From e0db4ba5bf071078554545eab42423f4fa4104d7 Mon Sep 17 00:00:00 2001 From: Matthew Kennedy Date: Mon, 25 Sep 2023 04:34:43 -0400 Subject: [PATCH] verbose idle is redundant, it's all in the log now --- firmware/controllers/actuators/idle_state.txt | 28 +++++++++---------- .../controllers/actuators/idle_thread.cpp | 6 ---- firmware/controllers/settings.cpp | 6 +--- firmware/integration/rusefi_config.txt | 2 +- firmware/tunerstudio/rusefi.input | 1 - 5 files changed, 16 insertions(+), 27 deletions(-) diff --git a/firmware/controllers/actuators/idle_state.txt b/firmware/controllers/actuators/idle_state.txt index 72408c1ca1..4bf8d42960 100644 --- a/firmware/controllers/actuators/idle_state.txt +++ b/firmware/controllers/actuators/idle_state.txt @@ -12,22 +12,22 @@ custom idle_state_e 4 bits, S32, @OFFSET@, [0:2], "not important" 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. -bit mustResetPid;idle: mustResetPid\nThis is used when the PID configuration is changed, to guarantee the reset -bit isCranking;idle: cranking -bit isIacTableForCoasting -bit notIdling -bit needReset;idle: reset -bit isInDeadZone;idle: dead zone -bit isBlipping + bit shouldResetPid;Idle: shouldResetPid + bit wasResetPid;Idle: wasResetPid\nThis is needed to slowly turn on the PID back after it was reset. + bit mustResetPid;Idle: mustResetPid\nThis is used when the PID configuration is changed, to guarantee the reset + bit isCranking;Idle: cranking + bit isIacTableForCoasting + bit notIdling + bit needReset;Idle: reset + bit isInDeadZone;Idle: dead zone + bit isBlipping bit useClosedLoop bit badTps -bit looksLikeRunning -bit looksLikeCoasting -bit looksLikeCrankToIdle -bit isVerboseIAC -bit isIdleCoasting;idle: coasting + bit looksLikeRunning + bit looksLikeCoasting + bit looksLikeCrankToIdle + bit isIdleCoasting;Idle: coasting + 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 a024d9846a..52c069bcbd 100644 --- a/firmware/controllers/actuators/idle_thread.cpp +++ b/firmware/controllers/actuators/idle_thread.cpp @@ -333,12 +333,6 @@ float IdleController::getIdlePosition(float rpm) { bool isAutomaticIdle = tps.Valid && engineConfiguration->idleMode == IM_AUTO; - isVerboseIAC = engineConfiguration->isVerboseIAC && isAutomaticIdle; - if (isVerboseIAC) { - efiPrintf("Idle state %s", getIdle_state_e(idleState)); - getIdlePid()->showPidStatus("idle"); - } - finishIdleTestIfNeeded(); undoIdleBlipIfNeeded(); diff --git a/firmware/controllers/settings.cpp b/firmware/controllers/settings.cpp index b06d81f87c..07913e0b9e 100644 --- a/firmware/controllers/settings.cpp +++ b/firmware/controllers/settings.cpp @@ -607,10 +607,6 @@ static void enableOrDisable(const char *param, bool isEnabled) { } else if (strEqualCaseInsensitive(param, "two_wire_wasted_spark")) { engineConfiguration->twoWireBatchIgnition = isEnabled; incrementGlobalConfigurationVersion(); - } else if (strEqualCaseInsensitive(param, "HIP9011")) { - engineConfiguration->isHip9011Enabled = isEnabled; - } else if (strEqualCaseInsensitive(param, "verbose_idle")) { - engineConfiguration->isVerboseIAC = isEnabled; } else if (strEqualCaseInsensitive(param, "altdebug")) { engineConfiguration->isVerboseAlternator = isEnabled; } else if (strEqualCaseInsensitive(param, "tpic_advanced_mode")) { @@ -1029,7 +1025,7 @@ void setDateTime(const char * const isoDateTime) { void setEngineTypeAndSave(int value) { setEngineType(value, true); } - + void setEngineType(int value, bool isWriteToFlash) { { #if EFI_PROD_CODE diff --git a/firmware/integration/rusefi_config.txt b/firmware/integration/rusefi_config.txt index 9d4cc78524..53cba9f0e5 100644 --- a/firmware/integration/rusefi_config.txt +++ b/firmware/integration/rusefi_config.txt @@ -976,7 +976,7 @@ end_struct bit widebandOnSecondBus,"2","1";Select which bus the wideband controller is attached to. bit fuelClosedLoopCorrectionEnabled;Enables lambda sensor closed loop feedback for fuelling. - bit isVerboseIAC;Print details into rusEFI console\nenable verbose_idle + bit unused1192b2 bit boardUseTachPullUp,"12v","5v" bit boardUseTempPullUp,"With Pull Ups","Piggyback Mode" bit yesUnderstandLocking,"yes","no" diff --git a/firmware/tunerstudio/rusefi.input b/firmware/tunerstudio/rusefi.input index 4f3a1df094..757f8aea68 100644 --- a/firmware/tunerstudio/rusefi.input +++ b/firmware/tunerstudio/rusefi.input @@ -3432,7 +3432,6 @@ cmd_set_engine_type_default = "@@TS_IO_TEST_COMMAND_char@@@@ts_command_e_TS_ field = "Use coasting idle table", useIacTableForCoasting field = "Dashpot coasting-to-idle Hold time", iacByTpsHoldTime field = "Dashpot coasting-to-idle Decay time", iacByTpsDecayTime - field = "Detailed status in console", isVerboseIAC dialog = idleSettings, "", yAxis field = "Idle control mode", idleMode