diff --git a/firmware/controllers/algo/engine_state.txt b/firmware/controllers/algo/engine_state.txt index bd72d3af20..709fb7705e 100644 --- a/firmware/controllers/algo/engine_state.txt +++ b/firmware/controllers/algo/engine_state.txt @@ -42,7 +42,6 @@ struct_no_prefix engine_state_s int8_t smartChipRestartCounter int8_t smartChipAliveCounter bit startStopPhysicalState - bit acrStateDup bit acrEngineMovedRecently ! same field is used for narrow band heater enable and wide band enable via CAN bit heaterControlEnabled @@ -54,6 +53,9 @@ struct_no_prefix engine_state_s float egtValue1 float egtValue2 + float luaSoftSparkSkip + float luaHardSparkSkip + float tractionControlSparkSkip int16_t desiredRpmLimit;User-defined RPM hard limit;"rpm", 1, 0, 0, 30000, 0 diff --git a/firmware/integration/rusefi_config.txt b/firmware/integration/rusefi_config.txt index 27b606eb03..1dcaf18e5a 100644 --- a/firmware/integration/rusefi_config.txt +++ b/firmware/integration/rusefi_config.txt @@ -1156,7 +1156,7 @@ int16_t tps2Max;Full throttle#2. tpsMax value as 10 bit ADC value. Not Voltage!\ ! temporary for too much CAN RX processing kills Lua script #5841 bit luaCanRxWorkaround bit flexSensorInverted - bit unusedBit_495_8 + bit useHardSkipInTraction bit unusedBit_495_9 bit unusedBit_495_10 bit useAuxSpeedForSlipRatio diff --git a/firmware/tunerstudio/rusefi.input b/firmware/tunerstudio/rusefi.input index 05cb39d42f..c189c86401 100644 --- a/firmware/tunerstudio/rusefi.input +++ b/firmware/tunerstudio/rusefi.input @@ -2070,7 +2070,7 @@ menuDialog = main subMenu = fancyHardwareDialog, "Fancy Hardware" subMenu = tractionEtbTableTbl, "Traction Control ETB Drop" subMenu = tractionTimingTableTbl, "Traction Control Timing Adjustment" - subMenu = tractionIgnitionSkipTableTbl, "Traction Control Skip Ignition" + subMenu = tractionIgnitionSkipDialog, "Traction Control Skip Ignition" subMenu = std_separator subMenu = hipFunction, "HIP9011 settings (knock sensor) (alpha version)" @@if_ts_show_hip9011 @@ -2992,6 +2992,10 @@ cmd_set_engine_type_default = "@@TS_IO_TEST_COMMAND_char@@@@ts_command_e_TS_ panel = wastegateIdlePosLeft, West panel = wastegateIdlePosGauges, East + dialog = tractionIgnitionSkipDialog, "Traction Ignition Skip" + field = useHardSkipInTraction, useHardSkipInTraction + panel = tractionIgnitionSkipTableTbl + dialog = mc33Dialog, "Low-Z injector control PT2001" field = "SPI Chip Select", mc33816_cs field = "SPI Device", mc33816spiDevice