diff --git a/firmware/console/binary/output_channels.txt b/firmware/console/binary/output_channels.txt index f238e1641b..9d312a4f01 100644 --- a/firmware/console/binary/output_channels.txt +++ b/firmware/console/binary/output_channels.txt @@ -33,7 +33,6 @@ bit isPedalError;Error: Pedal bit isKnockChipOk; bit launchTriggered;Launch Control Triggered bit isTps2Error;Error: TPS2 -bit isIdleClosedLoop;Idle: Closed Loop bit injectorFault;Injector Fault bit ignitionFault;Ignition Fault bit isMainRelayOn; diff --git a/firmware/controllers/actuators/idle_state.txt b/firmware/controllers/actuators/idle_state.txt index 4bf8d42960..388c1baa6e 100644 --- a/firmware/controllers/actuators/idle_state.txt +++ b/firmware/controllers/actuators/idle_state.txt @@ -10,7 +10,7 @@ custom idle_state_e 4 bits, S32, @OFFSET@, [0:2], "not important" percent_t iacByTpsTaper;idle: iacByTpsTaper portion int throttlePedalUpState;idle: throttlePedalUpState\ntrue in IDLE throttle pedal state, false if driver is touching the pedal\ntodo: better name for this field? -bit mightResetPid;idle: mightResetPid\nThe idea of 'mightResetPid' is to reset PID only once - each time when TPS > idlePidDeactivationTpsThreshold.\nThe throttle pedal can be pressed for a long time, making the PID data obsolete (thus the reset is required).\nWe set 'mightResetPid' to true only if PID was actually used (i.e. idlePid.getOutput() was called) to save some CPU resources.\nSee automaticIdleController(). + bit mightResetPid;idle: mightResetPid\nThe idea of 'mightResetPid' is to reset PID only once - each time when TPS > idlePidDeactivationTpsThreshold.\nThe throttle pedal can be pressed for a long time, making the PID data obsolete (thus the reset is required).\nWe set 'mightResetPid' to true only if PID was actually used (i.e. idlePid.getOutput() was called) to save some CPU resources.\nSee automaticIdleController(). bit shouldResetPid;Idle: shouldResetPid bit wasResetPid;Idle: wasResetPid\nThis is needed to slowly turn on the PID back after it was reset. @@ -21,13 +21,13 @@ bit mightResetPid;idle: mightResetPid\nThe idea of 'mightResetPid' is to reset P bit needReset;Idle: reset bit isInDeadZone;Idle: dead zone bit isBlipping -bit useClosedLoop -bit badTps + bit useClosedLoop + bit badTps bit looksLikeRunning bit looksLikeCoasting bit looksLikeCrankToIdle bit isIdleCoasting;Idle: coasting - + bit isIdleClosedLoop;Idle: Closed loop active int targetRpmByClt;idle: target by CLT int targetRpmAcBump;idle: A/C bump diff --git a/firmware/controllers/actuators/idle_thread.cpp b/firmware/controllers/actuators/idle_thread.cpp index fa2aa5ca91..84d0872b15 100644 --- a/firmware/controllers/actuators/idle_thread.cpp +++ b/firmware/controllers/actuators/idle_thread.cpp @@ -357,7 +357,7 @@ float IdleController::getIdlePosition(float rpm) { } #if EFI_TUNER_STUDIO && (EFI_PROD_CODE || EFI_SIMULATOR) - engine->outputChannels.isIdleClosedLoop = phase == Phase::Idling; + isIdleClosedLoop = phase == Phase::Idling; if (engineConfiguration->idleMode == IM_AUTO) { // see also tsOutputChannels->idlePosition