diff --git a/firmware/controllers/actuators/idle_thread.cpp b/firmware/controllers/actuators/idle_thread.cpp index bc0f485251..e1c1e13f55 100644 --- a/firmware/controllers/actuators/idle_thread.cpp +++ b/firmware/controllers/actuators/idle_thread.cpp @@ -63,18 +63,6 @@ static StepperMotor iacMotor; static uint32_t lastCrankingCyclesCounter = 0; static float lastCrankingIacPosition; -typedef enum { - INIT = 0, - TPS_THRESHOLD = 1, - RPM_DEAD_ZONE = 2, - PID_VALUE = 3, - PWM_PRETTY_CLOSE = 4, - PID_UPPER = 5, - ADJUSTING = 8, - BLIP = 16, - -} idle_state_e; - static idle_state_e idleState = INIT; /** @@ -274,6 +262,7 @@ private: */ if (engineConfiguration->isVerboseIAC && engineConfiguration->idleMode == IM_AUTO) { + // todo: print each bit using 'getIdle_state_e' method scheduleMsg(logger, "state %d", idleState); idlePid.showPidStatus(logger, "idle"); } diff --git a/firmware/controllers/algo/auto_generated_enums.cpp b/firmware/controllers/algo/auto_generated_enums.cpp index d5b4fa9d98..51814a87ce 100644 --- a/firmware/controllers/algo/auto_generated_enums.cpp +++ b/firmware/controllers/algo/auto_generated_enums.cpp @@ -1,6 +1,6 @@ // auto-generated from.\controllers/algo/rusefi_enums.h // by enum2string.jar tool -// on Wed May 01 12:54:14 EDT 2019 +// on Sat May 11 10:22:02 EDT 2019 // see also gen_config_and_enums.bat @@ -930,10 +930,6 @@ case TLE8888_PIN_9: } const char *getDebug_mode_e(debug_mode_e value){ switch(value) { -case DBG_DWELL_METRIC: - return "DBG_DWELL_METRIC"; -case DBG_AUX_TEMPERATURE: - return "DBG_AUX_TEMPERATURE"; case DBG_35: return "DBG_35"; case DBG_36: @@ -948,6 +944,8 @@ case DBG_ANALOG_INPUTS2: return "DBG_ANALOG_INPUTS2"; case DBG_AUX_PID_1: return "DBG_AUX_PID_1"; +case DBG_AUX_TEMPERATURE: + return "DBG_AUX_TEMPERATURE"; case DBG_AUX_VALVES: return "DBG_AUX_VALVES"; case DBG_BENCH_TEST: @@ -958,6 +956,8 @@ case DBG_CJ125: return "DBG_CJ125"; case DBG_CRANKING_DETAILS: return "DBG_CRANKING_DETAILS"; +case DBG_DWELL_METRIC: + return "DBG_DWELL_METRIC"; case DBG_ELECTRONIC_THROTTLE_EXTRA: return "DBG_ELECTRONIC_THROTTLE_EXTRA"; case DBG_ELECTRONIC_THROTTLE_PID: @@ -1195,3 +1195,24 @@ case STEADY_STATE_AT_BASELINE: } return NULL; } +const char *getIdle_state_e(idle_state_e value){ +switch(value) { +case ADJUSTING: + return "ADJUSTING"; +case BLIP: + return "BLIP"; +case INIT: + return "INIT"; +case PID_UPPER: + return "PID_UPPER"; +case PID_VALUE: + return "PID_VALUE"; +case PWM_PRETTY_CLOSE: + return "PWM_PRETTY_CLOSE"; +case RPM_DEAD_ZONE: + return "RPM_DEAD_ZONE"; +case TPS_THRESHOLD: + return "TPS_THRESHOLD"; + } + return NULL; +} diff --git a/firmware/controllers/algo/auto_generated_enums.h b/firmware/controllers/algo/auto_generated_enums.h index d7890b39fe..2e1a5ea598 100644 --- a/firmware/controllers/algo/auto_generated_enums.h +++ b/firmware/controllers/algo/auto_generated_enums.h @@ -1,6 +1,6 @@ // auto-generated from.\controllers/algo/rusefi_enums.h // by enum2string.jar tool -// on Wed Apr 10 18:05:03 EDT 2019 +// on Sat May 11 10:22:02 EDT 2019 // see also gen_config_and_enums.bat @@ -46,4 +46,5 @@ const char *getHip_state_e(hip_state_e value); const char *getTChargeMode_e(tChargeMode_e value); const char *getPidAutoTune_Peak(PidAutoTune_Peak value); const char *getPidAutoTune_AutoTunerState(PidAutoTune_AutoTunerState value); +const char *getIdle_state_e(idle_state_e value); #endif /*_A_H_HEADER_ */ diff --git a/firmware/controllers/algo/rusefi_enums.h b/firmware/controllers/algo/rusefi_enums.h index aa77a25c9e..42a88b7210 100644 --- a/firmware/controllers/algo/rusefi_enums.h +++ b/firmware/controllers/algo/rusefi_enums.h @@ -1072,5 +1072,16 @@ typedef enum { FAILED = 128 } PidAutoTune_AutoTunerState; +typedef enum { + INIT = 0, + TPS_THRESHOLD = 1, + RPM_DEAD_ZONE = 2, + PID_VALUE = 3, + PWM_PRETTY_CLOSE = 4, + PID_UPPER = 5, + ADJUSTING = 8, + BLIP = 16, + +} idle_state_e; #endif /* RUSEFI_ENUMS_H_ */ diff --git a/firmware/tunerstudio/rusefi.input b/firmware/tunerstudio/rusefi.input index 38b0fc8a21..521e87a3cd 100644 --- a/firmware/tunerstudio/rusefi.input +++ b/firmware/tunerstudio/rusefi.input @@ -1852,6 +1852,7 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" dialog = idleSettings, "", yAxis + field = "Debug mode", debugMode field = "Idle IAC control mode", idleMode field = "use ETB for idle", useETBforIdleControl field = "Use separate Ignition Table for idle", useSeparateAdvanceForIdle