diff --git a/firmware/config/boards/cypress/config/controllers/algo/engine_configuration_generated_structures_cypress.h b/firmware/config/boards/cypress/config/controllers/algo/engine_configuration_generated_structures_cypress.h index 9127301e6f..44aa7f8cea 100644 --- a/firmware/config/boards/cypress/config/controllers/algo/engine_configuration_generated_structures_cypress.h +++ b/firmware/config/boards/cypress/config/controllers/algo/engine_configuration_generated_structures_cypress.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Mon Mar 04 03:55:35 UTC 2024 +// this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue Mar 05 01:56:17 UTC 2024 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -2843,7 +2843,7 @@ struct engine_configuration_s { bool flexSensorInverted : 1 {}; /** offset 1576 bit 8 */ - bool unusedBit_495_8 : 1 {}; + bool useHardSkipInTraction : 1 {}; /** offset 1576 bit 9 */ bool unusedBit_495_9 : 1 {}; @@ -5630,4 +5630,4 @@ struct persistent_config_s { static_assert(sizeof(persistent_config_s) == 22236); // end -// this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Mon Mar 04 03:55:35 UTC 2024 +// this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue Mar 05 01:56:17 UTC 2024 diff --git a/firmware/config/boards/cypress/config/controllers/algo/rusefi_generated_cypress.h b/firmware/config/boards/cypress/config/controllers/algo/rusefi_generated_cypress.h index 842055c1cd..3f59940eb2 100644 --- a/firmware/config/boards/cypress/config/controllers/algo/rusefi_generated_cypress.h +++ b/firmware/config/boards/cypress/config/controllers/algo/rusefi_generated_cypress.h @@ -836,7 +836,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 1352820405 +#define SIGNATURE_HASH 523818637 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1174,14 +1174,14 @@ #define ts_show_vr_threshold_all false #define ts_show_vr_threshold_pins true #define ts_show_vvt_output true -#define TS_SIGNATURE "rusEFI master.2024.03.05.cypress.1352820405" +#define TS_SIGNATURE "rusEFI master.2024.03.05.cypress.523818637" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' #define TS_TEST_COMMAND_char t -#define TS_TOTAL_OUTPUT_SIZE 1456 +#define TS_TOTAL_OUTPUT_SIZE 1468 #define TS_TRIGGER_SCOPE_CHANNEL_1_NAME "Channel 1" #define TS_TRIGGER_SCOPE_CHANNEL_2_NAME "Channel 2" #define TS_TRIGGER_SCOPE_DISABLE 5 diff --git a/firmware/config/boards/kinetis/config/controllers/algo/engine_configuration_generated_structures_kin.h b/firmware/config/boards/kinetis/config/controllers/algo/engine_configuration_generated_structures_kin.h index e72e4386c7..e073cc51cf 100644 --- a/firmware/config/boards/kinetis/config/controllers/algo/engine_configuration_generated_structures_kin.h +++ b/firmware/config/boards/kinetis/config/controllers/algo/engine_configuration_generated_structures_kin.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Mon Mar 04 03:55:34 UTC 2024 +// this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue Mar 05 01:56:16 UTC 2024 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -2843,7 +2843,7 @@ struct engine_configuration_s { bool flexSensorInverted : 1 {}; /** offset 1576 bit 8 */ - bool unusedBit_495_8 : 1 {}; + bool useHardSkipInTraction : 1 {}; /** offset 1576 bit 9 */ bool unusedBit_495_9 : 1 {}; @@ -5630,4 +5630,4 @@ struct persistent_config_s { static_assert(sizeof(persistent_config_s) == 20860); // end -// this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Mon Mar 04 03:55:34 UTC 2024 +// this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue Mar 05 01:56:16 UTC 2024 diff --git a/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated_kin.h b/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated_kin.h index c25dd40b34..9edb7236a0 100644 --- a/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated_kin.h +++ b/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated_kin.h @@ -836,7 +836,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 309567771 +#define SIGNATURE_HASH 1575555363 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1174,14 +1174,14 @@ #define ts_show_vr_threshold_all false #define ts_show_vr_threshold_pins true #define ts_show_vvt_output true -#define TS_SIGNATURE "rusEFI master.2024.03.05.kin.309567771" +#define TS_SIGNATURE "rusEFI master.2024.03.05.kin.1575555363" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' #define TS_TEST_COMMAND_char t -#define TS_TOTAL_OUTPUT_SIZE 1456 +#define TS_TOTAL_OUTPUT_SIZE 1468 #define TS_TRIGGER_SCOPE_CHANNEL_1_NAME "Channel 1" #define TS_TRIGGER_SCOPE_CHANNEL_2_NAME "Channel 2" #define TS_TRIGGER_SCOPE_DISABLE 5 diff --git a/firmware/config/boards/subaru_eg33/config/controllers/algo/engine_configuration_generated_structures_subaru_eg33_f7.h b/firmware/config/boards/subaru_eg33/config/controllers/algo/engine_configuration_generated_structures_subaru_eg33_f7.h index 35ad69dbdb..9a1bbdeef3 100644 --- a/firmware/config/boards/subaru_eg33/config/controllers/algo/engine_configuration_generated_structures_subaru_eg33_f7.h +++ b/firmware/config/boards/subaru_eg33/config/controllers/algo/engine_configuration_generated_structures_subaru_eg33_f7.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Mon Mar 04 03:55:36 UTC 2024 +// this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue Mar 05 01:56:19 UTC 2024 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -2843,7 +2843,7 @@ struct engine_configuration_s { bool flexSensorInverted : 1 {}; /** offset 1576 bit 8 */ - bool unusedBit_495_8 : 1 {}; + bool useHardSkipInTraction : 1 {}; /** offset 1576 bit 9 */ bool unusedBit_495_9 : 1 {}; @@ -5630,4 +5630,4 @@ struct persistent_config_s { static_assert(sizeof(persistent_config_s) == 22236); // end -// this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Mon Mar 04 03:55:36 UTC 2024 +// this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue Mar 05 01:56:19 UTC 2024 diff --git a/firmware/config/boards/subaru_eg33/config/controllers/algo/rusefi_generated_subaru_eg33_f7.h b/firmware/config/boards/subaru_eg33/config/controllers/algo/rusefi_generated_subaru_eg33_f7.h index 9a9fbac527..c6ec89b8c8 100644 --- a/firmware/config/boards/subaru_eg33/config/controllers/algo/rusefi_generated_subaru_eg33_f7.h +++ b/firmware/config/boards/subaru_eg33/config/controllers/algo/rusefi_generated_subaru_eg33_f7.h @@ -1073,7 +1073,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 3812913245 +#define SIGNATURE_HASH 2900279397 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1411,14 +1411,14 @@ #define ts_show_vr_threshold_all false #define ts_show_vr_threshold_pins true #define ts_show_vvt_output true -#define TS_SIGNATURE "rusEFI master.2024.03.05.subaru_eg33_f7.3812913245" +#define TS_SIGNATURE "rusEFI master.2024.03.05.subaru_eg33_f7.2900279397" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' #define TS_TEST_COMMAND_char t -#define TS_TOTAL_OUTPUT_SIZE 1456 +#define TS_TOTAL_OUTPUT_SIZE 1468 #define TS_TRIGGER_SCOPE_CHANNEL_1_NAME "Channel 1" #define TS_TRIGGER_SCOPE_CHANNEL_2_NAME "Channel 2" #define TS_TRIGGER_SCOPE_DISABLE 5 diff --git a/firmware/console/binary/generated/data_logs.ini b/firmware/console/binary/generated/data_logs.ini index 3451f4eae2..21650a384a 100644 --- a/firmware/console/binary/generated/data_logs.ini +++ b/firmware/console/binary/generated/data_logs.ini @@ -549,7 +549,6 @@ entry = smartChipState, "smartChipState", int, "%d" entry = smartChipRestartCounter, "smartChipRestartCounter", int, "%d" entry = smartChipAliveCounter, "smartChipAliveCounter", int, "%d" entry = startStopPhysicalState, "startStopPhysicalState", int, "%d" -entry = acrStateDup, "acrStateDup", int, "%d" entry = acrEngineMovedRecently, "acrEngineMovedRecently", int, "%d" entry = heaterControlEnabled, "heaterControlEnabled", int, "%d" entry = luaDigitalState0, "luaDigitalState0", int, "%d" @@ -559,6 +558,9 @@ entry = luaDigitalState3, "luaDigitalState3", int, "%d" entry = startStopStateToggleCounter, "startStopStateToggleCounter", int, "%d" entry = egtValue1, "egtValue1", float, "%.3f" entry = egtValue2, "egtValue2", float, "%.3f" +entry = luaSoftSparkSkip, "luaSoftSparkSkip", float, "%.3f" +entry = luaHardSparkSkip, "luaHardSparkSkip", float, "%.3f" +entry = tractionControlSparkSkip, "tractionControlSparkSkip", float, "%.3f" entry = desiredRpmLimit, "User-defined RPM hard limit", int, "%d" entry = fuelInjectionCounter, "Fuel: Injection counter", int, "%d" entry = globalSparkCounter, "Ign: Spark counter", int, "%d" diff --git a/firmware/console/binary/generated/fancy_content.ini b/firmware/console/binary/generated/fancy_content.ini index c329b17f1c..916b28d8c8 100644 --- a/firmware/console/binary/generated/fancy_content.ini +++ b/firmware/console/binary/generated/fancy_content.ini @@ -229,7 +229,6 @@ indicatorPanel = engine_stateIndicatorPanel, 2 indicator = {lua_luaDisableEtb}, "luaDisableEtb No", "luaDisableEtb Yes" indicator = {lua_luaIgnCut}, "luaIgnCut No", "luaIgnCut Yes" indicator = {startStopPhysicalState}, "startStopPhysicalState No", "startStopPhysicalState Yes" - indicator = {acrStateDup}, "acrStateDup No", "acrStateDup Yes" indicator = {acrEngineMovedRecently}, "acrEngineMovedRecently No", "acrEngineMovedRecently Yes" indicator = {heaterControlEnabled}, "heaterControlEnabled No", "heaterControlEnabled Yes" indicator = {luaDigitalState0}, "luaDigitalState0 No", "luaDigitalState0 Yes" @@ -265,12 +264,16 @@ dialog = engine_stateDialog, "engine_state" graphLine = egtValue1 graphLine = egtValue2 liveGraph = engine_state_6_Graph, "Graph", South + graphLine = luaSoftSparkSkip + graphLine = luaHardSparkSkip + graphLine = tractionControlSparkSkip graphLine = desiredRpmLimit + liveGraph = engine_state_7_Graph, "Graph", South graphLine = fuelInjectionCounter graphLine = globalSparkCounter graphLine = fuelingLoad - liveGraph = engine_state_7_Graph, "Graph", South graphLine = ignitionLoad + liveGraph = engine_state_8_Graph, "Graph", South graphLine = veTableYAxis indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/console/binary/generated/live_data_ids.h b/firmware/console/binary/generated/live_data_ids.h index 3fae78708e..bb30f21f1f 100644 --- a/firmware/console/binary/generated/live_data_ids.h +++ b/firmware/console/binary/generated/live_data_ids.h @@ -47,15 +47,15 @@ LDS_lambda_monitor, #define FUEL_PUMP_CONTROL_BASE_ADDRESS 1048 #define MAIN_RELAY_BASE_ADDRESS 1052 #define ENGINE_STATE_BASE_ADDRESS 1056 -#define TPS_ACCEL_STATE_BASE_ADDRESS 1148 -#define TRIGGER_CENTRAL_BASE_ADDRESS 1196 -#define TRIGGER_STATE_BASE_ADDRESS 1256 -#define TRIGGER_STATE_PRIMARY_BASE_ADDRESS 1296 -#define WALL_FUEL_STATE_BASE_ADDRESS 1304 -#define IDLE_STATE_BASE_ADDRESS 1312 -#define ELECTRONIC_THROTTLE_BASE_ADDRESS 1360 -#define WIDEBAND_STATE_BASE_ADDRESS 1412 -#define DC_MOTORS_BASE_ADDRESS 1424 -#define SENT_STATE_BASE_ADDRESS 1436 -#define VVT_BASE_ADDRESS 1444 -#define LAMBDA_MONITOR_BASE_ADDRESS 1448 +#define TPS_ACCEL_STATE_BASE_ADDRESS 1160 +#define TRIGGER_CENTRAL_BASE_ADDRESS 1208 +#define TRIGGER_STATE_BASE_ADDRESS 1268 +#define TRIGGER_STATE_PRIMARY_BASE_ADDRESS 1308 +#define WALL_FUEL_STATE_BASE_ADDRESS 1316 +#define IDLE_STATE_BASE_ADDRESS 1324 +#define ELECTRONIC_THROTTLE_BASE_ADDRESS 1372 +#define WIDEBAND_STATE_BASE_ADDRESS 1424 +#define DC_MOTORS_BASE_ADDRESS 1436 +#define SENT_STATE_BASE_ADDRESS 1448 +#define VVT_BASE_ADDRESS 1456 +#define LAMBDA_MONITOR_BASE_ADDRESS 1460 diff --git a/firmware/console/binary/generated/output_channels.ini b/firmware/console/binary/generated/output_channels.ini index cdac4238db..d517a3bbce 100644 --- a/firmware/console/binary/generated/output_channels.ini +++ b/firmware/console/binary/generated/output_channels.ini @@ -646,142 +646,144 @@ smartChipState = scalar, S08, 1102, "", 1, 0 smartChipRestartCounter = scalar, S08, 1103, "", 1, 0 smartChipAliveCounter = scalar, S08, 1104, "", 1, 0 startStopPhysicalState = bits, U32, 1108, [0:0] -acrStateDup = bits, U32, 1108, [1:1] -acrEngineMovedRecently = bits, U32, 1108, [2:2] -heaterControlEnabled = bits, U32, 1108, [3:3] -luaDigitalState0 = bits, U32, 1108, [4:4] -luaDigitalState1 = bits, U32, 1108, [5:5] -luaDigitalState2 = bits, U32, 1108, [6:6] -luaDigitalState3 = bits, U32, 1108, [7:7] +acrEngineMovedRecently = bits, U32, 1108, [1:1] +heaterControlEnabled = bits, U32, 1108, [2:2] +luaDigitalState0 = bits, U32, 1108, [3:3] +luaDigitalState1 = bits, U32, 1108, [4:4] +luaDigitalState2 = bits, U32, 1108, [5:5] +luaDigitalState3 = bits, U32, 1108, [6:6] startStopStateToggleCounter = scalar, U32, 1112, "", 1, 0 egtValue1 = scalar, F32, 1116, "", 1, 0 egtValue2 = scalar, F32, 1120, "", 1, 0 -desiredRpmLimit = scalar, S16, 1124, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1128, "", 1, 0 -globalSparkCounter = scalar, U32, 1132, "", 1, 0 -fuelingLoad = scalar, F32, 1136, "", 1, 0 -ignitionLoad = scalar, F32, 1140, "", 1, 0 -veTableYAxis = scalar, U16, 1144, "%", 0.01, 0 -; total TS size = 1148 -tpsFrom = scalar, F32, 1148 -tpsTo = scalar, F32, 1152 -deltaTps = scalar, F32, 1156 -extraFuel = scalar, F32, 1160, "", 1, 0 -valueFromTable = scalar, F32, 1164, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1168, [0:0] -isBelowDecelThreshold = bits, U32, 1168, [1:1] -isTimeToResetAccumulator = bits, U32, 1168, [2:2] -isFractionalEnrichment = bits, U32, 1168, [3:3] -belowEpsilon = bits, U32, 1168, [4:4] -tooShort = bits, U32, 1168, [5:5] -fractionalInjFuel = scalar, F32, 1172, "", 1, 0 -accumulatedValue = scalar, F32, 1176, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1180, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1184, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1188, "", 1, 0 -cycleCnt = scalar, S32, 1192, "", 1, 0 -; total TS size = 1196 -hwEventCounters1 = scalar, U32, 1196, "", 1, 0 -hwEventCounters2 = scalar, U32, 1200, "", 1, 0 -hwEventCounters3 = scalar, U32, 1204, "", 1, 0 -hwEventCounters4 = scalar, U32, 1208, "", 1, 0 -hwEventCounters5 = scalar, U32, 1212, "", 1, 0 -hwEventCounters6 = scalar, U32, 1216, "", 1, 0 -vvtCamCounter = scalar, U32, 1220, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1224, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1228, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1232, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1233, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1236, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1240, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1244, "", 1, 0 -mapCamPrevToothAngle = scalar, F32, 1248, "deg", 1, 0 -isDecodingMapCam = bits, U32, 1252, [0:0] -; total TS size = 1256 -crankSynchronizationCounter0 = scalar, U32, 1256, "", 1, 0 -vvtSyncGapRatio0 = scalar, F32, 1260, "", 1, 0 -vvtToothDurations00 = scalar, U32, 1264, "us", 1, 0 -vvtCurrentPosition0 = scalar, F32, 1268, "sync: Primary Cam Position", 1, 0 -vvtToothPosition10 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition20 = scalar, F32, 1276, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition30 = scalar, F32, 1280, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition40 = scalar, F32, 1284, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio0 = scalar, F32, 1288, "", 1, 0 -triggerStateIndex0 = scalar, U08, 1292, "", 1, 0 -vvtStateIndex0 = scalar, U08, 1293, "", 1, 0 -; total TS size = 1296 -camResyncCounter = scalar, U08, 1296, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1300, [0:0] -; total TS size = 1304 -wallFuelCorrection = scalar, F32, 1304, "", 1, 0 -wallFuel = scalar, F32, 1308, "", 1, 0 -; total TS size = 1312 -idleState = bits, S32, 1312, [0:2], "not important" -currentIdlePosition = scalar, F32, 1316 -baseIdlePosition = scalar, F32, 1320 -idleClosedLoop = scalar, F32, 1324 -iacByTpsTaper = scalar, F32, 1328 -throttlePedalUpState = scalar, S32, 1332, "", 1, 0 -mightResetPid = bits, U32, 1336, [0:0] -shouldResetPid = bits, U32, 1336, [1:1] -wasResetPid = bits, U32, 1336, [2:2] -mustResetPid = bits, U32, 1336, [3:3] -isCranking = bits, U32, 1336, [4:4] -isIacTableForCoasting = bits, U32, 1336, [5:5] -notIdling = bits, U32, 1336, [6:6] -needReset = bits, U32, 1336, [7:7] -isInDeadZone = bits, U32, 1336, [8:8] -isBlipping = bits, U32, 1336, [9:9] -useClosedLoop = bits, U32, 1336, [10:10] -badTps = bits, U32, 1336, [11:11] -looksLikeRunning = bits, U32, 1336, [12:12] -looksLikeCoasting = bits, U32, 1336, [13:13] -looksLikeCrankToIdle = bits, U32, 1336, [14:14] -isIdleCoasting = bits, U32, 1336, [15:15] -isIdleClosedLoop = bits, U32, 1336, [16:16] -idleTarget = scalar, S32, 1340, "", 1, 0 -targetRpmByClt = scalar, S32, 1344, "", 1, 0 -targetRpmAc = scalar, S32, 1348, "", 1, 0 -iacByRpmTaper = scalar, F32, 1352 -luaAdd = scalar, F32, 1356 -; total TS size = 1360 -idlePosition0 = scalar, F32, 1360, "per", 1,0 -trim0 = scalar, F32, 1364, "", 1, 0 -luaAdjustment0 = scalar, F32, 1368, "per", 1,0 -m_wastegatePosition0 = scalar, F32, 1372, "per", 1,0 -etbFeedForward0 = scalar, F32, 1376 -etbIntegralError0 = scalar, F32, 1380, "", 1, 0 -etbCurrentTarget0 = scalar, F32, 1384, "%", 1, 0 -etbCurrentAdjustedTarget0 = scalar, F32, 1388, "%", 1, 0 -etbRevLimitActive0 = bits, U32, 1392, [0:0] -jamDetected0 = bits, U32, 1392, [1:1] -etbDutyRateOfChange0 = scalar, F32, 1396, "per", 1,0 -etbDutyAverage0 = scalar, F32, 1400, "per", 1,0 -etbTpsErrorCounter0 = scalar, U16, 1404, "count", 1,0 -etbPpsErrorCounter0 = scalar, U16, 1406, "count", 1,0 -etbErrorCode0 = scalar, S08, 1408, "", 1, 0 -tcEtbDrop0 = scalar, S08, 1409, "", 1, 0 -jamTimer0 = scalar, U16, 1410, "sec", 0.01, 0 -; total TS size = 1412 -faultCode0 = scalar, U08, 1412, "", 1, 0 -heaterDuty0 = scalar, U08, 1413, "%", 1, 0 -pumpDuty0 = scalar, U08, 1414, "%", 1, 0 -tempC0 = scalar, U16, 1416, "C", 1, 0 -nernstVoltage0 = scalar, U16, 1418, "V", 0.001, 0 -esr0 = scalar, U16, 1420, "ohm", 1, 0 +luaSoftSparkSkip = scalar, F32, 1124, "", 1, 0 +luaHardSparkSkip = scalar, F32, 1128, "", 1, 0 +tractionControlSparkSkip = scalar, F32, 1132, "", 1, 0 +desiredRpmLimit = scalar, S16, 1136, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 1140, "", 1, 0 +globalSparkCounter = scalar, U32, 1144, "", 1, 0 +fuelingLoad = scalar, F32, 1148, "", 1, 0 +ignitionLoad = scalar, F32, 1152, "", 1, 0 +veTableYAxis = scalar, U16, 1156, "%", 0.01, 0 +; total TS size = 1160 +tpsFrom = scalar, F32, 1160 +tpsTo = scalar, F32, 1164 +deltaTps = scalar, F32, 1168 +extraFuel = scalar, F32, 1172, "", 1, 0 +valueFromTable = scalar, F32, 1176, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1180, [0:0] +isBelowDecelThreshold = bits, U32, 1180, [1:1] +isTimeToResetAccumulator = bits, U32, 1180, [2:2] +isFractionalEnrichment = bits, U32, 1180, [3:3] +belowEpsilon = bits, U32, 1180, [4:4] +tooShort = bits, U32, 1180, [5:5] +fractionalInjFuel = scalar, F32, 1184, "", 1, 0 +accumulatedValue = scalar, F32, 1188, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1192, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1196, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1200, "", 1, 0 +cycleCnt = scalar, S32, 1204, "", 1, 0 +; total TS size = 1208 +hwEventCounters1 = scalar, U32, 1208, "", 1, 0 +hwEventCounters2 = scalar, U32, 1212, "", 1, 0 +hwEventCounters3 = scalar, U32, 1216, "", 1, 0 +hwEventCounters4 = scalar, U32, 1220, "", 1, 0 +hwEventCounters5 = scalar, U32, 1224, "", 1, 0 +hwEventCounters6 = scalar, U32, 1228, "", 1, 0 +vvtCamCounter = scalar, U32, 1232, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1236, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1240, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1244, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1245, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1248, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1252, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1256, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1260, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1264, [0:0] +; total TS size = 1268 +crankSynchronizationCounter0 = scalar, U32, 1268, "", 1, 0 +vvtSyncGapRatio0 = scalar, F32, 1272, "", 1, 0 +vvtToothDurations00 = scalar, U32, 1276, "us", 1, 0 +vvtCurrentPosition0 = scalar, F32, 1280, "sync: Primary Cam Position", 1, 0 +vvtToothPosition10 = scalar, F32, 1284, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition20 = scalar, F32, 1288, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition30 = scalar, F32, 1292, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition40 = scalar, F32, 1296, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio0 = scalar, F32, 1300, "", 1, 0 +triggerStateIndex0 = scalar, U08, 1304, "", 1, 0 +vvtStateIndex0 = scalar, U08, 1305, "", 1, 0 +; total TS size = 1308 +camResyncCounter = scalar, U08, 1308, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1312, [0:0] +; total TS size = 1316 +wallFuelCorrection = scalar, F32, 1316, "", 1, 0 +wallFuel = scalar, F32, 1320, "", 1, 0 +; total TS size = 1324 +idleState = bits, S32, 1324, [0:2], "not important" +currentIdlePosition = scalar, F32, 1328 +baseIdlePosition = scalar, F32, 1332 +idleClosedLoop = scalar, F32, 1336 +iacByTpsTaper = scalar, F32, 1340 +throttlePedalUpState = scalar, S32, 1344, "", 1, 0 +mightResetPid = bits, U32, 1348, [0:0] +shouldResetPid = bits, U32, 1348, [1:1] +wasResetPid = bits, U32, 1348, [2:2] +mustResetPid = bits, U32, 1348, [3:3] +isCranking = bits, U32, 1348, [4:4] +isIacTableForCoasting = bits, U32, 1348, [5:5] +notIdling = bits, U32, 1348, [6:6] +needReset = bits, U32, 1348, [7:7] +isInDeadZone = bits, U32, 1348, [8:8] +isBlipping = bits, U32, 1348, [9:9] +useClosedLoop = bits, U32, 1348, [10:10] +badTps = bits, U32, 1348, [11:11] +looksLikeRunning = bits, U32, 1348, [12:12] +looksLikeCoasting = bits, U32, 1348, [13:13] +looksLikeCrankToIdle = bits, U32, 1348, [14:14] +isIdleCoasting = bits, U32, 1348, [15:15] +isIdleClosedLoop = bits, U32, 1348, [16:16] +idleTarget = scalar, S32, 1352, "", 1, 0 +targetRpmByClt = scalar, S32, 1356, "", 1, 0 +targetRpmAc = scalar, S32, 1360, "", 1, 0 +iacByRpmTaper = scalar, F32, 1364 +luaAdd = scalar, F32, 1368 +; total TS size = 1372 +idlePosition0 = scalar, F32, 1372, "per", 1,0 +trim0 = scalar, F32, 1376, "", 1, 0 +luaAdjustment0 = scalar, F32, 1380, "per", 1,0 +m_wastegatePosition0 = scalar, F32, 1384, "per", 1,0 +etbFeedForward0 = scalar, F32, 1388 +etbIntegralError0 = scalar, F32, 1392, "", 1, 0 +etbCurrentTarget0 = scalar, F32, 1396, "%", 1, 0 +etbCurrentAdjustedTarget0 = scalar, F32, 1400, "%", 1, 0 +etbRevLimitActive0 = bits, U32, 1404, [0:0] +jamDetected0 = bits, U32, 1404, [1:1] +etbDutyRateOfChange0 = scalar, F32, 1408, "per", 1,0 +etbDutyAverage0 = scalar, F32, 1412, "per", 1,0 +etbTpsErrorCounter0 = scalar, U16, 1416, "count", 1,0 +etbPpsErrorCounter0 = scalar, U16, 1418, "count", 1,0 +etbErrorCode0 = scalar, S08, 1420, "", 1, 0 +tcEtbDrop0 = scalar, S08, 1421, "", 1, 0 +jamTimer0 = scalar, U16, 1422, "sec", 0.01, 0 ; total TS size = 1424 -dcOutput0 = scalar, F32, 1424, "per", 1,0 -isEnabled0_int = scalar, U08, 1428, "per", 1,0 -isEnabled0 = bits, U32, 1432, [0:0] +faultCode0 = scalar, U08, 1424, "", 1, 0 +heaterDuty0 = scalar, U08, 1425, "%", 1, 0 +pumpDuty0 = scalar, U08, 1426, "%", 1, 0 +tempC0 = scalar, U16, 1428, "C", 1, 0 +nernstVoltage0 = scalar, U16, 1430, "V", 0.001, 0 +esr0 = scalar, U16, 1432, "ohm", 1, 0 ; total TS size = 1436 -value0 = scalar, U16, 1436, "value", 1,0 -value1 = scalar, U16, 1438, "value", 1,0 -errorRate = scalar, F32, 1440, "ratio", 1,0 -; total TS size = 1444 -vvtTarget = scalar, U16, 1444, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1446, "%", 0.5, 0 +dcOutput0 = scalar, F32, 1436, "per", 1,0 +isEnabled0_int = scalar, U08, 1440, "per", 1,0 +isEnabled0 = bits, U32, 1444, [0:0] ; total TS size = 1448 -lambdaCurrentlyGood = bits, U32, 1448, [0:0] -lambdaMonitorCut = bits, U32, 1448, [1:1] -lambdaTimeSinceGood = scalar, U16, 1452, "sec", 0.01, 0 +value0 = scalar, U16, 1448, "value", 1,0 +value1 = scalar, U16, 1450, "value", 1,0 +errorRate = scalar, F32, 1452, "ratio", 1,0 ; total TS size = 1456 +vvtTarget = scalar, U16, 1456, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1458, "%", 0.5, 0 +; total TS size = 1460 +lambdaCurrentlyGood = bits, U32, 1460, [0:0] +lambdaMonitorCut = bits, U32, 1460, [1:1] +lambdaTimeSinceGood = scalar, U16, 1464, "sec", 0.01, 0 +; total TS size = 1468 diff --git a/firmware/console/binary/generated/total_live_data_generated.h b/firmware/console/binary/generated/total_live_data_generated.h index 9cf72461d3..0fbfa1bdc8 100644 --- a/firmware/console/binary/generated/total_live_data_generated.h +++ b/firmware/console/binary/generated/total_live_data_generated.h @@ -1,2 +1,2 @@ // generated by gen_live_documentation.sh / LiveDataProcessor.java -#define TS_TOTAL_OUTPUT_SIZE 1456 \ No newline at end of file +#define TS_TOTAL_OUTPUT_SIZE 1468 \ No newline at end of file diff --git a/firmware/console/binary_log/log_fields_generated.h b/firmware/console/binary_log/log_fields_generated.h index 30536ba344..89c1f953f5 100644 --- a/firmware/console/binary_log/log_fields_generated.h +++ b/firmware/console/binary_log/log_fields_generated.h @@ -433,6 +433,9 @@ static const LogField fields[] = { {engine->engineState.startStopStateToggleCounter, "startStopStateToggleCounter", "", 0}, {engine->engineState.egtValue1, "egtValue1", "", 0}, {engine->engineState.egtValue2, "egtValue2", "", 0}, + {engine->engineState.luaSoftSparkSkip, "luaSoftSparkSkip", "", 0}, + {engine->engineState.luaHardSparkSkip, "luaHardSparkSkip", "", 0}, + {engine->engineState.tractionControlSparkSkip, "tractionControlSparkSkip", "", 0}, {engine->engineState.desiredRpmLimit, "User-defined RPM hard limit", "rpm", 0}, {engine->engineState.fuelInjectionCounter, "Fuel: Injection counter", "", 0}, {engine->engineState.globalSparkCounter, "Ign: Spark counter", "", 0}, diff --git a/firmware/controllers/algo/engine_state_generated.h b/firmware/controllers/algo/engine_state_generated.h index 11707d7c42..c433630294 100644 --- a/firmware/controllers/algo/engine_state_generated.h +++ b/firmware/controllers/algo/engine_state_generated.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool config_definition_base.jar based on (unknown script) controllers/algo/engine_state.txt Wed Jan 03 20:30:10 UTC 2024 +// this section was generated automatically by rusEFI tool config_definition_base-all.jar based on (unknown script) controllers/algo/engine_state.txt Tue Mar 05 01:56:09 UTC 2024 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -236,97 +236,97 @@ struct engine_state_s { bool startStopPhysicalState : 1 {}; /** offset 52 bit 1 */ - bool acrStateDup : 1 {}; - /** - offset 52 bit 2 */ bool acrEngineMovedRecently : 1 {}; /** - offset 52 bit 3 */ + offset 52 bit 2 */ bool heaterControlEnabled : 1 {}; /** - offset 52 bit 4 */ + offset 52 bit 3 */ bool luaDigitalState0 : 1 {}; /** - offset 52 bit 5 */ + offset 52 bit 4 */ bool luaDigitalState1 : 1 {}; /** - offset 52 bit 6 */ + offset 52 bit 5 */ bool luaDigitalState2 : 1 {}; /** - offset 52 bit 7 */ + offset 52 bit 6 */ bool luaDigitalState3 : 1 {}; /** + offset 52 bit 7 */ + bool unusedBit_20_7 : 1 {}; + /** offset 52 bit 8 */ - bool unusedBit_21_8 : 1 {}; + bool unusedBit_20_8 : 1 {}; /** offset 52 bit 9 */ - bool unusedBit_21_9 : 1 {}; + bool unusedBit_20_9 : 1 {}; /** offset 52 bit 10 */ - bool unusedBit_21_10 : 1 {}; + bool unusedBit_20_10 : 1 {}; /** offset 52 bit 11 */ - bool unusedBit_21_11 : 1 {}; + bool unusedBit_20_11 : 1 {}; /** offset 52 bit 12 */ - bool unusedBit_21_12 : 1 {}; + bool unusedBit_20_12 : 1 {}; /** offset 52 bit 13 */ - bool unusedBit_21_13 : 1 {}; + bool unusedBit_20_13 : 1 {}; /** offset 52 bit 14 */ - bool unusedBit_21_14 : 1 {}; + bool unusedBit_20_14 : 1 {}; /** offset 52 bit 15 */ - bool unusedBit_21_15 : 1 {}; + bool unusedBit_20_15 : 1 {}; /** offset 52 bit 16 */ - bool unusedBit_21_16 : 1 {}; + bool unusedBit_20_16 : 1 {}; /** offset 52 bit 17 */ - bool unusedBit_21_17 : 1 {}; + bool unusedBit_20_17 : 1 {}; /** offset 52 bit 18 */ - bool unusedBit_21_18 : 1 {}; + bool unusedBit_20_18 : 1 {}; /** offset 52 bit 19 */ - bool unusedBit_21_19 : 1 {}; + bool unusedBit_20_19 : 1 {}; /** offset 52 bit 20 */ - bool unusedBit_21_20 : 1 {}; + bool unusedBit_20_20 : 1 {}; /** offset 52 bit 21 */ - bool unusedBit_21_21 : 1 {}; + bool unusedBit_20_21 : 1 {}; /** offset 52 bit 22 */ - bool unusedBit_21_22 : 1 {}; + bool unusedBit_20_22 : 1 {}; /** offset 52 bit 23 */ - bool unusedBit_21_23 : 1 {}; + bool unusedBit_20_23 : 1 {}; /** offset 52 bit 24 */ - bool unusedBit_21_24 : 1 {}; + bool unusedBit_20_24 : 1 {}; /** offset 52 bit 25 */ - bool unusedBit_21_25 : 1 {}; + bool unusedBit_20_25 : 1 {}; /** offset 52 bit 26 */ - bool unusedBit_21_26 : 1 {}; + bool unusedBit_20_26 : 1 {}; /** offset 52 bit 27 */ - bool unusedBit_21_27 : 1 {}; + bool unusedBit_20_27 : 1 {}; /** offset 52 bit 28 */ - bool unusedBit_21_28 : 1 {}; + bool unusedBit_20_28 : 1 {}; /** offset 52 bit 29 */ - bool unusedBit_21_29 : 1 {}; + bool unusedBit_20_29 : 1 {}; /** offset 52 bit 30 */ - bool unusedBit_21_30 : 1 {}; + bool unusedBit_20_30 : 1 {}; /** offset 52 bit 31 */ - bool unusedBit_21_31 : 1 {}; + bool unusedBit_20_31 : 1 {}; /** * offset 56 */ @@ -339,51 +339,63 @@ struct engine_state_s { * offset 64 */ float egtValue2 = (float)0; + /** + * offset 68 + */ + float luaSoftSparkSkip = (float)0; + /** + * offset 72 + */ + float luaHardSparkSkip = (float)0; + /** + * offset 76 + */ + float tractionControlSparkSkip = (float)0; /** * User-defined RPM hard limit * units: rpm - * offset 68 + * offset 80 */ int16_t desiredRpmLimit = (int16_t)0; /** * need 4 byte alignment * units: units - * offset 70 + * offset 82 */ - uint8_t alignmentFill_at_70[2]; + uint8_t alignmentFill_at_82[2]; /** * Fuel: Injection counter - * offset 72 + * offset 84 */ uint32_t fuelInjectionCounter = (uint32_t)0; /** * Ign: Spark counter - * offset 76 + * offset 88 */ uint32_t globalSparkCounter = (uint32_t)0; /** * @@GAUGE_NAME_FUEL_LOAD@@ - * offset 80 + * offset 92 */ float fuelingLoad = (float)0; /** * @@GAUGE_NAME_IGNITION_LOAD@@ - * offset 84 + * offset 96 */ float ignitionLoad = (float)0; /** * units: % - * offset 88 + * offset 100 */ scaled_channel veTableYAxis = (uint16_t)0; /** * need 4 byte alignment * units: units - * offset 90 + * offset 102 */ - uint8_t alignmentFill_at_90[2]; + uint8_t alignmentFill_at_102[2]; }; -static_assert(sizeof(engine_state_s) == 92); +static_assert(sizeof(engine_state_s) == 104); // end -// this section was generated automatically by rusEFI tool config_definition_base.jar based on (unknown script) controllers/algo/engine_state.txt Wed Jan 03 20:30:10 UTC 2024 +// this section was generated automatically by rusEFI tool config_definition_base-all.jar based on (unknown script) controllers/algo/engine_state.txt Tue Mar 05 01:56:09 UTC 2024 diff --git a/firmware/controllers/generated/engine_configuration_generated_structures_alphax-2chan.h b/firmware/controllers/generated/engine_configuration_generated_structures_alphax-2chan.h index b0f8ec6158..c886f821c3 100644 --- a/firmware/controllers/generated/engine_configuration_generated_structures_alphax-2chan.h +++ b/firmware/controllers/generated/engine_configuration_generated_structures_alphax-2chan.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Mon Mar 04 03:55:38 UTC 2024 +// this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue Mar 05 01:56:20 UTC 2024 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -2843,7 +2843,7 @@ struct engine_configuration_s { bool flexSensorInverted : 1 {}; /** offset 1576 bit 8 */ - bool unusedBit_495_8 : 1 {}; + bool useHardSkipInTraction : 1 {}; /** offset 1576 bit 9 */ bool unusedBit_495_9 : 1 {}; @@ -5630,4 +5630,4 @@ struct persistent_config_s { static_assert(sizeof(persistent_config_s) == 22236); // end -// this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Mon Mar 04 03:55:38 UTC 2024 +// this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue Mar 05 01:56:20 UTC 2024 diff --git a/firmware/controllers/generated/engine_configuration_generated_structures_alphax-4chan.h b/firmware/controllers/generated/engine_configuration_generated_structures_alphax-4chan.h index 62ceb63295..f1cb678a46 100644 --- a/firmware/controllers/generated/engine_configuration_generated_structures_alphax-4chan.h +++ b/firmware/controllers/generated/engine_configuration_generated_structures_alphax-4chan.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Mon Mar 04 03:55:39 UTC 2024 +// this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue Mar 05 01:56:21 UTC 2024 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -2843,7 +2843,7 @@ struct engine_configuration_s { bool flexSensorInverted : 1 {}; /** offset 1576 bit 8 */ - bool unusedBit_495_8 : 1 {}; + bool useHardSkipInTraction : 1 {}; /** offset 1576 bit 9 */ bool unusedBit_495_9 : 1 {}; @@ -5630,4 +5630,4 @@ struct persistent_config_s { static_assert(sizeof(persistent_config_s) == 22236); // end -// this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Mon Mar 04 03:55:39 UTC 2024 +// this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue Mar 05 01:56:21 UTC 2024 diff --git a/firmware/controllers/generated/engine_configuration_generated_structures_alphax-4chan_f7.h b/firmware/controllers/generated/engine_configuration_generated_structures_alphax-4chan_f7.h index 177d143dd2..3cf35158a7 100644 --- a/firmware/controllers/generated/engine_configuration_generated_structures_alphax-4chan_f7.h +++ b/firmware/controllers/generated/engine_configuration_generated_structures_alphax-4chan_f7.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Mon Mar 04 03:55:41 UTC 2024 +// this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue Mar 05 01:56:23 UTC 2024 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -2843,7 +2843,7 @@ struct engine_configuration_s { bool flexSensorInverted : 1 {}; /** offset 1576 bit 8 */ - bool unusedBit_495_8 : 1 {}; + bool useHardSkipInTraction : 1 {}; /** offset 1576 bit 9 */ bool unusedBit_495_9 : 1 {}; @@ -5630,4 +5630,4 @@ struct persistent_config_s { static_assert(sizeof(persistent_config_s) == 22236); // end -// this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Mon Mar 04 03:55:41 UTC 2024 +// this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue Mar 05 01:56:23 UTC 2024 diff --git a/firmware/controllers/generated/engine_configuration_generated_structures_alphax-8chan-revA.h b/firmware/controllers/generated/engine_configuration_generated_structures_alphax-8chan-revA.h index 402f7386b6..0a00b5f0a9 100644 --- a/firmware/controllers/generated/engine_configuration_generated_structures_alphax-8chan-revA.h +++ b/firmware/controllers/generated/engine_configuration_generated_structures_alphax-8chan-revA.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Mon Mar 04 03:55:45 UTC 2024 +// this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue Mar 05 01:56:27 UTC 2024 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -2843,7 +2843,7 @@ struct engine_configuration_s { bool flexSensorInverted : 1 {}; /** offset 1576 bit 8 */ - bool unusedBit_495_8 : 1 {}; + bool useHardSkipInTraction : 1 {}; /** offset 1576 bit 9 */ bool unusedBit_495_9 : 1 {}; @@ -5630,4 +5630,4 @@ struct persistent_config_s { static_assert(sizeof(persistent_config_s) == 22236); // end -// this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Mon Mar 04 03:55:45 UTC 2024 +// this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue Mar 05 01:56:27 UTC 2024 diff --git a/firmware/controllers/generated/engine_configuration_generated_structures_alphax-8chan.h b/firmware/controllers/generated/engine_configuration_generated_structures_alphax-8chan.h index 3ed4cd7910..f88b43a703 100644 --- a/firmware/controllers/generated/engine_configuration_generated_structures_alphax-8chan.h +++ b/firmware/controllers/generated/engine_configuration_generated_structures_alphax-8chan.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Mon Mar 04 03:55:42 UTC 2024 +// this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue Mar 05 01:56:24 UTC 2024 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -2843,7 +2843,7 @@ struct engine_configuration_s { bool flexSensorInverted : 1 {}; /** offset 1592 bit 8 */ - bool unusedBit_495_8 : 1 {}; + bool useHardSkipInTraction : 1 {}; /** offset 1592 bit 9 */ bool unusedBit_495_9 : 1 {}; @@ -5630,4 +5630,4 @@ struct persistent_config_s { static_assert(sizeof(persistent_config_s) == 22252); // end -// this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Mon Mar 04 03:55:42 UTC 2024 +// this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue Mar 05 01:56:24 UTC 2024 diff --git a/firmware/controllers/generated/engine_configuration_generated_structures_alphax-8chan_f7.h b/firmware/controllers/generated/engine_configuration_generated_structures_alphax-8chan_f7.h index 3c14c48d43..3656fc60a2 100644 --- a/firmware/controllers/generated/engine_configuration_generated_structures_alphax-8chan_f7.h +++ b/firmware/controllers/generated/engine_configuration_generated_structures_alphax-8chan_f7.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Mon Mar 04 03:55:44 UTC 2024 +// this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue Mar 05 01:56:26 UTC 2024 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -2843,7 +2843,7 @@ struct engine_configuration_s { bool flexSensorInverted : 1 {}; /** offset 1592 bit 8 */ - bool unusedBit_495_8 : 1 {}; + bool useHardSkipInTraction : 1 {}; /** offset 1592 bit 9 */ bool unusedBit_495_9 : 1 {}; @@ -5630,4 +5630,4 @@ struct persistent_config_s { static_assert(sizeof(persistent_config_s) == 22252); // end -// this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Mon Mar 04 03:55:44 UTC 2024 +// this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue Mar 05 01:56:26 UTC 2024 diff --git a/firmware/controllers/generated/engine_configuration_generated_structures_at_start_f435.h b/firmware/controllers/generated/engine_configuration_generated_structures_at_start_f435.h index bfaf7715f1..9e64a40993 100644 --- a/firmware/controllers/generated/engine_configuration_generated_structures_at_start_f435.h +++ b/firmware/controllers/generated/engine_configuration_generated_structures_at_start_f435.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Mon Mar 04 03:56:35 UTC 2024 +// this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue Mar 05 01:57:15 UTC 2024 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -2843,7 +2843,7 @@ struct engine_configuration_s { bool flexSensorInverted : 1 {}; /** offset 1576 bit 8 */ - bool unusedBit_495_8 : 1 {}; + bool useHardSkipInTraction : 1 {}; /** offset 1576 bit 9 */ bool unusedBit_495_9 : 1 {}; @@ -5630,4 +5630,4 @@ struct persistent_config_s { static_assert(sizeof(persistent_config_s) == 22236); // end -// this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Mon Mar 04 03:56:35 UTC 2024 +// this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue Mar 05 01:57:15 UTC 2024 diff --git a/firmware/controllers/generated/engine_configuration_generated_structures_atlas.h b/firmware/controllers/generated/engine_configuration_generated_structures_atlas.h index 488c58b632..bab666eb67 100644 --- a/firmware/controllers/generated/engine_configuration_generated_structures_atlas.h +++ b/firmware/controllers/generated/engine_configuration_generated_structures_atlas.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Mon Mar 04 03:56:31 UTC 2024 +// this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue Mar 05 01:57:11 UTC 2024 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -2843,7 +2843,7 @@ struct engine_configuration_s { bool flexSensorInverted : 1 {}; /** offset 1576 bit 8 */ - bool unusedBit_495_8 : 1 {}; + bool useHardSkipInTraction : 1 {}; /** offset 1576 bit 9 */ bool unusedBit_495_9 : 1 {}; @@ -5630,4 +5630,4 @@ struct persistent_config_s { static_assert(sizeof(persistent_config_s) == 21736); // end -// this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Mon Mar 04 03:56:31 UTC 2024 +// this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue Mar 05 01:57:11 UTC 2024 diff --git a/firmware/controllers/generated/engine_configuration_generated_structures_f407-discovery.h b/firmware/controllers/generated/engine_configuration_generated_structures_f407-discovery.h index 914c502d02..fcbf1bbb46 100644 --- a/firmware/controllers/generated/engine_configuration_generated_structures_f407-discovery.h +++ b/firmware/controllers/generated/engine_configuration_generated_structures_f407-discovery.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Mon Mar 04 03:56:34 UTC 2024 +// this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue Mar 05 01:57:14 UTC 2024 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -2843,7 +2843,7 @@ struct engine_configuration_s { bool flexSensorInverted : 1 {}; /** offset 1576 bit 8 */ - bool unusedBit_495_8 : 1 {}; + bool useHardSkipInTraction : 1 {}; /** offset 1576 bit 9 */ bool unusedBit_495_9 : 1 {}; @@ -5630,4 +5630,4 @@ struct persistent_config_s { static_assert(sizeof(persistent_config_s) == 22236); // end -// this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Mon Mar 04 03:56:34 UTC 2024 +// this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue Mar 05 01:57:14 UTC 2024 diff --git a/firmware/controllers/generated/engine_configuration_generated_structures_f429-discovery.h b/firmware/controllers/generated/engine_configuration_generated_structures_f429-discovery.h index c55fd24911..526adf0e8e 100644 --- a/firmware/controllers/generated/engine_configuration_generated_structures_f429-discovery.h +++ b/firmware/controllers/generated/engine_configuration_generated_structures_f429-discovery.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Mon Mar 04 03:56:23 UTC 2024 +// this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue Mar 05 01:57:03 UTC 2024 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -2843,7 +2843,7 @@ struct engine_configuration_s { bool flexSensorInverted : 1 {}; /** offset 1576 bit 8 */ - bool unusedBit_495_8 : 1 {}; + bool useHardSkipInTraction : 1 {}; /** offset 1576 bit 9 */ bool unusedBit_495_9 : 1 {}; @@ -5630,4 +5630,4 @@ struct persistent_config_s { static_assert(sizeof(persistent_config_s) == 22236); // end -// this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Mon Mar 04 03:56:23 UTC 2024 +// this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue Mar 05 01:57:03 UTC 2024 diff --git a/firmware/controllers/generated/engine_configuration_generated_structures_f469-discovery.h b/firmware/controllers/generated/engine_configuration_generated_structures_f469-discovery.h index 1923649ecb..58340ec469 100644 --- a/firmware/controllers/generated/engine_configuration_generated_structures_f469-discovery.h +++ b/firmware/controllers/generated/engine_configuration_generated_structures_f469-discovery.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Mon Mar 04 03:56:25 UTC 2024 +// this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue Mar 05 01:57:05 UTC 2024 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -2843,7 +2843,7 @@ struct engine_configuration_s { bool flexSensorInverted : 1 {}; /** offset 1576 bit 8 */ - bool unusedBit_495_8 : 1 {}; + bool useHardSkipInTraction : 1 {}; /** offset 1576 bit 9 */ bool unusedBit_495_9 : 1 {}; @@ -5630,4 +5630,4 @@ struct persistent_config_s { static_assert(sizeof(persistent_config_s) == 22236); // end -// this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Mon Mar 04 03:56:25 UTC 2024 +// this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue Mar 05 01:57:05 UTC 2024 diff --git a/firmware/controllers/generated/engine_configuration_generated_structures_frankenso_na6.h b/firmware/controllers/generated/engine_configuration_generated_structures_frankenso_na6.h index d864f50b03..b6ef6e3ca7 100644 --- a/firmware/controllers/generated/engine_configuration_generated_structures_frankenso_na6.h +++ b/firmware/controllers/generated/engine_configuration_generated_structures_frankenso_na6.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Mon Mar 04 03:56:15 UTC 2024 +// this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue Mar 05 01:56:55 UTC 2024 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -2843,7 +2843,7 @@ struct engine_configuration_s { bool flexSensorInverted : 1 {}; /** offset 1576 bit 8 */ - bool unusedBit_495_8 : 1 {}; + bool useHardSkipInTraction : 1 {}; /** offset 1576 bit 9 */ bool unusedBit_495_9 : 1 {}; @@ -5630,4 +5630,4 @@ struct persistent_config_s { static_assert(sizeof(persistent_config_s) == 22236); // end -// this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Mon Mar 04 03:56:15 UTC 2024 +// this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue Mar 05 01:56:55 UTC 2024 diff --git a/firmware/controllers/generated/engine_configuration_generated_structures_hellen-112-17.h b/firmware/controllers/generated/engine_configuration_generated_structures_hellen-112-17.h index de2f553f01..7e9fb43a5f 100644 --- a/firmware/controllers/generated/engine_configuration_generated_structures_hellen-112-17.h +++ b/firmware/controllers/generated/engine_configuration_generated_structures_hellen-112-17.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Mon Mar 04 03:55:56 UTC 2024 +// this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue Mar 05 01:56:38 UTC 2024 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -2843,7 +2843,7 @@ struct engine_configuration_s { bool flexSensorInverted : 1 {}; /** offset 1576 bit 8 */ - bool unusedBit_495_8 : 1 {}; + bool useHardSkipInTraction : 1 {}; /** offset 1576 bit 9 */ bool unusedBit_495_9 : 1 {}; @@ -5630,4 +5630,4 @@ struct persistent_config_s { static_assert(sizeof(persistent_config_s) == 22236); // end -// this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Mon Mar 04 03:55:56 UTC 2024 +// this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue Mar 05 01:56:38 UTC 2024 diff --git a/firmware/controllers/generated/engine_configuration_generated_structures_hellen-gm-e67.h b/firmware/controllers/generated/engine_configuration_generated_structures_hellen-gm-e67.h index b083434839..d7cb9dc688 100644 --- a/firmware/controllers/generated/engine_configuration_generated_structures_hellen-gm-e67.h +++ b/firmware/controllers/generated/engine_configuration_generated_structures_hellen-gm-e67.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Mon Mar 04 03:56:02 UTC 2024 +// this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue Mar 05 01:56:43 UTC 2024 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -2843,7 +2843,7 @@ struct engine_configuration_s { bool flexSensorInverted : 1 {}; /** offset 1576 bit 8 */ - bool unusedBit_495_8 : 1 {}; + bool useHardSkipInTraction : 1 {}; /** offset 1576 bit 9 */ bool unusedBit_495_9 : 1 {}; @@ -5630,4 +5630,4 @@ struct persistent_config_s { static_assert(sizeof(persistent_config_s) == 22236); // end -// this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Mon Mar 04 03:56:02 UTC 2024 +// this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue Mar 05 01:56:43 UTC 2024 diff --git a/firmware/controllers/generated/engine_configuration_generated_structures_hellen-honda-k.h b/firmware/controllers/generated/engine_configuration_generated_structures_hellen-honda-k.h index ebb260808f..e94f124c82 100644 --- a/firmware/controllers/generated/engine_configuration_generated_structures_hellen-honda-k.h +++ b/firmware/controllers/generated/engine_configuration_generated_structures_hellen-honda-k.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Mon Mar 04 03:55:51 UTC 2024 +// this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue Mar 05 01:56:32 UTC 2024 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -2843,7 +2843,7 @@ struct engine_configuration_s { bool flexSensorInverted : 1 {}; /** offset 1576 bit 8 */ - bool unusedBit_495_8 : 1 {}; + bool useHardSkipInTraction : 1 {}; /** offset 1576 bit 9 */ bool unusedBit_495_9 : 1 {}; @@ -5630,4 +5630,4 @@ struct persistent_config_s { static_assert(sizeof(persistent_config_s) == 22908); // end -// this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Mon Mar 04 03:55:51 UTC 2024 +// this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue Mar 05 01:56:32 UTC 2024 diff --git a/firmware/controllers/generated/engine_configuration_generated_structures_hellen-nb1.h b/firmware/controllers/generated/engine_configuration_generated_structures_hellen-nb1.h index 9b11d10267..48215c0e4f 100644 --- a/firmware/controllers/generated/engine_configuration_generated_structures_hellen-nb1.h +++ b/firmware/controllers/generated/engine_configuration_generated_structures_hellen-nb1.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Mon Mar 04 03:56:01 UTC 2024 +// this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue Mar 05 01:56:42 UTC 2024 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -2843,7 +2843,7 @@ struct engine_configuration_s { bool flexSensorInverted : 1 {}; /** offset 1576 bit 8 */ - bool unusedBit_495_8 : 1 {}; + bool useHardSkipInTraction : 1 {}; /** offset 1576 bit 9 */ bool unusedBit_495_9 : 1 {}; @@ -5630,4 +5630,4 @@ struct persistent_config_s { static_assert(sizeof(persistent_config_s) == 22236); // end -// this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Mon Mar 04 03:56:01 UTC 2024 +// this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue Mar 05 01:56:42 UTC 2024 diff --git a/firmware/controllers/generated/engine_configuration_generated_structures_hellen121nissan.h b/firmware/controllers/generated/engine_configuration_generated_structures_hellen121nissan.h index ca761afe15..555f314e06 100644 --- a/firmware/controllers/generated/engine_configuration_generated_structures_hellen121nissan.h +++ b/firmware/controllers/generated/engine_configuration_generated_structures_hellen121nissan.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Mon Mar 04 03:55:49 UTC 2024 +// this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue Mar 05 01:56:31 UTC 2024 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -2843,7 +2843,7 @@ struct engine_configuration_s { bool flexSensorInverted : 1 {}; /** offset 1576 bit 8 */ - bool unusedBit_495_8 : 1 {}; + bool useHardSkipInTraction : 1 {}; /** offset 1576 bit 9 */ bool unusedBit_495_9 : 1 {}; @@ -5630,4 +5630,4 @@ struct persistent_config_s { static_assert(sizeof(persistent_config_s) == 22236); // end -// this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Mon Mar 04 03:55:49 UTC 2024 +// this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue Mar 05 01:56:31 UTC 2024 diff --git a/firmware/controllers/generated/engine_configuration_generated_structures_hellen121vag.h b/firmware/controllers/generated/engine_configuration_generated_structures_hellen121vag.h index 59a3949371..3674642f27 100644 --- a/firmware/controllers/generated/engine_configuration_generated_structures_hellen121vag.h +++ b/firmware/controllers/generated/engine_configuration_generated_structures_hellen121vag.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Mon Mar 04 03:55:48 UTC 2024 +// this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue Mar 05 01:56:30 UTC 2024 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -2843,7 +2843,7 @@ struct engine_configuration_s { bool flexSensorInverted : 1 {}; /** offset 1576 bit 8 */ - bool unusedBit_495_8 : 1 {}; + bool useHardSkipInTraction : 1 {}; /** offset 1576 bit 9 */ bool unusedBit_495_9 : 1 {}; @@ -5630,4 +5630,4 @@ struct persistent_config_s { static_assert(sizeof(persistent_config_s) == 22236); // end -// this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Mon Mar 04 03:55:48 UTC 2024 +// this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue Mar 05 01:56:30 UTC 2024 diff --git a/firmware/controllers/generated/engine_configuration_generated_structures_hellen128.h b/firmware/controllers/generated/engine_configuration_generated_structures_hellen128.h index f647fd7064..55f2b0e124 100644 --- a/firmware/controllers/generated/engine_configuration_generated_structures_hellen128.h +++ b/firmware/controllers/generated/engine_configuration_generated_structures_hellen128.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Mon Mar 04 03:55:46 UTC 2024 +// this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue Mar 05 01:56:28 UTC 2024 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -2843,7 +2843,7 @@ struct engine_configuration_s { bool flexSensorInverted : 1 {}; /** offset 1576 bit 8 */ - bool unusedBit_495_8 : 1 {}; + bool useHardSkipInTraction : 1 {}; /** offset 1576 bit 9 */ bool unusedBit_495_9 : 1 {}; @@ -5630,4 +5630,4 @@ struct persistent_config_s { static_assert(sizeof(persistent_config_s) == 22236); // end -// this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Mon Mar 04 03:55:46 UTC 2024 +// this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue Mar 05 01:56:28 UTC 2024 diff --git a/firmware/controllers/generated/engine_configuration_generated_structures_hellen154hyundai.h b/firmware/controllers/generated/engine_configuration_generated_structures_hellen154hyundai.h index 4558198367..a90f99de0b 100644 --- a/firmware/controllers/generated/engine_configuration_generated_structures_hellen154hyundai.h +++ b/firmware/controllers/generated/engine_configuration_generated_structures_hellen154hyundai.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Mon Mar 04 03:55:52 UTC 2024 +// this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue Mar 05 01:56:34 UTC 2024 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -2843,7 +2843,7 @@ struct engine_configuration_s { bool flexSensorInverted : 1 {}; /** offset 1576 bit 8 */ - bool unusedBit_495_8 : 1 {}; + bool useHardSkipInTraction : 1 {}; /** offset 1576 bit 9 */ bool unusedBit_495_9 : 1 {}; @@ -5630,4 +5630,4 @@ struct persistent_config_s { static_assert(sizeof(persistent_config_s) == 22236); // end -// this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Mon Mar 04 03:55:52 UTC 2024 +// this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue Mar 05 01:56:34 UTC 2024 diff --git a/firmware/controllers/generated/engine_configuration_generated_structures_hellen72.h b/firmware/controllers/generated/engine_configuration_generated_structures_hellen72.h index 1fb683b13e..b2b3120897 100644 --- a/firmware/controllers/generated/engine_configuration_generated_structures_hellen72.h +++ b/firmware/controllers/generated/engine_configuration_generated_structures_hellen72.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Mon Mar 04 03:55:58 UTC 2024 +// this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue Mar 05 01:56:39 UTC 2024 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -2843,7 +2843,7 @@ struct engine_configuration_s { bool flexSensorInverted : 1 {}; /** offset 1576 bit 8 */ - bool unusedBit_495_8 : 1 {}; + bool useHardSkipInTraction : 1 {}; /** offset 1576 bit 9 */ bool unusedBit_495_9 : 1 {}; @@ -5630,4 +5630,4 @@ struct persistent_config_s { static_assert(sizeof(persistent_config_s) == 22236); // end -// this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Mon Mar 04 03:55:58 UTC 2024 +// this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue Mar 05 01:56:39 UTC 2024 diff --git a/firmware/controllers/generated/engine_configuration_generated_structures_hellen81.h b/firmware/controllers/generated/engine_configuration_generated_structures_hellen81.h index 25b3af02de..38248376c0 100644 --- a/firmware/controllers/generated/engine_configuration_generated_structures_hellen81.h +++ b/firmware/controllers/generated/engine_configuration_generated_structures_hellen81.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Mon Mar 04 03:55:59 UTC 2024 +// this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue Mar 05 01:56:40 UTC 2024 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -2843,7 +2843,7 @@ struct engine_configuration_s { bool flexSensorInverted : 1 {}; /** offset 1576 bit 8 */ - bool unusedBit_495_8 : 1 {}; + bool useHardSkipInTraction : 1 {}; /** offset 1576 bit 9 */ bool unusedBit_495_9 : 1 {}; @@ -5630,4 +5630,4 @@ struct persistent_config_s { static_assert(sizeof(persistent_config_s) == 22236); // end -// this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Mon Mar 04 03:55:59 UTC 2024 +// this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue Mar 05 01:56:40 UTC 2024 diff --git a/firmware/controllers/generated/engine_configuration_generated_structures_hellen88bmw.h b/firmware/controllers/generated/engine_configuration_generated_structures_hellen88bmw.h index 60b9937599..621ed68ef4 100644 --- a/firmware/controllers/generated/engine_configuration_generated_structures_hellen88bmw.h +++ b/firmware/controllers/generated/engine_configuration_generated_structures_hellen88bmw.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Mon Mar 04 03:55:54 UTC 2024 +// this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue Mar 05 01:56:35 UTC 2024 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -2843,7 +2843,7 @@ struct engine_configuration_s { bool flexSensorInverted : 1 {}; /** offset 1576 bit 8 */ - bool unusedBit_495_8 : 1 {}; + bool useHardSkipInTraction : 1 {}; /** offset 1576 bit 9 */ bool unusedBit_495_9 : 1 {}; @@ -5630,4 +5630,4 @@ struct persistent_config_s { static_assert(sizeof(persistent_config_s) == 22236); // end -// this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Mon Mar 04 03:55:54 UTC 2024 +// this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue Mar 05 01:56:35 UTC 2024 diff --git a/firmware/controllers/generated/engine_configuration_generated_structures_hellenNA6.h b/firmware/controllers/generated/engine_configuration_generated_structures_hellenNA6.h index 7048a8a549..bc7d8b484a 100644 --- a/firmware/controllers/generated/engine_configuration_generated_structures_hellenNA6.h +++ b/firmware/controllers/generated/engine_configuration_generated_structures_hellenNA6.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Mon Mar 04 03:56:03 UTC 2024 +// this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue Mar 05 01:56:45 UTC 2024 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -2843,7 +2843,7 @@ struct engine_configuration_s { bool flexSensorInverted : 1 {}; /** offset 1576 bit 8 */ - bool unusedBit_495_8 : 1 {}; + bool useHardSkipInTraction : 1 {}; /** offset 1576 bit 9 */ bool unusedBit_495_9 : 1 {}; @@ -5630,4 +5630,4 @@ struct persistent_config_s { static_assert(sizeof(persistent_config_s) == 22236); // end -// this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Mon Mar 04 03:56:03 UTC 2024 +// this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue Mar 05 01:56:45 UTC 2024 diff --git a/firmware/controllers/generated/engine_configuration_generated_structures_hellenNA8_96.h b/firmware/controllers/generated/engine_configuration_generated_structures_hellenNA8_96.h index c8c513199e..4e6c5b705c 100644 --- a/firmware/controllers/generated/engine_configuration_generated_structures_hellenNA8_96.h +++ b/firmware/controllers/generated/engine_configuration_generated_structures_hellenNA8_96.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Mon Mar 04 03:56:05 UTC 2024 +// this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue Mar 05 01:56:46 UTC 2024 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -2843,7 +2843,7 @@ struct engine_configuration_s { bool flexSensorInverted : 1 {}; /** offset 1576 bit 8 */ - bool unusedBit_495_8 : 1 {}; + bool useHardSkipInTraction : 1 {}; /** offset 1576 bit 9 */ bool unusedBit_495_9 : 1 {}; @@ -5630,4 +5630,4 @@ struct persistent_config_s { static_assert(sizeof(persistent_config_s) == 22236); // end -// this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Mon Mar 04 03:56:05 UTC 2024 +// this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue Mar 05 01:56:46 UTC 2024 diff --git a/firmware/controllers/generated/engine_configuration_generated_structures_m74_9.h b/firmware/controllers/generated/engine_configuration_generated_structures_m74_9.h index 738c629735..3595bb5824 100644 --- a/firmware/controllers/generated/engine_configuration_generated_structures_m74_9.h +++ b/firmware/controllers/generated/engine_configuration_generated_structures_m74_9.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Mon Mar 04 03:56:10 UTC 2024 +// this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue Mar 05 01:56:51 UTC 2024 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -2843,7 +2843,7 @@ struct engine_configuration_s { bool flexSensorInverted : 1 {}; /** offset 1576 bit 8 */ - bool unusedBit_495_8 : 1 {}; + bool useHardSkipInTraction : 1 {}; /** offset 1576 bit 9 */ bool unusedBit_495_9 : 1 {}; @@ -5630,4 +5630,4 @@ struct persistent_config_s { static_assert(sizeof(persistent_config_s) == 22236); // end -// this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Mon Mar 04 03:56:10 UTC 2024 +// this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue Mar 05 01:56:51 UTC 2024 diff --git a/firmware/controllers/generated/engine_configuration_generated_structures_mre_f4.h b/firmware/controllers/generated/engine_configuration_generated_structures_mre_f4.h index ea5ee38a11..c6b52d38e9 100644 --- a/firmware/controllers/generated/engine_configuration_generated_structures_mre_f4.h +++ b/firmware/controllers/generated/engine_configuration_generated_structures_mre_f4.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Mon Mar 04 03:56:09 UTC 2024 +// this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue Mar 05 01:56:50 UTC 2024 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -2843,7 +2843,7 @@ struct engine_configuration_s { bool flexSensorInverted : 1 {}; /** offset 1576 bit 8 */ - bool unusedBit_495_8 : 1 {}; + bool useHardSkipInTraction : 1 {}; /** offset 1576 bit 9 */ bool unusedBit_495_9 : 1 {}; @@ -5630,4 +5630,4 @@ struct persistent_config_s { static_assert(sizeof(persistent_config_s) == 22236); // end -// this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Mon Mar 04 03:56:09 UTC 2024 +// this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue Mar 05 01:56:50 UTC 2024 diff --git a/firmware/controllers/generated/engine_configuration_generated_structures_mre_f7.h b/firmware/controllers/generated/engine_configuration_generated_structures_mre_f7.h index cffdff0aa6..0456e59e83 100644 --- a/firmware/controllers/generated/engine_configuration_generated_structures_mre_f7.h +++ b/firmware/controllers/generated/engine_configuration_generated_structures_mre_f7.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Mon Mar 04 03:56:08 UTC 2024 +// this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue Mar 05 01:56:49 UTC 2024 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -2843,7 +2843,7 @@ struct engine_configuration_s { bool flexSensorInverted : 1 {}; /** offset 1576 bit 8 */ - bool unusedBit_495_8 : 1 {}; + bool useHardSkipInTraction : 1 {}; /** offset 1576 bit 9 */ bool unusedBit_495_9 : 1 {}; @@ -5630,4 +5630,4 @@ struct persistent_config_s { static_assert(sizeof(persistent_config_s) == 22236); // end -// this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Mon Mar 04 03:56:08 UTC 2024 +// this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue Mar 05 01:56:49 UTC 2024 diff --git a/firmware/controllers/generated/engine_configuration_generated_structures_nucleo_h743.h b/firmware/controllers/generated/engine_configuration_generated_structures_nucleo_h743.h index e4c5315874..ab13bbc5c0 100644 --- a/firmware/controllers/generated/engine_configuration_generated_structures_nucleo_h743.h +++ b/firmware/controllers/generated/engine_configuration_generated_structures_nucleo_h743.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Mon Mar 04 03:56:30 UTC 2024 +// this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue Mar 05 01:57:10 UTC 2024 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -2843,7 +2843,7 @@ struct engine_configuration_s { bool flexSensorInverted : 1 {}; /** offset 1576 bit 8 */ - bool unusedBit_495_8 : 1 {}; + bool useHardSkipInTraction : 1 {}; /** offset 1576 bit 9 */ bool unusedBit_495_9 : 1 {}; @@ -5630,4 +5630,4 @@ struct persistent_config_s { static_assert(sizeof(persistent_config_s) == 22236); // end -// this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Mon Mar 04 03:56:30 UTC 2024 +// this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue Mar 05 01:57:10 UTC 2024 diff --git a/firmware/controllers/generated/engine_configuration_generated_structures_prometheus_405.h b/firmware/controllers/generated/engine_configuration_generated_structures_prometheus_405.h index 2f2735c65f..45ffb82618 100644 --- a/firmware/controllers/generated/engine_configuration_generated_structures_prometheus_405.h +++ b/firmware/controllers/generated/engine_configuration_generated_structures_prometheus_405.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Mon Mar 04 03:56:17 UTC 2024 +// this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue Mar 05 01:56:58 UTC 2024 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -2843,7 +2843,7 @@ struct engine_configuration_s { bool flexSensorInverted : 1 {}; /** offset 1576 bit 8 */ - bool unusedBit_495_8 : 1 {}; + bool useHardSkipInTraction : 1 {}; /** offset 1576 bit 9 */ bool unusedBit_495_9 : 1 {}; @@ -5630,4 +5630,4 @@ struct persistent_config_s { static_assert(sizeof(persistent_config_s) == 22236); // end -// this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Mon Mar 04 03:56:17 UTC 2024 +// this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue Mar 05 01:56:58 UTC 2024 diff --git a/firmware/controllers/generated/engine_configuration_generated_structures_prometheus_469.h b/firmware/controllers/generated/engine_configuration_generated_structures_prometheus_469.h index 9562abb2d3..9e9f779cb7 100644 --- a/firmware/controllers/generated/engine_configuration_generated_structures_prometheus_469.h +++ b/firmware/controllers/generated/engine_configuration_generated_structures_prometheus_469.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Mon Mar 04 03:56:16 UTC 2024 +// this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue Mar 05 01:56:57 UTC 2024 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -2843,7 +2843,7 @@ struct engine_configuration_s { bool flexSensorInverted : 1 {}; /** offset 1576 bit 8 */ - bool unusedBit_495_8 : 1 {}; + bool useHardSkipInTraction : 1 {}; /** offset 1576 bit 9 */ bool unusedBit_495_9 : 1 {}; @@ -5630,4 +5630,4 @@ struct persistent_config_s { static_assert(sizeof(persistent_config_s) == 22236); // end -// this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Mon Mar 04 03:56:16 UTC 2024 +// this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue Mar 05 01:56:57 UTC 2024 diff --git a/firmware/controllers/generated/engine_configuration_generated_structures_proteus_f4.h b/firmware/controllers/generated/engine_configuration_generated_structures_proteus_f4.h index 4c8b86d6f1..42694315c8 100644 --- a/firmware/controllers/generated/engine_configuration_generated_structures_proteus_f4.h +++ b/firmware/controllers/generated/engine_configuration_generated_structures_proteus_f4.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Mon Mar 04 03:56:20 UTC 2024 +// this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue Mar 05 01:57:01 UTC 2024 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -2843,7 +2843,7 @@ struct engine_configuration_s { bool flexSensorInverted : 1 {}; /** offset 1576 bit 8 */ - bool unusedBit_495_8 : 1 {}; + bool useHardSkipInTraction : 1 {}; /** offset 1576 bit 9 */ bool unusedBit_495_9 : 1 {}; @@ -5630,4 +5630,4 @@ struct persistent_config_s { static_assert(sizeof(persistent_config_s) == 26236); // end -// this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Mon Mar 04 03:56:20 UTC 2024 +// this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue Mar 05 01:57:01 UTC 2024 diff --git a/firmware/controllers/generated/engine_configuration_generated_structures_proteus_f7.h b/firmware/controllers/generated/engine_configuration_generated_structures_proteus_f7.h index 68ffa2080e..519dd718bb 100644 --- a/firmware/controllers/generated/engine_configuration_generated_structures_proteus_f7.h +++ b/firmware/controllers/generated/engine_configuration_generated_structures_proteus_f7.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Mon Mar 04 03:56:19 UTC 2024 +// this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue Mar 05 01:56:59 UTC 2024 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -2843,7 +2843,7 @@ struct engine_configuration_s { bool flexSensorInverted : 1 {}; /** offset 1576 bit 8 */ - bool unusedBit_495_8 : 1 {}; + bool useHardSkipInTraction : 1 {}; /** offset 1576 bit 9 */ bool unusedBit_495_9 : 1 {}; @@ -5630,4 +5630,4 @@ struct persistent_config_s { static_assert(sizeof(persistent_config_s) == 26236); // end -// this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Mon Mar 04 03:56:19 UTC 2024 +// this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue Mar 05 01:56:59 UTC 2024 diff --git a/firmware/controllers/generated/engine_configuration_generated_structures_proteus_h7.h b/firmware/controllers/generated/engine_configuration_generated_structures_proteus_h7.h index 680bee5ce0..4bef0251d3 100644 --- a/firmware/controllers/generated/engine_configuration_generated_structures_proteus_h7.h +++ b/firmware/controllers/generated/engine_configuration_generated_structures_proteus_h7.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Mon Mar 04 03:56:22 UTC 2024 +// this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue Mar 05 01:57:02 UTC 2024 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -2843,7 +2843,7 @@ struct engine_configuration_s { bool flexSensorInverted : 1 {}; /** offset 1576 bit 8 */ - bool unusedBit_495_8 : 1 {}; + bool useHardSkipInTraction : 1 {}; /** offset 1576 bit 9 */ bool unusedBit_495_9 : 1 {}; @@ -5630,4 +5630,4 @@ struct persistent_config_s { static_assert(sizeof(persistent_config_s) == 26236); // end -// this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Mon Mar 04 03:56:22 UTC 2024 +// this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue Mar 05 01:57:02 UTC 2024 diff --git a/firmware/controllers/generated/engine_configuration_generated_structures_s105.h b/firmware/controllers/generated/engine_configuration_generated_structures_s105.h index d0f2da0bfd..fd4405d6a0 100644 --- a/firmware/controllers/generated/engine_configuration_generated_structures_s105.h +++ b/firmware/controllers/generated/engine_configuration_generated_structures_s105.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Mon Mar 04 03:56:12 UTC 2024 +// this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue Mar 05 01:56:53 UTC 2024 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -2843,7 +2843,7 @@ struct engine_configuration_s { bool flexSensorInverted : 1 {}; /** offset 1576 bit 8 */ - bool unusedBit_495_8 : 1 {}; + bool useHardSkipInTraction : 1 {}; /** offset 1576 bit 9 */ bool unusedBit_495_9 : 1 {}; @@ -5630,4 +5630,4 @@ struct persistent_config_s { static_assert(sizeof(persistent_config_s) == 22236); // end -// this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Mon Mar 04 03:56:12 UTC 2024 +// this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue Mar 05 01:56:53 UTC 2024 diff --git a/firmware/controllers/generated/engine_configuration_generated_structures_small-can-board.h b/firmware/controllers/generated/engine_configuration_generated_structures_small-can-board.h index d5dd7fb523..7c8be0eaa2 100644 --- a/firmware/controllers/generated/engine_configuration_generated_structures_small-can-board.h +++ b/firmware/controllers/generated/engine_configuration_generated_structures_small-can-board.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Mon Mar 04 03:56:06 UTC 2024 +// this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue Mar 05 01:56:47 UTC 2024 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -2843,7 +2843,7 @@ struct engine_configuration_s { bool flexSensorInverted : 1 {}; /** offset 1576 bit 8 */ - bool unusedBit_495_8 : 1 {}; + bool useHardSkipInTraction : 1 {}; /** offset 1576 bit 9 */ bool unusedBit_495_9 : 1 {}; @@ -5630,4 +5630,4 @@ struct persistent_config_s { static_assert(sizeof(persistent_config_s) == 22236); // end -// this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Mon Mar 04 03:56:06 UTC 2024 +// this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue Mar 05 01:56:47 UTC 2024 diff --git a/firmware/controllers/generated/engine_configuration_generated_structures_stm32f413_nucleo.h b/firmware/controllers/generated/engine_configuration_generated_structures_stm32f413_nucleo.h index d84d947575..d646acc33c 100644 --- a/firmware/controllers/generated/engine_configuration_generated_structures_stm32f413_nucleo.h +++ b/firmware/controllers/generated/engine_configuration_generated_structures_stm32f413_nucleo.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Mon Mar 04 03:56:26 UTC 2024 +// this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue Mar 05 01:57:06 UTC 2024 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -2843,7 +2843,7 @@ struct engine_configuration_s { bool flexSensorInverted : 1 {}; /** offset 1576 bit 8 */ - bool unusedBit_495_8 : 1 {}; + bool useHardSkipInTraction : 1 {}; /** offset 1576 bit 9 */ bool unusedBit_495_9 : 1 {}; @@ -5630,4 +5630,4 @@ struct persistent_config_s { static_assert(sizeof(persistent_config_s) == 22236); // end -// this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Mon Mar 04 03:56:26 UTC 2024 +// this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue Mar 05 01:57:06 UTC 2024 diff --git a/firmware/controllers/generated/engine_configuration_generated_structures_stm32f429_nucleo.h b/firmware/controllers/generated/engine_configuration_generated_structures_stm32f429_nucleo.h index f79414dc47..39d26e99fe 100644 --- a/firmware/controllers/generated/engine_configuration_generated_structures_stm32f429_nucleo.h +++ b/firmware/controllers/generated/engine_configuration_generated_structures_stm32f429_nucleo.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Mon Mar 04 03:56:27 UTC 2024 +// this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue Mar 05 01:57:07 UTC 2024 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -2843,7 +2843,7 @@ struct engine_configuration_s { bool flexSensorInverted : 1 {}; /** offset 1576 bit 8 */ - bool unusedBit_495_8 : 1 {}; + bool useHardSkipInTraction : 1 {}; /** offset 1576 bit 9 */ bool unusedBit_495_9 : 1 {}; @@ -5630,4 +5630,4 @@ struct persistent_config_s { static_assert(sizeof(persistent_config_s) == 22236); // end -// this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Mon Mar 04 03:56:27 UTC 2024 +// this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue Mar 05 01:57:07 UTC 2024 diff --git a/firmware/controllers/generated/engine_configuration_generated_structures_stm32f767_nucleo.h b/firmware/controllers/generated/engine_configuration_generated_structures_stm32f767_nucleo.h index 2764a4d4f5..1af0ffbd9a 100644 --- a/firmware/controllers/generated/engine_configuration_generated_structures_stm32f767_nucleo.h +++ b/firmware/controllers/generated/engine_configuration_generated_structures_stm32f767_nucleo.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Mon Mar 04 03:56:29 UTC 2024 +// this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue Mar 05 01:57:09 UTC 2024 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -2843,7 +2843,7 @@ struct engine_configuration_s { bool flexSensorInverted : 1 {}; /** offset 1576 bit 8 */ - bool unusedBit_495_8 : 1 {}; + bool useHardSkipInTraction : 1 {}; /** offset 1576 bit 9 */ bool unusedBit_495_9 : 1 {}; @@ -5630,4 +5630,4 @@ struct persistent_config_s { static_assert(sizeof(persistent_config_s) == 22236); // end -// this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Mon Mar 04 03:56:29 UTC 2024 +// this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue Mar 05 01:57:09 UTC 2024 diff --git a/firmware/controllers/generated/engine_configuration_generated_structures_t-b-g.h b/firmware/controllers/generated/engine_configuration_generated_structures_t-b-g.h index c19a6fc2f5..768ddf3493 100644 --- a/firmware/controllers/generated/engine_configuration_generated_structures_t-b-g.h +++ b/firmware/controllers/generated/engine_configuration_generated_structures_t-b-g.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Mon Mar 04 03:56:13 UTC 2024 +// this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue Mar 05 01:56:54 UTC 2024 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -2843,7 +2843,7 @@ struct engine_configuration_s { bool flexSensorInverted : 1 {}; /** offset 1576 bit 8 */ - bool unusedBit_495_8 : 1 {}; + bool useHardSkipInTraction : 1 {}; /** offset 1576 bit 9 */ bool unusedBit_495_9 : 1 {}; @@ -5630,4 +5630,4 @@ struct persistent_config_s { static_assert(sizeof(persistent_config_s) == 22236); // end -// this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Mon Mar 04 03:56:13 UTC 2024 +// this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue Mar 05 01:56:54 UTC 2024 diff --git a/firmware/controllers/generated/engine_configuration_generated_structures_tdg-pdm8.h b/firmware/controllers/generated/engine_configuration_generated_structures_tdg-pdm8.h index ecf7ecfd04..1d76e0f021 100644 --- a/firmware/controllers/generated/engine_configuration_generated_structures_tdg-pdm8.h +++ b/firmware/controllers/generated/engine_configuration_generated_structures_tdg-pdm8.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Mon Mar 04 03:56:32 UTC 2024 +// this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue Mar 05 01:57:12 UTC 2024 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -2843,7 +2843,7 @@ struct engine_configuration_s { bool flexSensorInverted : 1 {}; /** offset 1576 bit 8 */ - bool unusedBit_495_8 : 1 {}; + bool useHardSkipInTraction : 1 {}; /** offset 1576 bit 9 */ bool unusedBit_495_9 : 1 {}; @@ -5630,4 +5630,4 @@ struct persistent_config_s { static_assert(sizeof(persistent_config_s) == 22236); // end -// this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Mon Mar 04 03:56:32 UTC 2024 +// this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue Mar 05 01:57:12 UTC 2024 diff --git a/firmware/controllers/generated/engine_configuration_generated_structures_uaefi.h b/firmware/controllers/generated/engine_configuration_generated_structures_uaefi.h index 1e2c63f6a8..e4977944d6 100644 --- a/firmware/controllers/generated/engine_configuration_generated_structures_uaefi.h +++ b/firmware/controllers/generated/engine_configuration_generated_structures_uaefi.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Mon Mar 04 03:55:55 UTC 2024 +// this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue Mar 05 01:56:36 UTC 2024 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -2843,7 +2843,7 @@ struct engine_configuration_s { bool flexSensorInverted : 1 {}; /** offset 1576 bit 8 */ - bool unusedBit_495_8 : 1 {}; + bool useHardSkipInTraction : 1 {}; /** offset 1576 bit 9 */ bool unusedBit_495_9 : 1 {}; @@ -5630,4 +5630,4 @@ struct persistent_config_s { static_assert(sizeof(persistent_config_s) == 22236); // end -// this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Mon Mar 04 03:55:55 UTC 2024 +// this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue Mar 05 01:56:36 UTC 2024 diff --git a/firmware/controllers/generated/rusefi_generated_alphax-2chan.h b/firmware/controllers/generated/rusefi_generated_alphax-2chan.h index f95e805c3d..c5f6b6798a 100644 --- a/firmware/controllers/generated/rusefi_generated_alphax-2chan.h +++ b/firmware/controllers/generated/rusefi_generated_alphax-2chan.h @@ -1163,7 +1163,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 2877555107 +#define SIGNATURE_HASH 3827216795 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1501,14 +1501,14 @@ #define ts_show_vr_threshold_all true #define ts_show_vr_threshold_pins false #define ts_show_vvt_output true -#define TS_SIGNATURE "rusEFI master.2024.03.05.alphax-2chan.2877555107" +#define TS_SIGNATURE "rusEFI master.2024.03.05.alphax-2chan.3827216795" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' #define TS_TEST_COMMAND_char t -#define TS_TOTAL_OUTPUT_SIZE 1456 +#define TS_TOTAL_OUTPUT_SIZE 1468 #define TS_TRIGGER_SCOPE_CHANNEL_1_NAME "Channel 1" #define TS_TRIGGER_SCOPE_CHANNEL_2_NAME "Channel 2" #define TS_TRIGGER_SCOPE_DISABLE 5 diff --git a/firmware/controllers/generated/rusefi_generated_alphax-4chan.h b/firmware/controllers/generated/rusefi_generated_alphax-4chan.h index 5cfbd843b1..778f628783 100644 --- a/firmware/controllers/generated/rusefi_generated_alphax-4chan.h +++ b/firmware/controllers/generated/rusefi_generated_alphax-4chan.h @@ -1164,7 +1164,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 3271550142 +#define SIGNATURE_HASH 2372228230 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1502,14 +1502,14 @@ #define ts_show_vr_threshold_all true #define ts_show_vr_threshold_pins false #define ts_show_vvt_output true -#define TS_SIGNATURE "rusEFI master.2024.03.05.alphax-4chan.3271550142" +#define TS_SIGNATURE "rusEFI master.2024.03.05.alphax-4chan.2372228230" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' #define TS_TEST_COMMAND_char t -#define TS_TOTAL_OUTPUT_SIZE 1456 +#define TS_TOTAL_OUTPUT_SIZE 1468 #define TS_TRIGGER_SCOPE_CHANNEL_1_NAME "C2/C3 Crank VR" #define TS_TRIGGER_SCOPE_CHANNEL_2_NAME "E5/E6 Cam VR" #define TS_TRIGGER_SCOPE_DISABLE 5 diff --git a/firmware/controllers/generated/rusefi_generated_alphax-4chan_f7.h b/firmware/controllers/generated/rusefi_generated_alphax-4chan_f7.h index 74f9c4cfaf..e1c6aa36c8 100644 --- a/firmware/controllers/generated/rusefi_generated_alphax-4chan_f7.h +++ b/firmware/controllers/generated/rusefi_generated_alphax-4chan_f7.h @@ -1164,7 +1164,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 3271550142 +#define SIGNATURE_HASH 2372228230 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1502,14 +1502,14 @@ #define ts_show_vr_threshold_all true #define ts_show_vr_threshold_pins false #define ts_show_vvt_output true -#define TS_SIGNATURE "rusEFI master.2024.03.05.alphax-4chan_f7.3271550142" +#define TS_SIGNATURE "rusEFI master.2024.03.05.alphax-4chan_f7.2372228230" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' #define TS_TEST_COMMAND_char t -#define TS_TOTAL_OUTPUT_SIZE 1456 +#define TS_TOTAL_OUTPUT_SIZE 1468 #define TS_TRIGGER_SCOPE_CHANNEL_1_NAME "C2/C3 Crank VR" #define TS_TRIGGER_SCOPE_CHANNEL_2_NAME "E5/E6 Cam VR" #define TS_TRIGGER_SCOPE_DISABLE 5 diff --git a/firmware/controllers/generated/rusefi_generated_alphax-8chan-revA.h b/firmware/controllers/generated/rusefi_generated_alphax-8chan-revA.h index a1968f8e2f..73ff496f87 100644 --- a/firmware/controllers/generated/rusefi_generated_alphax-8chan-revA.h +++ b/firmware/controllers/generated/rusefi_generated_alphax-8chan-revA.h @@ -1163,7 +1163,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 122285346 +#define SIGNATURE_HASH 1221811482 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1501,14 +1501,14 @@ #define ts_show_vr_threshold_all false #define ts_show_vr_threshold_pins true #define ts_show_vvt_output true -#define TS_SIGNATURE "rusEFI master.2024.03.05.alphax-8chan-revA.122285346" +#define TS_SIGNATURE "rusEFI master.2024.03.05.alphax-8chan-revA.1221811482" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' #define TS_TEST_COMMAND_char t -#define TS_TOTAL_OUTPUT_SIZE 1456 +#define TS_TOTAL_OUTPUT_SIZE 1468 #define TS_TRIGGER_SCOPE_CHANNEL_1_NAME "Channel 1" #define TS_TRIGGER_SCOPE_CHANNEL_2_NAME "Channel 2" #define TS_TRIGGER_SCOPE_DISABLE 5 diff --git a/firmware/controllers/generated/rusefi_generated_alphax-8chan.h b/firmware/controllers/generated/rusefi_generated_alphax-8chan.h index c637e834e6..f20f1bf76f 100644 --- a/firmware/controllers/generated/rusefi_generated_alphax-8chan.h +++ b/firmware/controllers/generated/rusefi_generated_alphax-8chan.h @@ -1163,7 +1163,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 1319487505 +#define SIGNATURE_HASH 20936745 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1501,14 +1501,14 @@ #define ts_show_vr_threshold_all true #define ts_show_vr_threshold_pins false #define ts_show_vvt_output true -#define TS_SIGNATURE "rusEFI master.2024.03.05.alphax-8chan.1319487505" +#define TS_SIGNATURE "rusEFI master.2024.03.05.alphax-8chan.20936745" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' #define TS_TEST_COMMAND_char t -#define TS_TOTAL_OUTPUT_SIZE 1456 +#define TS_TOTAL_OUTPUT_SIZE 1468 #define TS_TRIGGER_SCOPE_CHANNEL_1_NAME "Channel 1" #define TS_TRIGGER_SCOPE_CHANNEL_2_NAME "Channel 2" #define TS_TRIGGER_SCOPE_DISABLE 5 diff --git a/firmware/controllers/generated/rusefi_generated_alphax-8chan_f7.h b/firmware/controllers/generated/rusefi_generated_alphax-8chan_f7.h index 9307e4af1d..0a7cc5491c 100644 --- a/firmware/controllers/generated/rusefi_generated_alphax-8chan_f7.h +++ b/firmware/controllers/generated/rusefi_generated_alphax-8chan_f7.h @@ -1163,7 +1163,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 1319487505 +#define SIGNATURE_HASH 20936745 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1501,14 +1501,14 @@ #define ts_show_vr_threshold_all true #define ts_show_vr_threshold_pins false #define ts_show_vvt_output true -#define TS_SIGNATURE "rusEFI master.2024.03.05.alphax-8chan_f7.1319487505" +#define TS_SIGNATURE "rusEFI master.2024.03.05.alphax-8chan_f7.20936745" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' #define TS_TEST_COMMAND_char t -#define TS_TOTAL_OUTPUT_SIZE 1456 +#define TS_TOTAL_OUTPUT_SIZE 1468 #define TS_TRIGGER_SCOPE_CHANNEL_1_NAME "Channel 1" #define TS_TRIGGER_SCOPE_CHANNEL_2_NAME "Channel 2" #define TS_TRIGGER_SCOPE_DISABLE 5 diff --git a/firmware/controllers/generated/rusefi_generated_at_start_f435.h b/firmware/controllers/generated/rusefi_generated_at_start_f435.h index c8a351c2f0..329607353f 100644 --- a/firmware/controllers/generated/rusefi_generated_at_start_f435.h +++ b/firmware/controllers/generated/rusefi_generated_at_start_f435.h @@ -1162,7 +1162,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 1352820405 +#define SIGNATURE_HASH 523818637 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1500,14 +1500,14 @@ #define ts_show_vr_threshold_all false #define ts_show_vr_threshold_pins true #define ts_show_vvt_output true -#define TS_SIGNATURE "rusEFI master.2024.03.05.at_start_f435.1352820405" +#define TS_SIGNATURE "rusEFI master.2024.03.05.at_start_f435.523818637" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' #define TS_TEST_COMMAND_char t -#define TS_TOTAL_OUTPUT_SIZE 1456 +#define TS_TOTAL_OUTPUT_SIZE 1468 #define TS_TRIGGER_SCOPE_CHANNEL_1_NAME "Channel 1" #define TS_TRIGGER_SCOPE_CHANNEL_2_NAME "Channel 2" #define TS_TRIGGER_SCOPE_DISABLE 5 diff --git a/firmware/controllers/generated/rusefi_generated_atlas.h b/firmware/controllers/generated/rusefi_generated_atlas.h index 19a52c46b5..0ea03e5a95 100644 --- a/firmware/controllers/generated/rusefi_generated_atlas.h +++ b/firmware/controllers/generated/rusefi_generated_atlas.h @@ -1162,7 +1162,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 346403579 +#define SIGNATURE_HASH 1530856131 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1500,14 +1500,14 @@ #define ts_show_vr_threshold_all false #define ts_show_vr_threshold_pins true #define ts_show_vvt_output true -#define TS_SIGNATURE "rusEFI master.2024.03.05.atlas.346403579" +#define TS_SIGNATURE "rusEFI master.2024.03.05.atlas.1530856131" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' #define TS_TEST_COMMAND_char t -#define TS_TOTAL_OUTPUT_SIZE 1456 +#define TS_TOTAL_OUTPUT_SIZE 1468 #define TS_TRIGGER_SCOPE_CHANNEL_1_NAME "Channel 1" #define TS_TRIGGER_SCOPE_CHANNEL_2_NAME "Channel 2" #define TS_TRIGGER_SCOPE_DISABLE 5 diff --git a/firmware/controllers/generated/rusefi_generated_f407-discovery.h b/firmware/controllers/generated/rusefi_generated_f407-discovery.h index 461375fa25..a1703946c5 100644 --- a/firmware/controllers/generated/rusefi_generated_f407-discovery.h +++ b/firmware/controllers/generated/rusefi_generated_f407-discovery.h @@ -1162,7 +1162,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets true -#define SIGNATURE_HASH 3808613738 +#define SIGNATURE_HASH 2895668562 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1500,14 +1500,14 @@ #define ts_show_vr_threshold_all true #define ts_show_vr_threshold_pins true #define ts_show_vvt_output true -#define TS_SIGNATURE "rusEFI master.2024.03.05.f407-discovery.3808613738" +#define TS_SIGNATURE "rusEFI master.2024.03.05.f407-discovery.2895668562" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' #define TS_TEST_COMMAND_char t -#define TS_TOTAL_OUTPUT_SIZE 1456 +#define TS_TOTAL_OUTPUT_SIZE 1468 #define TS_TRIGGER_SCOPE_CHANNEL_1_NAME "Channel 1" #define TS_TRIGGER_SCOPE_CHANNEL_2_NAME "Channel 2" #define TS_TRIGGER_SCOPE_DISABLE 5 diff --git a/firmware/controllers/generated/rusefi_generated_f429-discovery.h b/firmware/controllers/generated/rusefi_generated_f429-discovery.h index cf14d4eda4..b288f20aab 100644 --- a/firmware/controllers/generated/rusefi_generated_f429-discovery.h +++ b/firmware/controllers/generated/rusefi_generated_f429-discovery.h @@ -1162,7 +1162,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 1352820405 +#define SIGNATURE_HASH 523818637 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1500,14 +1500,14 @@ #define ts_show_vr_threshold_all false #define ts_show_vr_threshold_pins true #define ts_show_vvt_output true -#define TS_SIGNATURE "rusEFI master.2024.03.05.f429-discovery.1352820405" +#define TS_SIGNATURE "rusEFI master.2024.03.05.f429-discovery.523818637" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' #define TS_TEST_COMMAND_char t -#define TS_TOTAL_OUTPUT_SIZE 1456 +#define TS_TOTAL_OUTPUT_SIZE 1468 #define TS_TRIGGER_SCOPE_CHANNEL_1_NAME "Channel 1" #define TS_TRIGGER_SCOPE_CHANNEL_2_NAME "Channel 2" #define TS_TRIGGER_SCOPE_DISABLE 5 diff --git a/firmware/controllers/generated/rusefi_generated_f469-discovery.h b/firmware/controllers/generated/rusefi_generated_f469-discovery.h index 9d42f40698..56edd69b1b 100644 --- a/firmware/controllers/generated/rusefi_generated_f469-discovery.h +++ b/firmware/controllers/generated/rusefi_generated_f469-discovery.h @@ -1162,7 +1162,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 1651859494 +#define SIGNATURE_HASH 770691102 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1500,14 +1500,14 @@ #define ts_show_vr_threshold_all false #define ts_show_vr_threshold_pins true #define ts_show_vvt_output true -#define TS_SIGNATURE "rusEFI master.2024.03.05.f469-discovery.1651859494" +#define TS_SIGNATURE "rusEFI master.2024.03.05.f469-discovery.770691102" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' #define TS_TEST_COMMAND_char t -#define TS_TOTAL_OUTPUT_SIZE 1456 +#define TS_TOTAL_OUTPUT_SIZE 1468 #define TS_TRIGGER_SCOPE_CHANNEL_1_NAME "Channel 1" #define TS_TRIGGER_SCOPE_CHANNEL_2_NAME "Channel 2" #define TS_TRIGGER_SCOPE_DISABLE 5 diff --git a/firmware/controllers/generated/rusefi_generated_frankenso_na6.h b/firmware/controllers/generated/rusefi_generated_frankenso_na6.h index 436aa97920..33a8dadc8e 100644 --- a/firmware/controllers/generated/rusefi_generated_frankenso_na6.h +++ b/firmware/controllers/generated/rusefi_generated_frankenso_na6.h @@ -1162,7 +1162,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets true -#define SIGNATURE_HASH 102830766 +#define SIGNATURE_HASH 1237033622 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1500,14 +1500,14 @@ #define ts_show_vr_threshold_all false #define ts_show_vr_threshold_pins true #define ts_show_vvt_output true -#define TS_SIGNATURE "rusEFI master.2024.03.05.frankenso_na6.102830766" +#define TS_SIGNATURE "rusEFI master.2024.03.05.frankenso_na6.1237033622" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' #define TS_TEST_COMMAND_char t -#define TS_TOTAL_OUTPUT_SIZE 1456 +#define TS_TOTAL_OUTPUT_SIZE 1468 #define TS_TRIGGER_SCOPE_CHANNEL_1_NAME "Channel 1" #define TS_TRIGGER_SCOPE_CHANNEL_2_NAME "Channel 2" #define TS_TRIGGER_SCOPE_DISABLE 5 diff --git a/firmware/controllers/generated/rusefi_generated_hellen-112-17.h b/firmware/controllers/generated/rusefi_generated_hellen-112-17.h index cd0210e5ff..d310b35996 100644 --- a/firmware/controllers/generated/rusefi_generated_hellen-112-17.h +++ b/firmware/controllers/generated/rusefi_generated_hellen-112-17.h @@ -1163,7 +1163,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 3651862065 +#define SIGNATURE_HASH 2519748105 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1501,14 +1501,14 @@ #define ts_show_vr_threshold_all false #define ts_show_vr_threshold_pins true #define ts_show_vvt_output true -#define TS_SIGNATURE "rusEFI master.2024.03.05.hellen-112-17.3651862065" +#define TS_SIGNATURE "rusEFI master.2024.03.05.hellen-112-17.2519748105" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' #define TS_TEST_COMMAND_char t -#define TS_TOTAL_OUTPUT_SIZE 1456 +#define TS_TOTAL_OUTPUT_SIZE 1468 #define TS_TRIGGER_SCOPE_CHANNEL_1_NAME "Channel 1" #define TS_TRIGGER_SCOPE_CHANNEL_2_NAME "Channel 2" #define TS_TRIGGER_SCOPE_DISABLE 5 diff --git a/firmware/controllers/generated/rusefi_generated_hellen-gm-e67.h b/firmware/controllers/generated/rusefi_generated_hellen-gm-e67.h index 7533d91ad9..9c1c3f1c81 100644 --- a/firmware/controllers/generated/rusefi_generated_hellen-gm-e67.h +++ b/firmware/controllers/generated/rusefi_generated_hellen-gm-e67.h @@ -1162,7 +1162,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 2631598349 +#define SIGNATURE_HASH 3544297781 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1500,14 +1500,14 @@ #define ts_show_vr_threshold_all false #define ts_show_vr_threshold_pins true #define ts_show_vvt_output true -#define TS_SIGNATURE "rusEFI master.2024.03.05.hellen-gm-e67.2631598349" +#define TS_SIGNATURE "rusEFI master.2024.03.05.hellen-gm-e67.3544297781" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' #define TS_TEST_COMMAND_char t -#define TS_TOTAL_OUTPUT_SIZE 1456 +#define TS_TOTAL_OUTPUT_SIZE 1468 #define TS_TRIGGER_SCOPE_CHANNEL_1_NAME "Channel 1" #define TS_TRIGGER_SCOPE_CHANNEL_2_NAME "Channel 2" #define TS_TRIGGER_SCOPE_DISABLE 5 diff --git a/firmware/controllers/generated/rusefi_generated_hellen-honda-k.h b/firmware/controllers/generated/rusefi_generated_hellen-honda-k.h index a7907a069b..6c1ec0e366 100644 --- a/firmware/controllers/generated/rusefi_generated_hellen-honda-k.h +++ b/firmware/controllers/generated/rusefi_generated_hellen-honda-k.h @@ -1163,7 +1163,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 469729204 +#define SIGNATURE_HASH 1415958412 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1502,14 +1502,14 @@ #define ts_show_vr_threshold_all false #define ts_show_vr_threshold_pins true #define ts_show_vvt_output true -#define TS_SIGNATURE "rusEFI master.2024.03.05.hellen-honda-k.469729204" +#define TS_SIGNATURE "rusEFI master.2024.03.05.hellen-honda-k.1415958412" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' #define TS_TEST_COMMAND_char t -#define TS_TOTAL_OUTPUT_SIZE 1456 +#define TS_TOTAL_OUTPUT_SIZE 1468 #define TS_TRIGGER_SCOPE_CHANNEL_1_NAME "Channel 1" #define TS_TRIGGER_SCOPE_CHANNEL_2_NAME "Channel 2" #define TS_TRIGGER_SCOPE_DISABLE 5 diff --git a/firmware/controllers/generated/rusefi_generated_hellen-nb1.h b/firmware/controllers/generated/rusefi_generated_hellen-nb1.h index d5b3aa5741..87b7d31700 100644 --- a/firmware/controllers/generated/rusefi_generated_hellen-nb1.h +++ b/firmware/controllers/generated/rusefi_generated_hellen-nb1.h @@ -1163,7 +1163,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 3116011669 +#define SIGNATURE_HASH 4129300653 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1501,14 +1501,14 @@ #define ts_show_vr_threshold_all false #define ts_show_vr_threshold_pins true #define ts_show_vvt_output true -#define TS_SIGNATURE "rusEFI master.2024.03.05.hellen-nb1.3116011669" +#define TS_SIGNATURE "rusEFI master.2024.03.05.hellen-nb1.4129300653" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' #define TS_TEST_COMMAND_char t -#define TS_TOTAL_OUTPUT_SIZE 1456 +#define TS_TOTAL_OUTPUT_SIZE 1468 #define TS_TRIGGER_SCOPE_CHANNEL_1_NAME "Channel 1" #define TS_TRIGGER_SCOPE_CHANNEL_2_NAME "Channel 2" #define TS_TRIGGER_SCOPE_DISABLE 5 diff --git a/firmware/controllers/generated/rusefi_generated_hellen121nissan.h b/firmware/controllers/generated/rusefi_generated_hellen121nissan.h index 8c7496621e..290697beeb 100644 --- a/firmware/controllers/generated/rusefi_generated_hellen121nissan.h +++ b/firmware/controllers/generated/rusefi_generated_hellen121nissan.h @@ -1163,7 +1163,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 2098776226 +#define SIGNATURE_HASH 847411354 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1501,14 +1501,14 @@ #define ts_show_vr_threshold_all false #define ts_show_vr_threshold_pins true #define ts_show_vvt_output true -#define TS_SIGNATURE "rusEFI master.2024.03.05.hellen121nissan.2098776226" +#define TS_SIGNATURE "rusEFI master.2024.03.05.hellen121nissan.847411354" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' #define TS_TEST_COMMAND_char t -#define TS_TOTAL_OUTPUT_SIZE 1456 +#define TS_TOTAL_OUTPUT_SIZE 1468 #define TS_TRIGGER_SCOPE_CHANNEL_1_NAME "Channel 1" #define TS_TRIGGER_SCOPE_CHANNEL_2_NAME "Channel 2" #define TS_TRIGGER_SCOPE_DISABLE 5 diff --git a/firmware/controllers/generated/rusefi_generated_hellen121vag.h b/firmware/controllers/generated/rusefi_generated_hellen121vag.h index e85dd29a3f..2be4fd3471 100644 --- a/firmware/controllers/generated/rusefi_generated_hellen121vag.h +++ b/firmware/controllers/generated/rusefi_generated_hellen121vag.h @@ -1163,7 +1163,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 1624996691 +#define SIGNATURE_HASH 792841067 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1501,14 +1501,14 @@ #define ts_show_vr_threshold_all false #define ts_show_vr_threshold_pins true #define ts_show_vvt_output true -#define TS_SIGNATURE "rusEFI master.2024.03.05.hellen121vag.1624996691" +#define TS_SIGNATURE "rusEFI master.2024.03.05.hellen121vag.792841067" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' #define TS_TEST_COMMAND_char t -#define TS_TOTAL_OUTPUT_SIZE 1456 +#define TS_TOTAL_OUTPUT_SIZE 1468 #define TS_TRIGGER_SCOPE_CHANNEL_1_NAME "Channel 1" #define TS_TRIGGER_SCOPE_CHANNEL_2_NAME "Channel 2" #define TS_TRIGGER_SCOPE_DISABLE 5 diff --git a/firmware/controllers/generated/rusefi_generated_hellen128.h b/firmware/controllers/generated/rusefi_generated_hellen128.h index f5afaba300..17e6da3843 100644 --- a/firmware/controllers/generated/rusefi_generated_hellen128.h +++ b/firmware/controllers/generated/rusefi_generated_hellen128.h @@ -1163,7 +1163,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 3174059074 +#define SIGNATURE_HASH 4071292026 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1501,14 +1501,14 @@ #define ts_show_vr_threshold_all false #define ts_show_vr_threshold_pins true #define ts_show_vvt_output true -#define TS_SIGNATURE "rusEFI master.2024.03.05.hellen128.3174059074" +#define TS_SIGNATURE "rusEFI master.2024.03.05.hellen128.4071292026" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' #define TS_TEST_COMMAND_char t -#define TS_TOTAL_OUTPUT_SIZE 1456 +#define TS_TOTAL_OUTPUT_SIZE 1468 #define TS_TRIGGER_SCOPE_CHANNEL_1_NAME "Channel 1" #define TS_TRIGGER_SCOPE_CHANNEL_2_NAME "Channel 2" #define TS_TRIGGER_SCOPE_DISABLE 5 diff --git a/firmware/controllers/generated/rusefi_generated_hellen154hyundai.h b/firmware/controllers/generated/rusefi_generated_hellen154hyundai.h index 2550f32d6f..4a1a68d4c2 100644 --- a/firmware/controllers/generated/rusefi_generated_hellen154hyundai.h +++ b/firmware/controllers/generated/rusefi_generated_hellen154hyundai.h @@ -1163,7 +1163,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 1949760771 +#define SIGNATURE_HASH 1001147707 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1501,14 +1501,14 @@ #define ts_show_vr_threshold_all false #define ts_show_vr_threshold_pins true #define ts_show_vvt_output true -#define TS_SIGNATURE "rusEFI master.2024.03.05.hellen154hyundai.1949760771" +#define TS_SIGNATURE "rusEFI master.2024.03.05.hellen154hyundai.1001147707" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' #define TS_TEST_COMMAND_char t -#define TS_TOTAL_OUTPUT_SIZE 1456 +#define TS_TOTAL_OUTPUT_SIZE 1468 #define TS_TRIGGER_SCOPE_CHANNEL_1_NAME "Channel 1" #define TS_TRIGGER_SCOPE_CHANNEL_2_NAME "Channel 2" #define TS_TRIGGER_SCOPE_DISABLE 5 diff --git a/firmware/controllers/generated/rusefi_generated_hellen72.h b/firmware/controllers/generated/rusefi_generated_hellen72.h index b1951afe5e..b1613e7e98 100644 --- a/firmware/controllers/generated/rusefi_generated_hellen72.h +++ b/firmware/controllers/generated/rusefi_generated_hellen72.h @@ -1163,7 +1163,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 3494089257 +#define SIGNATURE_HASH 2681807377 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1501,14 +1501,14 @@ #define ts_show_vr_threshold_all false #define ts_show_vr_threshold_pins true #define ts_show_vvt_output true -#define TS_SIGNATURE "rusEFI master.2024.03.05.hellen72.3494089257" +#define TS_SIGNATURE "rusEFI master.2024.03.05.hellen72.2681807377" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' #define TS_TEST_COMMAND_char t -#define TS_TOTAL_OUTPUT_SIZE 1456 +#define TS_TOTAL_OUTPUT_SIZE 1468 #define TS_TRIGGER_SCOPE_CHANNEL_1_NAME "Channel 1" #define TS_TRIGGER_SCOPE_CHANNEL_2_NAME "Channel 2" #define TS_TRIGGER_SCOPE_DISABLE 5 diff --git a/firmware/controllers/generated/rusefi_generated_hellen81.h b/firmware/controllers/generated/rusefi_generated_hellen81.h index c61dd97a85..eafd4936f0 100644 --- a/firmware/controllers/generated/rusefi_generated_hellen81.h +++ b/firmware/controllers/generated/rusefi_generated_hellen81.h @@ -1162,7 +1162,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 892532307 +#define SIGNATURE_HASH 2057848427 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1500,14 +1500,14 @@ #define ts_show_vr_threshold_all false #define ts_show_vr_threshold_pins true #define ts_show_vvt_output true -#define TS_SIGNATURE "rusEFI master.2024.03.05.hellen81.892532307" +#define TS_SIGNATURE "rusEFI master.2024.03.05.hellen81.2057848427" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' #define TS_TEST_COMMAND_char t -#define TS_TOTAL_OUTPUT_SIZE 1456 +#define TS_TOTAL_OUTPUT_SIZE 1468 #define TS_TRIGGER_SCOPE_CHANNEL_1_NAME "Channel 1" #define TS_TRIGGER_SCOPE_CHANNEL_2_NAME "Channel 2" #define TS_TRIGGER_SCOPE_DISABLE 5 diff --git a/firmware/controllers/generated/rusefi_generated_hellen88bmw.h b/firmware/controllers/generated/rusefi_generated_hellen88bmw.h index b47ca53184..1da1377935 100644 --- a/firmware/controllers/generated/rusefi_generated_hellen88bmw.h +++ b/firmware/controllers/generated/rusefi_generated_hellen88bmw.h @@ -1163,7 +1163,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 571597584 +#define SIGNATURE_HASH 1837847336 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1501,14 +1501,14 @@ #define ts_show_vr_threshold_all false #define ts_show_vr_threshold_pins true #define ts_show_vvt_output false -#define TS_SIGNATURE "rusEFI master.2024.03.05.hellen88bmw.571597584" +#define TS_SIGNATURE "rusEFI master.2024.03.05.hellen88bmw.1837847336" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' #define TS_TEST_COMMAND_char t -#define TS_TOTAL_OUTPUT_SIZE 1456 +#define TS_TOTAL_OUTPUT_SIZE 1468 #define TS_TRIGGER_SCOPE_CHANNEL_1_NAME "Channel 1" #define TS_TRIGGER_SCOPE_CHANNEL_2_NAME "Channel 2" #define TS_TRIGGER_SCOPE_DISABLE 5 diff --git a/firmware/controllers/generated/rusefi_generated_hellenNA6.h b/firmware/controllers/generated/rusefi_generated_hellenNA6.h index 9e1459cb64..dbf52bb40c 100644 --- a/firmware/controllers/generated/rusefi_generated_hellenNA6.h +++ b/firmware/controllers/generated/rusefi_generated_hellenNA6.h @@ -1163,7 +1163,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 3288827221 +#define SIGNATURE_HASH 2342335853 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1501,14 +1501,14 @@ #define ts_show_vr_threshold_all false #define ts_show_vr_threshold_pins true #define ts_show_vvt_output true -#define TS_SIGNATURE "rusEFI master.2024.03.05.hellenNA6.3288827221" +#define TS_SIGNATURE "rusEFI master.2024.03.05.hellenNA6.2342335853" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' #define TS_TEST_COMMAND_char t -#define TS_TOTAL_OUTPUT_SIZE 1456 +#define TS_TOTAL_OUTPUT_SIZE 1468 #define TS_TRIGGER_SCOPE_CHANNEL_1_NAME "Channel 1" #define TS_TRIGGER_SCOPE_CHANNEL_2_NAME "Channel 2" #define TS_TRIGGER_SCOPE_DISABLE 5 diff --git a/firmware/controllers/generated/rusefi_generated_hellenNA8_96.h b/firmware/controllers/generated/rusefi_generated_hellenNA8_96.h index e15d180b3f..d15db41194 100644 --- a/firmware/controllers/generated/rusefi_generated_hellenNA8_96.h +++ b/firmware/controllers/generated/rusefi_generated_hellenNA8_96.h @@ -1164,7 +1164,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 1004390299 +#define SIGNATURE_HASH 1950840739 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1502,14 +1502,14 @@ #define ts_show_vr_threshold_all false #define ts_show_vr_threshold_pins true #define ts_show_vvt_output true -#define TS_SIGNATURE "rusEFI master.2024.03.05.hellenNA8_96.1004390299" +#define TS_SIGNATURE "rusEFI master.2024.03.05.hellenNA8_96.1950840739" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' #define TS_TEST_COMMAND_char t -#define TS_TOTAL_OUTPUT_SIZE 1456 +#define TS_TOTAL_OUTPUT_SIZE 1468 #define TS_TRIGGER_SCOPE_CHANNEL_1_NAME "Channel 1" #define TS_TRIGGER_SCOPE_CHANNEL_2_NAME "Channel 2" #define TS_TRIGGER_SCOPE_DISABLE 5 diff --git a/firmware/controllers/generated/rusefi_generated_m74_9.h b/firmware/controllers/generated/rusefi_generated_m74_9.h index afbd1a0b36..199fbc52d6 100644 --- a/firmware/controllers/generated/rusefi_generated_m74_9.h +++ b/firmware/controllers/generated/rusefi_generated_m74_9.h @@ -1162,7 +1162,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 320434468 +#define SIGNATURE_HASH 1552138524 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1501,14 +1501,14 @@ #define ts_show_vr_threshold_all false #define ts_show_vr_threshold_pins true #define ts_show_vvt_output true -#define TS_SIGNATURE "rusEFI master.2024.03.05.m74_9.320434468" +#define TS_SIGNATURE "rusEFI master.2024.03.05.m74_9.1552138524" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' #define TS_TEST_COMMAND_char t -#define TS_TOTAL_OUTPUT_SIZE 1456 +#define TS_TOTAL_OUTPUT_SIZE 1468 #define TS_TRIGGER_SCOPE_CHANNEL_1_NAME "Channel 1" #define TS_TRIGGER_SCOPE_CHANNEL_2_NAME "Channel 2" #define TS_TRIGGER_SCOPE_DISABLE 5 diff --git a/firmware/controllers/generated/rusefi_generated_mre_f4.h b/firmware/controllers/generated/rusefi_generated_mre_f4.h index 563b9a5769..74e5bbb862 100644 --- a/firmware/controllers/generated/rusefi_generated_mre_f4.h +++ b/firmware/controllers/generated/rusefi_generated_mre_f4.h @@ -1163,7 +1163,7 @@ #define show_microRusEFI_presets true #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 498645039 +#define SIGNATURE_HASH 1377962007 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1501,14 +1501,14 @@ #define ts_show_vr_threshold_all false #define ts_show_vr_threshold_pins true #define ts_show_vvt_output true -#define TS_SIGNATURE "rusEFI master.2024.03.05.mre_f4.498645039" +#define TS_SIGNATURE "rusEFI master.2024.03.05.mre_f4.1377962007" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' #define TS_TEST_COMMAND_char t -#define TS_TOTAL_OUTPUT_SIZE 1456 +#define TS_TOTAL_OUTPUT_SIZE 1468 #define TS_TRIGGER_SCOPE_CHANNEL_1_NAME "Channel 1" #define TS_TRIGGER_SCOPE_CHANNEL_2_NAME "Channel 2" #define TS_TRIGGER_SCOPE_DISABLE 5 diff --git a/firmware/controllers/generated/rusefi_generated_mre_f7.h b/firmware/controllers/generated/rusefi_generated_mre_f7.h index 1778bb1e75..9bced89365 100644 --- a/firmware/controllers/generated/rusefi_generated_mre_f7.h +++ b/firmware/controllers/generated/rusefi_generated_mre_f7.h @@ -1163,7 +1163,7 @@ #define show_microRusEFI_presets true #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 498645039 +#define SIGNATURE_HASH 1377962007 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1501,14 +1501,14 @@ #define ts_show_vr_threshold_all false #define ts_show_vr_threshold_pins true #define ts_show_vvt_output true -#define TS_SIGNATURE "rusEFI master.2024.03.05.mre_f7.498645039" +#define TS_SIGNATURE "rusEFI master.2024.03.05.mre_f7.1377962007" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' #define TS_TEST_COMMAND_char t -#define TS_TOTAL_OUTPUT_SIZE 1456 +#define TS_TOTAL_OUTPUT_SIZE 1468 #define TS_TRIGGER_SCOPE_CHANNEL_1_NAME "Channel 1" #define TS_TRIGGER_SCOPE_CHANNEL_2_NAME "Channel 2" #define TS_TRIGGER_SCOPE_DISABLE 5 diff --git a/firmware/controllers/generated/rusefi_generated_nucleo_h743.h b/firmware/controllers/generated/rusefi_generated_nucleo_h743.h index 2a5d2247dc..cbdd0f8236 100644 --- a/firmware/controllers/generated/rusefi_generated_nucleo_h743.h +++ b/firmware/controllers/generated/rusefi_generated_nucleo_h743.h @@ -1162,7 +1162,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 1352820405 +#define SIGNATURE_HASH 523818637 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1500,14 +1500,14 @@ #define ts_show_vr_threshold_all false #define ts_show_vr_threshold_pins true #define ts_show_vvt_output true -#define TS_SIGNATURE "rusEFI master.2024.03.05.nucleo_h743.1352820405" +#define TS_SIGNATURE "rusEFI master.2024.03.05.nucleo_h743.523818637" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' #define TS_TEST_COMMAND_char t -#define TS_TOTAL_OUTPUT_SIZE 1456 +#define TS_TOTAL_OUTPUT_SIZE 1468 #define TS_TRIGGER_SCOPE_CHANNEL_1_NAME "Channel 1" #define TS_TRIGGER_SCOPE_CHANNEL_2_NAME "Channel 2" #define TS_TRIGGER_SCOPE_DISABLE 5 diff --git a/firmware/controllers/generated/rusefi_generated_prometheus_405.h b/firmware/controllers/generated/rusefi_generated_prometheus_405.h index ebb7f00c74..6bc39c8c42 100644 --- a/firmware/controllers/generated/rusefi_generated_prometheus_405.h +++ b/firmware/controllers/generated/rusefi_generated_prometheus_405.h @@ -1162,7 +1162,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 1614195493 +#define SIGNATURE_HASH 799808285 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1500,14 +1500,14 @@ #define ts_show_vr_threshold_all false #define ts_show_vr_threshold_pins true #define ts_show_vvt_output true -#define TS_SIGNATURE "rusEFI master.2024.03.05.prometheus_405.1614195493" +#define TS_SIGNATURE "rusEFI master.2024.03.05.prometheus_405.799808285" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' #define TS_TEST_COMMAND_char t -#define TS_TOTAL_OUTPUT_SIZE 1456 +#define TS_TOTAL_OUTPUT_SIZE 1468 #define TS_TRIGGER_SCOPE_CHANNEL_1_NAME "Channel 1" #define TS_TRIGGER_SCOPE_CHANNEL_2_NAME "Channel 2" #define TS_TRIGGER_SCOPE_DISABLE 5 diff --git a/firmware/controllers/generated/rusefi_generated_prometheus_469.h b/firmware/controllers/generated/rusefi_generated_prometheus_469.h index dc5ca35493..1af32c7cb7 100644 --- a/firmware/controllers/generated/rusefi_generated_prometheus_469.h +++ b/firmware/controllers/generated/rusefi_generated_prometheus_469.h @@ -1162,7 +1162,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 1614195493 +#define SIGNATURE_HASH 799808285 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1500,14 +1500,14 @@ #define ts_show_vr_threshold_all false #define ts_show_vr_threshold_pins true #define ts_show_vvt_output true -#define TS_SIGNATURE "rusEFI master.2024.03.05.prometheus_469.1614195493" +#define TS_SIGNATURE "rusEFI master.2024.03.05.prometheus_469.799808285" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' #define TS_TEST_COMMAND_char t -#define TS_TOTAL_OUTPUT_SIZE 1456 +#define TS_TOTAL_OUTPUT_SIZE 1468 #define TS_TRIGGER_SCOPE_CHANNEL_1_NAME "Channel 1" #define TS_TRIGGER_SCOPE_CHANNEL_2_NAME "Channel 2" #define TS_TRIGGER_SCOPE_DISABLE 5 diff --git a/firmware/controllers/generated/rusefi_generated_proteus_f4.h b/firmware/controllers/generated/rusefi_generated_proteus_f4.h index 1632efd3b6..46c7a58652 100644 --- a/firmware/controllers/generated/rusefi_generated_proteus_f4.h +++ b/firmware/controllers/generated/rusefi_generated_proteus_f4.h @@ -1162,7 +1162,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets true #define show_test_presets false -#define SIGNATURE_HASH 3488186380 +#define SIGNATURE_HASH 2155032628 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1500,14 +1500,14 @@ #define ts_show_vr_threshold_all false #define ts_show_vr_threshold_pins true #define ts_show_vvt_output true -#define TS_SIGNATURE "rusEFI master.2024.03.05.proteus_f4.3488186380" +#define TS_SIGNATURE "rusEFI master.2024.03.05.proteus_f4.2155032628" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' #define TS_TEST_COMMAND_char t -#define TS_TOTAL_OUTPUT_SIZE 1456 +#define TS_TOTAL_OUTPUT_SIZE 1468 #define TS_TRIGGER_SCOPE_CHANNEL_1_NAME "Channel 1" #define TS_TRIGGER_SCOPE_CHANNEL_2_NAME "Channel 2" #define TS_TRIGGER_SCOPE_DISABLE 5 diff --git a/firmware/controllers/generated/rusefi_generated_proteus_f7.h b/firmware/controllers/generated/rusefi_generated_proteus_f7.h index b252efb5b9..542b386b2e 100644 --- a/firmware/controllers/generated/rusefi_generated_proteus_f7.h +++ b/firmware/controllers/generated/rusefi_generated_proteus_f7.h @@ -1162,7 +1162,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets true #define show_test_presets false -#define SIGNATURE_HASH 3488186380 +#define SIGNATURE_HASH 2155032628 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1500,14 +1500,14 @@ #define ts_show_vr_threshold_all false #define ts_show_vr_threshold_pins true #define ts_show_vvt_output true -#define TS_SIGNATURE "rusEFI master.2024.03.05.proteus_f7.3488186380" +#define TS_SIGNATURE "rusEFI master.2024.03.05.proteus_f7.2155032628" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' #define TS_TEST_COMMAND_char t -#define TS_TOTAL_OUTPUT_SIZE 1456 +#define TS_TOTAL_OUTPUT_SIZE 1468 #define TS_TRIGGER_SCOPE_CHANNEL_1_NAME "Channel 1" #define TS_TRIGGER_SCOPE_CHANNEL_2_NAME "Channel 2" #define TS_TRIGGER_SCOPE_DISABLE 5 diff --git a/firmware/controllers/generated/rusefi_generated_proteus_h7.h b/firmware/controllers/generated/rusefi_generated_proteus_h7.h index 0176e7194e..35cfe1d5b3 100644 --- a/firmware/controllers/generated/rusefi_generated_proteus_h7.h +++ b/firmware/controllers/generated/rusefi_generated_proteus_h7.h @@ -1162,7 +1162,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets true #define show_test_presets false -#define SIGNATURE_HASH 3488186380 +#define SIGNATURE_HASH 2155032628 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1500,14 +1500,14 @@ #define ts_show_vr_threshold_all false #define ts_show_vr_threshold_pins true #define ts_show_vvt_output true -#define TS_SIGNATURE "rusEFI master.2024.03.05.proteus_h7.3488186380" +#define TS_SIGNATURE "rusEFI master.2024.03.05.proteus_h7.2155032628" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' #define TS_TEST_COMMAND_char t -#define TS_TOTAL_OUTPUT_SIZE 1456 +#define TS_TOTAL_OUTPUT_SIZE 1468 #define TS_TRIGGER_SCOPE_CHANNEL_1_NAME "Channel 1" #define TS_TRIGGER_SCOPE_CHANNEL_2_NAME "Channel 2" #define TS_TRIGGER_SCOPE_DISABLE 5 diff --git a/firmware/controllers/generated/rusefi_generated_s105.h b/firmware/controllers/generated/rusefi_generated_s105.h index 9d21053991..57858a3694 100644 --- a/firmware/controllers/generated/rusefi_generated_s105.h +++ b/firmware/controllers/generated/rusefi_generated_s105.h @@ -1162,7 +1162,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 381904304 +#define SIGNATURE_HASH 1499059592 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1501,14 +1501,14 @@ #define ts_show_vr_threshold_all false #define ts_show_vr_threshold_pins true #define ts_show_vvt_output true -#define TS_SIGNATURE "rusEFI master.2024.03.05.s105.381904304" +#define TS_SIGNATURE "rusEFI master.2024.03.05.s105.1499059592" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' #define TS_TEST_COMMAND_char t -#define TS_TOTAL_OUTPUT_SIZE 1456 +#define TS_TOTAL_OUTPUT_SIZE 1468 #define TS_TRIGGER_SCOPE_CHANNEL_1_NAME "Channel 1" #define TS_TRIGGER_SCOPE_CHANNEL_2_NAME "Channel 2" #define TS_TRIGGER_SCOPE_DISABLE 5 diff --git a/firmware/controllers/generated/rusefi_generated_small-can-board.h b/firmware/controllers/generated/rusefi_generated_small-can-board.h index fd78a56800..dde3b4a4ff 100644 --- a/firmware/controllers/generated/rusefi_generated_small-can-board.h +++ b/firmware/controllers/generated/rusefi_generated_small-can-board.h @@ -1163,7 +1163,7 @@ #define show_Proteus_presets false #define show_small_can_board_presets true #define show_test_presets false -#define SIGNATURE_HASH 1845733948 +#define SIGNATURE_HASH 563681796 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1502,14 +1502,14 @@ #define ts_show_vr_threshold_all false #define ts_show_vr_threshold_pins true #define ts_show_vvt_output true -#define TS_SIGNATURE "rusEFI master.2024.03.05.small-can-board.1845733948" +#define TS_SIGNATURE "rusEFI master.2024.03.05.small-can-board.563681796" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' #define TS_TEST_COMMAND_char t -#define TS_TOTAL_OUTPUT_SIZE 1456 +#define TS_TOTAL_OUTPUT_SIZE 1468 #define TS_TRIGGER_SCOPE_CHANNEL_1_NAME "Channel 1" #define TS_TRIGGER_SCOPE_CHANNEL_2_NAME "Channel 2" #define TS_TRIGGER_SCOPE_DISABLE 5 diff --git a/firmware/controllers/generated/rusefi_generated_stm32f413_nucleo.h b/firmware/controllers/generated/rusefi_generated_stm32f413_nucleo.h index 1d7b876ac1..458ad3283f 100644 --- a/firmware/controllers/generated/rusefi_generated_stm32f413_nucleo.h +++ b/firmware/controllers/generated/rusefi_generated_stm32f413_nucleo.h @@ -1162,7 +1162,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 1352820405 +#define SIGNATURE_HASH 523818637 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1500,14 +1500,14 @@ #define ts_show_vr_threshold_all false #define ts_show_vr_threshold_pins true #define ts_show_vvt_output true -#define TS_SIGNATURE "rusEFI master.2024.03.05.stm32f413_nucleo.1352820405" +#define TS_SIGNATURE "rusEFI master.2024.03.05.stm32f413_nucleo.523818637" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' #define TS_TEST_COMMAND_char t -#define TS_TOTAL_OUTPUT_SIZE 1456 +#define TS_TOTAL_OUTPUT_SIZE 1468 #define TS_TRIGGER_SCOPE_CHANNEL_1_NAME "Channel 1" #define TS_TRIGGER_SCOPE_CHANNEL_2_NAME "Channel 2" #define TS_TRIGGER_SCOPE_DISABLE 5 diff --git a/firmware/controllers/generated/rusefi_generated_stm32f429_nucleo.h b/firmware/controllers/generated/rusefi_generated_stm32f429_nucleo.h index be1439e917..16734549c9 100644 --- a/firmware/controllers/generated/rusefi_generated_stm32f429_nucleo.h +++ b/firmware/controllers/generated/rusefi_generated_stm32f429_nucleo.h @@ -1162,7 +1162,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 1352820405 +#define SIGNATURE_HASH 523818637 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1500,14 +1500,14 @@ #define ts_show_vr_threshold_all false #define ts_show_vr_threshold_pins true #define ts_show_vvt_output true -#define TS_SIGNATURE "rusEFI master.2024.03.05.stm32f429_nucleo.1352820405" +#define TS_SIGNATURE "rusEFI master.2024.03.05.stm32f429_nucleo.523818637" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' #define TS_TEST_COMMAND_char t -#define TS_TOTAL_OUTPUT_SIZE 1456 +#define TS_TOTAL_OUTPUT_SIZE 1468 #define TS_TRIGGER_SCOPE_CHANNEL_1_NAME "Channel 1" #define TS_TRIGGER_SCOPE_CHANNEL_2_NAME "Channel 2" #define TS_TRIGGER_SCOPE_DISABLE 5 diff --git a/firmware/controllers/generated/rusefi_generated_stm32f767_nucleo.h b/firmware/controllers/generated/rusefi_generated_stm32f767_nucleo.h index 6e86f6f565..bdc2326436 100644 --- a/firmware/controllers/generated/rusefi_generated_stm32f767_nucleo.h +++ b/firmware/controllers/generated/rusefi_generated_stm32f767_nucleo.h @@ -1162,7 +1162,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 1352820405 +#define SIGNATURE_HASH 523818637 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1500,14 +1500,14 @@ #define ts_show_vr_threshold_all false #define ts_show_vr_threshold_pins true #define ts_show_vvt_output true -#define TS_SIGNATURE "rusEFI master.2024.03.05.stm32f767_nucleo.1352820405" +#define TS_SIGNATURE "rusEFI master.2024.03.05.stm32f767_nucleo.523818637" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' #define TS_TEST_COMMAND_char t -#define TS_TOTAL_OUTPUT_SIZE 1456 +#define TS_TOTAL_OUTPUT_SIZE 1468 #define TS_TRIGGER_SCOPE_CHANNEL_1_NAME "Channel 1" #define TS_TRIGGER_SCOPE_CHANNEL_2_NAME "Channel 2" #define TS_TRIGGER_SCOPE_DISABLE 5 diff --git a/firmware/controllers/generated/rusefi_generated_t-b-g.h b/firmware/controllers/generated/rusefi_generated_t-b-g.h index 558c6277b4..0837aa13c8 100644 --- a/firmware/controllers/generated/rusefi_generated_t-b-g.h +++ b/firmware/controllers/generated/rusefi_generated_t-b-g.h @@ -1162,7 +1162,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 1352820405 +#define SIGNATURE_HASH 523818637 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1500,14 +1500,14 @@ #define ts_show_vr_threshold_all false #define ts_show_vr_threshold_pins true #define ts_show_vvt_output true -#define TS_SIGNATURE "rusEFI master.2024.03.05.t-b-g.1352820405" +#define TS_SIGNATURE "rusEFI master.2024.03.05.t-b-g.523818637" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' #define TS_TEST_COMMAND_char t -#define TS_TOTAL_OUTPUT_SIZE 1456 +#define TS_TOTAL_OUTPUT_SIZE 1468 #define TS_TRIGGER_SCOPE_CHANNEL_1_NAME "Channel 1" #define TS_TRIGGER_SCOPE_CHANNEL_2_NAME "Channel 2" #define TS_TRIGGER_SCOPE_DISABLE 5 diff --git a/firmware/controllers/generated/rusefi_generated_tdg-pdm8.h b/firmware/controllers/generated/rusefi_generated_tdg-pdm8.h index 901f225ed8..e3bd157536 100644 --- a/firmware/controllers/generated/rusefi_generated_tdg-pdm8.h +++ b/firmware/controllers/generated/rusefi_generated_tdg-pdm8.h @@ -1162,7 +1162,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 3658238615 +#define SIGNATURE_HASH 2509699759 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1500,14 +1500,14 @@ #define ts_show_vr_threshold_all false #define ts_show_vr_threshold_pins true #define ts_show_vvt_output true -#define TS_SIGNATURE "rusEFI master.2024.03.05.tdg-pdm8.3658238615" +#define TS_SIGNATURE "rusEFI master.2024.03.05.tdg-pdm8.2509699759" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' #define TS_TEST_COMMAND_char t -#define TS_TOTAL_OUTPUT_SIZE 1456 +#define TS_TOTAL_OUTPUT_SIZE 1468 #define TS_TRIGGER_SCOPE_CHANNEL_1_NAME "Channel 1" #define TS_TRIGGER_SCOPE_CHANNEL_2_NAME "Channel 2" #define TS_TRIGGER_SCOPE_DISABLE 5 diff --git a/firmware/controllers/generated/rusefi_generated_uaefi.h b/firmware/controllers/generated/rusefi_generated_uaefi.h index 80f278fac4..bcd7aaa7c6 100644 --- a/firmware/controllers/generated/rusefi_generated_uaefi.h +++ b/firmware/controllers/generated/rusefi_generated_uaefi.h @@ -1163,7 +1163,7 @@ #define show_Proteus_presets false #define show_test_presets false #define show_uaefi_presets true -#define SIGNATURE_HASH 3713663592 +#define SIGNATURE_HASH 2462102096 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1501,14 +1501,14 @@ #define ts_show_vr_threshold_all true #define ts_show_vr_threshold_pins false #define ts_show_vvt_output true -#define TS_SIGNATURE "rusEFI master.2024.03.05.uaefi.3713663592" +#define TS_SIGNATURE "rusEFI master.2024.03.05.uaefi.2462102096" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' #define TS_TEST_COMMAND_char t -#define TS_TOTAL_OUTPUT_SIZE 1456 +#define TS_TOTAL_OUTPUT_SIZE 1468 #define TS_TRIGGER_SCOPE_CHANNEL_1_NAME "Channel 1" #define TS_TRIGGER_SCOPE_CHANNEL_2_NAME "Channel 2" #define TS_TRIGGER_SCOPE_DISABLE 5 diff --git a/firmware/controllers/generated/signature_alphax-2chan.h b/firmware/controllers/generated/signature_alphax-2chan.h index d9dda5b363..be1533dada 100644 --- a/firmware/controllers/generated/signature_alphax-2chan.h +++ b/firmware/controllers/generated/signature_alphax-2chan.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 2877555107 -#define TS_SIGNATURE "rusEFI master.2024.03.05.alphax-2chan.2877555107" +#define SIGNATURE_HASH 3827216795 +#define TS_SIGNATURE "rusEFI master.2024.03.05.alphax-2chan.3827216795" diff --git a/firmware/controllers/generated/signature_alphax-4chan.h b/firmware/controllers/generated/signature_alphax-4chan.h index 99217535d0..37cdd1574d 100644 --- a/firmware/controllers/generated/signature_alphax-4chan.h +++ b/firmware/controllers/generated/signature_alphax-4chan.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 3271550142 -#define TS_SIGNATURE "rusEFI master.2024.03.05.alphax-4chan.3271550142" +#define SIGNATURE_HASH 2372228230 +#define TS_SIGNATURE "rusEFI master.2024.03.05.alphax-4chan.2372228230" diff --git a/firmware/controllers/generated/signature_alphax-4chan_f7.h b/firmware/controllers/generated/signature_alphax-4chan_f7.h index c4ec8763b4..625123aed4 100644 --- a/firmware/controllers/generated/signature_alphax-4chan_f7.h +++ b/firmware/controllers/generated/signature_alphax-4chan_f7.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 3271550142 -#define TS_SIGNATURE "rusEFI master.2024.03.05.alphax-4chan_f7.3271550142" +#define SIGNATURE_HASH 2372228230 +#define TS_SIGNATURE "rusEFI master.2024.03.05.alphax-4chan_f7.2372228230" diff --git a/firmware/controllers/generated/signature_alphax-8chan-revA.h b/firmware/controllers/generated/signature_alphax-8chan-revA.h index 4adc9d4527..59866b55a6 100644 --- a/firmware/controllers/generated/signature_alphax-8chan-revA.h +++ b/firmware/controllers/generated/signature_alphax-8chan-revA.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 122285346 -#define TS_SIGNATURE "rusEFI master.2024.03.05.alphax-8chan-revA.122285346" +#define SIGNATURE_HASH 1221811482 +#define TS_SIGNATURE "rusEFI master.2024.03.05.alphax-8chan-revA.1221811482" diff --git a/firmware/controllers/generated/signature_alphax-8chan.h b/firmware/controllers/generated/signature_alphax-8chan.h index ad407db145..cd0a143dc5 100644 --- a/firmware/controllers/generated/signature_alphax-8chan.h +++ b/firmware/controllers/generated/signature_alphax-8chan.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 1319487505 -#define TS_SIGNATURE "rusEFI master.2024.03.05.alphax-8chan.1319487505" +#define SIGNATURE_HASH 20936745 +#define TS_SIGNATURE "rusEFI master.2024.03.05.alphax-8chan.20936745" diff --git a/firmware/controllers/generated/signature_alphax-8chan_f7.h b/firmware/controllers/generated/signature_alphax-8chan_f7.h index cd3b8406e1..a50588595f 100644 --- a/firmware/controllers/generated/signature_alphax-8chan_f7.h +++ b/firmware/controllers/generated/signature_alphax-8chan_f7.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 1319487505 -#define TS_SIGNATURE "rusEFI master.2024.03.05.alphax-8chan_f7.1319487505" +#define SIGNATURE_HASH 20936745 +#define TS_SIGNATURE "rusEFI master.2024.03.05.alphax-8chan_f7.20936745" diff --git a/firmware/controllers/generated/signature_at_start_f435.h b/firmware/controllers/generated/signature_at_start_f435.h index 772a2bd0cc..caaecbf0d4 100644 --- a/firmware/controllers/generated/signature_at_start_f435.h +++ b/firmware/controllers/generated/signature_at_start_f435.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 1352820405 -#define TS_SIGNATURE "rusEFI master.2024.03.05.at_start_f435.1352820405" +#define SIGNATURE_HASH 523818637 +#define TS_SIGNATURE "rusEFI master.2024.03.05.at_start_f435.523818637" diff --git a/firmware/controllers/generated/signature_atlas.h b/firmware/controllers/generated/signature_atlas.h index f61dccbd20..237e453359 100644 --- a/firmware/controllers/generated/signature_atlas.h +++ b/firmware/controllers/generated/signature_atlas.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 346403579 -#define TS_SIGNATURE "rusEFI master.2024.03.05.atlas.346403579" +#define SIGNATURE_HASH 1530856131 +#define TS_SIGNATURE "rusEFI master.2024.03.05.atlas.1530856131" diff --git a/firmware/controllers/generated/signature_cypress.h b/firmware/controllers/generated/signature_cypress.h index c77001f62c..5bd8e3f8ad 100644 --- a/firmware/controllers/generated/signature_cypress.h +++ b/firmware/controllers/generated/signature_cypress.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on hellen_cypress_gen_config.bat by SignatureConsumer // -#define SIGNATURE_HASH 1352820405 -#define TS_SIGNATURE "rusEFI master.2024.03.05.cypress.1352820405" +#define SIGNATURE_HASH 523818637 +#define TS_SIGNATURE "rusEFI master.2024.03.05.cypress.523818637" diff --git a/firmware/controllers/generated/signature_f407-discovery.h b/firmware/controllers/generated/signature_f407-discovery.h index 56ecc7f7de..a3192e3d2f 100644 --- a/firmware/controllers/generated/signature_f407-discovery.h +++ b/firmware/controllers/generated/signature_f407-discovery.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 3808613738 -#define TS_SIGNATURE "rusEFI master.2024.03.05.f407-discovery.3808613738" +#define SIGNATURE_HASH 2895668562 +#define TS_SIGNATURE "rusEFI master.2024.03.05.f407-discovery.2895668562" diff --git a/firmware/controllers/generated/signature_f429-discovery.h b/firmware/controllers/generated/signature_f429-discovery.h index af2e7302d1..8a2e2332c3 100644 --- a/firmware/controllers/generated/signature_f429-discovery.h +++ b/firmware/controllers/generated/signature_f429-discovery.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 1352820405 -#define TS_SIGNATURE "rusEFI master.2024.03.05.f429-discovery.1352820405" +#define SIGNATURE_HASH 523818637 +#define TS_SIGNATURE "rusEFI master.2024.03.05.f429-discovery.523818637" diff --git a/firmware/controllers/generated/signature_f469-discovery.h b/firmware/controllers/generated/signature_f469-discovery.h index 0e0c7bdc55..f16003499d 100644 --- a/firmware/controllers/generated/signature_f469-discovery.h +++ b/firmware/controllers/generated/signature_f469-discovery.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 1651859494 -#define TS_SIGNATURE "rusEFI master.2024.03.05.f469-discovery.1651859494" +#define SIGNATURE_HASH 770691102 +#define TS_SIGNATURE "rusEFI master.2024.03.05.f469-discovery.770691102" diff --git a/firmware/controllers/generated/signature_frankenso_na6.h b/firmware/controllers/generated/signature_frankenso_na6.h index 79a9bb4f21..bd36550a72 100644 --- a/firmware/controllers/generated/signature_frankenso_na6.h +++ b/firmware/controllers/generated/signature_frankenso_na6.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 102830766 -#define TS_SIGNATURE "rusEFI master.2024.03.05.frankenso_na6.102830766" +#define SIGNATURE_HASH 1237033622 +#define TS_SIGNATURE "rusEFI master.2024.03.05.frankenso_na6.1237033622" diff --git a/firmware/controllers/generated/signature_hellen-112-17.h b/firmware/controllers/generated/signature_hellen-112-17.h index 6fc4efc8ca..1d3b73b92a 100644 --- a/firmware/controllers/generated/signature_hellen-112-17.h +++ b/firmware/controllers/generated/signature_hellen-112-17.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 3651862065 -#define TS_SIGNATURE "rusEFI master.2024.03.05.hellen-112-17.3651862065" +#define SIGNATURE_HASH 2519748105 +#define TS_SIGNATURE "rusEFI master.2024.03.05.hellen-112-17.2519748105" diff --git a/firmware/controllers/generated/signature_hellen-gm-e67.h b/firmware/controllers/generated/signature_hellen-gm-e67.h index 98e231b8a2..0b1f61039f 100644 --- a/firmware/controllers/generated/signature_hellen-gm-e67.h +++ b/firmware/controllers/generated/signature_hellen-gm-e67.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 2631598349 -#define TS_SIGNATURE "rusEFI master.2024.03.05.hellen-gm-e67.2631598349" +#define SIGNATURE_HASH 3544297781 +#define TS_SIGNATURE "rusEFI master.2024.03.05.hellen-gm-e67.3544297781" diff --git a/firmware/controllers/generated/signature_hellen-honda-k.h b/firmware/controllers/generated/signature_hellen-honda-k.h index 2bc9872f1a..29a75da4ad 100644 --- a/firmware/controllers/generated/signature_hellen-honda-k.h +++ b/firmware/controllers/generated/signature_hellen-honda-k.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 469729204 -#define TS_SIGNATURE "rusEFI master.2024.03.05.hellen-honda-k.469729204" +#define SIGNATURE_HASH 1415958412 +#define TS_SIGNATURE "rusEFI master.2024.03.05.hellen-honda-k.1415958412" diff --git a/firmware/controllers/generated/signature_hellen-nb1.h b/firmware/controllers/generated/signature_hellen-nb1.h index 4a05001946..dee7885493 100644 --- a/firmware/controllers/generated/signature_hellen-nb1.h +++ b/firmware/controllers/generated/signature_hellen-nb1.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 3116011669 -#define TS_SIGNATURE "rusEFI master.2024.03.05.hellen-nb1.3116011669" +#define SIGNATURE_HASH 4129300653 +#define TS_SIGNATURE "rusEFI master.2024.03.05.hellen-nb1.4129300653" diff --git a/firmware/controllers/generated/signature_hellen121nissan.h b/firmware/controllers/generated/signature_hellen121nissan.h index c9a5f34b93..12218f84ef 100644 --- a/firmware/controllers/generated/signature_hellen121nissan.h +++ b/firmware/controllers/generated/signature_hellen121nissan.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 2098776226 -#define TS_SIGNATURE "rusEFI master.2024.03.05.hellen121nissan.2098776226" +#define SIGNATURE_HASH 847411354 +#define TS_SIGNATURE "rusEFI master.2024.03.05.hellen121nissan.847411354" diff --git a/firmware/controllers/generated/signature_hellen121vag.h b/firmware/controllers/generated/signature_hellen121vag.h index 2406c5810b..f26313ac18 100644 --- a/firmware/controllers/generated/signature_hellen121vag.h +++ b/firmware/controllers/generated/signature_hellen121vag.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 1624996691 -#define TS_SIGNATURE "rusEFI master.2024.03.05.hellen121vag.1624996691" +#define SIGNATURE_HASH 792841067 +#define TS_SIGNATURE "rusEFI master.2024.03.05.hellen121vag.792841067" diff --git a/firmware/controllers/generated/signature_hellen128.h b/firmware/controllers/generated/signature_hellen128.h index 1db2c59599..2b45c649a2 100644 --- a/firmware/controllers/generated/signature_hellen128.h +++ b/firmware/controllers/generated/signature_hellen128.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 3174059074 -#define TS_SIGNATURE "rusEFI master.2024.03.05.hellen128.3174059074" +#define SIGNATURE_HASH 4071292026 +#define TS_SIGNATURE "rusEFI master.2024.03.05.hellen128.4071292026" diff --git a/firmware/controllers/generated/signature_hellen154hyundai.h b/firmware/controllers/generated/signature_hellen154hyundai.h index 92d414b248..c3c11747b4 100644 --- a/firmware/controllers/generated/signature_hellen154hyundai.h +++ b/firmware/controllers/generated/signature_hellen154hyundai.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 1949760771 -#define TS_SIGNATURE "rusEFI master.2024.03.05.hellen154hyundai.1949760771" +#define SIGNATURE_HASH 1001147707 +#define TS_SIGNATURE "rusEFI master.2024.03.05.hellen154hyundai.1001147707" diff --git a/firmware/controllers/generated/signature_hellen72.h b/firmware/controllers/generated/signature_hellen72.h index 1076be8a53..079236c70c 100644 --- a/firmware/controllers/generated/signature_hellen72.h +++ b/firmware/controllers/generated/signature_hellen72.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 3494089257 -#define TS_SIGNATURE "rusEFI master.2024.03.05.hellen72.3494089257" +#define SIGNATURE_HASH 2681807377 +#define TS_SIGNATURE "rusEFI master.2024.03.05.hellen72.2681807377" diff --git a/firmware/controllers/generated/signature_hellen81.h b/firmware/controllers/generated/signature_hellen81.h index 1881cb1cb4..985267756b 100644 --- a/firmware/controllers/generated/signature_hellen81.h +++ b/firmware/controllers/generated/signature_hellen81.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 892532307 -#define TS_SIGNATURE "rusEFI master.2024.03.05.hellen81.892532307" +#define SIGNATURE_HASH 2057848427 +#define TS_SIGNATURE "rusEFI master.2024.03.05.hellen81.2057848427" diff --git a/firmware/controllers/generated/signature_hellen88bmw.h b/firmware/controllers/generated/signature_hellen88bmw.h index 0f93d2c3e5..dcbad45145 100644 --- a/firmware/controllers/generated/signature_hellen88bmw.h +++ b/firmware/controllers/generated/signature_hellen88bmw.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 571597584 -#define TS_SIGNATURE "rusEFI master.2024.03.05.hellen88bmw.571597584" +#define SIGNATURE_HASH 1837847336 +#define TS_SIGNATURE "rusEFI master.2024.03.05.hellen88bmw.1837847336" diff --git a/firmware/controllers/generated/signature_hellenNA6.h b/firmware/controllers/generated/signature_hellenNA6.h index c0dd876b71..f0fbaa66ad 100644 --- a/firmware/controllers/generated/signature_hellenNA6.h +++ b/firmware/controllers/generated/signature_hellenNA6.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 3288827221 -#define TS_SIGNATURE "rusEFI master.2024.03.05.hellenNA6.3288827221" +#define SIGNATURE_HASH 2342335853 +#define TS_SIGNATURE "rusEFI master.2024.03.05.hellenNA6.2342335853" diff --git a/firmware/controllers/generated/signature_hellenNA8_96.h b/firmware/controllers/generated/signature_hellenNA8_96.h index 187ef583e9..6aaf42a88a 100644 --- a/firmware/controllers/generated/signature_hellenNA8_96.h +++ b/firmware/controllers/generated/signature_hellenNA8_96.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 1004390299 -#define TS_SIGNATURE "rusEFI master.2024.03.05.hellenNA8_96.1004390299" +#define SIGNATURE_HASH 1950840739 +#define TS_SIGNATURE "rusEFI master.2024.03.05.hellenNA8_96.1950840739" diff --git a/firmware/controllers/generated/signature_kin.h b/firmware/controllers/generated/signature_kin.h index 5781241859..a5152075d5 100644 --- a/firmware/controllers/generated/signature_kin.h +++ b/firmware/controllers/generated/signature_kin.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on kinetis_gen_config.bat by SignatureConsumer // -#define SIGNATURE_HASH 309567771 -#define TS_SIGNATURE "rusEFI master.2024.03.05.kin.309567771" +#define SIGNATURE_HASH 1575555363 +#define TS_SIGNATURE "rusEFI master.2024.03.05.kin.1575555363" diff --git a/firmware/controllers/generated/signature_m74_9.h b/firmware/controllers/generated/signature_m74_9.h index dee0c658fc..395776ce2f 100644 --- a/firmware/controllers/generated/signature_m74_9.h +++ b/firmware/controllers/generated/signature_m74_9.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 320434468 -#define TS_SIGNATURE "rusEFI master.2024.03.05.m74_9.320434468" +#define SIGNATURE_HASH 1552138524 +#define TS_SIGNATURE "rusEFI master.2024.03.05.m74_9.1552138524" diff --git a/firmware/controllers/generated/signature_mre_f4.h b/firmware/controllers/generated/signature_mre_f4.h index c6d12026bb..6a062608cb 100644 --- a/firmware/controllers/generated/signature_mre_f4.h +++ b/firmware/controllers/generated/signature_mre_f4.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 498645039 -#define TS_SIGNATURE "rusEFI master.2024.03.05.mre_f4.498645039" +#define SIGNATURE_HASH 1377962007 +#define TS_SIGNATURE "rusEFI master.2024.03.05.mre_f4.1377962007" diff --git a/firmware/controllers/generated/signature_mre_f7.h b/firmware/controllers/generated/signature_mre_f7.h index 3e2ee26078..5f1b99de8b 100644 --- a/firmware/controllers/generated/signature_mre_f7.h +++ b/firmware/controllers/generated/signature_mre_f7.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 498645039 -#define TS_SIGNATURE "rusEFI master.2024.03.05.mre_f7.498645039" +#define SIGNATURE_HASH 1377962007 +#define TS_SIGNATURE "rusEFI master.2024.03.05.mre_f7.1377962007" diff --git a/firmware/controllers/generated/signature_nucleo_h743.h b/firmware/controllers/generated/signature_nucleo_h743.h index 4da67f9c5e..f9da45a05b 100644 --- a/firmware/controllers/generated/signature_nucleo_h743.h +++ b/firmware/controllers/generated/signature_nucleo_h743.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 1352820405 -#define TS_SIGNATURE "rusEFI master.2024.03.05.nucleo_h743.1352820405" +#define SIGNATURE_HASH 523818637 +#define TS_SIGNATURE "rusEFI master.2024.03.05.nucleo_h743.523818637" diff --git a/firmware/controllers/generated/signature_prometheus_405.h b/firmware/controllers/generated/signature_prometheus_405.h index e94f0faa9e..c97a3b7378 100644 --- a/firmware/controllers/generated/signature_prometheus_405.h +++ b/firmware/controllers/generated/signature_prometheus_405.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 1614195493 -#define TS_SIGNATURE "rusEFI master.2024.03.05.prometheus_405.1614195493" +#define SIGNATURE_HASH 799808285 +#define TS_SIGNATURE "rusEFI master.2024.03.05.prometheus_405.799808285" diff --git a/firmware/controllers/generated/signature_prometheus_469.h b/firmware/controllers/generated/signature_prometheus_469.h index 33d248ddfb..0e1462a7ac 100644 --- a/firmware/controllers/generated/signature_prometheus_469.h +++ b/firmware/controllers/generated/signature_prometheus_469.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 1614195493 -#define TS_SIGNATURE "rusEFI master.2024.03.05.prometheus_469.1614195493" +#define SIGNATURE_HASH 799808285 +#define TS_SIGNATURE "rusEFI master.2024.03.05.prometheus_469.799808285" diff --git a/firmware/controllers/generated/signature_proteus_f4.h b/firmware/controllers/generated/signature_proteus_f4.h index 491591e56c..9047a12516 100644 --- a/firmware/controllers/generated/signature_proteus_f4.h +++ b/firmware/controllers/generated/signature_proteus_f4.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 3488186380 -#define TS_SIGNATURE "rusEFI master.2024.03.05.proteus_f4.3488186380" +#define SIGNATURE_HASH 2155032628 +#define TS_SIGNATURE "rusEFI master.2024.03.05.proteus_f4.2155032628" diff --git a/firmware/controllers/generated/signature_proteus_f7.h b/firmware/controllers/generated/signature_proteus_f7.h index 591add4423..ab42df4945 100644 --- a/firmware/controllers/generated/signature_proteus_f7.h +++ b/firmware/controllers/generated/signature_proteus_f7.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 3488186380 -#define TS_SIGNATURE "rusEFI master.2024.03.05.proteus_f7.3488186380" +#define SIGNATURE_HASH 2155032628 +#define TS_SIGNATURE "rusEFI master.2024.03.05.proteus_f7.2155032628" diff --git a/firmware/controllers/generated/signature_proteus_h7.h b/firmware/controllers/generated/signature_proteus_h7.h index 3a2d13ed86..6cc42d1d64 100644 --- a/firmware/controllers/generated/signature_proteus_h7.h +++ b/firmware/controllers/generated/signature_proteus_h7.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 3488186380 -#define TS_SIGNATURE "rusEFI master.2024.03.05.proteus_h7.3488186380" +#define SIGNATURE_HASH 2155032628 +#define TS_SIGNATURE "rusEFI master.2024.03.05.proteus_h7.2155032628" diff --git a/firmware/controllers/generated/signature_s105.h b/firmware/controllers/generated/signature_s105.h index b7f610a11e..f5acc47fcc 100644 --- a/firmware/controllers/generated/signature_s105.h +++ b/firmware/controllers/generated/signature_s105.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 381904304 -#define TS_SIGNATURE "rusEFI master.2024.03.05.s105.381904304" +#define SIGNATURE_HASH 1499059592 +#define TS_SIGNATURE "rusEFI master.2024.03.05.s105.1499059592" diff --git a/firmware/controllers/generated/signature_small-can-board.h b/firmware/controllers/generated/signature_small-can-board.h index b3b7b01f7d..916d14c6e3 100644 --- a/firmware/controllers/generated/signature_small-can-board.h +++ b/firmware/controllers/generated/signature_small-can-board.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 1845733948 -#define TS_SIGNATURE "rusEFI master.2024.03.05.small-can-board.1845733948" +#define SIGNATURE_HASH 563681796 +#define TS_SIGNATURE "rusEFI master.2024.03.05.small-can-board.563681796" diff --git a/firmware/controllers/generated/signature_stm32f413_nucleo.h b/firmware/controllers/generated/signature_stm32f413_nucleo.h index b6f823b723..725f271730 100644 --- a/firmware/controllers/generated/signature_stm32f413_nucleo.h +++ b/firmware/controllers/generated/signature_stm32f413_nucleo.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 1352820405 -#define TS_SIGNATURE "rusEFI master.2024.03.05.stm32f413_nucleo.1352820405" +#define SIGNATURE_HASH 523818637 +#define TS_SIGNATURE "rusEFI master.2024.03.05.stm32f413_nucleo.523818637" diff --git a/firmware/controllers/generated/signature_stm32f429_nucleo.h b/firmware/controllers/generated/signature_stm32f429_nucleo.h index 032183a3be..ab4bd3a10c 100644 --- a/firmware/controllers/generated/signature_stm32f429_nucleo.h +++ b/firmware/controllers/generated/signature_stm32f429_nucleo.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 1352820405 -#define TS_SIGNATURE "rusEFI master.2024.03.05.stm32f429_nucleo.1352820405" +#define SIGNATURE_HASH 523818637 +#define TS_SIGNATURE "rusEFI master.2024.03.05.stm32f429_nucleo.523818637" diff --git a/firmware/controllers/generated/signature_stm32f767_nucleo.h b/firmware/controllers/generated/signature_stm32f767_nucleo.h index 70e0add79d..0777efbd63 100644 --- a/firmware/controllers/generated/signature_stm32f767_nucleo.h +++ b/firmware/controllers/generated/signature_stm32f767_nucleo.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 1352820405 -#define TS_SIGNATURE "rusEFI master.2024.03.05.stm32f767_nucleo.1352820405" +#define SIGNATURE_HASH 523818637 +#define TS_SIGNATURE "rusEFI master.2024.03.05.stm32f767_nucleo.523818637" diff --git a/firmware/controllers/generated/signature_subaru_eg33_f7.h b/firmware/controllers/generated/signature_subaru_eg33_f7.h index 6b7c7f27b6..2b4efc1153 100644 --- a/firmware/controllers/generated/signature_subaru_eg33_f7.h +++ b/firmware/controllers/generated/signature_subaru_eg33_f7.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on config/boards/subaru_eg33/config/gen_subaru_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 3812913245 -#define TS_SIGNATURE "rusEFI master.2024.03.05.subaru_eg33_f7.3812913245" +#define SIGNATURE_HASH 2900279397 +#define TS_SIGNATURE "rusEFI master.2024.03.05.subaru_eg33_f7.2900279397" diff --git a/firmware/controllers/generated/signature_t-b-g.h b/firmware/controllers/generated/signature_t-b-g.h index 02ad0ace12..ef882a6b6e 100644 --- a/firmware/controllers/generated/signature_t-b-g.h +++ b/firmware/controllers/generated/signature_t-b-g.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 1352820405 -#define TS_SIGNATURE "rusEFI master.2024.03.05.t-b-g.1352820405" +#define SIGNATURE_HASH 523818637 +#define TS_SIGNATURE "rusEFI master.2024.03.05.t-b-g.523818637" diff --git a/firmware/controllers/generated/signature_tdg-pdm8.h b/firmware/controllers/generated/signature_tdg-pdm8.h index 2212e8adef..230ddeccf0 100644 --- a/firmware/controllers/generated/signature_tdg-pdm8.h +++ b/firmware/controllers/generated/signature_tdg-pdm8.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 3658238615 -#define TS_SIGNATURE "rusEFI master.2024.03.05.tdg-pdm8.3658238615" +#define SIGNATURE_HASH 2509699759 +#define TS_SIGNATURE "rusEFI master.2024.03.05.tdg-pdm8.2509699759" diff --git a/firmware/controllers/generated/signature_uaefi.h b/firmware/controllers/generated/signature_uaefi.h index 2ddf17189f..561e8406a4 100644 --- a/firmware/controllers/generated/signature_uaefi.h +++ b/firmware/controllers/generated/signature_uaefi.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 3713663592 -#define TS_SIGNATURE "rusEFI master.2024.03.05.uaefi.3713663592" +#define SIGNATURE_HASH 2462102096 +#define TS_SIGNATURE "rusEFI master.2024.03.05.uaefi.2462102096" diff --git a/firmware/controllers/lua/generated/output_lookup_generated.cpp b/firmware/controllers/lua/generated/output_lookup_generated.cpp index d2e7549208..137f0392ef 100644 --- a/firmware/controllers/lua/generated/output_lookup_generated.cpp +++ b/firmware/controllers/lua/generated/output_lookup_generated.cpp @@ -1179,9 +1179,6 @@ float getOutputValueByName(const char *name) { // startStopPhysicalState case -1943724937: return engine->engineState.startStopPhysicalState; -// acrStateDup - case -793662747: - return engine->engineState.acrStateDup; // acrEngineMovedRecently case -791147982: return engine->engineState.acrEngineMovedRecently; @@ -1209,6 +1206,15 @@ float getOutputValueByName(const char *name) { // egtValue2 case -244414220: return engine->engineState.egtValue2; +// luaSoftSparkSkip + case -1117430949: + return engine->engineState.luaSoftSparkSkip; +// luaHardSparkSkip + case -1498397570: + return engine->engineState.luaHardSparkSkip; +// tractionControlSparkSkip + case -1555684830: + return engine->engineState.tractionControlSparkSkip; // desiredRpmLimit case -505351565: return engine->engineState.desiredRpmLimit; diff --git a/firmware/controllers/lua/generated/value_lookup_generated.cpp b/firmware/controllers/lua/generated/value_lookup_generated.cpp index e119db0a84..18209f5370 100644 --- a/firmware/controllers/lua/generated/value_lookup_generated.cpp +++ b/firmware/controllers/lua/generated/value_lookup_generated.cpp @@ -1090,6 +1090,9 @@ float getConfigValueByName(const char *name) { // flexSensorInverted case 512911183: return engineConfiguration->flexSensorInverted; +// useHardSkipInTraction + case -1495799741: + return engineConfiguration->useHardSkipInTraction; // useAuxSpeedForSlipRatio case -723870257: return engineConfiguration->useAuxSpeedForSlipRatio; @@ -3598,6 +3601,11 @@ bool setConfigValueByName(const char *name, float value) { { engineConfiguration->flexSensorInverted = (int)value; return 1; + } + case -1495799741: + { + engineConfiguration->useHardSkipInTraction = (int)value; + return 1; } case -723870257: { diff --git a/firmware/controllers/lua/generated/value_lookup_generated.md b/firmware/controllers/lua/generated/value_lookup_generated.md index 3bd187c388..98b68700bf 100644 --- a/firmware/controllers/lua/generated/value_lookup_generated.md +++ b/firmware/controllers/lua/generated/value_lookup_generated.md @@ -1084,6 +1084,9 @@ See Over/Undervoltage Shutdown/Retry bit in documentation ### flexSensorInverted +### useHardSkipInTraction + + ### useAuxSpeedForSlipRatio diff --git a/firmware/tunerstudio/generated/rusefi.ini b/firmware/tunerstudio/generated/rusefi.ini index ed966ea198..ebe2a60f41 100644 --- a/firmware/tunerstudio/generated/rusefi.ini +++ b/firmware/tunerstudio/generated/rusefi.ini @@ -37,12 +37,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.03.05.f407-discovery.3808613738" + signature = "rusEFI master.2024.03.05.f407-discovery.2895668562" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.03.05.f407-discovery.3808613738" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.03.05.f407-discovery.2895668562" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -98,7 +98,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="Disabled", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PB0", "PB1", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue Mar 05 00:53:15 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue Mar 05 01:57:18 UTC 2024 pageSize = 22236 page = 1 @@ -745,6 +745,7 @@ mc33810Gpgd3Mode = bits, U32, 1576, [4:4], "false", "true" enableExtendedCanBroadcast = bits, U32, 1576, [5:5], "false", "true" luaCanRxWorkaround = bits, U32, 1576, [6:6], "false", "true" flexSensorInverted = bits, U32, 1576, [7:7], "false", "true" +useHardSkipInTraction = bits, U32, 1576, [8:8], "false", "true" useAuxSpeedForSlipRatio = bits, U32, 1576, [11:11], "false", "true" useVssAsSecondWheelSpeed = bits, U32, 1576, [12:12], "false", "true" is_enabled_spi_5 = bits, U32, 1576, [13:13], "false", "true" @@ -2468,7 +2469,7 @@ injectorStagingRpmBins = array, U16, 22222, [6], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1456 + ochBlockSize = 1468 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3131,145 +3132,147 @@ smartChipState = scalar, S08, 1102, "", 1, 0 smartChipRestartCounter = scalar, S08, 1103, "", 1, 0 smartChipAliveCounter = scalar, S08, 1104, "", 1, 0 startStopPhysicalState = bits, U32, 1108, [0:0] -acrStateDup = bits, U32, 1108, [1:1] -acrEngineMovedRecently = bits, U32, 1108, [2:2] -heaterControlEnabled = bits, U32, 1108, [3:3] -luaDigitalState0 = bits, U32, 1108, [4:4] -luaDigitalState1 = bits, U32, 1108, [5:5] -luaDigitalState2 = bits, U32, 1108, [6:6] -luaDigitalState3 = bits, U32, 1108, [7:7] +acrEngineMovedRecently = bits, U32, 1108, [1:1] +heaterControlEnabled = bits, U32, 1108, [2:2] +luaDigitalState0 = bits, U32, 1108, [3:3] +luaDigitalState1 = bits, U32, 1108, [4:4] +luaDigitalState2 = bits, U32, 1108, [5:5] +luaDigitalState3 = bits, U32, 1108, [6:6] startStopStateToggleCounter = scalar, U32, 1112, "", 1, 0 egtValue1 = scalar, F32, 1116, "", 1, 0 egtValue2 = scalar, F32, 1120, "", 1, 0 -desiredRpmLimit = scalar, S16, 1124, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1128, "", 1, 0 -globalSparkCounter = scalar, U32, 1132, "", 1, 0 -fuelingLoad = scalar, F32, 1136, "", 1, 0 -ignitionLoad = scalar, F32, 1140, "", 1, 0 -veTableYAxis = scalar, U16, 1144, "%", 0.01, 0 -; total TS size = 1148 -tpsFrom = scalar, F32, 1148 -tpsTo = scalar, F32, 1152 -deltaTps = scalar, F32, 1156 -extraFuel = scalar, F32, 1160, "", 1, 0 -valueFromTable = scalar, F32, 1164, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1168, [0:0] -isBelowDecelThreshold = bits, U32, 1168, [1:1] -isTimeToResetAccumulator = bits, U32, 1168, [2:2] -isFractionalEnrichment = bits, U32, 1168, [3:3] -belowEpsilon = bits, U32, 1168, [4:4] -tooShort = bits, U32, 1168, [5:5] -fractionalInjFuel = scalar, F32, 1172, "", 1, 0 -accumulatedValue = scalar, F32, 1176, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1180, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1184, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1188, "", 1, 0 -cycleCnt = scalar, S32, 1192, "", 1, 0 -; total TS size = 1196 -hwEventCounters1 = scalar, U32, 1196, "", 1, 0 -hwEventCounters2 = scalar, U32, 1200, "", 1, 0 -hwEventCounters3 = scalar, U32, 1204, "", 1, 0 -hwEventCounters4 = scalar, U32, 1208, "", 1, 0 -hwEventCounters5 = scalar, U32, 1212, "", 1, 0 -hwEventCounters6 = scalar, U32, 1216, "", 1, 0 -vvtCamCounter = scalar, U32, 1220, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1224, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1228, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1232, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1233, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1236, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1240, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1244, "", 1, 0 -mapCamPrevToothAngle = scalar, F32, 1248, "deg", 1, 0 -isDecodingMapCam = bits, U32, 1252, [0:0] -; total TS size = 1256 -crankSynchronizationCounter0 = scalar, U32, 1256, "", 1, 0 -vvtSyncGapRatio0 = scalar, F32, 1260, "", 1, 0 -vvtToothDurations00 = scalar, U32, 1264, "us", 1, 0 -vvtCurrentPosition0 = scalar, F32, 1268, "sync: Primary Cam Position", 1, 0 -vvtToothPosition10 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition20 = scalar, F32, 1276, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition30 = scalar, F32, 1280, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition40 = scalar, F32, 1284, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio0 = scalar, F32, 1288, "", 1, 0 -triggerStateIndex0 = scalar, U08, 1292, "", 1, 0 -vvtStateIndex0 = scalar, U08, 1293, "", 1, 0 -; total TS size = 1296 -camResyncCounter = scalar, U08, 1296, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1300, [0:0] -; total TS size = 1304 -wallFuelCorrection = scalar, F32, 1304, "", 1, 0 -wallFuel = scalar, F32, 1308, "", 1, 0 -; total TS size = 1312 -idleState = bits, S32, 1312, [0:2], "not important" -currentIdlePosition = scalar, F32, 1316 -baseIdlePosition = scalar, F32, 1320 -idleClosedLoop = scalar, F32, 1324 -iacByTpsTaper = scalar, F32, 1328 -throttlePedalUpState = scalar, S32, 1332, "", 1, 0 -mightResetPid = bits, U32, 1336, [0:0] -shouldResetPid = bits, U32, 1336, [1:1] -wasResetPid = bits, U32, 1336, [2:2] -mustResetPid = bits, U32, 1336, [3:3] -isCranking = bits, U32, 1336, [4:4] -isIacTableForCoasting = bits, U32, 1336, [5:5] -notIdling = bits, U32, 1336, [6:6] -needReset = bits, U32, 1336, [7:7] -isInDeadZone = bits, U32, 1336, [8:8] -isBlipping = bits, U32, 1336, [9:9] -useClosedLoop = bits, U32, 1336, [10:10] -badTps = bits, U32, 1336, [11:11] -looksLikeRunning = bits, U32, 1336, [12:12] -looksLikeCoasting = bits, U32, 1336, [13:13] -looksLikeCrankToIdle = bits, U32, 1336, [14:14] -isIdleCoasting = bits, U32, 1336, [15:15] -isIdleClosedLoop = bits, U32, 1336, [16:16] -idleTarget = scalar, S32, 1340, "", 1, 0 -targetRpmByClt = scalar, S32, 1344, "", 1, 0 -targetRpmAc = scalar, S32, 1348, "", 1, 0 -iacByRpmTaper = scalar, F32, 1352 -luaAdd = scalar, F32, 1356 -; total TS size = 1360 -idlePosition0 = scalar, F32, 1360, "per", 1,0 -trim0 = scalar, F32, 1364, "", 1, 0 -luaAdjustment0 = scalar, F32, 1368, "per", 1,0 -m_wastegatePosition0 = scalar, F32, 1372, "per", 1,0 -etbFeedForward0 = scalar, F32, 1376 -etbIntegralError0 = scalar, F32, 1380, "", 1, 0 -etbCurrentTarget0 = scalar, F32, 1384, "%", 1, 0 -etbCurrentAdjustedTarget0 = scalar, F32, 1388, "%", 1, 0 -etbRevLimitActive0 = bits, U32, 1392, [0:0] -jamDetected0 = bits, U32, 1392, [1:1] -etbDutyRateOfChange0 = scalar, F32, 1396, "per", 1,0 -etbDutyAverage0 = scalar, F32, 1400, "per", 1,0 -etbTpsErrorCounter0 = scalar, U16, 1404, "count", 1,0 -etbPpsErrorCounter0 = scalar, U16, 1406, "count", 1,0 -etbErrorCode0 = scalar, S08, 1408, "", 1, 0 -tcEtbDrop0 = scalar, S08, 1409, "", 1, 0 -jamTimer0 = scalar, U16, 1410, "sec", 0.01, 0 -; total TS size = 1412 -faultCode0 = scalar, U08, 1412, "", 1, 0 -heaterDuty0 = scalar, U08, 1413, "%", 1, 0 -pumpDuty0 = scalar, U08, 1414, "%", 1, 0 -tempC0 = scalar, U16, 1416, "C", 1, 0 -nernstVoltage0 = scalar, U16, 1418, "V", 0.001, 0 -esr0 = scalar, U16, 1420, "ohm", 1, 0 +luaSoftSparkSkip = scalar, F32, 1124, "", 1, 0 +luaHardSparkSkip = scalar, F32, 1128, "", 1, 0 +tractionControlSparkSkip = scalar, F32, 1132, "", 1, 0 +desiredRpmLimit = scalar, S16, 1136, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 1140, "", 1, 0 +globalSparkCounter = scalar, U32, 1144, "", 1, 0 +fuelingLoad = scalar, F32, 1148, "", 1, 0 +ignitionLoad = scalar, F32, 1152, "", 1, 0 +veTableYAxis = scalar, U16, 1156, "%", 0.01, 0 +; total TS size = 1160 +tpsFrom = scalar, F32, 1160 +tpsTo = scalar, F32, 1164 +deltaTps = scalar, F32, 1168 +extraFuel = scalar, F32, 1172, "", 1, 0 +valueFromTable = scalar, F32, 1176, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1180, [0:0] +isBelowDecelThreshold = bits, U32, 1180, [1:1] +isTimeToResetAccumulator = bits, U32, 1180, [2:2] +isFractionalEnrichment = bits, U32, 1180, [3:3] +belowEpsilon = bits, U32, 1180, [4:4] +tooShort = bits, U32, 1180, [5:5] +fractionalInjFuel = scalar, F32, 1184, "", 1, 0 +accumulatedValue = scalar, F32, 1188, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1192, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1196, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1200, "", 1, 0 +cycleCnt = scalar, S32, 1204, "", 1, 0 +; total TS size = 1208 +hwEventCounters1 = scalar, U32, 1208, "", 1, 0 +hwEventCounters2 = scalar, U32, 1212, "", 1, 0 +hwEventCounters3 = scalar, U32, 1216, "", 1, 0 +hwEventCounters4 = scalar, U32, 1220, "", 1, 0 +hwEventCounters5 = scalar, U32, 1224, "", 1, 0 +hwEventCounters6 = scalar, U32, 1228, "", 1, 0 +vvtCamCounter = scalar, U32, 1232, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1236, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1240, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1244, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1245, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1248, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1252, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1256, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1260, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1264, [0:0] +; total TS size = 1268 +crankSynchronizationCounter0 = scalar, U32, 1268, "", 1, 0 +vvtSyncGapRatio0 = scalar, F32, 1272, "", 1, 0 +vvtToothDurations00 = scalar, U32, 1276, "us", 1, 0 +vvtCurrentPosition0 = scalar, F32, 1280, "sync: Primary Cam Position", 1, 0 +vvtToothPosition10 = scalar, F32, 1284, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition20 = scalar, F32, 1288, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition30 = scalar, F32, 1292, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition40 = scalar, F32, 1296, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio0 = scalar, F32, 1300, "", 1, 0 +triggerStateIndex0 = scalar, U08, 1304, "", 1, 0 +vvtStateIndex0 = scalar, U08, 1305, "", 1, 0 +; total TS size = 1308 +camResyncCounter = scalar, U08, 1308, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1312, [0:0] +; total TS size = 1316 +wallFuelCorrection = scalar, F32, 1316, "", 1, 0 +wallFuel = scalar, F32, 1320, "", 1, 0 +; total TS size = 1324 +idleState = bits, S32, 1324, [0:2], "not important" +currentIdlePosition = scalar, F32, 1328 +baseIdlePosition = scalar, F32, 1332 +idleClosedLoop = scalar, F32, 1336 +iacByTpsTaper = scalar, F32, 1340 +throttlePedalUpState = scalar, S32, 1344, "", 1, 0 +mightResetPid = bits, U32, 1348, [0:0] +shouldResetPid = bits, U32, 1348, [1:1] +wasResetPid = bits, U32, 1348, [2:2] +mustResetPid = bits, U32, 1348, [3:3] +isCranking = bits, U32, 1348, [4:4] +isIacTableForCoasting = bits, U32, 1348, [5:5] +notIdling = bits, U32, 1348, [6:6] +needReset = bits, U32, 1348, [7:7] +isInDeadZone = bits, U32, 1348, [8:8] +isBlipping = bits, U32, 1348, [9:9] +useClosedLoop = bits, U32, 1348, [10:10] +badTps = bits, U32, 1348, [11:11] +looksLikeRunning = bits, U32, 1348, [12:12] +looksLikeCoasting = bits, U32, 1348, [13:13] +looksLikeCrankToIdle = bits, U32, 1348, [14:14] +isIdleCoasting = bits, U32, 1348, [15:15] +isIdleClosedLoop = bits, U32, 1348, [16:16] +idleTarget = scalar, S32, 1352, "", 1, 0 +targetRpmByClt = scalar, S32, 1356, "", 1, 0 +targetRpmAc = scalar, S32, 1360, "", 1, 0 +iacByRpmTaper = scalar, F32, 1364 +luaAdd = scalar, F32, 1368 +; total TS size = 1372 +idlePosition0 = scalar, F32, 1372, "per", 1,0 +trim0 = scalar, F32, 1376, "", 1, 0 +luaAdjustment0 = scalar, F32, 1380, "per", 1,0 +m_wastegatePosition0 = scalar, F32, 1384, "per", 1,0 +etbFeedForward0 = scalar, F32, 1388 +etbIntegralError0 = scalar, F32, 1392, "", 1, 0 +etbCurrentTarget0 = scalar, F32, 1396, "%", 1, 0 +etbCurrentAdjustedTarget0 = scalar, F32, 1400, "%", 1, 0 +etbRevLimitActive0 = bits, U32, 1404, [0:0] +jamDetected0 = bits, U32, 1404, [1:1] +etbDutyRateOfChange0 = scalar, F32, 1408, "per", 1,0 +etbDutyAverage0 = scalar, F32, 1412, "per", 1,0 +etbTpsErrorCounter0 = scalar, U16, 1416, "count", 1,0 +etbPpsErrorCounter0 = scalar, U16, 1418, "count", 1,0 +etbErrorCode0 = scalar, S08, 1420, "", 1, 0 +tcEtbDrop0 = scalar, S08, 1421, "", 1, 0 +jamTimer0 = scalar, U16, 1422, "sec", 0.01, 0 ; total TS size = 1424 -dcOutput0 = scalar, F32, 1424, "per", 1,0 -isEnabled0_int = scalar, U08, 1428, "per", 1,0 -isEnabled0 = bits, U32, 1432, [0:0] +faultCode0 = scalar, U08, 1424, "", 1, 0 +heaterDuty0 = scalar, U08, 1425, "%", 1, 0 +pumpDuty0 = scalar, U08, 1426, "%", 1, 0 +tempC0 = scalar, U16, 1428, "C", 1, 0 +nernstVoltage0 = scalar, U16, 1430, "V", 0.001, 0 +esr0 = scalar, U16, 1432, "ohm", 1, 0 ; total TS size = 1436 -value0 = scalar, U16, 1436, "value", 1,0 -value1 = scalar, U16, 1438, "value", 1,0 -errorRate = scalar, F32, 1440, "ratio", 1,0 -; total TS size = 1444 -vvtTarget = scalar, U16, 1444, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1446, "%", 0.5, 0 +dcOutput0 = scalar, F32, 1436, "per", 1,0 +isEnabled0_int = scalar, U08, 1440, "per", 1,0 +isEnabled0 = bits, U32, 1444, [0:0] ; total TS size = 1448 -lambdaCurrentlyGood = bits, U32, 1448, [0:0] -lambdaMonitorCut = bits, U32, 1448, [1:1] -lambdaTimeSinceGood = scalar, U16, 1452, "sec", 0.01, 0 +value0 = scalar, U16, 1448, "value", 1,0 +value1 = scalar, U16, 1450, "value", 1,0 +errorRate = scalar, F32, 1452, "ratio", 1,0 ; total TS size = 1456 +vvtTarget = scalar, U16, 1456, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1458, "%", 0.5, 0 +; total TS size = 1460 +lambdaCurrentlyGood = bits, U32, 1460, [0:0] +lambdaMonitorCut = bits, U32, 1460, [1:1] +lambdaTimeSinceGood = scalar, U16, 1464, "sec", 0.01, 0 +; total TS size = 1468 time = { timeNow } @@ -5402,7 +5405,6 @@ entry = smartChipState, "smartChipState", int, "%d" entry = smartChipRestartCounter, "smartChipRestartCounter", int, "%d" entry = smartChipAliveCounter, "smartChipAliveCounter", int, "%d" entry = startStopPhysicalState, "startStopPhysicalState", int, "%d" -entry = acrStateDup, "acrStateDup", int, "%d" entry = acrEngineMovedRecently, "acrEngineMovedRecently", int, "%d" entry = heaterControlEnabled, "heaterControlEnabled", int, "%d" entry = luaDigitalState0, "luaDigitalState0", int, "%d" @@ -5412,6 +5414,9 @@ entry = luaDigitalState3, "luaDigitalState3", int, "%d" entry = startStopStateToggleCounter, "startStopStateToggleCounter", int, "%d" entry = egtValue1, "egtValue1", float, "%.3f" entry = egtValue2, "egtValue2", float, "%.3f" +entry = luaSoftSparkSkip, "luaSoftSparkSkip", float, "%.3f" +entry = luaHardSparkSkip, "luaHardSparkSkip", float, "%.3f" +entry = tractionControlSparkSkip, "tractionControlSparkSkip", float, "%.3f" entry = desiredRpmLimit, "User-defined RPM hard limit", int, "%d" entry = fuelInjectionCounter, "Fuel: Injection counter", int, "%d" entry = globalSparkCounter, "Ign: Spark counter", int, "%d" @@ -5917,7 +5922,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 @@ -6365,7 +6370,6 @@ indicatorPanel = engine_stateIndicatorPanel, 2 indicator = {lua_luaDisableEtb}, "luaDisableEtb No", "luaDisableEtb Yes" indicator = {lua_luaIgnCut}, "luaIgnCut No", "luaIgnCut Yes" indicator = {startStopPhysicalState}, "startStopPhysicalState No", "startStopPhysicalState Yes" - indicator = {acrStateDup}, "acrStateDup No", "acrStateDup Yes" indicator = {acrEngineMovedRecently}, "acrEngineMovedRecently No", "acrEngineMovedRecently Yes" indicator = {heaterControlEnabled}, "heaterControlEnabled No", "heaterControlEnabled Yes" indicator = {luaDigitalState0}, "luaDigitalState0 No", "luaDigitalState0 Yes" @@ -6401,12 +6405,16 @@ dialog = engine_stateDialog, "engine_state" graphLine = egtValue1 graphLine = egtValue2 liveGraph = engine_state_6_Graph, "Graph", South + graphLine = luaSoftSparkSkip + graphLine = luaHardSparkSkip + graphLine = tractionControlSparkSkip graphLine = desiredRpmLimit + liveGraph = engine_state_7_Graph, "Graph", South graphLine = fuelInjectionCounter graphLine = globalSparkCounter graphLine = fuelingLoad - liveGraph = engine_state_7_Graph, "Graph", South graphLine = ignitionLoad + liveGraph = engine_state_8_Graph, "Graph", South graphLine = veTableYAxis indicatorPanel = tps_accel_stateIndicatorPanel, 2 @@ -7314,6 +7322,10 @@ dialog = lambda_monitorDialog, "lambda_monitor" 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 diff --git a/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini b/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini index c23fb92d0f..caac3add17 100644 --- a/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini +++ b/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini @@ -37,12 +37,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.03.05.alphax-2chan.2877555107" + signature = "rusEFI master.2024.03.05.alphax-2chan.3827216795" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.03.05.alphax-2chan.2877555107" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.03.05.alphax-2chan.3827216795" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -98,7 +98,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","INVALID","B4 - O2","On-board MAP","INVALID","B5 - TPS","A2 Battery Sense","C7 - CAM Hall/Digital","INVALID","X1 - AIN1","INVALID","INVALID","B2 - MAP","B7 - CLT","B3 - IAT","X3 - AIN2","X7 - AIN4" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue Mar 05 00:52:15 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue Mar 05 01:56:20 UTC 2024 pageSize = 22236 page = 1 @@ -745,6 +745,7 @@ mc33810Gpgd3Mode = bits, U32, 1576, [4:4], "false", "true" enableExtendedCanBroadcast = bits, U32, 1576, [5:5], "false", "true" luaCanRxWorkaround = bits, U32, 1576, [6:6], "false", "true" flexSensorInverted = bits, U32, 1576, [7:7], "false", "true" +useHardSkipInTraction = bits, U32, 1576, [8:8], "false", "true" useAuxSpeedForSlipRatio = bits, U32, 1576, [11:11], "false", "true" useVssAsSecondWheelSpeed = bits, U32, 1576, [12:12], "false", "true" is_enabled_spi_5 = bits, U32, 1576, [13:13], "false", "true" @@ -2468,7 +2469,7 @@ injectorStagingRpmBins = array, U16, 22222, [6], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1456 + ochBlockSize = 1468 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3131,145 +3132,147 @@ smartChipState = scalar, S08, 1102, "", 1, 0 smartChipRestartCounter = scalar, S08, 1103, "", 1, 0 smartChipAliveCounter = scalar, S08, 1104, "", 1, 0 startStopPhysicalState = bits, U32, 1108, [0:0] -acrStateDup = bits, U32, 1108, [1:1] -acrEngineMovedRecently = bits, U32, 1108, [2:2] -heaterControlEnabled = bits, U32, 1108, [3:3] -luaDigitalState0 = bits, U32, 1108, [4:4] -luaDigitalState1 = bits, U32, 1108, [5:5] -luaDigitalState2 = bits, U32, 1108, [6:6] -luaDigitalState3 = bits, U32, 1108, [7:7] +acrEngineMovedRecently = bits, U32, 1108, [1:1] +heaterControlEnabled = bits, U32, 1108, [2:2] +luaDigitalState0 = bits, U32, 1108, [3:3] +luaDigitalState1 = bits, U32, 1108, [4:4] +luaDigitalState2 = bits, U32, 1108, [5:5] +luaDigitalState3 = bits, U32, 1108, [6:6] startStopStateToggleCounter = scalar, U32, 1112, "", 1, 0 egtValue1 = scalar, F32, 1116, "", 1, 0 egtValue2 = scalar, F32, 1120, "", 1, 0 -desiredRpmLimit = scalar, S16, 1124, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1128, "", 1, 0 -globalSparkCounter = scalar, U32, 1132, "", 1, 0 -fuelingLoad = scalar, F32, 1136, "", 1, 0 -ignitionLoad = scalar, F32, 1140, "", 1, 0 -veTableYAxis = scalar, U16, 1144, "%", 0.01, 0 -; total TS size = 1148 -tpsFrom = scalar, F32, 1148 -tpsTo = scalar, F32, 1152 -deltaTps = scalar, F32, 1156 -extraFuel = scalar, F32, 1160, "", 1, 0 -valueFromTable = scalar, F32, 1164, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1168, [0:0] -isBelowDecelThreshold = bits, U32, 1168, [1:1] -isTimeToResetAccumulator = bits, U32, 1168, [2:2] -isFractionalEnrichment = bits, U32, 1168, [3:3] -belowEpsilon = bits, U32, 1168, [4:4] -tooShort = bits, U32, 1168, [5:5] -fractionalInjFuel = scalar, F32, 1172, "", 1, 0 -accumulatedValue = scalar, F32, 1176, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1180, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1184, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1188, "", 1, 0 -cycleCnt = scalar, S32, 1192, "", 1, 0 -; total TS size = 1196 -hwEventCounters1 = scalar, U32, 1196, "", 1, 0 -hwEventCounters2 = scalar, U32, 1200, "", 1, 0 -hwEventCounters3 = scalar, U32, 1204, "", 1, 0 -hwEventCounters4 = scalar, U32, 1208, "", 1, 0 -hwEventCounters5 = scalar, U32, 1212, "", 1, 0 -hwEventCounters6 = scalar, U32, 1216, "", 1, 0 -vvtCamCounter = scalar, U32, 1220, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1224, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1228, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1232, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1233, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1236, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1240, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1244, "", 1, 0 -mapCamPrevToothAngle = scalar, F32, 1248, "deg", 1, 0 -isDecodingMapCam = bits, U32, 1252, [0:0] -; total TS size = 1256 -crankSynchronizationCounter0 = scalar, U32, 1256, "", 1, 0 -vvtSyncGapRatio0 = scalar, F32, 1260, "", 1, 0 -vvtToothDurations00 = scalar, U32, 1264, "us", 1, 0 -vvtCurrentPosition0 = scalar, F32, 1268, "sync: Primary Cam Position", 1, 0 -vvtToothPosition10 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition20 = scalar, F32, 1276, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition30 = scalar, F32, 1280, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition40 = scalar, F32, 1284, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio0 = scalar, F32, 1288, "", 1, 0 -triggerStateIndex0 = scalar, U08, 1292, "", 1, 0 -vvtStateIndex0 = scalar, U08, 1293, "", 1, 0 -; total TS size = 1296 -camResyncCounter = scalar, U08, 1296, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1300, [0:0] -; total TS size = 1304 -wallFuelCorrection = scalar, F32, 1304, "", 1, 0 -wallFuel = scalar, F32, 1308, "", 1, 0 -; total TS size = 1312 -idleState = bits, S32, 1312, [0:2], "not important" -currentIdlePosition = scalar, F32, 1316 -baseIdlePosition = scalar, F32, 1320 -idleClosedLoop = scalar, F32, 1324 -iacByTpsTaper = scalar, F32, 1328 -throttlePedalUpState = scalar, S32, 1332, "", 1, 0 -mightResetPid = bits, U32, 1336, [0:0] -shouldResetPid = bits, U32, 1336, [1:1] -wasResetPid = bits, U32, 1336, [2:2] -mustResetPid = bits, U32, 1336, [3:3] -isCranking = bits, U32, 1336, [4:4] -isIacTableForCoasting = bits, U32, 1336, [5:5] -notIdling = bits, U32, 1336, [6:6] -needReset = bits, U32, 1336, [7:7] -isInDeadZone = bits, U32, 1336, [8:8] -isBlipping = bits, U32, 1336, [9:9] -useClosedLoop = bits, U32, 1336, [10:10] -badTps = bits, U32, 1336, [11:11] -looksLikeRunning = bits, U32, 1336, [12:12] -looksLikeCoasting = bits, U32, 1336, [13:13] -looksLikeCrankToIdle = bits, U32, 1336, [14:14] -isIdleCoasting = bits, U32, 1336, [15:15] -isIdleClosedLoop = bits, U32, 1336, [16:16] -idleTarget = scalar, S32, 1340, "", 1, 0 -targetRpmByClt = scalar, S32, 1344, "", 1, 0 -targetRpmAc = scalar, S32, 1348, "", 1, 0 -iacByRpmTaper = scalar, F32, 1352 -luaAdd = scalar, F32, 1356 -; total TS size = 1360 -idlePosition0 = scalar, F32, 1360, "per", 1,0 -trim0 = scalar, F32, 1364, "", 1, 0 -luaAdjustment0 = scalar, F32, 1368, "per", 1,0 -m_wastegatePosition0 = scalar, F32, 1372, "per", 1,0 -etbFeedForward0 = scalar, F32, 1376 -etbIntegralError0 = scalar, F32, 1380, "", 1, 0 -etbCurrentTarget0 = scalar, F32, 1384, "%", 1, 0 -etbCurrentAdjustedTarget0 = scalar, F32, 1388, "%", 1, 0 -etbRevLimitActive0 = bits, U32, 1392, [0:0] -jamDetected0 = bits, U32, 1392, [1:1] -etbDutyRateOfChange0 = scalar, F32, 1396, "per", 1,0 -etbDutyAverage0 = scalar, F32, 1400, "per", 1,0 -etbTpsErrorCounter0 = scalar, U16, 1404, "count", 1,0 -etbPpsErrorCounter0 = scalar, U16, 1406, "count", 1,0 -etbErrorCode0 = scalar, S08, 1408, "", 1, 0 -tcEtbDrop0 = scalar, S08, 1409, "", 1, 0 -jamTimer0 = scalar, U16, 1410, "sec", 0.01, 0 -; total TS size = 1412 -faultCode0 = scalar, U08, 1412, "", 1, 0 -heaterDuty0 = scalar, U08, 1413, "%", 1, 0 -pumpDuty0 = scalar, U08, 1414, "%", 1, 0 -tempC0 = scalar, U16, 1416, "C", 1, 0 -nernstVoltage0 = scalar, U16, 1418, "V", 0.001, 0 -esr0 = scalar, U16, 1420, "ohm", 1, 0 +luaSoftSparkSkip = scalar, F32, 1124, "", 1, 0 +luaHardSparkSkip = scalar, F32, 1128, "", 1, 0 +tractionControlSparkSkip = scalar, F32, 1132, "", 1, 0 +desiredRpmLimit = scalar, S16, 1136, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 1140, "", 1, 0 +globalSparkCounter = scalar, U32, 1144, "", 1, 0 +fuelingLoad = scalar, F32, 1148, "", 1, 0 +ignitionLoad = scalar, F32, 1152, "", 1, 0 +veTableYAxis = scalar, U16, 1156, "%", 0.01, 0 +; total TS size = 1160 +tpsFrom = scalar, F32, 1160 +tpsTo = scalar, F32, 1164 +deltaTps = scalar, F32, 1168 +extraFuel = scalar, F32, 1172, "", 1, 0 +valueFromTable = scalar, F32, 1176, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1180, [0:0] +isBelowDecelThreshold = bits, U32, 1180, [1:1] +isTimeToResetAccumulator = bits, U32, 1180, [2:2] +isFractionalEnrichment = bits, U32, 1180, [3:3] +belowEpsilon = bits, U32, 1180, [4:4] +tooShort = bits, U32, 1180, [5:5] +fractionalInjFuel = scalar, F32, 1184, "", 1, 0 +accumulatedValue = scalar, F32, 1188, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1192, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1196, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1200, "", 1, 0 +cycleCnt = scalar, S32, 1204, "", 1, 0 +; total TS size = 1208 +hwEventCounters1 = scalar, U32, 1208, "", 1, 0 +hwEventCounters2 = scalar, U32, 1212, "", 1, 0 +hwEventCounters3 = scalar, U32, 1216, "", 1, 0 +hwEventCounters4 = scalar, U32, 1220, "", 1, 0 +hwEventCounters5 = scalar, U32, 1224, "", 1, 0 +hwEventCounters6 = scalar, U32, 1228, "", 1, 0 +vvtCamCounter = scalar, U32, 1232, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1236, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1240, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1244, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1245, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1248, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1252, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1256, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1260, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1264, [0:0] +; total TS size = 1268 +crankSynchronizationCounter0 = scalar, U32, 1268, "", 1, 0 +vvtSyncGapRatio0 = scalar, F32, 1272, "", 1, 0 +vvtToothDurations00 = scalar, U32, 1276, "us", 1, 0 +vvtCurrentPosition0 = scalar, F32, 1280, "sync: Primary Cam Position", 1, 0 +vvtToothPosition10 = scalar, F32, 1284, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition20 = scalar, F32, 1288, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition30 = scalar, F32, 1292, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition40 = scalar, F32, 1296, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio0 = scalar, F32, 1300, "", 1, 0 +triggerStateIndex0 = scalar, U08, 1304, "", 1, 0 +vvtStateIndex0 = scalar, U08, 1305, "", 1, 0 +; total TS size = 1308 +camResyncCounter = scalar, U08, 1308, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1312, [0:0] +; total TS size = 1316 +wallFuelCorrection = scalar, F32, 1316, "", 1, 0 +wallFuel = scalar, F32, 1320, "", 1, 0 +; total TS size = 1324 +idleState = bits, S32, 1324, [0:2], "not important" +currentIdlePosition = scalar, F32, 1328 +baseIdlePosition = scalar, F32, 1332 +idleClosedLoop = scalar, F32, 1336 +iacByTpsTaper = scalar, F32, 1340 +throttlePedalUpState = scalar, S32, 1344, "", 1, 0 +mightResetPid = bits, U32, 1348, [0:0] +shouldResetPid = bits, U32, 1348, [1:1] +wasResetPid = bits, U32, 1348, [2:2] +mustResetPid = bits, U32, 1348, [3:3] +isCranking = bits, U32, 1348, [4:4] +isIacTableForCoasting = bits, U32, 1348, [5:5] +notIdling = bits, U32, 1348, [6:6] +needReset = bits, U32, 1348, [7:7] +isInDeadZone = bits, U32, 1348, [8:8] +isBlipping = bits, U32, 1348, [9:9] +useClosedLoop = bits, U32, 1348, [10:10] +badTps = bits, U32, 1348, [11:11] +looksLikeRunning = bits, U32, 1348, [12:12] +looksLikeCoasting = bits, U32, 1348, [13:13] +looksLikeCrankToIdle = bits, U32, 1348, [14:14] +isIdleCoasting = bits, U32, 1348, [15:15] +isIdleClosedLoop = bits, U32, 1348, [16:16] +idleTarget = scalar, S32, 1352, "", 1, 0 +targetRpmByClt = scalar, S32, 1356, "", 1, 0 +targetRpmAc = scalar, S32, 1360, "", 1, 0 +iacByRpmTaper = scalar, F32, 1364 +luaAdd = scalar, F32, 1368 +; total TS size = 1372 +idlePosition0 = scalar, F32, 1372, "per", 1,0 +trim0 = scalar, F32, 1376, "", 1, 0 +luaAdjustment0 = scalar, F32, 1380, "per", 1,0 +m_wastegatePosition0 = scalar, F32, 1384, "per", 1,0 +etbFeedForward0 = scalar, F32, 1388 +etbIntegralError0 = scalar, F32, 1392, "", 1, 0 +etbCurrentTarget0 = scalar, F32, 1396, "%", 1, 0 +etbCurrentAdjustedTarget0 = scalar, F32, 1400, "%", 1, 0 +etbRevLimitActive0 = bits, U32, 1404, [0:0] +jamDetected0 = bits, U32, 1404, [1:1] +etbDutyRateOfChange0 = scalar, F32, 1408, "per", 1,0 +etbDutyAverage0 = scalar, F32, 1412, "per", 1,0 +etbTpsErrorCounter0 = scalar, U16, 1416, "count", 1,0 +etbPpsErrorCounter0 = scalar, U16, 1418, "count", 1,0 +etbErrorCode0 = scalar, S08, 1420, "", 1, 0 +tcEtbDrop0 = scalar, S08, 1421, "", 1, 0 +jamTimer0 = scalar, U16, 1422, "sec", 0.01, 0 ; total TS size = 1424 -dcOutput0 = scalar, F32, 1424, "per", 1,0 -isEnabled0_int = scalar, U08, 1428, "per", 1,0 -isEnabled0 = bits, U32, 1432, [0:0] +faultCode0 = scalar, U08, 1424, "", 1, 0 +heaterDuty0 = scalar, U08, 1425, "%", 1, 0 +pumpDuty0 = scalar, U08, 1426, "%", 1, 0 +tempC0 = scalar, U16, 1428, "C", 1, 0 +nernstVoltage0 = scalar, U16, 1430, "V", 0.001, 0 +esr0 = scalar, U16, 1432, "ohm", 1, 0 ; total TS size = 1436 -value0 = scalar, U16, 1436, "value", 1,0 -value1 = scalar, U16, 1438, "value", 1,0 -errorRate = scalar, F32, 1440, "ratio", 1,0 -; total TS size = 1444 -vvtTarget = scalar, U16, 1444, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1446, "%", 0.5, 0 +dcOutput0 = scalar, F32, 1436, "per", 1,0 +isEnabled0_int = scalar, U08, 1440, "per", 1,0 +isEnabled0 = bits, U32, 1444, [0:0] ; total TS size = 1448 -lambdaCurrentlyGood = bits, U32, 1448, [0:0] -lambdaMonitorCut = bits, U32, 1448, [1:1] -lambdaTimeSinceGood = scalar, U16, 1452, "sec", 0.01, 0 +value0 = scalar, U16, 1448, "value", 1,0 +value1 = scalar, U16, 1450, "value", 1,0 +errorRate = scalar, F32, 1452, "ratio", 1,0 ; total TS size = 1456 +vvtTarget = scalar, U16, 1456, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1458, "%", 0.5, 0 +; total TS size = 1460 +lambdaCurrentlyGood = bits, U32, 1460, [0:0] +lambdaMonitorCut = bits, U32, 1460, [1:1] +lambdaTimeSinceGood = scalar, U16, 1464, "sec", 0.01, 0 +; total TS size = 1468 time = { timeNow } @@ -5401,7 +5404,6 @@ entry = smartChipState, "smartChipState", int, "%d" entry = smartChipRestartCounter, "smartChipRestartCounter", int, "%d" entry = smartChipAliveCounter, "smartChipAliveCounter", int, "%d" entry = startStopPhysicalState, "startStopPhysicalState", int, "%d" -entry = acrStateDup, "acrStateDup", int, "%d" entry = acrEngineMovedRecently, "acrEngineMovedRecently", int, "%d" entry = heaterControlEnabled, "heaterControlEnabled", int, "%d" entry = luaDigitalState0, "luaDigitalState0", int, "%d" @@ -5411,6 +5413,9 @@ entry = luaDigitalState3, "luaDigitalState3", int, "%d" entry = startStopStateToggleCounter, "startStopStateToggleCounter", int, "%d" entry = egtValue1, "egtValue1", float, "%.3f" entry = egtValue2, "egtValue2", float, "%.3f" +entry = luaSoftSparkSkip, "luaSoftSparkSkip", float, "%.3f" +entry = luaHardSparkSkip, "luaHardSparkSkip", float, "%.3f" +entry = tractionControlSparkSkip, "tractionControlSparkSkip", float, "%.3f" entry = desiredRpmLimit, "User-defined RPM hard limit", int, "%d" entry = fuelInjectionCounter, "Fuel: Injection counter", int, "%d" entry = globalSparkCounter, "Ign: Spark counter", int, "%d" @@ -5910,7 +5915,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 @@ -6358,7 +6363,6 @@ indicatorPanel = engine_stateIndicatorPanel, 2 indicator = {lua_luaDisableEtb}, "luaDisableEtb No", "luaDisableEtb Yes" indicator = {lua_luaIgnCut}, "luaIgnCut No", "luaIgnCut Yes" indicator = {startStopPhysicalState}, "startStopPhysicalState No", "startStopPhysicalState Yes" - indicator = {acrStateDup}, "acrStateDup No", "acrStateDup Yes" indicator = {acrEngineMovedRecently}, "acrEngineMovedRecently No", "acrEngineMovedRecently Yes" indicator = {heaterControlEnabled}, "heaterControlEnabled No", "heaterControlEnabled Yes" indicator = {luaDigitalState0}, "luaDigitalState0 No", "luaDigitalState0 Yes" @@ -6394,12 +6398,16 @@ dialog = engine_stateDialog, "engine_state" graphLine = egtValue1 graphLine = egtValue2 liveGraph = engine_state_6_Graph, "Graph", South + graphLine = luaSoftSparkSkip + graphLine = luaHardSparkSkip + graphLine = tractionControlSparkSkip graphLine = desiredRpmLimit + liveGraph = engine_state_7_Graph, "Graph", South graphLine = fuelInjectionCounter graphLine = globalSparkCounter graphLine = fuelingLoad - liveGraph = engine_state_7_Graph, "Graph", South graphLine = ignitionLoad + liveGraph = engine_state_8_Graph, "Graph", South graphLine = veTableYAxis indicatorPanel = tps_accel_stateIndicatorPanel, 2 @@ -7306,6 +7314,10 @@ dialog = lambda_monitorDialog, "lambda_monitor" 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 diff --git a/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini b/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini index 22bb74823b..2d2adc8660 100644 --- a/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini +++ b/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini @@ -37,12 +37,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.03.05.alphax-4chan.3271550142" + signature = "rusEFI master.2024.03.05.alphax-4chan.2372228230" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.03.05.alphax-4chan.3271550142" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.03.05.alphax-4chan.2372228230" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -98,7 +98,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","INVALID","B4 - O2","On-board MAP","D5 - PPS","B5 - TPS","F7 - Ignition Key Voltage","C7 - CAM Hall/Digital","X7 - AIN4","D4 - TPS2","INVALID","X5 - AIN3","B2 - MAP","B7 - CLT","B3 - IAT","F6 - PPS2","INVALID","INVALID","INVALID","INVALID","X3 - AIN2","X1 - AIN1 and D5 on older boards" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue Mar 05 00:52:17 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue Mar 05 01:56:21 UTC 2024 pageSize = 22236 page = 1 @@ -745,6 +745,7 @@ mc33810Gpgd3Mode = bits, U32, 1576, [4:4], "false", "true" enableExtendedCanBroadcast = bits, U32, 1576, [5:5], "false", "true" luaCanRxWorkaround = bits, U32, 1576, [6:6], "false", "true" flexSensorInverted = bits, U32, 1576, [7:7], "false", "true" +useHardSkipInTraction = bits, U32, 1576, [8:8], "false", "true" useAuxSpeedForSlipRatio = bits, U32, 1576, [11:11], "false", "true" useVssAsSecondWheelSpeed = bits, U32, 1576, [12:12], "false", "true" is_enabled_spi_5 = bits, U32, 1576, [13:13], "false", "true" @@ -2468,7 +2469,7 @@ injectorStagingRpmBins = array, U16, 22222, [6], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1456 + ochBlockSize = 1468 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3131,145 +3132,147 @@ smartChipState = scalar, S08, 1102, "", 1, 0 smartChipRestartCounter = scalar, S08, 1103, "", 1, 0 smartChipAliveCounter = scalar, S08, 1104, "", 1, 0 startStopPhysicalState = bits, U32, 1108, [0:0] -acrStateDup = bits, U32, 1108, [1:1] -acrEngineMovedRecently = bits, U32, 1108, [2:2] -heaterControlEnabled = bits, U32, 1108, [3:3] -luaDigitalState0 = bits, U32, 1108, [4:4] -luaDigitalState1 = bits, U32, 1108, [5:5] -luaDigitalState2 = bits, U32, 1108, [6:6] -luaDigitalState3 = bits, U32, 1108, [7:7] +acrEngineMovedRecently = bits, U32, 1108, [1:1] +heaterControlEnabled = bits, U32, 1108, [2:2] +luaDigitalState0 = bits, U32, 1108, [3:3] +luaDigitalState1 = bits, U32, 1108, [4:4] +luaDigitalState2 = bits, U32, 1108, [5:5] +luaDigitalState3 = bits, U32, 1108, [6:6] startStopStateToggleCounter = scalar, U32, 1112, "", 1, 0 egtValue1 = scalar, F32, 1116, "", 1, 0 egtValue2 = scalar, F32, 1120, "", 1, 0 -desiredRpmLimit = scalar, S16, 1124, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1128, "", 1, 0 -globalSparkCounter = scalar, U32, 1132, "", 1, 0 -fuelingLoad = scalar, F32, 1136, "", 1, 0 -ignitionLoad = scalar, F32, 1140, "", 1, 0 -veTableYAxis = scalar, U16, 1144, "%", 0.01, 0 -; total TS size = 1148 -tpsFrom = scalar, F32, 1148 -tpsTo = scalar, F32, 1152 -deltaTps = scalar, F32, 1156 -extraFuel = scalar, F32, 1160, "", 1, 0 -valueFromTable = scalar, F32, 1164, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1168, [0:0] -isBelowDecelThreshold = bits, U32, 1168, [1:1] -isTimeToResetAccumulator = bits, U32, 1168, [2:2] -isFractionalEnrichment = bits, U32, 1168, [3:3] -belowEpsilon = bits, U32, 1168, [4:4] -tooShort = bits, U32, 1168, [5:5] -fractionalInjFuel = scalar, F32, 1172, "", 1, 0 -accumulatedValue = scalar, F32, 1176, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1180, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1184, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1188, "", 1, 0 -cycleCnt = scalar, S32, 1192, "", 1, 0 -; total TS size = 1196 -hwEventCounters1 = scalar, U32, 1196, "", 1, 0 -hwEventCounters2 = scalar, U32, 1200, "", 1, 0 -hwEventCounters3 = scalar, U32, 1204, "", 1, 0 -hwEventCounters4 = scalar, U32, 1208, "", 1, 0 -hwEventCounters5 = scalar, U32, 1212, "", 1, 0 -hwEventCounters6 = scalar, U32, 1216, "", 1, 0 -vvtCamCounter = scalar, U32, 1220, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1224, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1228, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1232, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1233, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1236, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1240, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1244, "", 1, 0 -mapCamPrevToothAngle = scalar, F32, 1248, "deg", 1, 0 -isDecodingMapCam = bits, U32, 1252, [0:0] -; total TS size = 1256 -crankSynchronizationCounter0 = scalar, U32, 1256, "", 1, 0 -vvtSyncGapRatio0 = scalar, F32, 1260, "", 1, 0 -vvtToothDurations00 = scalar, U32, 1264, "us", 1, 0 -vvtCurrentPosition0 = scalar, F32, 1268, "sync: Primary Cam Position", 1, 0 -vvtToothPosition10 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition20 = scalar, F32, 1276, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition30 = scalar, F32, 1280, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition40 = scalar, F32, 1284, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio0 = scalar, F32, 1288, "", 1, 0 -triggerStateIndex0 = scalar, U08, 1292, "", 1, 0 -vvtStateIndex0 = scalar, U08, 1293, "", 1, 0 -; total TS size = 1296 -camResyncCounter = scalar, U08, 1296, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1300, [0:0] -; total TS size = 1304 -wallFuelCorrection = scalar, F32, 1304, "", 1, 0 -wallFuel = scalar, F32, 1308, "", 1, 0 -; total TS size = 1312 -idleState = bits, S32, 1312, [0:2], "not important" -currentIdlePosition = scalar, F32, 1316 -baseIdlePosition = scalar, F32, 1320 -idleClosedLoop = scalar, F32, 1324 -iacByTpsTaper = scalar, F32, 1328 -throttlePedalUpState = scalar, S32, 1332, "", 1, 0 -mightResetPid = bits, U32, 1336, [0:0] -shouldResetPid = bits, U32, 1336, [1:1] -wasResetPid = bits, U32, 1336, [2:2] -mustResetPid = bits, U32, 1336, [3:3] -isCranking = bits, U32, 1336, [4:4] -isIacTableForCoasting = bits, U32, 1336, [5:5] -notIdling = bits, U32, 1336, [6:6] -needReset = bits, U32, 1336, [7:7] -isInDeadZone = bits, U32, 1336, [8:8] -isBlipping = bits, U32, 1336, [9:9] -useClosedLoop = bits, U32, 1336, [10:10] -badTps = bits, U32, 1336, [11:11] -looksLikeRunning = bits, U32, 1336, [12:12] -looksLikeCoasting = bits, U32, 1336, [13:13] -looksLikeCrankToIdle = bits, U32, 1336, [14:14] -isIdleCoasting = bits, U32, 1336, [15:15] -isIdleClosedLoop = bits, U32, 1336, [16:16] -idleTarget = scalar, S32, 1340, "", 1, 0 -targetRpmByClt = scalar, S32, 1344, "", 1, 0 -targetRpmAc = scalar, S32, 1348, "", 1, 0 -iacByRpmTaper = scalar, F32, 1352 -luaAdd = scalar, F32, 1356 -; total TS size = 1360 -idlePosition0 = scalar, F32, 1360, "per", 1,0 -trim0 = scalar, F32, 1364, "", 1, 0 -luaAdjustment0 = scalar, F32, 1368, "per", 1,0 -m_wastegatePosition0 = scalar, F32, 1372, "per", 1,0 -etbFeedForward0 = scalar, F32, 1376 -etbIntegralError0 = scalar, F32, 1380, "", 1, 0 -etbCurrentTarget0 = scalar, F32, 1384, "%", 1, 0 -etbCurrentAdjustedTarget0 = scalar, F32, 1388, "%", 1, 0 -etbRevLimitActive0 = bits, U32, 1392, [0:0] -jamDetected0 = bits, U32, 1392, [1:1] -etbDutyRateOfChange0 = scalar, F32, 1396, "per", 1,0 -etbDutyAverage0 = scalar, F32, 1400, "per", 1,0 -etbTpsErrorCounter0 = scalar, U16, 1404, "count", 1,0 -etbPpsErrorCounter0 = scalar, U16, 1406, "count", 1,0 -etbErrorCode0 = scalar, S08, 1408, "", 1, 0 -tcEtbDrop0 = scalar, S08, 1409, "", 1, 0 -jamTimer0 = scalar, U16, 1410, "sec", 0.01, 0 -; total TS size = 1412 -faultCode0 = scalar, U08, 1412, "", 1, 0 -heaterDuty0 = scalar, U08, 1413, "%", 1, 0 -pumpDuty0 = scalar, U08, 1414, "%", 1, 0 -tempC0 = scalar, U16, 1416, "C", 1, 0 -nernstVoltage0 = scalar, U16, 1418, "V", 0.001, 0 -esr0 = scalar, U16, 1420, "ohm", 1, 0 +luaSoftSparkSkip = scalar, F32, 1124, "", 1, 0 +luaHardSparkSkip = scalar, F32, 1128, "", 1, 0 +tractionControlSparkSkip = scalar, F32, 1132, "", 1, 0 +desiredRpmLimit = scalar, S16, 1136, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 1140, "", 1, 0 +globalSparkCounter = scalar, U32, 1144, "", 1, 0 +fuelingLoad = scalar, F32, 1148, "", 1, 0 +ignitionLoad = scalar, F32, 1152, "", 1, 0 +veTableYAxis = scalar, U16, 1156, "%", 0.01, 0 +; total TS size = 1160 +tpsFrom = scalar, F32, 1160 +tpsTo = scalar, F32, 1164 +deltaTps = scalar, F32, 1168 +extraFuel = scalar, F32, 1172, "", 1, 0 +valueFromTable = scalar, F32, 1176, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1180, [0:0] +isBelowDecelThreshold = bits, U32, 1180, [1:1] +isTimeToResetAccumulator = bits, U32, 1180, [2:2] +isFractionalEnrichment = bits, U32, 1180, [3:3] +belowEpsilon = bits, U32, 1180, [4:4] +tooShort = bits, U32, 1180, [5:5] +fractionalInjFuel = scalar, F32, 1184, "", 1, 0 +accumulatedValue = scalar, F32, 1188, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1192, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1196, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1200, "", 1, 0 +cycleCnt = scalar, S32, 1204, "", 1, 0 +; total TS size = 1208 +hwEventCounters1 = scalar, U32, 1208, "", 1, 0 +hwEventCounters2 = scalar, U32, 1212, "", 1, 0 +hwEventCounters3 = scalar, U32, 1216, "", 1, 0 +hwEventCounters4 = scalar, U32, 1220, "", 1, 0 +hwEventCounters5 = scalar, U32, 1224, "", 1, 0 +hwEventCounters6 = scalar, U32, 1228, "", 1, 0 +vvtCamCounter = scalar, U32, 1232, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1236, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1240, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1244, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1245, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1248, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1252, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1256, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1260, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1264, [0:0] +; total TS size = 1268 +crankSynchronizationCounter0 = scalar, U32, 1268, "", 1, 0 +vvtSyncGapRatio0 = scalar, F32, 1272, "", 1, 0 +vvtToothDurations00 = scalar, U32, 1276, "us", 1, 0 +vvtCurrentPosition0 = scalar, F32, 1280, "sync: Primary Cam Position", 1, 0 +vvtToothPosition10 = scalar, F32, 1284, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition20 = scalar, F32, 1288, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition30 = scalar, F32, 1292, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition40 = scalar, F32, 1296, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio0 = scalar, F32, 1300, "", 1, 0 +triggerStateIndex0 = scalar, U08, 1304, "", 1, 0 +vvtStateIndex0 = scalar, U08, 1305, "", 1, 0 +; total TS size = 1308 +camResyncCounter = scalar, U08, 1308, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1312, [0:0] +; total TS size = 1316 +wallFuelCorrection = scalar, F32, 1316, "", 1, 0 +wallFuel = scalar, F32, 1320, "", 1, 0 +; total TS size = 1324 +idleState = bits, S32, 1324, [0:2], "not important" +currentIdlePosition = scalar, F32, 1328 +baseIdlePosition = scalar, F32, 1332 +idleClosedLoop = scalar, F32, 1336 +iacByTpsTaper = scalar, F32, 1340 +throttlePedalUpState = scalar, S32, 1344, "", 1, 0 +mightResetPid = bits, U32, 1348, [0:0] +shouldResetPid = bits, U32, 1348, [1:1] +wasResetPid = bits, U32, 1348, [2:2] +mustResetPid = bits, U32, 1348, [3:3] +isCranking = bits, U32, 1348, [4:4] +isIacTableForCoasting = bits, U32, 1348, [5:5] +notIdling = bits, U32, 1348, [6:6] +needReset = bits, U32, 1348, [7:7] +isInDeadZone = bits, U32, 1348, [8:8] +isBlipping = bits, U32, 1348, [9:9] +useClosedLoop = bits, U32, 1348, [10:10] +badTps = bits, U32, 1348, [11:11] +looksLikeRunning = bits, U32, 1348, [12:12] +looksLikeCoasting = bits, U32, 1348, [13:13] +looksLikeCrankToIdle = bits, U32, 1348, [14:14] +isIdleCoasting = bits, U32, 1348, [15:15] +isIdleClosedLoop = bits, U32, 1348, [16:16] +idleTarget = scalar, S32, 1352, "", 1, 0 +targetRpmByClt = scalar, S32, 1356, "", 1, 0 +targetRpmAc = scalar, S32, 1360, "", 1, 0 +iacByRpmTaper = scalar, F32, 1364 +luaAdd = scalar, F32, 1368 +; total TS size = 1372 +idlePosition0 = scalar, F32, 1372, "per", 1,0 +trim0 = scalar, F32, 1376, "", 1, 0 +luaAdjustment0 = scalar, F32, 1380, "per", 1,0 +m_wastegatePosition0 = scalar, F32, 1384, "per", 1,0 +etbFeedForward0 = scalar, F32, 1388 +etbIntegralError0 = scalar, F32, 1392, "", 1, 0 +etbCurrentTarget0 = scalar, F32, 1396, "%", 1, 0 +etbCurrentAdjustedTarget0 = scalar, F32, 1400, "%", 1, 0 +etbRevLimitActive0 = bits, U32, 1404, [0:0] +jamDetected0 = bits, U32, 1404, [1:1] +etbDutyRateOfChange0 = scalar, F32, 1408, "per", 1,0 +etbDutyAverage0 = scalar, F32, 1412, "per", 1,0 +etbTpsErrorCounter0 = scalar, U16, 1416, "count", 1,0 +etbPpsErrorCounter0 = scalar, U16, 1418, "count", 1,0 +etbErrorCode0 = scalar, S08, 1420, "", 1, 0 +tcEtbDrop0 = scalar, S08, 1421, "", 1, 0 +jamTimer0 = scalar, U16, 1422, "sec", 0.01, 0 ; total TS size = 1424 -dcOutput0 = scalar, F32, 1424, "per", 1,0 -isEnabled0_int = scalar, U08, 1428, "per", 1,0 -isEnabled0 = bits, U32, 1432, [0:0] +faultCode0 = scalar, U08, 1424, "", 1, 0 +heaterDuty0 = scalar, U08, 1425, "%", 1, 0 +pumpDuty0 = scalar, U08, 1426, "%", 1, 0 +tempC0 = scalar, U16, 1428, "C", 1, 0 +nernstVoltage0 = scalar, U16, 1430, "V", 0.001, 0 +esr0 = scalar, U16, 1432, "ohm", 1, 0 ; total TS size = 1436 -value0 = scalar, U16, 1436, "value", 1,0 -value1 = scalar, U16, 1438, "value", 1,0 -errorRate = scalar, F32, 1440, "ratio", 1,0 -; total TS size = 1444 -vvtTarget = scalar, U16, 1444, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1446, "%", 0.5, 0 +dcOutput0 = scalar, F32, 1436, "per", 1,0 +isEnabled0_int = scalar, U08, 1440, "per", 1,0 +isEnabled0 = bits, U32, 1444, [0:0] ; total TS size = 1448 -lambdaCurrentlyGood = bits, U32, 1448, [0:0] -lambdaMonitorCut = bits, U32, 1448, [1:1] -lambdaTimeSinceGood = scalar, U16, 1452, "sec", 0.01, 0 +value0 = scalar, U16, 1448, "value", 1,0 +value1 = scalar, U16, 1450, "value", 1,0 +errorRate = scalar, F32, 1452, "ratio", 1,0 ; total TS size = 1456 +vvtTarget = scalar, U16, 1456, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1458, "%", 0.5, 0 +; total TS size = 1460 +lambdaCurrentlyGood = bits, U32, 1460, [0:0] +lambdaMonitorCut = bits, U32, 1460, [1:1] +lambdaTimeSinceGood = scalar, U16, 1464, "sec", 0.01, 0 +; total TS size = 1468 time = { timeNow } @@ -5401,7 +5404,6 @@ entry = smartChipState, "smartChipState", int, "%d" entry = smartChipRestartCounter, "smartChipRestartCounter", int, "%d" entry = smartChipAliveCounter, "smartChipAliveCounter", int, "%d" entry = startStopPhysicalState, "startStopPhysicalState", int, "%d" -entry = acrStateDup, "acrStateDup", int, "%d" entry = acrEngineMovedRecently, "acrEngineMovedRecently", int, "%d" entry = heaterControlEnabled, "heaterControlEnabled", int, "%d" entry = luaDigitalState0, "luaDigitalState0", int, "%d" @@ -5411,6 +5413,9 @@ entry = luaDigitalState3, "luaDigitalState3", int, "%d" entry = startStopStateToggleCounter, "startStopStateToggleCounter", int, "%d" entry = egtValue1, "egtValue1", float, "%.3f" entry = egtValue2, "egtValue2", float, "%.3f" +entry = luaSoftSparkSkip, "luaSoftSparkSkip", float, "%.3f" +entry = luaHardSparkSkip, "luaHardSparkSkip", float, "%.3f" +entry = tractionControlSparkSkip, "tractionControlSparkSkip", float, "%.3f" entry = desiredRpmLimit, "User-defined RPM hard limit", int, "%d" entry = fuelInjectionCounter, "Fuel: Injection counter", int, "%d" entry = globalSparkCounter, "Ign: Spark counter", int, "%d" @@ -5912,7 +5917,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 @@ -6361,7 +6366,6 @@ indicatorPanel = engine_stateIndicatorPanel, 2 indicator = {lua_luaDisableEtb}, "luaDisableEtb No", "luaDisableEtb Yes" indicator = {lua_luaIgnCut}, "luaIgnCut No", "luaIgnCut Yes" indicator = {startStopPhysicalState}, "startStopPhysicalState No", "startStopPhysicalState Yes" - indicator = {acrStateDup}, "acrStateDup No", "acrStateDup Yes" indicator = {acrEngineMovedRecently}, "acrEngineMovedRecently No", "acrEngineMovedRecently Yes" indicator = {heaterControlEnabled}, "heaterControlEnabled No", "heaterControlEnabled Yes" indicator = {luaDigitalState0}, "luaDigitalState0 No", "luaDigitalState0 Yes" @@ -6397,12 +6401,16 @@ dialog = engine_stateDialog, "engine_state" graphLine = egtValue1 graphLine = egtValue2 liveGraph = engine_state_6_Graph, "Graph", South + graphLine = luaSoftSparkSkip + graphLine = luaHardSparkSkip + graphLine = tractionControlSparkSkip graphLine = desiredRpmLimit + liveGraph = engine_state_7_Graph, "Graph", South graphLine = fuelInjectionCounter graphLine = globalSparkCounter graphLine = fuelingLoad - liveGraph = engine_state_7_Graph, "Graph", South graphLine = ignitionLoad + liveGraph = engine_state_8_Graph, "Graph", South graphLine = veTableYAxis indicatorPanel = tps_accel_stateIndicatorPanel, 2 @@ -7309,6 +7317,10 @@ dialog = lambda_monitorDialog, "lambda_monitor" 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 diff --git a/firmware/tunerstudio/generated/rusefi_alphax-4chan_f7.ini b/firmware/tunerstudio/generated/rusefi_alphax-4chan_f7.ini index 33fe6fb59b..384bb0d398 100644 --- a/firmware/tunerstudio/generated/rusefi_alphax-4chan_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_alphax-4chan_f7.ini @@ -37,12 +37,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.03.05.alphax-4chan_f7.3271550142" + signature = "rusEFI master.2024.03.05.alphax-4chan_f7.2372228230" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.03.05.alphax-4chan_f7.3271550142" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.03.05.alphax-4chan_f7.2372228230" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -98,7 +98,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","INVALID","B4 - O2","On-board MAP","D5 - PPS","B5 - TPS","F7 - Ignition Key Voltage","C7 - CAM Hall/Digital","X7 - AIN4","D4 - TPS2","INVALID","X5 - AIN3","B2 - MAP","B7 - CLT","B3 - IAT","F6 - PPS2","INVALID","INVALID","INVALID","INVALID","X3 - AIN2","X1 - AIN1 and D5 on older boards" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue Mar 05 00:52:18 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue Mar 05 01:56:23 UTC 2024 pageSize = 22236 page = 1 @@ -745,6 +745,7 @@ mc33810Gpgd3Mode = bits, U32, 1576, [4:4], "false", "true" enableExtendedCanBroadcast = bits, U32, 1576, [5:5], "false", "true" luaCanRxWorkaround = bits, U32, 1576, [6:6], "false", "true" flexSensorInverted = bits, U32, 1576, [7:7], "false", "true" +useHardSkipInTraction = bits, U32, 1576, [8:8], "false", "true" useAuxSpeedForSlipRatio = bits, U32, 1576, [11:11], "false", "true" useVssAsSecondWheelSpeed = bits, U32, 1576, [12:12], "false", "true" is_enabled_spi_5 = bits, U32, 1576, [13:13], "false", "true" @@ -2468,7 +2469,7 @@ injectorStagingRpmBins = array, U16, 22222, [6], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1456 + ochBlockSize = 1468 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3131,145 +3132,147 @@ smartChipState = scalar, S08, 1102, "", 1, 0 smartChipRestartCounter = scalar, S08, 1103, "", 1, 0 smartChipAliveCounter = scalar, S08, 1104, "", 1, 0 startStopPhysicalState = bits, U32, 1108, [0:0] -acrStateDup = bits, U32, 1108, [1:1] -acrEngineMovedRecently = bits, U32, 1108, [2:2] -heaterControlEnabled = bits, U32, 1108, [3:3] -luaDigitalState0 = bits, U32, 1108, [4:4] -luaDigitalState1 = bits, U32, 1108, [5:5] -luaDigitalState2 = bits, U32, 1108, [6:6] -luaDigitalState3 = bits, U32, 1108, [7:7] +acrEngineMovedRecently = bits, U32, 1108, [1:1] +heaterControlEnabled = bits, U32, 1108, [2:2] +luaDigitalState0 = bits, U32, 1108, [3:3] +luaDigitalState1 = bits, U32, 1108, [4:4] +luaDigitalState2 = bits, U32, 1108, [5:5] +luaDigitalState3 = bits, U32, 1108, [6:6] startStopStateToggleCounter = scalar, U32, 1112, "", 1, 0 egtValue1 = scalar, F32, 1116, "", 1, 0 egtValue2 = scalar, F32, 1120, "", 1, 0 -desiredRpmLimit = scalar, S16, 1124, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1128, "", 1, 0 -globalSparkCounter = scalar, U32, 1132, "", 1, 0 -fuelingLoad = scalar, F32, 1136, "", 1, 0 -ignitionLoad = scalar, F32, 1140, "", 1, 0 -veTableYAxis = scalar, U16, 1144, "%", 0.01, 0 -; total TS size = 1148 -tpsFrom = scalar, F32, 1148 -tpsTo = scalar, F32, 1152 -deltaTps = scalar, F32, 1156 -extraFuel = scalar, F32, 1160, "", 1, 0 -valueFromTable = scalar, F32, 1164, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1168, [0:0] -isBelowDecelThreshold = bits, U32, 1168, [1:1] -isTimeToResetAccumulator = bits, U32, 1168, [2:2] -isFractionalEnrichment = bits, U32, 1168, [3:3] -belowEpsilon = bits, U32, 1168, [4:4] -tooShort = bits, U32, 1168, [5:5] -fractionalInjFuel = scalar, F32, 1172, "", 1, 0 -accumulatedValue = scalar, F32, 1176, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1180, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1184, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1188, "", 1, 0 -cycleCnt = scalar, S32, 1192, "", 1, 0 -; total TS size = 1196 -hwEventCounters1 = scalar, U32, 1196, "", 1, 0 -hwEventCounters2 = scalar, U32, 1200, "", 1, 0 -hwEventCounters3 = scalar, U32, 1204, "", 1, 0 -hwEventCounters4 = scalar, U32, 1208, "", 1, 0 -hwEventCounters5 = scalar, U32, 1212, "", 1, 0 -hwEventCounters6 = scalar, U32, 1216, "", 1, 0 -vvtCamCounter = scalar, U32, 1220, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1224, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1228, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1232, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1233, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1236, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1240, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1244, "", 1, 0 -mapCamPrevToothAngle = scalar, F32, 1248, "deg", 1, 0 -isDecodingMapCam = bits, U32, 1252, [0:0] -; total TS size = 1256 -crankSynchronizationCounter0 = scalar, U32, 1256, "", 1, 0 -vvtSyncGapRatio0 = scalar, F32, 1260, "", 1, 0 -vvtToothDurations00 = scalar, U32, 1264, "us", 1, 0 -vvtCurrentPosition0 = scalar, F32, 1268, "sync: Primary Cam Position", 1, 0 -vvtToothPosition10 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition20 = scalar, F32, 1276, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition30 = scalar, F32, 1280, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition40 = scalar, F32, 1284, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio0 = scalar, F32, 1288, "", 1, 0 -triggerStateIndex0 = scalar, U08, 1292, "", 1, 0 -vvtStateIndex0 = scalar, U08, 1293, "", 1, 0 -; total TS size = 1296 -camResyncCounter = scalar, U08, 1296, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1300, [0:0] -; total TS size = 1304 -wallFuelCorrection = scalar, F32, 1304, "", 1, 0 -wallFuel = scalar, F32, 1308, "", 1, 0 -; total TS size = 1312 -idleState = bits, S32, 1312, [0:2], "not important" -currentIdlePosition = scalar, F32, 1316 -baseIdlePosition = scalar, F32, 1320 -idleClosedLoop = scalar, F32, 1324 -iacByTpsTaper = scalar, F32, 1328 -throttlePedalUpState = scalar, S32, 1332, "", 1, 0 -mightResetPid = bits, U32, 1336, [0:0] -shouldResetPid = bits, U32, 1336, [1:1] -wasResetPid = bits, U32, 1336, [2:2] -mustResetPid = bits, U32, 1336, [3:3] -isCranking = bits, U32, 1336, [4:4] -isIacTableForCoasting = bits, U32, 1336, [5:5] -notIdling = bits, U32, 1336, [6:6] -needReset = bits, U32, 1336, [7:7] -isInDeadZone = bits, U32, 1336, [8:8] -isBlipping = bits, U32, 1336, [9:9] -useClosedLoop = bits, U32, 1336, [10:10] -badTps = bits, U32, 1336, [11:11] -looksLikeRunning = bits, U32, 1336, [12:12] -looksLikeCoasting = bits, U32, 1336, [13:13] -looksLikeCrankToIdle = bits, U32, 1336, [14:14] -isIdleCoasting = bits, U32, 1336, [15:15] -isIdleClosedLoop = bits, U32, 1336, [16:16] -idleTarget = scalar, S32, 1340, "", 1, 0 -targetRpmByClt = scalar, S32, 1344, "", 1, 0 -targetRpmAc = scalar, S32, 1348, "", 1, 0 -iacByRpmTaper = scalar, F32, 1352 -luaAdd = scalar, F32, 1356 -; total TS size = 1360 -idlePosition0 = scalar, F32, 1360, "per", 1,0 -trim0 = scalar, F32, 1364, "", 1, 0 -luaAdjustment0 = scalar, F32, 1368, "per", 1,0 -m_wastegatePosition0 = scalar, F32, 1372, "per", 1,0 -etbFeedForward0 = scalar, F32, 1376 -etbIntegralError0 = scalar, F32, 1380, "", 1, 0 -etbCurrentTarget0 = scalar, F32, 1384, "%", 1, 0 -etbCurrentAdjustedTarget0 = scalar, F32, 1388, "%", 1, 0 -etbRevLimitActive0 = bits, U32, 1392, [0:0] -jamDetected0 = bits, U32, 1392, [1:1] -etbDutyRateOfChange0 = scalar, F32, 1396, "per", 1,0 -etbDutyAverage0 = scalar, F32, 1400, "per", 1,0 -etbTpsErrorCounter0 = scalar, U16, 1404, "count", 1,0 -etbPpsErrorCounter0 = scalar, U16, 1406, "count", 1,0 -etbErrorCode0 = scalar, S08, 1408, "", 1, 0 -tcEtbDrop0 = scalar, S08, 1409, "", 1, 0 -jamTimer0 = scalar, U16, 1410, "sec", 0.01, 0 -; total TS size = 1412 -faultCode0 = scalar, U08, 1412, "", 1, 0 -heaterDuty0 = scalar, U08, 1413, "%", 1, 0 -pumpDuty0 = scalar, U08, 1414, "%", 1, 0 -tempC0 = scalar, U16, 1416, "C", 1, 0 -nernstVoltage0 = scalar, U16, 1418, "V", 0.001, 0 -esr0 = scalar, U16, 1420, "ohm", 1, 0 +luaSoftSparkSkip = scalar, F32, 1124, "", 1, 0 +luaHardSparkSkip = scalar, F32, 1128, "", 1, 0 +tractionControlSparkSkip = scalar, F32, 1132, "", 1, 0 +desiredRpmLimit = scalar, S16, 1136, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 1140, "", 1, 0 +globalSparkCounter = scalar, U32, 1144, "", 1, 0 +fuelingLoad = scalar, F32, 1148, "", 1, 0 +ignitionLoad = scalar, F32, 1152, "", 1, 0 +veTableYAxis = scalar, U16, 1156, "%", 0.01, 0 +; total TS size = 1160 +tpsFrom = scalar, F32, 1160 +tpsTo = scalar, F32, 1164 +deltaTps = scalar, F32, 1168 +extraFuel = scalar, F32, 1172, "", 1, 0 +valueFromTable = scalar, F32, 1176, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1180, [0:0] +isBelowDecelThreshold = bits, U32, 1180, [1:1] +isTimeToResetAccumulator = bits, U32, 1180, [2:2] +isFractionalEnrichment = bits, U32, 1180, [3:3] +belowEpsilon = bits, U32, 1180, [4:4] +tooShort = bits, U32, 1180, [5:5] +fractionalInjFuel = scalar, F32, 1184, "", 1, 0 +accumulatedValue = scalar, F32, 1188, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1192, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1196, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1200, "", 1, 0 +cycleCnt = scalar, S32, 1204, "", 1, 0 +; total TS size = 1208 +hwEventCounters1 = scalar, U32, 1208, "", 1, 0 +hwEventCounters2 = scalar, U32, 1212, "", 1, 0 +hwEventCounters3 = scalar, U32, 1216, "", 1, 0 +hwEventCounters4 = scalar, U32, 1220, "", 1, 0 +hwEventCounters5 = scalar, U32, 1224, "", 1, 0 +hwEventCounters6 = scalar, U32, 1228, "", 1, 0 +vvtCamCounter = scalar, U32, 1232, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1236, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1240, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1244, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1245, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1248, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1252, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1256, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1260, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1264, [0:0] +; total TS size = 1268 +crankSynchronizationCounter0 = scalar, U32, 1268, "", 1, 0 +vvtSyncGapRatio0 = scalar, F32, 1272, "", 1, 0 +vvtToothDurations00 = scalar, U32, 1276, "us", 1, 0 +vvtCurrentPosition0 = scalar, F32, 1280, "sync: Primary Cam Position", 1, 0 +vvtToothPosition10 = scalar, F32, 1284, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition20 = scalar, F32, 1288, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition30 = scalar, F32, 1292, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition40 = scalar, F32, 1296, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio0 = scalar, F32, 1300, "", 1, 0 +triggerStateIndex0 = scalar, U08, 1304, "", 1, 0 +vvtStateIndex0 = scalar, U08, 1305, "", 1, 0 +; total TS size = 1308 +camResyncCounter = scalar, U08, 1308, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1312, [0:0] +; total TS size = 1316 +wallFuelCorrection = scalar, F32, 1316, "", 1, 0 +wallFuel = scalar, F32, 1320, "", 1, 0 +; total TS size = 1324 +idleState = bits, S32, 1324, [0:2], "not important" +currentIdlePosition = scalar, F32, 1328 +baseIdlePosition = scalar, F32, 1332 +idleClosedLoop = scalar, F32, 1336 +iacByTpsTaper = scalar, F32, 1340 +throttlePedalUpState = scalar, S32, 1344, "", 1, 0 +mightResetPid = bits, U32, 1348, [0:0] +shouldResetPid = bits, U32, 1348, [1:1] +wasResetPid = bits, U32, 1348, [2:2] +mustResetPid = bits, U32, 1348, [3:3] +isCranking = bits, U32, 1348, [4:4] +isIacTableForCoasting = bits, U32, 1348, [5:5] +notIdling = bits, U32, 1348, [6:6] +needReset = bits, U32, 1348, [7:7] +isInDeadZone = bits, U32, 1348, [8:8] +isBlipping = bits, U32, 1348, [9:9] +useClosedLoop = bits, U32, 1348, [10:10] +badTps = bits, U32, 1348, [11:11] +looksLikeRunning = bits, U32, 1348, [12:12] +looksLikeCoasting = bits, U32, 1348, [13:13] +looksLikeCrankToIdle = bits, U32, 1348, [14:14] +isIdleCoasting = bits, U32, 1348, [15:15] +isIdleClosedLoop = bits, U32, 1348, [16:16] +idleTarget = scalar, S32, 1352, "", 1, 0 +targetRpmByClt = scalar, S32, 1356, "", 1, 0 +targetRpmAc = scalar, S32, 1360, "", 1, 0 +iacByRpmTaper = scalar, F32, 1364 +luaAdd = scalar, F32, 1368 +; total TS size = 1372 +idlePosition0 = scalar, F32, 1372, "per", 1,0 +trim0 = scalar, F32, 1376, "", 1, 0 +luaAdjustment0 = scalar, F32, 1380, "per", 1,0 +m_wastegatePosition0 = scalar, F32, 1384, "per", 1,0 +etbFeedForward0 = scalar, F32, 1388 +etbIntegralError0 = scalar, F32, 1392, "", 1, 0 +etbCurrentTarget0 = scalar, F32, 1396, "%", 1, 0 +etbCurrentAdjustedTarget0 = scalar, F32, 1400, "%", 1, 0 +etbRevLimitActive0 = bits, U32, 1404, [0:0] +jamDetected0 = bits, U32, 1404, [1:1] +etbDutyRateOfChange0 = scalar, F32, 1408, "per", 1,0 +etbDutyAverage0 = scalar, F32, 1412, "per", 1,0 +etbTpsErrorCounter0 = scalar, U16, 1416, "count", 1,0 +etbPpsErrorCounter0 = scalar, U16, 1418, "count", 1,0 +etbErrorCode0 = scalar, S08, 1420, "", 1, 0 +tcEtbDrop0 = scalar, S08, 1421, "", 1, 0 +jamTimer0 = scalar, U16, 1422, "sec", 0.01, 0 ; total TS size = 1424 -dcOutput0 = scalar, F32, 1424, "per", 1,0 -isEnabled0_int = scalar, U08, 1428, "per", 1,0 -isEnabled0 = bits, U32, 1432, [0:0] +faultCode0 = scalar, U08, 1424, "", 1, 0 +heaterDuty0 = scalar, U08, 1425, "%", 1, 0 +pumpDuty0 = scalar, U08, 1426, "%", 1, 0 +tempC0 = scalar, U16, 1428, "C", 1, 0 +nernstVoltage0 = scalar, U16, 1430, "V", 0.001, 0 +esr0 = scalar, U16, 1432, "ohm", 1, 0 ; total TS size = 1436 -value0 = scalar, U16, 1436, "value", 1,0 -value1 = scalar, U16, 1438, "value", 1,0 -errorRate = scalar, F32, 1440, "ratio", 1,0 -; total TS size = 1444 -vvtTarget = scalar, U16, 1444, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1446, "%", 0.5, 0 +dcOutput0 = scalar, F32, 1436, "per", 1,0 +isEnabled0_int = scalar, U08, 1440, "per", 1,0 +isEnabled0 = bits, U32, 1444, [0:0] ; total TS size = 1448 -lambdaCurrentlyGood = bits, U32, 1448, [0:0] -lambdaMonitorCut = bits, U32, 1448, [1:1] -lambdaTimeSinceGood = scalar, U16, 1452, "sec", 0.01, 0 +value0 = scalar, U16, 1448, "value", 1,0 +value1 = scalar, U16, 1450, "value", 1,0 +errorRate = scalar, F32, 1452, "ratio", 1,0 ; total TS size = 1456 +vvtTarget = scalar, U16, 1456, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1458, "%", 0.5, 0 +; total TS size = 1460 +lambdaCurrentlyGood = bits, U32, 1460, [0:0] +lambdaMonitorCut = bits, U32, 1460, [1:1] +lambdaTimeSinceGood = scalar, U16, 1464, "sec", 0.01, 0 +; total TS size = 1468 time = { timeNow } @@ -5401,7 +5404,6 @@ entry = smartChipState, "smartChipState", int, "%d" entry = smartChipRestartCounter, "smartChipRestartCounter", int, "%d" entry = smartChipAliveCounter, "smartChipAliveCounter", int, "%d" entry = startStopPhysicalState, "startStopPhysicalState", int, "%d" -entry = acrStateDup, "acrStateDup", int, "%d" entry = acrEngineMovedRecently, "acrEngineMovedRecently", int, "%d" entry = heaterControlEnabled, "heaterControlEnabled", int, "%d" entry = luaDigitalState0, "luaDigitalState0", int, "%d" @@ -5411,6 +5413,9 @@ entry = luaDigitalState3, "luaDigitalState3", int, "%d" entry = startStopStateToggleCounter, "startStopStateToggleCounter", int, "%d" entry = egtValue1, "egtValue1", float, "%.3f" entry = egtValue2, "egtValue2", float, "%.3f" +entry = luaSoftSparkSkip, "luaSoftSparkSkip", float, "%.3f" +entry = luaHardSparkSkip, "luaHardSparkSkip", float, "%.3f" +entry = tractionControlSparkSkip, "tractionControlSparkSkip", float, "%.3f" entry = desiredRpmLimit, "User-defined RPM hard limit", int, "%d" entry = fuelInjectionCounter, "Fuel: Injection counter", int, "%d" entry = globalSparkCounter, "Ign: Spark counter", int, "%d" @@ -5912,7 +5917,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 @@ -6361,7 +6366,6 @@ indicatorPanel = engine_stateIndicatorPanel, 2 indicator = {lua_luaDisableEtb}, "luaDisableEtb No", "luaDisableEtb Yes" indicator = {lua_luaIgnCut}, "luaIgnCut No", "luaIgnCut Yes" indicator = {startStopPhysicalState}, "startStopPhysicalState No", "startStopPhysicalState Yes" - indicator = {acrStateDup}, "acrStateDup No", "acrStateDup Yes" indicator = {acrEngineMovedRecently}, "acrEngineMovedRecently No", "acrEngineMovedRecently Yes" indicator = {heaterControlEnabled}, "heaterControlEnabled No", "heaterControlEnabled Yes" indicator = {luaDigitalState0}, "luaDigitalState0 No", "luaDigitalState0 Yes" @@ -6397,12 +6401,16 @@ dialog = engine_stateDialog, "engine_state" graphLine = egtValue1 graphLine = egtValue2 liveGraph = engine_state_6_Graph, "Graph", South + graphLine = luaSoftSparkSkip + graphLine = luaHardSparkSkip + graphLine = tractionControlSparkSkip graphLine = desiredRpmLimit + liveGraph = engine_state_7_Graph, "Graph", South graphLine = fuelInjectionCounter graphLine = globalSparkCounter graphLine = fuelingLoad - liveGraph = engine_state_7_Graph, "Graph", South graphLine = ignitionLoad + liveGraph = engine_state_8_Graph, "Graph", South graphLine = veTableYAxis indicatorPanel = tps_accel_stateIndicatorPanel, 2 @@ -7309,6 +7317,10 @@ dialog = lambda_monitorDialog, "lambda_monitor" 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 diff --git a/firmware/tunerstudio/generated/rusefi_alphax-8chan-revA.ini b/firmware/tunerstudio/generated/rusefi_alphax-8chan-revA.ini index ea4eef488b..fbe44d3444 100644 --- a/firmware/tunerstudio/generated/rusefi_alphax-8chan-revA.ini +++ b/firmware/tunerstudio/generated/rusefi_alphax-8chan-revA.ini @@ -37,12 +37,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.03.05.alphax-8chan-revA.122285346" + signature = "rusEFI master.2024.03.05.alphax-8chan-revA.1221811482" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.03.05.alphax-8chan-revA.122285346" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.03.05.alphax-8chan-revA.1221811482" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -98,7 +98,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","INVALID","INVALID","INVALID","17A - PPS","23C - TPS","Battery Sense","INVALID","15D - AN5","24C - TPS2","14A - Analog 1","22A - Analog 22","On-board MAP","16A - CLT","15A - IAT","31C - PPS2","33A - AN3","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","16D - AN6","INVALID","INVALID","INVALID","INVALID","7C - AT4","INVALID","6C - AT3","14D - AN4" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue Mar 05 00:52:23 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue Mar 05 01:56:27 UTC 2024 pageSize = 22236 page = 1 @@ -745,6 +745,7 @@ mc33810Gpgd3Mode = bits, U32, 1576, [4:4], "false", "true" enableExtendedCanBroadcast = bits, U32, 1576, [5:5], "false", "true" luaCanRxWorkaround = bits, U32, 1576, [6:6], "false", "true" flexSensorInverted = bits, U32, 1576, [7:7], "false", "true" +useHardSkipInTraction = bits, U32, 1576, [8:8], "false", "true" useAuxSpeedForSlipRatio = bits, U32, 1576, [11:11], "false", "true" useVssAsSecondWheelSpeed = bits, U32, 1576, [12:12], "false", "true" is_enabled_spi_5 = bits, U32, 1576, [13:13], "false", "true" @@ -2468,7 +2469,7 @@ injectorStagingRpmBins = array, U16, 22222, [6], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1456 + ochBlockSize = 1468 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3131,145 +3132,147 @@ smartChipState = scalar, S08, 1102, "", 1, 0 smartChipRestartCounter = scalar, S08, 1103, "", 1, 0 smartChipAliveCounter = scalar, S08, 1104, "", 1, 0 startStopPhysicalState = bits, U32, 1108, [0:0] -acrStateDup = bits, U32, 1108, [1:1] -acrEngineMovedRecently = bits, U32, 1108, [2:2] -heaterControlEnabled = bits, U32, 1108, [3:3] -luaDigitalState0 = bits, U32, 1108, [4:4] -luaDigitalState1 = bits, U32, 1108, [5:5] -luaDigitalState2 = bits, U32, 1108, [6:6] -luaDigitalState3 = bits, U32, 1108, [7:7] +acrEngineMovedRecently = bits, U32, 1108, [1:1] +heaterControlEnabled = bits, U32, 1108, [2:2] +luaDigitalState0 = bits, U32, 1108, [3:3] +luaDigitalState1 = bits, U32, 1108, [4:4] +luaDigitalState2 = bits, U32, 1108, [5:5] +luaDigitalState3 = bits, U32, 1108, [6:6] startStopStateToggleCounter = scalar, U32, 1112, "", 1, 0 egtValue1 = scalar, F32, 1116, "", 1, 0 egtValue2 = scalar, F32, 1120, "", 1, 0 -desiredRpmLimit = scalar, S16, 1124, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1128, "", 1, 0 -globalSparkCounter = scalar, U32, 1132, "", 1, 0 -fuelingLoad = scalar, F32, 1136, "", 1, 0 -ignitionLoad = scalar, F32, 1140, "", 1, 0 -veTableYAxis = scalar, U16, 1144, "%", 0.01, 0 -; total TS size = 1148 -tpsFrom = scalar, F32, 1148 -tpsTo = scalar, F32, 1152 -deltaTps = scalar, F32, 1156 -extraFuel = scalar, F32, 1160, "", 1, 0 -valueFromTable = scalar, F32, 1164, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1168, [0:0] -isBelowDecelThreshold = bits, U32, 1168, [1:1] -isTimeToResetAccumulator = bits, U32, 1168, [2:2] -isFractionalEnrichment = bits, U32, 1168, [3:3] -belowEpsilon = bits, U32, 1168, [4:4] -tooShort = bits, U32, 1168, [5:5] -fractionalInjFuel = scalar, F32, 1172, "", 1, 0 -accumulatedValue = scalar, F32, 1176, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1180, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1184, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1188, "", 1, 0 -cycleCnt = scalar, S32, 1192, "", 1, 0 -; total TS size = 1196 -hwEventCounters1 = scalar, U32, 1196, "", 1, 0 -hwEventCounters2 = scalar, U32, 1200, "", 1, 0 -hwEventCounters3 = scalar, U32, 1204, "", 1, 0 -hwEventCounters4 = scalar, U32, 1208, "", 1, 0 -hwEventCounters5 = scalar, U32, 1212, "", 1, 0 -hwEventCounters6 = scalar, U32, 1216, "", 1, 0 -vvtCamCounter = scalar, U32, 1220, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1224, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1228, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1232, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1233, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1236, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1240, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1244, "", 1, 0 -mapCamPrevToothAngle = scalar, F32, 1248, "deg", 1, 0 -isDecodingMapCam = bits, U32, 1252, [0:0] -; total TS size = 1256 -crankSynchronizationCounter0 = scalar, U32, 1256, "", 1, 0 -vvtSyncGapRatio0 = scalar, F32, 1260, "", 1, 0 -vvtToothDurations00 = scalar, U32, 1264, "us", 1, 0 -vvtCurrentPosition0 = scalar, F32, 1268, "sync: Primary Cam Position", 1, 0 -vvtToothPosition10 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition20 = scalar, F32, 1276, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition30 = scalar, F32, 1280, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition40 = scalar, F32, 1284, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio0 = scalar, F32, 1288, "", 1, 0 -triggerStateIndex0 = scalar, U08, 1292, "", 1, 0 -vvtStateIndex0 = scalar, U08, 1293, "", 1, 0 -; total TS size = 1296 -camResyncCounter = scalar, U08, 1296, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1300, [0:0] -; total TS size = 1304 -wallFuelCorrection = scalar, F32, 1304, "", 1, 0 -wallFuel = scalar, F32, 1308, "", 1, 0 -; total TS size = 1312 -idleState = bits, S32, 1312, [0:2], "not important" -currentIdlePosition = scalar, F32, 1316 -baseIdlePosition = scalar, F32, 1320 -idleClosedLoop = scalar, F32, 1324 -iacByTpsTaper = scalar, F32, 1328 -throttlePedalUpState = scalar, S32, 1332, "", 1, 0 -mightResetPid = bits, U32, 1336, [0:0] -shouldResetPid = bits, U32, 1336, [1:1] -wasResetPid = bits, U32, 1336, [2:2] -mustResetPid = bits, U32, 1336, [3:3] -isCranking = bits, U32, 1336, [4:4] -isIacTableForCoasting = bits, U32, 1336, [5:5] -notIdling = bits, U32, 1336, [6:6] -needReset = bits, U32, 1336, [7:7] -isInDeadZone = bits, U32, 1336, [8:8] -isBlipping = bits, U32, 1336, [9:9] -useClosedLoop = bits, U32, 1336, [10:10] -badTps = bits, U32, 1336, [11:11] -looksLikeRunning = bits, U32, 1336, [12:12] -looksLikeCoasting = bits, U32, 1336, [13:13] -looksLikeCrankToIdle = bits, U32, 1336, [14:14] -isIdleCoasting = bits, U32, 1336, [15:15] -isIdleClosedLoop = bits, U32, 1336, [16:16] -idleTarget = scalar, S32, 1340, "", 1, 0 -targetRpmByClt = scalar, S32, 1344, "", 1, 0 -targetRpmAc = scalar, S32, 1348, "", 1, 0 -iacByRpmTaper = scalar, F32, 1352 -luaAdd = scalar, F32, 1356 -; total TS size = 1360 -idlePosition0 = scalar, F32, 1360, "per", 1,0 -trim0 = scalar, F32, 1364, "", 1, 0 -luaAdjustment0 = scalar, F32, 1368, "per", 1,0 -m_wastegatePosition0 = scalar, F32, 1372, "per", 1,0 -etbFeedForward0 = scalar, F32, 1376 -etbIntegralError0 = scalar, F32, 1380, "", 1, 0 -etbCurrentTarget0 = scalar, F32, 1384, "%", 1, 0 -etbCurrentAdjustedTarget0 = scalar, F32, 1388, "%", 1, 0 -etbRevLimitActive0 = bits, U32, 1392, [0:0] -jamDetected0 = bits, U32, 1392, [1:1] -etbDutyRateOfChange0 = scalar, F32, 1396, "per", 1,0 -etbDutyAverage0 = scalar, F32, 1400, "per", 1,0 -etbTpsErrorCounter0 = scalar, U16, 1404, "count", 1,0 -etbPpsErrorCounter0 = scalar, U16, 1406, "count", 1,0 -etbErrorCode0 = scalar, S08, 1408, "", 1, 0 -tcEtbDrop0 = scalar, S08, 1409, "", 1, 0 -jamTimer0 = scalar, U16, 1410, "sec", 0.01, 0 -; total TS size = 1412 -faultCode0 = scalar, U08, 1412, "", 1, 0 -heaterDuty0 = scalar, U08, 1413, "%", 1, 0 -pumpDuty0 = scalar, U08, 1414, "%", 1, 0 -tempC0 = scalar, U16, 1416, "C", 1, 0 -nernstVoltage0 = scalar, U16, 1418, "V", 0.001, 0 -esr0 = scalar, U16, 1420, "ohm", 1, 0 +luaSoftSparkSkip = scalar, F32, 1124, "", 1, 0 +luaHardSparkSkip = scalar, F32, 1128, "", 1, 0 +tractionControlSparkSkip = scalar, F32, 1132, "", 1, 0 +desiredRpmLimit = scalar, S16, 1136, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 1140, "", 1, 0 +globalSparkCounter = scalar, U32, 1144, "", 1, 0 +fuelingLoad = scalar, F32, 1148, "", 1, 0 +ignitionLoad = scalar, F32, 1152, "", 1, 0 +veTableYAxis = scalar, U16, 1156, "%", 0.01, 0 +; total TS size = 1160 +tpsFrom = scalar, F32, 1160 +tpsTo = scalar, F32, 1164 +deltaTps = scalar, F32, 1168 +extraFuel = scalar, F32, 1172, "", 1, 0 +valueFromTable = scalar, F32, 1176, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1180, [0:0] +isBelowDecelThreshold = bits, U32, 1180, [1:1] +isTimeToResetAccumulator = bits, U32, 1180, [2:2] +isFractionalEnrichment = bits, U32, 1180, [3:3] +belowEpsilon = bits, U32, 1180, [4:4] +tooShort = bits, U32, 1180, [5:5] +fractionalInjFuel = scalar, F32, 1184, "", 1, 0 +accumulatedValue = scalar, F32, 1188, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1192, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1196, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1200, "", 1, 0 +cycleCnt = scalar, S32, 1204, "", 1, 0 +; total TS size = 1208 +hwEventCounters1 = scalar, U32, 1208, "", 1, 0 +hwEventCounters2 = scalar, U32, 1212, "", 1, 0 +hwEventCounters3 = scalar, U32, 1216, "", 1, 0 +hwEventCounters4 = scalar, U32, 1220, "", 1, 0 +hwEventCounters5 = scalar, U32, 1224, "", 1, 0 +hwEventCounters6 = scalar, U32, 1228, "", 1, 0 +vvtCamCounter = scalar, U32, 1232, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1236, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1240, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1244, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1245, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1248, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1252, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1256, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1260, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1264, [0:0] +; total TS size = 1268 +crankSynchronizationCounter0 = scalar, U32, 1268, "", 1, 0 +vvtSyncGapRatio0 = scalar, F32, 1272, "", 1, 0 +vvtToothDurations00 = scalar, U32, 1276, "us", 1, 0 +vvtCurrentPosition0 = scalar, F32, 1280, "sync: Primary Cam Position", 1, 0 +vvtToothPosition10 = scalar, F32, 1284, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition20 = scalar, F32, 1288, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition30 = scalar, F32, 1292, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition40 = scalar, F32, 1296, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio0 = scalar, F32, 1300, "", 1, 0 +triggerStateIndex0 = scalar, U08, 1304, "", 1, 0 +vvtStateIndex0 = scalar, U08, 1305, "", 1, 0 +; total TS size = 1308 +camResyncCounter = scalar, U08, 1308, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1312, [0:0] +; total TS size = 1316 +wallFuelCorrection = scalar, F32, 1316, "", 1, 0 +wallFuel = scalar, F32, 1320, "", 1, 0 +; total TS size = 1324 +idleState = bits, S32, 1324, [0:2], "not important" +currentIdlePosition = scalar, F32, 1328 +baseIdlePosition = scalar, F32, 1332 +idleClosedLoop = scalar, F32, 1336 +iacByTpsTaper = scalar, F32, 1340 +throttlePedalUpState = scalar, S32, 1344, "", 1, 0 +mightResetPid = bits, U32, 1348, [0:0] +shouldResetPid = bits, U32, 1348, [1:1] +wasResetPid = bits, U32, 1348, [2:2] +mustResetPid = bits, U32, 1348, [3:3] +isCranking = bits, U32, 1348, [4:4] +isIacTableForCoasting = bits, U32, 1348, [5:5] +notIdling = bits, U32, 1348, [6:6] +needReset = bits, U32, 1348, [7:7] +isInDeadZone = bits, U32, 1348, [8:8] +isBlipping = bits, U32, 1348, [9:9] +useClosedLoop = bits, U32, 1348, [10:10] +badTps = bits, U32, 1348, [11:11] +looksLikeRunning = bits, U32, 1348, [12:12] +looksLikeCoasting = bits, U32, 1348, [13:13] +looksLikeCrankToIdle = bits, U32, 1348, [14:14] +isIdleCoasting = bits, U32, 1348, [15:15] +isIdleClosedLoop = bits, U32, 1348, [16:16] +idleTarget = scalar, S32, 1352, "", 1, 0 +targetRpmByClt = scalar, S32, 1356, "", 1, 0 +targetRpmAc = scalar, S32, 1360, "", 1, 0 +iacByRpmTaper = scalar, F32, 1364 +luaAdd = scalar, F32, 1368 +; total TS size = 1372 +idlePosition0 = scalar, F32, 1372, "per", 1,0 +trim0 = scalar, F32, 1376, "", 1, 0 +luaAdjustment0 = scalar, F32, 1380, "per", 1,0 +m_wastegatePosition0 = scalar, F32, 1384, "per", 1,0 +etbFeedForward0 = scalar, F32, 1388 +etbIntegralError0 = scalar, F32, 1392, "", 1, 0 +etbCurrentTarget0 = scalar, F32, 1396, "%", 1, 0 +etbCurrentAdjustedTarget0 = scalar, F32, 1400, "%", 1, 0 +etbRevLimitActive0 = bits, U32, 1404, [0:0] +jamDetected0 = bits, U32, 1404, [1:1] +etbDutyRateOfChange0 = scalar, F32, 1408, "per", 1,0 +etbDutyAverage0 = scalar, F32, 1412, "per", 1,0 +etbTpsErrorCounter0 = scalar, U16, 1416, "count", 1,0 +etbPpsErrorCounter0 = scalar, U16, 1418, "count", 1,0 +etbErrorCode0 = scalar, S08, 1420, "", 1, 0 +tcEtbDrop0 = scalar, S08, 1421, "", 1, 0 +jamTimer0 = scalar, U16, 1422, "sec", 0.01, 0 ; total TS size = 1424 -dcOutput0 = scalar, F32, 1424, "per", 1,0 -isEnabled0_int = scalar, U08, 1428, "per", 1,0 -isEnabled0 = bits, U32, 1432, [0:0] +faultCode0 = scalar, U08, 1424, "", 1, 0 +heaterDuty0 = scalar, U08, 1425, "%", 1, 0 +pumpDuty0 = scalar, U08, 1426, "%", 1, 0 +tempC0 = scalar, U16, 1428, "C", 1, 0 +nernstVoltage0 = scalar, U16, 1430, "V", 0.001, 0 +esr0 = scalar, U16, 1432, "ohm", 1, 0 ; total TS size = 1436 -value0 = scalar, U16, 1436, "value", 1,0 -value1 = scalar, U16, 1438, "value", 1,0 -errorRate = scalar, F32, 1440, "ratio", 1,0 -; total TS size = 1444 -vvtTarget = scalar, U16, 1444, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1446, "%", 0.5, 0 +dcOutput0 = scalar, F32, 1436, "per", 1,0 +isEnabled0_int = scalar, U08, 1440, "per", 1,0 +isEnabled0 = bits, U32, 1444, [0:0] ; total TS size = 1448 -lambdaCurrentlyGood = bits, U32, 1448, [0:0] -lambdaMonitorCut = bits, U32, 1448, [1:1] -lambdaTimeSinceGood = scalar, U16, 1452, "sec", 0.01, 0 +value0 = scalar, U16, 1448, "value", 1,0 +value1 = scalar, U16, 1450, "value", 1,0 +errorRate = scalar, F32, 1452, "ratio", 1,0 ; total TS size = 1456 +vvtTarget = scalar, U16, 1456, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1458, "%", 0.5, 0 +; total TS size = 1460 +lambdaCurrentlyGood = bits, U32, 1460, [0:0] +lambdaMonitorCut = bits, U32, 1460, [1:1] +lambdaTimeSinceGood = scalar, U16, 1464, "sec", 0.01, 0 +; total TS size = 1468 time = { timeNow } @@ -5401,7 +5404,6 @@ entry = smartChipState, "smartChipState", int, "%d" entry = smartChipRestartCounter, "smartChipRestartCounter", int, "%d" entry = smartChipAliveCounter, "smartChipAliveCounter", int, "%d" entry = startStopPhysicalState, "startStopPhysicalState", int, "%d" -entry = acrStateDup, "acrStateDup", int, "%d" entry = acrEngineMovedRecently, "acrEngineMovedRecently", int, "%d" entry = heaterControlEnabled, "heaterControlEnabled", int, "%d" entry = luaDigitalState0, "luaDigitalState0", int, "%d" @@ -5411,6 +5413,9 @@ entry = luaDigitalState3, "luaDigitalState3", int, "%d" entry = startStopStateToggleCounter, "startStopStateToggleCounter", int, "%d" entry = egtValue1, "egtValue1", float, "%.3f" entry = egtValue2, "egtValue2", float, "%.3f" +entry = luaSoftSparkSkip, "luaSoftSparkSkip", float, "%.3f" +entry = luaHardSparkSkip, "luaHardSparkSkip", float, "%.3f" +entry = tractionControlSparkSkip, "tractionControlSparkSkip", float, "%.3f" entry = desiredRpmLimit, "User-defined RPM hard limit", int, "%d" entry = fuelInjectionCounter, "Fuel: Injection counter", int, "%d" entry = globalSparkCounter, "Ign: Spark counter", int, "%d" @@ -5911,7 +5916,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 @@ -6361,7 +6366,6 @@ indicatorPanel = engine_stateIndicatorPanel, 2 indicator = {lua_luaDisableEtb}, "luaDisableEtb No", "luaDisableEtb Yes" indicator = {lua_luaIgnCut}, "luaIgnCut No", "luaIgnCut Yes" indicator = {startStopPhysicalState}, "startStopPhysicalState No", "startStopPhysicalState Yes" - indicator = {acrStateDup}, "acrStateDup No", "acrStateDup Yes" indicator = {acrEngineMovedRecently}, "acrEngineMovedRecently No", "acrEngineMovedRecently Yes" indicator = {heaterControlEnabled}, "heaterControlEnabled No", "heaterControlEnabled Yes" indicator = {luaDigitalState0}, "luaDigitalState0 No", "luaDigitalState0 Yes" @@ -6397,12 +6401,16 @@ dialog = engine_stateDialog, "engine_state" graphLine = egtValue1 graphLine = egtValue2 liveGraph = engine_state_6_Graph, "Graph", South + graphLine = luaSoftSparkSkip + graphLine = luaHardSparkSkip + graphLine = tractionControlSparkSkip graphLine = desiredRpmLimit + liveGraph = engine_state_7_Graph, "Graph", South graphLine = fuelInjectionCounter graphLine = globalSparkCounter graphLine = fuelingLoad - liveGraph = engine_state_7_Graph, "Graph", South graphLine = ignitionLoad + liveGraph = engine_state_8_Graph, "Graph", South graphLine = veTableYAxis indicatorPanel = tps_accel_stateIndicatorPanel, 2 @@ -7309,6 +7317,10 @@ dialog = lambda_monitorDialog, "lambda_monitor" 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 diff --git a/firmware/tunerstudio/generated/rusefi_alphax-8chan.ini b/firmware/tunerstudio/generated/rusefi_alphax-8chan.ini index e3f0ccbee7..7e1309d10b 100644 --- a/firmware/tunerstudio/generated/rusefi_alphax-8chan.ini +++ b/firmware/tunerstudio/generated/rusefi_alphax-8chan.ini @@ -37,12 +37,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.03.05.alphax-8chan.1319487505" + signature = "rusEFI master.2024.03.05.alphax-8chan.20936745" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.03.05.alphax-8chan.1319487505" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.03.05.alphax-8chan.20936745" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -98,7 +98,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","INVALID","3A - Aux Analog 2","On-board MAP","32A - PPS Sensor Input","31A - TPS Sensor Input","24 - Ignition Key Voltage","INVALID","INVALID","19A - Aux Analog 6","1A - Aux Analog 1","2A - Aux Analog 4","INVALID","29A - CLT Sensor Input","27A - IAT Sensor Input","INVALID","12A - Aux Analog 8","INVALID","11A - Aux Analog 3","INVALID","34A - PPS2 Sensor Input","33A - TPS2 Sensor Input","INVALID","INVALID","INVALID","4A - Aux Analog 7","INVALID","10A - Aux Analog 5","INVALID","28A - Aux Temp 2","28A - Aux Temp 1","INVALID","20A - Aux Analog 9" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue Mar 05 00:52:20 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue Mar 05 01:56:24 UTC 2024 pageSize = 22252 page = 1 @@ -748,6 +748,7 @@ mc33810Gpgd3Mode = bits, U32, 1592, [4:4], "false", "true" enableExtendedCanBroadcast = bits, U32, 1592, [5:5], "false", "true" luaCanRxWorkaround = bits, U32, 1592, [6:6], "false", "true" flexSensorInverted = bits, U32, 1592, [7:7], "false", "true" +useHardSkipInTraction = bits, U32, 1592, [8:8], "false", "true" useAuxSpeedForSlipRatio = bits, U32, 1592, [11:11], "false", "true" useVssAsSecondWheelSpeed = bits, U32, 1592, [12:12], "false", "true" is_enabled_spi_5 = bits, U32, 1592, [13:13], "false", "true" @@ -2471,7 +2472,7 @@ injectorStagingRpmBins = array, U16, 22238, [6], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1456 + ochBlockSize = 1468 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3134,145 +3135,147 @@ smartChipState = scalar, S08, 1102, "", 1, 0 smartChipRestartCounter = scalar, S08, 1103, "", 1, 0 smartChipAliveCounter = scalar, S08, 1104, "", 1, 0 startStopPhysicalState = bits, U32, 1108, [0:0] -acrStateDup = bits, U32, 1108, [1:1] -acrEngineMovedRecently = bits, U32, 1108, [2:2] -heaterControlEnabled = bits, U32, 1108, [3:3] -luaDigitalState0 = bits, U32, 1108, [4:4] -luaDigitalState1 = bits, U32, 1108, [5:5] -luaDigitalState2 = bits, U32, 1108, [6:6] -luaDigitalState3 = bits, U32, 1108, [7:7] +acrEngineMovedRecently = bits, U32, 1108, [1:1] +heaterControlEnabled = bits, U32, 1108, [2:2] +luaDigitalState0 = bits, U32, 1108, [3:3] +luaDigitalState1 = bits, U32, 1108, [4:4] +luaDigitalState2 = bits, U32, 1108, [5:5] +luaDigitalState3 = bits, U32, 1108, [6:6] startStopStateToggleCounter = scalar, U32, 1112, "", 1, 0 egtValue1 = scalar, F32, 1116, "", 1, 0 egtValue2 = scalar, F32, 1120, "", 1, 0 -desiredRpmLimit = scalar, S16, 1124, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1128, "", 1, 0 -globalSparkCounter = scalar, U32, 1132, "", 1, 0 -fuelingLoad = scalar, F32, 1136, "", 1, 0 -ignitionLoad = scalar, F32, 1140, "", 1, 0 -veTableYAxis = scalar, U16, 1144, "%", 0.01, 0 -; total TS size = 1148 -tpsFrom = scalar, F32, 1148 -tpsTo = scalar, F32, 1152 -deltaTps = scalar, F32, 1156 -extraFuel = scalar, F32, 1160, "", 1, 0 -valueFromTable = scalar, F32, 1164, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1168, [0:0] -isBelowDecelThreshold = bits, U32, 1168, [1:1] -isTimeToResetAccumulator = bits, U32, 1168, [2:2] -isFractionalEnrichment = bits, U32, 1168, [3:3] -belowEpsilon = bits, U32, 1168, [4:4] -tooShort = bits, U32, 1168, [5:5] -fractionalInjFuel = scalar, F32, 1172, "", 1, 0 -accumulatedValue = scalar, F32, 1176, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1180, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1184, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1188, "", 1, 0 -cycleCnt = scalar, S32, 1192, "", 1, 0 -; total TS size = 1196 -hwEventCounters1 = scalar, U32, 1196, "", 1, 0 -hwEventCounters2 = scalar, U32, 1200, "", 1, 0 -hwEventCounters3 = scalar, U32, 1204, "", 1, 0 -hwEventCounters4 = scalar, U32, 1208, "", 1, 0 -hwEventCounters5 = scalar, U32, 1212, "", 1, 0 -hwEventCounters6 = scalar, U32, 1216, "", 1, 0 -vvtCamCounter = scalar, U32, 1220, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1224, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1228, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1232, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1233, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1236, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1240, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1244, "", 1, 0 -mapCamPrevToothAngle = scalar, F32, 1248, "deg", 1, 0 -isDecodingMapCam = bits, U32, 1252, [0:0] -; total TS size = 1256 -crankSynchronizationCounter0 = scalar, U32, 1256, "", 1, 0 -vvtSyncGapRatio0 = scalar, F32, 1260, "", 1, 0 -vvtToothDurations00 = scalar, U32, 1264, "us", 1, 0 -vvtCurrentPosition0 = scalar, F32, 1268, "sync: Primary Cam Position", 1, 0 -vvtToothPosition10 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition20 = scalar, F32, 1276, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition30 = scalar, F32, 1280, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition40 = scalar, F32, 1284, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio0 = scalar, F32, 1288, "", 1, 0 -triggerStateIndex0 = scalar, U08, 1292, "", 1, 0 -vvtStateIndex0 = scalar, U08, 1293, "", 1, 0 -; total TS size = 1296 -camResyncCounter = scalar, U08, 1296, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1300, [0:0] -; total TS size = 1304 -wallFuelCorrection = scalar, F32, 1304, "", 1, 0 -wallFuel = scalar, F32, 1308, "", 1, 0 -; total TS size = 1312 -idleState = bits, S32, 1312, [0:2], "not important" -currentIdlePosition = scalar, F32, 1316 -baseIdlePosition = scalar, F32, 1320 -idleClosedLoop = scalar, F32, 1324 -iacByTpsTaper = scalar, F32, 1328 -throttlePedalUpState = scalar, S32, 1332, "", 1, 0 -mightResetPid = bits, U32, 1336, [0:0] -shouldResetPid = bits, U32, 1336, [1:1] -wasResetPid = bits, U32, 1336, [2:2] -mustResetPid = bits, U32, 1336, [3:3] -isCranking = bits, U32, 1336, [4:4] -isIacTableForCoasting = bits, U32, 1336, [5:5] -notIdling = bits, U32, 1336, [6:6] -needReset = bits, U32, 1336, [7:7] -isInDeadZone = bits, U32, 1336, [8:8] -isBlipping = bits, U32, 1336, [9:9] -useClosedLoop = bits, U32, 1336, [10:10] -badTps = bits, U32, 1336, [11:11] -looksLikeRunning = bits, U32, 1336, [12:12] -looksLikeCoasting = bits, U32, 1336, [13:13] -looksLikeCrankToIdle = bits, U32, 1336, [14:14] -isIdleCoasting = bits, U32, 1336, [15:15] -isIdleClosedLoop = bits, U32, 1336, [16:16] -idleTarget = scalar, S32, 1340, "", 1, 0 -targetRpmByClt = scalar, S32, 1344, "", 1, 0 -targetRpmAc = scalar, S32, 1348, "", 1, 0 -iacByRpmTaper = scalar, F32, 1352 -luaAdd = scalar, F32, 1356 -; total TS size = 1360 -idlePosition0 = scalar, F32, 1360, "per", 1,0 -trim0 = scalar, F32, 1364, "", 1, 0 -luaAdjustment0 = scalar, F32, 1368, "per", 1,0 -m_wastegatePosition0 = scalar, F32, 1372, "per", 1,0 -etbFeedForward0 = scalar, F32, 1376 -etbIntegralError0 = scalar, F32, 1380, "", 1, 0 -etbCurrentTarget0 = scalar, F32, 1384, "%", 1, 0 -etbCurrentAdjustedTarget0 = scalar, F32, 1388, "%", 1, 0 -etbRevLimitActive0 = bits, U32, 1392, [0:0] -jamDetected0 = bits, U32, 1392, [1:1] -etbDutyRateOfChange0 = scalar, F32, 1396, "per", 1,0 -etbDutyAverage0 = scalar, F32, 1400, "per", 1,0 -etbTpsErrorCounter0 = scalar, U16, 1404, "count", 1,0 -etbPpsErrorCounter0 = scalar, U16, 1406, "count", 1,0 -etbErrorCode0 = scalar, S08, 1408, "", 1, 0 -tcEtbDrop0 = scalar, S08, 1409, "", 1, 0 -jamTimer0 = scalar, U16, 1410, "sec", 0.01, 0 -; total TS size = 1412 -faultCode0 = scalar, U08, 1412, "", 1, 0 -heaterDuty0 = scalar, U08, 1413, "%", 1, 0 -pumpDuty0 = scalar, U08, 1414, "%", 1, 0 -tempC0 = scalar, U16, 1416, "C", 1, 0 -nernstVoltage0 = scalar, U16, 1418, "V", 0.001, 0 -esr0 = scalar, U16, 1420, "ohm", 1, 0 +luaSoftSparkSkip = scalar, F32, 1124, "", 1, 0 +luaHardSparkSkip = scalar, F32, 1128, "", 1, 0 +tractionControlSparkSkip = scalar, F32, 1132, "", 1, 0 +desiredRpmLimit = scalar, S16, 1136, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 1140, "", 1, 0 +globalSparkCounter = scalar, U32, 1144, "", 1, 0 +fuelingLoad = scalar, F32, 1148, "", 1, 0 +ignitionLoad = scalar, F32, 1152, "", 1, 0 +veTableYAxis = scalar, U16, 1156, "%", 0.01, 0 +; total TS size = 1160 +tpsFrom = scalar, F32, 1160 +tpsTo = scalar, F32, 1164 +deltaTps = scalar, F32, 1168 +extraFuel = scalar, F32, 1172, "", 1, 0 +valueFromTable = scalar, F32, 1176, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1180, [0:0] +isBelowDecelThreshold = bits, U32, 1180, [1:1] +isTimeToResetAccumulator = bits, U32, 1180, [2:2] +isFractionalEnrichment = bits, U32, 1180, [3:3] +belowEpsilon = bits, U32, 1180, [4:4] +tooShort = bits, U32, 1180, [5:5] +fractionalInjFuel = scalar, F32, 1184, "", 1, 0 +accumulatedValue = scalar, F32, 1188, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1192, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1196, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1200, "", 1, 0 +cycleCnt = scalar, S32, 1204, "", 1, 0 +; total TS size = 1208 +hwEventCounters1 = scalar, U32, 1208, "", 1, 0 +hwEventCounters2 = scalar, U32, 1212, "", 1, 0 +hwEventCounters3 = scalar, U32, 1216, "", 1, 0 +hwEventCounters4 = scalar, U32, 1220, "", 1, 0 +hwEventCounters5 = scalar, U32, 1224, "", 1, 0 +hwEventCounters6 = scalar, U32, 1228, "", 1, 0 +vvtCamCounter = scalar, U32, 1232, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1236, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1240, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1244, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1245, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1248, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1252, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1256, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1260, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1264, [0:0] +; total TS size = 1268 +crankSynchronizationCounter0 = scalar, U32, 1268, "", 1, 0 +vvtSyncGapRatio0 = scalar, F32, 1272, "", 1, 0 +vvtToothDurations00 = scalar, U32, 1276, "us", 1, 0 +vvtCurrentPosition0 = scalar, F32, 1280, "sync: Primary Cam Position", 1, 0 +vvtToothPosition10 = scalar, F32, 1284, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition20 = scalar, F32, 1288, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition30 = scalar, F32, 1292, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition40 = scalar, F32, 1296, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio0 = scalar, F32, 1300, "", 1, 0 +triggerStateIndex0 = scalar, U08, 1304, "", 1, 0 +vvtStateIndex0 = scalar, U08, 1305, "", 1, 0 +; total TS size = 1308 +camResyncCounter = scalar, U08, 1308, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1312, [0:0] +; total TS size = 1316 +wallFuelCorrection = scalar, F32, 1316, "", 1, 0 +wallFuel = scalar, F32, 1320, "", 1, 0 +; total TS size = 1324 +idleState = bits, S32, 1324, [0:2], "not important" +currentIdlePosition = scalar, F32, 1328 +baseIdlePosition = scalar, F32, 1332 +idleClosedLoop = scalar, F32, 1336 +iacByTpsTaper = scalar, F32, 1340 +throttlePedalUpState = scalar, S32, 1344, "", 1, 0 +mightResetPid = bits, U32, 1348, [0:0] +shouldResetPid = bits, U32, 1348, [1:1] +wasResetPid = bits, U32, 1348, [2:2] +mustResetPid = bits, U32, 1348, [3:3] +isCranking = bits, U32, 1348, [4:4] +isIacTableForCoasting = bits, U32, 1348, [5:5] +notIdling = bits, U32, 1348, [6:6] +needReset = bits, U32, 1348, [7:7] +isInDeadZone = bits, U32, 1348, [8:8] +isBlipping = bits, U32, 1348, [9:9] +useClosedLoop = bits, U32, 1348, [10:10] +badTps = bits, U32, 1348, [11:11] +looksLikeRunning = bits, U32, 1348, [12:12] +looksLikeCoasting = bits, U32, 1348, [13:13] +looksLikeCrankToIdle = bits, U32, 1348, [14:14] +isIdleCoasting = bits, U32, 1348, [15:15] +isIdleClosedLoop = bits, U32, 1348, [16:16] +idleTarget = scalar, S32, 1352, "", 1, 0 +targetRpmByClt = scalar, S32, 1356, "", 1, 0 +targetRpmAc = scalar, S32, 1360, "", 1, 0 +iacByRpmTaper = scalar, F32, 1364 +luaAdd = scalar, F32, 1368 +; total TS size = 1372 +idlePosition0 = scalar, F32, 1372, "per", 1,0 +trim0 = scalar, F32, 1376, "", 1, 0 +luaAdjustment0 = scalar, F32, 1380, "per", 1,0 +m_wastegatePosition0 = scalar, F32, 1384, "per", 1,0 +etbFeedForward0 = scalar, F32, 1388 +etbIntegralError0 = scalar, F32, 1392, "", 1, 0 +etbCurrentTarget0 = scalar, F32, 1396, "%", 1, 0 +etbCurrentAdjustedTarget0 = scalar, F32, 1400, "%", 1, 0 +etbRevLimitActive0 = bits, U32, 1404, [0:0] +jamDetected0 = bits, U32, 1404, [1:1] +etbDutyRateOfChange0 = scalar, F32, 1408, "per", 1,0 +etbDutyAverage0 = scalar, F32, 1412, "per", 1,0 +etbTpsErrorCounter0 = scalar, U16, 1416, "count", 1,0 +etbPpsErrorCounter0 = scalar, U16, 1418, "count", 1,0 +etbErrorCode0 = scalar, S08, 1420, "", 1, 0 +tcEtbDrop0 = scalar, S08, 1421, "", 1, 0 +jamTimer0 = scalar, U16, 1422, "sec", 0.01, 0 ; total TS size = 1424 -dcOutput0 = scalar, F32, 1424, "per", 1,0 -isEnabled0_int = scalar, U08, 1428, "per", 1,0 -isEnabled0 = bits, U32, 1432, [0:0] +faultCode0 = scalar, U08, 1424, "", 1, 0 +heaterDuty0 = scalar, U08, 1425, "%", 1, 0 +pumpDuty0 = scalar, U08, 1426, "%", 1, 0 +tempC0 = scalar, U16, 1428, "C", 1, 0 +nernstVoltage0 = scalar, U16, 1430, "V", 0.001, 0 +esr0 = scalar, U16, 1432, "ohm", 1, 0 ; total TS size = 1436 -value0 = scalar, U16, 1436, "value", 1,0 -value1 = scalar, U16, 1438, "value", 1,0 -errorRate = scalar, F32, 1440, "ratio", 1,0 -; total TS size = 1444 -vvtTarget = scalar, U16, 1444, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1446, "%", 0.5, 0 +dcOutput0 = scalar, F32, 1436, "per", 1,0 +isEnabled0_int = scalar, U08, 1440, "per", 1,0 +isEnabled0 = bits, U32, 1444, [0:0] ; total TS size = 1448 -lambdaCurrentlyGood = bits, U32, 1448, [0:0] -lambdaMonitorCut = bits, U32, 1448, [1:1] -lambdaTimeSinceGood = scalar, U16, 1452, "sec", 0.01, 0 +value0 = scalar, U16, 1448, "value", 1,0 +value1 = scalar, U16, 1450, "value", 1,0 +errorRate = scalar, F32, 1452, "ratio", 1,0 ; total TS size = 1456 +vvtTarget = scalar, U16, 1456, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1458, "%", 0.5, 0 +; total TS size = 1460 +lambdaCurrentlyGood = bits, U32, 1460, [0:0] +lambdaMonitorCut = bits, U32, 1460, [1:1] +lambdaTimeSinceGood = scalar, U16, 1464, "sec", 0.01, 0 +; total TS size = 1468 time = { timeNow } @@ -5404,7 +5407,6 @@ entry = smartChipState, "smartChipState", int, "%d" entry = smartChipRestartCounter, "smartChipRestartCounter", int, "%d" entry = smartChipAliveCounter, "smartChipAliveCounter", int, "%d" entry = startStopPhysicalState, "startStopPhysicalState", int, "%d" -entry = acrStateDup, "acrStateDup", int, "%d" entry = acrEngineMovedRecently, "acrEngineMovedRecently", int, "%d" entry = heaterControlEnabled, "heaterControlEnabled", int, "%d" entry = luaDigitalState0, "luaDigitalState0", int, "%d" @@ -5414,6 +5416,9 @@ entry = luaDigitalState3, "luaDigitalState3", int, "%d" entry = startStopStateToggleCounter, "startStopStateToggleCounter", int, "%d" entry = egtValue1, "egtValue1", float, "%.3f" entry = egtValue2, "egtValue2", float, "%.3f" +entry = luaSoftSparkSkip, "luaSoftSparkSkip", float, "%.3f" +entry = luaHardSparkSkip, "luaHardSparkSkip", float, "%.3f" +entry = tractionControlSparkSkip, "tractionControlSparkSkip", float, "%.3f" entry = desiredRpmLimit, "User-defined RPM hard limit", int, "%d" entry = fuelInjectionCounter, "Fuel: Injection counter", int, "%d" entry = globalSparkCounter, "Ign: Spark counter", int, "%d" @@ -5915,7 +5920,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 @@ -6365,7 +6370,6 @@ indicatorPanel = engine_stateIndicatorPanel, 2 indicator = {lua_luaDisableEtb}, "luaDisableEtb No", "luaDisableEtb Yes" indicator = {lua_luaIgnCut}, "luaIgnCut No", "luaIgnCut Yes" indicator = {startStopPhysicalState}, "startStopPhysicalState No", "startStopPhysicalState Yes" - indicator = {acrStateDup}, "acrStateDup No", "acrStateDup Yes" indicator = {acrEngineMovedRecently}, "acrEngineMovedRecently No", "acrEngineMovedRecently Yes" indicator = {heaterControlEnabled}, "heaterControlEnabled No", "heaterControlEnabled Yes" indicator = {luaDigitalState0}, "luaDigitalState0 No", "luaDigitalState0 Yes" @@ -6401,12 +6405,16 @@ dialog = engine_stateDialog, "engine_state" graphLine = egtValue1 graphLine = egtValue2 liveGraph = engine_state_6_Graph, "Graph", South + graphLine = luaSoftSparkSkip + graphLine = luaHardSparkSkip + graphLine = tractionControlSparkSkip graphLine = desiredRpmLimit + liveGraph = engine_state_7_Graph, "Graph", South graphLine = fuelInjectionCounter graphLine = globalSparkCounter graphLine = fuelingLoad - liveGraph = engine_state_7_Graph, "Graph", South graphLine = ignitionLoad + liveGraph = engine_state_8_Graph, "Graph", South graphLine = veTableYAxis indicatorPanel = tps_accel_stateIndicatorPanel, 2 @@ -7313,6 +7321,10 @@ dialog = lambda_monitorDialog, "lambda_monitor" 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 diff --git a/firmware/tunerstudio/generated/rusefi_alphax-8chan_f7.ini b/firmware/tunerstudio/generated/rusefi_alphax-8chan_f7.ini index aae07562d0..f926330386 100644 --- a/firmware/tunerstudio/generated/rusefi_alphax-8chan_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_alphax-8chan_f7.ini @@ -37,12 +37,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.03.05.alphax-8chan_f7.1319487505" + signature = "rusEFI master.2024.03.05.alphax-8chan_f7.20936745" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.03.05.alphax-8chan_f7.1319487505" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.03.05.alphax-8chan_f7.20936745" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -98,7 +98,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","INVALID","3A - Aux Analog 2","On-board MAP","32A - PPS Sensor Input","31A - TPS Sensor Input","24 - Ignition Key Voltage","INVALID","INVALID","19A - Aux Analog 6","1A - Aux Analog 1","2A - Aux Analog 4","INVALID","29A - CLT Sensor Input","27A - IAT Sensor Input","INVALID","12A - Aux Analog 8","INVALID","11A - Aux Analog 3","INVALID","34A - PPS2 Sensor Input","33A - TPS2 Sensor Input","INVALID","INVALID","INVALID","4A - Aux Analog 7","INVALID","10A - Aux Analog 5","INVALID","28A - Aux Temp 2","28A - Aux Temp 1","INVALID","20A - Aux Analog 9" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue Mar 05 00:52:21 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue Mar 05 01:56:26 UTC 2024 pageSize = 22252 page = 1 @@ -748,6 +748,7 @@ mc33810Gpgd3Mode = bits, U32, 1592, [4:4], "false", "true" enableExtendedCanBroadcast = bits, U32, 1592, [5:5], "false", "true" luaCanRxWorkaround = bits, U32, 1592, [6:6], "false", "true" flexSensorInverted = bits, U32, 1592, [7:7], "false", "true" +useHardSkipInTraction = bits, U32, 1592, [8:8], "false", "true" useAuxSpeedForSlipRatio = bits, U32, 1592, [11:11], "false", "true" useVssAsSecondWheelSpeed = bits, U32, 1592, [12:12], "false", "true" is_enabled_spi_5 = bits, U32, 1592, [13:13], "false", "true" @@ -2471,7 +2472,7 @@ injectorStagingRpmBins = array, U16, 22238, [6], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1456 + ochBlockSize = 1468 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3134,145 +3135,147 @@ smartChipState = scalar, S08, 1102, "", 1, 0 smartChipRestartCounter = scalar, S08, 1103, "", 1, 0 smartChipAliveCounter = scalar, S08, 1104, "", 1, 0 startStopPhysicalState = bits, U32, 1108, [0:0] -acrStateDup = bits, U32, 1108, [1:1] -acrEngineMovedRecently = bits, U32, 1108, [2:2] -heaterControlEnabled = bits, U32, 1108, [3:3] -luaDigitalState0 = bits, U32, 1108, [4:4] -luaDigitalState1 = bits, U32, 1108, [5:5] -luaDigitalState2 = bits, U32, 1108, [6:6] -luaDigitalState3 = bits, U32, 1108, [7:7] +acrEngineMovedRecently = bits, U32, 1108, [1:1] +heaterControlEnabled = bits, U32, 1108, [2:2] +luaDigitalState0 = bits, U32, 1108, [3:3] +luaDigitalState1 = bits, U32, 1108, [4:4] +luaDigitalState2 = bits, U32, 1108, [5:5] +luaDigitalState3 = bits, U32, 1108, [6:6] startStopStateToggleCounter = scalar, U32, 1112, "", 1, 0 egtValue1 = scalar, F32, 1116, "", 1, 0 egtValue2 = scalar, F32, 1120, "", 1, 0 -desiredRpmLimit = scalar, S16, 1124, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1128, "", 1, 0 -globalSparkCounter = scalar, U32, 1132, "", 1, 0 -fuelingLoad = scalar, F32, 1136, "", 1, 0 -ignitionLoad = scalar, F32, 1140, "", 1, 0 -veTableYAxis = scalar, U16, 1144, "%", 0.01, 0 -; total TS size = 1148 -tpsFrom = scalar, F32, 1148 -tpsTo = scalar, F32, 1152 -deltaTps = scalar, F32, 1156 -extraFuel = scalar, F32, 1160, "", 1, 0 -valueFromTable = scalar, F32, 1164, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1168, [0:0] -isBelowDecelThreshold = bits, U32, 1168, [1:1] -isTimeToResetAccumulator = bits, U32, 1168, [2:2] -isFractionalEnrichment = bits, U32, 1168, [3:3] -belowEpsilon = bits, U32, 1168, [4:4] -tooShort = bits, U32, 1168, [5:5] -fractionalInjFuel = scalar, F32, 1172, "", 1, 0 -accumulatedValue = scalar, F32, 1176, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1180, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1184, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1188, "", 1, 0 -cycleCnt = scalar, S32, 1192, "", 1, 0 -; total TS size = 1196 -hwEventCounters1 = scalar, U32, 1196, "", 1, 0 -hwEventCounters2 = scalar, U32, 1200, "", 1, 0 -hwEventCounters3 = scalar, U32, 1204, "", 1, 0 -hwEventCounters4 = scalar, U32, 1208, "", 1, 0 -hwEventCounters5 = scalar, U32, 1212, "", 1, 0 -hwEventCounters6 = scalar, U32, 1216, "", 1, 0 -vvtCamCounter = scalar, U32, 1220, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1224, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1228, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1232, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1233, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1236, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1240, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1244, "", 1, 0 -mapCamPrevToothAngle = scalar, F32, 1248, "deg", 1, 0 -isDecodingMapCam = bits, U32, 1252, [0:0] -; total TS size = 1256 -crankSynchronizationCounter0 = scalar, U32, 1256, "", 1, 0 -vvtSyncGapRatio0 = scalar, F32, 1260, "", 1, 0 -vvtToothDurations00 = scalar, U32, 1264, "us", 1, 0 -vvtCurrentPosition0 = scalar, F32, 1268, "sync: Primary Cam Position", 1, 0 -vvtToothPosition10 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition20 = scalar, F32, 1276, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition30 = scalar, F32, 1280, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition40 = scalar, F32, 1284, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio0 = scalar, F32, 1288, "", 1, 0 -triggerStateIndex0 = scalar, U08, 1292, "", 1, 0 -vvtStateIndex0 = scalar, U08, 1293, "", 1, 0 -; total TS size = 1296 -camResyncCounter = scalar, U08, 1296, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1300, [0:0] -; total TS size = 1304 -wallFuelCorrection = scalar, F32, 1304, "", 1, 0 -wallFuel = scalar, F32, 1308, "", 1, 0 -; total TS size = 1312 -idleState = bits, S32, 1312, [0:2], "not important" -currentIdlePosition = scalar, F32, 1316 -baseIdlePosition = scalar, F32, 1320 -idleClosedLoop = scalar, F32, 1324 -iacByTpsTaper = scalar, F32, 1328 -throttlePedalUpState = scalar, S32, 1332, "", 1, 0 -mightResetPid = bits, U32, 1336, [0:0] -shouldResetPid = bits, U32, 1336, [1:1] -wasResetPid = bits, U32, 1336, [2:2] -mustResetPid = bits, U32, 1336, [3:3] -isCranking = bits, U32, 1336, [4:4] -isIacTableForCoasting = bits, U32, 1336, [5:5] -notIdling = bits, U32, 1336, [6:6] -needReset = bits, U32, 1336, [7:7] -isInDeadZone = bits, U32, 1336, [8:8] -isBlipping = bits, U32, 1336, [9:9] -useClosedLoop = bits, U32, 1336, [10:10] -badTps = bits, U32, 1336, [11:11] -looksLikeRunning = bits, U32, 1336, [12:12] -looksLikeCoasting = bits, U32, 1336, [13:13] -looksLikeCrankToIdle = bits, U32, 1336, [14:14] -isIdleCoasting = bits, U32, 1336, [15:15] -isIdleClosedLoop = bits, U32, 1336, [16:16] -idleTarget = scalar, S32, 1340, "", 1, 0 -targetRpmByClt = scalar, S32, 1344, "", 1, 0 -targetRpmAc = scalar, S32, 1348, "", 1, 0 -iacByRpmTaper = scalar, F32, 1352 -luaAdd = scalar, F32, 1356 -; total TS size = 1360 -idlePosition0 = scalar, F32, 1360, "per", 1,0 -trim0 = scalar, F32, 1364, "", 1, 0 -luaAdjustment0 = scalar, F32, 1368, "per", 1,0 -m_wastegatePosition0 = scalar, F32, 1372, "per", 1,0 -etbFeedForward0 = scalar, F32, 1376 -etbIntegralError0 = scalar, F32, 1380, "", 1, 0 -etbCurrentTarget0 = scalar, F32, 1384, "%", 1, 0 -etbCurrentAdjustedTarget0 = scalar, F32, 1388, "%", 1, 0 -etbRevLimitActive0 = bits, U32, 1392, [0:0] -jamDetected0 = bits, U32, 1392, [1:1] -etbDutyRateOfChange0 = scalar, F32, 1396, "per", 1,0 -etbDutyAverage0 = scalar, F32, 1400, "per", 1,0 -etbTpsErrorCounter0 = scalar, U16, 1404, "count", 1,0 -etbPpsErrorCounter0 = scalar, U16, 1406, "count", 1,0 -etbErrorCode0 = scalar, S08, 1408, "", 1, 0 -tcEtbDrop0 = scalar, S08, 1409, "", 1, 0 -jamTimer0 = scalar, U16, 1410, "sec", 0.01, 0 -; total TS size = 1412 -faultCode0 = scalar, U08, 1412, "", 1, 0 -heaterDuty0 = scalar, U08, 1413, "%", 1, 0 -pumpDuty0 = scalar, U08, 1414, "%", 1, 0 -tempC0 = scalar, U16, 1416, "C", 1, 0 -nernstVoltage0 = scalar, U16, 1418, "V", 0.001, 0 -esr0 = scalar, U16, 1420, "ohm", 1, 0 +luaSoftSparkSkip = scalar, F32, 1124, "", 1, 0 +luaHardSparkSkip = scalar, F32, 1128, "", 1, 0 +tractionControlSparkSkip = scalar, F32, 1132, "", 1, 0 +desiredRpmLimit = scalar, S16, 1136, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 1140, "", 1, 0 +globalSparkCounter = scalar, U32, 1144, "", 1, 0 +fuelingLoad = scalar, F32, 1148, "", 1, 0 +ignitionLoad = scalar, F32, 1152, "", 1, 0 +veTableYAxis = scalar, U16, 1156, "%", 0.01, 0 +; total TS size = 1160 +tpsFrom = scalar, F32, 1160 +tpsTo = scalar, F32, 1164 +deltaTps = scalar, F32, 1168 +extraFuel = scalar, F32, 1172, "", 1, 0 +valueFromTable = scalar, F32, 1176, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1180, [0:0] +isBelowDecelThreshold = bits, U32, 1180, [1:1] +isTimeToResetAccumulator = bits, U32, 1180, [2:2] +isFractionalEnrichment = bits, U32, 1180, [3:3] +belowEpsilon = bits, U32, 1180, [4:4] +tooShort = bits, U32, 1180, [5:5] +fractionalInjFuel = scalar, F32, 1184, "", 1, 0 +accumulatedValue = scalar, F32, 1188, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1192, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1196, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1200, "", 1, 0 +cycleCnt = scalar, S32, 1204, "", 1, 0 +; total TS size = 1208 +hwEventCounters1 = scalar, U32, 1208, "", 1, 0 +hwEventCounters2 = scalar, U32, 1212, "", 1, 0 +hwEventCounters3 = scalar, U32, 1216, "", 1, 0 +hwEventCounters4 = scalar, U32, 1220, "", 1, 0 +hwEventCounters5 = scalar, U32, 1224, "", 1, 0 +hwEventCounters6 = scalar, U32, 1228, "", 1, 0 +vvtCamCounter = scalar, U32, 1232, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1236, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1240, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1244, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1245, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1248, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1252, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1256, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1260, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1264, [0:0] +; total TS size = 1268 +crankSynchronizationCounter0 = scalar, U32, 1268, "", 1, 0 +vvtSyncGapRatio0 = scalar, F32, 1272, "", 1, 0 +vvtToothDurations00 = scalar, U32, 1276, "us", 1, 0 +vvtCurrentPosition0 = scalar, F32, 1280, "sync: Primary Cam Position", 1, 0 +vvtToothPosition10 = scalar, F32, 1284, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition20 = scalar, F32, 1288, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition30 = scalar, F32, 1292, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition40 = scalar, F32, 1296, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio0 = scalar, F32, 1300, "", 1, 0 +triggerStateIndex0 = scalar, U08, 1304, "", 1, 0 +vvtStateIndex0 = scalar, U08, 1305, "", 1, 0 +; total TS size = 1308 +camResyncCounter = scalar, U08, 1308, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1312, [0:0] +; total TS size = 1316 +wallFuelCorrection = scalar, F32, 1316, "", 1, 0 +wallFuel = scalar, F32, 1320, "", 1, 0 +; total TS size = 1324 +idleState = bits, S32, 1324, [0:2], "not important" +currentIdlePosition = scalar, F32, 1328 +baseIdlePosition = scalar, F32, 1332 +idleClosedLoop = scalar, F32, 1336 +iacByTpsTaper = scalar, F32, 1340 +throttlePedalUpState = scalar, S32, 1344, "", 1, 0 +mightResetPid = bits, U32, 1348, [0:0] +shouldResetPid = bits, U32, 1348, [1:1] +wasResetPid = bits, U32, 1348, [2:2] +mustResetPid = bits, U32, 1348, [3:3] +isCranking = bits, U32, 1348, [4:4] +isIacTableForCoasting = bits, U32, 1348, [5:5] +notIdling = bits, U32, 1348, [6:6] +needReset = bits, U32, 1348, [7:7] +isInDeadZone = bits, U32, 1348, [8:8] +isBlipping = bits, U32, 1348, [9:9] +useClosedLoop = bits, U32, 1348, [10:10] +badTps = bits, U32, 1348, [11:11] +looksLikeRunning = bits, U32, 1348, [12:12] +looksLikeCoasting = bits, U32, 1348, [13:13] +looksLikeCrankToIdle = bits, U32, 1348, [14:14] +isIdleCoasting = bits, U32, 1348, [15:15] +isIdleClosedLoop = bits, U32, 1348, [16:16] +idleTarget = scalar, S32, 1352, "", 1, 0 +targetRpmByClt = scalar, S32, 1356, "", 1, 0 +targetRpmAc = scalar, S32, 1360, "", 1, 0 +iacByRpmTaper = scalar, F32, 1364 +luaAdd = scalar, F32, 1368 +; total TS size = 1372 +idlePosition0 = scalar, F32, 1372, "per", 1,0 +trim0 = scalar, F32, 1376, "", 1, 0 +luaAdjustment0 = scalar, F32, 1380, "per", 1,0 +m_wastegatePosition0 = scalar, F32, 1384, "per", 1,0 +etbFeedForward0 = scalar, F32, 1388 +etbIntegralError0 = scalar, F32, 1392, "", 1, 0 +etbCurrentTarget0 = scalar, F32, 1396, "%", 1, 0 +etbCurrentAdjustedTarget0 = scalar, F32, 1400, "%", 1, 0 +etbRevLimitActive0 = bits, U32, 1404, [0:0] +jamDetected0 = bits, U32, 1404, [1:1] +etbDutyRateOfChange0 = scalar, F32, 1408, "per", 1,0 +etbDutyAverage0 = scalar, F32, 1412, "per", 1,0 +etbTpsErrorCounter0 = scalar, U16, 1416, "count", 1,0 +etbPpsErrorCounter0 = scalar, U16, 1418, "count", 1,0 +etbErrorCode0 = scalar, S08, 1420, "", 1, 0 +tcEtbDrop0 = scalar, S08, 1421, "", 1, 0 +jamTimer0 = scalar, U16, 1422, "sec", 0.01, 0 ; total TS size = 1424 -dcOutput0 = scalar, F32, 1424, "per", 1,0 -isEnabled0_int = scalar, U08, 1428, "per", 1,0 -isEnabled0 = bits, U32, 1432, [0:0] +faultCode0 = scalar, U08, 1424, "", 1, 0 +heaterDuty0 = scalar, U08, 1425, "%", 1, 0 +pumpDuty0 = scalar, U08, 1426, "%", 1, 0 +tempC0 = scalar, U16, 1428, "C", 1, 0 +nernstVoltage0 = scalar, U16, 1430, "V", 0.001, 0 +esr0 = scalar, U16, 1432, "ohm", 1, 0 ; total TS size = 1436 -value0 = scalar, U16, 1436, "value", 1,0 -value1 = scalar, U16, 1438, "value", 1,0 -errorRate = scalar, F32, 1440, "ratio", 1,0 -; total TS size = 1444 -vvtTarget = scalar, U16, 1444, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1446, "%", 0.5, 0 +dcOutput0 = scalar, F32, 1436, "per", 1,0 +isEnabled0_int = scalar, U08, 1440, "per", 1,0 +isEnabled0 = bits, U32, 1444, [0:0] ; total TS size = 1448 -lambdaCurrentlyGood = bits, U32, 1448, [0:0] -lambdaMonitorCut = bits, U32, 1448, [1:1] -lambdaTimeSinceGood = scalar, U16, 1452, "sec", 0.01, 0 +value0 = scalar, U16, 1448, "value", 1,0 +value1 = scalar, U16, 1450, "value", 1,0 +errorRate = scalar, F32, 1452, "ratio", 1,0 ; total TS size = 1456 +vvtTarget = scalar, U16, 1456, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1458, "%", 0.5, 0 +; total TS size = 1460 +lambdaCurrentlyGood = bits, U32, 1460, [0:0] +lambdaMonitorCut = bits, U32, 1460, [1:1] +lambdaTimeSinceGood = scalar, U16, 1464, "sec", 0.01, 0 +; total TS size = 1468 time = { timeNow } @@ -5404,7 +5407,6 @@ entry = smartChipState, "smartChipState", int, "%d" entry = smartChipRestartCounter, "smartChipRestartCounter", int, "%d" entry = smartChipAliveCounter, "smartChipAliveCounter", int, "%d" entry = startStopPhysicalState, "startStopPhysicalState", int, "%d" -entry = acrStateDup, "acrStateDup", int, "%d" entry = acrEngineMovedRecently, "acrEngineMovedRecently", int, "%d" entry = heaterControlEnabled, "heaterControlEnabled", int, "%d" entry = luaDigitalState0, "luaDigitalState0", int, "%d" @@ -5414,6 +5416,9 @@ entry = luaDigitalState3, "luaDigitalState3", int, "%d" entry = startStopStateToggleCounter, "startStopStateToggleCounter", int, "%d" entry = egtValue1, "egtValue1", float, "%.3f" entry = egtValue2, "egtValue2", float, "%.3f" +entry = luaSoftSparkSkip, "luaSoftSparkSkip", float, "%.3f" +entry = luaHardSparkSkip, "luaHardSparkSkip", float, "%.3f" +entry = tractionControlSparkSkip, "tractionControlSparkSkip", float, "%.3f" entry = desiredRpmLimit, "User-defined RPM hard limit", int, "%d" entry = fuelInjectionCounter, "Fuel: Injection counter", int, "%d" entry = globalSparkCounter, "Ign: Spark counter", int, "%d" @@ -5915,7 +5920,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 @@ -6365,7 +6370,6 @@ indicatorPanel = engine_stateIndicatorPanel, 2 indicator = {lua_luaDisableEtb}, "luaDisableEtb No", "luaDisableEtb Yes" indicator = {lua_luaIgnCut}, "luaIgnCut No", "luaIgnCut Yes" indicator = {startStopPhysicalState}, "startStopPhysicalState No", "startStopPhysicalState Yes" - indicator = {acrStateDup}, "acrStateDup No", "acrStateDup Yes" indicator = {acrEngineMovedRecently}, "acrEngineMovedRecently No", "acrEngineMovedRecently Yes" indicator = {heaterControlEnabled}, "heaterControlEnabled No", "heaterControlEnabled Yes" indicator = {luaDigitalState0}, "luaDigitalState0 No", "luaDigitalState0 Yes" @@ -6401,12 +6405,16 @@ dialog = engine_stateDialog, "engine_state" graphLine = egtValue1 graphLine = egtValue2 liveGraph = engine_state_6_Graph, "Graph", South + graphLine = luaSoftSparkSkip + graphLine = luaHardSparkSkip + graphLine = tractionControlSparkSkip graphLine = desiredRpmLimit + liveGraph = engine_state_7_Graph, "Graph", South graphLine = fuelInjectionCounter graphLine = globalSparkCounter graphLine = fuelingLoad - liveGraph = engine_state_7_Graph, "Graph", South graphLine = ignitionLoad + liveGraph = engine_state_8_Graph, "Graph", South graphLine = veTableYAxis indicatorPanel = tps_accel_stateIndicatorPanel, 2 @@ -7313,6 +7321,10 @@ dialog = lambda_monitorDialog, "lambda_monitor" 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 diff --git a/firmware/tunerstudio/generated/rusefi_at_start_f435.ini b/firmware/tunerstudio/generated/rusefi_at_start_f435.ini index c18bd65013..ef1d7f915a 100644 --- a/firmware/tunerstudio/generated/rusefi_at_start_f435.ini +++ b/firmware/tunerstudio/generated/rusefi_at_start_f435.ini @@ -37,12 +37,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.03.05.at_start_f435.1352820405" + signature = "rusEFI master.2024.03.05.at_start_f435.523818637" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.03.05.at_start_f435.1352820405" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.03.05.at_start_f435.523818637" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -98,7 +98,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="Disabled", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PB0", "PB1", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue Mar 05 00:53:11 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue Mar 05 01:57:15 UTC 2024 pageSize = 22236 page = 1 @@ -745,6 +745,7 @@ mc33810Gpgd3Mode = bits, U32, 1576, [4:4], "false", "true" enableExtendedCanBroadcast = bits, U32, 1576, [5:5], "false", "true" luaCanRxWorkaround = bits, U32, 1576, [6:6], "false", "true" flexSensorInverted = bits, U32, 1576, [7:7], "false", "true" +useHardSkipInTraction = bits, U32, 1576, [8:8], "false", "true" useAuxSpeedForSlipRatio = bits, U32, 1576, [11:11], "false", "true" useVssAsSecondWheelSpeed = bits, U32, 1576, [12:12], "false", "true" is_enabled_spi_5 = bits, U32, 1576, [13:13], "false", "true" @@ -2468,7 +2469,7 @@ injectorStagingRpmBins = array, U16, 22222, [6], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1456 + ochBlockSize = 1468 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3131,145 +3132,147 @@ smartChipState = scalar, S08, 1102, "", 1, 0 smartChipRestartCounter = scalar, S08, 1103, "", 1, 0 smartChipAliveCounter = scalar, S08, 1104, "", 1, 0 startStopPhysicalState = bits, U32, 1108, [0:0] -acrStateDup = bits, U32, 1108, [1:1] -acrEngineMovedRecently = bits, U32, 1108, [2:2] -heaterControlEnabled = bits, U32, 1108, [3:3] -luaDigitalState0 = bits, U32, 1108, [4:4] -luaDigitalState1 = bits, U32, 1108, [5:5] -luaDigitalState2 = bits, U32, 1108, [6:6] -luaDigitalState3 = bits, U32, 1108, [7:7] +acrEngineMovedRecently = bits, U32, 1108, [1:1] +heaterControlEnabled = bits, U32, 1108, [2:2] +luaDigitalState0 = bits, U32, 1108, [3:3] +luaDigitalState1 = bits, U32, 1108, [4:4] +luaDigitalState2 = bits, U32, 1108, [5:5] +luaDigitalState3 = bits, U32, 1108, [6:6] startStopStateToggleCounter = scalar, U32, 1112, "", 1, 0 egtValue1 = scalar, F32, 1116, "", 1, 0 egtValue2 = scalar, F32, 1120, "", 1, 0 -desiredRpmLimit = scalar, S16, 1124, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1128, "", 1, 0 -globalSparkCounter = scalar, U32, 1132, "", 1, 0 -fuelingLoad = scalar, F32, 1136, "", 1, 0 -ignitionLoad = scalar, F32, 1140, "", 1, 0 -veTableYAxis = scalar, U16, 1144, "%", 0.01, 0 -; total TS size = 1148 -tpsFrom = scalar, F32, 1148 -tpsTo = scalar, F32, 1152 -deltaTps = scalar, F32, 1156 -extraFuel = scalar, F32, 1160, "", 1, 0 -valueFromTable = scalar, F32, 1164, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1168, [0:0] -isBelowDecelThreshold = bits, U32, 1168, [1:1] -isTimeToResetAccumulator = bits, U32, 1168, [2:2] -isFractionalEnrichment = bits, U32, 1168, [3:3] -belowEpsilon = bits, U32, 1168, [4:4] -tooShort = bits, U32, 1168, [5:5] -fractionalInjFuel = scalar, F32, 1172, "", 1, 0 -accumulatedValue = scalar, F32, 1176, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1180, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1184, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1188, "", 1, 0 -cycleCnt = scalar, S32, 1192, "", 1, 0 -; total TS size = 1196 -hwEventCounters1 = scalar, U32, 1196, "", 1, 0 -hwEventCounters2 = scalar, U32, 1200, "", 1, 0 -hwEventCounters3 = scalar, U32, 1204, "", 1, 0 -hwEventCounters4 = scalar, U32, 1208, "", 1, 0 -hwEventCounters5 = scalar, U32, 1212, "", 1, 0 -hwEventCounters6 = scalar, U32, 1216, "", 1, 0 -vvtCamCounter = scalar, U32, 1220, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1224, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1228, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1232, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1233, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1236, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1240, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1244, "", 1, 0 -mapCamPrevToothAngle = scalar, F32, 1248, "deg", 1, 0 -isDecodingMapCam = bits, U32, 1252, [0:0] -; total TS size = 1256 -crankSynchronizationCounter0 = scalar, U32, 1256, "", 1, 0 -vvtSyncGapRatio0 = scalar, F32, 1260, "", 1, 0 -vvtToothDurations00 = scalar, U32, 1264, "us", 1, 0 -vvtCurrentPosition0 = scalar, F32, 1268, "sync: Primary Cam Position", 1, 0 -vvtToothPosition10 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition20 = scalar, F32, 1276, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition30 = scalar, F32, 1280, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition40 = scalar, F32, 1284, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio0 = scalar, F32, 1288, "", 1, 0 -triggerStateIndex0 = scalar, U08, 1292, "", 1, 0 -vvtStateIndex0 = scalar, U08, 1293, "", 1, 0 -; total TS size = 1296 -camResyncCounter = scalar, U08, 1296, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1300, [0:0] -; total TS size = 1304 -wallFuelCorrection = scalar, F32, 1304, "", 1, 0 -wallFuel = scalar, F32, 1308, "", 1, 0 -; total TS size = 1312 -idleState = bits, S32, 1312, [0:2], "not important" -currentIdlePosition = scalar, F32, 1316 -baseIdlePosition = scalar, F32, 1320 -idleClosedLoop = scalar, F32, 1324 -iacByTpsTaper = scalar, F32, 1328 -throttlePedalUpState = scalar, S32, 1332, "", 1, 0 -mightResetPid = bits, U32, 1336, [0:0] -shouldResetPid = bits, U32, 1336, [1:1] -wasResetPid = bits, U32, 1336, [2:2] -mustResetPid = bits, U32, 1336, [3:3] -isCranking = bits, U32, 1336, [4:4] -isIacTableForCoasting = bits, U32, 1336, [5:5] -notIdling = bits, U32, 1336, [6:6] -needReset = bits, U32, 1336, [7:7] -isInDeadZone = bits, U32, 1336, [8:8] -isBlipping = bits, U32, 1336, [9:9] -useClosedLoop = bits, U32, 1336, [10:10] -badTps = bits, U32, 1336, [11:11] -looksLikeRunning = bits, U32, 1336, [12:12] -looksLikeCoasting = bits, U32, 1336, [13:13] -looksLikeCrankToIdle = bits, U32, 1336, [14:14] -isIdleCoasting = bits, U32, 1336, [15:15] -isIdleClosedLoop = bits, U32, 1336, [16:16] -idleTarget = scalar, S32, 1340, "", 1, 0 -targetRpmByClt = scalar, S32, 1344, "", 1, 0 -targetRpmAc = scalar, S32, 1348, "", 1, 0 -iacByRpmTaper = scalar, F32, 1352 -luaAdd = scalar, F32, 1356 -; total TS size = 1360 -idlePosition0 = scalar, F32, 1360, "per", 1,0 -trim0 = scalar, F32, 1364, "", 1, 0 -luaAdjustment0 = scalar, F32, 1368, "per", 1,0 -m_wastegatePosition0 = scalar, F32, 1372, "per", 1,0 -etbFeedForward0 = scalar, F32, 1376 -etbIntegralError0 = scalar, F32, 1380, "", 1, 0 -etbCurrentTarget0 = scalar, F32, 1384, "%", 1, 0 -etbCurrentAdjustedTarget0 = scalar, F32, 1388, "%", 1, 0 -etbRevLimitActive0 = bits, U32, 1392, [0:0] -jamDetected0 = bits, U32, 1392, [1:1] -etbDutyRateOfChange0 = scalar, F32, 1396, "per", 1,0 -etbDutyAverage0 = scalar, F32, 1400, "per", 1,0 -etbTpsErrorCounter0 = scalar, U16, 1404, "count", 1,0 -etbPpsErrorCounter0 = scalar, U16, 1406, "count", 1,0 -etbErrorCode0 = scalar, S08, 1408, "", 1, 0 -tcEtbDrop0 = scalar, S08, 1409, "", 1, 0 -jamTimer0 = scalar, U16, 1410, "sec", 0.01, 0 -; total TS size = 1412 -faultCode0 = scalar, U08, 1412, "", 1, 0 -heaterDuty0 = scalar, U08, 1413, "%", 1, 0 -pumpDuty0 = scalar, U08, 1414, "%", 1, 0 -tempC0 = scalar, U16, 1416, "C", 1, 0 -nernstVoltage0 = scalar, U16, 1418, "V", 0.001, 0 -esr0 = scalar, U16, 1420, "ohm", 1, 0 +luaSoftSparkSkip = scalar, F32, 1124, "", 1, 0 +luaHardSparkSkip = scalar, F32, 1128, "", 1, 0 +tractionControlSparkSkip = scalar, F32, 1132, "", 1, 0 +desiredRpmLimit = scalar, S16, 1136, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 1140, "", 1, 0 +globalSparkCounter = scalar, U32, 1144, "", 1, 0 +fuelingLoad = scalar, F32, 1148, "", 1, 0 +ignitionLoad = scalar, F32, 1152, "", 1, 0 +veTableYAxis = scalar, U16, 1156, "%", 0.01, 0 +; total TS size = 1160 +tpsFrom = scalar, F32, 1160 +tpsTo = scalar, F32, 1164 +deltaTps = scalar, F32, 1168 +extraFuel = scalar, F32, 1172, "", 1, 0 +valueFromTable = scalar, F32, 1176, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1180, [0:0] +isBelowDecelThreshold = bits, U32, 1180, [1:1] +isTimeToResetAccumulator = bits, U32, 1180, [2:2] +isFractionalEnrichment = bits, U32, 1180, [3:3] +belowEpsilon = bits, U32, 1180, [4:4] +tooShort = bits, U32, 1180, [5:5] +fractionalInjFuel = scalar, F32, 1184, "", 1, 0 +accumulatedValue = scalar, F32, 1188, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1192, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1196, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1200, "", 1, 0 +cycleCnt = scalar, S32, 1204, "", 1, 0 +; total TS size = 1208 +hwEventCounters1 = scalar, U32, 1208, "", 1, 0 +hwEventCounters2 = scalar, U32, 1212, "", 1, 0 +hwEventCounters3 = scalar, U32, 1216, "", 1, 0 +hwEventCounters4 = scalar, U32, 1220, "", 1, 0 +hwEventCounters5 = scalar, U32, 1224, "", 1, 0 +hwEventCounters6 = scalar, U32, 1228, "", 1, 0 +vvtCamCounter = scalar, U32, 1232, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1236, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1240, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1244, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1245, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1248, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1252, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1256, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1260, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1264, [0:0] +; total TS size = 1268 +crankSynchronizationCounter0 = scalar, U32, 1268, "", 1, 0 +vvtSyncGapRatio0 = scalar, F32, 1272, "", 1, 0 +vvtToothDurations00 = scalar, U32, 1276, "us", 1, 0 +vvtCurrentPosition0 = scalar, F32, 1280, "sync: Primary Cam Position", 1, 0 +vvtToothPosition10 = scalar, F32, 1284, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition20 = scalar, F32, 1288, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition30 = scalar, F32, 1292, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition40 = scalar, F32, 1296, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio0 = scalar, F32, 1300, "", 1, 0 +triggerStateIndex0 = scalar, U08, 1304, "", 1, 0 +vvtStateIndex0 = scalar, U08, 1305, "", 1, 0 +; total TS size = 1308 +camResyncCounter = scalar, U08, 1308, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1312, [0:0] +; total TS size = 1316 +wallFuelCorrection = scalar, F32, 1316, "", 1, 0 +wallFuel = scalar, F32, 1320, "", 1, 0 +; total TS size = 1324 +idleState = bits, S32, 1324, [0:2], "not important" +currentIdlePosition = scalar, F32, 1328 +baseIdlePosition = scalar, F32, 1332 +idleClosedLoop = scalar, F32, 1336 +iacByTpsTaper = scalar, F32, 1340 +throttlePedalUpState = scalar, S32, 1344, "", 1, 0 +mightResetPid = bits, U32, 1348, [0:0] +shouldResetPid = bits, U32, 1348, [1:1] +wasResetPid = bits, U32, 1348, [2:2] +mustResetPid = bits, U32, 1348, [3:3] +isCranking = bits, U32, 1348, [4:4] +isIacTableForCoasting = bits, U32, 1348, [5:5] +notIdling = bits, U32, 1348, [6:6] +needReset = bits, U32, 1348, [7:7] +isInDeadZone = bits, U32, 1348, [8:8] +isBlipping = bits, U32, 1348, [9:9] +useClosedLoop = bits, U32, 1348, [10:10] +badTps = bits, U32, 1348, [11:11] +looksLikeRunning = bits, U32, 1348, [12:12] +looksLikeCoasting = bits, U32, 1348, [13:13] +looksLikeCrankToIdle = bits, U32, 1348, [14:14] +isIdleCoasting = bits, U32, 1348, [15:15] +isIdleClosedLoop = bits, U32, 1348, [16:16] +idleTarget = scalar, S32, 1352, "", 1, 0 +targetRpmByClt = scalar, S32, 1356, "", 1, 0 +targetRpmAc = scalar, S32, 1360, "", 1, 0 +iacByRpmTaper = scalar, F32, 1364 +luaAdd = scalar, F32, 1368 +; total TS size = 1372 +idlePosition0 = scalar, F32, 1372, "per", 1,0 +trim0 = scalar, F32, 1376, "", 1, 0 +luaAdjustment0 = scalar, F32, 1380, "per", 1,0 +m_wastegatePosition0 = scalar, F32, 1384, "per", 1,0 +etbFeedForward0 = scalar, F32, 1388 +etbIntegralError0 = scalar, F32, 1392, "", 1, 0 +etbCurrentTarget0 = scalar, F32, 1396, "%", 1, 0 +etbCurrentAdjustedTarget0 = scalar, F32, 1400, "%", 1, 0 +etbRevLimitActive0 = bits, U32, 1404, [0:0] +jamDetected0 = bits, U32, 1404, [1:1] +etbDutyRateOfChange0 = scalar, F32, 1408, "per", 1,0 +etbDutyAverage0 = scalar, F32, 1412, "per", 1,0 +etbTpsErrorCounter0 = scalar, U16, 1416, "count", 1,0 +etbPpsErrorCounter0 = scalar, U16, 1418, "count", 1,0 +etbErrorCode0 = scalar, S08, 1420, "", 1, 0 +tcEtbDrop0 = scalar, S08, 1421, "", 1, 0 +jamTimer0 = scalar, U16, 1422, "sec", 0.01, 0 ; total TS size = 1424 -dcOutput0 = scalar, F32, 1424, "per", 1,0 -isEnabled0_int = scalar, U08, 1428, "per", 1,0 -isEnabled0 = bits, U32, 1432, [0:0] +faultCode0 = scalar, U08, 1424, "", 1, 0 +heaterDuty0 = scalar, U08, 1425, "%", 1, 0 +pumpDuty0 = scalar, U08, 1426, "%", 1, 0 +tempC0 = scalar, U16, 1428, "C", 1, 0 +nernstVoltage0 = scalar, U16, 1430, "V", 0.001, 0 +esr0 = scalar, U16, 1432, "ohm", 1, 0 ; total TS size = 1436 -value0 = scalar, U16, 1436, "value", 1,0 -value1 = scalar, U16, 1438, "value", 1,0 -errorRate = scalar, F32, 1440, "ratio", 1,0 -; total TS size = 1444 -vvtTarget = scalar, U16, 1444, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1446, "%", 0.5, 0 +dcOutput0 = scalar, F32, 1436, "per", 1,0 +isEnabled0_int = scalar, U08, 1440, "per", 1,0 +isEnabled0 = bits, U32, 1444, [0:0] ; total TS size = 1448 -lambdaCurrentlyGood = bits, U32, 1448, [0:0] -lambdaMonitorCut = bits, U32, 1448, [1:1] -lambdaTimeSinceGood = scalar, U16, 1452, "sec", 0.01, 0 +value0 = scalar, U16, 1448, "value", 1,0 +value1 = scalar, U16, 1450, "value", 1,0 +errorRate = scalar, F32, 1452, "ratio", 1,0 ; total TS size = 1456 +vvtTarget = scalar, U16, 1456, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1458, "%", 0.5, 0 +; total TS size = 1460 +lambdaCurrentlyGood = bits, U32, 1460, [0:0] +lambdaMonitorCut = bits, U32, 1460, [1:1] +lambdaTimeSinceGood = scalar, U16, 1464, "sec", 0.01, 0 +; total TS size = 1468 time = { timeNow } @@ -5401,7 +5404,6 @@ entry = smartChipState, "smartChipState", int, "%d" entry = smartChipRestartCounter, "smartChipRestartCounter", int, "%d" entry = smartChipAliveCounter, "smartChipAliveCounter", int, "%d" entry = startStopPhysicalState, "startStopPhysicalState", int, "%d" -entry = acrStateDup, "acrStateDup", int, "%d" entry = acrEngineMovedRecently, "acrEngineMovedRecently", int, "%d" entry = heaterControlEnabled, "heaterControlEnabled", int, "%d" entry = luaDigitalState0, "luaDigitalState0", int, "%d" @@ -5411,6 +5413,9 @@ entry = luaDigitalState3, "luaDigitalState3", int, "%d" entry = startStopStateToggleCounter, "startStopStateToggleCounter", int, "%d" entry = egtValue1, "egtValue1", float, "%.3f" entry = egtValue2, "egtValue2", float, "%.3f" +entry = luaSoftSparkSkip, "luaSoftSparkSkip", float, "%.3f" +entry = luaHardSparkSkip, "luaHardSparkSkip", float, "%.3f" +entry = tractionControlSparkSkip, "tractionControlSparkSkip", float, "%.3f" entry = desiredRpmLimit, "User-defined RPM hard limit", int, "%d" entry = fuelInjectionCounter, "Fuel: Injection counter", int, "%d" entry = globalSparkCounter, "Ign: Spark counter", int, "%d" @@ -5912,7 +5917,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 @@ -6360,7 +6365,6 @@ indicatorPanel = engine_stateIndicatorPanel, 2 indicator = {lua_luaDisableEtb}, "luaDisableEtb No", "luaDisableEtb Yes" indicator = {lua_luaIgnCut}, "luaIgnCut No", "luaIgnCut Yes" indicator = {startStopPhysicalState}, "startStopPhysicalState No", "startStopPhysicalState Yes" - indicator = {acrStateDup}, "acrStateDup No", "acrStateDup Yes" indicator = {acrEngineMovedRecently}, "acrEngineMovedRecently No", "acrEngineMovedRecently Yes" indicator = {heaterControlEnabled}, "heaterControlEnabled No", "heaterControlEnabled Yes" indicator = {luaDigitalState0}, "luaDigitalState0 No", "luaDigitalState0 Yes" @@ -6396,12 +6400,16 @@ dialog = engine_stateDialog, "engine_state" graphLine = egtValue1 graphLine = egtValue2 liveGraph = engine_state_6_Graph, "Graph", South + graphLine = luaSoftSparkSkip + graphLine = luaHardSparkSkip + graphLine = tractionControlSparkSkip graphLine = desiredRpmLimit + liveGraph = engine_state_7_Graph, "Graph", South graphLine = fuelInjectionCounter graphLine = globalSparkCounter graphLine = fuelingLoad - liveGraph = engine_state_7_Graph, "Graph", South graphLine = ignitionLoad + liveGraph = engine_state_8_Graph, "Graph", South graphLine = veTableYAxis indicatorPanel = tps_accel_stateIndicatorPanel, 2 @@ -7308,6 +7316,10 @@ dialog = lambda_monitorDialog, "lambda_monitor" 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 diff --git a/firmware/tunerstudio/generated/rusefi_atlas.ini b/firmware/tunerstudio/generated/rusefi_atlas.ini index 770a2061f9..70dbd01c1e 100644 --- a/firmware/tunerstudio/generated/rusefi_atlas.ini +++ b/firmware/tunerstudio/generated/rusefi_atlas.ini @@ -37,12 +37,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.03.05.atlas.346403579" + signature = "rusEFI master.2024.03.05.atlas.1530856131" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.03.05.atlas.346403579" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.03.05.atlas.1530856131" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -98,7 +98,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="Disabled", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PB0", "PB1", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue Mar 05 00:53:07 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue Mar 05 01:57:11 UTC 2024 pageSize = 21736 page = 1 @@ -745,6 +745,7 @@ mc33810Gpgd3Mode = bits, U32, 1576, [4:4], "false", "true" enableExtendedCanBroadcast = bits, U32, 1576, [5:5], "false", "true" luaCanRxWorkaround = bits, U32, 1576, [6:6], "false", "true" flexSensorInverted = bits, U32, 1576, [7:7], "false", "true" +useHardSkipInTraction = bits, U32, 1576, [8:8], "false", "true" useAuxSpeedForSlipRatio = bits, U32, 1576, [11:11], "false", "true" useVssAsSecondWheelSpeed = bits, U32, 1576, [12:12], "false", "true" is_enabled_spi_5 = bits, U32, 1576, [13:13], "false", "true" @@ -2468,7 +2469,7 @@ injectorStagingRpmBins = array, U16, 21722, [6], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1456 + ochBlockSize = 1468 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3131,145 +3132,147 @@ smartChipState = scalar, S08, 1102, "", 1, 0 smartChipRestartCounter = scalar, S08, 1103, "", 1, 0 smartChipAliveCounter = scalar, S08, 1104, "", 1, 0 startStopPhysicalState = bits, U32, 1108, [0:0] -acrStateDup = bits, U32, 1108, [1:1] -acrEngineMovedRecently = bits, U32, 1108, [2:2] -heaterControlEnabled = bits, U32, 1108, [3:3] -luaDigitalState0 = bits, U32, 1108, [4:4] -luaDigitalState1 = bits, U32, 1108, [5:5] -luaDigitalState2 = bits, U32, 1108, [6:6] -luaDigitalState3 = bits, U32, 1108, [7:7] +acrEngineMovedRecently = bits, U32, 1108, [1:1] +heaterControlEnabled = bits, U32, 1108, [2:2] +luaDigitalState0 = bits, U32, 1108, [3:3] +luaDigitalState1 = bits, U32, 1108, [4:4] +luaDigitalState2 = bits, U32, 1108, [5:5] +luaDigitalState3 = bits, U32, 1108, [6:6] startStopStateToggleCounter = scalar, U32, 1112, "", 1, 0 egtValue1 = scalar, F32, 1116, "", 1, 0 egtValue2 = scalar, F32, 1120, "", 1, 0 -desiredRpmLimit = scalar, S16, 1124, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1128, "", 1, 0 -globalSparkCounter = scalar, U32, 1132, "", 1, 0 -fuelingLoad = scalar, F32, 1136, "", 1, 0 -ignitionLoad = scalar, F32, 1140, "", 1, 0 -veTableYAxis = scalar, U16, 1144, "%", 0.01, 0 -; total TS size = 1148 -tpsFrom = scalar, F32, 1148 -tpsTo = scalar, F32, 1152 -deltaTps = scalar, F32, 1156 -extraFuel = scalar, F32, 1160, "", 1, 0 -valueFromTable = scalar, F32, 1164, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1168, [0:0] -isBelowDecelThreshold = bits, U32, 1168, [1:1] -isTimeToResetAccumulator = bits, U32, 1168, [2:2] -isFractionalEnrichment = bits, U32, 1168, [3:3] -belowEpsilon = bits, U32, 1168, [4:4] -tooShort = bits, U32, 1168, [5:5] -fractionalInjFuel = scalar, F32, 1172, "", 1, 0 -accumulatedValue = scalar, F32, 1176, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1180, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1184, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1188, "", 1, 0 -cycleCnt = scalar, S32, 1192, "", 1, 0 -; total TS size = 1196 -hwEventCounters1 = scalar, U32, 1196, "", 1, 0 -hwEventCounters2 = scalar, U32, 1200, "", 1, 0 -hwEventCounters3 = scalar, U32, 1204, "", 1, 0 -hwEventCounters4 = scalar, U32, 1208, "", 1, 0 -hwEventCounters5 = scalar, U32, 1212, "", 1, 0 -hwEventCounters6 = scalar, U32, 1216, "", 1, 0 -vvtCamCounter = scalar, U32, 1220, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1224, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1228, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1232, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1233, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1236, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1240, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1244, "", 1, 0 -mapCamPrevToothAngle = scalar, F32, 1248, "deg", 1, 0 -isDecodingMapCam = bits, U32, 1252, [0:0] -; total TS size = 1256 -crankSynchronizationCounter0 = scalar, U32, 1256, "", 1, 0 -vvtSyncGapRatio0 = scalar, F32, 1260, "", 1, 0 -vvtToothDurations00 = scalar, U32, 1264, "us", 1, 0 -vvtCurrentPosition0 = scalar, F32, 1268, "sync: Primary Cam Position", 1, 0 -vvtToothPosition10 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition20 = scalar, F32, 1276, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition30 = scalar, F32, 1280, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition40 = scalar, F32, 1284, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio0 = scalar, F32, 1288, "", 1, 0 -triggerStateIndex0 = scalar, U08, 1292, "", 1, 0 -vvtStateIndex0 = scalar, U08, 1293, "", 1, 0 -; total TS size = 1296 -camResyncCounter = scalar, U08, 1296, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1300, [0:0] -; total TS size = 1304 -wallFuelCorrection = scalar, F32, 1304, "", 1, 0 -wallFuel = scalar, F32, 1308, "", 1, 0 -; total TS size = 1312 -idleState = bits, S32, 1312, [0:2], "not important" -currentIdlePosition = scalar, F32, 1316 -baseIdlePosition = scalar, F32, 1320 -idleClosedLoop = scalar, F32, 1324 -iacByTpsTaper = scalar, F32, 1328 -throttlePedalUpState = scalar, S32, 1332, "", 1, 0 -mightResetPid = bits, U32, 1336, [0:0] -shouldResetPid = bits, U32, 1336, [1:1] -wasResetPid = bits, U32, 1336, [2:2] -mustResetPid = bits, U32, 1336, [3:3] -isCranking = bits, U32, 1336, [4:4] -isIacTableForCoasting = bits, U32, 1336, [5:5] -notIdling = bits, U32, 1336, [6:6] -needReset = bits, U32, 1336, [7:7] -isInDeadZone = bits, U32, 1336, [8:8] -isBlipping = bits, U32, 1336, [9:9] -useClosedLoop = bits, U32, 1336, [10:10] -badTps = bits, U32, 1336, [11:11] -looksLikeRunning = bits, U32, 1336, [12:12] -looksLikeCoasting = bits, U32, 1336, [13:13] -looksLikeCrankToIdle = bits, U32, 1336, [14:14] -isIdleCoasting = bits, U32, 1336, [15:15] -isIdleClosedLoop = bits, U32, 1336, [16:16] -idleTarget = scalar, S32, 1340, "", 1, 0 -targetRpmByClt = scalar, S32, 1344, "", 1, 0 -targetRpmAc = scalar, S32, 1348, "", 1, 0 -iacByRpmTaper = scalar, F32, 1352 -luaAdd = scalar, F32, 1356 -; total TS size = 1360 -idlePosition0 = scalar, F32, 1360, "per", 1,0 -trim0 = scalar, F32, 1364, "", 1, 0 -luaAdjustment0 = scalar, F32, 1368, "per", 1,0 -m_wastegatePosition0 = scalar, F32, 1372, "per", 1,0 -etbFeedForward0 = scalar, F32, 1376 -etbIntegralError0 = scalar, F32, 1380, "", 1, 0 -etbCurrentTarget0 = scalar, F32, 1384, "%", 1, 0 -etbCurrentAdjustedTarget0 = scalar, F32, 1388, "%", 1, 0 -etbRevLimitActive0 = bits, U32, 1392, [0:0] -jamDetected0 = bits, U32, 1392, [1:1] -etbDutyRateOfChange0 = scalar, F32, 1396, "per", 1,0 -etbDutyAverage0 = scalar, F32, 1400, "per", 1,0 -etbTpsErrorCounter0 = scalar, U16, 1404, "count", 1,0 -etbPpsErrorCounter0 = scalar, U16, 1406, "count", 1,0 -etbErrorCode0 = scalar, S08, 1408, "", 1, 0 -tcEtbDrop0 = scalar, S08, 1409, "", 1, 0 -jamTimer0 = scalar, U16, 1410, "sec", 0.01, 0 -; total TS size = 1412 -faultCode0 = scalar, U08, 1412, "", 1, 0 -heaterDuty0 = scalar, U08, 1413, "%", 1, 0 -pumpDuty0 = scalar, U08, 1414, "%", 1, 0 -tempC0 = scalar, U16, 1416, "C", 1, 0 -nernstVoltage0 = scalar, U16, 1418, "V", 0.001, 0 -esr0 = scalar, U16, 1420, "ohm", 1, 0 +luaSoftSparkSkip = scalar, F32, 1124, "", 1, 0 +luaHardSparkSkip = scalar, F32, 1128, "", 1, 0 +tractionControlSparkSkip = scalar, F32, 1132, "", 1, 0 +desiredRpmLimit = scalar, S16, 1136, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 1140, "", 1, 0 +globalSparkCounter = scalar, U32, 1144, "", 1, 0 +fuelingLoad = scalar, F32, 1148, "", 1, 0 +ignitionLoad = scalar, F32, 1152, "", 1, 0 +veTableYAxis = scalar, U16, 1156, "%", 0.01, 0 +; total TS size = 1160 +tpsFrom = scalar, F32, 1160 +tpsTo = scalar, F32, 1164 +deltaTps = scalar, F32, 1168 +extraFuel = scalar, F32, 1172, "", 1, 0 +valueFromTable = scalar, F32, 1176, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1180, [0:0] +isBelowDecelThreshold = bits, U32, 1180, [1:1] +isTimeToResetAccumulator = bits, U32, 1180, [2:2] +isFractionalEnrichment = bits, U32, 1180, [3:3] +belowEpsilon = bits, U32, 1180, [4:4] +tooShort = bits, U32, 1180, [5:5] +fractionalInjFuel = scalar, F32, 1184, "", 1, 0 +accumulatedValue = scalar, F32, 1188, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1192, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1196, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1200, "", 1, 0 +cycleCnt = scalar, S32, 1204, "", 1, 0 +; total TS size = 1208 +hwEventCounters1 = scalar, U32, 1208, "", 1, 0 +hwEventCounters2 = scalar, U32, 1212, "", 1, 0 +hwEventCounters3 = scalar, U32, 1216, "", 1, 0 +hwEventCounters4 = scalar, U32, 1220, "", 1, 0 +hwEventCounters5 = scalar, U32, 1224, "", 1, 0 +hwEventCounters6 = scalar, U32, 1228, "", 1, 0 +vvtCamCounter = scalar, U32, 1232, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1236, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1240, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1244, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1245, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1248, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1252, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1256, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1260, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1264, [0:0] +; total TS size = 1268 +crankSynchronizationCounter0 = scalar, U32, 1268, "", 1, 0 +vvtSyncGapRatio0 = scalar, F32, 1272, "", 1, 0 +vvtToothDurations00 = scalar, U32, 1276, "us", 1, 0 +vvtCurrentPosition0 = scalar, F32, 1280, "sync: Primary Cam Position", 1, 0 +vvtToothPosition10 = scalar, F32, 1284, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition20 = scalar, F32, 1288, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition30 = scalar, F32, 1292, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition40 = scalar, F32, 1296, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio0 = scalar, F32, 1300, "", 1, 0 +triggerStateIndex0 = scalar, U08, 1304, "", 1, 0 +vvtStateIndex0 = scalar, U08, 1305, "", 1, 0 +; total TS size = 1308 +camResyncCounter = scalar, U08, 1308, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1312, [0:0] +; total TS size = 1316 +wallFuelCorrection = scalar, F32, 1316, "", 1, 0 +wallFuel = scalar, F32, 1320, "", 1, 0 +; total TS size = 1324 +idleState = bits, S32, 1324, [0:2], "not important" +currentIdlePosition = scalar, F32, 1328 +baseIdlePosition = scalar, F32, 1332 +idleClosedLoop = scalar, F32, 1336 +iacByTpsTaper = scalar, F32, 1340 +throttlePedalUpState = scalar, S32, 1344, "", 1, 0 +mightResetPid = bits, U32, 1348, [0:0] +shouldResetPid = bits, U32, 1348, [1:1] +wasResetPid = bits, U32, 1348, [2:2] +mustResetPid = bits, U32, 1348, [3:3] +isCranking = bits, U32, 1348, [4:4] +isIacTableForCoasting = bits, U32, 1348, [5:5] +notIdling = bits, U32, 1348, [6:6] +needReset = bits, U32, 1348, [7:7] +isInDeadZone = bits, U32, 1348, [8:8] +isBlipping = bits, U32, 1348, [9:9] +useClosedLoop = bits, U32, 1348, [10:10] +badTps = bits, U32, 1348, [11:11] +looksLikeRunning = bits, U32, 1348, [12:12] +looksLikeCoasting = bits, U32, 1348, [13:13] +looksLikeCrankToIdle = bits, U32, 1348, [14:14] +isIdleCoasting = bits, U32, 1348, [15:15] +isIdleClosedLoop = bits, U32, 1348, [16:16] +idleTarget = scalar, S32, 1352, "", 1, 0 +targetRpmByClt = scalar, S32, 1356, "", 1, 0 +targetRpmAc = scalar, S32, 1360, "", 1, 0 +iacByRpmTaper = scalar, F32, 1364 +luaAdd = scalar, F32, 1368 +; total TS size = 1372 +idlePosition0 = scalar, F32, 1372, "per", 1,0 +trim0 = scalar, F32, 1376, "", 1, 0 +luaAdjustment0 = scalar, F32, 1380, "per", 1,0 +m_wastegatePosition0 = scalar, F32, 1384, "per", 1,0 +etbFeedForward0 = scalar, F32, 1388 +etbIntegralError0 = scalar, F32, 1392, "", 1, 0 +etbCurrentTarget0 = scalar, F32, 1396, "%", 1, 0 +etbCurrentAdjustedTarget0 = scalar, F32, 1400, "%", 1, 0 +etbRevLimitActive0 = bits, U32, 1404, [0:0] +jamDetected0 = bits, U32, 1404, [1:1] +etbDutyRateOfChange0 = scalar, F32, 1408, "per", 1,0 +etbDutyAverage0 = scalar, F32, 1412, "per", 1,0 +etbTpsErrorCounter0 = scalar, U16, 1416, "count", 1,0 +etbPpsErrorCounter0 = scalar, U16, 1418, "count", 1,0 +etbErrorCode0 = scalar, S08, 1420, "", 1, 0 +tcEtbDrop0 = scalar, S08, 1421, "", 1, 0 +jamTimer0 = scalar, U16, 1422, "sec", 0.01, 0 ; total TS size = 1424 -dcOutput0 = scalar, F32, 1424, "per", 1,0 -isEnabled0_int = scalar, U08, 1428, "per", 1,0 -isEnabled0 = bits, U32, 1432, [0:0] +faultCode0 = scalar, U08, 1424, "", 1, 0 +heaterDuty0 = scalar, U08, 1425, "%", 1, 0 +pumpDuty0 = scalar, U08, 1426, "%", 1, 0 +tempC0 = scalar, U16, 1428, "C", 1, 0 +nernstVoltage0 = scalar, U16, 1430, "V", 0.001, 0 +esr0 = scalar, U16, 1432, "ohm", 1, 0 ; total TS size = 1436 -value0 = scalar, U16, 1436, "value", 1,0 -value1 = scalar, U16, 1438, "value", 1,0 -errorRate = scalar, F32, 1440, "ratio", 1,0 -; total TS size = 1444 -vvtTarget = scalar, U16, 1444, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1446, "%", 0.5, 0 +dcOutput0 = scalar, F32, 1436, "per", 1,0 +isEnabled0_int = scalar, U08, 1440, "per", 1,0 +isEnabled0 = bits, U32, 1444, [0:0] ; total TS size = 1448 -lambdaCurrentlyGood = bits, U32, 1448, [0:0] -lambdaMonitorCut = bits, U32, 1448, [1:1] -lambdaTimeSinceGood = scalar, U16, 1452, "sec", 0.01, 0 +value0 = scalar, U16, 1448, "value", 1,0 +value1 = scalar, U16, 1450, "value", 1,0 +errorRate = scalar, F32, 1452, "ratio", 1,0 ; total TS size = 1456 +vvtTarget = scalar, U16, 1456, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1458, "%", 0.5, 0 +; total TS size = 1460 +lambdaCurrentlyGood = bits, U32, 1460, [0:0] +lambdaMonitorCut = bits, U32, 1460, [1:1] +lambdaTimeSinceGood = scalar, U16, 1464, "sec", 0.01, 0 +; total TS size = 1468 time = { timeNow } @@ -5401,7 +5404,6 @@ entry = smartChipState, "smartChipState", int, "%d" entry = smartChipRestartCounter, "smartChipRestartCounter", int, "%d" entry = smartChipAliveCounter, "smartChipAliveCounter", int, "%d" entry = startStopPhysicalState, "startStopPhysicalState", int, "%d" -entry = acrStateDup, "acrStateDup", int, "%d" entry = acrEngineMovedRecently, "acrEngineMovedRecently", int, "%d" entry = heaterControlEnabled, "heaterControlEnabled", int, "%d" entry = luaDigitalState0, "luaDigitalState0", int, "%d" @@ -5411,6 +5413,9 @@ entry = luaDigitalState3, "luaDigitalState3", int, "%d" entry = startStopStateToggleCounter, "startStopStateToggleCounter", int, "%d" entry = egtValue1, "egtValue1", float, "%.3f" entry = egtValue2, "egtValue2", float, "%.3f" +entry = luaSoftSparkSkip, "luaSoftSparkSkip", float, "%.3f" +entry = luaHardSparkSkip, "luaHardSparkSkip", float, "%.3f" +entry = tractionControlSparkSkip, "tractionControlSparkSkip", float, "%.3f" entry = desiredRpmLimit, "User-defined RPM hard limit", int, "%d" entry = fuelInjectionCounter, "Fuel: Injection counter", int, "%d" entry = globalSparkCounter, "Ign: Spark counter", int, "%d" @@ -5912,7 +5917,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 @@ -6360,7 +6365,6 @@ indicatorPanel = engine_stateIndicatorPanel, 2 indicator = {lua_luaDisableEtb}, "luaDisableEtb No", "luaDisableEtb Yes" indicator = {lua_luaIgnCut}, "luaIgnCut No", "luaIgnCut Yes" indicator = {startStopPhysicalState}, "startStopPhysicalState No", "startStopPhysicalState Yes" - indicator = {acrStateDup}, "acrStateDup No", "acrStateDup Yes" indicator = {acrEngineMovedRecently}, "acrEngineMovedRecently No", "acrEngineMovedRecently Yes" indicator = {heaterControlEnabled}, "heaterControlEnabled No", "heaterControlEnabled Yes" indicator = {luaDigitalState0}, "luaDigitalState0 No", "luaDigitalState0 Yes" @@ -6396,12 +6400,16 @@ dialog = engine_stateDialog, "engine_state" graphLine = egtValue1 graphLine = egtValue2 liveGraph = engine_state_6_Graph, "Graph", South + graphLine = luaSoftSparkSkip + graphLine = luaHardSparkSkip + graphLine = tractionControlSparkSkip graphLine = desiredRpmLimit + liveGraph = engine_state_7_Graph, "Graph", South graphLine = fuelInjectionCounter graphLine = globalSparkCounter graphLine = fuelingLoad - liveGraph = engine_state_7_Graph, "Graph", South graphLine = ignitionLoad + liveGraph = engine_state_8_Graph, "Graph", South graphLine = veTableYAxis indicatorPanel = tps_accel_stateIndicatorPanel, 2 @@ -7308,6 +7316,10 @@ dialog = lambda_monitorDialog, "lambda_monitor" 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 diff --git a/firmware/tunerstudio/generated/rusefi_cypress.ini b/firmware/tunerstudio/generated/rusefi_cypress.ini index 2b5afe4630..563754be87 100644 --- a/firmware/tunerstudio/generated/rusefi_cypress.ini +++ b/firmware/tunerstudio/generated/rusefi_cypress.ini @@ -37,12 +37,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.03.05.cypress.1352820405" + signature = "rusEFI master.2024.03.05.cypress.523818637" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.03.05.cypress.1352820405" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.03.05.cypress.523818637" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -98,7 +98,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="Disabled", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PB0", "PB1", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue Mar 05 00:52:13 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue Mar 05 01:56:17 UTC 2024 pageSize = 22236 page = 1 @@ -745,6 +745,7 @@ mc33810Gpgd3Mode = bits, U32, 1576, [4:4], "false", "true" enableExtendedCanBroadcast = bits, U32, 1576, [5:5], "false", "true" luaCanRxWorkaround = bits, U32, 1576, [6:6], "false", "true" flexSensorInverted = bits, U32, 1576, [7:7], "false", "true" +useHardSkipInTraction = bits, U32, 1576, [8:8], "false", "true" useAuxSpeedForSlipRatio = bits, U32, 1576, [11:11], "false", "true" useVssAsSecondWheelSpeed = bits, U32, 1576, [12:12], "false", "true" is_enabled_spi_5 = bits, U32, 1576, [13:13], "false", "true" @@ -2468,7 +2469,7 @@ injectorStagingRpmBins = array, U16, 22222, [6], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1456 + ochBlockSize = 1468 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3131,145 +3132,147 @@ smartChipState = scalar, S08, 1102, "", 1, 0 smartChipRestartCounter = scalar, S08, 1103, "", 1, 0 smartChipAliveCounter = scalar, S08, 1104, "", 1, 0 startStopPhysicalState = bits, U32, 1108, [0:0] -acrStateDup = bits, U32, 1108, [1:1] -acrEngineMovedRecently = bits, U32, 1108, [2:2] -heaterControlEnabled = bits, U32, 1108, [3:3] -luaDigitalState0 = bits, U32, 1108, [4:4] -luaDigitalState1 = bits, U32, 1108, [5:5] -luaDigitalState2 = bits, U32, 1108, [6:6] -luaDigitalState3 = bits, U32, 1108, [7:7] +acrEngineMovedRecently = bits, U32, 1108, [1:1] +heaterControlEnabled = bits, U32, 1108, [2:2] +luaDigitalState0 = bits, U32, 1108, [3:3] +luaDigitalState1 = bits, U32, 1108, [4:4] +luaDigitalState2 = bits, U32, 1108, [5:5] +luaDigitalState3 = bits, U32, 1108, [6:6] startStopStateToggleCounter = scalar, U32, 1112, "", 1, 0 egtValue1 = scalar, F32, 1116, "", 1, 0 egtValue2 = scalar, F32, 1120, "", 1, 0 -desiredRpmLimit = scalar, S16, 1124, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1128, "", 1, 0 -globalSparkCounter = scalar, U32, 1132, "", 1, 0 -fuelingLoad = scalar, F32, 1136, "", 1, 0 -ignitionLoad = scalar, F32, 1140, "", 1, 0 -veTableYAxis = scalar, U16, 1144, "%", 0.01, 0 -; total TS size = 1148 -tpsFrom = scalar, F32, 1148 -tpsTo = scalar, F32, 1152 -deltaTps = scalar, F32, 1156 -extraFuel = scalar, F32, 1160, "", 1, 0 -valueFromTable = scalar, F32, 1164, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1168, [0:0] -isBelowDecelThreshold = bits, U32, 1168, [1:1] -isTimeToResetAccumulator = bits, U32, 1168, [2:2] -isFractionalEnrichment = bits, U32, 1168, [3:3] -belowEpsilon = bits, U32, 1168, [4:4] -tooShort = bits, U32, 1168, [5:5] -fractionalInjFuel = scalar, F32, 1172, "", 1, 0 -accumulatedValue = scalar, F32, 1176, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1180, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1184, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1188, "", 1, 0 -cycleCnt = scalar, S32, 1192, "", 1, 0 -; total TS size = 1196 -hwEventCounters1 = scalar, U32, 1196, "", 1, 0 -hwEventCounters2 = scalar, U32, 1200, "", 1, 0 -hwEventCounters3 = scalar, U32, 1204, "", 1, 0 -hwEventCounters4 = scalar, U32, 1208, "", 1, 0 -hwEventCounters5 = scalar, U32, 1212, "", 1, 0 -hwEventCounters6 = scalar, U32, 1216, "", 1, 0 -vvtCamCounter = scalar, U32, 1220, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1224, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1228, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1232, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1233, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1236, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1240, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1244, "", 1, 0 -mapCamPrevToothAngle = scalar, F32, 1248, "deg", 1, 0 -isDecodingMapCam = bits, U32, 1252, [0:0] -; total TS size = 1256 -crankSynchronizationCounter0 = scalar, U32, 1256, "", 1, 0 -vvtSyncGapRatio0 = scalar, F32, 1260, "", 1, 0 -vvtToothDurations00 = scalar, U32, 1264, "us", 1, 0 -vvtCurrentPosition0 = scalar, F32, 1268, "sync: Primary Cam Position", 1, 0 -vvtToothPosition10 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition20 = scalar, F32, 1276, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition30 = scalar, F32, 1280, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition40 = scalar, F32, 1284, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio0 = scalar, F32, 1288, "", 1, 0 -triggerStateIndex0 = scalar, U08, 1292, "", 1, 0 -vvtStateIndex0 = scalar, U08, 1293, "", 1, 0 -; total TS size = 1296 -camResyncCounter = scalar, U08, 1296, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1300, [0:0] -; total TS size = 1304 -wallFuelCorrection = scalar, F32, 1304, "", 1, 0 -wallFuel = scalar, F32, 1308, "", 1, 0 -; total TS size = 1312 -idleState = bits, S32, 1312, [0:2], "not important" -currentIdlePosition = scalar, F32, 1316 -baseIdlePosition = scalar, F32, 1320 -idleClosedLoop = scalar, F32, 1324 -iacByTpsTaper = scalar, F32, 1328 -throttlePedalUpState = scalar, S32, 1332, "", 1, 0 -mightResetPid = bits, U32, 1336, [0:0] -shouldResetPid = bits, U32, 1336, [1:1] -wasResetPid = bits, U32, 1336, [2:2] -mustResetPid = bits, U32, 1336, [3:3] -isCranking = bits, U32, 1336, [4:4] -isIacTableForCoasting = bits, U32, 1336, [5:5] -notIdling = bits, U32, 1336, [6:6] -needReset = bits, U32, 1336, [7:7] -isInDeadZone = bits, U32, 1336, [8:8] -isBlipping = bits, U32, 1336, [9:9] -useClosedLoop = bits, U32, 1336, [10:10] -badTps = bits, U32, 1336, [11:11] -looksLikeRunning = bits, U32, 1336, [12:12] -looksLikeCoasting = bits, U32, 1336, [13:13] -looksLikeCrankToIdle = bits, U32, 1336, [14:14] -isIdleCoasting = bits, U32, 1336, [15:15] -isIdleClosedLoop = bits, U32, 1336, [16:16] -idleTarget = scalar, S32, 1340, "", 1, 0 -targetRpmByClt = scalar, S32, 1344, "", 1, 0 -targetRpmAc = scalar, S32, 1348, "", 1, 0 -iacByRpmTaper = scalar, F32, 1352 -luaAdd = scalar, F32, 1356 -; total TS size = 1360 -idlePosition0 = scalar, F32, 1360, "per", 1,0 -trim0 = scalar, F32, 1364, "", 1, 0 -luaAdjustment0 = scalar, F32, 1368, "per", 1,0 -m_wastegatePosition0 = scalar, F32, 1372, "per", 1,0 -etbFeedForward0 = scalar, F32, 1376 -etbIntegralError0 = scalar, F32, 1380, "", 1, 0 -etbCurrentTarget0 = scalar, F32, 1384, "%", 1, 0 -etbCurrentAdjustedTarget0 = scalar, F32, 1388, "%", 1, 0 -etbRevLimitActive0 = bits, U32, 1392, [0:0] -jamDetected0 = bits, U32, 1392, [1:1] -etbDutyRateOfChange0 = scalar, F32, 1396, "per", 1,0 -etbDutyAverage0 = scalar, F32, 1400, "per", 1,0 -etbTpsErrorCounter0 = scalar, U16, 1404, "count", 1,0 -etbPpsErrorCounter0 = scalar, U16, 1406, "count", 1,0 -etbErrorCode0 = scalar, S08, 1408, "", 1, 0 -tcEtbDrop0 = scalar, S08, 1409, "", 1, 0 -jamTimer0 = scalar, U16, 1410, "sec", 0.01, 0 -; total TS size = 1412 -faultCode0 = scalar, U08, 1412, "", 1, 0 -heaterDuty0 = scalar, U08, 1413, "%", 1, 0 -pumpDuty0 = scalar, U08, 1414, "%", 1, 0 -tempC0 = scalar, U16, 1416, "C", 1, 0 -nernstVoltage0 = scalar, U16, 1418, "V", 0.001, 0 -esr0 = scalar, U16, 1420, "ohm", 1, 0 +luaSoftSparkSkip = scalar, F32, 1124, "", 1, 0 +luaHardSparkSkip = scalar, F32, 1128, "", 1, 0 +tractionControlSparkSkip = scalar, F32, 1132, "", 1, 0 +desiredRpmLimit = scalar, S16, 1136, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 1140, "", 1, 0 +globalSparkCounter = scalar, U32, 1144, "", 1, 0 +fuelingLoad = scalar, F32, 1148, "", 1, 0 +ignitionLoad = scalar, F32, 1152, "", 1, 0 +veTableYAxis = scalar, U16, 1156, "%", 0.01, 0 +; total TS size = 1160 +tpsFrom = scalar, F32, 1160 +tpsTo = scalar, F32, 1164 +deltaTps = scalar, F32, 1168 +extraFuel = scalar, F32, 1172, "", 1, 0 +valueFromTable = scalar, F32, 1176, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1180, [0:0] +isBelowDecelThreshold = bits, U32, 1180, [1:1] +isTimeToResetAccumulator = bits, U32, 1180, [2:2] +isFractionalEnrichment = bits, U32, 1180, [3:3] +belowEpsilon = bits, U32, 1180, [4:4] +tooShort = bits, U32, 1180, [5:5] +fractionalInjFuel = scalar, F32, 1184, "", 1, 0 +accumulatedValue = scalar, F32, 1188, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1192, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1196, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1200, "", 1, 0 +cycleCnt = scalar, S32, 1204, "", 1, 0 +; total TS size = 1208 +hwEventCounters1 = scalar, U32, 1208, "", 1, 0 +hwEventCounters2 = scalar, U32, 1212, "", 1, 0 +hwEventCounters3 = scalar, U32, 1216, "", 1, 0 +hwEventCounters4 = scalar, U32, 1220, "", 1, 0 +hwEventCounters5 = scalar, U32, 1224, "", 1, 0 +hwEventCounters6 = scalar, U32, 1228, "", 1, 0 +vvtCamCounter = scalar, U32, 1232, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1236, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1240, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1244, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1245, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1248, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1252, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1256, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1260, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1264, [0:0] +; total TS size = 1268 +crankSynchronizationCounter0 = scalar, U32, 1268, "", 1, 0 +vvtSyncGapRatio0 = scalar, F32, 1272, "", 1, 0 +vvtToothDurations00 = scalar, U32, 1276, "us", 1, 0 +vvtCurrentPosition0 = scalar, F32, 1280, "sync: Primary Cam Position", 1, 0 +vvtToothPosition10 = scalar, F32, 1284, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition20 = scalar, F32, 1288, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition30 = scalar, F32, 1292, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition40 = scalar, F32, 1296, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio0 = scalar, F32, 1300, "", 1, 0 +triggerStateIndex0 = scalar, U08, 1304, "", 1, 0 +vvtStateIndex0 = scalar, U08, 1305, "", 1, 0 +; total TS size = 1308 +camResyncCounter = scalar, U08, 1308, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1312, [0:0] +; total TS size = 1316 +wallFuelCorrection = scalar, F32, 1316, "", 1, 0 +wallFuel = scalar, F32, 1320, "", 1, 0 +; total TS size = 1324 +idleState = bits, S32, 1324, [0:2], "not important" +currentIdlePosition = scalar, F32, 1328 +baseIdlePosition = scalar, F32, 1332 +idleClosedLoop = scalar, F32, 1336 +iacByTpsTaper = scalar, F32, 1340 +throttlePedalUpState = scalar, S32, 1344, "", 1, 0 +mightResetPid = bits, U32, 1348, [0:0] +shouldResetPid = bits, U32, 1348, [1:1] +wasResetPid = bits, U32, 1348, [2:2] +mustResetPid = bits, U32, 1348, [3:3] +isCranking = bits, U32, 1348, [4:4] +isIacTableForCoasting = bits, U32, 1348, [5:5] +notIdling = bits, U32, 1348, [6:6] +needReset = bits, U32, 1348, [7:7] +isInDeadZone = bits, U32, 1348, [8:8] +isBlipping = bits, U32, 1348, [9:9] +useClosedLoop = bits, U32, 1348, [10:10] +badTps = bits, U32, 1348, [11:11] +looksLikeRunning = bits, U32, 1348, [12:12] +looksLikeCoasting = bits, U32, 1348, [13:13] +looksLikeCrankToIdle = bits, U32, 1348, [14:14] +isIdleCoasting = bits, U32, 1348, [15:15] +isIdleClosedLoop = bits, U32, 1348, [16:16] +idleTarget = scalar, S32, 1352, "", 1, 0 +targetRpmByClt = scalar, S32, 1356, "", 1, 0 +targetRpmAc = scalar, S32, 1360, "", 1, 0 +iacByRpmTaper = scalar, F32, 1364 +luaAdd = scalar, F32, 1368 +; total TS size = 1372 +idlePosition0 = scalar, F32, 1372, "per", 1,0 +trim0 = scalar, F32, 1376, "", 1, 0 +luaAdjustment0 = scalar, F32, 1380, "per", 1,0 +m_wastegatePosition0 = scalar, F32, 1384, "per", 1,0 +etbFeedForward0 = scalar, F32, 1388 +etbIntegralError0 = scalar, F32, 1392, "", 1, 0 +etbCurrentTarget0 = scalar, F32, 1396, "%", 1, 0 +etbCurrentAdjustedTarget0 = scalar, F32, 1400, "%", 1, 0 +etbRevLimitActive0 = bits, U32, 1404, [0:0] +jamDetected0 = bits, U32, 1404, [1:1] +etbDutyRateOfChange0 = scalar, F32, 1408, "per", 1,0 +etbDutyAverage0 = scalar, F32, 1412, "per", 1,0 +etbTpsErrorCounter0 = scalar, U16, 1416, "count", 1,0 +etbPpsErrorCounter0 = scalar, U16, 1418, "count", 1,0 +etbErrorCode0 = scalar, S08, 1420, "", 1, 0 +tcEtbDrop0 = scalar, S08, 1421, "", 1, 0 +jamTimer0 = scalar, U16, 1422, "sec", 0.01, 0 ; total TS size = 1424 -dcOutput0 = scalar, F32, 1424, "per", 1,0 -isEnabled0_int = scalar, U08, 1428, "per", 1,0 -isEnabled0 = bits, U32, 1432, [0:0] +faultCode0 = scalar, U08, 1424, "", 1, 0 +heaterDuty0 = scalar, U08, 1425, "%", 1, 0 +pumpDuty0 = scalar, U08, 1426, "%", 1, 0 +tempC0 = scalar, U16, 1428, "C", 1, 0 +nernstVoltage0 = scalar, U16, 1430, "V", 0.001, 0 +esr0 = scalar, U16, 1432, "ohm", 1, 0 ; total TS size = 1436 -value0 = scalar, U16, 1436, "value", 1,0 -value1 = scalar, U16, 1438, "value", 1,0 -errorRate = scalar, F32, 1440, "ratio", 1,0 -; total TS size = 1444 -vvtTarget = scalar, U16, 1444, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1446, "%", 0.5, 0 +dcOutput0 = scalar, F32, 1436, "per", 1,0 +isEnabled0_int = scalar, U08, 1440, "per", 1,0 +isEnabled0 = bits, U32, 1444, [0:0] ; total TS size = 1448 -lambdaCurrentlyGood = bits, U32, 1448, [0:0] -lambdaMonitorCut = bits, U32, 1448, [1:1] -lambdaTimeSinceGood = scalar, U16, 1452, "sec", 0.01, 0 +value0 = scalar, U16, 1448, "value", 1,0 +value1 = scalar, U16, 1450, "value", 1,0 +errorRate = scalar, F32, 1452, "ratio", 1,0 ; total TS size = 1456 +vvtTarget = scalar, U16, 1456, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1458, "%", 0.5, 0 +; total TS size = 1460 +lambdaCurrentlyGood = bits, U32, 1460, [0:0] +lambdaMonitorCut = bits, U32, 1460, [1:1] +lambdaTimeSinceGood = scalar, U16, 1464, "sec", 0.01, 0 +; total TS size = 1468 time = { timeNow } @@ -5401,7 +5404,6 @@ entry = smartChipState, "smartChipState", int, "%d" entry = smartChipRestartCounter, "smartChipRestartCounter", int, "%d" entry = smartChipAliveCounter, "smartChipAliveCounter", int, "%d" entry = startStopPhysicalState, "startStopPhysicalState", int, "%d" -entry = acrStateDup, "acrStateDup", int, "%d" entry = acrEngineMovedRecently, "acrEngineMovedRecently", int, "%d" entry = heaterControlEnabled, "heaterControlEnabled", int, "%d" entry = luaDigitalState0, "luaDigitalState0", int, "%d" @@ -5411,6 +5413,9 @@ entry = luaDigitalState3, "luaDigitalState3", int, "%d" entry = startStopStateToggleCounter, "startStopStateToggleCounter", int, "%d" entry = egtValue1, "egtValue1", float, "%.3f" entry = egtValue2, "egtValue2", float, "%.3f" +entry = luaSoftSparkSkip, "luaSoftSparkSkip", float, "%.3f" +entry = luaHardSparkSkip, "luaHardSparkSkip", float, "%.3f" +entry = tractionControlSparkSkip, "tractionControlSparkSkip", float, "%.3f" entry = desiredRpmLimit, "User-defined RPM hard limit", int, "%d" entry = fuelInjectionCounter, "Fuel: Injection counter", int, "%d" entry = globalSparkCounter, "Ign: Spark counter", int, "%d" @@ -5912,7 +5917,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 @@ -6360,7 +6365,6 @@ indicatorPanel = engine_stateIndicatorPanel, 2 indicator = {lua_luaDisableEtb}, "luaDisableEtb No", "luaDisableEtb Yes" indicator = {lua_luaIgnCut}, "luaIgnCut No", "luaIgnCut Yes" indicator = {startStopPhysicalState}, "startStopPhysicalState No", "startStopPhysicalState Yes" - indicator = {acrStateDup}, "acrStateDup No", "acrStateDup Yes" indicator = {acrEngineMovedRecently}, "acrEngineMovedRecently No", "acrEngineMovedRecently Yes" indicator = {heaterControlEnabled}, "heaterControlEnabled No", "heaterControlEnabled Yes" indicator = {luaDigitalState0}, "luaDigitalState0 No", "luaDigitalState0 Yes" @@ -6396,12 +6400,16 @@ dialog = engine_stateDialog, "engine_state" graphLine = egtValue1 graphLine = egtValue2 liveGraph = engine_state_6_Graph, "Graph", South + graphLine = luaSoftSparkSkip + graphLine = luaHardSparkSkip + graphLine = tractionControlSparkSkip graphLine = desiredRpmLimit + liveGraph = engine_state_7_Graph, "Graph", South graphLine = fuelInjectionCounter graphLine = globalSparkCounter graphLine = fuelingLoad - liveGraph = engine_state_7_Graph, "Graph", South graphLine = ignitionLoad + liveGraph = engine_state_8_Graph, "Graph", South graphLine = veTableYAxis indicatorPanel = tps_accel_stateIndicatorPanel, 2 @@ -7308,6 +7316,10 @@ dialog = lambda_monitorDialog, "lambda_monitor" 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 diff --git a/firmware/tunerstudio/generated/rusefi_f407-discovery.ini b/firmware/tunerstudio/generated/rusefi_f407-discovery.ini index a0e75f6831..0231517ed3 100644 --- a/firmware/tunerstudio/generated/rusefi_f407-discovery.ini +++ b/firmware/tunerstudio/generated/rusefi_f407-discovery.ini @@ -37,12 +37,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.03.05.f407-discovery.3808613738" + signature = "rusEFI master.2024.03.05.f407-discovery.2895668562" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.03.05.f407-discovery.3808613738" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.03.05.f407-discovery.2895668562" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -98,7 +98,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="Disabled", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PB0", "PB1", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue Mar 05 00:53:10 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue Mar 05 01:57:14 UTC 2024 pageSize = 22236 page = 1 @@ -745,6 +745,7 @@ mc33810Gpgd3Mode = bits, U32, 1576, [4:4], "false", "true" enableExtendedCanBroadcast = bits, U32, 1576, [5:5], "false", "true" luaCanRxWorkaround = bits, U32, 1576, [6:6], "false", "true" flexSensorInverted = bits, U32, 1576, [7:7], "false", "true" +useHardSkipInTraction = bits, U32, 1576, [8:8], "false", "true" useAuxSpeedForSlipRatio = bits, U32, 1576, [11:11], "false", "true" useVssAsSecondWheelSpeed = bits, U32, 1576, [12:12], "false", "true" is_enabled_spi_5 = bits, U32, 1576, [13:13], "false", "true" @@ -2468,7 +2469,7 @@ injectorStagingRpmBins = array, U16, 22222, [6], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1456 + ochBlockSize = 1468 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3131,145 +3132,147 @@ smartChipState = scalar, S08, 1102, "", 1, 0 smartChipRestartCounter = scalar, S08, 1103, "", 1, 0 smartChipAliveCounter = scalar, S08, 1104, "", 1, 0 startStopPhysicalState = bits, U32, 1108, [0:0] -acrStateDup = bits, U32, 1108, [1:1] -acrEngineMovedRecently = bits, U32, 1108, [2:2] -heaterControlEnabled = bits, U32, 1108, [3:3] -luaDigitalState0 = bits, U32, 1108, [4:4] -luaDigitalState1 = bits, U32, 1108, [5:5] -luaDigitalState2 = bits, U32, 1108, [6:6] -luaDigitalState3 = bits, U32, 1108, [7:7] +acrEngineMovedRecently = bits, U32, 1108, [1:1] +heaterControlEnabled = bits, U32, 1108, [2:2] +luaDigitalState0 = bits, U32, 1108, [3:3] +luaDigitalState1 = bits, U32, 1108, [4:4] +luaDigitalState2 = bits, U32, 1108, [5:5] +luaDigitalState3 = bits, U32, 1108, [6:6] startStopStateToggleCounter = scalar, U32, 1112, "", 1, 0 egtValue1 = scalar, F32, 1116, "", 1, 0 egtValue2 = scalar, F32, 1120, "", 1, 0 -desiredRpmLimit = scalar, S16, 1124, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1128, "", 1, 0 -globalSparkCounter = scalar, U32, 1132, "", 1, 0 -fuelingLoad = scalar, F32, 1136, "", 1, 0 -ignitionLoad = scalar, F32, 1140, "", 1, 0 -veTableYAxis = scalar, U16, 1144, "%", 0.01, 0 -; total TS size = 1148 -tpsFrom = scalar, F32, 1148 -tpsTo = scalar, F32, 1152 -deltaTps = scalar, F32, 1156 -extraFuel = scalar, F32, 1160, "", 1, 0 -valueFromTable = scalar, F32, 1164, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1168, [0:0] -isBelowDecelThreshold = bits, U32, 1168, [1:1] -isTimeToResetAccumulator = bits, U32, 1168, [2:2] -isFractionalEnrichment = bits, U32, 1168, [3:3] -belowEpsilon = bits, U32, 1168, [4:4] -tooShort = bits, U32, 1168, [5:5] -fractionalInjFuel = scalar, F32, 1172, "", 1, 0 -accumulatedValue = scalar, F32, 1176, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1180, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1184, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1188, "", 1, 0 -cycleCnt = scalar, S32, 1192, "", 1, 0 -; total TS size = 1196 -hwEventCounters1 = scalar, U32, 1196, "", 1, 0 -hwEventCounters2 = scalar, U32, 1200, "", 1, 0 -hwEventCounters3 = scalar, U32, 1204, "", 1, 0 -hwEventCounters4 = scalar, U32, 1208, "", 1, 0 -hwEventCounters5 = scalar, U32, 1212, "", 1, 0 -hwEventCounters6 = scalar, U32, 1216, "", 1, 0 -vvtCamCounter = scalar, U32, 1220, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1224, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1228, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1232, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1233, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1236, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1240, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1244, "", 1, 0 -mapCamPrevToothAngle = scalar, F32, 1248, "deg", 1, 0 -isDecodingMapCam = bits, U32, 1252, [0:0] -; total TS size = 1256 -crankSynchronizationCounter0 = scalar, U32, 1256, "", 1, 0 -vvtSyncGapRatio0 = scalar, F32, 1260, "", 1, 0 -vvtToothDurations00 = scalar, U32, 1264, "us", 1, 0 -vvtCurrentPosition0 = scalar, F32, 1268, "sync: Primary Cam Position", 1, 0 -vvtToothPosition10 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition20 = scalar, F32, 1276, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition30 = scalar, F32, 1280, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition40 = scalar, F32, 1284, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio0 = scalar, F32, 1288, "", 1, 0 -triggerStateIndex0 = scalar, U08, 1292, "", 1, 0 -vvtStateIndex0 = scalar, U08, 1293, "", 1, 0 -; total TS size = 1296 -camResyncCounter = scalar, U08, 1296, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1300, [0:0] -; total TS size = 1304 -wallFuelCorrection = scalar, F32, 1304, "", 1, 0 -wallFuel = scalar, F32, 1308, "", 1, 0 -; total TS size = 1312 -idleState = bits, S32, 1312, [0:2], "not important" -currentIdlePosition = scalar, F32, 1316 -baseIdlePosition = scalar, F32, 1320 -idleClosedLoop = scalar, F32, 1324 -iacByTpsTaper = scalar, F32, 1328 -throttlePedalUpState = scalar, S32, 1332, "", 1, 0 -mightResetPid = bits, U32, 1336, [0:0] -shouldResetPid = bits, U32, 1336, [1:1] -wasResetPid = bits, U32, 1336, [2:2] -mustResetPid = bits, U32, 1336, [3:3] -isCranking = bits, U32, 1336, [4:4] -isIacTableForCoasting = bits, U32, 1336, [5:5] -notIdling = bits, U32, 1336, [6:6] -needReset = bits, U32, 1336, [7:7] -isInDeadZone = bits, U32, 1336, [8:8] -isBlipping = bits, U32, 1336, [9:9] -useClosedLoop = bits, U32, 1336, [10:10] -badTps = bits, U32, 1336, [11:11] -looksLikeRunning = bits, U32, 1336, [12:12] -looksLikeCoasting = bits, U32, 1336, [13:13] -looksLikeCrankToIdle = bits, U32, 1336, [14:14] -isIdleCoasting = bits, U32, 1336, [15:15] -isIdleClosedLoop = bits, U32, 1336, [16:16] -idleTarget = scalar, S32, 1340, "", 1, 0 -targetRpmByClt = scalar, S32, 1344, "", 1, 0 -targetRpmAc = scalar, S32, 1348, "", 1, 0 -iacByRpmTaper = scalar, F32, 1352 -luaAdd = scalar, F32, 1356 -; total TS size = 1360 -idlePosition0 = scalar, F32, 1360, "per", 1,0 -trim0 = scalar, F32, 1364, "", 1, 0 -luaAdjustment0 = scalar, F32, 1368, "per", 1,0 -m_wastegatePosition0 = scalar, F32, 1372, "per", 1,0 -etbFeedForward0 = scalar, F32, 1376 -etbIntegralError0 = scalar, F32, 1380, "", 1, 0 -etbCurrentTarget0 = scalar, F32, 1384, "%", 1, 0 -etbCurrentAdjustedTarget0 = scalar, F32, 1388, "%", 1, 0 -etbRevLimitActive0 = bits, U32, 1392, [0:0] -jamDetected0 = bits, U32, 1392, [1:1] -etbDutyRateOfChange0 = scalar, F32, 1396, "per", 1,0 -etbDutyAverage0 = scalar, F32, 1400, "per", 1,0 -etbTpsErrorCounter0 = scalar, U16, 1404, "count", 1,0 -etbPpsErrorCounter0 = scalar, U16, 1406, "count", 1,0 -etbErrorCode0 = scalar, S08, 1408, "", 1, 0 -tcEtbDrop0 = scalar, S08, 1409, "", 1, 0 -jamTimer0 = scalar, U16, 1410, "sec", 0.01, 0 -; total TS size = 1412 -faultCode0 = scalar, U08, 1412, "", 1, 0 -heaterDuty0 = scalar, U08, 1413, "%", 1, 0 -pumpDuty0 = scalar, U08, 1414, "%", 1, 0 -tempC0 = scalar, U16, 1416, "C", 1, 0 -nernstVoltage0 = scalar, U16, 1418, "V", 0.001, 0 -esr0 = scalar, U16, 1420, "ohm", 1, 0 +luaSoftSparkSkip = scalar, F32, 1124, "", 1, 0 +luaHardSparkSkip = scalar, F32, 1128, "", 1, 0 +tractionControlSparkSkip = scalar, F32, 1132, "", 1, 0 +desiredRpmLimit = scalar, S16, 1136, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 1140, "", 1, 0 +globalSparkCounter = scalar, U32, 1144, "", 1, 0 +fuelingLoad = scalar, F32, 1148, "", 1, 0 +ignitionLoad = scalar, F32, 1152, "", 1, 0 +veTableYAxis = scalar, U16, 1156, "%", 0.01, 0 +; total TS size = 1160 +tpsFrom = scalar, F32, 1160 +tpsTo = scalar, F32, 1164 +deltaTps = scalar, F32, 1168 +extraFuel = scalar, F32, 1172, "", 1, 0 +valueFromTable = scalar, F32, 1176, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1180, [0:0] +isBelowDecelThreshold = bits, U32, 1180, [1:1] +isTimeToResetAccumulator = bits, U32, 1180, [2:2] +isFractionalEnrichment = bits, U32, 1180, [3:3] +belowEpsilon = bits, U32, 1180, [4:4] +tooShort = bits, U32, 1180, [5:5] +fractionalInjFuel = scalar, F32, 1184, "", 1, 0 +accumulatedValue = scalar, F32, 1188, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1192, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1196, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1200, "", 1, 0 +cycleCnt = scalar, S32, 1204, "", 1, 0 +; total TS size = 1208 +hwEventCounters1 = scalar, U32, 1208, "", 1, 0 +hwEventCounters2 = scalar, U32, 1212, "", 1, 0 +hwEventCounters3 = scalar, U32, 1216, "", 1, 0 +hwEventCounters4 = scalar, U32, 1220, "", 1, 0 +hwEventCounters5 = scalar, U32, 1224, "", 1, 0 +hwEventCounters6 = scalar, U32, 1228, "", 1, 0 +vvtCamCounter = scalar, U32, 1232, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1236, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1240, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1244, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1245, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1248, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1252, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1256, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1260, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1264, [0:0] +; total TS size = 1268 +crankSynchronizationCounter0 = scalar, U32, 1268, "", 1, 0 +vvtSyncGapRatio0 = scalar, F32, 1272, "", 1, 0 +vvtToothDurations00 = scalar, U32, 1276, "us", 1, 0 +vvtCurrentPosition0 = scalar, F32, 1280, "sync: Primary Cam Position", 1, 0 +vvtToothPosition10 = scalar, F32, 1284, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition20 = scalar, F32, 1288, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition30 = scalar, F32, 1292, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition40 = scalar, F32, 1296, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio0 = scalar, F32, 1300, "", 1, 0 +triggerStateIndex0 = scalar, U08, 1304, "", 1, 0 +vvtStateIndex0 = scalar, U08, 1305, "", 1, 0 +; total TS size = 1308 +camResyncCounter = scalar, U08, 1308, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1312, [0:0] +; total TS size = 1316 +wallFuelCorrection = scalar, F32, 1316, "", 1, 0 +wallFuel = scalar, F32, 1320, "", 1, 0 +; total TS size = 1324 +idleState = bits, S32, 1324, [0:2], "not important" +currentIdlePosition = scalar, F32, 1328 +baseIdlePosition = scalar, F32, 1332 +idleClosedLoop = scalar, F32, 1336 +iacByTpsTaper = scalar, F32, 1340 +throttlePedalUpState = scalar, S32, 1344, "", 1, 0 +mightResetPid = bits, U32, 1348, [0:0] +shouldResetPid = bits, U32, 1348, [1:1] +wasResetPid = bits, U32, 1348, [2:2] +mustResetPid = bits, U32, 1348, [3:3] +isCranking = bits, U32, 1348, [4:4] +isIacTableForCoasting = bits, U32, 1348, [5:5] +notIdling = bits, U32, 1348, [6:6] +needReset = bits, U32, 1348, [7:7] +isInDeadZone = bits, U32, 1348, [8:8] +isBlipping = bits, U32, 1348, [9:9] +useClosedLoop = bits, U32, 1348, [10:10] +badTps = bits, U32, 1348, [11:11] +looksLikeRunning = bits, U32, 1348, [12:12] +looksLikeCoasting = bits, U32, 1348, [13:13] +looksLikeCrankToIdle = bits, U32, 1348, [14:14] +isIdleCoasting = bits, U32, 1348, [15:15] +isIdleClosedLoop = bits, U32, 1348, [16:16] +idleTarget = scalar, S32, 1352, "", 1, 0 +targetRpmByClt = scalar, S32, 1356, "", 1, 0 +targetRpmAc = scalar, S32, 1360, "", 1, 0 +iacByRpmTaper = scalar, F32, 1364 +luaAdd = scalar, F32, 1368 +; total TS size = 1372 +idlePosition0 = scalar, F32, 1372, "per", 1,0 +trim0 = scalar, F32, 1376, "", 1, 0 +luaAdjustment0 = scalar, F32, 1380, "per", 1,0 +m_wastegatePosition0 = scalar, F32, 1384, "per", 1,0 +etbFeedForward0 = scalar, F32, 1388 +etbIntegralError0 = scalar, F32, 1392, "", 1, 0 +etbCurrentTarget0 = scalar, F32, 1396, "%", 1, 0 +etbCurrentAdjustedTarget0 = scalar, F32, 1400, "%", 1, 0 +etbRevLimitActive0 = bits, U32, 1404, [0:0] +jamDetected0 = bits, U32, 1404, [1:1] +etbDutyRateOfChange0 = scalar, F32, 1408, "per", 1,0 +etbDutyAverage0 = scalar, F32, 1412, "per", 1,0 +etbTpsErrorCounter0 = scalar, U16, 1416, "count", 1,0 +etbPpsErrorCounter0 = scalar, U16, 1418, "count", 1,0 +etbErrorCode0 = scalar, S08, 1420, "", 1, 0 +tcEtbDrop0 = scalar, S08, 1421, "", 1, 0 +jamTimer0 = scalar, U16, 1422, "sec", 0.01, 0 ; total TS size = 1424 -dcOutput0 = scalar, F32, 1424, "per", 1,0 -isEnabled0_int = scalar, U08, 1428, "per", 1,0 -isEnabled0 = bits, U32, 1432, [0:0] +faultCode0 = scalar, U08, 1424, "", 1, 0 +heaterDuty0 = scalar, U08, 1425, "%", 1, 0 +pumpDuty0 = scalar, U08, 1426, "%", 1, 0 +tempC0 = scalar, U16, 1428, "C", 1, 0 +nernstVoltage0 = scalar, U16, 1430, "V", 0.001, 0 +esr0 = scalar, U16, 1432, "ohm", 1, 0 ; total TS size = 1436 -value0 = scalar, U16, 1436, "value", 1,0 -value1 = scalar, U16, 1438, "value", 1,0 -errorRate = scalar, F32, 1440, "ratio", 1,0 -; total TS size = 1444 -vvtTarget = scalar, U16, 1444, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1446, "%", 0.5, 0 +dcOutput0 = scalar, F32, 1436, "per", 1,0 +isEnabled0_int = scalar, U08, 1440, "per", 1,0 +isEnabled0 = bits, U32, 1444, [0:0] ; total TS size = 1448 -lambdaCurrentlyGood = bits, U32, 1448, [0:0] -lambdaMonitorCut = bits, U32, 1448, [1:1] -lambdaTimeSinceGood = scalar, U16, 1452, "sec", 0.01, 0 +value0 = scalar, U16, 1448, "value", 1,0 +value1 = scalar, U16, 1450, "value", 1,0 +errorRate = scalar, F32, 1452, "ratio", 1,0 ; total TS size = 1456 +vvtTarget = scalar, U16, 1456, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1458, "%", 0.5, 0 +; total TS size = 1460 +lambdaCurrentlyGood = bits, U32, 1460, [0:0] +lambdaMonitorCut = bits, U32, 1460, [1:1] +lambdaTimeSinceGood = scalar, U16, 1464, "sec", 0.01, 0 +; total TS size = 1468 time = { timeNow } @@ -5402,7 +5405,6 @@ entry = smartChipState, "smartChipState", int, "%d" entry = smartChipRestartCounter, "smartChipRestartCounter", int, "%d" entry = smartChipAliveCounter, "smartChipAliveCounter", int, "%d" entry = startStopPhysicalState, "startStopPhysicalState", int, "%d" -entry = acrStateDup, "acrStateDup", int, "%d" entry = acrEngineMovedRecently, "acrEngineMovedRecently", int, "%d" entry = heaterControlEnabled, "heaterControlEnabled", int, "%d" entry = luaDigitalState0, "luaDigitalState0", int, "%d" @@ -5412,6 +5414,9 @@ entry = luaDigitalState3, "luaDigitalState3", int, "%d" entry = startStopStateToggleCounter, "startStopStateToggleCounter", int, "%d" entry = egtValue1, "egtValue1", float, "%.3f" entry = egtValue2, "egtValue2", float, "%.3f" +entry = luaSoftSparkSkip, "luaSoftSparkSkip", float, "%.3f" +entry = luaHardSparkSkip, "luaHardSparkSkip", float, "%.3f" +entry = tractionControlSparkSkip, "tractionControlSparkSkip", float, "%.3f" entry = desiredRpmLimit, "User-defined RPM hard limit", int, "%d" entry = fuelInjectionCounter, "Fuel: Injection counter", int, "%d" entry = globalSparkCounter, "Ign: Spark counter", int, "%d" @@ -5917,7 +5922,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 @@ -6365,7 +6370,6 @@ indicatorPanel = engine_stateIndicatorPanel, 2 indicator = {lua_luaDisableEtb}, "luaDisableEtb No", "luaDisableEtb Yes" indicator = {lua_luaIgnCut}, "luaIgnCut No", "luaIgnCut Yes" indicator = {startStopPhysicalState}, "startStopPhysicalState No", "startStopPhysicalState Yes" - indicator = {acrStateDup}, "acrStateDup No", "acrStateDup Yes" indicator = {acrEngineMovedRecently}, "acrEngineMovedRecently No", "acrEngineMovedRecently Yes" indicator = {heaterControlEnabled}, "heaterControlEnabled No", "heaterControlEnabled Yes" indicator = {luaDigitalState0}, "luaDigitalState0 No", "luaDigitalState0 Yes" @@ -6401,12 +6405,16 @@ dialog = engine_stateDialog, "engine_state" graphLine = egtValue1 graphLine = egtValue2 liveGraph = engine_state_6_Graph, "Graph", South + graphLine = luaSoftSparkSkip + graphLine = luaHardSparkSkip + graphLine = tractionControlSparkSkip graphLine = desiredRpmLimit + liveGraph = engine_state_7_Graph, "Graph", South graphLine = fuelInjectionCounter graphLine = globalSparkCounter graphLine = fuelingLoad - liveGraph = engine_state_7_Graph, "Graph", South graphLine = ignitionLoad + liveGraph = engine_state_8_Graph, "Graph", South graphLine = veTableYAxis indicatorPanel = tps_accel_stateIndicatorPanel, 2 @@ -7314,6 +7322,10 @@ dialog = lambda_monitorDialog, "lambda_monitor" 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 diff --git a/firmware/tunerstudio/generated/rusefi_f429-discovery.ini b/firmware/tunerstudio/generated/rusefi_f429-discovery.ini index c770ec45e8..cc09d0fe32 100644 --- a/firmware/tunerstudio/generated/rusefi_f429-discovery.ini +++ b/firmware/tunerstudio/generated/rusefi_f429-discovery.ini @@ -37,12 +37,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.03.05.f429-discovery.1352820405" + signature = "rusEFI master.2024.03.05.f429-discovery.523818637" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.03.05.f429-discovery.1352820405" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.03.05.f429-discovery.523818637" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -98,7 +98,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="Disabled", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PB0", "PB1", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue Mar 05 00:53:00 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue Mar 05 01:57:03 UTC 2024 pageSize = 22236 page = 1 @@ -745,6 +745,7 @@ mc33810Gpgd3Mode = bits, U32, 1576, [4:4], "false", "true" enableExtendedCanBroadcast = bits, U32, 1576, [5:5], "false", "true" luaCanRxWorkaround = bits, U32, 1576, [6:6], "false", "true" flexSensorInverted = bits, U32, 1576, [7:7], "false", "true" +useHardSkipInTraction = bits, U32, 1576, [8:8], "false", "true" useAuxSpeedForSlipRatio = bits, U32, 1576, [11:11], "false", "true" useVssAsSecondWheelSpeed = bits, U32, 1576, [12:12], "false", "true" is_enabled_spi_5 = bits, U32, 1576, [13:13], "false", "true" @@ -2468,7 +2469,7 @@ injectorStagingRpmBins = array, U16, 22222, [6], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1456 + ochBlockSize = 1468 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3131,145 +3132,147 @@ smartChipState = scalar, S08, 1102, "", 1, 0 smartChipRestartCounter = scalar, S08, 1103, "", 1, 0 smartChipAliveCounter = scalar, S08, 1104, "", 1, 0 startStopPhysicalState = bits, U32, 1108, [0:0] -acrStateDup = bits, U32, 1108, [1:1] -acrEngineMovedRecently = bits, U32, 1108, [2:2] -heaterControlEnabled = bits, U32, 1108, [3:3] -luaDigitalState0 = bits, U32, 1108, [4:4] -luaDigitalState1 = bits, U32, 1108, [5:5] -luaDigitalState2 = bits, U32, 1108, [6:6] -luaDigitalState3 = bits, U32, 1108, [7:7] +acrEngineMovedRecently = bits, U32, 1108, [1:1] +heaterControlEnabled = bits, U32, 1108, [2:2] +luaDigitalState0 = bits, U32, 1108, [3:3] +luaDigitalState1 = bits, U32, 1108, [4:4] +luaDigitalState2 = bits, U32, 1108, [5:5] +luaDigitalState3 = bits, U32, 1108, [6:6] startStopStateToggleCounter = scalar, U32, 1112, "", 1, 0 egtValue1 = scalar, F32, 1116, "", 1, 0 egtValue2 = scalar, F32, 1120, "", 1, 0 -desiredRpmLimit = scalar, S16, 1124, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1128, "", 1, 0 -globalSparkCounter = scalar, U32, 1132, "", 1, 0 -fuelingLoad = scalar, F32, 1136, "", 1, 0 -ignitionLoad = scalar, F32, 1140, "", 1, 0 -veTableYAxis = scalar, U16, 1144, "%", 0.01, 0 -; total TS size = 1148 -tpsFrom = scalar, F32, 1148 -tpsTo = scalar, F32, 1152 -deltaTps = scalar, F32, 1156 -extraFuel = scalar, F32, 1160, "", 1, 0 -valueFromTable = scalar, F32, 1164, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1168, [0:0] -isBelowDecelThreshold = bits, U32, 1168, [1:1] -isTimeToResetAccumulator = bits, U32, 1168, [2:2] -isFractionalEnrichment = bits, U32, 1168, [3:3] -belowEpsilon = bits, U32, 1168, [4:4] -tooShort = bits, U32, 1168, [5:5] -fractionalInjFuel = scalar, F32, 1172, "", 1, 0 -accumulatedValue = scalar, F32, 1176, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1180, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1184, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1188, "", 1, 0 -cycleCnt = scalar, S32, 1192, "", 1, 0 -; total TS size = 1196 -hwEventCounters1 = scalar, U32, 1196, "", 1, 0 -hwEventCounters2 = scalar, U32, 1200, "", 1, 0 -hwEventCounters3 = scalar, U32, 1204, "", 1, 0 -hwEventCounters4 = scalar, U32, 1208, "", 1, 0 -hwEventCounters5 = scalar, U32, 1212, "", 1, 0 -hwEventCounters6 = scalar, U32, 1216, "", 1, 0 -vvtCamCounter = scalar, U32, 1220, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1224, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1228, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1232, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1233, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1236, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1240, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1244, "", 1, 0 -mapCamPrevToothAngle = scalar, F32, 1248, "deg", 1, 0 -isDecodingMapCam = bits, U32, 1252, [0:0] -; total TS size = 1256 -crankSynchronizationCounter0 = scalar, U32, 1256, "", 1, 0 -vvtSyncGapRatio0 = scalar, F32, 1260, "", 1, 0 -vvtToothDurations00 = scalar, U32, 1264, "us", 1, 0 -vvtCurrentPosition0 = scalar, F32, 1268, "sync: Primary Cam Position", 1, 0 -vvtToothPosition10 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition20 = scalar, F32, 1276, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition30 = scalar, F32, 1280, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition40 = scalar, F32, 1284, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio0 = scalar, F32, 1288, "", 1, 0 -triggerStateIndex0 = scalar, U08, 1292, "", 1, 0 -vvtStateIndex0 = scalar, U08, 1293, "", 1, 0 -; total TS size = 1296 -camResyncCounter = scalar, U08, 1296, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1300, [0:0] -; total TS size = 1304 -wallFuelCorrection = scalar, F32, 1304, "", 1, 0 -wallFuel = scalar, F32, 1308, "", 1, 0 -; total TS size = 1312 -idleState = bits, S32, 1312, [0:2], "not important" -currentIdlePosition = scalar, F32, 1316 -baseIdlePosition = scalar, F32, 1320 -idleClosedLoop = scalar, F32, 1324 -iacByTpsTaper = scalar, F32, 1328 -throttlePedalUpState = scalar, S32, 1332, "", 1, 0 -mightResetPid = bits, U32, 1336, [0:0] -shouldResetPid = bits, U32, 1336, [1:1] -wasResetPid = bits, U32, 1336, [2:2] -mustResetPid = bits, U32, 1336, [3:3] -isCranking = bits, U32, 1336, [4:4] -isIacTableForCoasting = bits, U32, 1336, [5:5] -notIdling = bits, U32, 1336, [6:6] -needReset = bits, U32, 1336, [7:7] -isInDeadZone = bits, U32, 1336, [8:8] -isBlipping = bits, U32, 1336, [9:9] -useClosedLoop = bits, U32, 1336, [10:10] -badTps = bits, U32, 1336, [11:11] -looksLikeRunning = bits, U32, 1336, [12:12] -looksLikeCoasting = bits, U32, 1336, [13:13] -looksLikeCrankToIdle = bits, U32, 1336, [14:14] -isIdleCoasting = bits, U32, 1336, [15:15] -isIdleClosedLoop = bits, U32, 1336, [16:16] -idleTarget = scalar, S32, 1340, "", 1, 0 -targetRpmByClt = scalar, S32, 1344, "", 1, 0 -targetRpmAc = scalar, S32, 1348, "", 1, 0 -iacByRpmTaper = scalar, F32, 1352 -luaAdd = scalar, F32, 1356 -; total TS size = 1360 -idlePosition0 = scalar, F32, 1360, "per", 1,0 -trim0 = scalar, F32, 1364, "", 1, 0 -luaAdjustment0 = scalar, F32, 1368, "per", 1,0 -m_wastegatePosition0 = scalar, F32, 1372, "per", 1,0 -etbFeedForward0 = scalar, F32, 1376 -etbIntegralError0 = scalar, F32, 1380, "", 1, 0 -etbCurrentTarget0 = scalar, F32, 1384, "%", 1, 0 -etbCurrentAdjustedTarget0 = scalar, F32, 1388, "%", 1, 0 -etbRevLimitActive0 = bits, U32, 1392, [0:0] -jamDetected0 = bits, U32, 1392, [1:1] -etbDutyRateOfChange0 = scalar, F32, 1396, "per", 1,0 -etbDutyAverage0 = scalar, F32, 1400, "per", 1,0 -etbTpsErrorCounter0 = scalar, U16, 1404, "count", 1,0 -etbPpsErrorCounter0 = scalar, U16, 1406, "count", 1,0 -etbErrorCode0 = scalar, S08, 1408, "", 1, 0 -tcEtbDrop0 = scalar, S08, 1409, "", 1, 0 -jamTimer0 = scalar, U16, 1410, "sec", 0.01, 0 -; total TS size = 1412 -faultCode0 = scalar, U08, 1412, "", 1, 0 -heaterDuty0 = scalar, U08, 1413, "%", 1, 0 -pumpDuty0 = scalar, U08, 1414, "%", 1, 0 -tempC0 = scalar, U16, 1416, "C", 1, 0 -nernstVoltage0 = scalar, U16, 1418, "V", 0.001, 0 -esr0 = scalar, U16, 1420, "ohm", 1, 0 +luaSoftSparkSkip = scalar, F32, 1124, "", 1, 0 +luaHardSparkSkip = scalar, F32, 1128, "", 1, 0 +tractionControlSparkSkip = scalar, F32, 1132, "", 1, 0 +desiredRpmLimit = scalar, S16, 1136, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 1140, "", 1, 0 +globalSparkCounter = scalar, U32, 1144, "", 1, 0 +fuelingLoad = scalar, F32, 1148, "", 1, 0 +ignitionLoad = scalar, F32, 1152, "", 1, 0 +veTableYAxis = scalar, U16, 1156, "%", 0.01, 0 +; total TS size = 1160 +tpsFrom = scalar, F32, 1160 +tpsTo = scalar, F32, 1164 +deltaTps = scalar, F32, 1168 +extraFuel = scalar, F32, 1172, "", 1, 0 +valueFromTable = scalar, F32, 1176, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1180, [0:0] +isBelowDecelThreshold = bits, U32, 1180, [1:1] +isTimeToResetAccumulator = bits, U32, 1180, [2:2] +isFractionalEnrichment = bits, U32, 1180, [3:3] +belowEpsilon = bits, U32, 1180, [4:4] +tooShort = bits, U32, 1180, [5:5] +fractionalInjFuel = scalar, F32, 1184, "", 1, 0 +accumulatedValue = scalar, F32, 1188, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1192, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1196, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1200, "", 1, 0 +cycleCnt = scalar, S32, 1204, "", 1, 0 +; total TS size = 1208 +hwEventCounters1 = scalar, U32, 1208, "", 1, 0 +hwEventCounters2 = scalar, U32, 1212, "", 1, 0 +hwEventCounters3 = scalar, U32, 1216, "", 1, 0 +hwEventCounters4 = scalar, U32, 1220, "", 1, 0 +hwEventCounters5 = scalar, U32, 1224, "", 1, 0 +hwEventCounters6 = scalar, U32, 1228, "", 1, 0 +vvtCamCounter = scalar, U32, 1232, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1236, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1240, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1244, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1245, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1248, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1252, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1256, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1260, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1264, [0:0] +; total TS size = 1268 +crankSynchronizationCounter0 = scalar, U32, 1268, "", 1, 0 +vvtSyncGapRatio0 = scalar, F32, 1272, "", 1, 0 +vvtToothDurations00 = scalar, U32, 1276, "us", 1, 0 +vvtCurrentPosition0 = scalar, F32, 1280, "sync: Primary Cam Position", 1, 0 +vvtToothPosition10 = scalar, F32, 1284, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition20 = scalar, F32, 1288, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition30 = scalar, F32, 1292, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition40 = scalar, F32, 1296, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio0 = scalar, F32, 1300, "", 1, 0 +triggerStateIndex0 = scalar, U08, 1304, "", 1, 0 +vvtStateIndex0 = scalar, U08, 1305, "", 1, 0 +; total TS size = 1308 +camResyncCounter = scalar, U08, 1308, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1312, [0:0] +; total TS size = 1316 +wallFuelCorrection = scalar, F32, 1316, "", 1, 0 +wallFuel = scalar, F32, 1320, "", 1, 0 +; total TS size = 1324 +idleState = bits, S32, 1324, [0:2], "not important" +currentIdlePosition = scalar, F32, 1328 +baseIdlePosition = scalar, F32, 1332 +idleClosedLoop = scalar, F32, 1336 +iacByTpsTaper = scalar, F32, 1340 +throttlePedalUpState = scalar, S32, 1344, "", 1, 0 +mightResetPid = bits, U32, 1348, [0:0] +shouldResetPid = bits, U32, 1348, [1:1] +wasResetPid = bits, U32, 1348, [2:2] +mustResetPid = bits, U32, 1348, [3:3] +isCranking = bits, U32, 1348, [4:4] +isIacTableForCoasting = bits, U32, 1348, [5:5] +notIdling = bits, U32, 1348, [6:6] +needReset = bits, U32, 1348, [7:7] +isInDeadZone = bits, U32, 1348, [8:8] +isBlipping = bits, U32, 1348, [9:9] +useClosedLoop = bits, U32, 1348, [10:10] +badTps = bits, U32, 1348, [11:11] +looksLikeRunning = bits, U32, 1348, [12:12] +looksLikeCoasting = bits, U32, 1348, [13:13] +looksLikeCrankToIdle = bits, U32, 1348, [14:14] +isIdleCoasting = bits, U32, 1348, [15:15] +isIdleClosedLoop = bits, U32, 1348, [16:16] +idleTarget = scalar, S32, 1352, "", 1, 0 +targetRpmByClt = scalar, S32, 1356, "", 1, 0 +targetRpmAc = scalar, S32, 1360, "", 1, 0 +iacByRpmTaper = scalar, F32, 1364 +luaAdd = scalar, F32, 1368 +; total TS size = 1372 +idlePosition0 = scalar, F32, 1372, "per", 1,0 +trim0 = scalar, F32, 1376, "", 1, 0 +luaAdjustment0 = scalar, F32, 1380, "per", 1,0 +m_wastegatePosition0 = scalar, F32, 1384, "per", 1,0 +etbFeedForward0 = scalar, F32, 1388 +etbIntegralError0 = scalar, F32, 1392, "", 1, 0 +etbCurrentTarget0 = scalar, F32, 1396, "%", 1, 0 +etbCurrentAdjustedTarget0 = scalar, F32, 1400, "%", 1, 0 +etbRevLimitActive0 = bits, U32, 1404, [0:0] +jamDetected0 = bits, U32, 1404, [1:1] +etbDutyRateOfChange0 = scalar, F32, 1408, "per", 1,0 +etbDutyAverage0 = scalar, F32, 1412, "per", 1,0 +etbTpsErrorCounter0 = scalar, U16, 1416, "count", 1,0 +etbPpsErrorCounter0 = scalar, U16, 1418, "count", 1,0 +etbErrorCode0 = scalar, S08, 1420, "", 1, 0 +tcEtbDrop0 = scalar, S08, 1421, "", 1, 0 +jamTimer0 = scalar, U16, 1422, "sec", 0.01, 0 ; total TS size = 1424 -dcOutput0 = scalar, F32, 1424, "per", 1,0 -isEnabled0_int = scalar, U08, 1428, "per", 1,0 -isEnabled0 = bits, U32, 1432, [0:0] +faultCode0 = scalar, U08, 1424, "", 1, 0 +heaterDuty0 = scalar, U08, 1425, "%", 1, 0 +pumpDuty0 = scalar, U08, 1426, "%", 1, 0 +tempC0 = scalar, U16, 1428, "C", 1, 0 +nernstVoltage0 = scalar, U16, 1430, "V", 0.001, 0 +esr0 = scalar, U16, 1432, "ohm", 1, 0 ; total TS size = 1436 -value0 = scalar, U16, 1436, "value", 1,0 -value1 = scalar, U16, 1438, "value", 1,0 -errorRate = scalar, F32, 1440, "ratio", 1,0 -; total TS size = 1444 -vvtTarget = scalar, U16, 1444, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1446, "%", 0.5, 0 +dcOutput0 = scalar, F32, 1436, "per", 1,0 +isEnabled0_int = scalar, U08, 1440, "per", 1,0 +isEnabled0 = bits, U32, 1444, [0:0] ; total TS size = 1448 -lambdaCurrentlyGood = bits, U32, 1448, [0:0] -lambdaMonitorCut = bits, U32, 1448, [1:1] -lambdaTimeSinceGood = scalar, U16, 1452, "sec", 0.01, 0 +value0 = scalar, U16, 1448, "value", 1,0 +value1 = scalar, U16, 1450, "value", 1,0 +errorRate = scalar, F32, 1452, "ratio", 1,0 ; total TS size = 1456 +vvtTarget = scalar, U16, 1456, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1458, "%", 0.5, 0 +; total TS size = 1460 +lambdaCurrentlyGood = bits, U32, 1460, [0:0] +lambdaMonitorCut = bits, U32, 1460, [1:1] +lambdaTimeSinceGood = scalar, U16, 1464, "sec", 0.01, 0 +; total TS size = 1468 time = { timeNow } @@ -5401,7 +5404,6 @@ entry = smartChipState, "smartChipState", int, "%d" entry = smartChipRestartCounter, "smartChipRestartCounter", int, "%d" entry = smartChipAliveCounter, "smartChipAliveCounter", int, "%d" entry = startStopPhysicalState, "startStopPhysicalState", int, "%d" -entry = acrStateDup, "acrStateDup", int, "%d" entry = acrEngineMovedRecently, "acrEngineMovedRecently", int, "%d" entry = heaterControlEnabled, "heaterControlEnabled", int, "%d" entry = luaDigitalState0, "luaDigitalState0", int, "%d" @@ -5411,6 +5413,9 @@ entry = luaDigitalState3, "luaDigitalState3", int, "%d" entry = startStopStateToggleCounter, "startStopStateToggleCounter", int, "%d" entry = egtValue1, "egtValue1", float, "%.3f" entry = egtValue2, "egtValue2", float, "%.3f" +entry = luaSoftSparkSkip, "luaSoftSparkSkip", float, "%.3f" +entry = luaHardSparkSkip, "luaHardSparkSkip", float, "%.3f" +entry = tractionControlSparkSkip, "tractionControlSparkSkip", float, "%.3f" entry = desiredRpmLimit, "User-defined RPM hard limit", int, "%d" entry = fuelInjectionCounter, "Fuel: Injection counter", int, "%d" entry = globalSparkCounter, "Ign: Spark counter", int, "%d" @@ -5912,7 +5917,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 @@ -6360,7 +6365,6 @@ indicatorPanel = engine_stateIndicatorPanel, 2 indicator = {lua_luaDisableEtb}, "luaDisableEtb No", "luaDisableEtb Yes" indicator = {lua_luaIgnCut}, "luaIgnCut No", "luaIgnCut Yes" indicator = {startStopPhysicalState}, "startStopPhysicalState No", "startStopPhysicalState Yes" - indicator = {acrStateDup}, "acrStateDup No", "acrStateDup Yes" indicator = {acrEngineMovedRecently}, "acrEngineMovedRecently No", "acrEngineMovedRecently Yes" indicator = {heaterControlEnabled}, "heaterControlEnabled No", "heaterControlEnabled Yes" indicator = {luaDigitalState0}, "luaDigitalState0 No", "luaDigitalState0 Yes" @@ -6396,12 +6400,16 @@ dialog = engine_stateDialog, "engine_state" graphLine = egtValue1 graphLine = egtValue2 liveGraph = engine_state_6_Graph, "Graph", South + graphLine = luaSoftSparkSkip + graphLine = luaHardSparkSkip + graphLine = tractionControlSparkSkip graphLine = desiredRpmLimit + liveGraph = engine_state_7_Graph, "Graph", South graphLine = fuelInjectionCounter graphLine = globalSparkCounter graphLine = fuelingLoad - liveGraph = engine_state_7_Graph, "Graph", South graphLine = ignitionLoad + liveGraph = engine_state_8_Graph, "Graph", South graphLine = veTableYAxis indicatorPanel = tps_accel_stateIndicatorPanel, 2 @@ -7308,6 +7316,10 @@ dialog = lambda_monitorDialog, "lambda_monitor" 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 diff --git a/firmware/tunerstudio/generated/rusefi_f469-discovery.ini b/firmware/tunerstudio/generated/rusefi_f469-discovery.ini index 5602853b73..0365207ec3 100644 --- a/firmware/tunerstudio/generated/rusefi_f469-discovery.ini +++ b/firmware/tunerstudio/generated/rusefi_f469-discovery.ini @@ -37,12 +37,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.03.05.f469-discovery.1651859494" + signature = "rusEFI master.2024.03.05.f469-discovery.770691102" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.03.05.f469-discovery.1651859494" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.03.05.f469-discovery.770691102" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -98,7 +98,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="Disabled", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PB0", "PB1", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue Mar 05 00:53:01 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue Mar 05 01:57:05 UTC 2024 pageSize = 22236 page = 1 @@ -745,6 +745,7 @@ mc33810Gpgd3Mode = bits, U32, 1576, [4:4], "false", "true" enableExtendedCanBroadcast = bits, U32, 1576, [5:5], "false", "true" luaCanRxWorkaround = bits, U32, 1576, [6:6], "false", "true" flexSensorInverted = bits, U32, 1576, [7:7], "false", "true" +useHardSkipInTraction = bits, U32, 1576, [8:8], "false", "true" useAuxSpeedForSlipRatio = bits, U32, 1576, [11:11], "false", "true" useVssAsSecondWheelSpeed = bits, U32, 1576, [12:12], "false", "true" is_enabled_spi_5 = bits, U32, 1576, [13:13], "false", "true" @@ -2468,7 +2469,7 @@ injectorStagingRpmBins = array, U16, 22222, [6], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1456 + ochBlockSize = 1468 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3131,145 +3132,147 @@ smartChipState = scalar, S08, 1102, "", 1, 0 smartChipRestartCounter = scalar, S08, 1103, "", 1, 0 smartChipAliveCounter = scalar, S08, 1104, "", 1, 0 startStopPhysicalState = bits, U32, 1108, [0:0] -acrStateDup = bits, U32, 1108, [1:1] -acrEngineMovedRecently = bits, U32, 1108, [2:2] -heaterControlEnabled = bits, U32, 1108, [3:3] -luaDigitalState0 = bits, U32, 1108, [4:4] -luaDigitalState1 = bits, U32, 1108, [5:5] -luaDigitalState2 = bits, U32, 1108, [6:6] -luaDigitalState3 = bits, U32, 1108, [7:7] +acrEngineMovedRecently = bits, U32, 1108, [1:1] +heaterControlEnabled = bits, U32, 1108, [2:2] +luaDigitalState0 = bits, U32, 1108, [3:3] +luaDigitalState1 = bits, U32, 1108, [4:4] +luaDigitalState2 = bits, U32, 1108, [5:5] +luaDigitalState3 = bits, U32, 1108, [6:6] startStopStateToggleCounter = scalar, U32, 1112, "", 1, 0 egtValue1 = scalar, F32, 1116, "", 1, 0 egtValue2 = scalar, F32, 1120, "", 1, 0 -desiredRpmLimit = scalar, S16, 1124, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1128, "", 1, 0 -globalSparkCounter = scalar, U32, 1132, "", 1, 0 -fuelingLoad = scalar, F32, 1136, "", 1, 0 -ignitionLoad = scalar, F32, 1140, "", 1, 0 -veTableYAxis = scalar, U16, 1144, "%", 0.01, 0 -; total TS size = 1148 -tpsFrom = scalar, F32, 1148 -tpsTo = scalar, F32, 1152 -deltaTps = scalar, F32, 1156 -extraFuel = scalar, F32, 1160, "", 1, 0 -valueFromTable = scalar, F32, 1164, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1168, [0:0] -isBelowDecelThreshold = bits, U32, 1168, [1:1] -isTimeToResetAccumulator = bits, U32, 1168, [2:2] -isFractionalEnrichment = bits, U32, 1168, [3:3] -belowEpsilon = bits, U32, 1168, [4:4] -tooShort = bits, U32, 1168, [5:5] -fractionalInjFuel = scalar, F32, 1172, "", 1, 0 -accumulatedValue = scalar, F32, 1176, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1180, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1184, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1188, "", 1, 0 -cycleCnt = scalar, S32, 1192, "", 1, 0 -; total TS size = 1196 -hwEventCounters1 = scalar, U32, 1196, "", 1, 0 -hwEventCounters2 = scalar, U32, 1200, "", 1, 0 -hwEventCounters3 = scalar, U32, 1204, "", 1, 0 -hwEventCounters4 = scalar, U32, 1208, "", 1, 0 -hwEventCounters5 = scalar, U32, 1212, "", 1, 0 -hwEventCounters6 = scalar, U32, 1216, "", 1, 0 -vvtCamCounter = scalar, U32, 1220, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1224, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1228, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1232, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1233, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1236, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1240, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1244, "", 1, 0 -mapCamPrevToothAngle = scalar, F32, 1248, "deg", 1, 0 -isDecodingMapCam = bits, U32, 1252, [0:0] -; total TS size = 1256 -crankSynchronizationCounter0 = scalar, U32, 1256, "", 1, 0 -vvtSyncGapRatio0 = scalar, F32, 1260, "", 1, 0 -vvtToothDurations00 = scalar, U32, 1264, "us", 1, 0 -vvtCurrentPosition0 = scalar, F32, 1268, "sync: Primary Cam Position", 1, 0 -vvtToothPosition10 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition20 = scalar, F32, 1276, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition30 = scalar, F32, 1280, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition40 = scalar, F32, 1284, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio0 = scalar, F32, 1288, "", 1, 0 -triggerStateIndex0 = scalar, U08, 1292, "", 1, 0 -vvtStateIndex0 = scalar, U08, 1293, "", 1, 0 -; total TS size = 1296 -camResyncCounter = scalar, U08, 1296, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1300, [0:0] -; total TS size = 1304 -wallFuelCorrection = scalar, F32, 1304, "", 1, 0 -wallFuel = scalar, F32, 1308, "", 1, 0 -; total TS size = 1312 -idleState = bits, S32, 1312, [0:2], "not important" -currentIdlePosition = scalar, F32, 1316 -baseIdlePosition = scalar, F32, 1320 -idleClosedLoop = scalar, F32, 1324 -iacByTpsTaper = scalar, F32, 1328 -throttlePedalUpState = scalar, S32, 1332, "", 1, 0 -mightResetPid = bits, U32, 1336, [0:0] -shouldResetPid = bits, U32, 1336, [1:1] -wasResetPid = bits, U32, 1336, [2:2] -mustResetPid = bits, U32, 1336, [3:3] -isCranking = bits, U32, 1336, [4:4] -isIacTableForCoasting = bits, U32, 1336, [5:5] -notIdling = bits, U32, 1336, [6:6] -needReset = bits, U32, 1336, [7:7] -isInDeadZone = bits, U32, 1336, [8:8] -isBlipping = bits, U32, 1336, [9:9] -useClosedLoop = bits, U32, 1336, [10:10] -badTps = bits, U32, 1336, [11:11] -looksLikeRunning = bits, U32, 1336, [12:12] -looksLikeCoasting = bits, U32, 1336, [13:13] -looksLikeCrankToIdle = bits, U32, 1336, [14:14] -isIdleCoasting = bits, U32, 1336, [15:15] -isIdleClosedLoop = bits, U32, 1336, [16:16] -idleTarget = scalar, S32, 1340, "", 1, 0 -targetRpmByClt = scalar, S32, 1344, "", 1, 0 -targetRpmAc = scalar, S32, 1348, "", 1, 0 -iacByRpmTaper = scalar, F32, 1352 -luaAdd = scalar, F32, 1356 -; total TS size = 1360 -idlePosition0 = scalar, F32, 1360, "per", 1,0 -trim0 = scalar, F32, 1364, "", 1, 0 -luaAdjustment0 = scalar, F32, 1368, "per", 1,0 -m_wastegatePosition0 = scalar, F32, 1372, "per", 1,0 -etbFeedForward0 = scalar, F32, 1376 -etbIntegralError0 = scalar, F32, 1380, "", 1, 0 -etbCurrentTarget0 = scalar, F32, 1384, "%", 1, 0 -etbCurrentAdjustedTarget0 = scalar, F32, 1388, "%", 1, 0 -etbRevLimitActive0 = bits, U32, 1392, [0:0] -jamDetected0 = bits, U32, 1392, [1:1] -etbDutyRateOfChange0 = scalar, F32, 1396, "per", 1,0 -etbDutyAverage0 = scalar, F32, 1400, "per", 1,0 -etbTpsErrorCounter0 = scalar, U16, 1404, "count", 1,0 -etbPpsErrorCounter0 = scalar, U16, 1406, "count", 1,0 -etbErrorCode0 = scalar, S08, 1408, "", 1, 0 -tcEtbDrop0 = scalar, S08, 1409, "", 1, 0 -jamTimer0 = scalar, U16, 1410, "sec", 0.01, 0 -; total TS size = 1412 -faultCode0 = scalar, U08, 1412, "", 1, 0 -heaterDuty0 = scalar, U08, 1413, "%", 1, 0 -pumpDuty0 = scalar, U08, 1414, "%", 1, 0 -tempC0 = scalar, U16, 1416, "C", 1, 0 -nernstVoltage0 = scalar, U16, 1418, "V", 0.001, 0 -esr0 = scalar, U16, 1420, "ohm", 1, 0 +luaSoftSparkSkip = scalar, F32, 1124, "", 1, 0 +luaHardSparkSkip = scalar, F32, 1128, "", 1, 0 +tractionControlSparkSkip = scalar, F32, 1132, "", 1, 0 +desiredRpmLimit = scalar, S16, 1136, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 1140, "", 1, 0 +globalSparkCounter = scalar, U32, 1144, "", 1, 0 +fuelingLoad = scalar, F32, 1148, "", 1, 0 +ignitionLoad = scalar, F32, 1152, "", 1, 0 +veTableYAxis = scalar, U16, 1156, "%", 0.01, 0 +; total TS size = 1160 +tpsFrom = scalar, F32, 1160 +tpsTo = scalar, F32, 1164 +deltaTps = scalar, F32, 1168 +extraFuel = scalar, F32, 1172, "", 1, 0 +valueFromTable = scalar, F32, 1176, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1180, [0:0] +isBelowDecelThreshold = bits, U32, 1180, [1:1] +isTimeToResetAccumulator = bits, U32, 1180, [2:2] +isFractionalEnrichment = bits, U32, 1180, [3:3] +belowEpsilon = bits, U32, 1180, [4:4] +tooShort = bits, U32, 1180, [5:5] +fractionalInjFuel = scalar, F32, 1184, "", 1, 0 +accumulatedValue = scalar, F32, 1188, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1192, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1196, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1200, "", 1, 0 +cycleCnt = scalar, S32, 1204, "", 1, 0 +; total TS size = 1208 +hwEventCounters1 = scalar, U32, 1208, "", 1, 0 +hwEventCounters2 = scalar, U32, 1212, "", 1, 0 +hwEventCounters3 = scalar, U32, 1216, "", 1, 0 +hwEventCounters4 = scalar, U32, 1220, "", 1, 0 +hwEventCounters5 = scalar, U32, 1224, "", 1, 0 +hwEventCounters6 = scalar, U32, 1228, "", 1, 0 +vvtCamCounter = scalar, U32, 1232, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1236, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1240, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1244, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1245, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1248, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1252, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1256, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1260, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1264, [0:0] +; total TS size = 1268 +crankSynchronizationCounter0 = scalar, U32, 1268, "", 1, 0 +vvtSyncGapRatio0 = scalar, F32, 1272, "", 1, 0 +vvtToothDurations00 = scalar, U32, 1276, "us", 1, 0 +vvtCurrentPosition0 = scalar, F32, 1280, "sync: Primary Cam Position", 1, 0 +vvtToothPosition10 = scalar, F32, 1284, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition20 = scalar, F32, 1288, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition30 = scalar, F32, 1292, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition40 = scalar, F32, 1296, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio0 = scalar, F32, 1300, "", 1, 0 +triggerStateIndex0 = scalar, U08, 1304, "", 1, 0 +vvtStateIndex0 = scalar, U08, 1305, "", 1, 0 +; total TS size = 1308 +camResyncCounter = scalar, U08, 1308, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1312, [0:0] +; total TS size = 1316 +wallFuelCorrection = scalar, F32, 1316, "", 1, 0 +wallFuel = scalar, F32, 1320, "", 1, 0 +; total TS size = 1324 +idleState = bits, S32, 1324, [0:2], "not important" +currentIdlePosition = scalar, F32, 1328 +baseIdlePosition = scalar, F32, 1332 +idleClosedLoop = scalar, F32, 1336 +iacByTpsTaper = scalar, F32, 1340 +throttlePedalUpState = scalar, S32, 1344, "", 1, 0 +mightResetPid = bits, U32, 1348, [0:0] +shouldResetPid = bits, U32, 1348, [1:1] +wasResetPid = bits, U32, 1348, [2:2] +mustResetPid = bits, U32, 1348, [3:3] +isCranking = bits, U32, 1348, [4:4] +isIacTableForCoasting = bits, U32, 1348, [5:5] +notIdling = bits, U32, 1348, [6:6] +needReset = bits, U32, 1348, [7:7] +isInDeadZone = bits, U32, 1348, [8:8] +isBlipping = bits, U32, 1348, [9:9] +useClosedLoop = bits, U32, 1348, [10:10] +badTps = bits, U32, 1348, [11:11] +looksLikeRunning = bits, U32, 1348, [12:12] +looksLikeCoasting = bits, U32, 1348, [13:13] +looksLikeCrankToIdle = bits, U32, 1348, [14:14] +isIdleCoasting = bits, U32, 1348, [15:15] +isIdleClosedLoop = bits, U32, 1348, [16:16] +idleTarget = scalar, S32, 1352, "", 1, 0 +targetRpmByClt = scalar, S32, 1356, "", 1, 0 +targetRpmAc = scalar, S32, 1360, "", 1, 0 +iacByRpmTaper = scalar, F32, 1364 +luaAdd = scalar, F32, 1368 +; total TS size = 1372 +idlePosition0 = scalar, F32, 1372, "per", 1,0 +trim0 = scalar, F32, 1376, "", 1, 0 +luaAdjustment0 = scalar, F32, 1380, "per", 1,0 +m_wastegatePosition0 = scalar, F32, 1384, "per", 1,0 +etbFeedForward0 = scalar, F32, 1388 +etbIntegralError0 = scalar, F32, 1392, "", 1, 0 +etbCurrentTarget0 = scalar, F32, 1396, "%", 1, 0 +etbCurrentAdjustedTarget0 = scalar, F32, 1400, "%", 1, 0 +etbRevLimitActive0 = bits, U32, 1404, [0:0] +jamDetected0 = bits, U32, 1404, [1:1] +etbDutyRateOfChange0 = scalar, F32, 1408, "per", 1,0 +etbDutyAverage0 = scalar, F32, 1412, "per", 1,0 +etbTpsErrorCounter0 = scalar, U16, 1416, "count", 1,0 +etbPpsErrorCounter0 = scalar, U16, 1418, "count", 1,0 +etbErrorCode0 = scalar, S08, 1420, "", 1, 0 +tcEtbDrop0 = scalar, S08, 1421, "", 1, 0 +jamTimer0 = scalar, U16, 1422, "sec", 0.01, 0 ; total TS size = 1424 -dcOutput0 = scalar, F32, 1424, "per", 1,0 -isEnabled0_int = scalar, U08, 1428, "per", 1,0 -isEnabled0 = bits, U32, 1432, [0:0] +faultCode0 = scalar, U08, 1424, "", 1, 0 +heaterDuty0 = scalar, U08, 1425, "%", 1, 0 +pumpDuty0 = scalar, U08, 1426, "%", 1, 0 +tempC0 = scalar, U16, 1428, "C", 1, 0 +nernstVoltage0 = scalar, U16, 1430, "V", 0.001, 0 +esr0 = scalar, U16, 1432, "ohm", 1, 0 ; total TS size = 1436 -value0 = scalar, U16, 1436, "value", 1,0 -value1 = scalar, U16, 1438, "value", 1,0 -errorRate = scalar, F32, 1440, "ratio", 1,0 -; total TS size = 1444 -vvtTarget = scalar, U16, 1444, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1446, "%", 0.5, 0 +dcOutput0 = scalar, F32, 1436, "per", 1,0 +isEnabled0_int = scalar, U08, 1440, "per", 1,0 +isEnabled0 = bits, U32, 1444, [0:0] ; total TS size = 1448 -lambdaCurrentlyGood = bits, U32, 1448, [0:0] -lambdaMonitorCut = bits, U32, 1448, [1:1] -lambdaTimeSinceGood = scalar, U16, 1452, "sec", 0.01, 0 +value0 = scalar, U16, 1448, "value", 1,0 +value1 = scalar, U16, 1450, "value", 1,0 +errorRate = scalar, F32, 1452, "ratio", 1,0 ; total TS size = 1456 +vvtTarget = scalar, U16, 1456, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1458, "%", 0.5, 0 +; total TS size = 1460 +lambdaCurrentlyGood = bits, U32, 1460, [0:0] +lambdaMonitorCut = bits, U32, 1460, [1:1] +lambdaTimeSinceGood = scalar, U16, 1464, "sec", 0.01, 0 +; total TS size = 1468 time = { timeNow } @@ -5401,7 +5404,6 @@ entry = smartChipState, "smartChipState", int, "%d" entry = smartChipRestartCounter, "smartChipRestartCounter", int, "%d" entry = smartChipAliveCounter, "smartChipAliveCounter", int, "%d" entry = startStopPhysicalState, "startStopPhysicalState", int, "%d" -entry = acrStateDup, "acrStateDup", int, "%d" entry = acrEngineMovedRecently, "acrEngineMovedRecently", int, "%d" entry = heaterControlEnabled, "heaterControlEnabled", int, "%d" entry = luaDigitalState0, "luaDigitalState0", int, "%d" @@ -5411,6 +5413,9 @@ entry = luaDigitalState3, "luaDigitalState3", int, "%d" entry = startStopStateToggleCounter, "startStopStateToggleCounter", int, "%d" entry = egtValue1, "egtValue1", float, "%.3f" entry = egtValue2, "egtValue2", float, "%.3f" +entry = luaSoftSparkSkip, "luaSoftSparkSkip", float, "%.3f" +entry = luaHardSparkSkip, "luaHardSparkSkip", float, "%.3f" +entry = tractionControlSparkSkip, "tractionControlSparkSkip", float, "%.3f" entry = desiredRpmLimit, "User-defined RPM hard limit", int, "%d" entry = fuelInjectionCounter, "Fuel: Injection counter", int, "%d" entry = globalSparkCounter, "Ign: Spark counter", int, "%d" @@ -5912,7 +5917,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 @@ -6360,7 +6365,6 @@ indicatorPanel = engine_stateIndicatorPanel, 2 indicator = {lua_luaDisableEtb}, "luaDisableEtb No", "luaDisableEtb Yes" indicator = {lua_luaIgnCut}, "luaIgnCut No", "luaIgnCut Yes" indicator = {startStopPhysicalState}, "startStopPhysicalState No", "startStopPhysicalState Yes" - indicator = {acrStateDup}, "acrStateDup No", "acrStateDup Yes" indicator = {acrEngineMovedRecently}, "acrEngineMovedRecently No", "acrEngineMovedRecently Yes" indicator = {heaterControlEnabled}, "heaterControlEnabled No", "heaterControlEnabled Yes" indicator = {luaDigitalState0}, "luaDigitalState0 No", "luaDigitalState0 Yes" @@ -6396,12 +6400,16 @@ dialog = engine_stateDialog, "engine_state" graphLine = egtValue1 graphLine = egtValue2 liveGraph = engine_state_6_Graph, "Graph", South + graphLine = luaSoftSparkSkip + graphLine = luaHardSparkSkip + graphLine = tractionControlSparkSkip graphLine = desiredRpmLimit + liveGraph = engine_state_7_Graph, "Graph", South graphLine = fuelInjectionCounter graphLine = globalSparkCounter graphLine = fuelingLoad - liveGraph = engine_state_7_Graph, "Graph", South graphLine = ignitionLoad + liveGraph = engine_state_8_Graph, "Graph", South graphLine = veTableYAxis indicatorPanel = tps_accel_stateIndicatorPanel, 2 @@ -7308,6 +7316,10 @@ dialog = lambda_monitorDialog, "lambda_monitor" 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 diff --git a/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini b/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini index 4b19a99f95..81bf04e29e 100644 --- a/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini +++ b/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini @@ -37,12 +37,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.03.05.frankenso_na6.102830766" + signature = "rusEFI master.2024.03.05.frankenso_na6.1237033622" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.03.05.frankenso_na6.102830766" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.03.05.frankenso_na6.1237033622" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -98,7 +98,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","Analog 3O","Analog 3L","Analog 3M","Analog 3J","Analog 3I","INVALID","Analog 3H","Analog 3G","INVALID","INVALID","INVALID","Analog 3P","Analog 3Q","Analog 3N","Analog VBatt","Analog 3E" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue Mar 05 00:52:51 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue Mar 05 01:56:55 UTC 2024 pageSize = 22236 page = 1 @@ -745,6 +745,7 @@ mc33810Gpgd3Mode = bits, U32, 1576, [4:4], "false", "true" enableExtendedCanBroadcast = bits, U32, 1576, [5:5], "false", "true" luaCanRxWorkaround = bits, U32, 1576, [6:6], "false", "true" flexSensorInverted = bits, U32, 1576, [7:7], "false", "true" +useHardSkipInTraction = bits, U32, 1576, [8:8], "false", "true" useAuxSpeedForSlipRatio = bits, U32, 1576, [11:11], "false", "true" useVssAsSecondWheelSpeed = bits, U32, 1576, [12:12], "false", "true" is_enabled_spi_5 = bits, U32, 1576, [13:13], "false", "true" @@ -2468,7 +2469,7 @@ injectorStagingRpmBins = array, U16, 22222, [6], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1456 + ochBlockSize = 1468 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3131,145 +3132,147 @@ smartChipState = scalar, S08, 1102, "", 1, 0 smartChipRestartCounter = scalar, S08, 1103, "", 1, 0 smartChipAliveCounter = scalar, S08, 1104, "", 1, 0 startStopPhysicalState = bits, U32, 1108, [0:0] -acrStateDup = bits, U32, 1108, [1:1] -acrEngineMovedRecently = bits, U32, 1108, [2:2] -heaterControlEnabled = bits, U32, 1108, [3:3] -luaDigitalState0 = bits, U32, 1108, [4:4] -luaDigitalState1 = bits, U32, 1108, [5:5] -luaDigitalState2 = bits, U32, 1108, [6:6] -luaDigitalState3 = bits, U32, 1108, [7:7] +acrEngineMovedRecently = bits, U32, 1108, [1:1] +heaterControlEnabled = bits, U32, 1108, [2:2] +luaDigitalState0 = bits, U32, 1108, [3:3] +luaDigitalState1 = bits, U32, 1108, [4:4] +luaDigitalState2 = bits, U32, 1108, [5:5] +luaDigitalState3 = bits, U32, 1108, [6:6] startStopStateToggleCounter = scalar, U32, 1112, "", 1, 0 egtValue1 = scalar, F32, 1116, "", 1, 0 egtValue2 = scalar, F32, 1120, "", 1, 0 -desiredRpmLimit = scalar, S16, 1124, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1128, "", 1, 0 -globalSparkCounter = scalar, U32, 1132, "", 1, 0 -fuelingLoad = scalar, F32, 1136, "", 1, 0 -ignitionLoad = scalar, F32, 1140, "", 1, 0 -veTableYAxis = scalar, U16, 1144, "%", 0.01, 0 -; total TS size = 1148 -tpsFrom = scalar, F32, 1148 -tpsTo = scalar, F32, 1152 -deltaTps = scalar, F32, 1156 -extraFuel = scalar, F32, 1160, "", 1, 0 -valueFromTable = scalar, F32, 1164, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1168, [0:0] -isBelowDecelThreshold = bits, U32, 1168, [1:1] -isTimeToResetAccumulator = bits, U32, 1168, [2:2] -isFractionalEnrichment = bits, U32, 1168, [3:3] -belowEpsilon = bits, U32, 1168, [4:4] -tooShort = bits, U32, 1168, [5:5] -fractionalInjFuel = scalar, F32, 1172, "", 1, 0 -accumulatedValue = scalar, F32, 1176, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1180, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1184, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1188, "", 1, 0 -cycleCnt = scalar, S32, 1192, "", 1, 0 -; total TS size = 1196 -hwEventCounters1 = scalar, U32, 1196, "", 1, 0 -hwEventCounters2 = scalar, U32, 1200, "", 1, 0 -hwEventCounters3 = scalar, U32, 1204, "", 1, 0 -hwEventCounters4 = scalar, U32, 1208, "", 1, 0 -hwEventCounters5 = scalar, U32, 1212, "", 1, 0 -hwEventCounters6 = scalar, U32, 1216, "", 1, 0 -vvtCamCounter = scalar, U32, 1220, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1224, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1228, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1232, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1233, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1236, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1240, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1244, "", 1, 0 -mapCamPrevToothAngle = scalar, F32, 1248, "deg", 1, 0 -isDecodingMapCam = bits, U32, 1252, [0:0] -; total TS size = 1256 -crankSynchronizationCounter0 = scalar, U32, 1256, "", 1, 0 -vvtSyncGapRatio0 = scalar, F32, 1260, "", 1, 0 -vvtToothDurations00 = scalar, U32, 1264, "us", 1, 0 -vvtCurrentPosition0 = scalar, F32, 1268, "sync: Primary Cam Position", 1, 0 -vvtToothPosition10 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition20 = scalar, F32, 1276, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition30 = scalar, F32, 1280, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition40 = scalar, F32, 1284, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio0 = scalar, F32, 1288, "", 1, 0 -triggerStateIndex0 = scalar, U08, 1292, "", 1, 0 -vvtStateIndex0 = scalar, U08, 1293, "", 1, 0 -; total TS size = 1296 -camResyncCounter = scalar, U08, 1296, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1300, [0:0] -; total TS size = 1304 -wallFuelCorrection = scalar, F32, 1304, "", 1, 0 -wallFuel = scalar, F32, 1308, "", 1, 0 -; total TS size = 1312 -idleState = bits, S32, 1312, [0:2], "not important" -currentIdlePosition = scalar, F32, 1316 -baseIdlePosition = scalar, F32, 1320 -idleClosedLoop = scalar, F32, 1324 -iacByTpsTaper = scalar, F32, 1328 -throttlePedalUpState = scalar, S32, 1332, "", 1, 0 -mightResetPid = bits, U32, 1336, [0:0] -shouldResetPid = bits, U32, 1336, [1:1] -wasResetPid = bits, U32, 1336, [2:2] -mustResetPid = bits, U32, 1336, [3:3] -isCranking = bits, U32, 1336, [4:4] -isIacTableForCoasting = bits, U32, 1336, [5:5] -notIdling = bits, U32, 1336, [6:6] -needReset = bits, U32, 1336, [7:7] -isInDeadZone = bits, U32, 1336, [8:8] -isBlipping = bits, U32, 1336, [9:9] -useClosedLoop = bits, U32, 1336, [10:10] -badTps = bits, U32, 1336, [11:11] -looksLikeRunning = bits, U32, 1336, [12:12] -looksLikeCoasting = bits, U32, 1336, [13:13] -looksLikeCrankToIdle = bits, U32, 1336, [14:14] -isIdleCoasting = bits, U32, 1336, [15:15] -isIdleClosedLoop = bits, U32, 1336, [16:16] -idleTarget = scalar, S32, 1340, "", 1, 0 -targetRpmByClt = scalar, S32, 1344, "", 1, 0 -targetRpmAc = scalar, S32, 1348, "", 1, 0 -iacByRpmTaper = scalar, F32, 1352 -luaAdd = scalar, F32, 1356 -; total TS size = 1360 -idlePosition0 = scalar, F32, 1360, "per", 1,0 -trim0 = scalar, F32, 1364, "", 1, 0 -luaAdjustment0 = scalar, F32, 1368, "per", 1,0 -m_wastegatePosition0 = scalar, F32, 1372, "per", 1,0 -etbFeedForward0 = scalar, F32, 1376 -etbIntegralError0 = scalar, F32, 1380, "", 1, 0 -etbCurrentTarget0 = scalar, F32, 1384, "%", 1, 0 -etbCurrentAdjustedTarget0 = scalar, F32, 1388, "%", 1, 0 -etbRevLimitActive0 = bits, U32, 1392, [0:0] -jamDetected0 = bits, U32, 1392, [1:1] -etbDutyRateOfChange0 = scalar, F32, 1396, "per", 1,0 -etbDutyAverage0 = scalar, F32, 1400, "per", 1,0 -etbTpsErrorCounter0 = scalar, U16, 1404, "count", 1,0 -etbPpsErrorCounter0 = scalar, U16, 1406, "count", 1,0 -etbErrorCode0 = scalar, S08, 1408, "", 1, 0 -tcEtbDrop0 = scalar, S08, 1409, "", 1, 0 -jamTimer0 = scalar, U16, 1410, "sec", 0.01, 0 -; total TS size = 1412 -faultCode0 = scalar, U08, 1412, "", 1, 0 -heaterDuty0 = scalar, U08, 1413, "%", 1, 0 -pumpDuty0 = scalar, U08, 1414, "%", 1, 0 -tempC0 = scalar, U16, 1416, "C", 1, 0 -nernstVoltage0 = scalar, U16, 1418, "V", 0.001, 0 -esr0 = scalar, U16, 1420, "ohm", 1, 0 +luaSoftSparkSkip = scalar, F32, 1124, "", 1, 0 +luaHardSparkSkip = scalar, F32, 1128, "", 1, 0 +tractionControlSparkSkip = scalar, F32, 1132, "", 1, 0 +desiredRpmLimit = scalar, S16, 1136, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 1140, "", 1, 0 +globalSparkCounter = scalar, U32, 1144, "", 1, 0 +fuelingLoad = scalar, F32, 1148, "", 1, 0 +ignitionLoad = scalar, F32, 1152, "", 1, 0 +veTableYAxis = scalar, U16, 1156, "%", 0.01, 0 +; total TS size = 1160 +tpsFrom = scalar, F32, 1160 +tpsTo = scalar, F32, 1164 +deltaTps = scalar, F32, 1168 +extraFuel = scalar, F32, 1172, "", 1, 0 +valueFromTable = scalar, F32, 1176, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1180, [0:0] +isBelowDecelThreshold = bits, U32, 1180, [1:1] +isTimeToResetAccumulator = bits, U32, 1180, [2:2] +isFractionalEnrichment = bits, U32, 1180, [3:3] +belowEpsilon = bits, U32, 1180, [4:4] +tooShort = bits, U32, 1180, [5:5] +fractionalInjFuel = scalar, F32, 1184, "", 1, 0 +accumulatedValue = scalar, F32, 1188, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1192, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1196, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1200, "", 1, 0 +cycleCnt = scalar, S32, 1204, "", 1, 0 +; total TS size = 1208 +hwEventCounters1 = scalar, U32, 1208, "", 1, 0 +hwEventCounters2 = scalar, U32, 1212, "", 1, 0 +hwEventCounters3 = scalar, U32, 1216, "", 1, 0 +hwEventCounters4 = scalar, U32, 1220, "", 1, 0 +hwEventCounters5 = scalar, U32, 1224, "", 1, 0 +hwEventCounters6 = scalar, U32, 1228, "", 1, 0 +vvtCamCounter = scalar, U32, 1232, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1236, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1240, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1244, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1245, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1248, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1252, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1256, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1260, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1264, [0:0] +; total TS size = 1268 +crankSynchronizationCounter0 = scalar, U32, 1268, "", 1, 0 +vvtSyncGapRatio0 = scalar, F32, 1272, "", 1, 0 +vvtToothDurations00 = scalar, U32, 1276, "us", 1, 0 +vvtCurrentPosition0 = scalar, F32, 1280, "sync: Primary Cam Position", 1, 0 +vvtToothPosition10 = scalar, F32, 1284, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition20 = scalar, F32, 1288, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition30 = scalar, F32, 1292, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition40 = scalar, F32, 1296, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio0 = scalar, F32, 1300, "", 1, 0 +triggerStateIndex0 = scalar, U08, 1304, "", 1, 0 +vvtStateIndex0 = scalar, U08, 1305, "", 1, 0 +; total TS size = 1308 +camResyncCounter = scalar, U08, 1308, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1312, [0:0] +; total TS size = 1316 +wallFuelCorrection = scalar, F32, 1316, "", 1, 0 +wallFuel = scalar, F32, 1320, "", 1, 0 +; total TS size = 1324 +idleState = bits, S32, 1324, [0:2], "not important" +currentIdlePosition = scalar, F32, 1328 +baseIdlePosition = scalar, F32, 1332 +idleClosedLoop = scalar, F32, 1336 +iacByTpsTaper = scalar, F32, 1340 +throttlePedalUpState = scalar, S32, 1344, "", 1, 0 +mightResetPid = bits, U32, 1348, [0:0] +shouldResetPid = bits, U32, 1348, [1:1] +wasResetPid = bits, U32, 1348, [2:2] +mustResetPid = bits, U32, 1348, [3:3] +isCranking = bits, U32, 1348, [4:4] +isIacTableForCoasting = bits, U32, 1348, [5:5] +notIdling = bits, U32, 1348, [6:6] +needReset = bits, U32, 1348, [7:7] +isInDeadZone = bits, U32, 1348, [8:8] +isBlipping = bits, U32, 1348, [9:9] +useClosedLoop = bits, U32, 1348, [10:10] +badTps = bits, U32, 1348, [11:11] +looksLikeRunning = bits, U32, 1348, [12:12] +looksLikeCoasting = bits, U32, 1348, [13:13] +looksLikeCrankToIdle = bits, U32, 1348, [14:14] +isIdleCoasting = bits, U32, 1348, [15:15] +isIdleClosedLoop = bits, U32, 1348, [16:16] +idleTarget = scalar, S32, 1352, "", 1, 0 +targetRpmByClt = scalar, S32, 1356, "", 1, 0 +targetRpmAc = scalar, S32, 1360, "", 1, 0 +iacByRpmTaper = scalar, F32, 1364 +luaAdd = scalar, F32, 1368 +; total TS size = 1372 +idlePosition0 = scalar, F32, 1372, "per", 1,0 +trim0 = scalar, F32, 1376, "", 1, 0 +luaAdjustment0 = scalar, F32, 1380, "per", 1,0 +m_wastegatePosition0 = scalar, F32, 1384, "per", 1,0 +etbFeedForward0 = scalar, F32, 1388 +etbIntegralError0 = scalar, F32, 1392, "", 1, 0 +etbCurrentTarget0 = scalar, F32, 1396, "%", 1, 0 +etbCurrentAdjustedTarget0 = scalar, F32, 1400, "%", 1, 0 +etbRevLimitActive0 = bits, U32, 1404, [0:0] +jamDetected0 = bits, U32, 1404, [1:1] +etbDutyRateOfChange0 = scalar, F32, 1408, "per", 1,0 +etbDutyAverage0 = scalar, F32, 1412, "per", 1,0 +etbTpsErrorCounter0 = scalar, U16, 1416, "count", 1,0 +etbPpsErrorCounter0 = scalar, U16, 1418, "count", 1,0 +etbErrorCode0 = scalar, S08, 1420, "", 1, 0 +tcEtbDrop0 = scalar, S08, 1421, "", 1, 0 +jamTimer0 = scalar, U16, 1422, "sec", 0.01, 0 ; total TS size = 1424 -dcOutput0 = scalar, F32, 1424, "per", 1,0 -isEnabled0_int = scalar, U08, 1428, "per", 1,0 -isEnabled0 = bits, U32, 1432, [0:0] +faultCode0 = scalar, U08, 1424, "", 1, 0 +heaterDuty0 = scalar, U08, 1425, "%", 1, 0 +pumpDuty0 = scalar, U08, 1426, "%", 1, 0 +tempC0 = scalar, U16, 1428, "C", 1, 0 +nernstVoltage0 = scalar, U16, 1430, "V", 0.001, 0 +esr0 = scalar, U16, 1432, "ohm", 1, 0 ; total TS size = 1436 -value0 = scalar, U16, 1436, "value", 1,0 -value1 = scalar, U16, 1438, "value", 1,0 -errorRate = scalar, F32, 1440, "ratio", 1,0 -; total TS size = 1444 -vvtTarget = scalar, U16, 1444, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1446, "%", 0.5, 0 +dcOutput0 = scalar, F32, 1436, "per", 1,0 +isEnabled0_int = scalar, U08, 1440, "per", 1,0 +isEnabled0 = bits, U32, 1444, [0:0] ; total TS size = 1448 -lambdaCurrentlyGood = bits, U32, 1448, [0:0] -lambdaMonitorCut = bits, U32, 1448, [1:1] -lambdaTimeSinceGood = scalar, U16, 1452, "sec", 0.01, 0 +value0 = scalar, U16, 1448, "value", 1,0 +value1 = scalar, U16, 1450, "value", 1,0 +errorRate = scalar, F32, 1452, "ratio", 1,0 ; total TS size = 1456 +vvtTarget = scalar, U16, 1456, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1458, "%", 0.5, 0 +; total TS size = 1460 +lambdaCurrentlyGood = bits, U32, 1460, [0:0] +lambdaMonitorCut = bits, U32, 1460, [1:1] +lambdaTimeSinceGood = scalar, U16, 1464, "sec", 0.01, 0 +; total TS size = 1468 time = { timeNow } @@ -5401,7 +5404,6 @@ entry = smartChipState, "smartChipState", int, "%d" entry = smartChipRestartCounter, "smartChipRestartCounter", int, "%d" entry = smartChipAliveCounter, "smartChipAliveCounter", int, "%d" entry = startStopPhysicalState, "startStopPhysicalState", int, "%d" -entry = acrStateDup, "acrStateDup", int, "%d" entry = acrEngineMovedRecently, "acrEngineMovedRecently", int, "%d" entry = heaterControlEnabled, "heaterControlEnabled", int, "%d" entry = luaDigitalState0, "luaDigitalState0", int, "%d" @@ -5411,6 +5413,9 @@ entry = luaDigitalState3, "luaDigitalState3", int, "%d" entry = startStopStateToggleCounter, "startStopStateToggleCounter", int, "%d" entry = egtValue1, "egtValue1", float, "%.3f" entry = egtValue2, "egtValue2", float, "%.3f" +entry = luaSoftSparkSkip, "luaSoftSparkSkip", float, "%.3f" +entry = luaHardSparkSkip, "luaHardSparkSkip", float, "%.3f" +entry = tractionControlSparkSkip, "tractionControlSparkSkip", float, "%.3f" entry = desiredRpmLimit, "User-defined RPM hard limit", int, "%d" entry = fuelInjectionCounter, "Fuel: Injection counter", int, "%d" entry = globalSparkCounter, "Ign: Spark counter", int, "%d" @@ -5912,7 +5917,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 @@ -6360,7 +6365,6 @@ indicatorPanel = engine_stateIndicatorPanel, 2 indicator = {lua_luaDisableEtb}, "luaDisableEtb No", "luaDisableEtb Yes" indicator = {lua_luaIgnCut}, "luaIgnCut No", "luaIgnCut Yes" indicator = {startStopPhysicalState}, "startStopPhysicalState No", "startStopPhysicalState Yes" - indicator = {acrStateDup}, "acrStateDup No", "acrStateDup Yes" indicator = {acrEngineMovedRecently}, "acrEngineMovedRecently No", "acrEngineMovedRecently Yes" indicator = {heaterControlEnabled}, "heaterControlEnabled No", "heaterControlEnabled Yes" indicator = {luaDigitalState0}, "luaDigitalState0 No", "luaDigitalState0 Yes" @@ -6396,12 +6400,16 @@ dialog = engine_stateDialog, "engine_state" graphLine = egtValue1 graphLine = egtValue2 liveGraph = engine_state_6_Graph, "Graph", South + graphLine = luaSoftSparkSkip + graphLine = luaHardSparkSkip + graphLine = tractionControlSparkSkip graphLine = desiredRpmLimit + liveGraph = engine_state_7_Graph, "Graph", South graphLine = fuelInjectionCounter graphLine = globalSparkCounter graphLine = fuelingLoad - liveGraph = engine_state_7_Graph, "Graph", South graphLine = ignitionLoad + liveGraph = engine_state_8_Graph, "Graph", South graphLine = veTableYAxis indicatorPanel = tps_accel_stateIndicatorPanel, 2 @@ -7308,6 +7316,10 @@ dialog = lambda_monitorDialog, "lambda_monitor" 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 diff --git a/firmware/tunerstudio/generated/rusefi_hellen-112-17.ini b/firmware/tunerstudio/generated/rusefi_hellen-112-17.ini index cc0444a271..60cf300c2c 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen-112-17.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen-112-17.ini @@ -37,12 +37,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.03.05.hellen-112-17.3651862065" + signature = "rusEFI master.2024.03.05.hellen-112-17.2519748105" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.03.05.hellen-112-17.3651862065" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.03.05.hellen-112-17.2519748105" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -98,7 +98,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","B20 TPS Throttle Position 2","A14 Analog Input","INVALID","A21 PPS1","B03 TPS Throttle Position 1","INVALID","A07 TODO","A12 Analog Input","A10 Analog Input","INVALID","B19 MAP","A09 Analog Input","B15 CLT","B27 IAT","A11 Analog Input","A19 Analog Input" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue Mar 05 00:52:33 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue Mar 05 01:56:38 UTC 2024 pageSize = 22236 page = 1 @@ -745,6 +745,7 @@ mc33810Gpgd3Mode = bits, U32, 1576, [4:4], "false", "true" enableExtendedCanBroadcast = bits, U32, 1576, [5:5], "false", "true" luaCanRxWorkaround = bits, U32, 1576, [6:6], "false", "true" flexSensorInverted = bits, U32, 1576, [7:7], "false", "true" +useHardSkipInTraction = bits, U32, 1576, [8:8], "false", "true" useAuxSpeedForSlipRatio = bits, U32, 1576, [11:11], "false", "true" useVssAsSecondWheelSpeed = bits, U32, 1576, [12:12], "false", "true" is_enabled_spi_5 = bits, U32, 1576, [13:13], "false", "true" @@ -2468,7 +2469,7 @@ injectorStagingRpmBins = array, U16, 22222, [6], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1456 + ochBlockSize = 1468 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3131,145 +3132,147 @@ smartChipState = scalar, S08, 1102, "", 1, 0 smartChipRestartCounter = scalar, S08, 1103, "", 1, 0 smartChipAliveCounter = scalar, S08, 1104, "", 1, 0 startStopPhysicalState = bits, U32, 1108, [0:0] -acrStateDup = bits, U32, 1108, [1:1] -acrEngineMovedRecently = bits, U32, 1108, [2:2] -heaterControlEnabled = bits, U32, 1108, [3:3] -luaDigitalState0 = bits, U32, 1108, [4:4] -luaDigitalState1 = bits, U32, 1108, [5:5] -luaDigitalState2 = bits, U32, 1108, [6:6] -luaDigitalState3 = bits, U32, 1108, [7:7] +acrEngineMovedRecently = bits, U32, 1108, [1:1] +heaterControlEnabled = bits, U32, 1108, [2:2] +luaDigitalState0 = bits, U32, 1108, [3:3] +luaDigitalState1 = bits, U32, 1108, [4:4] +luaDigitalState2 = bits, U32, 1108, [5:5] +luaDigitalState3 = bits, U32, 1108, [6:6] startStopStateToggleCounter = scalar, U32, 1112, "", 1, 0 egtValue1 = scalar, F32, 1116, "", 1, 0 egtValue2 = scalar, F32, 1120, "", 1, 0 -desiredRpmLimit = scalar, S16, 1124, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1128, "", 1, 0 -globalSparkCounter = scalar, U32, 1132, "", 1, 0 -fuelingLoad = scalar, F32, 1136, "", 1, 0 -ignitionLoad = scalar, F32, 1140, "", 1, 0 -veTableYAxis = scalar, U16, 1144, "%", 0.01, 0 -; total TS size = 1148 -tpsFrom = scalar, F32, 1148 -tpsTo = scalar, F32, 1152 -deltaTps = scalar, F32, 1156 -extraFuel = scalar, F32, 1160, "", 1, 0 -valueFromTable = scalar, F32, 1164, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1168, [0:0] -isBelowDecelThreshold = bits, U32, 1168, [1:1] -isTimeToResetAccumulator = bits, U32, 1168, [2:2] -isFractionalEnrichment = bits, U32, 1168, [3:3] -belowEpsilon = bits, U32, 1168, [4:4] -tooShort = bits, U32, 1168, [5:5] -fractionalInjFuel = scalar, F32, 1172, "", 1, 0 -accumulatedValue = scalar, F32, 1176, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1180, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1184, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1188, "", 1, 0 -cycleCnt = scalar, S32, 1192, "", 1, 0 -; total TS size = 1196 -hwEventCounters1 = scalar, U32, 1196, "", 1, 0 -hwEventCounters2 = scalar, U32, 1200, "", 1, 0 -hwEventCounters3 = scalar, U32, 1204, "", 1, 0 -hwEventCounters4 = scalar, U32, 1208, "", 1, 0 -hwEventCounters5 = scalar, U32, 1212, "", 1, 0 -hwEventCounters6 = scalar, U32, 1216, "", 1, 0 -vvtCamCounter = scalar, U32, 1220, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1224, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1228, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1232, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1233, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1236, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1240, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1244, "", 1, 0 -mapCamPrevToothAngle = scalar, F32, 1248, "deg", 1, 0 -isDecodingMapCam = bits, U32, 1252, [0:0] -; total TS size = 1256 -crankSynchronizationCounter0 = scalar, U32, 1256, "", 1, 0 -vvtSyncGapRatio0 = scalar, F32, 1260, "", 1, 0 -vvtToothDurations00 = scalar, U32, 1264, "us", 1, 0 -vvtCurrentPosition0 = scalar, F32, 1268, "sync: Primary Cam Position", 1, 0 -vvtToothPosition10 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition20 = scalar, F32, 1276, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition30 = scalar, F32, 1280, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition40 = scalar, F32, 1284, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio0 = scalar, F32, 1288, "", 1, 0 -triggerStateIndex0 = scalar, U08, 1292, "", 1, 0 -vvtStateIndex0 = scalar, U08, 1293, "", 1, 0 -; total TS size = 1296 -camResyncCounter = scalar, U08, 1296, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1300, [0:0] -; total TS size = 1304 -wallFuelCorrection = scalar, F32, 1304, "", 1, 0 -wallFuel = scalar, F32, 1308, "", 1, 0 -; total TS size = 1312 -idleState = bits, S32, 1312, [0:2], "not important" -currentIdlePosition = scalar, F32, 1316 -baseIdlePosition = scalar, F32, 1320 -idleClosedLoop = scalar, F32, 1324 -iacByTpsTaper = scalar, F32, 1328 -throttlePedalUpState = scalar, S32, 1332, "", 1, 0 -mightResetPid = bits, U32, 1336, [0:0] -shouldResetPid = bits, U32, 1336, [1:1] -wasResetPid = bits, U32, 1336, [2:2] -mustResetPid = bits, U32, 1336, [3:3] -isCranking = bits, U32, 1336, [4:4] -isIacTableForCoasting = bits, U32, 1336, [5:5] -notIdling = bits, U32, 1336, [6:6] -needReset = bits, U32, 1336, [7:7] -isInDeadZone = bits, U32, 1336, [8:8] -isBlipping = bits, U32, 1336, [9:9] -useClosedLoop = bits, U32, 1336, [10:10] -badTps = bits, U32, 1336, [11:11] -looksLikeRunning = bits, U32, 1336, [12:12] -looksLikeCoasting = bits, U32, 1336, [13:13] -looksLikeCrankToIdle = bits, U32, 1336, [14:14] -isIdleCoasting = bits, U32, 1336, [15:15] -isIdleClosedLoop = bits, U32, 1336, [16:16] -idleTarget = scalar, S32, 1340, "", 1, 0 -targetRpmByClt = scalar, S32, 1344, "", 1, 0 -targetRpmAc = scalar, S32, 1348, "", 1, 0 -iacByRpmTaper = scalar, F32, 1352 -luaAdd = scalar, F32, 1356 -; total TS size = 1360 -idlePosition0 = scalar, F32, 1360, "per", 1,0 -trim0 = scalar, F32, 1364, "", 1, 0 -luaAdjustment0 = scalar, F32, 1368, "per", 1,0 -m_wastegatePosition0 = scalar, F32, 1372, "per", 1,0 -etbFeedForward0 = scalar, F32, 1376 -etbIntegralError0 = scalar, F32, 1380, "", 1, 0 -etbCurrentTarget0 = scalar, F32, 1384, "%", 1, 0 -etbCurrentAdjustedTarget0 = scalar, F32, 1388, "%", 1, 0 -etbRevLimitActive0 = bits, U32, 1392, [0:0] -jamDetected0 = bits, U32, 1392, [1:1] -etbDutyRateOfChange0 = scalar, F32, 1396, "per", 1,0 -etbDutyAverage0 = scalar, F32, 1400, "per", 1,0 -etbTpsErrorCounter0 = scalar, U16, 1404, "count", 1,0 -etbPpsErrorCounter0 = scalar, U16, 1406, "count", 1,0 -etbErrorCode0 = scalar, S08, 1408, "", 1, 0 -tcEtbDrop0 = scalar, S08, 1409, "", 1, 0 -jamTimer0 = scalar, U16, 1410, "sec", 0.01, 0 -; total TS size = 1412 -faultCode0 = scalar, U08, 1412, "", 1, 0 -heaterDuty0 = scalar, U08, 1413, "%", 1, 0 -pumpDuty0 = scalar, U08, 1414, "%", 1, 0 -tempC0 = scalar, U16, 1416, "C", 1, 0 -nernstVoltage0 = scalar, U16, 1418, "V", 0.001, 0 -esr0 = scalar, U16, 1420, "ohm", 1, 0 +luaSoftSparkSkip = scalar, F32, 1124, "", 1, 0 +luaHardSparkSkip = scalar, F32, 1128, "", 1, 0 +tractionControlSparkSkip = scalar, F32, 1132, "", 1, 0 +desiredRpmLimit = scalar, S16, 1136, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 1140, "", 1, 0 +globalSparkCounter = scalar, U32, 1144, "", 1, 0 +fuelingLoad = scalar, F32, 1148, "", 1, 0 +ignitionLoad = scalar, F32, 1152, "", 1, 0 +veTableYAxis = scalar, U16, 1156, "%", 0.01, 0 +; total TS size = 1160 +tpsFrom = scalar, F32, 1160 +tpsTo = scalar, F32, 1164 +deltaTps = scalar, F32, 1168 +extraFuel = scalar, F32, 1172, "", 1, 0 +valueFromTable = scalar, F32, 1176, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1180, [0:0] +isBelowDecelThreshold = bits, U32, 1180, [1:1] +isTimeToResetAccumulator = bits, U32, 1180, [2:2] +isFractionalEnrichment = bits, U32, 1180, [3:3] +belowEpsilon = bits, U32, 1180, [4:4] +tooShort = bits, U32, 1180, [5:5] +fractionalInjFuel = scalar, F32, 1184, "", 1, 0 +accumulatedValue = scalar, F32, 1188, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1192, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1196, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1200, "", 1, 0 +cycleCnt = scalar, S32, 1204, "", 1, 0 +; total TS size = 1208 +hwEventCounters1 = scalar, U32, 1208, "", 1, 0 +hwEventCounters2 = scalar, U32, 1212, "", 1, 0 +hwEventCounters3 = scalar, U32, 1216, "", 1, 0 +hwEventCounters4 = scalar, U32, 1220, "", 1, 0 +hwEventCounters5 = scalar, U32, 1224, "", 1, 0 +hwEventCounters6 = scalar, U32, 1228, "", 1, 0 +vvtCamCounter = scalar, U32, 1232, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1236, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1240, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1244, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1245, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1248, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1252, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1256, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1260, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1264, [0:0] +; total TS size = 1268 +crankSynchronizationCounter0 = scalar, U32, 1268, "", 1, 0 +vvtSyncGapRatio0 = scalar, F32, 1272, "", 1, 0 +vvtToothDurations00 = scalar, U32, 1276, "us", 1, 0 +vvtCurrentPosition0 = scalar, F32, 1280, "sync: Primary Cam Position", 1, 0 +vvtToothPosition10 = scalar, F32, 1284, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition20 = scalar, F32, 1288, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition30 = scalar, F32, 1292, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition40 = scalar, F32, 1296, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio0 = scalar, F32, 1300, "", 1, 0 +triggerStateIndex0 = scalar, U08, 1304, "", 1, 0 +vvtStateIndex0 = scalar, U08, 1305, "", 1, 0 +; total TS size = 1308 +camResyncCounter = scalar, U08, 1308, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1312, [0:0] +; total TS size = 1316 +wallFuelCorrection = scalar, F32, 1316, "", 1, 0 +wallFuel = scalar, F32, 1320, "", 1, 0 +; total TS size = 1324 +idleState = bits, S32, 1324, [0:2], "not important" +currentIdlePosition = scalar, F32, 1328 +baseIdlePosition = scalar, F32, 1332 +idleClosedLoop = scalar, F32, 1336 +iacByTpsTaper = scalar, F32, 1340 +throttlePedalUpState = scalar, S32, 1344, "", 1, 0 +mightResetPid = bits, U32, 1348, [0:0] +shouldResetPid = bits, U32, 1348, [1:1] +wasResetPid = bits, U32, 1348, [2:2] +mustResetPid = bits, U32, 1348, [3:3] +isCranking = bits, U32, 1348, [4:4] +isIacTableForCoasting = bits, U32, 1348, [5:5] +notIdling = bits, U32, 1348, [6:6] +needReset = bits, U32, 1348, [7:7] +isInDeadZone = bits, U32, 1348, [8:8] +isBlipping = bits, U32, 1348, [9:9] +useClosedLoop = bits, U32, 1348, [10:10] +badTps = bits, U32, 1348, [11:11] +looksLikeRunning = bits, U32, 1348, [12:12] +looksLikeCoasting = bits, U32, 1348, [13:13] +looksLikeCrankToIdle = bits, U32, 1348, [14:14] +isIdleCoasting = bits, U32, 1348, [15:15] +isIdleClosedLoop = bits, U32, 1348, [16:16] +idleTarget = scalar, S32, 1352, "", 1, 0 +targetRpmByClt = scalar, S32, 1356, "", 1, 0 +targetRpmAc = scalar, S32, 1360, "", 1, 0 +iacByRpmTaper = scalar, F32, 1364 +luaAdd = scalar, F32, 1368 +; total TS size = 1372 +idlePosition0 = scalar, F32, 1372, "per", 1,0 +trim0 = scalar, F32, 1376, "", 1, 0 +luaAdjustment0 = scalar, F32, 1380, "per", 1,0 +m_wastegatePosition0 = scalar, F32, 1384, "per", 1,0 +etbFeedForward0 = scalar, F32, 1388 +etbIntegralError0 = scalar, F32, 1392, "", 1, 0 +etbCurrentTarget0 = scalar, F32, 1396, "%", 1, 0 +etbCurrentAdjustedTarget0 = scalar, F32, 1400, "%", 1, 0 +etbRevLimitActive0 = bits, U32, 1404, [0:0] +jamDetected0 = bits, U32, 1404, [1:1] +etbDutyRateOfChange0 = scalar, F32, 1408, "per", 1,0 +etbDutyAverage0 = scalar, F32, 1412, "per", 1,0 +etbTpsErrorCounter0 = scalar, U16, 1416, "count", 1,0 +etbPpsErrorCounter0 = scalar, U16, 1418, "count", 1,0 +etbErrorCode0 = scalar, S08, 1420, "", 1, 0 +tcEtbDrop0 = scalar, S08, 1421, "", 1, 0 +jamTimer0 = scalar, U16, 1422, "sec", 0.01, 0 ; total TS size = 1424 -dcOutput0 = scalar, F32, 1424, "per", 1,0 -isEnabled0_int = scalar, U08, 1428, "per", 1,0 -isEnabled0 = bits, U32, 1432, [0:0] +faultCode0 = scalar, U08, 1424, "", 1, 0 +heaterDuty0 = scalar, U08, 1425, "%", 1, 0 +pumpDuty0 = scalar, U08, 1426, "%", 1, 0 +tempC0 = scalar, U16, 1428, "C", 1, 0 +nernstVoltage0 = scalar, U16, 1430, "V", 0.001, 0 +esr0 = scalar, U16, 1432, "ohm", 1, 0 ; total TS size = 1436 -value0 = scalar, U16, 1436, "value", 1,0 -value1 = scalar, U16, 1438, "value", 1,0 -errorRate = scalar, F32, 1440, "ratio", 1,0 -; total TS size = 1444 -vvtTarget = scalar, U16, 1444, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1446, "%", 0.5, 0 +dcOutput0 = scalar, F32, 1436, "per", 1,0 +isEnabled0_int = scalar, U08, 1440, "per", 1,0 +isEnabled0 = bits, U32, 1444, [0:0] ; total TS size = 1448 -lambdaCurrentlyGood = bits, U32, 1448, [0:0] -lambdaMonitorCut = bits, U32, 1448, [1:1] -lambdaTimeSinceGood = scalar, U16, 1452, "sec", 0.01, 0 +value0 = scalar, U16, 1448, "value", 1,0 +value1 = scalar, U16, 1450, "value", 1,0 +errorRate = scalar, F32, 1452, "ratio", 1,0 ; total TS size = 1456 +vvtTarget = scalar, U16, 1456, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1458, "%", 0.5, 0 +; total TS size = 1460 +lambdaCurrentlyGood = bits, U32, 1460, [0:0] +lambdaMonitorCut = bits, U32, 1460, [1:1] +lambdaTimeSinceGood = scalar, U16, 1464, "sec", 0.01, 0 +; total TS size = 1468 time = { timeNow } @@ -5401,7 +5404,6 @@ entry = smartChipState, "smartChipState", int, "%d" entry = smartChipRestartCounter, "smartChipRestartCounter", int, "%d" entry = smartChipAliveCounter, "smartChipAliveCounter", int, "%d" entry = startStopPhysicalState, "startStopPhysicalState", int, "%d" -entry = acrStateDup, "acrStateDup", int, "%d" entry = acrEngineMovedRecently, "acrEngineMovedRecently", int, "%d" entry = heaterControlEnabled, "heaterControlEnabled", int, "%d" entry = luaDigitalState0, "luaDigitalState0", int, "%d" @@ -5411,6 +5413,9 @@ entry = luaDigitalState3, "luaDigitalState3", int, "%d" entry = startStopStateToggleCounter, "startStopStateToggleCounter", int, "%d" entry = egtValue1, "egtValue1", float, "%.3f" entry = egtValue2, "egtValue2", float, "%.3f" +entry = luaSoftSparkSkip, "luaSoftSparkSkip", float, "%.3f" +entry = luaHardSparkSkip, "luaHardSparkSkip", float, "%.3f" +entry = tractionControlSparkSkip, "tractionControlSparkSkip", float, "%.3f" entry = desiredRpmLimit, "User-defined RPM hard limit", int, "%d" entry = fuelInjectionCounter, "Fuel: Injection counter", int, "%d" entry = globalSparkCounter, "Ign: Spark counter", int, "%d" @@ -5911,7 +5916,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 @@ -6359,7 +6364,6 @@ indicatorPanel = engine_stateIndicatorPanel, 2 indicator = {lua_luaDisableEtb}, "luaDisableEtb No", "luaDisableEtb Yes" indicator = {lua_luaIgnCut}, "luaIgnCut No", "luaIgnCut Yes" indicator = {startStopPhysicalState}, "startStopPhysicalState No", "startStopPhysicalState Yes" - indicator = {acrStateDup}, "acrStateDup No", "acrStateDup Yes" indicator = {acrEngineMovedRecently}, "acrEngineMovedRecently No", "acrEngineMovedRecently Yes" indicator = {heaterControlEnabled}, "heaterControlEnabled No", "heaterControlEnabled Yes" indicator = {luaDigitalState0}, "luaDigitalState0 No", "luaDigitalState0 Yes" @@ -6395,12 +6399,16 @@ dialog = engine_stateDialog, "engine_state" graphLine = egtValue1 graphLine = egtValue2 liveGraph = engine_state_6_Graph, "Graph", South + graphLine = luaSoftSparkSkip + graphLine = luaHardSparkSkip + graphLine = tractionControlSparkSkip graphLine = desiredRpmLimit + liveGraph = engine_state_7_Graph, "Graph", South graphLine = fuelInjectionCounter graphLine = globalSparkCounter graphLine = fuelingLoad - liveGraph = engine_state_7_Graph, "Graph", South graphLine = ignitionLoad + liveGraph = engine_state_8_Graph, "Graph", South graphLine = veTableYAxis indicatorPanel = tps_accel_stateIndicatorPanel, 2 @@ -7307,6 +7315,10 @@ dialog = lambda_monitorDialog, "lambda_monitor" 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 diff --git a/firmware/tunerstudio/generated/rusefi_hellen-gm-e67.ini b/firmware/tunerstudio/generated/rusefi_hellen-gm-e67.ini index 1c9fda9d36..0eea60ea78 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen-gm-e67.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen-gm-e67.ini @@ -37,12 +37,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.03.05.hellen-gm-e67.2631598349" + signature = "rusEFI master.2024.03.05.hellen-gm-e67.3544297781" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.03.05.hellen-gm-e67.2631598349" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.03.05.hellen-gm-e67.3544297781" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -98,7 +98,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","INVALID","C2-60 - Oil Pressure","C3-58 - Baro","C1-47 - PPS1","C2-64 - TPS1","C1-19 Battery Sense","C1-45 Secondary Fuel Level","C3-57 - A/C Pressure","C2-66 - TPS2","C1-44 Primary Fuel Level","C2-65 - Trans Fluids","C3-59 - MAP","C3-55 - CLT","C3-56 - IAT","C1-49 - PPS2","C1-46 Vac Sense" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue Mar 05 00:52:39 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue Mar 05 01:56:43 UTC 2024 pageSize = 22236 page = 1 @@ -745,6 +745,7 @@ mc33810Gpgd3Mode = bits, U32, 1576, [4:4], "false", "true" enableExtendedCanBroadcast = bits, U32, 1576, [5:5], "false", "true" luaCanRxWorkaround = bits, U32, 1576, [6:6], "false", "true" flexSensorInverted = bits, U32, 1576, [7:7], "false", "true" +useHardSkipInTraction = bits, U32, 1576, [8:8], "false", "true" useAuxSpeedForSlipRatio = bits, U32, 1576, [11:11], "false", "true" useVssAsSecondWheelSpeed = bits, U32, 1576, [12:12], "false", "true" is_enabled_spi_5 = bits, U32, 1576, [13:13], "false", "true" @@ -2468,7 +2469,7 @@ injectorStagingRpmBins = array, U16, 22222, [6], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1456 + ochBlockSize = 1468 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3131,145 +3132,147 @@ smartChipState = scalar, S08, 1102, "", 1, 0 smartChipRestartCounter = scalar, S08, 1103, "", 1, 0 smartChipAliveCounter = scalar, S08, 1104, "", 1, 0 startStopPhysicalState = bits, U32, 1108, [0:0] -acrStateDup = bits, U32, 1108, [1:1] -acrEngineMovedRecently = bits, U32, 1108, [2:2] -heaterControlEnabled = bits, U32, 1108, [3:3] -luaDigitalState0 = bits, U32, 1108, [4:4] -luaDigitalState1 = bits, U32, 1108, [5:5] -luaDigitalState2 = bits, U32, 1108, [6:6] -luaDigitalState3 = bits, U32, 1108, [7:7] +acrEngineMovedRecently = bits, U32, 1108, [1:1] +heaterControlEnabled = bits, U32, 1108, [2:2] +luaDigitalState0 = bits, U32, 1108, [3:3] +luaDigitalState1 = bits, U32, 1108, [4:4] +luaDigitalState2 = bits, U32, 1108, [5:5] +luaDigitalState3 = bits, U32, 1108, [6:6] startStopStateToggleCounter = scalar, U32, 1112, "", 1, 0 egtValue1 = scalar, F32, 1116, "", 1, 0 egtValue2 = scalar, F32, 1120, "", 1, 0 -desiredRpmLimit = scalar, S16, 1124, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1128, "", 1, 0 -globalSparkCounter = scalar, U32, 1132, "", 1, 0 -fuelingLoad = scalar, F32, 1136, "", 1, 0 -ignitionLoad = scalar, F32, 1140, "", 1, 0 -veTableYAxis = scalar, U16, 1144, "%", 0.01, 0 -; total TS size = 1148 -tpsFrom = scalar, F32, 1148 -tpsTo = scalar, F32, 1152 -deltaTps = scalar, F32, 1156 -extraFuel = scalar, F32, 1160, "", 1, 0 -valueFromTable = scalar, F32, 1164, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1168, [0:0] -isBelowDecelThreshold = bits, U32, 1168, [1:1] -isTimeToResetAccumulator = bits, U32, 1168, [2:2] -isFractionalEnrichment = bits, U32, 1168, [3:3] -belowEpsilon = bits, U32, 1168, [4:4] -tooShort = bits, U32, 1168, [5:5] -fractionalInjFuel = scalar, F32, 1172, "", 1, 0 -accumulatedValue = scalar, F32, 1176, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1180, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1184, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1188, "", 1, 0 -cycleCnt = scalar, S32, 1192, "", 1, 0 -; total TS size = 1196 -hwEventCounters1 = scalar, U32, 1196, "", 1, 0 -hwEventCounters2 = scalar, U32, 1200, "", 1, 0 -hwEventCounters3 = scalar, U32, 1204, "", 1, 0 -hwEventCounters4 = scalar, U32, 1208, "", 1, 0 -hwEventCounters5 = scalar, U32, 1212, "", 1, 0 -hwEventCounters6 = scalar, U32, 1216, "", 1, 0 -vvtCamCounter = scalar, U32, 1220, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1224, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1228, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1232, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1233, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1236, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1240, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1244, "", 1, 0 -mapCamPrevToothAngle = scalar, F32, 1248, "deg", 1, 0 -isDecodingMapCam = bits, U32, 1252, [0:0] -; total TS size = 1256 -crankSynchronizationCounter0 = scalar, U32, 1256, "", 1, 0 -vvtSyncGapRatio0 = scalar, F32, 1260, "", 1, 0 -vvtToothDurations00 = scalar, U32, 1264, "us", 1, 0 -vvtCurrentPosition0 = scalar, F32, 1268, "sync: Primary Cam Position", 1, 0 -vvtToothPosition10 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition20 = scalar, F32, 1276, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition30 = scalar, F32, 1280, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition40 = scalar, F32, 1284, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio0 = scalar, F32, 1288, "", 1, 0 -triggerStateIndex0 = scalar, U08, 1292, "", 1, 0 -vvtStateIndex0 = scalar, U08, 1293, "", 1, 0 -; total TS size = 1296 -camResyncCounter = scalar, U08, 1296, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1300, [0:0] -; total TS size = 1304 -wallFuelCorrection = scalar, F32, 1304, "", 1, 0 -wallFuel = scalar, F32, 1308, "", 1, 0 -; total TS size = 1312 -idleState = bits, S32, 1312, [0:2], "not important" -currentIdlePosition = scalar, F32, 1316 -baseIdlePosition = scalar, F32, 1320 -idleClosedLoop = scalar, F32, 1324 -iacByTpsTaper = scalar, F32, 1328 -throttlePedalUpState = scalar, S32, 1332, "", 1, 0 -mightResetPid = bits, U32, 1336, [0:0] -shouldResetPid = bits, U32, 1336, [1:1] -wasResetPid = bits, U32, 1336, [2:2] -mustResetPid = bits, U32, 1336, [3:3] -isCranking = bits, U32, 1336, [4:4] -isIacTableForCoasting = bits, U32, 1336, [5:5] -notIdling = bits, U32, 1336, [6:6] -needReset = bits, U32, 1336, [7:7] -isInDeadZone = bits, U32, 1336, [8:8] -isBlipping = bits, U32, 1336, [9:9] -useClosedLoop = bits, U32, 1336, [10:10] -badTps = bits, U32, 1336, [11:11] -looksLikeRunning = bits, U32, 1336, [12:12] -looksLikeCoasting = bits, U32, 1336, [13:13] -looksLikeCrankToIdle = bits, U32, 1336, [14:14] -isIdleCoasting = bits, U32, 1336, [15:15] -isIdleClosedLoop = bits, U32, 1336, [16:16] -idleTarget = scalar, S32, 1340, "", 1, 0 -targetRpmByClt = scalar, S32, 1344, "", 1, 0 -targetRpmAc = scalar, S32, 1348, "", 1, 0 -iacByRpmTaper = scalar, F32, 1352 -luaAdd = scalar, F32, 1356 -; total TS size = 1360 -idlePosition0 = scalar, F32, 1360, "per", 1,0 -trim0 = scalar, F32, 1364, "", 1, 0 -luaAdjustment0 = scalar, F32, 1368, "per", 1,0 -m_wastegatePosition0 = scalar, F32, 1372, "per", 1,0 -etbFeedForward0 = scalar, F32, 1376 -etbIntegralError0 = scalar, F32, 1380, "", 1, 0 -etbCurrentTarget0 = scalar, F32, 1384, "%", 1, 0 -etbCurrentAdjustedTarget0 = scalar, F32, 1388, "%", 1, 0 -etbRevLimitActive0 = bits, U32, 1392, [0:0] -jamDetected0 = bits, U32, 1392, [1:1] -etbDutyRateOfChange0 = scalar, F32, 1396, "per", 1,0 -etbDutyAverage0 = scalar, F32, 1400, "per", 1,0 -etbTpsErrorCounter0 = scalar, U16, 1404, "count", 1,0 -etbPpsErrorCounter0 = scalar, U16, 1406, "count", 1,0 -etbErrorCode0 = scalar, S08, 1408, "", 1, 0 -tcEtbDrop0 = scalar, S08, 1409, "", 1, 0 -jamTimer0 = scalar, U16, 1410, "sec", 0.01, 0 -; total TS size = 1412 -faultCode0 = scalar, U08, 1412, "", 1, 0 -heaterDuty0 = scalar, U08, 1413, "%", 1, 0 -pumpDuty0 = scalar, U08, 1414, "%", 1, 0 -tempC0 = scalar, U16, 1416, "C", 1, 0 -nernstVoltage0 = scalar, U16, 1418, "V", 0.001, 0 -esr0 = scalar, U16, 1420, "ohm", 1, 0 +luaSoftSparkSkip = scalar, F32, 1124, "", 1, 0 +luaHardSparkSkip = scalar, F32, 1128, "", 1, 0 +tractionControlSparkSkip = scalar, F32, 1132, "", 1, 0 +desiredRpmLimit = scalar, S16, 1136, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 1140, "", 1, 0 +globalSparkCounter = scalar, U32, 1144, "", 1, 0 +fuelingLoad = scalar, F32, 1148, "", 1, 0 +ignitionLoad = scalar, F32, 1152, "", 1, 0 +veTableYAxis = scalar, U16, 1156, "%", 0.01, 0 +; total TS size = 1160 +tpsFrom = scalar, F32, 1160 +tpsTo = scalar, F32, 1164 +deltaTps = scalar, F32, 1168 +extraFuel = scalar, F32, 1172, "", 1, 0 +valueFromTable = scalar, F32, 1176, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1180, [0:0] +isBelowDecelThreshold = bits, U32, 1180, [1:1] +isTimeToResetAccumulator = bits, U32, 1180, [2:2] +isFractionalEnrichment = bits, U32, 1180, [3:3] +belowEpsilon = bits, U32, 1180, [4:4] +tooShort = bits, U32, 1180, [5:5] +fractionalInjFuel = scalar, F32, 1184, "", 1, 0 +accumulatedValue = scalar, F32, 1188, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1192, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1196, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1200, "", 1, 0 +cycleCnt = scalar, S32, 1204, "", 1, 0 +; total TS size = 1208 +hwEventCounters1 = scalar, U32, 1208, "", 1, 0 +hwEventCounters2 = scalar, U32, 1212, "", 1, 0 +hwEventCounters3 = scalar, U32, 1216, "", 1, 0 +hwEventCounters4 = scalar, U32, 1220, "", 1, 0 +hwEventCounters5 = scalar, U32, 1224, "", 1, 0 +hwEventCounters6 = scalar, U32, 1228, "", 1, 0 +vvtCamCounter = scalar, U32, 1232, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1236, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1240, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1244, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1245, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1248, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1252, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1256, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1260, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1264, [0:0] +; total TS size = 1268 +crankSynchronizationCounter0 = scalar, U32, 1268, "", 1, 0 +vvtSyncGapRatio0 = scalar, F32, 1272, "", 1, 0 +vvtToothDurations00 = scalar, U32, 1276, "us", 1, 0 +vvtCurrentPosition0 = scalar, F32, 1280, "sync: Primary Cam Position", 1, 0 +vvtToothPosition10 = scalar, F32, 1284, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition20 = scalar, F32, 1288, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition30 = scalar, F32, 1292, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition40 = scalar, F32, 1296, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio0 = scalar, F32, 1300, "", 1, 0 +triggerStateIndex0 = scalar, U08, 1304, "", 1, 0 +vvtStateIndex0 = scalar, U08, 1305, "", 1, 0 +; total TS size = 1308 +camResyncCounter = scalar, U08, 1308, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1312, [0:0] +; total TS size = 1316 +wallFuelCorrection = scalar, F32, 1316, "", 1, 0 +wallFuel = scalar, F32, 1320, "", 1, 0 +; total TS size = 1324 +idleState = bits, S32, 1324, [0:2], "not important" +currentIdlePosition = scalar, F32, 1328 +baseIdlePosition = scalar, F32, 1332 +idleClosedLoop = scalar, F32, 1336 +iacByTpsTaper = scalar, F32, 1340 +throttlePedalUpState = scalar, S32, 1344, "", 1, 0 +mightResetPid = bits, U32, 1348, [0:0] +shouldResetPid = bits, U32, 1348, [1:1] +wasResetPid = bits, U32, 1348, [2:2] +mustResetPid = bits, U32, 1348, [3:3] +isCranking = bits, U32, 1348, [4:4] +isIacTableForCoasting = bits, U32, 1348, [5:5] +notIdling = bits, U32, 1348, [6:6] +needReset = bits, U32, 1348, [7:7] +isInDeadZone = bits, U32, 1348, [8:8] +isBlipping = bits, U32, 1348, [9:9] +useClosedLoop = bits, U32, 1348, [10:10] +badTps = bits, U32, 1348, [11:11] +looksLikeRunning = bits, U32, 1348, [12:12] +looksLikeCoasting = bits, U32, 1348, [13:13] +looksLikeCrankToIdle = bits, U32, 1348, [14:14] +isIdleCoasting = bits, U32, 1348, [15:15] +isIdleClosedLoop = bits, U32, 1348, [16:16] +idleTarget = scalar, S32, 1352, "", 1, 0 +targetRpmByClt = scalar, S32, 1356, "", 1, 0 +targetRpmAc = scalar, S32, 1360, "", 1, 0 +iacByRpmTaper = scalar, F32, 1364 +luaAdd = scalar, F32, 1368 +; total TS size = 1372 +idlePosition0 = scalar, F32, 1372, "per", 1,0 +trim0 = scalar, F32, 1376, "", 1, 0 +luaAdjustment0 = scalar, F32, 1380, "per", 1,0 +m_wastegatePosition0 = scalar, F32, 1384, "per", 1,0 +etbFeedForward0 = scalar, F32, 1388 +etbIntegralError0 = scalar, F32, 1392, "", 1, 0 +etbCurrentTarget0 = scalar, F32, 1396, "%", 1, 0 +etbCurrentAdjustedTarget0 = scalar, F32, 1400, "%", 1, 0 +etbRevLimitActive0 = bits, U32, 1404, [0:0] +jamDetected0 = bits, U32, 1404, [1:1] +etbDutyRateOfChange0 = scalar, F32, 1408, "per", 1,0 +etbDutyAverage0 = scalar, F32, 1412, "per", 1,0 +etbTpsErrorCounter0 = scalar, U16, 1416, "count", 1,0 +etbPpsErrorCounter0 = scalar, U16, 1418, "count", 1,0 +etbErrorCode0 = scalar, S08, 1420, "", 1, 0 +tcEtbDrop0 = scalar, S08, 1421, "", 1, 0 +jamTimer0 = scalar, U16, 1422, "sec", 0.01, 0 ; total TS size = 1424 -dcOutput0 = scalar, F32, 1424, "per", 1,0 -isEnabled0_int = scalar, U08, 1428, "per", 1,0 -isEnabled0 = bits, U32, 1432, [0:0] +faultCode0 = scalar, U08, 1424, "", 1, 0 +heaterDuty0 = scalar, U08, 1425, "%", 1, 0 +pumpDuty0 = scalar, U08, 1426, "%", 1, 0 +tempC0 = scalar, U16, 1428, "C", 1, 0 +nernstVoltage0 = scalar, U16, 1430, "V", 0.001, 0 +esr0 = scalar, U16, 1432, "ohm", 1, 0 ; total TS size = 1436 -value0 = scalar, U16, 1436, "value", 1,0 -value1 = scalar, U16, 1438, "value", 1,0 -errorRate = scalar, F32, 1440, "ratio", 1,0 -; total TS size = 1444 -vvtTarget = scalar, U16, 1444, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1446, "%", 0.5, 0 +dcOutput0 = scalar, F32, 1436, "per", 1,0 +isEnabled0_int = scalar, U08, 1440, "per", 1,0 +isEnabled0 = bits, U32, 1444, [0:0] ; total TS size = 1448 -lambdaCurrentlyGood = bits, U32, 1448, [0:0] -lambdaMonitorCut = bits, U32, 1448, [1:1] -lambdaTimeSinceGood = scalar, U16, 1452, "sec", 0.01, 0 +value0 = scalar, U16, 1448, "value", 1,0 +value1 = scalar, U16, 1450, "value", 1,0 +errorRate = scalar, F32, 1452, "ratio", 1,0 ; total TS size = 1456 +vvtTarget = scalar, U16, 1456, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1458, "%", 0.5, 0 +; total TS size = 1460 +lambdaCurrentlyGood = bits, U32, 1460, [0:0] +lambdaMonitorCut = bits, U32, 1460, [1:1] +lambdaTimeSinceGood = scalar, U16, 1464, "sec", 0.01, 0 +; total TS size = 1468 time = { timeNow } @@ -5401,7 +5404,6 @@ entry = smartChipState, "smartChipState", int, "%d" entry = smartChipRestartCounter, "smartChipRestartCounter", int, "%d" entry = smartChipAliveCounter, "smartChipAliveCounter", int, "%d" entry = startStopPhysicalState, "startStopPhysicalState", int, "%d" -entry = acrStateDup, "acrStateDup", int, "%d" entry = acrEngineMovedRecently, "acrEngineMovedRecently", int, "%d" entry = heaterControlEnabled, "heaterControlEnabled", int, "%d" entry = luaDigitalState0, "luaDigitalState0", int, "%d" @@ -5411,6 +5413,9 @@ entry = luaDigitalState3, "luaDigitalState3", int, "%d" entry = startStopStateToggleCounter, "startStopStateToggleCounter", int, "%d" entry = egtValue1, "egtValue1", float, "%.3f" entry = egtValue2, "egtValue2", float, "%.3f" +entry = luaSoftSparkSkip, "luaSoftSparkSkip", float, "%.3f" +entry = luaHardSparkSkip, "luaHardSparkSkip", float, "%.3f" +entry = tractionControlSparkSkip, "tractionControlSparkSkip", float, "%.3f" entry = desiredRpmLimit, "User-defined RPM hard limit", int, "%d" entry = fuelInjectionCounter, "Fuel: Injection counter", int, "%d" entry = globalSparkCounter, "Ign: Spark counter", int, "%d" @@ -5913,7 +5918,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 @@ -6361,7 +6366,6 @@ indicatorPanel = engine_stateIndicatorPanel, 2 indicator = {lua_luaDisableEtb}, "luaDisableEtb No", "luaDisableEtb Yes" indicator = {lua_luaIgnCut}, "luaIgnCut No", "luaIgnCut Yes" indicator = {startStopPhysicalState}, "startStopPhysicalState No", "startStopPhysicalState Yes" - indicator = {acrStateDup}, "acrStateDup No", "acrStateDup Yes" indicator = {acrEngineMovedRecently}, "acrEngineMovedRecently No", "acrEngineMovedRecently Yes" indicator = {heaterControlEnabled}, "heaterControlEnabled No", "heaterControlEnabled Yes" indicator = {luaDigitalState0}, "luaDigitalState0 No", "luaDigitalState0 Yes" @@ -6397,12 +6401,16 @@ dialog = engine_stateDialog, "engine_state" graphLine = egtValue1 graphLine = egtValue2 liveGraph = engine_state_6_Graph, "Graph", South + graphLine = luaSoftSparkSkip + graphLine = luaHardSparkSkip + graphLine = tractionControlSparkSkip graphLine = desiredRpmLimit + liveGraph = engine_state_7_Graph, "Graph", South graphLine = fuelInjectionCounter graphLine = globalSparkCounter graphLine = fuelingLoad - liveGraph = engine_state_7_Graph, "Graph", South graphLine = ignitionLoad + liveGraph = engine_state_8_Graph, "Graph", South graphLine = veTableYAxis indicatorPanel = tps_accel_stateIndicatorPanel, 2 @@ -7309,6 +7317,10 @@ dialog = lambda_monitorDialog, "lambda_monitor" 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 diff --git a/firmware/tunerstudio/generated/rusefi_hellen-honda-k.ini b/firmware/tunerstudio/generated/rusefi_hellen-honda-k.ini index 6255d80f0c..4bc2168c53 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen-honda-k.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen-honda-k.ini @@ -37,12 +37,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.03.05.hellen-honda-k.469729204" + signature = "rusEFI master.2024.03.05.hellen-honda-k.1415958412" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.03.05.hellen-honda-k.469729204" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.03.05.hellen-honda-k.1415958412" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -98,7 +98,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","INVALID","INVALID","INVALID","INVALID","A15 TPS","E9 Ignition Key Voltage","INVALID","Aux Analog 3","Aux Analog 1","INVALID","A19 - MAP","INVALID","B8 - CLT","B17 IAT","Aux Analog 2" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue Mar 05 00:52:28 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue Mar 05 01:56:32 UTC 2024 pageSize = 22908 page = 1 @@ -745,6 +745,7 @@ mc33810Gpgd3Mode = bits, U32, 1576, [4:4], "false", "true" enableExtendedCanBroadcast = bits, U32, 1576, [5:5], "false", "true" luaCanRxWorkaround = bits, U32, 1576, [6:6], "false", "true" flexSensorInverted = bits, U32, 1576, [7:7], "false", "true" +useHardSkipInTraction = bits, U32, 1576, [8:8], "false", "true" useAuxSpeedForSlipRatio = bits, U32, 1576, [11:11], "false", "true" useVssAsSecondWheelSpeed = bits, U32, 1576, [12:12], "false", "true" is_enabled_spi_5 = bits, U32, 1576, [13:13], "false", "true" @@ -2468,7 +2469,7 @@ injectorStagingRpmBins = array, U16, 22894, [6], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1456 + ochBlockSize = 1468 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3131,145 +3132,147 @@ smartChipState = scalar, S08, 1102, "", 1, 0 smartChipRestartCounter = scalar, S08, 1103, "", 1, 0 smartChipAliveCounter = scalar, S08, 1104, "", 1, 0 startStopPhysicalState = bits, U32, 1108, [0:0] -acrStateDup = bits, U32, 1108, [1:1] -acrEngineMovedRecently = bits, U32, 1108, [2:2] -heaterControlEnabled = bits, U32, 1108, [3:3] -luaDigitalState0 = bits, U32, 1108, [4:4] -luaDigitalState1 = bits, U32, 1108, [5:5] -luaDigitalState2 = bits, U32, 1108, [6:6] -luaDigitalState3 = bits, U32, 1108, [7:7] +acrEngineMovedRecently = bits, U32, 1108, [1:1] +heaterControlEnabled = bits, U32, 1108, [2:2] +luaDigitalState0 = bits, U32, 1108, [3:3] +luaDigitalState1 = bits, U32, 1108, [4:4] +luaDigitalState2 = bits, U32, 1108, [5:5] +luaDigitalState3 = bits, U32, 1108, [6:6] startStopStateToggleCounter = scalar, U32, 1112, "", 1, 0 egtValue1 = scalar, F32, 1116, "", 1, 0 egtValue2 = scalar, F32, 1120, "", 1, 0 -desiredRpmLimit = scalar, S16, 1124, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1128, "", 1, 0 -globalSparkCounter = scalar, U32, 1132, "", 1, 0 -fuelingLoad = scalar, F32, 1136, "", 1, 0 -ignitionLoad = scalar, F32, 1140, "", 1, 0 -veTableYAxis = scalar, U16, 1144, "%", 0.01, 0 -; total TS size = 1148 -tpsFrom = scalar, F32, 1148 -tpsTo = scalar, F32, 1152 -deltaTps = scalar, F32, 1156 -extraFuel = scalar, F32, 1160, "", 1, 0 -valueFromTable = scalar, F32, 1164, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1168, [0:0] -isBelowDecelThreshold = bits, U32, 1168, [1:1] -isTimeToResetAccumulator = bits, U32, 1168, [2:2] -isFractionalEnrichment = bits, U32, 1168, [3:3] -belowEpsilon = bits, U32, 1168, [4:4] -tooShort = bits, U32, 1168, [5:5] -fractionalInjFuel = scalar, F32, 1172, "", 1, 0 -accumulatedValue = scalar, F32, 1176, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1180, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1184, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1188, "", 1, 0 -cycleCnt = scalar, S32, 1192, "", 1, 0 -; total TS size = 1196 -hwEventCounters1 = scalar, U32, 1196, "", 1, 0 -hwEventCounters2 = scalar, U32, 1200, "", 1, 0 -hwEventCounters3 = scalar, U32, 1204, "", 1, 0 -hwEventCounters4 = scalar, U32, 1208, "", 1, 0 -hwEventCounters5 = scalar, U32, 1212, "", 1, 0 -hwEventCounters6 = scalar, U32, 1216, "", 1, 0 -vvtCamCounter = scalar, U32, 1220, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1224, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1228, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1232, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1233, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1236, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1240, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1244, "", 1, 0 -mapCamPrevToothAngle = scalar, F32, 1248, "deg", 1, 0 -isDecodingMapCam = bits, U32, 1252, [0:0] -; total TS size = 1256 -crankSynchronizationCounter0 = scalar, U32, 1256, "", 1, 0 -vvtSyncGapRatio0 = scalar, F32, 1260, "", 1, 0 -vvtToothDurations00 = scalar, U32, 1264, "us", 1, 0 -vvtCurrentPosition0 = scalar, F32, 1268, "sync: Primary Cam Position", 1, 0 -vvtToothPosition10 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition20 = scalar, F32, 1276, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition30 = scalar, F32, 1280, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition40 = scalar, F32, 1284, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio0 = scalar, F32, 1288, "", 1, 0 -triggerStateIndex0 = scalar, U08, 1292, "", 1, 0 -vvtStateIndex0 = scalar, U08, 1293, "", 1, 0 -; total TS size = 1296 -camResyncCounter = scalar, U08, 1296, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1300, [0:0] -; total TS size = 1304 -wallFuelCorrection = scalar, F32, 1304, "", 1, 0 -wallFuel = scalar, F32, 1308, "", 1, 0 -; total TS size = 1312 -idleState = bits, S32, 1312, [0:2], "not important" -currentIdlePosition = scalar, F32, 1316 -baseIdlePosition = scalar, F32, 1320 -idleClosedLoop = scalar, F32, 1324 -iacByTpsTaper = scalar, F32, 1328 -throttlePedalUpState = scalar, S32, 1332, "", 1, 0 -mightResetPid = bits, U32, 1336, [0:0] -shouldResetPid = bits, U32, 1336, [1:1] -wasResetPid = bits, U32, 1336, [2:2] -mustResetPid = bits, U32, 1336, [3:3] -isCranking = bits, U32, 1336, [4:4] -isIacTableForCoasting = bits, U32, 1336, [5:5] -notIdling = bits, U32, 1336, [6:6] -needReset = bits, U32, 1336, [7:7] -isInDeadZone = bits, U32, 1336, [8:8] -isBlipping = bits, U32, 1336, [9:9] -useClosedLoop = bits, U32, 1336, [10:10] -badTps = bits, U32, 1336, [11:11] -looksLikeRunning = bits, U32, 1336, [12:12] -looksLikeCoasting = bits, U32, 1336, [13:13] -looksLikeCrankToIdle = bits, U32, 1336, [14:14] -isIdleCoasting = bits, U32, 1336, [15:15] -isIdleClosedLoop = bits, U32, 1336, [16:16] -idleTarget = scalar, S32, 1340, "", 1, 0 -targetRpmByClt = scalar, S32, 1344, "", 1, 0 -targetRpmAc = scalar, S32, 1348, "", 1, 0 -iacByRpmTaper = scalar, F32, 1352 -luaAdd = scalar, F32, 1356 -; total TS size = 1360 -idlePosition0 = scalar, F32, 1360, "per", 1,0 -trim0 = scalar, F32, 1364, "", 1, 0 -luaAdjustment0 = scalar, F32, 1368, "per", 1,0 -m_wastegatePosition0 = scalar, F32, 1372, "per", 1,0 -etbFeedForward0 = scalar, F32, 1376 -etbIntegralError0 = scalar, F32, 1380, "", 1, 0 -etbCurrentTarget0 = scalar, F32, 1384, "%", 1, 0 -etbCurrentAdjustedTarget0 = scalar, F32, 1388, "%", 1, 0 -etbRevLimitActive0 = bits, U32, 1392, [0:0] -jamDetected0 = bits, U32, 1392, [1:1] -etbDutyRateOfChange0 = scalar, F32, 1396, "per", 1,0 -etbDutyAverage0 = scalar, F32, 1400, "per", 1,0 -etbTpsErrorCounter0 = scalar, U16, 1404, "count", 1,0 -etbPpsErrorCounter0 = scalar, U16, 1406, "count", 1,0 -etbErrorCode0 = scalar, S08, 1408, "", 1, 0 -tcEtbDrop0 = scalar, S08, 1409, "", 1, 0 -jamTimer0 = scalar, U16, 1410, "sec", 0.01, 0 -; total TS size = 1412 -faultCode0 = scalar, U08, 1412, "", 1, 0 -heaterDuty0 = scalar, U08, 1413, "%", 1, 0 -pumpDuty0 = scalar, U08, 1414, "%", 1, 0 -tempC0 = scalar, U16, 1416, "C", 1, 0 -nernstVoltage0 = scalar, U16, 1418, "V", 0.001, 0 -esr0 = scalar, U16, 1420, "ohm", 1, 0 +luaSoftSparkSkip = scalar, F32, 1124, "", 1, 0 +luaHardSparkSkip = scalar, F32, 1128, "", 1, 0 +tractionControlSparkSkip = scalar, F32, 1132, "", 1, 0 +desiredRpmLimit = scalar, S16, 1136, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 1140, "", 1, 0 +globalSparkCounter = scalar, U32, 1144, "", 1, 0 +fuelingLoad = scalar, F32, 1148, "", 1, 0 +ignitionLoad = scalar, F32, 1152, "", 1, 0 +veTableYAxis = scalar, U16, 1156, "%", 0.01, 0 +; total TS size = 1160 +tpsFrom = scalar, F32, 1160 +tpsTo = scalar, F32, 1164 +deltaTps = scalar, F32, 1168 +extraFuel = scalar, F32, 1172, "", 1, 0 +valueFromTable = scalar, F32, 1176, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1180, [0:0] +isBelowDecelThreshold = bits, U32, 1180, [1:1] +isTimeToResetAccumulator = bits, U32, 1180, [2:2] +isFractionalEnrichment = bits, U32, 1180, [3:3] +belowEpsilon = bits, U32, 1180, [4:4] +tooShort = bits, U32, 1180, [5:5] +fractionalInjFuel = scalar, F32, 1184, "", 1, 0 +accumulatedValue = scalar, F32, 1188, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1192, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1196, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1200, "", 1, 0 +cycleCnt = scalar, S32, 1204, "", 1, 0 +; total TS size = 1208 +hwEventCounters1 = scalar, U32, 1208, "", 1, 0 +hwEventCounters2 = scalar, U32, 1212, "", 1, 0 +hwEventCounters3 = scalar, U32, 1216, "", 1, 0 +hwEventCounters4 = scalar, U32, 1220, "", 1, 0 +hwEventCounters5 = scalar, U32, 1224, "", 1, 0 +hwEventCounters6 = scalar, U32, 1228, "", 1, 0 +vvtCamCounter = scalar, U32, 1232, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1236, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1240, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1244, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1245, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1248, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1252, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1256, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1260, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1264, [0:0] +; total TS size = 1268 +crankSynchronizationCounter0 = scalar, U32, 1268, "", 1, 0 +vvtSyncGapRatio0 = scalar, F32, 1272, "", 1, 0 +vvtToothDurations00 = scalar, U32, 1276, "us", 1, 0 +vvtCurrentPosition0 = scalar, F32, 1280, "sync: Primary Cam Position", 1, 0 +vvtToothPosition10 = scalar, F32, 1284, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition20 = scalar, F32, 1288, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition30 = scalar, F32, 1292, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition40 = scalar, F32, 1296, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio0 = scalar, F32, 1300, "", 1, 0 +triggerStateIndex0 = scalar, U08, 1304, "", 1, 0 +vvtStateIndex0 = scalar, U08, 1305, "", 1, 0 +; total TS size = 1308 +camResyncCounter = scalar, U08, 1308, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1312, [0:0] +; total TS size = 1316 +wallFuelCorrection = scalar, F32, 1316, "", 1, 0 +wallFuel = scalar, F32, 1320, "", 1, 0 +; total TS size = 1324 +idleState = bits, S32, 1324, [0:2], "not important" +currentIdlePosition = scalar, F32, 1328 +baseIdlePosition = scalar, F32, 1332 +idleClosedLoop = scalar, F32, 1336 +iacByTpsTaper = scalar, F32, 1340 +throttlePedalUpState = scalar, S32, 1344, "", 1, 0 +mightResetPid = bits, U32, 1348, [0:0] +shouldResetPid = bits, U32, 1348, [1:1] +wasResetPid = bits, U32, 1348, [2:2] +mustResetPid = bits, U32, 1348, [3:3] +isCranking = bits, U32, 1348, [4:4] +isIacTableForCoasting = bits, U32, 1348, [5:5] +notIdling = bits, U32, 1348, [6:6] +needReset = bits, U32, 1348, [7:7] +isInDeadZone = bits, U32, 1348, [8:8] +isBlipping = bits, U32, 1348, [9:9] +useClosedLoop = bits, U32, 1348, [10:10] +badTps = bits, U32, 1348, [11:11] +looksLikeRunning = bits, U32, 1348, [12:12] +looksLikeCoasting = bits, U32, 1348, [13:13] +looksLikeCrankToIdle = bits, U32, 1348, [14:14] +isIdleCoasting = bits, U32, 1348, [15:15] +isIdleClosedLoop = bits, U32, 1348, [16:16] +idleTarget = scalar, S32, 1352, "", 1, 0 +targetRpmByClt = scalar, S32, 1356, "", 1, 0 +targetRpmAc = scalar, S32, 1360, "", 1, 0 +iacByRpmTaper = scalar, F32, 1364 +luaAdd = scalar, F32, 1368 +; total TS size = 1372 +idlePosition0 = scalar, F32, 1372, "per", 1,0 +trim0 = scalar, F32, 1376, "", 1, 0 +luaAdjustment0 = scalar, F32, 1380, "per", 1,0 +m_wastegatePosition0 = scalar, F32, 1384, "per", 1,0 +etbFeedForward0 = scalar, F32, 1388 +etbIntegralError0 = scalar, F32, 1392, "", 1, 0 +etbCurrentTarget0 = scalar, F32, 1396, "%", 1, 0 +etbCurrentAdjustedTarget0 = scalar, F32, 1400, "%", 1, 0 +etbRevLimitActive0 = bits, U32, 1404, [0:0] +jamDetected0 = bits, U32, 1404, [1:1] +etbDutyRateOfChange0 = scalar, F32, 1408, "per", 1,0 +etbDutyAverage0 = scalar, F32, 1412, "per", 1,0 +etbTpsErrorCounter0 = scalar, U16, 1416, "count", 1,0 +etbPpsErrorCounter0 = scalar, U16, 1418, "count", 1,0 +etbErrorCode0 = scalar, S08, 1420, "", 1, 0 +tcEtbDrop0 = scalar, S08, 1421, "", 1, 0 +jamTimer0 = scalar, U16, 1422, "sec", 0.01, 0 ; total TS size = 1424 -dcOutput0 = scalar, F32, 1424, "per", 1,0 -isEnabled0_int = scalar, U08, 1428, "per", 1,0 -isEnabled0 = bits, U32, 1432, [0:0] +faultCode0 = scalar, U08, 1424, "", 1, 0 +heaterDuty0 = scalar, U08, 1425, "%", 1, 0 +pumpDuty0 = scalar, U08, 1426, "%", 1, 0 +tempC0 = scalar, U16, 1428, "C", 1, 0 +nernstVoltage0 = scalar, U16, 1430, "V", 0.001, 0 +esr0 = scalar, U16, 1432, "ohm", 1, 0 ; total TS size = 1436 -value0 = scalar, U16, 1436, "value", 1,0 -value1 = scalar, U16, 1438, "value", 1,0 -errorRate = scalar, F32, 1440, "ratio", 1,0 -; total TS size = 1444 -vvtTarget = scalar, U16, 1444, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1446, "%", 0.5, 0 +dcOutput0 = scalar, F32, 1436, "per", 1,0 +isEnabled0_int = scalar, U08, 1440, "per", 1,0 +isEnabled0 = bits, U32, 1444, [0:0] ; total TS size = 1448 -lambdaCurrentlyGood = bits, U32, 1448, [0:0] -lambdaMonitorCut = bits, U32, 1448, [1:1] -lambdaTimeSinceGood = scalar, U16, 1452, "sec", 0.01, 0 +value0 = scalar, U16, 1448, "value", 1,0 +value1 = scalar, U16, 1450, "value", 1,0 +errorRate = scalar, F32, 1452, "ratio", 1,0 ; total TS size = 1456 +vvtTarget = scalar, U16, 1456, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1458, "%", 0.5, 0 +; total TS size = 1460 +lambdaCurrentlyGood = bits, U32, 1460, [0:0] +lambdaMonitorCut = bits, U32, 1460, [1:1] +lambdaTimeSinceGood = scalar, U16, 1464, "sec", 0.01, 0 +; total TS size = 1468 time = { timeNow } @@ -5401,7 +5404,6 @@ entry = smartChipState, "smartChipState", int, "%d" entry = smartChipRestartCounter, "smartChipRestartCounter", int, "%d" entry = smartChipAliveCounter, "smartChipAliveCounter", int, "%d" entry = startStopPhysicalState, "startStopPhysicalState", int, "%d" -entry = acrStateDup, "acrStateDup", int, "%d" entry = acrEngineMovedRecently, "acrEngineMovedRecently", int, "%d" entry = heaterControlEnabled, "heaterControlEnabled", int, "%d" entry = luaDigitalState0, "luaDigitalState0", int, "%d" @@ -5411,6 +5413,9 @@ entry = luaDigitalState3, "luaDigitalState3", int, "%d" entry = startStopStateToggleCounter, "startStopStateToggleCounter", int, "%d" entry = egtValue1, "egtValue1", float, "%.3f" entry = egtValue2, "egtValue2", float, "%.3f" +entry = luaSoftSparkSkip, "luaSoftSparkSkip", float, "%.3f" +entry = luaHardSparkSkip, "luaHardSparkSkip", float, "%.3f" +entry = tractionControlSparkSkip, "tractionControlSparkSkip", float, "%.3f" entry = desiredRpmLimit, "User-defined RPM hard limit", int, "%d" entry = fuelInjectionCounter, "Fuel: Injection counter", int, "%d" entry = globalSparkCounter, "Ign: Spark counter", int, "%d" @@ -5911,7 +5916,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 @@ -6359,7 +6364,6 @@ indicatorPanel = engine_stateIndicatorPanel, 2 indicator = {lua_luaDisableEtb}, "luaDisableEtb No", "luaDisableEtb Yes" indicator = {lua_luaIgnCut}, "luaIgnCut No", "luaIgnCut Yes" indicator = {startStopPhysicalState}, "startStopPhysicalState No", "startStopPhysicalState Yes" - indicator = {acrStateDup}, "acrStateDup No", "acrStateDup Yes" indicator = {acrEngineMovedRecently}, "acrEngineMovedRecently No", "acrEngineMovedRecently Yes" indicator = {heaterControlEnabled}, "heaterControlEnabled No", "heaterControlEnabled Yes" indicator = {luaDigitalState0}, "luaDigitalState0 No", "luaDigitalState0 Yes" @@ -6395,12 +6399,16 @@ dialog = engine_stateDialog, "engine_state" graphLine = egtValue1 graphLine = egtValue2 liveGraph = engine_state_6_Graph, "Graph", South + graphLine = luaSoftSparkSkip + graphLine = luaHardSparkSkip + graphLine = tractionControlSparkSkip graphLine = desiredRpmLimit + liveGraph = engine_state_7_Graph, "Graph", South graphLine = fuelInjectionCounter graphLine = globalSparkCounter graphLine = fuelingLoad - liveGraph = engine_state_7_Graph, "Graph", South graphLine = ignitionLoad + liveGraph = engine_state_8_Graph, "Graph", South graphLine = veTableYAxis indicatorPanel = tps_accel_stateIndicatorPanel, 2 @@ -7295,6 +7303,10 @@ dialog = lambda_monitorDialog, "lambda_monitor" 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 diff --git a/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini b/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini index d3a81ffe7e..4202d69e64 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini @@ -37,12 +37,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.03.05.hellen-nb1.3116011669" + signature = "rusEFI master.2024.03.05.hellen-nb1.4129300653" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.03.05.hellen-nb1.3116011669" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.03.05.hellen-nb1.4129300653" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -98,7 +98,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","2C - O2S","TPS1","intMAP","1G - Steering/RES2","3E - TPS","1B - Battery Sense","2H - CAM","3S - EGR BOOST IN","2A - Pressure Input","2J - CRANK","2L - MAF","3D - MAP","2E - Coolant","2B - IAT","4C - IN TEMP/PPS2","1P - AC Switch" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue Mar 05 00:52:38 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue Mar 05 01:56:42 UTC 2024 pageSize = 22236 page = 1 @@ -745,6 +745,7 @@ mc33810Gpgd3Mode = bits, U32, 1576, [4:4], "false", "true" enableExtendedCanBroadcast = bits, U32, 1576, [5:5], "false", "true" luaCanRxWorkaround = bits, U32, 1576, [6:6], "false", "true" flexSensorInverted = bits, U32, 1576, [7:7], "false", "true" +useHardSkipInTraction = bits, U32, 1576, [8:8], "false", "true" useAuxSpeedForSlipRatio = bits, U32, 1576, [11:11], "false", "true" useVssAsSecondWheelSpeed = bits, U32, 1576, [12:12], "false", "true" is_enabled_spi_5 = bits, U32, 1576, [13:13], "false", "true" @@ -2468,7 +2469,7 @@ injectorStagingRpmBins = array, U16, 22222, [6], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1456 + ochBlockSize = 1468 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3131,145 +3132,147 @@ smartChipState = scalar, S08, 1102, "", 1, 0 smartChipRestartCounter = scalar, S08, 1103, "", 1, 0 smartChipAliveCounter = scalar, S08, 1104, "", 1, 0 startStopPhysicalState = bits, U32, 1108, [0:0] -acrStateDup = bits, U32, 1108, [1:1] -acrEngineMovedRecently = bits, U32, 1108, [2:2] -heaterControlEnabled = bits, U32, 1108, [3:3] -luaDigitalState0 = bits, U32, 1108, [4:4] -luaDigitalState1 = bits, U32, 1108, [5:5] -luaDigitalState2 = bits, U32, 1108, [6:6] -luaDigitalState3 = bits, U32, 1108, [7:7] +acrEngineMovedRecently = bits, U32, 1108, [1:1] +heaterControlEnabled = bits, U32, 1108, [2:2] +luaDigitalState0 = bits, U32, 1108, [3:3] +luaDigitalState1 = bits, U32, 1108, [4:4] +luaDigitalState2 = bits, U32, 1108, [5:5] +luaDigitalState3 = bits, U32, 1108, [6:6] startStopStateToggleCounter = scalar, U32, 1112, "", 1, 0 egtValue1 = scalar, F32, 1116, "", 1, 0 egtValue2 = scalar, F32, 1120, "", 1, 0 -desiredRpmLimit = scalar, S16, 1124, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1128, "", 1, 0 -globalSparkCounter = scalar, U32, 1132, "", 1, 0 -fuelingLoad = scalar, F32, 1136, "", 1, 0 -ignitionLoad = scalar, F32, 1140, "", 1, 0 -veTableYAxis = scalar, U16, 1144, "%", 0.01, 0 -; total TS size = 1148 -tpsFrom = scalar, F32, 1148 -tpsTo = scalar, F32, 1152 -deltaTps = scalar, F32, 1156 -extraFuel = scalar, F32, 1160, "", 1, 0 -valueFromTable = scalar, F32, 1164, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1168, [0:0] -isBelowDecelThreshold = bits, U32, 1168, [1:1] -isTimeToResetAccumulator = bits, U32, 1168, [2:2] -isFractionalEnrichment = bits, U32, 1168, [3:3] -belowEpsilon = bits, U32, 1168, [4:4] -tooShort = bits, U32, 1168, [5:5] -fractionalInjFuel = scalar, F32, 1172, "", 1, 0 -accumulatedValue = scalar, F32, 1176, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1180, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1184, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1188, "", 1, 0 -cycleCnt = scalar, S32, 1192, "", 1, 0 -; total TS size = 1196 -hwEventCounters1 = scalar, U32, 1196, "", 1, 0 -hwEventCounters2 = scalar, U32, 1200, "", 1, 0 -hwEventCounters3 = scalar, U32, 1204, "", 1, 0 -hwEventCounters4 = scalar, U32, 1208, "", 1, 0 -hwEventCounters5 = scalar, U32, 1212, "", 1, 0 -hwEventCounters6 = scalar, U32, 1216, "", 1, 0 -vvtCamCounter = scalar, U32, 1220, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1224, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1228, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1232, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1233, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1236, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1240, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1244, "", 1, 0 -mapCamPrevToothAngle = scalar, F32, 1248, "deg", 1, 0 -isDecodingMapCam = bits, U32, 1252, [0:0] -; total TS size = 1256 -crankSynchronizationCounter0 = scalar, U32, 1256, "", 1, 0 -vvtSyncGapRatio0 = scalar, F32, 1260, "", 1, 0 -vvtToothDurations00 = scalar, U32, 1264, "us", 1, 0 -vvtCurrentPosition0 = scalar, F32, 1268, "sync: Primary Cam Position", 1, 0 -vvtToothPosition10 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition20 = scalar, F32, 1276, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition30 = scalar, F32, 1280, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition40 = scalar, F32, 1284, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio0 = scalar, F32, 1288, "", 1, 0 -triggerStateIndex0 = scalar, U08, 1292, "", 1, 0 -vvtStateIndex0 = scalar, U08, 1293, "", 1, 0 -; total TS size = 1296 -camResyncCounter = scalar, U08, 1296, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1300, [0:0] -; total TS size = 1304 -wallFuelCorrection = scalar, F32, 1304, "", 1, 0 -wallFuel = scalar, F32, 1308, "", 1, 0 -; total TS size = 1312 -idleState = bits, S32, 1312, [0:2], "not important" -currentIdlePosition = scalar, F32, 1316 -baseIdlePosition = scalar, F32, 1320 -idleClosedLoop = scalar, F32, 1324 -iacByTpsTaper = scalar, F32, 1328 -throttlePedalUpState = scalar, S32, 1332, "", 1, 0 -mightResetPid = bits, U32, 1336, [0:0] -shouldResetPid = bits, U32, 1336, [1:1] -wasResetPid = bits, U32, 1336, [2:2] -mustResetPid = bits, U32, 1336, [3:3] -isCranking = bits, U32, 1336, [4:4] -isIacTableForCoasting = bits, U32, 1336, [5:5] -notIdling = bits, U32, 1336, [6:6] -needReset = bits, U32, 1336, [7:7] -isInDeadZone = bits, U32, 1336, [8:8] -isBlipping = bits, U32, 1336, [9:9] -useClosedLoop = bits, U32, 1336, [10:10] -badTps = bits, U32, 1336, [11:11] -looksLikeRunning = bits, U32, 1336, [12:12] -looksLikeCoasting = bits, U32, 1336, [13:13] -looksLikeCrankToIdle = bits, U32, 1336, [14:14] -isIdleCoasting = bits, U32, 1336, [15:15] -isIdleClosedLoop = bits, U32, 1336, [16:16] -idleTarget = scalar, S32, 1340, "", 1, 0 -targetRpmByClt = scalar, S32, 1344, "", 1, 0 -targetRpmAc = scalar, S32, 1348, "", 1, 0 -iacByRpmTaper = scalar, F32, 1352 -luaAdd = scalar, F32, 1356 -; total TS size = 1360 -idlePosition0 = scalar, F32, 1360, "per", 1,0 -trim0 = scalar, F32, 1364, "", 1, 0 -luaAdjustment0 = scalar, F32, 1368, "per", 1,0 -m_wastegatePosition0 = scalar, F32, 1372, "per", 1,0 -etbFeedForward0 = scalar, F32, 1376 -etbIntegralError0 = scalar, F32, 1380, "", 1, 0 -etbCurrentTarget0 = scalar, F32, 1384, "%", 1, 0 -etbCurrentAdjustedTarget0 = scalar, F32, 1388, "%", 1, 0 -etbRevLimitActive0 = bits, U32, 1392, [0:0] -jamDetected0 = bits, U32, 1392, [1:1] -etbDutyRateOfChange0 = scalar, F32, 1396, "per", 1,0 -etbDutyAverage0 = scalar, F32, 1400, "per", 1,0 -etbTpsErrorCounter0 = scalar, U16, 1404, "count", 1,0 -etbPpsErrorCounter0 = scalar, U16, 1406, "count", 1,0 -etbErrorCode0 = scalar, S08, 1408, "", 1, 0 -tcEtbDrop0 = scalar, S08, 1409, "", 1, 0 -jamTimer0 = scalar, U16, 1410, "sec", 0.01, 0 -; total TS size = 1412 -faultCode0 = scalar, U08, 1412, "", 1, 0 -heaterDuty0 = scalar, U08, 1413, "%", 1, 0 -pumpDuty0 = scalar, U08, 1414, "%", 1, 0 -tempC0 = scalar, U16, 1416, "C", 1, 0 -nernstVoltage0 = scalar, U16, 1418, "V", 0.001, 0 -esr0 = scalar, U16, 1420, "ohm", 1, 0 +luaSoftSparkSkip = scalar, F32, 1124, "", 1, 0 +luaHardSparkSkip = scalar, F32, 1128, "", 1, 0 +tractionControlSparkSkip = scalar, F32, 1132, "", 1, 0 +desiredRpmLimit = scalar, S16, 1136, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 1140, "", 1, 0 +globalSparkCounter = scalar, U32, 1144, "", 1, 0 +fuelingLoad = scalar, F32, 1148, "", 1, 0 +ignitionLoad = scalar, F32, 1152, "", 1, 0 +veTableYAxis = scalar, U16, 1156, "%", 0.01, 0 +; total TS size = 1160 +tpsFrom = scalar, F32, 1160 +tpsTo = scalar, F32, 1164 +deltaTps = scalar, F32, 1168 +extraFuel = scalar, F32, 1172, "", 1, 0 +valueFromTable = scalar, F32, 1176, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1180, [0:0] +isBelowDecelThreshold = bits, U32, 1180, [1:1] +isTimeToResetAccumulator = bits, U32, 1180, [2:2] +isFractionalEnrichment = bits, U32, 1180, [3:3] +belowEpsilon = bits, U32, 1180, [4:4] +tooShort = bits, U32, 1180, [5:5] +fractionalInjFuel = scalar, F32, 1184, "", 1, 0 +accumulatedValue = scalar, F32, 1188, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1192, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1196, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1200, "", 1, 0 +cycleCnt = scalar, S32, 1204, "", 1, 0 +; total TS size = 1208 +hwEventCounters1 = scalar, U32, 1208, "", 1, 0 +hwEventCounters2 = scalar, U32, 1212, "", 1, 0 +hwEventCounters3 = scalar, U32, 1216, "", 1, 0 +hwEventCounters4 = scalar, U32, 1220, "", 1, 0 +hwEventCounters5 = scalar, U32, 1224, "", 1, 0 +hwEventCounters6 = scalar, U32, 1228, "", 1, 0 +vvtCamCounter = scalar, U32, 1232, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1236, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1240, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1244, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1245, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1248, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1252, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1256, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1260, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1264, [0:0] +; total TS size = 1268 +crankSynchronizationCounter0 = scalar, U32, 1268, "", 1, 0 +vvtSyncGapRatio0 = scalar, F32, 1272, "", 1, 0 +vvtToothDurations00 = scalar, U32, 1276, "us", 1, 0 +vvtCurrentPosition0 = scalar, F32, 1280, "sync: Primary Cam Position", 1, 0 +vvtToothPosition10 = scalar, F32, 1284, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition20 = scalar, F32, 1288, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition30 = scalar, F32, 1292, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition40 = scalar, F32, 1296, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio0 = scalar, F32, 1300, "", 1, 0 +triggerStateIndex0 = scalar, U08, 1304, "", 1, 0 +vvtStateIndex0 = scalar, U08, 1305, "", 1, 0 +; total TS size = 1308 +camResyncCounter = scalar, U08, 1308, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1312, [0:0] +; total TS size = 1316 +wallFuelCorrection = scalar, F32, 1316, "", 1, 0 +wallFuel = scalar, F32, 1320, "", 1, 0 +; total TS size = 1324 +idleState = bits, S32, 1324, [0:2], "not important" +currentIdlePosition = scalar, F32, 1328 +baseIdlePosition = scalar, F32, 1332 +idleClosedLoop = scalar, F32, 1336 +iacByTpsTaper = scalar, F32, 1340 +throttlePedalUpState = scalar, S32, 1344, "", 1, 0 +mightResetPid = bits, U32, 1348, [0:0] +shouldResetPid = bits, U32, 1348, [1:1] +wasResetPid = bits, U32, 1348, [2:2] +mustResetPid = bits, U32, 1348, [3:3] +isCranking = bits, U32, 1348, [4:4] +isIacTableForCoasting = bits, U32, 1348, [5:5] +notIdling = bits, U32, 1348, [6:6] +needReset = bits, U32, 1348, [7:7] +isInDeadZone = bits, U32, 1348, [8:8] +isBlipping = bits, U32, 1348, [9:9] +useClosedLoop = bits, U32, 1348, [10:10] +badTps = bits, U32, 1348, [11:11] +looksLikeRunning = bits, U32, 1348, [12:12] +looksLikeCoasting = bits, U32, 1348, [13:13] +looksLikeCrankToIdle = bits, U32, 1348, [14:14] +isIdleCoasting = bits, U32, 1348, [15:15] +isIdleClosedLoop = bits, U32, 1348, [16:16] +idleTarget = scalar, S32, 1352, "", 1, 0 +targetRpmByClt = scalar, S32, 1356, "", 1, 0 +targetRpmAc = scalar, S32, 1360, "", 1, 0 +iacByRpmTaper = scalar, F32, 1364 +luaAdd = scalar, F32, 1368 +; total TS size = 1372 +idlePosition0 = scalar, F32, 1372, "per", 1,0 +trim0 = scalar, F32, 1376, "", 1, 0 +luaAdjustment0 = scalar, F32, 1380, "per", 1,0 +m_wastegatePosition0 = scalar, F32, 1384, "per", 1,0 +etbFeedForward0 = scalar, F32, 1388 +etbIntegralError0 = scalar, F32, 1392, "", 1, 0 +etbCurrentTarget0 = scalar, F32, 1396, "%", 1, 0 +etbCurrentAdjustedTarget0 = scalar, F32, 1400, "%", 1, 0 +etbRevLimitActive0 = bits, U32, 1404, [0:0] +jamDetected0 = bits, U32, 1404, [1:1] +etbDutyRateOfChange0 = scalar, F32, 1408, "per", 1,0 +etbDutyAverage0 = scalar, F32, 1412, "per", 1,0 +etbTpsErrorCounter0 = scalar, U16, 1416, "count", 1,0 +etbPpsErrorCounter0 = scalar, U16, 1418, "count", 1,0 +etbErrorCode0 = scalar, S08, 1420, "", 1, 0 +tcEtbDrop0 = scalar, S08, 1421, "", 1, 0 +jamTimer0 = scalar, U16, 1422, "sec", 0.01, 0 ; total TS size = 1424 -dcOutput0 = scalar, F32, 1424, "per", 1,0 -isEnabled0_int = scalar, U08, 1428, "per", 1,0 -isEnabled0 = bits, U32, 1432, [0:0] +faultCode0 = scalar, U08, 1424, "", 1, 0 +heaterDuty0 = scalar, U08, 1425, "%", 1, 0 +pumpDuty0 = scalar, U08, 1426, "%", 1, 0 +tempC0 = scalar, U16, 1428, "C", 1, 0 +nernstVoltage0 = scalar, U16, 1430, "V", 0.001, 0 +esr0 = scalar, U16, 1432, "ohm", 1, 0 ; total TS size = 1436 -value0 = scalar, U16, 1436, "value", 1,0 -value1 = scalar, U16, 1438, "value", 1,0 -errorRate = scalar, F32, 1440, "ratio", 1,0 -; total TS size = 1444 -vvtTarget = scalar, U16, 1444, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1446, "%", 0.5, 0 +dcOutput0 = scalar, F32, 1436, "per", 1,0 +isEnabled0_int = scalar, U08, 1440, "per", 1,0 +isEnabled0 = bits, U32, 1444, [0:0] ; total TS size = 1448 -lambdaCurrentlyGood = bits, U32, 1448, [0:0] -lambdaMonitorCut = bits, U32, 1448, [1:1] -lambdaTimeSinceGood = scalar, U16, 1452, "sec", 0.01, 0 +value0 = scalar, U16, 1448, "value", 1,0 +value1 = scalar, U16, 1450, "value", 1,0 +errorRate = scalar, F32, 1452, "ratio", 1,0 ; total TS size = 1456 +vvtTarget = scalar, U16, 1456, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1458, "%", 0.5, 0 +; total TS size = 1460 +lambdaCurrentlyGood = bits, U32, 1460, [0:0] +lambdaMonitorCut = bits, U32, 1460, [1:1] +lambdaTimeSinceGood = scalar, U16, 1464, "sec", 0.01, 0 +; total TS size = 1468 time = { timeNow } @@ -5401,7 +5404,6 @@ entry = smartChipState, "smartChipState", int, "%d" entry = smartChipRestartCounter, "smartChipRestartCounter", int, "%d" entry = smartChipAliveCounter, "smartChipAliveCounter", int, "%d" entry = startStopPhysicalState, "startStopPhysicalState", int, "%d" -entry = acrStateDup, "acrStateDup", int, "%d" entry = acrEngineMovedRecently, "acrEngineMovedRecently", int, "%d" entry = heaterControlEnabled, "heaterControlEnabled", int, "%d" entry = luaDigitalState0, "luaDigitalState0", int, "%d" @@ -5411,6 +5413,9 @@ entry = luaDigitalState3, "luaDigitalState3", int, "%d" entry = startStopStateToggleCounter, "startStopStateToggleCounter", int, "%d" entry = egtValue1, "egtValue1", float, "%.3f" entry = egtValue2, "egtValue2", float, "%.3f" +entry = luaSoftSparkSkip, "luaSoftSparkSkip", float, "%.3f" +entry = luaHardSparkSkip, "luaHardSparkSkip", float, "%.3f" +entry = tractionControlSparkSkip, "tractionControlSparkSkip", float, "%.3f" entry = desiredRpmLimit, "User-defined RPM hard limit", int, "%d" entry = fuelInjectionCounter, "Fuel: Injection counter", int, "%d" entry = globalSparkCounter, "Ign: Spark counter", int, "%d" @@ -5913,7 +5918,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 @@ -6361,7 +6366,6 @@ indicatorPanel = engine_stateIndicatorPanel, 2 indicator = {lua_luaDisableEtb}, "luaDisableEtb No", "luaDisableEtb Yes" indicator = {lua_luaIgnCut}, "luaIgnCut No", "luaIgnCut Yes" indicator = {startStopPhysicalState}, "startStopPhysicalState No", "startStopPhysicalState Yes" - indicator = {acrStateDup}, "acrStateDup No", "acrStateDup Yes" indicator = {acrEngineMovedRecently}, "acrEngineMovedRecently No", "acrEngineMovedRecently Yes" indicator = {heaterControlEnabled}, "heaterControlEnabled No", "heaterControlEnabled Yes" indicator = {luaDigitalState0}, "luaDigitalState0 No", "luaDigitalState0 Yes" @@ -6397,12 +6401,16 @@ dialog = engine_stateDialog, "engine_state" graphLine = egtValue1 graphLine = egtValue2 liveGraph = engine_state_6_Graph, "Graph", South + graphLine = luaSoftSparkSkip + graphLine = luaHardSparkSkip + graphLine = tractionControlSparkSkip graphLine = desiredRpmLimit + liveGraph = engine_state_7_Graph, "Graph", South graphLine = fuelInjectionCounter graphLine = globalSparkCounter graphLine = fuelingLoad - liveGraph = engine_state_7_Graph, "Graph", South graphLine = ignitionLoad + liveGraph = engine_state_8_Graph, "Graph", South graphLine = veTableYAxis indicatorPanel = tps_accel_stateIndicatorPanel, 2 @@ -7309,6 +7317,10 @@ dialog = lambda_monitorDialog, "lambda_monitor" 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 diff --git a/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini b/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini index 88dd6ff36d..74feb142ee 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini @@ -37,12 +37,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.03.05.hellen121nissan.2098776226" + signature = "rusEFI master.2024.03.05.hellen121nissan.847411354" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.03.05.hellen121nissan.2098776226" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.03.05.hellen121nissan.847411354" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -98,7 +98,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","51 - MAF","INVALID","Aux P68","106 - PPS 1","50 - TPS 1","109 Ignition Key Voltage","INVALID","INVALID","69 - TPS 2","INVALID","Aux P66","Aux P67","73 - CLT","34 - IAT","98 - PPS 2" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue Mar 05 00:52:27 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue Mar 05 01:56:31 UTC 2024 pageSize = 22236 page = 1 @@ -745,6 +745,7 @@ mc33810Gpgd3Mode = bits, U32, 1576, [4:4], "false", "true" enableExtendedCanBroadcast = bits, U32, 1576, [5:5], "false", "true" luaCanRxWorkaround = bits, U32, 1576, [6:6], "false", "true" flexSensorInverted = bits, U32, 1576, [7:7], "false", "true" +useHardSkipInTraction = bits, U32, 1576, [8:8], "false", "true" useAuxSpeedForSlipRatio = bits, U32, 1576, [11:11], "false", "true" useVssAsSecondWheelSpeed = bits, U32, 1576, [12:12], "false", "true" is_enabled_spi_5 = bits, U32, 1576, [13:13], "false", "true" @@ -2468,7 +2469,7 @@ injectorStagingRpmBins = array, U16, 22222, [6], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1456 + ochBlockSize = 1468 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3131,145 +3132,147 @@ smartChipState = scalar, S08, 1102, "", 1, 0 smartChipRestartCounter = scalar, S08, 1103, "", 1, 0 smartChipAliveCounter = scalar, S08, 1104, "", 1, 0 startStopPhysicalState = bits, U32, 1108, [0:0] -acrStateDup = bits, U32, 1108, [1:1] -acrEngineMovedRecently = bits, U32, 1108, [2:2] -heaterControlEnabled = bits, U32, 1108, [3:3] -luaDigitalState0 = bits, U32, 1108, [4:4] -luaDigitalState1 = bits, U32, 1108, [5:5] -luaDigitalState2 = bits, U32, 1108, [6:6] -luaDigitalState3 = bits, U32, 1108, [7:7] +acrEngineMovedRecently = bits, U32, 1108, [1:1] +heaterControlEnabled = bits, U32, 1108, [2:2] +luaDigitalState0 = bits, U32, 1108, [3:3] +luaDigitalState1 = bits, U32, 1108, [4:4] +luaDigitalState2 = bits, U32, 1108, [5:5] +luaDigitalState3 = bits, U32, 1108, [6:6] startStopStateToggleCounter = scalar, U32, 1112, "", 1, 0 egtValue1 = scalar, F32, 1116, "", 1, 0 egtValue2 = scalar, F32, 1120, "", 1, 0 -desiredRpmLimit = scalar, S16, 1124, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1128, "", 1, 0 -globalSparkCounter = scalar, U32, 1132, "", 1, 0 -fuelingLoad = scalar, F32, 1136, "", 1, 0 -ignitionLoad = scalar, F32, 1140, "", 1, 0 -veTableYAxis = scalar, U16, 1144, "%", 0.01, 0 -; total TS size = 1148 -tpsFrom = scalar, F32, 1148 -tpsTo = scalar, F32, 1152 -deltaTps = scalar, F32, 1156 -extraFuel = scalar, F32, 1160, "", 1, 0 -valueFromTable = scalar, F32, 1164, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1168, [0:0] -isBelowDecelThreshold = bits, U32, 1168, [1:1] -isTimeToResetAccumulator = bits, U32, 1168, [2:2] -isFractionalEnrichment = bits, U32, 1168, [3:3] -belowEpsilon = bits, U32, 1168, [4:4] -tooShort = bits, U32, 1168, [5:5] -fractionalInjFuel = scalar, F32, 1172, "", 1, 0 -accumulatedValue = scalar, F32, 1176, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1180, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1184, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1188, "", 1, 0 -cycleCnt = scalar, S32, 1192, "", 1, 0 -; total TS size = 1196 -hwEventCounters1 = scalar, U32, 1196, "", 1, 0 -hwEventCounters2 = scalar, U32, 1200, "", 1, 0 -hwEventCounters3 = scalar, U32, 1204, "", 1, 0 -hwEventCounters4 = scalar, U32, 1208, "", 1, 0 -hwEventCounters5 = scalar, U32, 1212, "", 1, 0 -hwEventCounters6 = scalar, U32, 1216, "", 1, 0 -vvtCamCounter = scalar, U32, 1220, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1224, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1228, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1232, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1233, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1236, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1240, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1244, "", 1, 0 -mapCamPrevToothAngle = scalar, F32, 1248, "deg", 1, 0 -isDecodingMapCam = bits, U32, 1252, [0:0] -; total TS size = 1256 -crankSynchronizationCounter0 = scalar, U32, 1256, "", 1, 0 -vvtSyncGapRatio0 = scalar, F32, 1260, "", 1, 0 -vvtToothDurations00 = scalar, U32, 1264, "us", 1, 0 -vvtCurrentPosition0 = scalar, F32, 1268, "sync: Primary Cam Position", 1, 0 -vvtToothPosition10 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition20 = scalar, F32, 1276, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition30 = scalar, F32, 1280, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition40 = scalar, F32, 1284, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio0 = scalar, F32, 1288, "", 1, 0 -triggerStateIndex0 = scalar, U08, 1292, "", 1, 0 -vvtStateIndex0 = scalar, U08, 1293, "", 1, 0 -; total TS size = 1296 -camResyncCounter = scalar, U08, 1296, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1300, [0:0] -; total TS size = 1304 -wallFuelCorrection = scalar, F32, 1304, "", 1, 0 -wallFuel = scalar, F32, 1308, "", 1, 0 -; total TS size = 1312 -idleState = bits, S32, 1312, [0:2], "not important" -currentIdlePosition = scalar, F32, 1316 -baseIdlePosition = scalar, F32, 1320 -idleClosedLoop = scalar, F32, 1324 -iacByTpsTaper = scalar, F32, 1328 -throttlePedalUpState = scalar, S32, 1332, "", 1, 0 -mightResetPid = bits, U32, 1336, [0:0] -shouldResetPid = bits, U32, 1336, [1:1] -wasResetPid = bits, U32, 1336, [2:2] -mustResetPid = bits, U32, 1336, [3:3] -isCranking = bits, U32, 1336, [4:4] -isIacTableForCoasting = bits, U32, 1336, [5:5] -notIdling = bits, U32, 1336, [6:6] -needReset = bits, U32, 1336, [7:7] -isInDeadZone = bits, U32, 1336, [8:8] -isBlipping = bits, U32, 1336, [9:9] -useClosedLoop = bits, U32, 1336, [10:10] -badTps = bits, U32, 1336, [11:11] -looksLikeRunning = bits, U32, 1336, [12:12] -looksLikeCoasting = bits, U32, 1336, [13:13] -looksLikeCrankToIdle = bits, U32, 1336, [14:14] -isIdleCoasting = bits, U32, 1336, [15:15] -isIdleClosedLoop = bits, U32, 1336, [16:16] -idleTarget = scalar, S32, 1340, "", 1, 0 -targetRpmByClt = scalar, S32, 1344, "", 1, 0 -targetRpmAc = scalar, S32, 1348, "", 1, 0 -iacByRpmTaper = scalar, F32, 1352 -luaAdd = scalar, F32, 1356 -; total TS size = 1360 -idlePosition0 = scalar, F32, 1360, "per", 1,0 -trim0 = scalar, F32, 1364, "", 1, 0 -luaAdjustment0 = scalar, F32, 1368, "per", 1,0 -m_wastegatePosition0 = scalar, F32, 1372, "per", 1,0 -etbFeedForward0 = scalar, F32, 1376 -etbIntegralError0 = scalar, F32, 1380, "", 1, 0 -etbCurrentTarget0 = scalar, F32, 1384, "%", 1, 0 -etbCurrentAdjustedTarget0 = scalar, F32, 1388, "%", 1, 0 -etbRevLimitActive0 = bits, U32, 1392, [0:0] -jamDetected0 = bits, U32, 1392, [1:1] -etbDutyRateOfChange0 = scalar, F32, 1396, "per", 1,0 -etbDutyAverage0 = scalar, F32, 1400, "per", 1,0 -etbTpsErrorCounter0 = scalar, U16, 1404, "count", 1,0 -etbPpsErrorCounter0 = scalar, U16, 1406, "count", 1,0 -etbErrorCode0 = scalar, S08, 1408, "", 1, 0 -tcEtbDrop0 = scalar, S08, 1409, "", 1, 0 -jamTimer0 = scalar, U16, 1410, "sec", 0.01, 0 -; total TS size = 1412 -faultCode0 = scalar, U08, 1412, "", 1, 0 -heaterDuty0 = scalar, U08, 1413, "%", 1, 0 -pumpDuty0 = scalar, U08, 1414, "%", 1, 0 -tempC0 = scalar, U16, 1416, "C", 1, 0 -nernstVoltage0 = scalar, U16, 1418, "V", 0.001, 0 -esr0 = scalar, U16, 1420, "ohm", 1, 0 +luaSoftSparkSkip = scalar, F32, 1124, "", 1, 0 +luaHardSparkSkip = scalar, F32, 1128, "", 1, 0 +tractionControlSparkSkip = scalar, F32, 1132, "", 1, 0 +desiredRpmLimit = scalar, S16, 1136, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 1140, "", 1, 0 +globalSparkCounter = scalar, U32, 1144, "", 1, 0 +fuelingLoad = scalar, F32, 1148, "", 1, 0 +ignitionLoad = scalar, F32, 1152, "", 1, 0 +veTableYAxis = scalar, U16, 1156, "%", 0.01, 0 +; total TS size = 1160 +tpsFrom = scalar, F32, 1160 +tpsTo = scalar, F32, 1164 +deltaTps = scalar, F32, 1168 +extraFuel = scalar, F32, 1172, "", 1, 0 +valueFromTable = scalar, F32, 1176, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1180, [0:0] +isBelowDecelThreshold = bits, U32, 1180, [1:1] +isTimeToResetAccumulator = bits, U32, 1180, [2:2] +isFractionalEnrichment = bits, U32, 1180, [3:3] +belowEpsilon = bits, U32, 1180, [4:4] +tooShort = bits, U32, 1180, [5:5] +fractionalInjFuel = scalar, F32, 1184, "", 1, 0 +accumulatedValue = scalar, F32, 1188, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1192, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1196, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1200, "", 1, 0 +cycleCnt = scalar, S32, 1204, "", 1, 0 +; total TS size = 1208 +hwEventCounters1 = scalar, U32, 1208, "", 1, 0 +hwEventCounters2 = scalar, U32, 1212, "", 1, 0 +hwEventCounters3 = scalar, U32, 1216, "", 1, 0 +hwEventCounters4 = scalar, U32, 1220, "", 1, 0 +hwEventCounters5 = scalar, U32, 1224, "", 1, 0 +hwEventCounters6 = scalar, U32, 1228, "", 1, 0 +vvtCamCounter = scalar, U32, 1232, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1236, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1240, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1244, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1245, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1248, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1252, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1256, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1260, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1264, [0:0] +; total TS size = 1268 +crankSynchronizationCounter0 = scalar, U32, 1268, "", 1, 0 +vvtSyncGapRatio0 = scalar, F32, 1272, "", 1, 0 +vvtToothDurations00 = scalar, U32, 1276, "us", 1, 0 +vvtCurrentPosition0 = scalar, F32, 1280, "sync: Primary Cam Position", 1, 0 +vvtToothPosition10 = scalar, F32, 1284, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition20 = scalar, F32, 1288, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition30 = scalar, F32, 1292, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition40 = scalar, F32, 1296, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio0 = scalar, F32, 1300, "", 1, 0 +triggerStateIndex0 = scalar, U08, 1304, "", 1, 0 +vvtStateIndex0 = scalar, U08, 1305, "", 1, 0 +; total TS size = 1308 +camResyncCounter = scalar, U08, 1308, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1312, [0:0] +; total TS size = 1316 +wallFuelCorrection = scalar, F32, 1316, "", 1, 0 +wallFuel = scalar, F32, 1320, "", 1, 0 +; total TS size = 1324 +idleState = bits, S32, 1324, [0:2], "not important" +currentIdlePosition = scalar, F32, 1328 +baseIdlePosition = scalar, F32, 1332 +idleClosedLoop = scalar, F32, 1336 +iacByTpsTaper = scalar, F32, 1340 +throttlePedalUpState = scalar, S32, 1344, "", 1, 0 +mightResetPid = bits, U32, 1348, [0:0] +shouldResetPid = bits, U32, 1348, [1:1] +wasResetPid = bits, U32, 1348, [2:2] +mustResetPid = bits, U32, 1348, [3:3] +isCranking = bits, U32, 1348, [4:4] +isIacTableForCoasting = bits, U32, 1348, [5:5] +notIdling = bits, U32, 1348, [6:6] +needReset = bits, U32, 1348, [7:7] +isInDeadZone = bits, U32, 1348, [8:8] +isBlipping = bits, U32, 1348, [9:9] +useClosedLoop = bits, U32, 1348, [10:10] +badTps = bits, U32, 1348, [11:11] +looksLikeRunning = bits, U32, 1348, [12:12] +looksLikeCoasting = bits, U32, 1348, [13:13] +looksLikeCrankToIdle = bits, U32, 1348, [14:14] +isIdleCoasting = bits, U32, 1348, [15:15] +isIdleClosedLoop = bits, U32, 1348, [16:16] +idleTarget = scalar, S32, 1352, "", 1, 0 +targetRpmByClt = scalar, S32, 1356, "", 1, 0 +targetRpmAc = scalar, S32, 1360, "", 1, 0 +iacByRpmTaper = scalar, F32, 1364 +luaAdd = scalar, F32, 1368 +; total TS size = 1372 +idlePosition0 = scalar, F32, 1372, "per", 1,0 +trim0 = scalar, F32, 1376, "", 1, 0 +luaAdjustment0 = scalar, F32, 1380, "per", 1,0 +m_wastegatePosition0 = scalar, F32, 1384, "per", 1,0 +etbFeedForward0 = scalar, F32, 1388 +etbIntegralError0 = scalar, F32, 1392, "", 1, 0 +etbCurrentTarget0 = scalar, F32, 1396, "%", 1, 0 +etbCurrentAdjustedTarget0 = scalar, F32, 1400, "%", 1, 0 +etbRevLimitActive0 = bits, U32, 1404, [0:0] +jamDetected0 = bits, U32, 1404, [1:1] +etbDutyRateOfChange0 = scalar, F32, 1408, "per", 1,0 +etbDutyAverage0 = scalar, F32, 1412, "per", 1,0 +etbTpsErrorCounter0 = scalar, U16, 1416, "count", 1,0 +etbPpsErrorCounter0 = scalar, U16, 1418, "count", 1,0 +etbErrorCode0 = scalar, S08, 1420, "", 1, 0 +tcEtbDrop0 = scalar, S08, 1421, "", 1, 0 +jamTimer0 = scalar, U16, 1422, "sec", 0.01, 0 ; total TS size = 1424 -dcOutput0 = scalar, F32, 1424, "per", 1,0 -isEnabled0_int = scalar, U08, 1428, "per", 1,0 -isEnabled0 = bits, U32, 1432, [0:0] +faultCode0 = scalar, U08, 1424, "", 1, 0 +heaterDuty0 = scalar, U08, 1425, "%", 1, 0 +pumpDuty0 = scalar, U08, 1426, "%", 1, 0 +tempC0 = scalar, U16, 1428, "C", 1, 0 +nernstVoltage0 = scalar, U16, 1430, "V", 0.001, 0 +esr0 = scalar, U16, 1432, "ohm", 1, 0 ; total TS size = 1436 -value0 = scalar, U16, 1436, "value", 1,0 -value1 = scalar, U16, 1438, "value", 1,0 -errorRate = scalar, F32, 1440, "ratio", 1,0 -; total TS size = 1444 -vvtTarget = scalar, U16, 1444, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1446, "%", 0.5, 0 +dcOutput0 = scalar, F32, 1436, "per", 1,0 +isEnabled0_int = scalar, U08, 1440, "per", 1,0 +isEnabled0 = bits, U32, 1444, [0:0] ; total TS size = 1448 -lambdaCurrentlyGood = bits, U32, 1448, [0:0] -lambdaMonitorCut = bits, U32, 1448, [1:1] -lambdaTimeSinceGood = scalar, U16, 1452, "sec", 0.01, 0 +value0 = scalar, U16, 1448, "value", 1,0 +value1 = scalar, U16, 1450, "value", 1,0 +errorRate = scalar, F32, 1452, "ratio", 1,0 ; total TS size = 1456 +vvtTarget = scalar, U16, 1456, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1458, "%", 0.5, 0 +; total TS size = 1460 +lambdaCurrentlyGood = bits, U32, 1460, [0:0] +lambdaMonitorCut = bits, U32, 1460, [1:1] +lambdaTimeSinceGood = scalar, U16, 1464, "sec", 0.01, 0 +; total TS size = 1468 time = { timeNow } @@ -5401,7 +5404,6 @@ entry = smartChipState, "smartChipState", int, "%d" entry = smartChipRestartCounter, "smartChipRestartCounter", int, "%d" entry = smartChipAliveCounter, "smartChipAliveCounter", int, "%d" entry = startStopPhysicalState, "startStopPhysicalState", int, "%d" -entry = acrStateDup, "acrStateDup", int, "%d" entry = acrEngineMovedRecently, "acrEngineMovedRecently", int, "%d" entry = heaterControlEnabled, "heaterControlEnabled", int, "%d" entry = luaDigitalState0, "luaDigitalState0", int, "%d" @@ -5411,6 +5413,9 @@ entry = luaDigitalState3, "luaDigitalState3", int, "%d" entry = startStopStateToggleCounter, "startStopStateToggleCounter", int, "%d" entry = egtValue1, "egtValue1", float, "%.3f" entry = egtValue2, "egtValue2", float, "%.3f" +entry = luaSoftSparkSkip, "luaSoftSparkSkip", float, "%.3f" +entry = luaHardSparkSkip, "luaHardSparkSkip", float, "%.3f" +entry = tractionControlSparkSkip, "tractionControlSparkSkip", float, "%.3f" entry = desiredRpmLimit, "User-defined RPM hard limit", int, "%d" entry = fuelInjectionCounter, "Fuel: Injection counter", int, "%d" entry = globalSparkCounter, "Ign: Spark counter", int, "%d" @@ -5911,7 +5916,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 @@ -6359,7 +6364,6 @@ indicatorPanel = engine_stateIndicatorPanel, 2 indicator = {lua_luaDisableEtb}, "luaDisableEtb No", "luaDisableEtb Yes" indicator = {lua_luaIgnCut}, "luaIgnCut No", "luaIgnCut Yes" indicator = {startStopPhysicalState}, "startStopPhysicalState No", "startStopPhysicalState Yes" - indicator = {acrStateDup}, "acrStateDup No", "acrStateDup Yes" indicator = {acrEngineMovedRecently}, "acrEngineMovedRecently No", "acrEngineMovedRecently Yes" indicator = {heaterControlEnabled}, "heaterControlEnabled No", "heaterControlEnabled Yes" indicator = {luaDigitalState0}, "luaDigitalState0 No", "luaDigitalState0 Yes" @@ -6395,12 +6399,16 @@ dialog = engine_stateDialog, "engine_state" graphLine = egtValue1 graphLine = egtValue2 liveGraph = engine_state_6_Graph, "Graph", South + graphLine = luaSoftSparkSkip + graphLine = luaHardSparkSkip + graphLine = tractionControlSparkSkip graphLine = desiredRpmLimit + liveGraph = engine_state_7_Graph, "Graph", South graphLine = fuelInjectionCounter graphLine = globalSparkCounter graphLine = fuelingLoad - liveGraph = engine_state_7_Graph, "Graph", South graphLine = ignitionLoad + liveGraph = engine_state_8_Graph, "Graph", South graphLine = veTableYAxis indicatorPanel = tps_accel_stateIndicatorPanel, 2 @@ -7303,6 +7311,10 @@ dialog = lambda_monitorDialog, "lambda_monitor" 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 diff --git a/firmware/tunerstudio/generated/rusefi_hellen121vag.ini b/firmware/tunerstudio/generated/rusefi_hellen121vag.ini index f28c716abd..d4acc45ee7 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen121vag.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen121vag.ini @@ -37,12 +37,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.03.05.hellen121vag.1624996691" + signature = "rusEFI master.2024.03.05.hellen121vag.792841067" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.03.05.hellen121vag.1624996691" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.03.05.hellen121vag.792841067" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -98,7 +98,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","14 - O2","INVALID","INVALID","34 In PPS1","92 - TPS 1","106 - KNOCK","86 - CAM1","87 - CAM2","84 - TPS2","INVALID","29 In Maf","101 - MAP2","93 - CLT","85 - IAT","35 In PPS2" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue Mar 05 00:52:25 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue Mar 05 01:56:30 UTC 2024 pageSize = 22236 page = 1 @@ -745,6 +745,7 @@ mc33810Gpgd3Mode = bits, U32, 1576, [4:4], "false", "true" enableExtendedCanBroadcast = bits, U32, 1576, [5:5], "false", "true" luaCanRxWorkaround = bits, U32, 1576, [6:6], "false", "true" flexSensorInverted = bits, U32, 1576, [7:7], "false", "true" +useHardSkipInTraction = bits, U32, 1576, [8:8], "false", "true" useAuxSpeedForSlipRatio = bits, U32, 1576, [11:11], "false", "true" useVssAsSecondWheelSpeed = bits, U32, 1576, [12:12], "false", "true" is_enabled_spi_5 = bits, U32, 1576, [13:13], "false", "true" @@ -2468,7 +2469,7 @@ injectorStagingRpmBins = array, U16, 22222, [6], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1456 + ochBlockSize = 1468 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3131,145 +3132,147 @@ smartChipState = scalar, S08, 1102, "", 1, 0 smartChipRestartCounter = scalar, S08, 1103, "", 1, 0 smartChipAliveCounter = scalar, S08, 1104, "", 1, 0 startStopPhysicalState = bits, U32, 1108, [0:0] -acrStateDup = bits, U32, 1108, [1:1] -acrEngineMovedRecently = bits, U32, 1108, [2:2] -heaterControlEnabled = bits, U32, 1108, [3:3] -luaDigitalState0 = bits, U32, 1108, [4:4] -luaDigitalState1 = bits, U32, 1108, [5:5] -luaDigitalState2 = bits, U32, 1108, [6:6] -luaDigitalState3 = bits, U32, 1108, [7:7] +acrEngineMovedRecently = bits, U32, 1108, [1:1] +heaterControlEnabled = bits, U32, 1108, [2:2] +luaDigitalState0 = bits, U32, 1108, [3:3] +luaDigitalState1 = bits, U32, 1108, [4:4] +luaDigitalState2 = bits, U32, 1108, [5:5] +luaDigitalState3 = bits, U32, 1108, [6:6] startStopStateToggleCounter = scalar, U32, 1112, "", 1, 0 egtValue1 = scalar, F32, 1116, "", 1, 0 egtValue2 = scalar, F32, 1120, "", 1, 0 -desiredRpmLimit = scalar, S16, 1124, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1128, "", 1, 0 -globalSparkCounter = scalar, U32, 1132, "", 1, 0 -fuelingLoad = scalar, F32, 1136, "", 1, 0 -ignitionLoad = scalar, F32, 1140, "", 1, 0 -veTableYAxis = scalar, U16, 1144, "%", 0.01, 0 -; total TS size = 1148 -tpsFrom = scalar, F32, 1148 -tpsTo = scalar, F32, 1152 -deltaTps = scalar, F32, 1156 -extraFuel = scalar, F32, 1160, "", 1, 0 -valueFromTable = scalar, F32, 1164, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1168, [0:0] -isBelowDecelThreshold = bits, U32, 1168, [1:1] -isTimeToResetAccumulator = bits, U32, 1168, [2:2] -isFractionalEnrichment = bits, U32, 1168, [3:3] -belowEpsilon = bits, U32, 1168, [4:4] -tooShort = bits, U32, 1168, [5:5] -fractionalInjFuel = scalar, F32, 1172, "", 1, 0 -accumulatedValue = scalar, F32, 1176, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1180, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1184, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1188, "", 1, 0 -cycleCnt = scalar, S32, 1192, "", 1, 0 -; total TS size = 1196 -hwEventCounters1 = scalar, U32, 1196, "", 1, 0 -hwEventCounters2 = scalar, U32, 1200, "", 1, 0 -hwEventCounters3 = scalar, U32, 1204, "", 1, 0 -hwEventCounters4 = scalar, U32, 1208, "", 1, 0 -hwEventCounters5 = scalar, U32, 1212, "", 1, 0 -hwEventCounters6 = scalar, U32, 1216, "", 1, 0 -vvtCamCounter = scalar, U32, 1220, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1224, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1228, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1232, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1233, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1236, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1240, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1244, "", 1, 0 -mapCamPrevToothAngle = scalar, F32, 1248, "deg", 1, 0 -isDecodingMapCam = bits, U32, 1252, [0:0] -; total TS size = 1256 -crankSynchronizationCounter0 = scalar, U32, 1256, "", 1, 0 -vvtSyncGapRatio0 = scalar, F32, 1260, "", 1, 0 -vvtToothDurations00 = scalar, U32, 1264, "us", 1, 0 -vvtCurrentPosition0 = scalar, F32, 1268, "sync: Primary Cam Position", 1, 0 -vvtToothPosition10 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition20 = scalar, F32, 1276, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition30 = scalar, F32, 1280, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition40 = scalar, F32, 1284, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio0 = scalar, F32, 1288, "", 1, 0 -triggerStateIndex0 = scalar, U08, 1292, "", 1, 0 -vvtStateIndex0 = scalar, U08, 1293, "", 1, 0 -; total TS size = 1296 -camResyncCounter = scalar, U08, 1296, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1300, [0:0] -; total TS size = 1304 -wallFuelCorrection = scalar, F32, 1304, "", 1, 0 -wallFuel = scalar, F32, 1308, "", 1, 0 -; total TS size = 1312 -idleState = bits, S32, 1312, [0:2], "not important" -currentIdlePosition = scalar, F32, 1316 -baseIdlePosition = scalar, F32, 1320 -idleClosedLoop = scalar, F32, 1324 -iacByTpsTaper = scalar, F32, 1328 -throttlePedalUpState = scalar, S32, 1332, "", 1, 0 -mightResetPid = bits, U32, 1336, [0:0] -shouldResetPid = bits, U32, 1336, [1:1] -wasResetPid = bits, U32, 1336, [2:2] -mustResetPid = bits, U32, 1336, [3:3] -isCranking = bits, U32, 1336, [4:4] -isIacTableForCoasting = bits, U32, 1336, [5:5] -notIdling = bits, U32, 1336, [6:6] -needReset = bits, U32, 1336, [7:7] -isInDeadZone = bits, U32, 1336, [8:8] -isBlipping = bits, U32, 1336, [9:9] -useClosedLoop = bits, U32, 1336, [10:10] -badTps = bits, U32, 1336, [11:11] -looksLikeRunning = bits, U32, 1336, [12:12] -looksLikeCoasting = bits, U32, 1336, [13:13] -looksLikeCrankToIdle = bits, U32, 1336, [14:14] -isIdleCoasting = bits, U32, 1336, [15:15] -isIdleClosedLoop = bits, U32, 1336, [16:16] -idleTarget = scalar, S32, 1340, "", 1, 0 -targetRpmByClt = scalar, S32, 1344, "", 1, 0 -targetRpmAc = scalar, S32, 1348, "", 1, 0 -iacByRpmTaper = scalar, F32, 1352 -luaAdd = scalar, F32, 1356 -; total TS size = 1360 -idlePosition0 = scalar, F32, 1360, "per", 1,0 -trim0 = scalar, F32, 1364, "", 1, 0 -luaAdjustment0 = scalar, F32, 1368, "per", 1,0 -m_wastegatePosition0 = scalar, F32, 1372, "per", 1,0 -etbFeedForward0 = scalar, F32, 1376 -etbIntegralError0 = scalar, F32, 1380, "", 1, 0 -etbCurrentTarget0 = scalar, F32, 1384, "%", 1, 0 -etbCurrentAdjustedTarget0 = scalar, F32, 1388, "%", 1, 0 -etbRevLimitActive0 = bits, U32, 1392, [0:0] -jamDetected0 = bits, U32, 1392, [1:1] -etbDutyRateOfChange0 = scalar, F32, 1396, "per", 1,0 -etbDutyAverage0 = scalar, F32, 1400, "per", 1,0 -etbTpsErrorCounter0 = scalar, U16, 1404, "count", 1,0 -etbPpsErrorCounter0 = scalar, U16, 1406, "count", 1,0 -etbErrorCode0 = scalar, S08, 1408, "", 1, 0 -tcEtbDrop0 = scalar, S08, 1409, "", 1, 0 -jamTimer0 = scalar, U16, 1410, "sec", 0.01, 0 -; total TS size = 1412 -faultCode0 = scalar, U08, 1412, "", 1, 0 -heaterDuty0 = scalar, U08, 1413, "%", 1, 0 -pumpDuty0 = scalar, U08, 1414, "%", 1, 0 -tempC0 = scalar, U16, 1416, "C", 1, 0 -nernstVoltage0 = scalar, U16, 1418, "V", 0.001, 0 -esr0 = scalar, U16, 1420, "ohm", 1, 0 +luaSoftSparkSkip = scalar, F32, 1124, "", 1, 0 +luaHardSparkSkip = scalar, F32, 1128, "", 1, 0 +tractionControlSparkSkip = scalar, F32, 1132, "", 1, 0 +desiredRpmLimit = scalar, S16, 1136, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 1140, "", 1, 0 +globalSparkCounter = scalar, U32, 1144, "", 1, 0 +fuelingLoad = scalar, F32, 1148, "", 1, 0 +ignitionLoad = scalar, F32, 1152, "", 1, 0 +veTableYAxis = scalar, U16, 1156, "%", 0.01, 0 +; total TS size = 1160 +tpsFrom = scalar, F32, 1160 +tpsTo = scalar, F32, 1164 +deltaTps = scalar, F32, 1168 +extraFuel = scalar, F32, 1172, "", 1, 0 +valueFromTable = scalar, F32, 1176, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1180, [0:0] +isBelowDecelThreshold = bits, U32, 1180, [1:1] +isTimeToResetAccumulator = bits, U32, 1180, [2:2] +isFractionalEnrichment = bits, U32, 1180, [3:3] +belowEpsilon = bits, U32, 1180, [4:4] +tooShort = bits, U32, 1180, [5:5] +fractionalInjFuel = scalar, F32, 1184, "", 1, 0 +accumulatedValue = scalar, F32, 1188, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1192, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1196, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1200, "", 1, 0 +cycleCnt = scalar, S32, 1204, "", 1, 0 +; total TS size = 1208 +hwEventCounters1 = scalar, U32, 1208, "", 1, 0 +hwEventCounters2 = scalar, U32, 1212, "", 1, 0 +hwEventCounters3 = scalar, U32, 1216, "", 1, 0 +hwEventCounters4 = scalar, U32, 1220, "", 1, 0 +hwEventCounters5 = scalar, U32, 1224, "", 1, 0 +hwEventCounters6 = scalar, U32, 1228, "", 1, 0 +vvtCamCounter = scalar, U32, 1232, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1236, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1240, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1244, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1245, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1248, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1252, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1256, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1260, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1264, [0:0] +; total TS size = 1268 +crankSynchronizationCounter0 = scalar, U32, 1268, "", 1, 0 +vvtSyncGapRatio0 = scalar, F32, 1272, "", 1, 0 +vvtToothDurations00 = scalar, U32, 1276, "us", 1, 0 +vvtCurrentPosition0 = scalar, F32, 1280, "sync: Primary Cam Position", 1, 0 +vvtToothPosition10 = scalar, F32, 1284, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition20 = scalar, F32, 1288, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition30 = scalar, F32, 1292, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition40 = scalar, F32, 1296, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio0 = scalar, F32, 1300, "", 1, 0 +triggerStateIndex0 = scalar, U08, 1304, "", 1, 0 +vvtStateIndex0 = scalar, U08, 1305, "", 1, 0 +; total TS size = 1308 +camResyncCounter = scalar, U08, 1308, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1312, [0:0] +; total TS size = 1316 +wallFuelCorrection = scalar, F32, 1316, "", 1, 0 +wallFuel = scalar, F32, 1320, "", 1, 0 +; total TS size = 1324 +idleState = bits, S32, 1324, [0:2], "not important" +currentIdlePosition = scalar, F32, 1328 +baseIdlePosition = scalar, F32, 1332 +idleClosedLoop = scalar, F32, 1336 +iacByTpsTaper = scalar, F32, 1340 +throttlePedalUpState = scalar, S32, 1344, "", 1, 0 +mightResetPid = bits, U32, 1348, [0:0] +shouldResetPid = bits, U32, 1348, [1:1] +wasResetPid = bits, U32, 1348, [2:2] +mustResetPid = bits, U32, 1348, [3:3] +isCranking = bits, U32, 1348, [4:4] +isIacTableForCoasting = bits, U32, 1348, [5:5] +notIdling = bits, U32, 1348, [6:6] +needReset = bits, U32, 1348, [7:7] +isInDeadZone = bits, U32, 1348, [8:8] +isBlipping = bits, U32, 1348, [9:9] +useClosedLoop = bits, U32, 1348, [10:10] +badTps = bits, U32, 1348, [11:11] +looksLikeRunning = bits, U32, 1348, [12:12] +looksLikeCoasting = bits, U32, 1348, [13:13] +looksLikeCrankToIdle = bits, U32, 1348, [14:14] +isIdleCoasting = bits, U32, 1348, [15:15] +isIdleClosedLoop = bits, U32, 1348, [16:16] +idleTarget = scalar, S32, 1352, "", 1, 0 +targetRpmByClt = scalar, S32, 1356, "", 1, 0 +targetRpmAc = scalar, S32, 1360, "", 1, 0 +iacByRpmTaper = scalar, F32, 1364 +luaAdd = scalar, F32, 1368 +; total TS size = 1372 +idlePosition0 = scalar, F32, 1372, "per", 1,0 +trim0 = scalar, F32, 1376, "", 1, 0 +luaAdjustment0 = scalar, F32, 1380, "per", 1,0 +m_wastegatePosition0 = scalar, F32, 1384, "per", 1,0 +etbFeedForward0 = scalar, F32, 1388 +etbIntegralError0 = scalar, F32, 1392, "", 1, 0 +etbCurrentTarget0 = scalar, F32, 1396, "%", 1, 0 +etbCurrentAdjustedTarget0 = scalar, F32, 1400, "%", 1, 0 +etbRevLimitActive0 = bits, U32, 1404, [0:0] +jamDetected0 = bits, U32, 1404, [1:1] +etbDutyRateOfChange0 = scalar, F32, 1408, "per", 1,0 +etbDutyAverage0 = scalar, F32, 1412, "per", 1,0 +etbTpsErrorCounter0 = scalar, U16, 1416, "count", 1,0 +etbPpsErrorCounter0 = scalar, U16, 1418, "count", 1,0 +etbErrorCode0 = scalar, S08, 1420, "", 1, 0 +tcEtbDrop0 = scalar, S08, 1421, "", 1, 0 +jamTimer0 = scalar, U16, 1422, "sec", 0.01, 0 ; total TS size = 1424 -dcOutput0 = scalar, F32, 1424, "per", 1,0 -isEnabled0_int = scalar, U08, 1428, "per", 1,0 -isEnabled0 = bits, U32, 1432, [0:0] +faultCode0 = scalar, U08, 1424, "", 1, 0 +heaterDuty0 = scalar, U08, 1425, "%", 1, 0 +pumpDuty0 = scalar, U08, 1426, "%", 1, 0 +tempC0 = scalar, U16, 1428, "C", 1, 0 +nernstVoltage0 = scalar, U16, 1430, "V", 0.001, 0 +esr0 = scalar, U16, 1432, "ohm", 1, 0 ; total TS size = 1436 -value0 = scalar, U16, 1436, "value", 1,0 -value1 = scalar, U16, 1438, "value", 1,0 -errorRate = scalar, F32, 1440, "ratio", 1,0 -; total TS size = 1444 -vvtTarget = scalar, U16, 1444, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1446, "%", 0.5, 0 +dcOutput0 = scalar, F32, 1436, "per", 1,0 +isEnabled0_int = scalar, U08, 1440, "per", 1,0 +isEnabled0 = bits, U32, 1444, [0:0] ; total TS size = 1448 -lambdaCurrentlyGood = bits, U32, 1448, [0:0] -lambdaMonitorCut = bits, U32, 1448, [1:1] -lambdaTimeSinceGood = scalar, U16, 1452, "sec", 0.01, 0 +value0 = scalar, U16, 1448, "value", 1,0 +value1 = scalar, U16, 1450, "value", 1,0 +errorRate = scalar, F32, 1452, "ratio", 1,0 ; total TS size = 1456 +vvtTarget = scalar, U16, 1456, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1458, "%", 0.5, 0 +; total TS size = 1460 +lambdaCurrentlyGood = bits, U32, 1460, [0:0] +lambdaMonitorCut = bits, U32, 1460, [1:1] +lambdaTimeSinceGood = scalar, U16, 1464, "sec", 0.01, 0 +; total TS size = 1468 time = { timeNow } @@ -5401,7 +5404,6 @@ entry = smartChipState, "smartChipState", int, "%d" entry = smartChipRestartCounter, "smartChipRestartCounter", int, "%d" entry = smartChipAliveCounter, "smartChipAliveCounter", int, "%d" entry = startStopPhysicalState, "startStopPhysicalState", int, "%d" -entry = acrStateDup, "acrStateDup", int, "%d" entry = acrEngineMovedRecently, "acrEngineMovedRecently", int, "%d" entry = heaterControlEnabled, "heaterControlEnabled", int, "%d" entry = luaDigitalState0, "luaDigitalState0", int, "%d" @@ -5411,6 +5413,9 @@ entry = luaDigitalState3, "luaDigitalState3", int, "%d" entry = startStopStateToggleCounter, "startStopStateToggleCounter", int, "%d" entry = egtValue1, "egtValue1", float, "%.3f" entry = egtValue2, "egtValue2", float, "%.3f" +entry = luaSoftSparkSkip, "luaSoftSparkSkip", float, "%.3f" +entry = luaHardSparkSkip, "luaHardSparkSkip", float, "%.3f" +entry = tractionControlSparkSkip, "tractionControlSparkSkip", float, "%.3f" entry = desiredRpmLimit, "User-defined RPM hard limit", int, "%d" entry = fuelInjectionCounter, "Fuel: Injection counter", int, "%d" entry = globalSparkCounter, "Ign: Spark counter", int, "%d" @@ -5913,7 +5918,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 @@ -6361,7 +6366,6 @@ indicatorPanel = engine_stateIndicatorPanel, 2 indicator = {lua_luaDisableEtb}, "luaDisableEtb No", "luaDisableEtb Yes" indicator = {lua_luaIgnCut}, "luaIgnCut No", "luaIgnCut Yes" indicator = {startStopPhysicalState}, "startStopPhysicalState No", "startStopPhysicalState Yes" - indicator = {acrStateDup}, "acrStateDup No", "acrStateDup Yes" indicator = {acrEngineMovedRecently}, "acrEngineMovedRecently No", "acrEngineMovedRecently Yes" indicator = {heaterControlEnabled}, "heaterControlEnabled No", "heaterControlEnabled Yes" indicator = {luaDigitalState0}, "luaDigitalState0 No", "luaDigitalState0 Yes" @@ -6397,12 +6401,16 @@ dialog = engine_stateDialog, "engine_state" graphLine = egtValue1 graphLine = egtValue2 liveGraph = engine_state_6_Graph, "Graph", South + graphLine = luaSoftSparkSkip + graphLine = luaHardSparkSkip + graphLine = tractionControlSparkSkip graphLine = desiredRpmLimit + liveGraph = engine_state_7_Graph, "Graph", South graphLine = fuelInjectionCounter graphLine = globalSparkCounter graphLine = fuelingLoad - liveGraph = engine_state_7_Graph, "Graph", South graphLine = ignitionLoad + liveGraph = engine_state_8_Graph, "Graph", South graphLine = veTableYAxis indicatorPanel = tps_accel_stateIndicatorPanel, 2 @@ -7309,6 +7317,10 @@ dialog = lambda_monitorDialog, "lambda_monitor" 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 diff --git a/firmware/tunerstudio/generated/rusefi_hellen128.ini b/firmware/tunerstudio/generated/rusefi_hellen128.ini index 5554ce6774..6df3178280 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen128.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen128.ini @@ -37,12 +37,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.03.05.hellen128.3174059074" + signature = "rusEFI master.2024.03.05.hellen128.4071292026" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.03.05.hellen128.3174059074" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.03.05.hellen128.4071292026" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -98,7 +98,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","P36_IN_O2S","P32_IN_O2S2","P40_IN_MAP3","C24 - PPS1","E31 - TPS1","Battery Sense","E40 - IN_CAM","P30_IN_AUX4","E34 - TPS2","E37 - Crank Input","E47 - MAF","E23 - MAP","E29 - Coolant Temp","E45 - IAT","C25 - PPS2","P41_IN_AUX3" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue Mar 05 00:52:24 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue Mar 05 01:56:28 UTC 2024 pageSize = 22236 page = 1 @@ -745,6 +745,7 @@ mc33810Gpgd3Mode = bits, U32, 1576, [4:4], "false", "true" enableExtendedCanBroadcast = bits, U32, 1576, [5:5], "false", "true" luaCanRxWorkaround = bits, U32, 1576, [6:6], "false", "true" flexSensorInverted = bits, U32, 1576, [7:7], "false", "true" +useHardSkipInTraction = bits, U32, 1576, [8:8], "false", "true" useAuxSpeedForSlipRatio = bits, U32, 1576, [11:11], "false", "true" useVssAsSecondWheelSpeed = bits, U32, 1576, [12:12], "false", "true" is_enabled_spi_5 = bits, U32, 1576, [13:13], "false", "true" @@ -2468,7 +2469,7 @@ injectorStagingRpmBins = array, U16, 22222, [6], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1456 + ochBlockSize = 1468 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3131,145 +3132,147 @@ smartChipState = scalar, S08, 1102, "", 1, 0 smartChipRestartCounter = scalar, S08, 1103, "", 1, 0 smartChipAliveCounter = scalar, S08, 1104, "", 1, 0 startStopPhysicalState = bits, U32, 1108, [0:0] -acrStateDup = bits, U32, 1108, [1:1] -acrEngineMovedRecently = bits, U32, 1108, [2:2] -heaterControlEnabled = bits, U32, 1108, [3:3] -luaDigitalState0 = bits, U32, 1108, [4:4] -luaDigitalState1 = bits, U32, 1108, [5:5] -luaDigitalState2 = bits, U32, 1108, [6:6] -luaDigitalState3 = bits, U32, 1108, [7:7] +acrEngineMovedRecently = bits, U32, 1108, [1:1] +heaterControlEnabled = bits, U32, 1108, [2:2] +luaDigitalState0 = bits, U32, 1108, [3:3] +luaDigitalState1 = bits, U32, 1108, [4:4] +luaDigitalState2 = bits, U32, 1108, [5:5] +luaDigitalState3 = bits, U32, 1108, [6:6] startStopStateToggleCounter = scalar, U32, 1112, "", 1, 0 egtValue1 = scalar, F32, 1116, "", 1, 0 egtValue2 = scalar, F32, 1120, "", 1, 0 -desiredRpmLimit = scalar, S16, 1124, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1128, "", 1, 0 -globalSparkCounter = scalar, U32, 1132, "", 1, 0 -fuelingLoad = scalar, F32, 1136, "", 1, 0 -ignitionLoad = scalar, F32, 1140, "", 1, 0 -veTableYAxis = scalar, U16, 1144, "%", 0.01, 0 -; total TS size = 1148 -tpsFrom = scalar, F32, 1148 -tpsTo = scalar, F32, 1152 -deltaTps = scalar, F32, 1156 -extraFuel = scalar, F32, 1160, "", 1, 0 -valueFromTable = scalar, F32, 1164, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1168, [0:0] -isBelowDecelThreshold = bits, U32, 1168, [1:1] -isTimeToResetAccumulator = bits, U32, 1168, [2:2] -isFractionalEnrichment = bits, U32, 1168, [3:3] -belowEpsilon = bits, U32, 1168, [4:4] -tooShort = bits, U32, 1168, [5:5] -fractionalInjFuel = scalar, F32, 1172, "", 1, 0 -accumulatedValue = scalar, F32, 1176, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1180, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1184, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1188, "", 1, 0 -cycleCnt = scalar, S32, 1192, "", 1, 0 -; total TS size = 1196 -hwEventCounters1 = scalar, U32, 1196, "", 1, 0 -hwEventCounters2 = scalar, U32, 1200, "", 1, 0 -hwEventCounters3 = scalar, U32, 1204, "", 1, 0 -hwEventCounters4 = scalar, U32, 1208, "", 1, 0 -hwEventCounters5 = scalar, U32, 1212, "", 1, 0 -hwEventCounters6 = scalar, U32, 1216, "", 1, 0 -vvtCamCounter = scalar, U32, 1220, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1224, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1228, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1232, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1233, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1236, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1240, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1244, "", 1, 0 -mapCamPrevToothAngle = scalar, F32, 1248, "deg", 1, 0 -isDecodingMapCam = bits, U32, 1252, [0:0] -; total TS size = 1256 -crankSynchronizationCounter0 = scalar, U32, 1256, "", 1, 0 -vvtSyncGapRatio0 = scalar, F32, 1260, "", 1, 0 -vvtToothDurations00 = scalar, U32, 1264, "us", 1, 0 -vvtCurrentPosition0 = scalar, F32, 1268, "sync: Primary Cam Position", 1, 0 -vvtToothPosition10 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition20 = scalar, F32, 1276, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition30 = scalar, F32, 1280, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition40 = scalar, F32, 1284, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio0 = scalar, F32, 1288, "", 1, 0 -triggerStateIndex0 = scalar, U08, 1292, "", 1, 0 -vvtStateIndex0 = scalar, U08, 1293, "", 1, 0 -; total TS size = 1296 -camResyncCounter = scalar, U08, 1296, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1300, [0:0] -; total TS size = 1304 -wallFuelCorrection = scalar, F32, 1304, "", 1, 0 -wallFuel = scalar, F32, 1308, "", 1, 0 -; total TS size = 1312 -idleState = bits, S32, 1312, [0:2], "not important" -currentIdlePosition = scalar, F32, 1316 -baseIdlePosition = scalar, F32, 1320 -idleClosedLoop = scalar, F32, 1324 -iacByTpsTaper = scalar, F32, 1328 -throttlePedalUpState = scalar, S32, 1332, "", 1, 0 -mightResetPid = bits, U32, 1336, [0:0] -shouldResetPid = bits, U32, 1336, [1:1] -wasResetPid = bits, U32, 1336, [2:2] -mustResetPid = bits, U32, 1336, [3:3] -isCranking = bits, U32, 1336, [4:4] -isIacTableForCoasting = bits, U32, 1336, [5:5] -notIdling = bits, U32, 1336, [6:6] -needReset = bits, U32, 1336, [7:7] -isInDeadZone = bits, U32, 1336, [8:8] -isBlipping = bits, U32, 1336, [9:9] -useClosedLoop = bits, U32, 1336, [10:10] -badTps = bits, U32, 1336, [11:11] -looksLikeRunning = bits, U32, 1336, [12:12] -looksLikeCoasting = bits, U32, 1336, [13:13] -looksLikeCrankToIdle = bits, U32, 1336, [14:14] -isIdleCoasting = bits, U32, 1336, [15:15] -isIdleClosedLoop = bits, U32, 1336, [16:16] -idleTarget = scalar, S32, 1340, "", 1, 0 -targetRpmByClt = scalar, S32, 1344, "", 1, 0 -targetRpmAc = scalar, S32, 1348, "", 1, 0 -iacByRpmTaper = scalar, F32, 1352 -luaAdd = scalar, F32, 1356 -; total TS size = 1360 -idlePosition0 = scalar, F32, 1360, "per", 1,0 -trim0 = scalar, F32, 1364, "", 1, 0 -luaAdjustment0 = scalar, F32, 1368, "per", 1,0 -m_wastegatePosition0 = scalar, F32, 1372, "per", 1,0 -etbFeedForward0 = scalar, F32, 1376 -etbIntegralError0 = scalar, F32, 1380, "", 1, 0 -etbCurrentTarget0 = scalar, F32, 1384, "%", 1, 0 -etbCurrentAdjustedTarget0 = scalar, F32, 1388, "%", 1, 0 -etbRevLimitActive0 = bits, U32, 1392, [0:0] -jamDetected0 = bits, U32, 1392, [1:1] -etbDutyRateOfChange0 = scalar, F32, 1396, "per", 1,0 -etbDutyAverage0 = scalar, F32, 1400, "per", 1,0 -etbTpsErrorCounter0 = scalar, U16, 1404, "count", 1,0 -etbPpsErrorCounter0 = scalar, U16, 1406, "count", 1,0 -etbErrorCode0 = scalar, S08, 1408, "", 1, 0 -tcEtbDrop0 = scalar, S08, 1409, "", 1, 0 -jamTimer0 = scalar, U16, 1410, "sec", 0.01, 0 -; total TS size = 1412 -faultCode0 = scalar, U08, 1412, "", 1, 0 -heaterDuty0 = scalar, U08, 1413, "%", 1, 0 -pumpDuty0 = scalar, U08, 1414, "%", 1, 0 -tempC0 = scalar, U16, 1416, "C", 1, 0 -nernstVoltage0 = scalar, U16, 1418, "V", 0.001, 0 -esr0 = scalar, U16, 1420, "ohm", 1, 0 +luaSoftSparkSkip = scalar, F32, 1124, "", 1, 0 +luaHardSparkSkip = scalar, F32, 1128, "", 1, 0 +tractionControlSparkSkip = scalar, F32, 1132, "", 1, 0 +desiredRpmLimit = scalar, S16, 1136, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 1140, "", 1, 0 +globalSparkCounter = scalar, U32, 1144, "", 1, 0 +fuelingLoad = scalar, F32, 1148, "", 1, 0 +ignitionLoad = scalar, F32, 1152, "", 1, 0 +veTableYAxis = scalar, U16, 1156, "%", 0.01, 0 +; total TS size = 1160 +tpsFrom = scalar, F32, 1160 +tpsTo = scalar, F32, 1164 +deltaTps = scalar, F32, 1168 +extraFuel = scalar, F32, 1172, "", 1, 0 +valueFromTable = scalar, F32, 1176, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1180, [0:0] +isBelowDecelThreshold = bits, U32, 1180, [1:1] +isTimeToResetAccumulator = bits, U32, 1180, [2:2] +isFractionalEnrichment = bits, U32, 1180, [3:3] +belowEpsilon = bits, U32, 1180, [4:4] +tooShort = bits, U32, 1180, [5:5] +fractionalInjFuel = scalar, F32, 1184, "", 1, 0 +accumulatedValue = scalar, F32, 1188, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1192, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1196, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1200, "", 1, 0 +cycleCnt = scalar, S32, 1204, "", 1, 0 +; total TS size = 1208 +hwEventCounters1 = scalar, U32, 1208, "", 1, 0 +hwEventCounters2 = scalar, U32, 1212, "", 1, 0 +hwEventCounters3 = scalar, U32, 1216, "", 1, 0 +hwEventCounters4 = scalar, U32, 1220, "", 1, 0 +hwEventCounters5 = scalar, U32, 1224, "", 1, 0 +hwEventCounters6 = scalar, U32, 1228, "", 1, 0 +vvtCamCounter = scalar, U32, 1232, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1236, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1240, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1244, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1245, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1248, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1252, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1256, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1260, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1264, [0:0] +; total TS size = 1268 +crankSynchronizationCounter0 = scalar, U32, 1268, "", 1, 0 +vvtSyncGapRatio0 = scalar, F32, 1272, "", 1, 0 +vvtToothDurations00 = scalar, U32, 1276, "us", 1, 0 +vvtCurrentPosition0 = scalar, F32, 1280, "sync: Primary Cam Position", 1, 0 +vvtToothPosition10 = scalar, F32, 1284, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition20 = scalar, F32, 1288, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition30 = scalar, F32, 1292, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition40 = scalar, F32, 1296, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio0 = scalar, F32, 1300, "", 1, 0 +triggerStateIndex0 = scalar, U08, 1304, "", 1, 0 +vvtStateIndex0 = scalar, U08, 1305, "", 1, 0 +; total TS size = 1308 +camResyncCounter = scalar, U08, 1308, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1312, [0:0] +; total TS size = 1316 +wallFuelCorrection = scalar, F32, 1316, "", 1, 0 +wallFuel = scalar, F32, 1320, "", 1, 0 +; total TS size = 1324 +idleState = bits, S32, 1324, [0:2], "not important" +currentIdlePosition = scalar, F32, 1328 +baseIdlePosition = scalar, F32, 1332 +idleClosedLoop = scalar, F32, 1336 +iacByTpsTaper = scalar, F32, 1340 +throttlePedalUpState = scalar, S32, 1344, "", 1, 0 +mightResetPid = bits, U32, 1348, [0:0] +shouldResetPid = bits, U32, 1348, [1:1] +wasResetPid = bits, U32, 1348, [2:2] +mustResetPid = bits, U32, 1348, [3:3] +isCranking = bits, U32, 1348, [4:4] +isIacTableForCoasting = bits, U32, 1348, [5:5] +notIdling = bits, U32, 1348, [6:6] +needReset = bits, U32, 1348, [7:7] +isInDeadZone = bits, U32, 1348, [8:8] +isBlipping = bits, U32, 1348, [9:9] +useClosedLoop = bits, U32, 1348, [10:10] +badTps = bits, U32, 1348, [11:11] +looksLikeRunning = bits, U32, 1348, [12:12] +looksLikeCoasting = bits, U32, 1348, [13:13] +looksLikeCrankToIdle = bits, U32, 1348, [14:14] +isIdleCoasting = bits, U32, 1348, [15:15] +isIdleClosedLoop = bits, U32, 1348, [16:16] +idleTarget = scalar, S32, 1352, "", 1, 0 +targetRpmByClt = scalar, S32, 1356, "", 1, 0 +targetRpmAc = scalar, S32, 1360, "", 1, 0 +iacByRpmTaper = scalar, F32, 1364 +luaAdd = scalar, F32, 1368 +; total TS size = 1372 +idlePosition0 = scalar, F32, 1372, "per", 1,0 +trim0 = scalar, F32, 1376, "", 1, 0 +luaAdjustment0 = scalar, F32, 1380, "per", 1,0 +m_wastegatePosition0 = scalar, F32, 1384, "per", 1,0 +etbFeedForward0 = scalar, F32, 1388 +etbIntegralError0 = scalar, F32, 1392, "", 1, 0 +etbCurrentTarget0 = scalar, F32, 1396, "%", 1, 0 +etbCurrentAdjustedTarget0 = scalar, F32, 1400, "%", 1, 0 +etbRevLimitActive0 = bits, U32, 1404, [0:0] +jamDetected0 = bits, U32, 1404, [1:1] +etbDutyRateOfChange0 = scalar, F32, 1408, "per", 1,0 +etbDutyAverage0 = scalar, F32, 1412, "per", 1,0 +etbTpsErrorCounter0 = scalar, U16, 1416, "count", 1,0 +etbPpsErrorCounter0 = scalar, U16, 1418, "count", 1,0 +etbErrorCode0 = scalar, S08, 1420, "", 1, 0 +tcEtbDrop0 = scalar, S08, 1421, "", 1, 0 +jamTimer0 = scalar, U16, 1422, "sec", 0.01, 0 ; total TS size = 1424 -dcOutput0 = scalar, F32, 1424, "per", 1,0 -isEnabled0_int = scalar, U08, 1428, "per", 1,0 -isEnabled0 = bits, U32, 1432, [0:0] +faultCode0 = scalar, U08, 1424, "", 1, 0 +heaterDuty0 = scalar, U08, 1425, "%", 1, 0 +pumpDuty0 = scalar, U08, 1426, "%", 1, 0 +tempC0 = scalar, U16, 1428, "C", 1, 0 +nernstVoltage0 = scalar, U16, 1430, "V", 0.001, 0 +esr0 = scalar, U16, 1432, "ohm", 1, 0 ; total TS size = 1436 -value0 = scalar, U16, 1436, "value", 1,0 -value1 = scalar, U16, 1438, "value", 1,0 -errorRate = scalar, F32, 1440, "ratio", 1,0 -; total TS size = 1444 -vvtTarget = scalar, U16, 1444, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1446, "%", 0.5, 0 +dcOutput0 = scalar, F32, 1436, "per", 1,0 +isEnabled0_int = scalar, U08, 1440, "per", 1,0 +isEnabled0 = bits, U32, 1444, [0:0] ; total TS size = 1448 -lambdaCurrentlyGood = bits, U32, 1448, [0:0] -lambdaMonitorCut = bits, U32, 1448, [1:1] -lambdaTimeSinceGood = scalar, U16, 1452, "sec", 0.01, 0 +value0 = scalar, U16, 1448, "value", 1,0 +value1 = scalar, U16, 1450, "value", 1,0 +errorRate = scalar, F32, 1452, "ratio", 1,0 ; total TS size = 1456 +vvtTarget = scalar, U16, 1456, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1458, "%", 0.5, 0 +; total TS size = 1460 +lambdaCurrentlyGood = bits, U32, 1460, [0:0] +lambdaMonitorCut = bits, U32, 1460, [1:1] +lambdaTimeSinceGood = scalar, U16, 1464, "sec", 0.01, 0 +; total TS size = 1468 time = { timeNow } @@ -5401,7 +5404,6 @@ entry = smartChipState, "smartChipState", int, "%d" entry = smartChipRestartCounter, "smartChipRestartCounter", int, "%d" entry = smartChipAliveCounter, "smartChipAliveCounter", int, "%d" entry = startStopPhysicalState, "startStopPhysicalState", int, "%d" -entry = acrStateDup, "acrStateDup", int, "%d" entry = acrEngineMovedRecently, "acrEngineMovedRecently", int, "%d" entry = heaterControlEnabled, "heaterControlEnabled", int, "%d" entry = luaDigitalState0, "luaDigitalState0", int, "%d" @@ -5411,6 +5413,9 @@ entry = luaDigitalState3, "luaDigitalState3", int, "%d" entry = startStopStateToggleCounter, "startStopStateToggleCounter", int, "%d" entry = egtValue1, "egtValue1", float, "%.3f" entry = egtValue2, "egtValue2", float, "%.3f" +entry = luaSoftSparkSkip, "luaSoftSparkSkip", float, "%.3f" +entry = luaHardSparkSkip, "luaHardSparkSkip", float, "%.3f" +entry = tractionControlSparkSkip, "tractionControlSparkSkip", float, "%.3f" entry = desiredRpmLimit, "User-defined RPM hard limit", int, "%d" entry = fuelInjectionCounter, "Fuel: Injection counter", int, "%d" entry = globalSparkCounter, "Ign: Spark counter", int, "%d" @@ -5913,7 +5918,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 @@ -6361,7 +6366,6 @@ indicatorPanel = engine_stateIndicatorPanel, 2 indicator = {lua_luaDisableEtb}, "luaDisableEtb No", "luaDisableEtb Yes" indicator = {lua_luaIgnCut}, "luaIgnCut No", "luaIgnCut Yes" indicator = {startStopPhysicalState}, "startStopPhysicalState No", "startStopPhysicalState Yes" - indicator = {acrStateDup}, "acrStateDup No", "acrStateDup Yes" indicator = {acrEngineMovedRecently}, "acrEngineMovedRecently No", "acrEngineMovedRecently Yes" indicator = {heaterControlEnabled}, "heaterControlEnabled No", "heaterControlEnabled Yes" indicator = {luaDigitalState0}, "luaDigitalState0 No", "luaDigitalState0 Yes" @@ -6397,12 +6401,16 @@ dialog = engine_stateDialog, "engine_state" graphLine = egtValue1 graphLine = egtValue2 liveGraph = engine_state_6_Graph, "Graph", South + graphLine = luaSoftSparkSkip + graphLine = luaHardSparkSkip + graphLine = tractionControlSparkSkip graphLine = desiredRpmLimit + liveGraph = engine_state_7_Graph, "Graph", South graphLine = fuelInjectionCounter graphLine = globalSparkCounter graphLine = fuelingLoad - liveGraph = engine_state_7_Graph, "Graph", South graphLine = ignitionLoad + liveGraph = engine_state_8_Graph, "Graph", South graphLine = veTableYAxis indicatorPanel = tps_accel_stateIndicatorPanel, 2 @@ -7308,6 +7316,10 @@ dialog = lambda_monitorDialog, "lambda_monitor" 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 diff --git a/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini b/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini index 30cf4995f1..bd0a739be2 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini @@ -37,12 +37,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.03.05.hellen154hyundai.1949760771" + signature = "rusEFI master.2024.03.05.hellen154hyundai.1001147707" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.03.05.hellen154hyundai.1949760771" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.03.05.hellen154hyundai.1001147707" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -98,7 +98,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","K21 Ambient Temperature","K58 Oil Temp","K54 A/C pressure","PPS 1","TPS 1","K2 Ignition Key Voltage","X10 AIN2","INVALID","TPS 2","X11 AIN1","Map Sensor K31","K10 Sensor","CLT","IAT","PPS 2" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue Mar 05 00:52:29 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue Mar 05 01:56:34 UTC 2024 pageSize = 22236 page = 1 @@ -745,6 +745,7 @@ mc33810Gpgd3Mode = bits, U32, 1576, [4:4], "false", "true" enableExtendedCanBroadcast = bits, U32, 1576, [5:5], "false", "true" luaCanRxWorkaround = bits, U32, 1576, [6:6], "false", "true" flexSensorInverted = bits, U32, 1576, [7:7], "false", "true" +useHardSkipInTraction = bits, U32, 1576, [8:8], "false", "true" useAuxSpeedForSlipRatio = bits, U32, 1576, [11:11], "false", "true" useVssAsSecondWheelSpeed = bits, U32, 1576, [12:12], "false", "true" is_enabled_spi_5 = bits, U32, 1576, [13:13], "false", "true" @@ -2468,7 +2469,7 @@ injectorStagingRpmBins = array, U16, 22222, [6], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1456 + ochBlockSize = 1468 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3131,145 +3132,147 @@ smartChipState = scalar, S08, 1102, "", 1, 0 smartChipRestartCounter = scalar, S08, 1103, "", 1, 0 smartChipAliveCounter = scalar, S08, 1104, "", 1, 0 startStopPhysicalState = bits, U32, 1108, [0:0] -acrStateDup = bits, U32, 1108, [1:1] -acrEngineMovedRecently = bits, U32, 1108, [2:2] -heaterControlEnabled = bits, U32, 1108, [3:3] -luaDigitalState0 = bits, U32, 1108, [4:4] -luaDigitalState1 = bits, U32, 1108, [5:5] -luaDigitalState2 = bits, U32, 1108, [6:6] -luaDigitalState3 = bits, U32, 1108, [7:7] +acrEngineMovedRecently = bits, U32, 1108, [1:1] +heaterControlEnabled = bits, U32, 1108, [2:2] +luaDigitalState0 = bits, U32, 1108, [3:3] +luaDigitalState1 = bits, U32, 1108, [4:4] +luaDigitalState2 = bits, U32, 1108, [5:5] +luaDigitalState3 = bits, U32, 1108, [6:6] startStopStateToggleCounter = scalar, U32, 1112, "", 1, 0 egtValue1 = scalar, F32, 1116, "", 1, 0 egtValue2 = scalar, F32, 1120, "", 1, 0 -desiredRpmLimit = scalar, S16, 1124, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1128, "", 1, 0 -globalSparkCounter = scalar, U32, 1132, "", 1, 0 -fuelingLoad = scalar, F32, 1136, "", 1, 0 -ignitionLoad = scalar, F32, 1140, "", 1, 0 -veTableYAxis = scalar, U16, 1144, "%", 0.01, 0 -; total TS size = 1148 -tpsFrom = scalar, F32, 1148 -tpsTo = scalar, F32, 1152 -deltaTps = scalar, F32, 1156 -extraFuel = scalar, F32, 1160, "", 1, 0 -valueFromTable = scalar, F32, 1164, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1168, [0:0] -isBelowDecelThreshold = bits, U32, 1168, [1:1] -isTimeToResetAccumulator = bits, U32, 1168, [2:2] -isFractionalEnrichment = bits, U32, 1168, [3:3] -belowEpsilon = bits, U32, 1168, [4:4] -tooShort = bits, U32, 1168, [5:5] -fractionalInjFuel = scalar, F32, 1172, "", 1, 0 -accumulatedValue = scalar, F32, 1176, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1180, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1184, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1188, "", 1, 0 -cycleCnt = scalar, S32, 1192, "", 1, 0 -; total TS size = 1196 -hwEventCounters1 = scalar, U32, 1196, "", 1, 0 -hwEventCounters2 = scalar, U32, 1200, "", 1, 0 -hwEventCounters3 = scalar, U32, 1204, "", 1, 0 -hwEventCounters4 = scalar, U32, 1208, "", 1, 0 -hwEventCounters5 = scalar, U32, 1212, "", 1, 0 -hwEventCounters6 = scalar, U32, 1216, "", 1, 0 -vvtCamCounter = scalar, U32, 1220, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1224, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1228, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1232, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1233, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1236, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1240, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1244, "", 1, 0 -mapCamPrevToothAngle = scalar, F32, 1248, "deg", 1, 0 -isDecodingMapCam = bits, U32, 1252, [0:0] -; total TS size = 1256 -crankSynchronizationCounter0 = scalar, U32, 1256, "", 1, 0 -vvtSyncGapRatio0 = scalar, F32, 1260, "", 1, 0 -vvtToothDurations00 = scalar, U32, 1264, "us", 1, 0 -vvtCurrentPosition0 = scalar, F32, 1268, "sync: Primary Cam Position", 1, 0 -vvtToothPosition10 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition20 = scalar, F32, 1276, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition30 = scalar, F32, 1280, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition40 = scalar, F32, 1284, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio0 = scalar, F32, 1288, "", 1, 0 -triggerStateIndex0 = scalar, U08, 1292, "", 1, 0 -vvtStateIndex0 = scalar, U08, 1293, "", 1, 0 -; total TS size = 1296 -camResyncCounter = scalar, U08, 1296, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1300, [0:0] -; total TS size = 1304 -wallFuelCorrection = scalar, F32, 1304, "", 1, 0 -wallFuel = scalar, F32, 1308, "", 1, 0 -; total TS size = 1312 -idleState = bits, S32, 1312, [0:2], "not important" -currentIdlePosition = scalar, F32, 1316 -baseIdlePosition = scalar, F32, 1320 -idleClosedLoop = scalar, F32, 1324 -iacByTpsTaper = scalar, F32, 1328 -throttlePedalUpState = scalar, S32, 1332, "", 1, 0 -mightResetPid = bits, U32, 1336, [0:0] -shouldResetPid = bits, U32, 1336, [1:1] -wasResetPid = bits, U32, 1336, [2:2] -mustResetPid = bits, U32, 1336, [3:3] -isCranking = bits, U32, 1336, [4:4] -isIacTableForCoasting = bits, U32, 1336, [5:5] -notIdling = bits, U32, 1336, [6:6] -needReset = bits, U32, 1336, [7:7] -isInDeadZone = bits, U32, 1336, [8:8] -isBlipping = bits, U32, 1336, [9:9] -useClosedLoop = bits, U32, 1336, [10:10] -badTps = bits, U32, 1336, [11:11] -looksLikeRunning = bits, U32, 1336, [12:12] -looksLikeCoasting = bits, U32, 1336, [13:13] -looksLikeCrankToIdle = bits, U32, 1336, [14:14] -isIdleCoasting = bits, U32, 1336, [15:15] -isIdleClosedLoop = bits, U32, 1336, [16:16] -idleTarget = scalar, S32, 1340, "", 1, 0 -targetRpmByClt = scalar, S32, 1344, "", 1, 0 -targetRpmAc = scalar, S32, 1348, "", 1, 0 -iacByRpmTaper = scalar, F32, 1352 -luaAdd = scalar, F32, 1356 -; total TS size = 1360 -idlePosition0 = scalar, F32, 1360, "per", 1,0 -trim0 = scalar, F32, 1364, "", 1, 0 -luaAdjustment0 = scalar, F32, 1368, "per", 1,0 -m_wastegatePosition0 = scalar, F32, 1372, "per", 1,0 -etbFeedForward0 = scalar, F32, 1376 -etbIntegralError0 = scalar, F32, 1380, "", 1, 0 -etbCurrentTarget0 = scalar, F32, 1384, "%", 1, 0 -etbCurrentAdjustedTarget0 = scalar, F32, 1388, "%", 1, 0 -etbRevLimitActive0 = bits, U32, 1392, [0:0] -jamDetected0 = bits, U32, 1392, [1:1] -etbDutyRateOfChange0 = scalar, F32, 1396, "per", 1,0 -etbDutyAverage0 = scalar, F32, 1400, "per", 1,0 -etbTpsErrorCounter0 = scalar, U16, 1404, "count", 1,0 -etbPpsErrorCounter0 = scalar, U16, 1406, "count", 1,0 -etbErrorCode0 = scalar, S08, 1408, "", 1, 0 -tcEtbDrop0 = scalar, S08, 1409, "", 1, 0 -jamTimer0 = scalar, U16, 1410, "sec", 0.01, 0 -; total TS size = 1412 -faultCode0 = scalar, U08, 1412, "", 1, 0 -heaterDuty0 = scalar, U08, 1413, "%", 1, 0 -pumpDuty0 = scalar, U08, 1414, "%", 1, 0 -tempC0 = scalar, U16, 1416, "C", 1, 0 -nernstVoltage0 = scalar, U16, 1418, "V", 0.001, 0 -esr0 = scalar, U16, 1420, "ohm", 1, 0 +luaSoftSparkSkip = scalar, F32, 1124, "", 1, 0 +luaHardSparkSkip = scalar, F32, 1128, "", 1, 0 +tractionControlSparkSkip = scalar, F32, 1132, "", 1, 0 +desiredRpmLimit = scalar, S16, 1136, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 1140, "", 1, 0 +globalSparkCounter = scalar, U32, 1144, "", 1, 0 +fuelingLoad = scalar, F32, 1148, "", 1, 0 +ignitionLoad = scalar, F32, 1152, "", 1, 0 +veTableYAxis = scalar, U16, 1156, "%", 0.01, 0 +; total TS size = 1160 +tpsFrom = scalar, F32, 1160 +tpsTo = scalar, F32, 1164 +deltaTps = scalar, F32, 1168 +extraFuel = scalar, F32, 1172, "", 1, 0 +valueFromTable = scalar, F32, 1176, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1180, [0:0] +isBelowDecelThreshold = bits, U32, 1180, [1:1] +isTimeToResetAccumulator = bits, U32, 1180, [2:2] +isFractionalEnrichment = bits, U32, 1180, [3:3] +belowEpsilon = bits, U32, 1180, [4:4] +tooShort = bits, U32, 1180, [5:5] +fractionalInjFuel = scalar, F32, 1184, "", 1, 0 +accumulatedValue = scalar, F32, 1188, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1192, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1196, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1200, "", 1, 0 +cycleCnt = scalar, S32, 1204, "", 1, 0 +; total TS size = 1208 +hwEventCounters1 = scalar, U32, 1208, "", 1, 0 +hwEventCounters2 = scalar, U32, 1212, "", 1, 0 +hwEventCounters3 = scalar, U32, 1216, "", 1, 0 +hwEventCounters4 = scalar, U32, 1220, "", 1, 0 +hwEventCounters5 = scalar, U32, 1224, "", 1, 0 +hwEventCounters6 = scalar, U32, 1228, "", 1, 0 +vvtCamCounter = scalar, U32, 1232, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1236, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1240, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1244, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1245, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1248, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1252, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1256, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1260, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1264, [0:0] +; total TS size = 1268 +crankSynchronizationCounter0 = scalar, U32, 1268, "", 1, 0 +vvtSyncGapRatio0 = scalar, F32, 1272, "", 1, 0 +vvtToothDurations00 = scalar, U32, 1276, "us", 1, 0 +vvtCurrentPosition0 = scalar, F32, 1280, "sync: Primary Cam Position", 1, 0 +vvtToothPosition10 = scalar, F32, 1284, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition20 = scalar, F32, 1288, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition30 = scalar, F32, 1292, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition40 = scalar, F32, 1296, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio0 = scalar, F32, 1300, "", 1, 0 +triggerStateIndex0 = scalar, U08, 1304, "", 1, 0 +vvtStateIndex0 = scalar, U08, 1305, "", 1, 0 +; total TS size = 1308 +camResyncCounter = scalar, U08, 1308, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1312, [0:0] +; total TS size = 1316 +wallFuelCorrection = scalar, F32, 1316, "", 1, 0 +wallFuel = scalar, F32, 1320, "", 1, 0 +; total TS size = 1324 +idleState = bits, S32, 1324, [0:2], "not important" +currentIdlePosition = scalar, F32, 1328 +baseIdlePosition = scalar, F32, 1332 +idleClosedLoop = scalar, F32, 1336 +iacByTpsTaper = scalar, F32, 1340 +throttlePedalUpState = scalar, S32, 1344, "", 1, 0 +mightResetPid = bits, U32, 1348, [0:0] +shouldResetPid = bits, U32, 1348, [1:1] +wasResetPid = bits, U32, 1348, [2:2] +mustResetPid = bits, U32, 1348, [3:3] +isCranking = bits, U32, 1348, [4:4] +isIacTableForCoasting = bits, U32, 1348, [5:5] +notIdling = bits, U32, 1348, [6:6] +needReset = bits, U32, 1348, [7:7] +isInDeadZone = bits, U32, 1348, [8:8] +isBlipping = bits, U32, 1348, [9:9] +useClosedLoop = bits, U32, 1348, [10:10] +badTps = bits, U32, 1348, [11:11] +looksLikeRunning = bits, U32, 1348, [12:12] +looksLikeCoasting = bits, U32, 1348, [13:13] +looksLikeCrankToIdle = bits, U32, 1348, [14:14] +isIdleCoasting = bits, U32, 1348, [15:15] +isIdleClosedLoop = bits, U32, 1348, [16:16] +idleTarget = scalar, S32, 1352, "", 1, 0 +targetRpmByClt = scalar, S32, 1356, "", 1, 0 +targetRpmAc = scalar, S32, 1360, "", 1, 0 +iacByRpmTaper = scalar, F32, 1364 +luaAdd = scalar, F32, 1368 +; total TS size = 1372 +idlePosition0 = scalar, F32, 1372, "per", 1,0 +trim0 = scalar, F32, 1376, "", 1, 0 +luaAdjustment0 = scalar, F32, 1380, "per", 1,0 +m_wastegatePosition0 = scalar, F32, 1384, "per", 1,0 +etbFeedForward0 = scalar, F32, 1388 +etbIntegralError0 = scalar, F32, 1392, "", 1, 0 +etbCurrentTarget0 = scalar, F32, 1396, "%", 1, 0 +etbCurrentAdjustedTarget0 = scalar, F32, 1400, "%", 1, 0 +etbRevLimitActive0 = bits, U32, 1404, [0:0] +jamDetected0 = bits, U32, 1404, [1:1] +etbDutyRateOfChange0 = scalar, F32, 1408, "per", 1,0 +etbDutyAverage0 = scalar, F32, 1412, "per", 1,0 +etbTpsErrorCounter0 = scalar, U16, 1416, "count", 1,0 +etbPpsErrorCounter0 = scalar, U16, 1418, "count", 1,0 +etbErrorCode0 = scalar, S08, 1420, "", 1, 0 +tcEtbDrop0 = scalar, S08, 1421, "", 1, 0 +jamTimer0 = scalar, U16, 1422, "sec", 0.01, 0 ; total TS size = 1424 -dcOutput0 = scalar, F32, 1424, "per", 1,0 -isEnabled0_int = scalar, U08, 1428, "per", 1,0 -isEnabled0 = bits, U32, 1432, [0:0] +faultCode0 = scalar, U08, 1424, "", 1, 0 +heaterDuty0 = scalar, U08, 1425, "%", 1, 0 +pumpDuty0 = scalar, U08, 1426, "%", 1, 0 +tempC0 = scalar, U16, 1428, "C", 1, 0 +nernstVoltage0 = scalar, U16, 1430, "V", 0.001, 0 +esr0 = scalar, U16, 1432, "ohm", 1, 0 ; total TS size = 1436 -value0 = scalar, U16, 1436, "value", 1,0 -value1 = scalar, U16, 1438, "value", 1,0 -errorRate = scalar, F32, 1440, "ratio", 1,0 -; total TS size = 1444 -vvtTarget = scalar, U16, 1444, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1446, "%", 0.5, 0 +dcOutput0 = scalar, F32, 1436, "per", 1,0 +isEnabled0_int = scalar, U08, 1440, "per", 1,0 +isEnabled0 = bits, U32, 1444, [0:0] ; total TS size = 1448 -lambdaCurrentlyGood = bits, U32, 1448, [0:0] -lambdaMonitorCut = bits, U32, 1448, [1:1] -lambdaTimeSinceGood = scalar, U16, 1452, "sec", 0.01, 0 +value0 = scalar, U16, 1448, "value", 1,0 +value1 = scalar, U16, 1450, "value", 1,0 +errorRate = scalar, F32, 1452, "ratio", 1,0 ; total TS size = 1456 +vvtTarget = scalar, U16, 1456, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1458, "%", 0.5, 0 +; total TS size = 1460 +lambdaCurrentlyGood = bits, U32, 1460, [0:0] +lambdaMonitorCut = bits, U32, 1460, [1:1] +lambdaTimeSinceGood = scalar, U16, 1464, "sec", 0.01, 0 +; total TS size = 1468 time = { timeNow } @@ -5401,7 +5404,6 @@ entry = smartChipState, "smartChipState", int, "%d" entry = smartChipRestartCounter, "smartChipRestartCounter", int, "%d" entry = smartChipAliveCounter, "smartChipAliveCounter", int, "%d" entry = startStopPhysicalState, "startStopPhysicalState", int, "%d" -entry = acrStateDup, "acrStateDup", int, "%d" entry = acrEngineMovedRecently, "acrEngineMovedRecently", int, "%d" entry = heaterControlEnabled, "heaterControlEnabled", int, "%d" entry = luaDigitalState0, "luaDigitalState0", int, "%d" @@ -5411,6 +5413,9 @@ entry = luaDigitalState3, "luaDigitalState3", int, "%d" entry = startStopStateToggleCounter, "startStopStateToggleCounter", int, "%d" entry = egtValue1, "egtValue1", float, "%.3f" entry = egtValue2, "egtValue2", float, "%.3f" +entry = luaSoftSparkSkip, "luaSoftSparkSkip", float, "%.3f" +entry = luaHardSparkSkip, "luaHardSparkSkip", float, "%.3f" +entry = tractionControlSparkSkip, "tractionControlSparkSkip", float, "%.3f" entry = desiredRpmLimit, "User-defined RPM hard limit", int, "%d" entry = fuelInjectionCounter, "Fuel: Injection counter", int, "%d" entry = globalSparkCounter, "Ign: Spark counter", int, "%d" @@ -5911,7 +5916,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 @@ -6359,7 +6364,6 @@ indicatorPanel = engine_stateIndicatorPanel, 2 indicator = {lua_luaDisableEtb}, "luaDisableEtb No", "luaDisableEtb Yes" indicator = {lua_luaIgnCut}, "luaIgnCut No", "luaIgnCut Yes" indicator = {startStopPhysicalState}, "startStopPhysicalState No", "startStopPhysicalState Yes" - indicator = {acrStateDup}, "acrStateDup No", "acrStateDup Yes" indicator = {acrEngineMovedRecently}, "acrEngineMovedRecently No", "acrEngineMovedRecently Yes" indicator = {heaterControlEnabled}, "heaterControlEnabled No", "heaterControlEnabled Yes" indicator = {luaDigitalState0}, "luaDigitalState0 No", "luaDigitalState0 Yes" @@ -6395,12 +6399,16 @@ dialog = engine_stateDialog, "engine_state" graphLine = egtValue1 graphLine = egtValue2 liveGraph = engine_state_6_Graph, "Graph", South + graphLine = luaSoftSparkSkip + graphLine = luaHardSparkSkip + graphLine = tractionControlSparkSkip graphLine = desiredRpmLimit + liveGraph = engine_state_7_Graph, "Graph", South graphLine = fuelInjectionCounter graphLine = globalSparkCounter graphLine = fuelingLoad - liveGraph = engine_state_7_Graph, "Graph", South graphLine = ignitionLoad + liveGraph = engine_state_8_Graph, "Graph", South graphLine = veTableYAxis indicatorPanel = tps_accel_stateIndicatorPanel, 2 @@ -7300,6 +7308,10 @@ dialog = lambda_monitorDialog, "lambda_monitor" 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 diff --git a/firmware/tunerstudio/generated/rusefi_hellen72.ini b/firmware/tunerstudio/generated/rusefi_hellen72.ini index c088da7ad0..190d8c6f35 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen72.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen72.ini @@ -37,12 +37,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.03.05.hellen72.3494089257" + signature = "rusEFI master.2024.03.05.hellen72.2681807377" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.03.05.hellen72.3494089257" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.03.05.hellen72.2681807377" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -98,7 +98,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","5N - TPS2","3L - IGN_7 / AFR","intMAP (A15)","5P - PPS1","4V - TPS (A17)","4S/4T - Alternator voltage","3V - CAM (A19)","4J - VTCS/AUX4 (A20)","4F - AC_PRES/AUX1 (A23)","3Y - CRANK (A24)","4X - MAF (A9)","4U - MAP2/Ign8 (A10)","4P - CLT (A11)","4N - IAT (A14)","5M - PPS2 OR TEMPERATURE SENSOR","4AE - EGR/MAP4 (A22)" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue Mar 05 00:52:35 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue Mar 05 01:56:39 UTC 2024 pageSize = 22236 page = 1 @@ -745,6 +745,7 @@ mc33810Gpgd3Mode = bits, U32, 1576, [4:4], "false", "true" enableExtendedCanBroadcast = bits, U32, 1576, [5:5], "false", "true" luaCanRxWorkaround = bits, U32, 1576, [6:6], "false", "true" flexSensorInverted = bits, U32, 1576, [7:7], "false", "true" +useHardSkipInTraction = bits, U32, 1576, [8:8], "false", "true" useAuxSpeedForSlipRatio = bits, U32, 1576, [11:11], "false", "true" useVssAsSecondWheelSpeed = bits, U32, 1576, [12:12], "false", "true" is_enabled_spi_5 = bits, U32, 1576, [13:13], "false", "true" @@ -2468,7 +2469,7 @@ injectorStagingRpmBins = array, U16, 22222, [6], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1456 + ochBlockSize = 1468 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3131,145 +3132,147 @@ smartChipState = scalar, S08, 1102, "", 1, 0 smartChipRestartCounter = scalar, S08, 1103, "", 1, 0 smartChipAliveCounter = scalar, S08, 1104, "", 1, 0 startStopPhysicalState = bits, U32, 1108, [0:0] -acrStateDup = bits, U32, 1108, [1:1] -acrEngineMovedRecently = bits, U32, 1108, [2:2] -heaterControlEnabled = bits, U32, 1108, [3:3] -luaDigitalState0 = bits, U32, 1108, [4:4] -luaDigitalState1 = bits, U32, 1108, [5:5] -luaDigitalState2 = bits, U32, 1108, [6:6] -luaDigitalState3 = bits, U32, 1108, [7:7] +acrEngineMovedRecently = bits, U32, 1108, [1:1] +heaterControlEnabled = bits, U32, 1108, [2:2] +luaDigitalState0 = bits, U32, 1108, [3:3] +luaDigitalState1 = bits, U32, 1108, [4:4] +luaDigitalState2 = bits, U32, 1108, [5:5] +luaDigitalState3 = bits, U32, 1108, [6:6] startStopStateToggleCounter = scalar, U32, 1112, "", 1, 0 egtValue1 = scalar, F32, 1116, "", 1, 0 egtValue2 = scalar, F32, 1120, "", 1, 0 -desiredRpmLimit = scalar, S16, 1124, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1128, "", 1, 0 -globalSparkCounter = scalar, U32, 1132, "", 1, 0 -fuelingLoad = scalar, F32, 1136, "", 1, 0 -ignitionLoad = scalar, F32, 1140, "", 1, 0 -veTableYAxis = scalar, U16, 1144, "%", 0.01, 0 -; total TS size = 1148 -tpsFrom = scalar, F32, 1148 -tpsTo = scalar, F32, 1152 -deltaTps = scalar, F32, 1156 -extraFuel = scalar, F32, 1160, "", 1, 0 -valueFromTable = scalar, F32, 1164, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1168, [0:0] -isBelowDecelThreshold = bits, U32, 1168, [1:1] -isTimeToResetAccumulator = bits, U32, 1168, [2:2] -isFractionalEnrichment = bits, U32, 1168, [3:3] -belowEpsilon = bits, U32, 1168, [4:4] -tooShort = bits, U32, 1168, [5:5] -fractionalInjFuel = scalar, F32, 1172, "", 1, 0 -accumulatedValue = scalar, F32, 1176, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1180, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1184, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1188, "", 1, 0 -cycleCnt = scalar, S32, 1192, "", 1, 0 -; total TS size = 1196 -hwEventCounters1 = scalar, U32, 1196, "", 1, 0 -hwEventCounters2 = scalar, U32, 1200, "", 1, 0 -hwEventCounters3 = scalar, U32, 1204, "", 1, 0 -hwEventCounters4 = scalar, U32, 1208, "", 1, 0 -hwEventCounters5 = scalar, U32, 1212, "", 1, 0 -hwEventCounters6 = scalar, U32, 1216, "", 1, 0 -vvtCamCounter = scalar, U32, 1220, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1224, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1228, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1232, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1233, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1236, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1240, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1244, "", 1, 0 -mapCamPrevToothAngle = scalar, F32, 1248, "deg", 1, 0 -isDecodingMapCam = bits, U32, 1252, [0:0] -; total TS size = 1256 -crankSynchronizationCounter0 = scalar, U32, 1256, "", 1, 0 -vvtSyncGapRatio0 = scalar, F32, 1260, "", 1, 0 -vvtToothDurations00 = scalar, U32, 1264, "us", 1, 0 -vvtCurrentPosition0 = scalar, F32, 1268, "sync: Primary Cam Position", 1, 0 -vvtToothPosition10 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition20 = scalar, F32, 1276, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition30 = scalar, F32, 1280, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition40 = scalar, F32, 1284, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio0 = scalar, F32, 1288, "", 1, 0 -triggerStateIndex0 = scalar, U08, 1292, "", 1, 0 -vvtStateIndex0 = scalar, U08, 1293, "", 1, 0 -; total TS size = 1296 -camResyncCounter = scalar, U08, 1296, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1300, [0:0] -; total TS size = 1304 -wallFuelCorrection = scalar, F32, 1304, "", 1, 0 -wallFuel = scalar, F32, 1308, "", 1, 0 -; total TS size = 1312 -idleState = bits, S32, 1312, [0:2], "not important" -currentIdlePosition = scalar, F32, 1316 -baseIdlePosition = scalar, F32, 1320 -idleClosedLoop = scalar, F32, 1324 -iacByTpsTaper = scalar, F32, 1328 -throttlePedalUpState = scalar, S32, 1332, "", 1, 0 -mightResetPid = bits, U32, 1336, [0:0] -shouldResetPid = bits, U32, 1336, [1:1] -wasResetPid = bits, U32, 1336, [2:2] -mustResetPid = bits, U32, 1336, [3:3] -isCranking = bits, U32, 1336, [4:4] -isIacTableForCoasting = bits, U32, 1336, [5:5] -notIdling = bits, U32, 1336, [6:6] -needReset = bits, U32, 1336, [7:7] -isInDeadZone = bits, U32, 1336, [8:8] -isBlipping = bits, U32, 1336, [9:9] -useClosedLoop = bits, U32, 1336, [10:10] -badTps = bits, U32, 1336, [11:11] -looksLikeRunning = bits, U32, 1336, [12:12] -looksLikeCoasting = bits, U32, 1336, [13:13] -looksLikeCrankToIdle = bits, U32, 1336, [14:14] -isIdleCoasting = bits, U32, 1336, [15:15] -isIdleClosedLoop = bits, U32, 1336, [16:16] -idleTarget = scalar, S32, 1340, "", 1, 0 -targetRpmByClt = scalar, S32, 1344, "", 1, 0 -targetRpmAc = scalar, S32, 1348, "", 1, 0 -iacByRpmTaper = scalar, F32, 1352 -luaAdd = scalar, F32, 1356 -; total TS size = 1360 -idlePosition0 = scalar, F32, 1360, "per", 1,0 -trim0 = scalar, F32, 1364, "", 1, 0 -luaAdjustment0 = scalar, F32, 1368, "per", 1,0 -m_wastegatePosition0 = scalar, F32, 1372, "per", 1,0 -etbFeedForward0 = scalar, F32, 1376 -etbIntegralError0 = scalar, F32, 1380, "", 1, 0 -etbCurrentTarget0 = scalar, F32, 1384, "%", 1, 0 -etbCurrentAdjustedTarget0 = scalar, F32, 1388, "%", 1, 0 -etbRevLimitActive0 = bits, U32, 1392, [0:0] -jamDetected0 = bits, U32, 1392, [1:1] -etbDutyRateOfChange0 = scalar, F32, 1396, "per", 1,0 -etbDutyAverage0 = scalar, F32, 1400, "per", 1,0 -etbTpsErrorCounter0 = scalar, U16, 1404, "count", 1,0 -etbPpsErrorCounter0 = scalar, U16, 1406, "count", 1,0 -etbErrorCode0 = scalar, S08, 1408, "", 1, 0 -tcEtbDrop0 = scalar, S08, 1409, "", 1, 0 -jamTimer0 = scalar, U16, 1410, "sec", 0.01, 0 -; total TS size = 1412 -faultCode0 = scalar, U08, 1412, "", 1, 0 -heaterDuty0 = scalar, U08, 1413, "%", 1, 0 -pumpDuty0 = scalar, U08, 1414, "%", 1, 0 -tempC0 = scalar, U16, 1416, "C", 1, 0 -nernstVoltage0 = scalar, U16, 1418, "V", 0.001, 0 -esr0 = scalar, U16, 1420, "ohm", 1, 0 +luaSoftSparkSkip = scalar, F32, 1124, "", 1, 0 +luaHardSparkSkip = scalar, F32, 1128, "", 1, 0 +tractionControlSparkSkip = scalar, F32, 1132, "", 1, 0 +desiredRpmLimit = scalar, S16, 1136, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 1140, "", 1, 0 +globalSparkCounter = scalar, U32, 1144, "", 1, 0 +fuelingLoad = scalar, F32, 1148, "", 1, 0 +ignitionLoad = scalar, F32, 1152, "", 1, 0 +veTableYAxis = scalar, U16, 1156, "%", 0.01, 0 +; total TS size = 1160 +tpsFrom = scalar, F32, 1160 +tpsTo = scalar, F32, 1164 +deltaTps = scalar, F32, 1168 +extraFuel = scalar, F32, 1172, "", 1, 0 +valueFromTable = scalar, F32, 1176, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1180, [0:0] +isBelowDecelThreshold = bits, U32, 1180, [1:1] +isTimeToResetAccumulator = bits, U32, 1180, [2:2] +isFractionalEnrichment = bits, U32, 1180, [3:3] +belowEpsilon = bits, U32, 1180, [4:4] +tooShort = bits, U32, 1180, [5:5] +fractionalInjFuel = scalar, F32, 1184, "", 1, 0 +accumulatedValue = scalar, F32, 1188, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1192, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1196, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1200, "", 1, 0 +cycleCnt = scalar, S32, 1204, "", 1, 0 +; total TS size = 1208 +hwEventCounters1 = scalar, U32, 1208, "", 1, 0 +hwEventCounters2 = scalar, U32, 1212, "", 1, 0 +hwEventCounters3 = scalar, U32, 1216, "", 1, 0 +hwEventCounters4 = scalar, U32, 1220, "", 1, 0 +hwEventCounters5 = scalar, U32, 1224, "", 1, 0 +hwEventCounters6 = scalar, U32, 1228, "", 1, 0 +vvtCamCounter = scalar, U32, 1232, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1236, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1240, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1244, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1245, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1248, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1252, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1256, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1260, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1264, [0:0] +; total TS size = 1268 +crankSynchronizationCounter0 = scalar, U32, 1268, "", 1, 0 +vvtSyncGapRatio0 = scalar, F32, 1272, "", 1, 0 +vvtToothDurations00 = scalar, U32, 1276, "us", 1, 0 +vvtCurrentPosition0 = scalar, F32, 1280, "sync: Primary Cam Position", 1, 0 +vvtToothPosition10 = scalar, F32, 1284, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition20 = scalar, F32, 1288, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition30 = scalar, F32, 1292, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition40 = scalar, F32, 1296, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio0 = scalar, F32, 1300, "", 1, 0 +triggerStateIndex0 = scalar, U08, 1304, "", 1, 0 +vvtStateIndex0 = scalar, U08, 1305, "", 1, 0 +; total TS size = 1308 +camResyncCounter = scalar, U08, 1308, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1312, [0:0] +; total TS size = 1316 +wallFuelCorrection = scalar, F32, 1316, "", 1, 0 +wallFuel = scalar, F32, 1320, "", 1, 0 +; total TS size = 1324 +idleState = bits, S32, 1324, [0:2], "not important" +currentIdlePosition = scalar, F32, 1328 +baseIdlePosition = scalar, F32, 1332 +idleClosedLoop = scalar, F32, 1336 +iacByTpsTaper = scalar, F32, 1340 +throttlePedalUpState = scalar, S32, 1344, "", 1, 0 +mightResetPid = bits, U32, 1348, [0:0] +shouldResetPid = bits, U32, 1348, [1:1] +wasResetPid = bits, U32, 1348, [2:2] +mustResetPid = bits, U32, 1348, [3:3] +isCranking = bits, U32, 1348, [4:4] +isIacTableForCoasting = bits, U32, 1348, [5:5] +notIdling = bits, U32, 1348, [6:6] +needReset = bits, U32, 1348, [7:7] +isInDeadZone = bits, U32, 1348, [8:8] +isBlipping = bits, U32, 1348, [9:9] +useClosedLoop = bits, U32, 1348, [10:10] +badTps = bits, U32, 1348, [11:11] +looksLikeRunning = bits, U32, 1348, [12:12] +looksLikeCoasting = bits, U32, 1348, [13:13] +looksLikeCrankToIdle = bits, U32, 1348, [14:14] +isIdleCoasting = bits, U32, 1348, [15:15] +isIdleClosedLoop = bits, U32, 1348, [16:16] +idleTarget = scalar, S32, 1352, "", 1, 0 +targetRpmByClt = scalar, S32, 1356, "", 1, 0 +targetRpmAc = scalar, S32, 1360, "", 1, 0 +iacByRpmTaper = scalar, F32, 1364 +luaAdd = scalar, F32, 1368 +; total TS size = 1372 +idlePosition0 = scalar, F32, 1372, "per", 1,0 +trim0 = scalar, F32, 1376, "", 1, 0 +luaAdjustment0 = scalar, F32, 1380, "per", 1,0 +m_wastegatePosition0 = scalar, F32, 1384, "per", 1,0 +etbFeedForward0 = scalar, F32, 1388 +etbIntegralError0 = scalar, F32, 1392, "", 1, 0 +etbCurrentTarget0 = scalar, F32, 1396, "%", 1, 0 +etbCurrentAdjustedTarget0 = scalar, F32, 1400, "%", 1, 0 +etbRevLimitActive0 = bits, U32, 1404, [0:0] +jamDetected0 = bits, U32, 1404, [1:1] +etbDutyRateOfChange0 = scalar, F32, 1408, "per", 1,0 +etbDutyAverage0 = scalar, F32, 1412, "per", 1,0 +etbTpsErrorCounter0 = scalar, U16, 1416, "count", 1,0 +etbPpsErrorCounter0 = scalar, U16, 1418, "count", 1,0 +etbErrorCode0 = scalar, S08, 1420, "", 1, 0 +tcEtbDrop0 = scalar, S08, 1421, "", 1, 0 +jamTimer0 = scalar, U16, 1422, "sec", 0.01, 0 ; total TS size = 1424 -dcOutput0 = scalar, F32, 1424, "per", 1,0 -isEnabled0_int = scalar, U08, 1428, "per", 1,0 -isEnabled0 = bits, U32, 1432, [0:0] +faultCode0 = scalar, U08, 1424, "", 1, 0 +heaterDuty0 = scalar, U08, 1425, "%", 1, 0 +pumpDuty0 = scalar, U08, 1426, "%", 1, 0 +tempC0 = scalar, U16, 1428, "C", 1, 0 +nernstVoltage0 = scalar, U16, 1430, "V", 0.001, 0 +esr0 = scalar, U16, 1432, "ohm", 1, 0 ; total TS size = 1436 -value0 = scalar, U16, 1436, "value", 1,0 -value1 = scalar, U16, 1438, "value", 1,0 -errorRate = scalar, F32, 1440, "ratio", 1,0 -; total TS size = 1444 -vvtTarget = scalar, U16, 1444, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1446, "%", 0.5, 0 +dcOutput0 = scalar, F32, 1436, "per", 1,0 +isEnabled0_int = scalar, U08, 1440, "per", 1,0 +isEnabled0 = bits, U32, 1444, [0:0] ; total TS size = 1448 -lambdaCurrentlyGood = bits, U32, 1448, [0:0] -lambdaMonitorCut = bits, U32, 1448, [1:1] -lambdaTimeSinceGood = scalar, U16, 1452, "sec", 0.01, 0 +value0 = scalar, U16, 1448, "value", 1,0 +value1 = scalar, U16, 1450, "value", 1,0 +errorRate = scalar, F32, 1452, "ratio", 1,0 ; total TS size = 1456 +vvtTarget = scalar, U16, 1456, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1458, "%", 0.5, 0 +; total TS size = 1460 +lambdaCurrentlyGood = bits, U32, 1460, [0:0] +lambdaMonitorCut = bits, U32, 1460, [1:1] +lambdaTimeSinceGood = scalar, U16, 1464, "sec", 0.01, 0 +; total TS size = 1468 time = { timeNow } @@ -5401,7 +5404,6 @@ entry = smartChipState, "smartChipState", int, "%d" entry = smartChipRestartCounter, "smartChipRestartCounter", int, "%d" entry = smartChipAliveCounter, "smartChipAliveCounter", int, "%d" entry = startStopPhysicalState, "startStopPhysicalState", int, "%d" -entry = acrStateDup, "acrStateDup", int, "%d" entry = acrEngineMovedRecently, "acrEngineMovedRecently", int, "%d" entry = heaterControlEnabled, "heaterControlEnabled", int, "%d" entry = luaDigitalState0, "luaDigitalState0", int, "%d" @@ -5411,6 +5413,9 @@ entry = luaDigitalState3, "luaDigitalState3", int, "%d" entry = startStopStateToggleCounter, "startStopStateToggleCounter", int, "%d" entry = egtValue1, "egtValue1", float, "%.3f" entry = egtValue2, "egtValue2", float, "%.3f" +entry = luaSoftSparkSkip, "luaSoftSparkSkip", float, "%.3f" +entry = luaHardSparkSkip, "luaHardSparkSkip", float, "%.3f" +entry = tractionControlSparkSkip, "tractionControlSparkSkip", float, "%.3f" entry = desiredRpmLimit, "User-defined RPM hard limit", int, "%d" entry = fuelInjectionCounter, "Fuel: Injection counter", int, "%d" entry = globalSparkCounter, "Ign: Spark counter", int, "%d" @@ -5913,7 +5918,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 @@ -6361,7 +6366,6 @@ indicatorPanel = engine_stateIndicatorPanel, 2 indicator = {lua_luaDisableEtb}, "luaDisableEtb No", "luaDisableEtb Yes" indicator = {lua_luaIgnCut}, "luaIgnCut No", "luaIgnCut Yes" indicator = {startStopPhysicalState}, "startStopPhysicalState No", "startStopPhysicalState Yes" - indicator = {acrStateDup}, "acrStateDup No", "acrStateDup Yes" indicator = {acrEngineMovedRecently}, "acrEngineMovedRecently No", "acrEngineMovedRecently Yes" indicator = {heaterControlEnabled}, "heaterControlEnabled No", "heaterControlEnabled Yes" indicator = {luaDigitalState0}, "luaDigitalState0 No", "luaDigitalState0 Yes" @@ -6397,12 +6401,16 @@ dialog = engine_stateDialog, "engine_state" graphLine = egtValue1 graphLine = egtValue2 liveGraph = engine_state_6_Graph, "Graph", South + graphLine = luaSoftSparkSkip + graphLine = luaHardSparkSkip + graphLine = tractionControlSparkSkip graphLine = desiredRpmLimit + liveGraph = engine_state_7_Graph, "Graph", South graphLine = fuelInjectionCounter graphLine = globalSparkCounter graphLine = fuelingLoad - liveGraph = engine_state_7_Graph, "Graph", South graphLine = ignitionLoad + liveGraph = engine_state_8_Graph, "Graph", South graphLine = veTableYAxis indicatorPanel = tps_accel_stateIndicatorPanel, 2 @@ -7309,6 +7317,10 @@ dialog = lambda_monitorDialog, "lambda_monitor" 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 diff --git a/firmware/tunerstudio/generated/rusefi_hellen81.ini b/firmware/tunerstudio/generated/rusefi_hellen81.ini index d9e480dda3..e5cbc94cea 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen81.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen81.ini @@ -37,12 +37,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.03.05.hellen81.892532307" + signature = "rusEFI master.2024.03.05.hellen81.2057848427" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.03.05.hellen81.892532307" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.03.05.hellen81.2057848427" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -98,7 +98,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","18 - IN_O2S","55 - IN_O2S2","41 - IN_MAP3","78 - IN_PPS","16 - IN_TPS","13 - IN_VIGN","79 - IN_CAM","77 - IN_AUX4","74 - IN_AUX1","15 - IN_CRANK (A24)","37 - IN_MAP1","38 - IN_MAP2","39 - IN_CLT","40 - IN_IAT","75 - IN_AUX2","76 - IN_AUX3" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue Mar 05 00:52:36 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue Mar 05 01:56:40 UTC 2024 pageSize = 22236 page = 1 @@ -745,6 +745,7 @@ mc33810Gpgd3Mode = bits, U32, 1576, [4:4], "false", "true" enableExtendedCanBroadcast = bits, U32, 1576, [5:5], "false", "true" luaCanRxWorkaround = bits, U32, 1576, [6:6], "false", "true" flexSensorInverted = bits, U32, 1576, [7:7], "false", "true" +useHardSkipInTraction = bits, U32, 1576, [8:8], "false", "true" useAuxSpeedForSlipRatio = bits, U32, 1576, [11:11], "false", "true" useVssAsSecondWheelSpeed = bits, U32, 1576, [12:12], "false", "true" is_enabled_spi_5 = bits, U32, 1576, [13:13], "false", "true" @@ -2468,7 +2469,7 @@ injectorStagingRpmBins = array, U16, 22222, [6], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1456 + ochBlockSize = 1468 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3131,145 +3132,147 @@ smartChipState = scalar, S08, 1102, "", 1, 0 smartChipRestartCounter = scalar, S08, 1103, "", 1, 0 smartChipAliveCounter = scalar, S08, 1104, "", 1, 0 startStopPhysicalState = bits, U32, 1108, [0:0] -acrStateDup = bits, U32, 1108, [1:1] -acrEngineMovedRecently = bits, U32, 1108, [2:2] -heaterControlEnabled = bits, U32, 1108, [3:3] -luaDigitalState0 = bits, U32, 1108, [4:4] -luaDigitalState1 = bits, U32, 1108, [5:5] -luaDigitalState2 = bits, U32, 1108, [6:6] -luaDigitalState3 = bits, U32, 1108, [7:7] +acrEngineMovedRecently = bits, U32, 1108, [1:1] +heaterControlEnabled = bits, U32, 1108, [2:2] +luaDigitalState0 = bits, U32, 1108, [3:3] +luaDigitalState1 = bits, U32, 1108, [4:4] +luaDigitalState2 = bits, U32, 1108, [5:5] +luaDigitalState3 = bits, U32, 1108, [6:6] startStopStateToggleCounter = scalar, U32, 1112, "", 1, 0 egtValue1 = scalar, F32, 1116, "", 1, 0 egtValue2 = scalar, F32, 1120, "", 1, 0 -desiredRpmLimit = scalar, S16, 1124, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1128, "", 1, 0 -globalSparkCounter = scalar, U32, 1132, "", 1, 0 -fuelingLoad = scalar, F32, 1136, "", 1, 0 -ignitionLoad = scalar, F32, 1140, "", 1, 0 -veTableYAxis = scalar, U16, 1144, "%", 0.01, 0 -; total TS size = 1148 -tpsFrom = scalar, F32, 1148 -tpsTo = scalar, F32, 1152 -deltaTps = scalar, F32, 1156 -extraFuel = scalar, F32, 1160, "", 1, 0 -valueFromTable = scalar, F32, 1164, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1168, [0:0] -isBelowDecelThreshold = bits, U32, 1168, [1:1] -isTimeToResetAccumulator = bits, U32, 1168, [2:2] -isFractionalEnrichment = bits, U32, 1168, [3:3] -belowEpsilon = bits, U32, 1168, [4:4] -tooShort = bits, U32, 1168, [5:5] -fractionalInjFuel = scalar, F32, 1172, "", 1, 0 -accumulatedValue = scalar, F32, 1176, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1180, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1184, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1188, "", 1, 0 -cycleCnt = scalar, S32, 1192, "", 1, 0 -; total TS size = 1196 -hwEventCounters1 = scalar, U32, 1196, "", 1, 0 -hwEventCounters2 = scalar, U32, 1200, "", 1, 0 -hwEventCounters3 = scalar, U32, 1204, "", 1, 0 -hwEventCounters4 = scalar, U32, 1208, "", 1, 0 -hwEventCounters5 = scalar, U32, 1212, "", 1, 0 -hwEventCounters6 = scalar, U32, 1216, "", 1, 0 -vvtCamCounter = scalar, U32, 1220, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1224, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1228, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1232, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1233, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1236, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1240, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1244, "", 1, 0 -mapCamPrevToothAngle = scalar, F32, 1248, "deg", 1, 0 -isDecodingMapCam = bits, U32, 1252, [0:0] -; total TS size = 1256 -crankSynchronizationCounter0 = scalar, U32, 1256, "", 1, 0 -vvtSyncGapRatio0 = scalar, F32, 1260, "", 1, 0 -vvtToothDurations00 = scalar, U32, 1264, "us", 1, 0 -vvtCurrentPosition0 = scalar, F32, 1268, "sync: Primary Cam Position", 1, 0 -vvtToothPosition10 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition20 = scalar, F32, 1276, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition30 = scalar, F32, 1280, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition40 = scalar, F32, 1284, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio0 = scalar, F32, 1288, "", 1, 0 -triggerStateIndex0 = scalar, U08, 1292, "", 1, 0 -vvtStateIndex0 = scalar, U08, 1293, "", 1, 0 -; total TS size = 1296 -camResyncCounter = scalar, U08, 1296, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1300, [0:0] -; total TS size = 1304 -wallFuelCorrection = scalar, F32, 1304, "", 1, 0 -wallFuel = scalar, F32, 1308, "", 1, 0 -; total TS size = 1312 -idleState = bits, S32, 1312, [0:2], "not important" -currentIdlePosition = scalar, F32, 1316 -baseIdlePosition = scalar, F32, 1320 -idleClosedLoop = scalar, F32, 1324 -iacByTpsTaper = scalar, F32, 1328 -throttlePedalUpState = scalar, S32, 1332, "", 1, 0 -mightResetPid = bits, U32, 1336, [0:0] -shouldResetPid = bits, U32, 1336, [1:1] -wasResetPid = bits, U32, 1336, [2:2] -mustResetPid = bits, U32, 1336, [3:3] -isCranking = bits, U32, 1336, [4:4] -isIacTableForCoasting = bits, U32, 1336, [5:5] -notIdling = bits, U32, 1336, [6:6] -needReset = bits, U32, 1336, [7:7] -isInDeadZone = bits, U32, 1336, [8:8] -isBlipping = bits, U32, 1336, [9:9] -useClosedLoop = bits, U32, 1336, [10:10] -badTps = bits, U32, 1336, [11:11] -looksLikeRunning = bits, U32, 1336, [12:12] -looksLikeCoasting = bits, U32, 1336, [13:13] -looksLikeCrankToIdle = bits, U32, 1336, [14:14] -isIdleCoasting = bits, U32, 1336, [15:15] -isIdleClosedLoop = bits, U32, 1336, [16:16] -idleTarget = scalar, S32, 1340, "", 1, 0 -targetRpmByClt = scalar, S32, 1344, "", 1, 0 -targetRpmAc = scalar, S32, 1348, "", 1, 0 -iacByRpmTaper = scalar, F32, 1352 -luaAdd = scalar, F32, 1356 -; total TS size = 1360 -idlePosition0 = scalar, F32, 1360, "per", 1,0 -trim0 = scalar, F32, 1364, "", 1, 0 -luaAdjustment0 = scalar, F32, 1368, "per", 1,0 -m_wastegatePosition0 = scalar, F32, 1372, "per", 1,0 -etbFeedForward0 = scalar, F32, 1376 -etbIntegralError0 = scalar, F32, 1380, "", 1, 0 -etbCurrentTarget0 = scalar, F32, 1384, "%", 1, 0 -etbCurrentAdjustedTarget0 = scalar, F32, 1388, "%", 1, 0 -etbRevLimitActive0 = bits, U32, 1392, [0:0] -jamDetected0 = bits, U32, 1392, [1:1] -etbDutyRateOfChange0 = scalar, F32, 1396, "per", 1,0 -etbDutyAverage0 = scalar, F32, 1400, "per", 1,0 -etbTpsErrorCounter0 = scalar, U16, 1404, "count", 1,0 -etbPpsErrorCounter0 = scalar, U16, 1406, "count", 1,0 -etbErrorCode0 = scalar, S08, 1408, "", 1, 0 -tcEtbDrop0 = scalar, S08, 1409, "", 1, 0 -jamTimer0 = scalar, U16, 1410, "sec", 0.01, 0 -; total TS size = 1412 -faultCode0 = scalar, U08, 1412, "", 1, 0 -heaterDuty0 = scalar, U08, 1413, "%", 1, 0 -pumpDuty0 = scalar, U08, 1414, "%", 1, 0 -tempC0 = scalar, U16, 1416, "C", 1, 0 -nernstVoltage0 = scalar, U16, 1418, "V", 0.001, 0 -esr0 = scalar, U16, 1420, "ohm", 1, 0 +luaSoftSparkSkip = scalar, F32, 1124, "", 1, 0 +luaHardSparkSkip = scalar, F32, 1128, "", 1, 0 +tractionControlSparkSkip = scalar, F32, 1132, "", 1, 0 +desiredRpmLimit = scalar, S16, 1136, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 1140, "", 1, 0 +globalSparkCounter = scalar, U32, 1144, "", 1, 0 +fuelingLoad = scalar, F32, 1148, "", 1, 0 +ignitionLoad = scalar, F32, 1152, "", 1, 0 +veTableYAxis = scalar, U16, 1156, "%", 0.01, 0 +; total TS size = 1160 +tpsFrom = scalar, F32, 1160 +tpsTo = scalar, F32, 1164 +deltaTps = scalar, F32, 1168 +extraFuel = scalar, F32, 1172, "", 1, 0 +valueFromTable = scalar, F32, 1176, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1180, [0:0] +isBelowDecelThreshold = bits, U32, 1180, [1:1] +isTimeToResetAccumulator = bits, U32, 1180, [2:2] +isFractionalEnrichment = bits, U32, 1180, [3:3] +belowEpsilon = bits, U32, 1180, [4:4] +tooShort = bits, U32, 1180, [5:5] +fractionalInjFuel = scalar, F32, 1184, "", 1, 0 +accumulatedValue = scalar, F32, 1188, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1192, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1196, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1200, "", 1, 0 +cycleCnt = scalar, S32, 1204, "", 1, 0 +; total TS size = 1208 +hwEventCounters1 = scalar, U32, 1208, "", 1, 0 +hwEventCounters2 = scalar, U32, 1212, "", 1, 0 +hwEventCounters3 = scalar, U32, 1216, "", 1, 0 +hwEventCounters4 = scalar, U32, 1220, "", 1, 0 +hwEventCounters5 = scalar, U32, 1224, "", 1, 0 +hwEventCounters6 = scalar, U32, 1228, "", 1, 0 +vvtCamCounter = scalar, U32, 1232, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1236, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1240, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1244, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1245, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1248, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1252, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1256, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1260, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1264, [0:0] +; total TS size = 1268 +crankSynchronizationCounter0 = scalar, U32, 1268, "", 1, 0 +vvtSyncGapRatio0 = scalar, F32, 1272, "", 1, 0 +vvtToothDurations00 = scalar, U32, 1276, "us", 1, 0 +vvtCurrentPosition0 = scalar, F32, 1280, "sync: Primary Cam Position", 1, 0 +vvtToothPosition10 = scalar, F32, 1284, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition20 = scalar, F32, 1288, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition30 = scalar, F32, 1292, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition40 = scalar, F32, 1296, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio0 = scalar, F32, 1300, "", 1, 0 +triggerStateIndex0 = scalar, U08, 1304, "", 1, 0 +vvtStateIndex0 = scalar, U08, 1305, "", 1, 0 +; total TS size = 1308 +camResyncCounter = scalar, U08, 1308, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1312, [0:0] +; total TS size = 1316 +wallFuelCorrection = scalar, F32, 1316, "", 1, 0 +wallFuel = scalar, F32, 1320, "", 1, 0 +; total TS size = 1324 +idleState = bits, S32, 1324, [0:2], "not important" +currentIdlePosition = scalar, F32, 1328 +baseIdlePosition = scalar, F32, 1332 +idleClosedLoop = scalar, F32, 1336 +iacByTpsTaper = scalar, F32, 1340 +throttlePedalUpState = scalar, S32, 1344, "", 1, 0 +mightResetPid = bits, U32, 1348, [0:0] +shouldResetPid = bits, U32, 1348, [1:1] +wasResetPid = bits, U32, 1348, [2:2] +mustResetPid = bits, U32, 1348, [3:3] +isCranking = bits, U32, 1348, [4:4] +isIacTableForCoasting = bits, U32, 1348, [5:5] +notIdling = bits, U32, 1348, [6:6] +needReset = bits, U32, 1348, [7:7] +isInDeadZone = bits, U32, 1348, [8:8] +isBlipping = bits, U32, 1348, [9:9] +useClosedLoop = bits, U32, 1348, [10:10] +badTps = bits, U32, 1348, [11:11] +looksLikeRunning = bits, U32, 1348, [12:12] +looksLikeCoasting = bits, U32, 1348, [13:13] +looksLikeCrankToIdle = bits, U32, 1348, [14:14] +isIdleCoasting = bits, U32, 1348, [15:15] +isIdleClosedLoop = bits, U32, 1348, [16:16] +idleTarget = scalar, S32, 1352, "", 1, 0 +targetRpmByClt = scalar, S32, 1356, "", 1, 0 +targetRpmAc = scalar, S32, 1360, "", 1, 0 +iacByRpmTaper = scalar, F32, 1364 +luaAdd = scalar, F32, 1368 +; total TS size = 1372 +idlePosition0 = scalar, F32, 1372, "per", 1,0 +trim0 = scalar, F32, 1376, "", 1, 0 +luaAdjustment0 = scalar, F32, 1380, "per", 1,0 +m_wastegatePosition0 = scalar, F32, 1384, "per", 1,0 +etbFeedForward0 = scalar, F32, 1388 +etbIntegralError0 = scalar, F32, 1392, "", 1, 0 +etbCurrentTarget0 = scalar, F32, 1396, "%", 1, 0 +etbCurrentAdjustedTarget0 = scalar, F32, 1400, "%", 1, 0 +etbRevLimitActive0 = bits, U32, 1404, [0:0] +jamDetected0 = bits, U32, 1404, [1:1] +etbDutyRateOfChange0 = scalar, F32, 1408, "per", 1,0 +etbDutyAverage0 = scalar, F32, 1412, "per", 1,0 +etbTpsErrorCounter0 = scalar, U16, 1416, "count", 1,0 +etbPpsErrorCounter0 = scalar, U16, 1418, "count", 1,0 +etbErrorCode0 = scalar, S08, 1420, "", 1, 0 +tcEtbDrop0 = scalar, S08, 1421, "", 1, 0 +jamTimer0 = scalar, U16, 1422, "sec", 0.01, 0 ; total TS size = 1424 -dcOutput0 = scalar, F32, 1424, "per", 1,0 -isEnabled0_int = scalar, U08, 1428, "per", 1,0 -isEnabled0 = bits, U32, 1432, [0:0] +faultCode0 = scalar, U08, 1424, "", 1, 0 +heaterDuty0 = scalar, U08, 1425, "%", 1, 0 +pumpDuty0 = scalar, U08, 1426, "%", 1, 0 +tempC0 = scalar, U16, 1428, "C", 1, 0 +nernstVoltage0 = scalar, U16, 1430, "V", 0.001, 0 +esr0 = scalar, U16, 1432, "ohm", 1, 0 ; total TS size = 1436 -value0 = scalar, U16, 1436, "value", 1,0 -value1 = scalar, U16, 1438, "value", 1,0 -errorRate = scalar, F32, 1440, "ratio", 1,0 -; total TS size = 1444 -vvtTarget = scalar, U16, 1444, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1446, "%", 0.5, 0 +dcOutput0 = scalar, F32, 1436, "per", 1,0 +isEnabled0_int = scalar, U08, 1440, "per", 1,0 +isEnabled0 = bits, U32, 1444, [0:0] ; total TS size = 1448 -lambdaCurrentlyGood = bits, U32, 1448, [0:0] -lambdaMonitorCut = bits, U32, 1448, [1:1] -lambdaTimeSinceGood = scalar, U16, 1452, "sec", 0.01, 0 +value0 = scalar, U16, 1448, "value", 1,0 +value1 = scalar, U16, 1450, "value", 1,0 +errorRate = scalar, F32, 1452, "ratio", 1,0 ; total TS size = 1456 +vvtTarget = scalar, U16, 1456, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1458, "%", 0.5, 0 +; total TS size = 1460 +lambdaCurrentlyGood = bits, U32, 1460, [0:0] +lambdaMonitorCut = bits, U32, 1460, [1:1] +lambdaTimeSinceGood = scalar, U16, 1464, "sec", 0.01, 0 +; total TS size = 1468 time = { timeNow } @@ -5401,7 +5404,6 @@ entry = smartChipState, "smartChipState", int, "%d" entry = smartChipRestartCounter, "smartChipRestartCounter", int, "%d" entry = smartChipAliveCounter, "smartChipAliveCounter", int, "%d" entry = startStopPhysicalState, "startStopPhysicalState", int, "%d" -entry = acrStateDup, "acrStateDup", int, "%d" entry = acrEngineMovedRecently, "acrEngineMovedRecently", int, "%d" entry = heaterControlEnabled, "heaterControlEnabled", int, "%d" entry = luaDigitalState0, "luaDigitalState0", int, "%d" @@ -5411,6 +5413,9 @@ entry = luaDigitalState3, "luaDigitalState3", int, "%d" entry = startStopStateToggleCounter, "startStopStateToggleCounter", int, "%d" entry = egtValue1, "egtValue1", float, "%.3f" entry = egtValue2, "egtValue2", float, "%.3f" +entry = luaSoftSparkSkip, "luaSoftSparkSkip", float, "%.3f" +entry = luaHardSparkSkip, "luaHardSparkSkip", float, "%.3f" +entry = tractionControlSparkSkip, "tractionControlSparkSkip", float, "%.3f" entry = desiredRpmLimit, "User-defined RPM hard limit", int, "%d" entry = fuelInjectionCounter, "Fuel: Injection counter", int, "%d" entry = globalSparkCounter, "Ign: Spark counter", int, "%d" @@ -5911,7 +5916,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 @@ -6359,7 +6364,6 @@ indicatorPanel = engine_stateIndicatorPanel, 2 indicator = {lua_luaDisableEtb}, "luaDisableEtb No", "luaDisableEtb Yes" indicator = {lua_luaIgnCut}, "luaIgnCut No", "luaIgnCut Yes" indicator = {startStopPhysicalState}, "startStopPhysicalState No", "startStopPhysicalState Yes" - indicator = {acrStateDup}, "acrStateDup No", "acrStateDup Yes" indicator = {acrEngineMovedRecently}, "acrEngineMovedRecently No", "acrEngineMovedRecently Yes" indicator = {heaterControlEnabled}, "heaterControlEnabled No", "heaterControlEnabled Yes" indicator = {luaDigitalState0}, "luaDigitalState0 No", "luaDigitalState0 Yes" @@ -6395,12 +6399,16 @@ dialog = engine_stateDialog, "engine_state" graphLine = egtValue1 graphLine = egtValue2 liveGraph = engine_state_6_Graph, "Graph", South + graphLine = luaSoftSparkSkip + graphLine = luaHardSparkSkip + graphLine = tractionControlSparkSkip graphLine = desiredRpmLimit + liveGraph = engine_state_7_Graph, "Graph", South graphLine = fuelInjectionCounter graphLine = globalSparkCounter graphLine = fuelingLoad - liveGraph = engine_state_7_Graph, "Graph", South graphLine = ignitionLoad + liveGraph = engine_state_8_Graph, "Graph", South graphLine = veTableYAxis indicatorPanel = tps_accel_stateIndicatorPanel, 2 @@ -7307,6 +7315,10 @@ dialog = lambda_monitorDialog, "lambda_monitor" 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 diff --git a/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini b/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini index e03513ad5a..da102f0bb5 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini @@ -37,12 +37,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.03.05.hellen88bmw.571597584" + signature = "rusEFI master.2024.03.05.hellen88bmw.1837847336" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.03.05.hellen88bmw.571597584" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.03.05.hellen88bmw.1837847336" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -98,7 +98,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","VIN5","VIN6","INVALID","PPS1","73 - TPS","56 - Battery Sense","17 - CAM","Aux BARO","Aux TPS2","16 - CRANK","41 - MAF","Aux MAP","78 - CLT","77 - IAT","Aux PPS2","Aux TPS3" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue Mar 05 00:52:31 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue Mar 05 01:56:35 UTC 2024 pageSize = 22236 page = 1 @@ -745,6 +745,7 @@ mc33810Gpgd3Mode = bits, U32, 1576, [4:4], "false", "true" enableExtendedCanBroadcast = bits, U32, 1576, [5:5], "false", "true" luaCanRxWorkaround = bits, U32, 1576, [6:6], "false", "true" flexSensorInverted = bits, U32, 1576, [7:7], "false", "true" +useHardSkipInTraction = bits, U32, 1576, [8:8], "false", "true" useAuxSpeedForSlipRatio = bits, U32, 1576, [11:11], "false", "true" useVssAsSecondWheelSpeed = bits, U32, 1576, [12:12], "false", "true" is_enabled_spi_5 = bits, U32, 1576, [13:13], "false", "true" @@ -2468,7 +2469,7 @@ injectorStagingRpmBins = array, U16, 22222, [6], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1456 + ochBlockSize = 1468 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3131,145 +3132,147 @@ smartChipState = scalar, S08, 1102, "", 1, 0 smartChipRestartCounter = scalar, S08, 1103, "", 1, 0 smartChipAliveCounter = scalar, S08, 1104, "", 1, 0 startStopPhysicalState = bits, U32, 1108, [0:0] -acrStateDup = bits, U32, 1108, [1:1] -acrEngineMovedRecently = bits, U32, 1108, [2:2] -heaterControlEnabled = bits, U32, 1108, [3:3] -luaDigitalState0 = bits, U32, 1108, [4:4] -luaDigitalState1 = bits, U32, 1108, [5:5] -luaDigitalState2 = bits, U32, 1108, [6:6] -luaDigitalState3 = bits, U32, 1108, [7:7] +acrEngineMovedRecently = bits, U32, 1108, [1:1] +heaterControlEnabled = bits, U32, 1108, [2:2] +luaDigitalState0 = bits, U32, 1108, [3:3] +luaDigitalState1 = bits, U32, 1108, [4:4] +luaDigitalState2 = bits, U32, 1108, [5:5] +luaDigitalState3 = bits, U32, 1108, [6:6] startStopStateToggleCounter = scalar, U32, 1112, "", 1, 0 egtValue1 = scalar, F32, 1116, "", 1, 0 egtValue2 = scalar, F32, 1120, "", 1, 0 -desiredRpmLimit = scalar, S16, 1124, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1128, "", 1, 0 -globalSparkCounter = scalar, U32, 1132, "", 1, 0 -fuelingLoad = scalar, F32, 1136, "", 1, 0 -ignitionLoad = scalar, F32, 1140, "", 1, 0 -veTableYAxis = scalar, U16, 1144, "%", 0.01, 0 -; total TS size = 1148 -tpsFrom = scalar, F32, 1148 -tpsTo = scalar, F32, 1152 -deltaTps = scalar, F32, 1156 -extraFuel = scalar, F32, 1160, "", 1, 0 -valueFromTable = scalar, F32, 1164, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1168, [0:0] -isBelowDecelThreshold = bits, U32, 1168, [1:1] -isTimeToResetAccumulator = bits, U32, 1168, [2:2] -isFractionalEnrichment = bits, U32, 1168, [3:3] -belowEpsilon = bits, U32, 1168, [4:4] -tooShort = bits, U32, 1168, [5:5] -fractionalInjFuel = scalar, F32, 1172, "", 1, 0 -accumulatedValue = scalar, F32, 1176, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1180, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1184, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1188, "", 1, 0 -cycleCnt = scalar, S32, 1192, "", 1, 0 -; total TS size = 1196 -hwEventCounters1 = scalar, U32, 1196, "", 1, 0 -hwEventCounters2 = scalar, U32, 1200, "", 1, 0 -hwEventCounters3 = scalar, U32, 1204, "", 1, 0 -hwEventCounters4 = scalar, U32, 1208, "", 1, 0 -hwEventCounters5 = scalar, U32, 1212, "", 1, 0 -hwEventCounters6 = scalar, U32, 1216, "", 1, 0 -vvtCamCounter = scalar, U32, 1220, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1224, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1228, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1232, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1233, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1236, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1240, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1244, "", 1, 0 -mapCamPrevToothAngle = scalar, F32, 1248, "deg", 1, 0 -isDecodingMapCam = bits, U32, 1252, [0:0] -; total TS size = 1256 -crankSynchronizationCounter0 = scalar, U32, 1256, "", 1, 0 -vvtSyncGapRatio0 = scalar, F32, 1260, "", 1, 0 -vvtToothDurations00 = scalar, U32, 1264, "us", 1, 0 -vvtCurrentPosition0 = scalar, F32, 1268, "sync: Primary Cam Position", 1, 0 -vvtToothPosition10 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition20 = scalar, F32, 1276, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition30 = scalar, F32, 1280, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition40 = scalar, F32, 1284, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio0 = scalar, F32, 1288, "", 1, 0 -triggerStateIndex0 = scalar, U08, 1292, "", 1, 0 -vvtStateIndex0 = scalar, U08, 1293, "", 1, 0 -; total TS size = 1296 -camResyncCounter = scalar, U08, 1296, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1300, [0:0] -; total TS size = 1304 -wallFuelCorrection = scalar, F32, 1304, "", 1, 0 -wallFuel = scalar, F32, 1308, "", 1, 0 -; total TS size = 1312 -idleState = bits, S32, 1312, [0:2], "not important" -currentIdlePosition = scalar, F32, 1316 -baseIdlePosition = scalar, F32, 1320 -idleClosedLoop = scalar, F32, 1324 -iacByTpsTaper = scalar, F32, 1328 -throttlePedalUpState = scalar, S32, 1332, "", 1, 0 -mightResetPid = bits, U32, 1336, [0:0] -shouldResetPid = bits, U32, 1336, [1:1] -wasResetPid = bits, U32, 1336, [2:2] -mustResetPid = bits, U32, 1336, [3:3] -isCranking = bits, U32, 1336, [4:4] -isIacTableForCoasting = bits, U32, 1336, [5:5] -notIdling = bits, U32, 1336, [6:6] -needReset = bits, U32, 1336, [7:7] -isInDeadZone = bits, U32, 1336, [8:8] -isBlipping = bits, U32, 1336, [9:9] -useClosedLoop = bits, U32, 1336, [10:10] -badTps = bits, U32, 1336, [11:11] -looksLikeRunning = bits, U32, 1336, [12:12] -looksLikeCoasting = bits, U32, 1336, [13:13] -looksLikeCrankToIdle = bits, U32, 1336, [14:14] -isIdleCoasting = bits, U32, 1336, [15:15] -isIdleClosedLoop = bits, U32, 1336, [16:16] -idleTarget = scalar, S32, 1340, "", 1, 0 -targetRpmByClt = scalar, S32, 1344, "", 1, 0 -targetRpmAc = scalar, S32, 1348, "", 1, 0 -iacByRpmTaper = scalar, F32, 1352 -luaAdd = scalar, F32, 1356 -; total TS size = 1360 -idlePosition0 = scalar, F32, 1360, "per", 1,0 -trim0 = scalar, F32, 1364, "", 1, 0 -luaAdjustment0 = scalar, F32, 1368, "per", 1,0 -m_wastegatePosition0 = scalar, F32, 1372, "per", 1,0 -etbFeedForward0 = scalar, F32, 1376 -etbIntegralError0 = scalar, F32, 1380, "", 1, 0 -etbCurrentTarget0 = scalar, F32, 1384, "%", 1, 0 -etbCurrentAdjustedTarget0 = scalar, F32, 1388, "%", 1, 0 -etbRevLimitActive0 = bits, U32, 1392, [0:0] -jamDetected0 = bits, U32, 1392, [1:1] -etbDutyRateOfChange0 = scalar, F32, 1396, "per", 1,0 -etbDutyAverage0 = scalar, F32, 1400, "per", 1,0 -etbTpsErrorCounter0 = scalar, U16, 1404, "count", 1,0 -etbPpsErrorCounter0 = scalar, U16, 1406, "count", 1,0 -etbErrorCode0 = scalar, S08, 1408, "", 1, 0 -tcEtbDrop0 = scalar, S08, 1409, "", 1, 0 -jamTimer0 = scalar, U16, 1410, "sec", 0.01, 0 -; total TS size = 1412 -faultCode0 = scalar, U08, 1412, "", 1, 0 -heaterDuty0 = scalar, U08, 1413, "%", 1, 0 -pumpDuty0 = scalar, U08, 1414, "%", 1, 0 -tempC0 = scalar, U16, 1416, "C", 1, 0 -nernstVoltage0 = scalar, U16, 1418, "V", 0.001, 0 -esr0 = scalar, U16, 1420, "ohm", 1, 0 +luaSoftSparkSkip = scalar, F32, 1124, "", 1, 0 +luaHardSparkSkip = scalar, F32, 1128, "", 1, 0 +tractionControlSparkSkip = scalar, F32, 1132, "", 1, 0 +desiredRpmLimit = scalar, S16, 1136, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 1140, "", 1, 0 +globalSparkCounter = scalar, U32, 1144, "", 1, 0 +fuelingLoad = scalar, F32, 1148, "", 1, 0 +ignitionLoad = scalar, F32, 1152, "", 1, 0 +veTableYAxis = scalar, U16, 1156, "%", 0.01, 0 +; total TS size = 1160 +tpsFrom = scalar, F32, 1160 +tpsTo = scalar, F32, 1164 +deltaTps = scalar, F32, 1168 +extraFuel = scalar, F32, 1172, "", 1, 0 +valueFromTable = scalar, F32, 1176, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1180, [0:0] +isBelowDecelThreshold = bits, U32, 1180, [1:1] +isTimeToResetAccumulator = bits, U32, 1180, [2:2] +isFractionalEnrichment = bits, U32, 1180, [3:3] +belowEpsilon = bits, U32, 1180, [4:4] +tooShort = bits, U32, 1180, [5:5] +fractionalInjFuel = scalar, F32, 1184, "", 1, 0 +accumulatedValue = scalar, F32, 1188, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1192, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1196, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1200, "", 1, 0 +cycleCnt = scalar, S32, 1204, "", 1, 0 +; total TS size = 1208 +hwEventCounters1 = scalar, U32, 1208, "", 1, 0 +hwEventCounters2 = scalar, U32, 1212, "", 1, 0 +hwEventCounters3 = scalar, U32, 1216, "", 1, 0 +hwEventCounters4 = scalar, U32, 1220, "", 1, 0 +hwEventCounters5 = scalar, U32, 1224, "", 1, 0 +hwEventCounters6 = scalar, U32, 1228, "", 1, 0 +vvtCamCounter = scalar, U32, 1232, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1236, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1240, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1244, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1245, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1248, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1252, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1256, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1260, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1264, [0:0] +; total TS size = 1268 +crankSynchronizationCounter0 = scalar, U32, 1268, "", 1, 0 +vvtSyncGapRatio0 = scalar, F32, 1272, "", 1, 0 +vvtToothDurations00 = scalar, U32, 1276, "us", 1, 0 +vvtCurrentPosition0 = scalar, F32, 1280, "sync: Primary Cam Position", 1, 0 +vvtToothPosition10 = scalar, F32, 1284, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition20 = scalar, F32, 1288, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition30 = scalar, F32, 1292, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition40 = scalar, F32, 1296, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio0 = scalar, F32, 1300, "", 1, 0 +triggerStateIndex0 = scalar, U08, 1304, "", 1, 0 +vvtStateIndex0 = scalar, U08, 1305, "", 1, 0 +; total TS size = 1308 +camResyncCounter = scalar, U08, 1308, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1312, [0:0] +; total TS size = 1316 +wallFuelCorrection = scalar, F32, 1316, "", 1, 0 +wallFuel = scalar, F32, 1320, "", 1, 0 +; total TS size = 1324 +idleState = bits, S32, 1324, [0:2], "not important" +currentIdlePosition = scalar, F32, 1328 +baseIdlePosition = scalar, F32, 1332 +idleClosedLoop = scalar, F32, 1336 +iacByTpsTaper = scalar, F32, 1340 +throttlePedalUpState = scalar, S32, 1344, "", 1, 0 +mightResetPid = bits, U32, 1348, [0:0] +shouldResetPid = bits, U32, 1348, [1:1] +wasResetPid = bits, U32, 1348, [2:2] +mustResetPid = bits, U32, 1348, [3:3] +isCranking = bits, U32, 1348, [4:4] +isIacTableForCoasting = bits, U32, 1348, [5:5] +notIdling = bits, U32, 1348, [6:6] +needReset = bits, U32, 1348, [7:7] +isInDeadZone = bits, U32, 1348, [8:8] +isBlipping = bits, U32, 1348, [9:9] +useClosedLoop = bits, U32, 1348, [10:10] +badTps = bits, U32, 1348, [11:11] +looksLikeRunning = bits, U32, 1348, [12:12] +looksLikeCoasting = bits, U32, 1348, [13:13] +looksLikeCrankToIdle = bits, U32, 1348, [14:14] +isIdleCoasting = bits, U32, 1348, [15:15] +isIdleClosedLoop = bits, U32, 1348, [16:16] +idleTarget = scalar, S32, 1352, "", 1, 0 +targetRpmByClt = scalar, S32, 1356, "", 1, 0 +targetRpmAc = scalar, S32, 1360, "", 1, 0 +iacByRpmTaper = scalar, F32, 1364 +luaAdd = scalar, F32, 1368 +; total TS size = 1372 +idlePosition0 = scalar, F32, 1372, "per", 1,0 +trim0 = scalar, F32, 1376, "", 1, 0 +luaAdjustment0 = scalar, F32, 1380, "per", 1,0 +m_wastegatePosition0 = scalar, F32, 1384, "per", 1,0 +etbFeedForward0 = scalar, F32, 1388 +etbIntegralError0 = scalar, F32, 1392, "", 1, 0 +etbCurrentTarget0 = scalar, F32, 1396, "%", 1, 0 +etbCurrentAdjustedTarget0 = scalar, F32, 1400, "%", 1, 0 +etbRevLimitActive0 = bits, U32, 1404, [0:0] +jamDetected0 = bits, U32, 1404, [1:1] +etbDutyRateOfChange0 = scalar, F32, 1408, "per", 1,0 +etbDutyAverage0 = scalar, F32, 1412, "per", 1,0 +etbTpsErrorCounter0 = scalar, U16, 1416, "count", 1,0 +etbPpsErrorCounter0 = scalar, U16, 1418, "count", 1,0 +etbErrorCode0 = scalar, S08, 1420, "", 1, 0 +tcEtbDrop0 = scalar, S08, 1421, "", 1, 0 +jamTimer0 = scalar, U16, 1422, "sec", 0.01, 0 ; total TS size = 1424 -dcOutput0 = scalar, F32, 1424, "per", 1,0 -isEnabled0_int = scalar, U08, 1428, "per", 1,0 -isEnabled0 = bits, U32, 1432, [0:0] +faultCode0 = scalar, U08, 1424, "", 1, 0 +heaterDuty0 = scalar, U08, 1425, "%", 1, 0 +pumpDuty0 = scalar, U08, 1426, "%", 1, 0 +tempC0 = scalar, U16, 1428, "C", 1, 0 +nernstVoltage0 = scalar, U16, 1430, "V", 0.001, 0 +esr0 = scalar, U16, 1432, "ohm", 1, 0 ; total TS size = 1436 -value0 = scalar, U16, 1436, "value", 1,0 -value1 = scalar, U16, 1438, "value", 1,0 -errorRate = scalar, F32, 1440, "ratio", 1,0 -; total TS size = 1444 -vvtTarget = scalar, U16, 1444, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1446, "%", 0.5, 0 +dcOutput0 = scalar, F32, 1436, "per", 1,0 +isEnabled0_int = scalar, U08, 1440, "per", 1,0 +isEnabled0 = bits, U32, 1444, [0:0] ; total TS size = 1448 -lambdaCurrentlyGood = bits, U32, 1448, [0:0] -lambdaMonitorCut = bits, U32, 1448, [1:1] -lambdaTimeSinceGood = scalar, U16, 1452, "sec", 0.01, 0 +value0 = scalar, U16, 1448, "value", 1,0 +value1 = scalar, U16, 1450, "value", 1,0 +errorRate = scalar, F32, 1452, "ratio", 1,0 ; total TS size = 1456 +vvtTarget = scalar, U16, 1456, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1458, "%", 0.5, 0 +; total TS size = 1460 +lambdaCurrentlyGood = bits, U32, 1460, [0:0] +lambdaMonitorCut = bits, U32, 1460, [1:1] +lambdaTimeSinceGood = scalar, U16, 1464, "sec", 0.01, 0 +; total TS size = 1468 time = { timeNow } @@ -5401,7 +5404,6 @@ entry = smartChipState, "smartChipState", int, "%d" entry = smartChipRestartCounter, "smartChipRestartCounter", int, "%d" entry = smartChipAliveCounter, "smartChipAliveCounter", int, "%d" entry = startStopPhysicalState, "startStopPhysicalState", int, "%d" -entry = acrStateDup, "acrStateDup", int, "%d" entry = acrEngineMovedRecently, "acrEngineMovedRecently", int, "%d" entry = heaterControlEnabled, "heaterControlEnabled", int, "%d" entry = luaDigitalState0, "luaDigitalState0", int, "%d" @@ -5411,6 +5413,9 @@ entry = luaDigitalState3, "luaDigitalState3", int, "%d" entry = startStopStateToggleCounter, "startStopStateToggleCounter", int, "%d" entry = egtValue1, "egtValue1", float, "%.3f" entry = egtValue2, "egtValue2", float, "%.3f" +entry = luaSoftSparkSkip, "luaSoftSparkSkip", float, "%.3f" +entry = luaHardSparkSkip, "luaHardSparkSkip", float, "%.3f" +entry = tractionControlSparkSkip, "tractionControlSparkSkip", float, "%.3f" entry = desiredRpmLimit, "User-defined RPM hard limit", int, "%d" entry = fuelInjectionCounter, "Fuel: Injection counter", int, "%d" entry = globalSparkCounter, "Ign: Spark counter", int, "%d" @@ -5909,7 +5914,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 @@ -6357,7 +6362,6 @@ indicatorPanel = engine_stateIndicatorPanel, 2 indicator = {lua_luaDisableEtb}, "luaDisableEtb No", "luaDisableEtb Yes" indicator = {lua_luaIgnCut}, "luaIgnCut No", "luaIgnCut Yes" indicator = {startStopPhysicalState}, "startStopPhysicalState No", "startStopPhysicalState Yes" - indicator = {acrStateDup}, "acrStateDup No", "acrStateDup Yes" indicator = {acrEngineMovedRecently}, "acrEngineMovedRecently No", "acrEngineMovedRecently Yes" indicator = {heaterControlEnabled}, "heaterControlEnabled No", "heaterControlEnabled Yes" indicator = {luaDigitalState0}, "luaDigitalState0 No", "luaDigitalState0 Yes" @@ -6393,12 +6397,16 @@ dialog = engine_stateDialog, "engine_state" graphLine = egtValue1 graphLine = egtValue2 liveGraph = engine_state_6_Graph, "Graph", South + graphLine = luaSoftSparkSkip + graphLine = luaHardSparkSkip + graphLine = tractionControlSparkSkip graphLine = desiredRpmLimit + liveGraph = engine_state_7_Graph, "Graph", South graphLine = fuelInjectionCounter graphLine = globalSparkCounter graphLine = fuelingLoad - liveGraph = engine_state_7_Graph, "Graph", South graphLine = ignitionLoad + liveGraph = engine_state_8_Graph, "Graph", South graphLine = veTableYAxis indicatorPanel = tps_accel_stateIndicatorPanel, 2 @@ -7304,6 +7312,10 @@ dialog = lambda_monitorDialog, "lambda_monitor" 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 diff --git a/firmware/tunerstudio/generated/rusefi_hellenNA6.ini b/firmware/tunerstudio/generated/rusefi_hellenNA6.ini index 9a8f859b41..ca5956ea96 100644 --- a/firmware/tunerstudio/generated/rusefi_hellenNA6.ini +++ b/firmware/tunerstudio/generated/rusefi_hellenNA6.ini @@ -37,12 +37,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.03.05.hellenNA6.3288827221" + signature = "rusEFI master.2024.03.05.hellenNA6.2342335853" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.03.05.hellenNA6.3288827221" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.03.05.hellenNA6.2342335853" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -98,7 +98,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","3N - O2S","2N - Temperature Sensor","intMAP (A15)","4I - PPS1","TPS Input","1B - Battery Sense","INVALID","4G - PPS2 OR TEMPERATURE SENSOR","4H - TPS2","INVALID","3O - MAF","2M - Pressure Sensor","3Q - CLT","3P - IAT","1V - Clutch Switch","1Q AC Switch" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue Mar 05 00:52:40 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue Mar 05 01:56:45 UTC 2024 pageSize = 22236 page = 1 @@ -745,6 +745,7 @@ mc33810Gpgd3Mode = bits, U32, 1576, [4:4], "false", "true" enableExtendedCanBroadcast = bits, U32, 1576, [5:5], "false", "true" luaCanRxWorkaround = bits, U32, 1576, [6:6], "false", "true" flexSensorInverted = bits, U32, 1576, [7:7], "false", "true" +useHardSkipInTraction = bits, U32, 1576, [8:8], "false", "true" useAuxSpeedForSlipRatio = bits, U32, 1576, [11:11], "false", "true" useVssAsSecondWheelSpeed = bits, U32, 1576, [12:12], "false", "true" is_enabled_spi_5 = bits, U32, 1576, [13:13], "false", "true" @@ -2468,7 +2469,7 @@ injectorStagingRpmBins = array, U16, 22222, [6], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1456 + ochBlockSize = 1468 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3131,145 +3132,147 @@ smartChipState = scalar, S08, 1102, "", 1, 0 smartChipRestartCounter = scalar, S08, 1103, "", 1, 0 smartChipAliveCounter = scalar, S08, 1104, "", 1, 0 startStopPhysicalState = bits, U32, 1108, [0:0] -acrStateDup = bits, U32, 1108, [1:1] -acrEngineMovedRecently = bits, U32, 1108, [2:2] -heaterControlEnabled = bits, U32, 1108, [3:3] -luaDigitalState0 = bits, U32, 1108, [4:4] -luaDigitalState1 = bits, U32, 1108, [5:5] -luaDigitalState2 = bits, U32, 1108, [6:6] -luaDigitalState3 = bits, U32, 1108, [7:7] +acrEngineMovedRecently = bits, U32, 1108, [1:1] +heaterControlEnabled = bits, U32, 1108, [2:2] +luaDigitalState0 = bits, U32, 1108, [3:3] +luaDigitalState1 = bits, U32, 1108, [4:4] +luaDigitalState2 = bits, U32, 1108, [5:5] +luaDigitalState3 = bits, U32, 1108, [6:6] startStopStateToggleCounter = scalar, U32, 1112, "", 1, 0 egtValue1 = scalar, F32, 1116, "", 1, 0 egtValue2 = scalar, F32, 1120, "", 1, 0 -desiredRpmLimit = scalar, S16, 1124, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1128, "", 1, 0 -globalSparkCounter = scalar, U32, 1132, "", 1, 0 -fuelingLoad = scalar, F32, 1136, "", 1, 0 -ignitionLoad = scalar, F32, 1140, "", 1, 0 -veTableYAxis = scalar, U16, 1144, "%", 0.01, 0 -; total TS size = 1148 -tpsFrom = scalar, F32, 1148 -tpsTo = scalar, F32, 1152 -deltaTps = scalar, F32, 1156 -extraFuel = scalar, F32, 1160, "", 1, 0 -valueFromTable = scalar, F32, 1164, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1168, [0:0] -isBelowDecelThreshold = bits, U32, 1168, [1:1] -isTimeToResetAccumulator = bits, U32, 1168, [2:2] -isFractionalEnrichment = bits, U32, 1168, [3:3] -belowEpsilon = bits, U32, 1168, [4:4] -tooShort = bits, U32, 1168, [5:5] -fractionalInjFuel = scalar, F32, 1172, "", 1, 0 -accumulatedValue = scalar, F32, 1176, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1180, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1184, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1188, "", 1, 0 -cycleCnt = scalar, S32, 1192, "", 1, 0 -; total TS size = 1196 -hwEventCounters1 = scalar, U32, 1196, "", 1, 0 -hwEventCounters2 = scalar, U32, 1200, "", 1, 0 -hwEventCounters3 = scalar, U32, 1204, "", 1, 0 -hwEventCounters4 = scalar, U32, 1208, "", 1, 0 -hwEventCounters5 = scalar, U32, 1212, "", 1, 0 -hwEventCounters6 = scalar, U32, 1216, "", 1, 0 -vvtCamCounter = scalar, U32, 1220, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1224, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1228, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1232, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1233, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1236, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1240, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1244, "", 1, 0 -mapCamPrevToothAngle = scalar, F32, 1248, "deg", 1, 0 -isDecodingMapCam = bits, U32, 1252, [0:0] -; total TS size = 1256 -crankSynchronizationCounter0 = scalar, U32, 1256, "", 1, 0 -vvtSyncGapRatio0 = scalar, F32, 1260, "", 1, 0 -vvtToothDurations00 = scalar, U32, 1264, "us", 1, 0 -vvtCurrentPosition0 = scalar, F32, 1268, "sync: Primary Cam Position", 1, 0 -vvtToothPosition10 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition20 = scalar, F32, 1276, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition30 = scalar, F32, 1280, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition40 = scalar, F32, 1284, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio0 = scalar, F32, 1288, "", 1, 0 -triggerStateIndex0 = scalar, U08, 1292, "", 1, 0 -vvtStateIndex0 = scalar, U08, 1293, "", 1, 0 -; total TS size = 1296 -camResyncCounter = scalar, U08, 1296, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1300, [0:0] -; total TS size = 1304 -wallFuelCorrection = scalar, F32, 1304, "", 1, 0 -wallFuel = scalar, F32, 1308, "", 1, 0 -; total TS size = 1312 -idleState = bits, S32, 1312, [0:2], "not important" -currentIdlePosition = scalar, F32, 1316 -baseIdlePosition = scalar, F32, 1320 -idleClosedLoop = scalar, F32, 1324 -iacByTpsTaper = scalar, F32, 1328 -throttlePedalUpState = scalar, S32, 1332, "", 1, 0 -mightResetPid = bits, U32, 1336, [0:0] -shouldResetPid = bits, U32, 1336, [1:1] -wasResetPid = bits, U32, 1336, [2:2] -mustResetPid = bits, U32, 1336, [3:3] -isCranking = bits, U32, 1336, [4:4] -isIacTableForCoasting = bits, U32, 1336, [5:5] -notIdling = bits, U32, 1336, [6:6] -needReset = bits, U32, 1336, [7:7] -isInDeadZone = bits, U32, 1336, [8:8] -isBlipping = bits, U32, 1336, [9:9] -useClosedLoop = bits, U32, 1336, [10:10] -badTps = bits, U32, 1336, [11:11] -looksLikeRunning = bits, U32, 1336, [12:12] -looksLikeCoasting = bits, U32, 1336, [13:13] -looksLikeCrankToIdle = bits, U32, 1336, [14:14] -isIdleCoasting = bits, U32, 1336, [15:15] -isIdleClosedLoop = bits, U32, 1336, [16:16] -idleTarget = scalar, S32, 1340, "", 1, 0 -targetRpmByClt = scalar, S32, 1344, "", 1, 0 -targetRpmAc = scalar, S32, 1348, "", 1, 0 -iacByRpmTaper = scalar, F32, 1352 -luaAdd = scalar, F32, 1356 -; total TS size = 1360 -idlePosition0 = scalar, F32, 1360, "per", 1,0 -trim0 = scalar, F32, 1364, "", 1, 0 -luaAdjustment0 = scalar, F32, 1368, "per", 1,0 -m_wastegatePosition0 = scalar, F32, 1372, "per", 1,0 -etbFeedForward0 = scalar, F32, 1376 -etbIntegralError0 = scalar, F32, 1380, "", 1, 0 -etbCurrentTarget0 = scalar, F32, 1384, "%", 1, 0 -etbCurrentAdjustedTarget0 = scalar, F32, 1388, "%", 1, 0 -etbRevLimitActive0 = bits, U32, 1392, [0:0] -jamDetected0 = bits, U32, 1392, [1:1] -etbDutyRateOfChange0 = scalar, F32, 1396, "per", 1,0 -etbDutyAverage0 = scalar, F32, 1400, "per", 1,0 -etbTpsErrorCounter0 = scalar, U16, 1404, "count", 1,0 -etbPpsErrorCounter0 = scalar, U16, 1406, "count", 1,0 -etbErrorCode0 = scalar, S08, 1408, "", 1, 0 -tcEtbDrop0 = scalar, S08, 1409, "", 1, 0 -jamTimer0 = scalar, U16, 1410, "sec", 0.01, 0 -; total TS size = 1412 -faultCode0 = scalar, U08, 1412, "", 1, 0 -heaterDuty0 = scalar, U08, 1413, "%", 1, 0 -pumpDuty0 = scalar, U08, 1414, "%", 1, 0 -tempC0 = scalar, U16, 1416, "C", 1, 0 -nernstVoltage0 = scalar, U16, 1418, "V", 0.001, 0 -esr0 = scalar, U16, 1420, "ohm", 1, 0 +luaSoftSparkSkip = scalar, F32, 1124, "", 1, 0 +luaHardSparkSkip = scalar, F32, 1128, "", 1, 0 +tractionControlSparkSkip = scalar, F32, 1132, "", 1, 0 +desiredRpmLimit = scalar, S16, 1136, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 1140, "", 1, 0 +globalSparkCounter = scalar, U32, 1144, "", 1, 0 +fuelingLoad = scalar, F32, 1148, "", 1, 0 +ignitionLoad = scalar, F32, 1152, "", 1, 0 +veTableYAxis = scalar, U16, 1156, "%", 0.01, 0 +; total TS size = 1160 +tpsFrom = scalar, F32, 1160 +tpsTo = scalar, F32, 1164 +deltaTps = scalar, F32, 1168 +extraFuel = scalar, F32, 1172, "", 1, 0 +valueFromTable = scalar, F32, 1176, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1180, [0:0] +isBelowDecelThreshold = bits, U32, 1180, [1:1] +isTimeToResetAccumulator = bits, U32, 1180, [2:2] +isFractionalEnrichment = bits, U32, 1180, [3:3] +belowEpsilon = bits, U32, 1180, [4:4] +tooShort = bits, U32, 1180, [5:5] +fractionalInjFuel = scalar, F32, 1184, "", 1, 0 +accumulatedValue = scalar, F32, 1188, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1192, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1196, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1200, "", 1, 0 +cycleCnt = scalar, S32, 1204, "", 1, 0 +; total TS size = 1208 +hwEventCounters1 = scalar, U32, 1208, "", 1, 0 +hwEventCounters2 = scalar, U32, 1212, "", 1, 0 +hwEventCounters3 = scalar, U32, 1216, "", 1, 0 +hwEventCounters4 = scalar, U32, 1220, "", 1, 0 +hwEventCounters5 = scalar, U32, 1224, "", 1, 0 +hwEventCounters6 = scalar, U32, 1228, "", 1, 0 +vvtCamCounter = scalar, U32, 1232, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1236, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1240, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1244, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1245, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1248, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1252, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1256, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1260, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1264, [0:0] +; total TS size = 1268 +crankSynchronizationCounter0 = scalar, U32, 1268, "", 1, 0 +vvtSyncGapRatio0 = scalar, F32, 1272, "", 1, 0 +vvtToothDurations00 = scalar, U32, 1276, "us", 1, 0 +vvtCurrentPosition0 = scalar, F32, 1280, "sync: Primary Cam Position", 1, 0 +vvtToothPosition10 = scalar, F32, 1284, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition20 = scalar, F32, 1288, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition30 = scalar, F32, 1292, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition40 = scalar, F32, 1296, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio0 = scalar, F32, 1300, "", 1, 0 +triggerStateIndex0 = scalar, U08, 1304, "", 1, 0 +vvtStateIndex0 = scalar, U08, 1305, "", 1, 0 +; total TS size = 1308 +camResyncCounter = scalar, U08, 1308, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1312, [0:0] +; total TS size = 1316 +wallFuelCorrection = scalar, F32, 1316, "", 1, 0 +wallFuel = scalar, F32, 1320, "", 1, 0 +; total TS size = 1324 +idleState = bits, S32, 1324, [0:2], "not important" +currentIdlePosition = scalar, F32, 1328 +baseIdlePosition = scalar, F32, 1332 +idleClosedLoop = scalar, F32, 1336 +iacByTpsTaper = scalar, F32, 1340 +throttlePedalUpState = scalar, S32, 1344, "", 1, 0 +mightResetPid = bits, U32, 1348, [0:0] +shouldResetPid = bits, U32, 1348, [1:1] +wasResetPid = bits, U32, 1348, [2:2] +mustResetPid = bits, U32, 1348, [3:3] +isCranking = bits, U32, 1348, [4:4] +isIacTableForCoasting = bits, U32, 1348, [5:5] +notIdling = bits, U32, 1348, [6:6] +needReset = bits, U32, 1348, [7:7] +isInDeadZone = bits, U32, 1348, [8:8] +isBlipping = bits, U32, 1348, [9:9] +useClosedLoop = bits, U32, 1348, [10:10] +badTps = bits, U32, 1348, [11:11] +looksLikeRunning = bits, U32, 1348, [12:12] +looksLikeCoasting = bits, U32, 1348, [13:13] +looksLikeCrankToIdle = bits, U32, 1348, [14:14] +isIdleCoasting = bits, U32, 1348, [15:15] +isIdleClosedLoop = bits, U32, 1348, [16:16] +idleTarget = scalar, S32, 1352, "", 1, 0 +targetRpmByClt = scalar, S32, 1356, "", 1, 0 +targetRpmAc = scalar, S32, 1360, "", 1, 0 +iacByRpmTaper = scalar, F32, 1364 +luaAdd = scalar, F32, 1368 +; total TS size = 1372 +idlePosition0 = scalar, F32, 1372, "per", 1,0 +trim0 = scalar, F32, 1376, "", 1, 0 +luaAdjustment0 = scalar, F32, 1380, "per", 1,0 +m_wastegatePosition0 = scalar, F32, 1384, "per", 1,0 +etbFeedForward0 = scalar, F32, 1388 +etbIntegralError0 = scalar, F32, 1392, "", 1, 0 +etbCurrentTarget0 = scalar, F32, 1396, "%", 1, 0 +etbCurrentAdjustedTarget0 = scalar, F32, 1400, "%", 1, 0 +etbRevLimitActive0 = bits, U32, 1404, [0:0] +jamDetected0 = bits, U32, 1404, [1:1] +etbDutyRateOfChange0 = scalar, F32, 1408, "per", 1,0 +etbDutyAverage0 = scalar, F32, 1412, "per", 1,0 +etbTpsErrorCounter0 = scalar, U16, 1416, "count", 1,0 +etbPpsErrorCounter0 = scalar, U16, 1418, "count", 1,0 +etbErrorCode0 = scalar, S08, 1420, "", 1, 0 +tcEtbDrop0 = scalar, S08, 1421, "", 1, 0 +jamTimer0 = scalar, U16, 1422, "sec", 0.01, 0 ; total TS size = 1424 -dcOutput0 = scalar, F32, 1424, "per", 1,0 -isEnabled0_int = scalar, U08, 1428, "per", 1,0 -isEnabled0 = bits, U32, 1432, [0:0] +faultCode0 = scalar, U08, 1424, "", 1, 0 +heaterDuty0 = scalar, U08, 1425, "%", 1, 0 +pumpDuty0 = scalar, U08, 1426, "%", 1, 0 +tempC0 = scalar, U16, 1428, "C", 1, 0 +nernstVoltage0 = scalar, U16, 1430, "V", 0.001, 0 +esr0 = scalar, U16, 1432, "ohm", 1, 0 ; total TS size = 1436 -value0 = scalar, U16, 1436, "value", 1,0 -value1 = scalar, U16, 1438, "value", 1,0 -errorRate = scalar, F32, 1440, "ratio", 1,0 -; total TS size = 1444 -vvtTarget = scalar, U16, 1444, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1446, "%", 0.5, 0 +dcOutput0 = scalar, F32, 1436, "per", 1,0 +isEnabled0_int = scalar, U08, 1440, "per", 1,0 +isEnabled0 = bits, U32, 1444, [0:0] ; total TS size = 1448 -lambdaCurrentlyGood = bits, U32, 1448, [0:0] -lambdaMonitorCut = bits, U32, 1448, [1:1] -lambdaTimeSinceGood = scalar, U16, 1452, "sec", 0.01, 0 +value0 = scalar, U16, 1448, "value", 1,0 +value1 = scalar, U16, 1450, "value", 1,0 +errorRate = scalar, F32, 1452, "ratio", 1,0 ; total TS size = 1456 +vvtTarget = scalar, U16, 1456, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1458, "%", 0.5, 0 +; total TS size = 1460 +lambdaCurrentlyGood = bits, U32, 1460, [0:0] +lambdaMonitorCut = bits, U32, 1460, [1:1] +lambdaTimeSinceGood = scalar, U16, 1464, "sec", 0.01, 0 +; total TS size = 1468 time = { timeNow } @@ -5401,7 +5404,6 @@ entry = smartChipState, "smartChipState", int, "%d" entry = smartChipRestartCounter, "smartChipRestartCounter", int, "%d" entry = smartChipAliveCounter, "smartChipAliveCounter", int, "%d" entry = startStopPhysicalState, "startStopPhysicalState", int, "%d" -entry = acrStateDup, "acrStateDup", int, "%d" entry = acrEngineMovedRecently, "acrEngineMovedRecently", int, "%d" entry = heaterControlEnabled, "heaterControlEnabled", int, "%d" entry = luaDigitalState0, "luaDigitalState0", int, "%d" @@ -5411,6 +5413,9 @@ entry = luaDigitalState3, "luaDigitalState3", int, "%d" entry = startStopStateToggleCounter, "startStopStateToggleCounter", int, "%d" entry = egtValue1, "egtValue1", float, "%.3f" entry = egtValue2, "egtValue2", float, "%.3f" +entry = luaSoftSparkSkip, "luaSoftSparkSkip", float, "%.3f" +entry = luaHardSparkSkip, "luaHardSparkSkip", float, "%.3f" +entry = tractionControlSparkSkip, "tractionControlSparkSkip", float, "%.3f" entry = desiredRpmLimit, "User-defined RPM hard limit", int, "%d" entry = fuelInjectionCounter, "Fuel: Injection counter", int, "%d" entry = globalSparkCounter, "Ign: Spark counter", int, "%d" @@ -5913,7 +5918,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 @@ -6361,7 +6366,6 @@ indicatorPanel = engine_stateIndicatorPanel, 2 indicator = {lua_luaDisableEtb}, "luaDisableEtb No", "luaDisableEtb Yes" indicator = {lua_luaIgnCut}, "luaIgnCut No", "luaIgnCut Yes" indicator = {startStopPhysicalState}, "startStopPhysicalState No", "startStopPhysicalState Yes" - indicator = {acrStateDup}, "acrStateDup No", "acrStateDup Yes" indicator = {acrEngineMovedRecently}, "acrEngineMovedRecently No", "acrEngineMovedRecently Yes" indicator = {heaterControlEnabled}, "heaterControlEnabled No", "heaterControlEnabled Yes" indicator = {luaDigitalState0}, "luaDigitalState0 No", "luaDigitalState0 Yes" @@ -6397,12 +6401,16 @@ dialog = engine_stateDialog, "engine_state" graphLine = egtValue1 graphLine = egtValue2 liveGraph = engine_state_6_Graph, "Graph", South + graphLine = luaSoftSparkSkip + graphLine = luaHardSparkSkip + graphLine = tractionControlSparkSkip graphLine = desiredRpmLimit + liveGraph = engine_state_7_Graph, "Graph", South graphLine = fuelInjectionCounter graphLine = globalSparkCounter graphLine = fuelingLoad - liveGraph = engine_state_7_Graph, "Graph", South graphLine = ignitionLoad + liveGraph = engine_state_8_Graph, "Graph", South graphLine = veTableYAxis indicatorPanel = tps_accel_stateIndicatorPanel, 2 @@ -7309,6 +7317,10 @@ dialog = lambda_monitorDialog, "lambda_monitor" 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 diff --git a/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini b/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini index 648c014c0b..ef7a72cb5f 100644 --- a/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini +++ b/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini @@ -37,12 +37,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.03.05.hellenNA8_96.1004390299" + signature = "rusEFI master.2024.03.05.hellenNA8_96.1950840739" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.03.05.hellenNA8_96.1004390299" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.03.05.hellenNA8_96.1950840739" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -98,7 +98,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","2C - O2S","TPS1","intMAP","PPS1","2F - TPS","3B - Battery Sense","3G - CAM","3S - EGR BOOST IN","2A - Pressure Input","3F - CRANK","2B - MAF","INVALID","2G - Coolant","2B - IAT","4C - IN TEMP/PPS2","1K - AC Switch" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue Mar 05 00:52:42 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue Mar 05 01:56:46 UTC 2024 pageSize = 22236 page = 1 @@ -745,6 +745,7 @@ mc33810Gpgd3Mode = bits, U32, 1576, [4:4], "false", "true" enableExtendedCanBroadcast = bits, U32, 1576, [5:5], "false", "true" luaCanRxWorkaround = bits, U32, 1576, [6:6], "false", "true" flexSensorInverted = bits, U32, 1576, [7:7], "false", "true" +useHardSkipInTraction = bits, U32, 1576, [8:8], "false", "true" useAuxSpeedForSlipRatio = bits, U32, 1576, [11:11], "false", "true" useVssAsSecondWheelSpeed = bits, U32, 1576, [12:12], "false", "true" is_enabled_spi_5 = bits, U32, 1576, [13:13], "false", "true" @@ -2468,7 +2469,7 @@ injectorStagingRpmBins = array, U16, 22222, [6], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1456 + ochBlockSize = 1468 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3131,145 +3132,147 @@ smartChipState = scalar, S08, 1102, "", 1, 0 smartChipRestartCounter = scalar, S08, 1103, "", 1, 0 smartChipAliveCounter = scalar, S08, 1104, "", 1, 0 startStopPhysicalState = bits, U32, 1108, [0:0] -acrStateDup = bits, U32, 1108, [1:1] -acrEngineMovedRecently = bits, U32, 1108, [2:2] -heaterControlEnabled = bits, U32, 1108, [3:3] -luaDigitalState0 = bits, U32, 1108, [4:4] -luaDigitalState1 = bits, U32, 1108, [5:5] -luaDigitalState2 = bits, U32, 1108, [6:6] -luaDigitalState3 = bits, U32, 1108, [7:7] +acrEngineMovedRecently = bits, U32, 1108, [1:1] +heaterControlEnabled = bits, U32, 1108, [2:2] +luaDigitalState0 = bits, U32, 1108, [3:3] +luaDigitalState1 = bits, U32, 1108, [4:4] +luaDigitalState2 = bits, U32, 1108, [5:5] +luaDigitalState3 = bits, U32, 1108, [6:6] startStopStateToggleCounter = scalar, U32, 1112, "", 1, 0 egtValue1 = scalar, F32, 1116, "", 1, 0 egtValue2 = scalar, F32, 1120, "", 1, 0 -desiredRpmLimit = scalar, S16, 1124, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1128, "", 1, 0 -globalSparkCounter = scalar, U32, 1132, "", 1, 0 -fuelingLoad = scalar, F32, 1136, "", 1, 0 -ignitionLoad = scalar, F32, 1140, "", 1, 0 -veTableYAxis = scalar, U16, 1144, "%", 0.01, 0 -; total TS size = 1148 -tpsFrom = scalar, F32, 1148 -tpsTo = scalar, F32, 1152 -deltaTps = scalar, F32, 1156 -extraFuel = scalar, F32, 1160, "", 1, 0 -valueFromTable = scalar, F32, 1164, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1168, [0:0] -isBelowDecelThreshold = bits, U32, 1168, [1:1] -isTimeToResetAccumulator = bits, U32, 1168, [2:2] -isFractionalEnrichment = bits, U32, 1168, [3:3] -belowEpsilon = bits, U32, 1168, [4:4] -tooShort = bits, U32, 1168, [5:5] -fractionalInjFuel = scalar, F32, 1172, "", 1, 0 -accumulatedValue = scalar, F32, 1176, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1180, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1184, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1188, "", 1, 0 -cycleCnt = scalar, S32, 1192, "", 1, 0 -; total TS size = 1196 -hwEventCounters1 = scalar, U32, 1196, "", 1, 0 -hwEventCounters2 = scalar, U32, 1200, "", 1, 0 -hwEventCounters3 = scalar, U32, 1204, "", 1, 0 -hwEventCounters4 = scalar, U32, 1208, "", 1, 0 -hwEventCounters5 = scalar, U32, 1212, "", 1, 0 -hwEventCounters6 = scalar, U32, 1216, "", 1, 0 -vvtCamCounter = scalar, U32, 1220, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1224, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1228, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1232, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1233, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1236, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1240, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1244, "", 1, 0 -mapCamPrevToothAngle = scalar, F32, 1248, "deg", 1, 0 -isDecodingMapCam = bits, U32, 1252, [0:0] -; total TS size = 1256 -crankSynchronizationCounter0 = scalar, U32, 1256, "", 1, 0 -vvtSyncGapRatio0 = scalar, F32, 1260, "", 1, 0 -vvtToothDurations00 = scalar, U32, 1264, "us", 1, 0 -vvtCurrentPosition0 = scalar, F32, 1268, "sync: Primary Cam Position", 1, 0 -vvtToothPosition10 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition20 = scalar, F32, 1276, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition30 = scalar, F32, 1280, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition40 = scalar, F32, 1284, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio0 = scalar, F32, 1288, "", 1, 0 -triggerStateIndex0 = scalar, U08, 1292, "", 1, 0 -vvtStateIndex0 = scalar, U08, 1293, "", 1, 0 -; total TS size = 1296 -camResyncCounter = scalar, U08, 1296, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1300, [0:0] -; total TS size = 1304 -wallFuelCorrection = scalar, F32, 1304, "", 1, 0 -wallFuel = scalar, F32, 1308, "", 1, 0 -; total TS size = 1312 -idleState = bits, S32, 1312, [0:2], "not important" -currentIdlePosition = scalar, F32, 1316 -baseIdlePosition = scalar, F32, 1320 -idleClosedLoop = scalar, F32, 1324 -iacByTpsTaper = scalar, F32, 1328 -throttlePedalUpState = scalar, S32, 1332, "", 1, 0 -mightResetPid = bits, U32, 1336, [0:0] -shouldResetPid = bits, U32, 1336, [1:1] -wasResetPid = bits, U32, 1336, [2:2] -mustResetPid = bits, U32, 1336, [3:3] -isCranking = bits, U32, 1336, [4:4] -isIacTableForCoasting = bits, U32, 1336, [5:5] -notIdling = bits, U32, 1336, [6:6] -needReset = bits, U32, 1336, [7:7] -isInDeadZone = bits, U32, 1336, [8:8] -isBlipping = bits, U32, 1336, [9:9] -useClosedLoop = bits, U32, 1336, [10:10] -badTps = bits, U32, 1336, [11:11] -looksLikeRunning = bits, U32, 1336, [12:12] -looksLikeCoasting = bits, U32, 1336, [13:13] -looksLikeCrankToIdle = bits, U32, 1336, [14:14] -isIdleCoasting = bits, U32, 1336, [15:15] -isIdleClosedLoop = bits, U32, 1336, [16:16] -idleTarget = scalar, S32, 1340, "", 1, 0 -targetRpmByClt = scalar, S32, 1344, "", 1, 0 -targetRpmAc = scalar, S32, 1348, "", 1, 0 -iacByRpmTaper = scalar, F32, 1352 -luaAdd = scalar, F32, 1356 -; total TS size = 1360 -idlePosition0 = scalar, F32, 1360, "per", 1,0 -trim0 = scalar, F32, 1364, "", 1, 0 -luaAdjustment0 = scalar, F32, 1368, "per", 1,0 -m_wastegatePosition0 = scalar, F32, 1372, "per", 1,0 -etbFeedForward0 = scalar, F32, 1376 -etbIntegralError0 = scalar, F32, 1380, "", 1, 0 -etbCurrentTarget0 = scalar, F32, 1384, "%", 1, 0 -etbCurrentAdjustedTarget0 = scalar, F32, 1388, "%", 1, 0 -etbRevLimitActive0 = bits, U32, 1392, [0:0] -jamDetected0 = bits, U32, 1392, [1:1] -etbDutyRateOfChange0 = scalar, F32, 1396, "per", 1,0 -etbDutyAverage0 = scalar, F32, 1400, "per", 1,0 -etbTpsErrorCounter0 = scalar, U16, 1404, "count", 1,0 -etbPpsErrorCounter0 = scalar, U16, 1406, "count", 1,0 -etbErrorCode0 = scalar, S08, 1408, "", 1, 0 -tcEtbDrop0 = scalar, S08, 1409, "", 1, 0 -jamTimer0 = scalar, U16, 1410, "sec", 0.01, 0 -; total TS size = 1412 -faultCode0 = scalar, U08, 1412, "", 1, 0 -heaterDuty0 = scalar, U08, 1413, "%", 1, 0 -pumpDuty0 = scalar, U08, 1414, "%", 1, 0 -tempC0 = scalar, U16, 1416, "C", 1, 0 -nernstVoltage0 = scalar, U16, 1418, "V", 0.001, 0 -esr0 = scalar, U16, 1420, "ohm", 1, 0 +luaSoftSparkSkip = scalar, F32, 1124, "", 1, 0 +luaHardSparkSkip = scalar, F32, 1128, "", 1, 0 +tractionControlSparkSkip = scalar, F32, 1132, "", 1, 0 +desiredRpmLimit = scalar, S16, 1136, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 1140, "", 1, 0 +globalSparkCounter = scalar, U32, 1144, "", 1, 0 +fuelingLoad = scalar, F32, 1148, "", 1, 0 +ignitionLoad = scalar, F32, 1152, "", 1, 0 +veTableYAxis = scalar, U16, 1156, "%", 0.01, 0 +; total TS size = 1160 +tpsFrom = scalar, F32, 1160 +tpsTo = scalar, F32, 1164 +deltaTps = scalar, F32, 1168 +extraFuel = scalar, F32, 1172, "", 1, 0 +valueFromTable = scalar, F32, 1176, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1180, [0:0] +isBelowDecelThreshold = bits, U32, 1180, [1:1] +isTimeToResetAccumulator = bits, U32, 1180, [2:2] +isFractionalEnrichment = bits, U32, 1180, [3:3] +belowEpsilon = bits, U32, 1180, [4:4] +tooShort = bits, U32, 1180, [5:5] +fractionalInjFuel = scalar, F32, 1184, "", 1, 0 +accumulatedValue = scalar, F32, 1188, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1192, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1196, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1200, "", 1, 0 +cycleCnt = scalar, S32, 1204, "", 1, 0 +; total TS size = 1208 +hwEventCounters1 = scalar, U32, 1208, "", 1, 0 +hwEventCounters2 = scalar, U32, 1212, "", 1, 0 +hwEventCounters3 = scalar, U32, 1216, "", 1, 0 +hwEventCounters4 = scalar, U32, 1220, "", 1, 0 +hwEventCounters5 = scalar, U32, 1224, "", 1, 0 +hwEventCounters6 = scalar, U32, 1228, "", 1, 0 +vvtCamCounter = scalar, U32, 1232, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1236, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1240, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1244, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1245, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1248, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1252, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1256, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1260, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1264, [0:0] +; total TS size = 1268 +crankSynchronizationCounter0 = scalar, U32, 1268, "", 1, 0 +vvtSyncGapRatio0 = scalar, F32, 1272, "", 1, 0 +vvtToothDurations00 = scalar, U32, 1276, "us", 1, 0 +vvtCurrentPosition0 = scalar, F32, 1280, "sync: Primary Cam Position", 1, 0 +vvtToothPosition10 = scalar, F32, 1284, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition20 = scalar, F32, 1288, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition30 = scalar, F32, 1292, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition40 = scalar, F32, 1296, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio0 = scalar, F32, 1300, "", 1, 0 +triggerStateIndex0 = scalar, U08, 1304, "", 1, 0 +vvtStateIndex0 = scalar, U08, 1305, "", 1, 0 +; total TS size = 1308 +camResyncCounter = scalar, U08, 1308, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1312, [0:0] +; total TS size = 1316 +wallFuelCorrection = scalar, F32, 1316, "", 1, 0 +wallFuel = scalar, F32, 1320, "", 1, 0 +; total TS size = 1324 +idleState = bits, S32, 1324, [0:2], "not important" +currentIdlePosition = scalar, F32, 1328 +baseIdlePosition = scalar, F32, 1332 +idleClosedLoop = scalar, F32, 1336 +iacByTpsTaper = scalar, F32, 1340 +throttlePedalUpState = scalar, S32, 1344, "", 1, 0 +mightResetPid = bits, U32, 1348, [0:0] +shouldResetPid = bits, U32, 1348, [1:1] +wasResetPid = bits, U32, 1348, [2:2] +mustResetPid = bits, U32, 1348, [3:3] +isCranking = bits, U32, 1348, [4:4] +isIacTableForCoasting = bits, U32, 1348, [5:5] +notIdling = bits, U32, 1348, [6:6] +needReset = bits, U32, 1348, [7:7] +isInDeadZone = bits, U32, 1348, [8:8] +isBlipping = bits, U32, 1348, [9:9] +useClosedLoop = bits, U32, 1348, [10:10] +badTps = bits, U32, 1348, [11:11] +looksLikeRunning = bits, U32, 1348, [12:12] +looksLikeCoasting = bits, U32, 1348, [13:13] +looksLikeCrankToIdle = bits, U32, 1348, [14:14] +isIdleCoasting = bits, U32, 1348, [15:15] +isIdleClosedLoop = bits, U32, 1348, [16:16] +idleTarget = scalar, S32, 1352, "", 1, 0 +targetRpmByClt = scalar, S32, 1356, "", 1, 0 +targetRpmAc = scalar, S32, 1360, "", 1, 0 +iacByRpmTaper = scalar, F32, 1364 +luaAdd = scalar, F32, 1368 +; total TS size = 1372 +idlePosition0 = scalar, F32, 1372, "per", 1,0 +trim0 = scalar, F32, 1376, "", 1, 0 +luaAdjustment0 = scalar, F32, 1380, "per", 1,0 +m_wastegatePosition0 = scalar, F32, 1384, "per", 1,0 +etbFeedForward0 = scalar, F32, 1388 +etbIntegralError0 = scalar, F32, 1392, "", 1, 0 +etbCurrentTarget0 = scalar, F32, 1396, "%", 1, 0 +etbCurrentAdjustedTarget0 = scalar, F32, 1400, "%", 1, 0 +etbRevLimitActive0 = bits, U32, 1404, [0:0] +jamDetected0 = bits, U32, 1404, [1:1] +etbDutyRateOfChange0 = scalar, F32, 1408, "per", 1,0 +etbDutyAverage0 = scalar, F32, 1412, "per", 1,0 +etbTpsErrorCounter0 = scalar, U16, 1416, "count", 1,0 +etbPpsErrorCounter0 = scalar, U16, 1418, "count", 1,0 +etbErrorCode0 = scalar, S08, 1420, "", 1, 0 +tcEtbDrop0 = scalar, S08, 1421, "", 1, 0 +jamTimer0 = scalar, U16, 1422, "sec", 0.01, 0 ; total TS size = 1424 -dcOutput0 = scalar, F32, 1424, "per", 1,0 -isEnabled0_int = scalar, U08, 1428, "per", 1,0 -isEnabled0 = bits, U32, 1432, [0:0] +faultCode0 = scalar, U08, 1424, "", 1, 0 +heaterDuty0 = scalar, U08, 1425, "%", 1, 0 +pumpDuty0 = scalar, U08, 1426, "%", 1, 0 +tempC0 = scalar, U16, 1428, "C", 1, 0 +nernstVoltage0 = scalar, U16, 1430, "V", 0.001, 0 +esr0 = scalar, U16, 1432, "ohm", 1, 0 ; total TS size = 1436 -value0 = scalar, U16, 1436, "value", 1,0 -value1 = scalar, U16, 1438, "value", 1,0 -errorRate = scalar, F32, 1440, "ratio", 1,0 -; total TS size = 1444 -vvtTarget = scalar, U16, 1444, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1446, "%", 0.5, 0 +dcOutput0 = scalar, F32, 1436, "per", 1,0 +isEnabled0_int = scalar, U08, 1440, "per", 1,0 +isEnabled0 = bits, U32, 1444, [0:0] ; total TS size = 1448 -lambdaCurrentlyGood = bits, U32, 1448, [0:0] -lambdaMonitorCut = bits, U32, 1448, [1:1] -lambdaTimeSinceGood = scalar, U16, 1452, "sec", 0.01, 0 +value0 = scalar, U16, 1448, "value", 1,0 +value1 = scalar, U16, 1450, "value", 1,0 +errorRate = scalar, F32, 1452, "ratio", 1,0 ; total TS size = 1456 +vvtTarget = scalar, U16, 1456, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1458, "%", 0.5, 0 +; total TS size = 1460 +lambdaCurrentlyGood = bits, U32, 1460, [0:0] +lambdaMonitorCut = bits, U32, 1460, [1:1] +lambdaTimeSinceGood = scalar, U16, 1464, "sec", 0.01, 0 +; total TS size = 1468 time = { timeNow } @@ -5401,7 +5404,6 @@ entry = smartChipState, "smartChipState", int, "%d" entry = smartChipRestartCounter, "smartChipRestartCounter", int, "%d" entry = smartChipAliveCounter, "smartChipAliveCounter", int, "%d" entry = startStopPhysicalState, "startStopPhysicalState", int, "%d" -entry = acrStateDup, "acrStateDup", int, "%d" entry = acrEngineMovedRecently, "acrEngineMovedRecently", int, "%d" entry = heaterControlEnabled, "heaterControlEnabled", int, "%d" entry = luaDigitalState0, "luaDigitalState0", int, "%d" @@ -5411,6 +5413,9 @@ entry = luaDigitalState3, "luaDigitalState3", int, "%d" entry = startStopStateToggleCounter, "startStopStateToggleCounter", int, "%d" entry = egtValue1, "egtValue1", float, "%.3f" entry = egtValue2, "egtValue2", float, "%.3f" +entry = luaSoftSparkSkip, "luaSoftSparkSkip", float, "%.3f" +entry = luaHardSparkSkip, "luaHardSparkSkip", float, "%.3f" +entry = tractionControlSparkSkip, "tractionControlSparkSkip", float, "%.3f" entry = desiredRpmLimit, "User-defined RPM hard limit", int, "%d" entry = fuelInjectionCounter, "Fuel: Injection counter", int, "%d" entry = globalSparkCounter, "Ign: Spark counter", int, "%d" @@ -5913,7 +5918,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 @@ -6361,7 +6366,6 @@ indicatorPanel = engine_stateIndicatorPanel, 2 indicator = {lua_luaDisableEtb}, "luaDisableEtb No", "luaDisableEtb Yes" indicator = {lua_luaIgnCut}, "luaIgnCut No", "luaIgnCut Yes" indicator = {startStopPhysicalState}, "startStopPhysicalState No", "startStopPhysicalState Yes" - indicator = {acrStateDup}, "acrStateDup No", "acrStateDup Yes" indicator = {acrEngineMovedRecently}, "acrEngineMovedRecently No", "acrEngineMovedRecently Yes" indicator = {heaterControlEnabled}, "heaterControlEnabled No", "heaterControlEnabled Yes" indicator = {luaDigitalState0}, "luaDigitalState0 No", "luaDigitalState0 Yes" @@ -6397,12 +6401,16 @@ dialog = engine_stateDialog, "engine_state" graphLine = egtValue1 graphLine = egtValue2 liveGraph = engine_state_6_Graph, "Graph", South + graphLine = luaSoftSparkSkip + graphLine = luaHardSparkSkip + graphLine = tractionControlSparkSkip graphLine = desiredRpmLimit + liveGraph = engine_state_7_Graph, "Graph", South graphLine = fuelInjectionCounter graphLine = globalSparkCounter graphLine = fuelingLoad - liveGraph = engine_state_7_Graph, "Graph", South graphLine = ignitionLoad + liveGraph = engine_state_8_Graph, "Graph", South graphLine = veTableYAxis indicatorPanel = tps_accel_stateIndicatorPanel, 2 @@ -7309,6 +7317,10 @@ dialog = lambda_monitorDialog, "lambda_monitor" 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 diff --git a/firmware/tunerstudio/generated/rusefi_kin.ini b/firmware/tunerstudio/generated/rusefi_kin.ini index 985bc750f8..5a4c3975a9 100644 --- a/firmware/tunerstudio/generated/rusefi_kin.ini +++ b/firmware/tunerstudio/generated/rusefi_kin.ini @@ -37,12 +37,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.03.05.kin.309567771" + signature = "rusEFI master.2024.03.05.kin.1575555363" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.03.05.kin.309567771" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.03.05.kin.1575555363" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -98,7 +98,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="Disabled", "PA2", "PA3", "INVALID", "PD3", "INVALID", "INVALID", "INVALID", "PB12", "PB13", "INVALID", "PE2", "INVALID", "PC14", "PC15", "PC16", "PC17" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue Mar 05 00:52:12 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue Mar 05 01:56:16 UTC 2024 pageSize = 20860 page = 1 @@ -745,6 +745,7 @@ mc33810Gpgd3Mode = bits, U32, 1576, [4:4], "false", "true" enableExtendedCanBroadcast = bits, U32, 1576, [5:5], "false", "true" luaCanRxWorkaround = bits, U32, 1576, [6:6], "false", "true" flexSensorInverted = bits, U32, 1576, [7:7], "false", "true" +useHardSkipInTraction = bits, U32, 1576, [8:8], "false", "true" useAuxSpeedForSlipRatio = bits, U32, 1576, [11:11], "false", "true" useVssAsSecondWheelSpeed = bits, U32, 1576, [12:12], "false", "true" is_enabled_spi_5 = bits, U32, 1576, [13:13], "false", "true" @@ -2468,7 +2469,7 @@ injectorStagingRpmBins = array, U16, 20846, [6], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1456 + ochBlockSize = 1468 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3131,145 +3132,147 @@ smartChipState = scalar, S08, 1102, "", 1, 0 smartChipRestartCounter = scalar, S08, 1103, "", 1, 0 smartChipAliveCounter = scalar, S08, 1104, "", 1, 0 startStopPhysicalState = bits, U32, 1108, [0:0] -acrStateDup = bits, U32, 1108, [1:1] -acrEngineMovedRecently = bits, U32, 1108, [2:2] -heaterControlEnabled = bits, U32, 1108, [3:3] -luaDigitalState0 = bits, U32, 1108, [4:4] -luaDigitalState1 = bits, U32, 1108, [5:5] -luaDigitalState2 = bits, U32, 1108, [6:6] -luaDigitalState3 = bits, U32, 1108, [7:7] +acrEngineMovedRecently = bits, U32, 1108, [1:1] +heaterControlEnabled = bits, U32, 1108, [2:2] +luaDigitalState0 = bits, U32, 1108, [3:3] +luaDigitalState1 = bits, U32, 1108, [4:4] +luaDigitalState2 = bits, U32, 1108, [5:5] +luaDigitalState3 = bits, U32, 1108, [6:6] startStopStateToggleCounter = scalar, U32, 1112, "", 1, 0 egtValue1 = scalar, F32, 1116, "", 1, 0 egtValue2 = scalar, F32, 1120, "", 1, 0 -desiredRpmLimit = scalar, S16, 1124, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1128, "", 1, 0 -globalSparkCounter = scalar, U32, 1132, "", 1, 0 -fuelingLoad = scalar, F32, 1136, "", 1, 0 -ignitionLoad = scalar, F32, 1140, "", 1, 0 -veTableYAxis = scalar, U16, 1144, "%", 0.01, 0 -; total TS size = 1148 -tpsFrom = scalar, F32, 1148 -tpsTo = scalar, F32, 1152 -deltaTps = scalar, F32, 1156 -extraFuel = scalar, F32, 1160, "", 1, 0 -valueFromTable = scalar, F32, 1164, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1168, [0:0] -isBelowDecelThreshold = bits, U32, 1168, [1:1] -isTimeToResetAccumulator = bits, U32, 1168, [2:2] -isFractionalEnrichment = bits, U32, 1168, [3:3] -belowEpsilon = bits, U32, 1168, [4:4] -tooShort = bits, U32, 1168, [5:5] -fractionalInjFuel = scalar, F32, 1172, "", 1, 0 -accumulatedValue = scalar, F32, 1176, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1180, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1184, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1188, "", 1, 0 -cycleCnt = scalar, S32, 1192, "", 1, 0 -; total TS size = 1196 -hwEventCounters1 = scalar, U32, 1196, "", 1, 0 -hwEventCounters2 = scalar, U32, 1200, "", 1, 0 -hwEventCounters3 = scalar, U32, 1204, "", 1, 0 -hwEventCounters4 = scalar, U32, 1208, "", 1, 0 -hwEventCounters5 = scalar, U32, 1212, "", 1, 0 -hwEventCounters6 = scalar, U32, 1216, "", 1, 0 -vvtCamCounter = scalar, U32, 1220, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1224, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1228, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1232, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1233, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1236, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1240, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1244, "", 1, 0 -mapCamPrevToothAngle = scalar, F32, 1248, "deg", 1, 0 -isDecodingMapCam = bits, U32, 1252, [0:0] -; total TS size = 1256 -crankSynchronizationCounter0 = scalar, U32, 1256, "", 1, 0 -vvtSyncGapRatio0 = scalar, F32, 1260, "", 1, 0 -vvtToothDurations00 = scalar, U32, 1264, "us", 1, 0 -vvtCurrentPosition0 = scalar, F32, 1268, "sync: Primary Cam Position", 1, 0 -vvtToothPosition10 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition20 = scalar, F32, 1276, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition30 = scalar, F32, 1280, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition40 = scalar, F32, 1284, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio0 = scalar, F32, 1288, "", 1, 0 -triggerStateIndex0 = scalar, U08, 1292, "", 1, 0 -vvtStateIndex0 = scalar, U08, 1293, "", 1, 0 -; total TS size = 1296 -camResyncCounter = scalar, U08, 1296, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1300, [0:0] -; total TS size = 1304 -wallFuelCorrection = scalar, F32, 1304, "", 1, 0 -wallFuel = scalar, F32, 1308, "", 1, 0 -; total TS size = 1312 -idleState = bits, S32, 1312, [0:2], "not important" -currentIdlePosition = scalar, F32, 1316 -baseIdlePosition = scalar, F32, 1320 -idleClosedLoop = scalar, F32, 1324 -iacByTpsTaper = scalar, F32, 1328 -throttlePedalUpState = scalar, S32, 1332, "", 1, 0 -mightResetPid = bits, U32, 1336, [0:0] -shouldResetPid = bits, U32, 1336, [1:1] -wasResetPid = bits, U32, 1336, [2:2] -mustResetPid = bits, U32, 1336, [3:3] -isCranking = bits, U32, 1336, [4:4] -isIacTableForCoasting = bits, U32, 1336, [5:5] -notIdling = bits, U32, 1336, [6:6] -needReset = bits, U32, 1336, [7:7] -isInDeadZone = bits, U32, 1336, [8:8] -isBlipping = bits, U32, 1336, [9:9] -useClosedLoop = bits, U32, 1336, [10:10] -badTps = bits, U32, 1336, [11:11] -looksLikeRunning = bits, U32, 1336, [12:12] -looksLikeCoasting = bits, U32, 1336, [13:13] -looksLikeCrankToIdle = bits, U32, 1336, [14:14] -isIdleCoasting = bits, U32, 1336, [15:15] -isIdleClosedLoop = bits, U32, 1336, [16:16] -idleTarget = scalar, S32, 1340, "", 1, 0 -targetRpmByClt = scalar, S32, 1344, "", 1, 0 -targetRpmAc = scalar, S32, 1348, "", 1, 0 -iacByRpmTaper = scalar, F32, 1352 -luaAdd = scalar, F32, 1356 -; total TS size = 1360 -idlePosition0 = scalar, F32, 1360, "per", 1,0 -trim0 = scalar, F32, 1364, "", 1, 0 -luaAdjustment0 = scalar, F32, 1368, "per", 1,0 -m_wastegatePosition0 = scalar, F32, 1372, "per", 1,0 -etbFeedForward0 = scalar, F32, 1376 -etbIntegralError0 = scalar, F32, 1380, "", 1, 0 -etbCurrentTarget0 = scalar, F32, 1384, "%", 1, 0 -etbCurrentAdjustedTarget0 = scalar, F32, 1388, "%", 1, 0 -etbRevLimitActive0 = bits, U32, 1392, [0:0] -jamDetected0 = bits, U32, 1392, [1:1] -etbDutyRateOfChange0 = scalar, F32, 1396, "per", 1,0 -etbDutyAverage0 = scalar, F32, 1400, "per", 1,0 -etbTpsErrorCounter0 = scalar, U16, 1404, "count", 1,0 -etbPpsErrorCounter0 = scalar, U16, 1406, "count", 1,0 -etbErrorCode0 = scalar, S08, 1408, "", 1, 0 -tcEtbDrop0 = scalar, S08, 1409, "", 1, 0 -jamTimer0 = scalar, U16, 1410, "sec", 0.01, 0 -; total TS size = 1412 -faultCode0 = scalar, U08, 1412, "", 1, 0 -heaterDuty0 = scalar, U08, 1413, "%", 1, 0 -pumpDuty0 = scalar, U08, 1414, "%", 1, 0 -tempC0 = scalar, U16, 1416, "C", 1, 0 -nernstVoltage0 = scalar, U16, 1418, "V", 0.001, 0 -esr0 = scalar, U16, 1420, "ohm", 1, 0 +luaSoftSparkSkip = scalar, F32, 1124, "", 1, 0 +luaHardSparkSkip = scalar, F32, 1128, "", 1, 0 +tractionControlSparkSkip = scalar, F32, 1132, "", 1, 0 +desiredRpmLimit = scalar, S16, 1136, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 1140, "", 1, 0 +globalSparkCounter = scalar, U32, 1144, "", 1, 0 +fuelingLoad = scalar, F32, 1148, "", 1, 0 +ignitionLoad = scalar, F32, 1152, "", 1, 0 +veTableYAxis = scalar, U16, 1156, "%", 0.01, 0 +; total TS size = 1160 +tpsFrom = scalar, F32, 1160 +tpsTo = scalar, F32, 1164 +deltaTps = scalar, F32, 1168 +extraFuel = scalar, F32, 1172, "", 1, 0 +valueFromTable = scalar, F32, 1176, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1180, [0:0] +isBelowDecelThreshold = bits, U32, 1180, [1:1] +isTimeToResetAccumulator = bits, U32, 1180, [2:2] +isFractionalEnrichment = bits, U32, 1180, [3:3] +belowEpsilon = bits, U32, 1180, [4:4] +tooShort = bits, U32, 1180, [5:5] +fractionalInjFuel = scalar, F32, 1184, "", 1, 0 +accumulatedValue = scalar, F32, 1188, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1192, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1196, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1200, "", 1, 0 +cycleCnt = scalar, S32, 1204, "", 1, 0 +; total TS size = 1208 +hwEventCounters1 = scalar, U32, 1208, "", 1, 0 +hwEventCounters2 = scalar, U32, 1212, "", 1, 0 +hwEventCounters3 = scalar, U32, 1216, "", 1, 0 +hwEventCounters4 = scalar, U32, 1220, "", 1, 0 +hwEventCounters5 = scalar, U32, 1224, "", 1, 0 +hwEventCounters6 = scalar, U32, 1228, "", 1, 0 +vvtCamCounter = scalar, U32, 1232, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1236, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1240, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1244, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1245, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1248, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1252, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1256, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1260, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1264, [0:0] +; total TS size = 1268 +crankSynchronizationCounter0 = scalar, U32, 1268, "", 1, 0 +vvtSyncGapRatio0 = scalar, F32, 1272, "", 1, 0 +vvtToothDurations00 = scalar, U32, 1276, "us", 1, 0 +vvtCurrentPosition0 = scalar, F32, 1280, "sync: Primary Cam Position", 1, 0 +vvtToothPosition10 = scalar, F32, 1284, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition20 = scalar, F32, 1288, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition30 = scalar, F32, 1292, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition40 = scalar, F32, 1296, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio0 = scalar, F32, 1300, "", 1, 0 +triggerStateIndex0 = scalar, U08, 1304, "", 1, 0 +vvtStateIndex0 = scalar, U08, 1305, "", 1, 0 +; total TS size = 1308 +camResyncCounter = scalar, U08, 1308, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1312, [0:0] +; total TS size = 1316 +wallFuelCorrection = scalar, F32, 1316, "", 1, 0 +wallFuel = scalar, F32, 1320, "", 1, 0 +; total TS size = 1324 +idleState = bits, S32, 1324, [0:2], "not important" +currentIdlePosition = scalar, F32, 1328 +baseIdlePosition = scalar, F32, 1332 +idleClosedLoop = scalar, F32, 1336 +iacByTpsTaper = scalar, F32, 1340 +throttlePedalUpState = scalar, S32, 1344, "", 1, 0 +mightResetPid = bits, U32, 1348, [0:0] +shouldResetPid = bits, U32, 1348, [1:1] +wasResetPid = bits, U32, 1348, [2:2] +mustResetPid = bits, U32, 1348, [3:3] +isCranking = bits, U32, 1348, [4:4] +isIacTableForCoasting = bits, U32, 1348, [5:5] +notIdling = bits, U32, 1348, [6:6] +needReset = bits, U32, 1348, [7:7] +isInDeadZone = bits, U32, 1348, [8:8] +isBlipping = bits, U32, 1348, [9:9] +useClosedLoop = bits, U32, 1348, [10:10] +badTps = bits, U32, 1348, [11:11] +looksLikeRunning = bits, U32, 1348, [12:12] +looksLikeCoasting = bits, U32, 1348, [13:13] +looksLikeCrankToIdle = bits, U32, 1348, [14:14] +isIdleCoasting = bits, U32, 1348, [15:15] +isIdleClosedLoop = bits, U32, 1348, [16:16] +idleTarget = scalar, S32, 1352, "", 1, 0 +targetRpmByClt = scalar, S32, 1356, "", 1, 0 +targetRpmAc = scalar, S32, 1360, "", 1, 0 +iacByRpmTaper = scalar, F32, 1364 +luaAdd = scalar, F32, 1368 +; total TS size = 1372 +idlePosition0 = scalar, F32, 1372, "per", 1,0 +trim0 = scalar, F32, 1376, "", 1, 0 +luaAdjustment0 = scalar, F32, 1380, "per", 1,0 +m_wastegatePosition0 = scalar, F32, 1384, "per", 1,0 +etbFeedForward0 = scalar, F32, 1388 +etbIntegralError0 = scalar, F32, 1392, "", 1, 0 +etbCurrentTarget0 = scalar, F32, 1396, "%", 1, 0 +etbCurrentAdjustedTarget0 = scalar, F32, 1400, "%", 1, 0 +etbRevLimitActive0 = bits, U32, 1404, [0:0] +jamDetected0 = bits, U32, 1404, [1:1] +etbDutyRateOfChange0 = scalar, F32, 1408, "per", 1,0 +etbDutyAverage0 = scalar, F32, 1412, "per", 1,0 +etbTpsErrorCounter0 = scalar, U16, 1416, "count", 1,0 +etbPpsErrorCounter0 = scalar, U16, 1418, "count", 1,0 +etbErrorCode0 = scalar, S08, 1420, "", 1, 0 +tcEtbDrop0 = scalar, S08, 1421, "", 1, 0 +jamTimer0 = scalar, U16, 1422, "sec", 0.01, 0 ; total TS size = 1424 -dcOutput0 = scalar, F32, 1424, "per", 1,0 -isEnabled0_int = scalar, U08, 1428, "per", 1,0 -isEnabled0 = bits, U32, 1432, [0:0] +faultCode0 = scalar, U08, 1424, "", 1, 0 +heaterDuty0 = scalar, U08, 1425, "%", 1, 0 +pumpDuty0 = scalar, U08, 1426, "%", 1, 0 +tempC0 = scalar, U16, 1428, "C", 1, 0 +nernstVoltage0 = scalar, U16, 1430, "V", 0.001, 0 +esr0 = scalar, U16, 1432, "ohm", 1, 0 ; total TS size = 1436 -value0 = scalar, U16, 1436, "value", 1,0 -value1 = scalar, U16, 1438, "value", 1,0 -errorRate = scalar, F32, 1440, "ratio", 1,0 -; total TS size = 1444 -vvtTarget = scalar, U16, 1444, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1446, "%", 0.5, 0 +dcOutput0 = scalar, F32, 1436, "per", 1,0 +isEnabled0_int = scalar, U08, 1440, "per", 1,0 +isEnabled0 = bits, U32, 1444, [0:0] ; total TS size = 1448 -lambdaCurrentlyGood = bits, U32, 1448, [0:0] -lambdaMonitorCut = bits, U32, 1448, [1:1] -lambdaTimeSinceGood = scalar, U16, 1452, "sec", 0.01, 0 +value0 = scalar, U16, 1448, "value", 1,0 +value1 = scalar, U16, 1450, "value", 1,0 +errorRate = scalar, F32, 1452, "ratio", 1,0 ; total TS size = 1456 +vvtTarget = scalar, U16, 1456, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1458, "%", 0.5, 0 +; total TS size = 1460 +lambdaCurrentlyGood = bits, U32, 1460, [0:0] +lambdaMonitorCut = bits, U32, 1460, [1:1] +lambdaTimeSinceGood = scalar, U16, 1464, "sec", 0.01, 0 +; total TS size = 1468 time = { timeNow } @@ -5401,7 +5404,6 @@ entry = smartChipState, "smartChipState", int, "%d" entry = smartChipRestartCounter, "smartChipRestartCounter", int, "%d" entry = smartChipAliveCounter, "smartChipAliveCounter", int, "%d" entry = startStopPhysicalState, "startStopPhysicalState", int, "%d" -entry = acrStateDup, "acrStateDup", int, "%d" entry = acrEngineMovedRecently, "acrEngineMovedRecently", int, "%d" entry = heaterControlEnabled, "heaterControlEnabled", int, "%d" entry = luaDigitalState0, "luaDigitalState0", int, "%d" @@ -5411,6 +5413,9 @@ entry = luaDigitalState3, "luaDigitalState3", int, "%d" entry = startStopStateToggleCounter, "startStopStateToggleCounter", int, "%d" entry = egtValue1, "egtValue1", float, "%.3f" entry = egtValue2, "egtValue2", float, "%.3f" +entry = luaSoftSparkSkip, "luaSoftSparkSkip", float, "%.3f" +entry = luaHardSparkSkip, "luaHardSparkSkip", float, "%.3f" +entry = tractionControlSparkSkip, "tractionControlSparkSkip", float, "%.3f" entry = desiredRpmLimit, "User-defined RPM hard limit", int, "%d" entry = fuelInjectionCounter, "Fuel: Injection counter", int, "%d" entry = globalSparkCounter, "Ign: Spark counter", int, "%d" @@ -5912,7 +5917,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 @@ -6360,7 +6365,6 @@ indicatorPanel = engine_stateIndicatorPanel, 2 indicator = {lua_luaDisableEtb}, "luaDisableEtb No", "luaDisableEtb Yes" indicator = {lua_luaIgnCut}, "luaIgnCut No", "luaIgnCut Yes" indicator = {startStopPhysicalState}, "startStopPhysicalState No", "startStopPhysicalState Yes" - indicator = {acrStateDup}, "acrStateDup No", "acrStateDup Yes" indicator = {acrEngineMovedRecently}, "acrEngineMovedRecently No", "acrEngineMovedRecently Yes" indicator = {heaterControlEnabled}, "heaterControlEnabled No", "heaterControlEnabled Yes" indicator = {luaDigitalState0}, "luaDigitalState0 No", "luaDigitalState0 Yes" @@ -6396,12 +6400,16 @@ dialog = engine_stateDialog, "engine_state" graphLine = egtValue1 graphLine = egtValue2 liveGraph = engine_state_6_Graph, "Graph", South + graphLine = luaSoftSparkSkip + graphLine = luaHardSparkSkip + graphLine = tractionControlSparkSkip graphLine = desiredRpmLimit + liveGraph = engine_state_7_Graph, "Graph", South graphLine = fuelInjectionCounter graphLine = globalSparkCounter graphLine = fuelingLoad - liveGraph = engine_state_7_Graph, "Graph", South graphLine = ignitionLoad + liveGraph = engine_state_8_Graph, "Graph", South graphLine = veTableYAxis indicatorPanel = tps_accel_stateIndicatorPanel, 2 @@ -7309,6 +7317,10 @@ dialog = lambda_monitorDialog, "lambda_monitor" 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 diff --git a/firmware/tunerstudio/generated/rusefi_m74_9.ini b/firmware/tunerstudio/generated/rusefi_m74_9.ini index 46b22e487d..6476516919 100644 --- a/firmware/tunerstudio/generated/rusefi_m74_9.ini +++ b/firmware/tunerstudio/generated/rusefi_m74_9.ini @@ -37,12 +37,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.03.05.m74_9.320434468" + signature = "rusEFI master.2024.03.05.m74_9.1552138524" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.03.05.m74_9.320434468" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.03.05.m74_9.1552138524" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -98,7 +98,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","INVALID","MAF/MAP sensor signal","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","Pedal position sensor 1 signal PPS1","Pedal position sensor 2 signal PPS2","ETB TPS position sensor 1 signal","ETB TPS position sensor 2 signal" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue Mar 05 00:52:47 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue Mar 05 01:56:51 UTC 2024 pageSize = 22236 page = 1 @@ -745,6 +745,7 @@ mc33810Gpgd3Mode = bits, U32, 1576, [4:4], "false", "true" enableExtendedCanBroadcast = bits, U32, 1576, [5:5], "false", "true" luaCanRxWorkaround = bits, U32, 1576, [6:6], "false", "true" flexSensorInverted = bits, U32, 1576, [7:7], "false", "true" +useHardSkipInTraction = bits, U32, 1576, [8:8], "false", "true" useAuxSpeedForSlipRatio = bits, U32, 1576, [11:11], "false", "true" useVssAsSecondWheelSpeed = bits, U32, 1576, [12:12], "false", "true" is_enabled_spi_5 = bits, U32, 1576, [13:13], "false", "true" @@ -2468,7 +2469,7 @@ injectorStagingRpmBins = array, U16, 22222, [6], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1456 + ochBlockSize = 1468 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3131,145 +3132,147 @@ smartChipState = scalar, S08, 1102, "", 1, 0 smartChipRestartCounter = scalar, S08, 1103, "", 1, 0 smartChipAliveCounter = scalar, S08, 1104, "", 1, 0 startStopPhysicalState = bits, U32, 1108, [0:0] -acrStateDup = bits, U32, 1108, [1:1] -acrEngineMovedRecently = bits, U32, 1108, [2:2] -heaterControlEnabled = bits, U32, 1108, [3:3] -luaDigitalState0 = bits, U32, 1108, [4:4] -luaDigitalState1 = bits, U32, 1108, [5:5] -luaDigitalState2 = bits, U32, 1108, [6:6] -luaDigitalState3 = bits, U32, 1108, [7:7] +acrEngineMovedRecently = bits, U32, 1108, [1:1] +heaterControlEnabled = bits, U32, 1108, [2:2] +luaDigitalState0 = bits, U32, 1108, [3:3] +luaDigitalState1 = bits, U32, 1108, [4:4] +luaDigitalState2 = bits, U32, 1108, [5:5] +luaDigitalState3 = bits, U32, 1108, [6:6] startStopStateToggleCounter = scalar, U32, 1112, "", 1, 0 egtValue1 = scalar, F32, 1116, "", 1, 0 egtValue2 = scalar, F32, 1120, "", 1, 0 -desiredRpmLimit = scalar, S16, 1124, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1128, "", 1, 0 -globalSparkCounter = scalar, U32, 1132, "", 1, 0 -fuelingLoad = scalar, F32, 1136, "", 1, 0 -ignitionLoad = scalar, F32, 1140, "", 1, 0 -veTableYAxis = scalar, U16, 1144, "%", 0.01, 0 -; total TS size = 1148 -tpsFrom = scalar, F32, 1148 -tpsTo = scalar, F32, 1152 -deltaTps = scalar, F32, 1156 -extraFuel = scalar, F32, 1160, "", 1, 0 -valueFromTable = scalar, F32, 1164, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1168, [0:0] -isBelowDecelThreshold = bits, U32, 1168, [1:1] -isTimeToResetAccumulator = bits, U32, 1168, [2:2] -isFractionalEnrichment = bits, U32, 1168, [3:3] -belowEpsilon = bits, U32, 1168, [4:4] -tooShort = bits, U32, 1168, [5:5] -fractionalInjFuel = scalar, F32, 1172, "", 1, 0 -accumulatedValue = scalar, F32, 1176, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1180, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1184, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1188, "", 1, 0 -cycleCnt = scalar, S32, 1192, "", 1, 0 -; total TS size = 1196 -hwEventCounters1 = scalar, U32, 1196, "", 1, 0 -hwEventCounters2 = scalar, U32, 1200, "", 1, 0 -hwEventCounters3 = scalar, U32, 1204, "", 1, 0 -hwEventCounters4 = scalar, U32, 1208, "", 1, 0 -hwEventCounters5 = scalar, U32, 1212, "", 1, 0 -hwEventCounters6 = scalar, U32, 1216, "", 1, 0 -vvtCamCounter = scalar, U32, 1220, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1224, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1228, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1232, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1233, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1236, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1240, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1244, "", 1, 0 -mapCamPrevToothAngle = scalar, F32, 1248, "deg", 1, 0 -isDecodingMapCam = bits, U32, 1252, [0:0] -; total TS size = 1256 -crankSynchronizationCounter0 = scalar, U32, 1256, "", 1, 0 -vvtSyncGapRatio0 = scalar, F32, 1260, "", 1, 0 -vvtToothDurations00 = scalar, U32, 1264, "us", 1, 0 -vvtCurrentPosition0 = scalar, F32, 1268, "sync: Primary Cam Position", 1, 0 -vvtToothPosition10 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition20 = scalar, F32, 1276, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition30 = scalar, F32, 1280, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition40 = scalar, F32, 1284, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio0 = scalar, F32, 1288, "", 1, 0 -triggerStateIndex0 = scalar, U08, 1292, "", 1, 0 -vvtStateIndex0 = scalar, U08, 1293, "", 1, 0 -; total TS size = 1296 -camResyncCounter = scalar, U08, 1296, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1300, [0:0] -; total TS size = 1304 -wallFuelCorrection = scalar, F32, 1304, "", 1, 0 -wallFuel = scalar, F32, 1308, "", 1, 0 -; total TS size = 1312 -idleState = bits, S32, 1312, [0:2], "not important" -currentIdlePosition = scalar, F32, 1316 -baseIdlePosition = scalar, F32, 1320 -idleClosedLoop = scalar, F32, 1324 -iacByTpsTaper = scalar, F32, 1328 -throttlePedalUpState = scalar, S32, 1332, "", 1, 0 -mightResetPid = bits, U32, 1336, [0:0] -shouldResetPid = bits, U32, 1336, [1:1] -wasResetPid = bits, U32, 1336, [2:2] -mustResetPid = bits, U32, 1336, [3:3] -isCranking = bits, U32, 1336, [4:4] -isIacTableForCoasting = bits, U32, 1336, [5:5] -notIdling = bits, U32, 1336, [6:6] -needReset = bits, U32, 1336, [7:7] -isInDeadZone = bits, U32, 1336, [8:8] -isBlipping = bits, U32, 1336, [9:9] -useClosedLoop = bits, U32, 1336, [10:10] -badTps = bits, U32, 1336, [11:11] -looksLikeRunning = bits, U32, 1336, [12:12] -looksLikeCoasting = bits, U32, 1336, [13:13] -looksLikeCrankToIdle = bits, U32, 1336, [14:14] -isIdleCoasting = bits, U32, 1336, [15:15] -isIdleClosedLoop = bits, U32, 1336, [16:16] -idleTarget = scalar, S32, 1340, "", 1, 0 -targetRpmByClt = scalar, S32, 1344, "", 1, 0 -targetRpmAc = scalar, S32, 1348, "", 1, 0 -iacByRpmTaper = scalar, F32, 1352 -luaAdd = scalar, F32, 1356 -; total TS size = 1360 -idlePosition0 = scalar, F32, 1360, "per", 1,0 -trim0 = scalar, F32, 1364, "", 1, 0 -luaAdjustment0 = scalar, F32, 1368, "per", 1,0 -m_wastegatePosition0 = scalar, F32, 1372, "per", 1,0 -etbFeedForward0 = scalar, F32, 1376 -etbIntegralError0 = scalar, F32, 1380, "", 1, 0 -etbCurrentTarget0 = scalar, F32, 1384, "%", 1, 0 -etbCurrentAdjustedTarget0 = scalar, F32, 1388, "%", 1, 0 -etbRevLimitActive0 = bits, U32, 1392, [0:0] -jamDetected0 = bits, U32, 1392, [1:1] -etbDutyRateOfChange0 = scalar, F32, 1396, "per", 1,0 -etbDutyAverage0 = scalar, F32, 1400, "per", 1,0 -etbTpsErrorCounter0 = scalar, U16, 1404, "count", 1,0 -etbPpsErrorCounter0 = scalar, U16, 1406, "count", 1,0 -etbErrorCode0 = scalar, S08, 1408, "", 1, 0 -tcEtbDrop0 = scalar, S08, 1409, "", 1, 0 -jamTimer0 = scalar, U16, 1410, "sec", 0.01, 0 -; total TS size = 1412 -faultCode0 = scalar, U08, 1412, "", 1, 0 -heaterDuty0 = scalar, U08, 1413, "%", 1, 0 -pumpDuty0 = scalar, U08, 1414, "%", 1, 0 -tempC0 = scalar, U16, 1416, "C", 1, 0 -nernstVoltage0 = scalar, U16, 1418, "V", 0.001, 0 -esr0 = scalar, U16, 1420, "ohm", 1, 0 +luaSoftSparkSkip = scalar, F32, 1124, "", 1, 0 +luaHardSparkSkip = scalar, F32, 1128, "", 1, 0 +tractionControlSparkSkip = scalar, F32, 1132, "", 1, 0 +desiredRpmLimit = scalar, S16, 1136, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 1140, "", 1, 0 +globalSparkCounter = scalar, U32, 1144, "", 1, 0 +fuelingLoad = scalar, F32, 1148, "", 1, 0 +ignitionLoad = scalar, F32, 1152, "", 1, 0 +veTableYAxis = scalar, U16, 1156, "%", 0.01, 0 +; total TS size = 1160 +tpsFrom = scalar, F32, 1160 +tpsTo = scalar, F32, 1164 +deltaTps = scalar, F32, 1168 +extraFuel = scalar, F32, 1172, "", 1, 0 +valueFromTable = scalar, F32, 1176, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1180, [0:0] +isBelowDecelThreshold = bits, U32, 1180, [1:1] +isTimeToResetAccumulator = bits, U32, 1180, [2:2] +isFractionalEnrichment = bits, U32, 1180, [3:3] +belowEpsilon = bits, U32, 1180, [4:4] +tooShort = bits, U32, 1180, [5:5] +fractionalInjFuel = scalar, F32, 1184, "", 1, 0 +accumulatedValue = scalar, F32, 1188, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1192, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1196, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1200, "", 1, 0 +cycleCnt = scalar, S32, 1204, "", 1, 0 +; total TS size = 1208 +hwEventCounters1 = scalar, U32, 1208, "", 1, 0 +hwEventCounters2 = scalar, U32, 1212, "", 1, 0 +hwEventCounters3 = scalar, U32, 1216, "", 1, 0 +hwEventCounters4 = scalar, U32, 1220, "", 1, 0 +hwEventCounters5 = scalar, U32, 1224, "", 1, 0 +hwEventCounters6 = scalar, U32, 1228, "", 1, 0 +vvtCamCounter = scalar, U32, 1232, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1236, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1240, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1244, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1245, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1248, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1252, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1256, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1260, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1264, [0:0] +; total TS size = 1268 +crankSynchronizationCounter0 = scalar, U32, 1268, "", 1, 0 +vvtSyncGapRatio0 = scalar, F32, 1272, "", 1, 0 +vvtToothDurations00 = scalar, U32, 1276, "us", 1, 0 +vvtCurrentPosition0 = scalar, F32, 1280, "sync: Primary Cam Position", 1, 0 +vvtToothPosition10 = scalar, F32, 1284, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition20 = scalar, F32, 1288, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition30 = scalar, F32, 1292, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition40 = scalar, F32, 1296, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio0 = scalar, F32, 1300, "", 1, 0 +triggerStateIndex0 = scalar, U08, 1304, "", 1, 0 +vvtStateIndex0 = scalar, U08, 1305, "", 1, 0 +; total TS size = 1308 +camResyncCounter = scalar, U08, 1308, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1312, [0:0] +; total TS size = 1316 +wallFuelCorrection = scalar, F32, 1316, "", 1, 0 +wallFuel = scalar, F32, 1320, "", 1, 0 +; total TS size = 1324 +idleState = bits, S32, 1324, [0:2], "not important" +currentIdlePosition = scalar, F32, 1328 +baseIdlePosition = scalar, F32, 1332 +idleClosedLoop = scalar, F32, 1336 +iacByTpsTaper = scalar, F32, 1340 +throttlePedalUpState = scalar, S32, 1344, "", 1, 0 +mightResetPid = bits, U32, 1348, [0:0] +shouldResetPid = bits, U32, 1348, [1:1] +wasResetPid = bits, U32, 1348, [2:2] +mustResetPid = bits, U32, 1348, [3:3] +isCranking = bits, U32, 1348, [4:4] +isIacTableForCoasting = bits, U32, 1348, [5:5] +notIdling = bits, U32, 1348, [6:6] +needReset = bits, U32, 1348, [7:7] +isInDeadZone = bits, U32, 1348, [8:8] +isBlipping = bits, U32, 1348, [9:9] +useClosedLoop = bits, U32, 1348, [10:10] +badTps = bits, U32, 1348, [11:11] +looksLikeRunning = bits, U32, 1348, [12:12] +looksLikeCoasting = bits, U32, 1348, [13:13] +looksLikeCrankToIdle = bits, U32, 1348, [14:14] +isIdleCoasting = bits, U32, 1348, [15:15] +isIdleClosedLoop = bits, U32, 1348, [16:16] +idleTarget = scalar, S32, 1352, "", 1, 0 +targetRpmByClt = scalar, S32, 1356, "", 1, 0 +targetRpmAc = scalar, S32, 1360, "", 1, 0 +iacByRpmTaper = scalar, F32, 1364 +luaAdd = scalar, F32, 1368 +; total TS size = 1372 +idlePosition0 = scalar, F32, 1372, "per", 1,0 +trim0 = scalar, F32, 1376, "", 1, 0 +luaAdjustment0 = scalar, F32, 1380, "per", 1,0 +m_wastegatePosition0 = scalar, F32, 1384, "per", 1,0 +etbFeedForward0 = scalar, F32, 1388 +etbIntegralError0 = scalar, F32, 1392, "", 1, 0 +etbCurrentTarget0 = scalar, F32, 1396, "%", 1, 0 +etbCurrentAdjustedTarget0 = scalar, F32, 1400, "%", 1, 0 +etbRevLimitActive0 = bits, U32, 1404, [0:0] +jamDetected0 = bits, U32, 1404, [1:1] +etbDutyRateOfChange0 = scalar, F32, 1408, "per", 1,0 +etbDutyAverage0 = scalar, F32, 1412, "per", 1,0 +etbTpsErrorCounter0 = scalar, U16, 1416, "count", 1,0 +etbPpsErrorCounter0 = scalar, U16, 1418, "count", 1,0 +etbErrorCode0 = scalar, S08, 1420, "", 1, 0 +tcEtbDrop0 = scalar, S08, 1421, "", 1, 0 +jamTimer0 = scalar, U16, 1422, "sec", 0.01, 0 ; total TS size = 1424 -dcOutput0 = scalar, F32, 1424, "per", 1,0 -isEnabled0_int = scalar, U08, 1428, "per", 1,0 -isEnabled0 = bits, U32, 1432, [0:0] +faultCode0 = scalar, U08, 1424, "", 1, 0 +heaterDuty0 = scalar, U08, 1425, "%", 1, 0 +pumpDuty0 = scalar, U08, 1426, "%", 1, 0 +tempC0 = scalar, U16, 1428, "C", 1, 0 +nernstVoltage0 = scalar, U16, 1430, "V", 0.001, 0 +esr0 = scalar, U16, 1432, "ohm", 1, 0 ; total TS size = 1436 -value0 = scalar, U16, 1436, "value", 1,0 -value1 = scalar, U16, 1438, "value", 1,0 -errorRate = scalar, F32, 1440, "ratio", 1,0 -; total TS size = 1444 -vvtTarget = scalar, U16, 1444, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1446, "%", 0.5, 0 +dcOutput0 = scalar, F32, 1436, "per", 1,0 +isEnabled0_int = scalar, U08, 1440, "per", 1,0 +isEnabled0 = bits, U32, 1444, [0:0] ; total TS size = 1448 -lambdaCurrentlyGood = bits, U32, 1448, [0:0] -lambdaMonitorCut = bits, U32, 1448, [1:1] -lambdaTimeSinceGood = scalar, U16, 1452, "sec", 0.01, 0 +value0 = scalar, U16, 1448, "value", 1,0 +value1 = scalar, U16, 1450, "value", 1,0 +errorRate = scalar, F32, 1452, "ratio", 1,0 ; total TS size = 1456 +vvtTarget = scalar, U16, 1456, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1458, "%", 0.5, 0 +; total TS size = 1460 +lambdaCurrentlyGood = bits, U32, 1460, [0:0] +lambdaMonitorCut = bits, U32, 1460, [1:1] +lambdaTimeSinceGood = scalar, U16, 1464, "sec", 0.01, 0 +; total TS size = 1468 time = { timeNow } @@ -5401,7 +5404,6 @@ entry = smartChipState, "smartChipState", int, "%d" entry = smartChipRestartCounter, "smartChipRestartCounter", int, "%d" entry = smartChipAliveCounter, "smartChipAliveCounter", int, "%d" entry = startStopPhysicalState, "startStopPhysicalState", int, "%d" -entry = acrStateDup, "acrStateDup", int, "%d" entry = acrEngineMovedRecently, "acrEngineMovedRecently", int, "%d" entry = heaterControlEnabled, "heaterControlEnabled", int, "%d" entry = luaDigitalState0, "luaDigitalState0", int, "%d" @@ -5411,6 +5413,9 @@ entry = luaDigitalState3, "luaDigitalState3", int, "%d" entry = startStopStateToggleCounter, "startStopStateToggleCounter", int, "%d" entry = egtValue1, "egtValue1", float, "%.3f" entry = egtValue2, "egtValue2", float, "%.3f" +entry = luaSoftSparkSkip, "luaSoftSparkSkip", float, "%.3f" +entry = luaHardSparkSkip, "luaHardSparkSkip", float, "%.3f" +entry = tractionControlSparkSkip, "tractionControlSparkSkip", float, "%.3f" entry = desiredRpmLimit, "User-defined RPM hard limit", int, "%d" entry = fuelInjectionCounter, "Fuel: Injection counter", int, "%d" entry = globalSparkCounter, "Ign: Spark counter", int, "%d" @@ -5915,7 +5920,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 @@ -6363,7 +6368,6 @@ indicatorPanel = engine_stateIndicatorPanel, 2 indicator = {lua_luaDisableEtb}, "luaDisableEtb No", "luaDisableEtb Yes" indicator = {lua_luaIgnCut}, "luaIgnCut No", "luaIgnCut Yes" indicator = {startStopPhysicalState}, "startStopPhysicalState No", "startStopPhysicalState Yes" - indicator = {acrStateDup}, "acrStateDup No", "acrStateDup Yes" indicator = {acrEngineMovedRecently}, "acrEngineMovedRecently No", "acrEngineMovedRecently Yes" indicator = {heaterControlEnabled}, "heaterControlEnabled No", "heaterControlEnabled Yes" indicator = {luaDigitalState0}, "luaDigitalState0 No", "luaDigitalState0 Yes" @@ -6399,12 +6403,16 @@ dialog = engine_stateDialog, "engine_state" graphLine = egtValue1 graphLine = egtValue2 liveGraph = engine_state_6_Graph, "Graph", South + graphLine = luaSoftSparkSkip + graphLine = luaHardSparkSkip + graphLine = tractionControlSparkSkip graphLine = desiredRpmLimit + liveGraph = engine_state_7_Graph, "Graph", South graphLine = fuelInjectionCounter graphLine = globalSparkCounter graphLine = fuelingLoad - liveGraph = engine_state_7_Graph, "Graph", South graphLine = ignitionLoad + liveGraph = engine_state_8_Graph, "Graph", South graphLine = veTableYAxis indicatorPanel = tps_accel_stateIndicatorPanel, 2 @@ -7311,6 +7319,10 @@ dialog = lambda_monitorDialog, "lambda_monitor" 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 diff --git a/firmware/tunerstudio/generated/rusefi_mre_f4.ini b/firmware/tunerstudio/generated/rusefi_mre_f4.ini index 58a3c48801..fbd7be0354 100644 --- a/firmware/tunerstudio/generated/rusefi_mre_f4.ini +++ b/firmware/tunerstudio/generated/rusefi_mre_f4.ini @@ -37,12 +37,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.03.05.mre_f4.498645039" + signature = "rusEFI master.2024.03.05.mre_f4.1377962007" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.03.05.mre_f4.498645039" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.03.05.mre_f4.1377962007" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -98,7 +98,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","18 - AN temp 1","23 - AN temp 2","24 - AN temp 3 or Hall Input","22 - AN temp 4 or Hall Input","28 - AN volt 10, Aux Reuse","INVALID","26 - AN volt 2","31 - AN volt 3","36 - AN volt 8, Aux Reuse","40 - AN volt 9, Aux Reuse","27 - AN volt 1","Battery Sense","19 - AN volt 4","20 - AN volt 5","32 - AN volt 6, Aux Reuse","30 - AN volt 7" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue Mar 05 00:52:46 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue Mar 05 01:56:50 UTC 2024 pageSize = 22236 page = 1 @@ -745,6 +745,7 @@ mc33810Gpgd3Mode = bits, U32, 1576, [4:4], "false", "true" enableExtendedCanBroadcast = bits, U32, 1576, [5:5], "false", "true" luaCanRxWorkaround = bits, U32, 1576, [6:6], "false", "true" flexSensorInverted = bits, U32, 1576, [7:7], "false", "true" +useHardSkipInTraction = bits, U32, 1576, [8:8], "false", "true" useAuxSpeedForSlipRatio = bits, U32, 1576, [11:11], "false", "true" useVssAsSecondWheelSpeed = bits, U32, 1576, [12:12], "false", "true" is_enabled_spi_5 = bits, U32, 1576, [13:13], "false", "true" @@ -2468,7 +2469,7 @@ injectorStagingRpmBins = array, U16, 22222, [6], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1456 + ochBlockSize = 1468 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3131,145 +3132,147 @@ smartChipState = scalar, S08, 1102, "", 1, 0 smartChipRestartCounter = scalar, S08, 1103, "", 1, 0 smartChipAliveCounter = scalar, S08, 1104, "", 1, 0 startStopPhysicalState = bits, U32, 1108, [0:0] -acrStateDup = bits, U32, 1108, [1:1] -acrEngineMovedRecently = bits, U32, 1108, [2:2] -heaterControlEnabled = bits, U32, 1108, [3:3] -luaDigitalState0 = bits, U32, 1108, [4:4] -luaDigitalState1 = bits, U32, 1108, [5:5] -luaDigitalState2 = bits, U32, 1108, [6:6] -luaDigitalState3 = bits, U32, 1108, [7:7] +acrEngineMovedRecently = bits, U32, 1108, [1:1] +heaterControlEnabled = bits, U32, 1108, [2:2] +luaDigitalState0 = bits, U32, 1108, [3:3] +luaDigitalState1 = bits, U32, 1108, [4:4] +luaDigitalState2 = bits, U32, 1108, [5:5] +luaDigitalState3 = bits, U32, 1108, [6:6] startStopStateToggleCounter = scalar, U32, 1112, "", 1, 0 egtValue1 = scalar, F32, 1116, "", 1, 0 egtValue2 = scalar, F32, 1120, "", 1, 0 -desiredRpmLimit = scalar, S16, 1124, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1128, "", 1, 0 -globalSparkCounter = scalar, U32, 1132, "", 1, 0 -fuelingLoad = scalar, F32, 1136, "", 1, 0 -ignitionLoad = scalar, F32, 1140, "", 1, 0 -veTableYAxis = scalar, U16, 1144, "%", 0.01, 0 -; total TS size = 1148 -tpsFrom = scalar, F32, 1148 -tpsTo = scalar, F32, 1152 -deltaTps = scalar, F32, 1156 -extraFuel = scalar, F32, 1160, "", 1, 0 -valueFromTable = scalar, F32, 1164, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1168, [0:0] -isBelowDecelThreshold = bits, U32, 1168, [1:1] -isTimeToResetAccumulator = bits, U32, 1168, [2:2] -isFractionalEnrichment = bits, U32, 1168, [3:3] -belowEpsilon = bits, U32, 1168, [4:4] -tooShort = bits, U32, 1168, [5:5] -fractionalInjFuel = scalar, F32, 1172, "", 1, 0 -accumulatedValue = scalar, F32, 1176, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1180, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1184, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1188, "", 1, 0 -cycleCnt = scalar, S32, 1192, "", 1, 0 -; total TS size = 1196 -hwEventCounters1 = scalar, U32, 1196, "", 1, 0 -hwEventCounters2 = scalar, U32, 1200, "", 1, 0 -hwEventCounters3 = scalar, U32, 1204, "", 1, 0 -hwEventCounters4 = scalar, U32, 1208, "", 1, 0 -hwEventCounters5 = scalar, U32, 1212, "", 1, 0 -hwEventCounters6 = scalar, U32, 1216, "", 1, 0 -vvtCamCounter = scalar, U32, 1220, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1224, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1228, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1232, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1233, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1236, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1240, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1244, "", 1, 0 -mapCamPrevToothAngle = scalar, F32, 1248, "deg", 1, 0 -isDecodingMapCam = bits, U32, 1252, [0:0] -; total TS size = 1256 -crankSynchronizationCounter0 = scalar, U32, 1256, "", 1, 0 -vvtSyncGapRatio0 = scalar, F32, 1260, "", 1, 0 -vvtToothDurations00 = scalar, U32, 1264, "us", 1, 0 -vvtCurrentPosition0 = scalar, F32, 1268, "sync: Primary Cam Position", 1, 0 -vvtToothPosition10 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition20 = scalar, F32, 1276, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition30 = scalar, F32, 1280, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition40 = scalar, F32, 1284, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio0 = scalar, F32, 1288, "", 1, 0 -triggerStateIndex0 = scalar, U08, 1292, "", 1, 0 -vvtStateIndex0 = scalar, U08, 1293, "", 1, 0 -; total TS size = 1296 -camResyncCounter = scalar, U08, 1296, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1300, [0:0] -; total TS size = 1304 -wallFuelCorrection = scalar, F32, 1304, "", 1, 0 -wallFuel = scalar, F32, 1308, "", 1, 0 -; total TS size = 1312 -idleState = bits, S32, 1312, [0:2], "not important" -currentIdlePosition = scalar, F32, 1316 -baseIdlePosition = scalar, F32, 1320 -idleClosedLoop = scalar, F32, 1324 -iacByTpsTaper = scalar, F32, 1328 -throttlePedalUpState = scalar, S32, 1332, "", 1, 0 -mightResetPid = bits, U32, 1336, [0:0] -shouldResetPid = bits, U32, 1336, [1:1] -wasResetPid = bits, U32, 1336, [2:2] -mustResetPid = bits, U32, 1336, [3:3] -isCranking = bits, U32, 1336, [4:4] -isIacTableForCoasting = bits, U32, 1336, [5:5] -notIdling = bits, U32, 1336, [6:6] -needReset = bits, U32, 1336, [7:7] -isInDeadZone = bits, U32, 1336, [8:8] -isBlipping = bits, U32, 1336, [9:9] -useClosedLoop = bits, U32, 1336, [10:10] -badTps = bits, U32, 1336, [11:11] -looksLikeRunning = bits, U32, 1336, [12:12] -looksLikeCoasting = bits, U32, 1336, [13:13] -looksLikeCrankToIdle = bits, U32, 1336, [14:14] -isIdleCoasting = bits, U32, 1336, [15:15] -isIdleClosedLoop = bits, U32, 1336, [16:16] -idleTarget = scalar, S32, 1340, "", 1, 0 -targetRpmByClt = scalar, S32, 1344, "", 1, 0 -targetRpmAc = scalar, S32, 1348, "", 1, 0 -iacByRpmTaper = scalar, F32, 1352 -luaAdd = scalar, F32, 1356 -; total TS size = 1360 -idlePosition0 = scalar, F32, 1360, "per", 1,0 -trim0 = scalar, F32, 1364, "", 1, 0 -luaAdjustment0 = scalar, F32, 1368, "per", 1,0 -m_wastegatePosition0 = scalar, F32, 1372, "per", 1,0 -etbFeedForward0 = scalar, F32, 1376 -etbIntegralError0 = scalar, F32, 1380, "", 1, 0 -etbCurrentTarget0 = scalar, F32, 1384, "%", 1, 0 -etbCurrentAdjustedTarget0 = scalar, F32, 1388, "%", 1, 0 -etbRevLimitActive0 = bits, U32, 1392, [0:0] -jamDetected0 = bits, U32, 1392, [1:1] -etbDutyRateOfChange0 = scalar, F32, 1396, "per", 1,0 -etbDutyAverage0 = scalar, F32, 1400, "per", 1,0 -etbTpsErrorCounter0 = scalar, U16, 1404, "count", 1,0 -etbPpsErrorCounter0 = scalar, U16, 1406, "count", 1,0 -etbErrorCode0 = scalar, S08, 1408, "", 1, 0 -tcEtbDrop0 = scalar, S08, 1409, "", 1, 0 -jamTimer0 = scalar, U16, 1410, "sec", 0.01, 0 -; total TS size = 1412 -faultCode0 = scalar, U08, 1412, "", 1, 0 -heaterDuty0 = scalar, U08, 1413, "%", 1, 0 -pumpDuty0 = scalar, U08, 1414, "%", 1, 0 -tempC0 = scalar, U16, 1416, "C", 1, 0 -nernstVoltage0 = scalar, U16, 1418, "V", 0.001, 0 -esr0 = scalar, U16, 1420, "ohm", 1, 0 +luaSoftSparkSkip = scalar, F32, 1124, "", 1, 0 +luaHardSparkSkip = scalar, F32, 1128, "", 1, 0 +tractionControlSparkSkip = scalar, F32, 1132, "", 1, 0 +desiredRpmLimit = scalar, S16, 1136, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 1140, "", 1, 0 +globalSparkCounter = scalar, U32, 1144, "", 1, 0 +fuelingLoad = scalar, F32, 1148, "", 1, 0 +ignitionLoad = scalar, F32, 1152, "", 1, 0 +veTableYAxis = scalar, U16, 1156, "%", 0.01, 0 +; total TS size = 1160 +tpsFrom = scalar, F32, 1160 +tpsTo = scalar, F32, 1164 +deltaTps = scalar, F32, 1168 +extraFuel = scalar, F32, 1172, "", 1, 0 +valueFromTable = scalar, F32, 1176, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1180, [0:0] +isBelowDecelThreshold = bits, U32, 1180, [1:1] +isTimeToResetAccumulator = bits, U32, 1180, [2:2] +isFractionalEnrichment = bits, U32, 1180, [3:3] +belowEpsilon = bits, U32, 1180, [4:4] +tooShort = bits, U32, 1180, [5:5] +fractionalInjFuel = scalar, F32, 1184, "", 1, 0 +accumulatedValue = scalar, F32, 1188, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1192, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1196, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1200, "", 1, 0 +cycleCnt = scalar, S32, 1204, "", 1, 0 +; total TS size = 1208 +hwEventCounters1 = scalar, U32, 1208, "", 1, 0 +hwEventCounters2 = scalar, U32, 1212, "", 1, 0 +hwEventCounters3 = scalar, U32, 1216, "", 1, 0 +hwEventCounters4 = scalar, U32, 1220, "", 1, 0 +hwEventCounters5 = scalar, U32, 1224, "", 1, 0 +hwEventCounters6 = scalar, U32, 1228, "", 1, 0 +vvtCamCounter = scalar, U32, 1232, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1236, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1240, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1244, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1245, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1248, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1252, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1256, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1260, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1264, [0:0] +; total TS size = 1268 +crankSynchronizationCounter0 = scalar, U32, 1268, "", 1, 0 +vvtSyncGapRatio0 = scalar, F32, 1272, "", 1, 0 +vvtToothDurations00 = scalar, U32, 1276, "us", 1, 0 +vvtCurrentPosition0 = scalar, F32, 1280, "sync: Primary Cam Position", 1, 0 +vvtToothPosition10 = scalar, F32, 1284, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition20 = scalar, F32, 1288, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition30 = scalar, F32, 1292, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition40 = scalar, F32, 1296, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio0 = scalar, F32, 1300, "", 1, 0 +triggerStateIndex0 = scalar, U08, 1304, "", 1, 0 +vvtStateIndex0 = scalar, U08, 1305, "", 1, 0 +; total TS size = 1308 +camResyncCounter = scalar, U08, 1308, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1312, [0:0] +; total TS size = 1316 +wallFuelCorrection = scalar, F32, 1316, "", 1, 0 +wallFuel = scalar, F32, 1320, "", 1, 0 +; total TS size = 1324 +idleState = bits, S32, 1324, [0:2], "not important" +currentIdlePosition = scalar, F32, 1328 +baseIdlePosition = scalar, F32, 1332 +idleClosedLoop = scalar, F32, 1336 +iacByTpsTaper = scalar, F32, 1340 +throttlePedalUpState = scalar, S32, 1344, "", 1, 0 +mightResetPid = bits, U32, 1348, [0:0] +shouldResetPid = bits, U32, 1348, [1:1] +wasResetPid = bits, U32, 1348, [2:2] +mustResetPid = bits, U32, 1348, [3:3] +isCranking = bits, U32, 1348, [4:4] +isIacTableForCoasting = bits, U32, 1348, [5:5] +notIdling = bits, U32, 1348, [6:6] +needReset = bits, U32, 1348, [7:7] +isInDeadZone = bits, U32, 1348, [8:8] +isBlipping = bits, U32, 1348, [9:9] +useClosedLoop = bits, U32, 1348, [10:10] +badTps = bits, U32, 1348, [11:11] +looksLikeRunning = bits, U32, 1348, [12:12] +looksLikeCoasting = bits, U32, 1348, [13:13] +looksLikeCrankToIdle = bits, U32, 1348, [14:14] +isIdleCoasting = bits, U32, 1348, [15:15] +isIdleClosedLoop = bits, U32, 1348, [16:16] +idleTarget = scalar, S32, 1352, "", 1, 0 +targetRpmByClt = scalar, S32, 1356, "", 1, 0 +targetRpmAc = scalar, S32, 1360, "", 1, 0 +iacByRpmTaper = scalar, F32, 1364 +luaAdd = scalar, F32, 1368 +; total TS size = 1372 +idlePosition0 = scalar, F32, 1372, "per", 1,0 +trim0 = scalar, F32, 1376, "", 1, 0 +luaAdjustment0 = scalar, F32, 1380, "per", 1,0 +m_wastegatePosition0 = scalar, F32, 1384, "per", 1,0 +etbFeedForward0 = scalar, F32, 1388 +etbIntegralError0 = scalar, F32, 1392, "", 1, 0 +etbCurrentTarget0 = scalar, F32, 1396, "%", 1, 0 +etbCurrentAdjustedTarget0 = scalar, F32, 1400, "%", 1, 0 +etbRevLimitActive0 = bits, U32, 1404, [0:0] +jamDetected0 = bits, U32, 1404, [1:1] +etbDutyRateOfChange0 = scalar, F32, 1408, "per", 1,0 +etbDutyAverage0 = scalar, F32, 1412, "per", 1,0 +etbTpsErrorCounter0 = scalar, U16, 1416, "count", 1,0 +etbPpsErrorCounter0 = scalar, U16, 1418, "count", 1,0 +etbErrorCode0 = scalar, S08, 1420, "", 1, 0 +tcEtbDrop0 = scalar, S08, 1421, "", 1, 0 +jamTimer0 = scalar, U16, 1422, "sec", 0.01, 0 ; total TS size = 1424 -dcOutput0 = scalar, F32, 1424, "per", 1,0 -isEnabled0_int = scalar, U08, 1428, "per", 1,0 -isEnabled0 = bits, U32, 1432, [0:0] +faultCode0 = scalar, U08, 1424, "", 1, 0 +heaterDuty0 = scalar, U08, 1425, "%", 1, 0 +pumpDuty0 = scalar, U08, 1426, "%", 1, 0 +tempC0 = scalar, U16, 1428, "C", 1, 0 +nernstVoltage0 = scalar, U16, 1430, "V", 0.001, 0 +esr0 = scalar, U16, 1432, "ohm", 1, 0 ; total TS size = 1436 -value0 = scalar, U16, 1436, "value", 1,0 -value1 = scalar, U16, 1438, "value", 1,0 -errorRate = scalar, F32, 1440, "ratio", 1,0 -; total TS size = 1444 -vvtTarget = scalar, U16, 1444, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1446, "%", 0.5, 0 +dcOutput0 = scalar, F32, 1436, "per", 1,0 +isEnabled0_int = scalar, U08, 1440, "per", 1,0 +isEnabled0 = bits, U32, 1444, [0:0] ; total TS size = 1448 -lambdaCurrentlyGood = bits, U32, 1448, [0:0] -lambdaMonitorCut = bits, U32, 1448, [1:1] -lambdaTimeSinceGood = scalar, U16, 1452, "sec", 0.01, 0 +value0 = scalar, U16, 1448, "value", 1,0 +value1 = scalar, U16, 1450, "value", 1,0 +errorRate = scalar, F32, 1452, "ratio", 1,0 ; total TS size = 1456 +vvtTarget = scalar, U16, 1456, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1458, "%", 0.5, 0 +; total TS size = 1460 +lambdaCurrentlyGood = bits, U32, 1460, [0:0] +lambdaMonitorCut = bits, U32, 1460, [1:1] +lambdaTimeSinceGood = scalar, U16, 1464, "sec", 0.01, 0 +; total TS size = 1468 time = { timeNow } @@ -5402,7 +5405,6 @@ entry = smartChipState, "smartChipState", int, "%d" entry = smartChipRestartCounter, "smartChipRestartCounter", int, "%d" entry = smartChipAliveCounter, "smartChipAliveCounter", int, "%d" entry = startStopPhysicalState, "startStopPhysicalState", int, "%d" -entry = acrStateDup, "acrStateDup", int, "%d" entry = acrEngineMovedRecently, "acrEngineMovedRecently", int, "%d" entry = heaterControlEnabled, "heaterControlEnabled", int, "%d" entry = luaDigitalState0, "luaDigitalState0", int, "%d" @@ -5412,6 +5414,9 @@ entry = luaDigitalState3, "luaDigitalState3", int, "%d" entry = startStopStateToggleCounter, "startStopStateToggleCounter", int, "%d" entry = egtValue1, "egtValue1", float, "%.3f" entry = egtValue2, "egtValue2", float, "%.3f" +entry = luaSoftSparkSkip, "luaSoftSparkSkip", float, "%.3f" +entry = luaHardSparkSkip, "luaHardSparkSkip", float, "%.3f" +entry = tractionControlSparkSkip, "tractionControlSparkSkip", float, "%.3f" entry = desiredRpmLimit, "User-defined RPM hard limit", int, "%d" entry = fuelInjectionCounter, "Fuel: Injection counter", int, "%d" entry = globalSparkCounter, "Ign: Spark counter", int, "%d" @@ -5917,7 +5922,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 @@ -6365,7 +6370,6 @@ indicatorPanel = engine_stateIndicatorPanel, 2 indicator = {lua_luaDisableEtb}, "luaDisableEtb No", "luaDisableEtb Yes" indicator = {lua_luaIgnCut}, "luaIgnCut No", "luaIgnCut Yes" indicator = {startStopPhysicalState}, "startStopPhysicalState No", "startStopPhysicalState Yes" - indicator = {acrStateDup}, "acrStateDup No", "acrStateDup Yes" indicator = {acrEngineMovedRecently}, "acrEngineMovedRecently No", "acrEngineMovedRecently Yes" indicator = {heaterControlEnabled}, "heaterControlEnabled No", "heaterControlEnabled Yes" indicator = {luaDigitalState0}, "luaDigitalState0 No", "luaDigitalState0 Yes" @@ -6401,12 +6405,16 @@ dialog = engine_stateDialog, "engine_state" graphLine = egtValue1 graphLine = egtValue2 liveGraph = engine_state_6_Graph, "Graph", South + graphLine = luaSoftSparkSkip + graphLine = luaHardSparkSkip + graphLine = tractionControlSparkSkip graphLine = desiredRpmLimit + liveGraph = engine_state_7_Graph, "Graph", South graphLine = fuelInjectionCounter graphLine = globalSparkCounter graphLine = fuelingLoad - liveGraph = engine_state_7_Graph, "Graph", South graphLine = ignitionLoad + liveGraph = engine_state_8_Graph, "Graph", South graphLine = veTableYAxis indicatorPanel = tps_accel_stateIndicatorPanel, 2 @@ -7314,6 +7322,10 @@ dialog = lambda_monitorDialog, "lambda_monitor" 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 diff --git a/firmware/tunerstudio/generated/rusefi_mre_f7.ini b/firmware/tunerstudio/generated/rusefi_mre_f7.ini index 8337bc77f0..24a9e39b52 100644 --- a/firmware/tunerstudio/generated/rusefi_mre_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_mre_f7.ini @@ -37,12 +37,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.03.05.mre_f7.498645039" + signature = "rusEFI master.2024.03.05.mre_f7.1377962007" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.03.05.mre_f7.498645039" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.03.05.mre_f7.1377962007" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -98,7 +98,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","18 - AN temp 1","23 - AN temp 2","24 - AN temp 3 or Hall Input","22 - AN temp 4 or Hall Input","28 - AN volt 10, Aux Reuse","INVALID","26 - AN volt 2","31 - AN volt 3","36 - AN volt 8, Aux Reuse","40 - AN volt 9, Aux Reuse","27 - AN volt 1","Battery Sense","19 - AN volt 4","20 - AN volt 5","32 - AN volt 6, Aux Reuse","30 - AN volt 7" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue Mar 05 00:52:44 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue Mar 05 01:56:49 UTC 2024 pageSize = 22236 page = 1 @@ -745,6 +745,7 @@ mc33810Gpgd3Mode = bits, U32, 1576, [4:4], "false", "true" enableExtendedCanBroadcast = bits, U32, 1576, [5:5], "false", "true" luaCanRxWorkaround = bits, U32, 1576, [6:6], "false", "true" flexSensorInverted = bits, U32, 1576, [7:7], "false", "true" +useHardSkipInTraction = bits, U32, 1576, [8:8], "false", "true" useAuxSpeedForSlipRatio = bits, U32, 1576, [11:11], "false", "true" useVssAsSecondWheelSpeed = bits, U32, 1576, [12:12], "false", "true" is_enabled_spi_5 = bits, U32, 1576, [13:13], "false", "true" @@ -2468,7 +2469,7 @@ injectorStagingRpmBins = array, U16, 22222, [6], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1456 + ochBlockSize = 1468 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3131,145 +3132,147 @@ smartChipState = scalar, S08, 1102, "", 1, 0 smartChipRestartCounter = scalar, S08, 1103, "", 1, 0 smartChipAliveCounter = scalar, S08, 1104, "", 1, 0 startStopPhysicalState = bits, U32, 1108, [0:0] -acrStateDup = bits, U32, 1108, [1:1] -acrEngineMovedRecently = bits, U32, 1108, [2:2] -heaterControlEnabled = bits, U32, 1108, [3:3] -luaDigitalState0 = bits, U32, 1108, [4:4] -luaDigitalState1 = bits, U32, 1108, [5:5] -luaDigitalState2 = bits, U32, 1108, [6:6] -luaDigitalState3 = bits, U32, 1108, [7:7] +acrEngineMovedRecently = bits, U32, 1108, [1:1] +heaterControlEnabled = bits, U32, 1108, [2:2] +luaDigitalState0 = bits, U32, 1108, [3:3] +luaDigitalState1 = bits, U32, 1108, [4:4] +luaDigitalState2 = bits, U32, 1108, [5:5] +luaDigitalState3 = bits, U32, 1108, [6:6] startStopStateToggleCounter = scalar, U32, 1112, "", 1, 0 egtValue1 = scalar, F32, 1116, "", 1, 0 egtValue2 = scalar, F32, 1120, "", 1, 0 -desiredRpmLimit = scalar, S16, 1124, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1128, "", 1, 0 -globalSparkCounter = scalar, U32, 1132, "", 1, 0 -fuelingLoad = scalar, F32, 1136, "", 1, 0 -ignitionLoad = scalar, F32, 1140, "", 1, 0 -veTableYAxis = scalar, U16, 1144, "%", 0.01, 0 -; total TS size = 1148 -tpsFrom = scalar, F32, 1148 -tpsTo = scalar, F32, 1152 -deltaTps = scalar, F32, 1156 -extraFuel = scalar, F32, 1160, "", 1, 0 -valueFromTable = scalar, F32, 1164, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1168, [0:0] -isBelowDecelThreshold = bits, U32, 1168, [1:1] -isTimeToResetAccumulator = bits, U32, 1168, [2:2] -isFractionalEnrichment = bits, U32, 1168, [3:3] -belowEpsilon = bits, U32, 1168, [4:4] -tooShort = bits, U32, 1168, [5:5] -fractionalInjFuel = scalar, F32, 1172, "", 1, 0 -accumulatedValue = scalar, F32, 1176, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1180, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1184, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1188, "", 1, 0 -cycleCnt = scalar, S32, 1192, "", 1, 0 -; total TS size = 1196 -hwEventCounters1 = scalar, U32, 1196, "", 1, 0 -hwEventCounters2 = scalar, U32, 1200, "", 1, 0 -hwEventCounters3 = scalar, U32, 1204, "", 1, 0 -hwEventCounters4 = scalar, U32, 1208, "", 1, 0 -hwEventCounters5 = scalar, U32, 1212, "", 1, 0 -hwEventCounters6 = scalar, U32, 1216, "", 1, 0 -vvtCamCounter = scalar, U32, 1220, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1224, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1228, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1232, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1233, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1236, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1240, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1244, "", 1, 0 -mapCamPrevToothAngle = scalar, F32, 1248, "deg", 1, 0 -isDecodingMapCam = bits, U32, 1252, [0:0] -; total TS size = 1256 -crankSynchronizationCounter0 = scalar, U32, 1256, "", 1, 0 -vvtSyncGapRatio0 = scalar, F32, 1260, "", 1, 0 -vvtToothDurations00 = scalar, U32, 1264, "us", 1, 0 -vvtCurrentPosition0 = scalar, F32, 1268, "sync: Primary Cam Position", 1, 0 -vvtToothPosition10 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition20 = scalar, F32, 1276, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition30 = scalar, F32, 1280, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition40 = scalar, F32, 1284, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio0 = scalar, F32, 1288, "", 1, 0 -triggerStateIndex0 = scalar, U08, 1292, "", 1, 0 -vvtStateIndex0 = scalar, U08, 1293, "", 1, 0 -; total TS size = 1296 -camResyncCounter = scalar, U08, 1296, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1300, [0:0] -; total TS size = 1304 -wallFuelCorrection = scalar, F32, 1304, "", 1, 0 -wallFuel = scalar, F32, 1308, "", 1, 0 -; total TS size = 1312 -idleState = bits, S32, 1312, [0:2], "not important" -currentIdlePosition = scalar, F32, 1316 -baseIdlePosition = scalar, F32, 1320 -idleClosedLoop = scalar, F32, 1324 -iacByTpsTaper = scalar, F32, 1328 -throttlePedalUpState = scalar, S32, 1332, "", 1, 0 -mightResetPid = bits, U32, 1336, [0:0] -shouldResetPid = bits, U32, 1336, [1:1] -wasResetPid = bits, U32, 1336, [2:2] -mustResetPid = bits, U32, 1336, [3:3] -isCranking = bits, U32, 1336, [4:4] -isIacTableForCoasting = bits, U32, 1336, [5:5] -notIdling = bits, U32, 1336, [6:6] -needReset = bits, U32, 1336, [7:7] -isInDeadZone = bits, U32, 1336, [8:8] -isBlipping = bits, U32, 1336, [9:9] -useClosedLoop = bits, U32, 1336, [10:10] -badTps = bits, U32, 1336, [11:11] -looksLikeRunning = bits, U32, 1336, [12:12] -looksLikeCoasting = bits, U32, 1336, [13:13] -looksLikeCrankToIdle = bits, U32, 1336, [14:14] -isIdleCoasting = bits, U32, 1336, [15:15] -isIdleClosedLoop = bits, U32, 1336, [16:16] -idleTarget = scalar, S32, 1340, "", 1, 0 -targetRpmByClt = scalar, S32, 1344, "", 1, 0 -targetRpmAc = scalar, S32, 1348, "", 1, 0 -iacByRpmTaper = scalar, F32, 1352 -luaAdd = scalar, F32, 1356 -; total TS size = 1360 -idlePosition0 = scalar, F32, 1360, "per", 1,0 -trim0 = scalar, F32, 1364, "", 1, 0 -luaAdjustment0 = scalar, F32, 1368, "per", 1,0 -m_wastegatePosition0 = scalar, F32, 1372, "per", 1,0 -etbFeedForward0 = scalar, F32, 1376 -etbIntegralError0 = scalar, F32, 1380, "", 1, 0 -etbCurrentTarget0 = scalar, F32, 1384, "%", 1, 0 -etbCurrentAdjustedTarget0 = scalar, F32, 1388, "%", 1, 0 -etbRevLimitActive0 = bits, U32, 1392, [0:0] -jamDetected0 = bits, U32, 1392, [1:1] -etbDutyRateOfChange0 = scalar, F32, 1396, "per", 1,0 -etbDutyAverage0 = scalar, F32, 1400, "per", 1,0 -etbTpsErrorCounter0 = scalar, U16, 1404, "count", 1,0 -etbPpsErrorCounter0 = scalar, U16, 1406, "count", 1,0 -etbErrorCode0 = scalar, S08, 1408, "", 1, 0 -tcEtbDrop0 = scalar, S08, 1409, "", 1, 0 -jamTimer0 = scalar, U16, 1410, "sec", 0.01, 0 -; total TS size = 1412 -faultCode0 = scalar, U08, 1412, "", 1, 0 -heaterDuty0 = scalar, U08, 1413, "%", 1, 0 -pumpDuty0 = scalar, U08, 1414, "%", 1, 0 -tempC0 = scalar, U16, 1416, "C", 1, 0 -nernstVoltage0 = scalar, U16, 1418, "V", 0.001, 0 -esr0 = scalar, U16, 1420, "ohm", 1, 0 +luaSoftSparkSkip = scalar, F32, 1124, "", 1, 0 +luaHardSparkSkip = scalar, F32, 1128, "", 1, 0 +tractionControlSparkSkip = scalar, F32, 1132, "", 1, 0 +desiredRpmLimit = scalar, S16, 1136, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 1140, "", 1, 0 +globalSparkCounter = scalar, U32, 1144, "", 1, 0 +fuelingLoad = scalar, F32, 1148, "", 1, 0 +ignitionLoad = scalar, F32, 1152, "", 1, 0 +veTableYAxis = scalar, U16, 1156, "%", 0.01, 0 +; total TS size = 1160 +tpsFrom = scalar, F32, 1160 +tpsTo = scalar, F32, 1164 +deltaTps = scalar, F32, 1168 +extraFuel = scalar, F32, 1172, "", 1, 0 +valueFromTable = scalar, F32, 1176, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1180, [0:0] +isBelowDecelThreshold = bits, U32, 1180, [1:1] +isTimeToResetAccumulator = bits, U32, 1180, [2:2] +isFractionalEnrichment = bits, U32, 1180, [3:3] +belowEpsilon = bits, U32, 1180, [4:4] +tooShort = bits, U32, 1180, [5:5] +fractionalInjFuel = scalar, F32, 1184, "", 1, 0 +accumulatedValue = scalar, F32, 1188, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1192, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1196, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1200, "", 1, 0 +cycleCnt = scalar, S32, 1204, "", 1, 0 +; total TS size = 1208 +hwEventCounters1 = scalar, U32, 1208, "", 1, 0 +hwEventCounters2 = scalar, U32, 1212, "", 1, 0 +hwEventCounters3 = scalar, U32, 1216, "", 1, 0 +hwEventCounters4 = scalar, U32, 1220, "", 1, 0 +hwEventCounters5 = scalar, U32, 1224, "", 1, 0 +hwEventCounters6 = scalar, U32, 1228, "", 1, 0 +vvtCamCounter = scalar, U32, 1232, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1236, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1240, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1244, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1245, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1248, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1252, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1256, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1260, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1264, [0:0] +; total TS size = 1268 +crankSynchronizationCounter0 = scalar, U32, 1268, "", 1, 0 +vvtSyncGapRatio0 = scalar, F32, 1272, "", 1, 0 +vvtToothDurations00 = scalar, U32, 1276, "us", 1, 0 +vvtCurrentPosition0 = scalar, F32, 1280, "sync: Primary Cam Position", 1, 0 +vvtToothPosition10 = scalar, F32, 1284, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition20 = scalar, F32, 1288, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition30 = scalar, F32, 1292, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition40 = scalar, F32, 1296, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio0 = scalar, F32, 1300, "", 1, 0 +triggerStateIndex0 = scalar, U08, 1304, "", 1, 0 +vvtStateIndex0 = scalar, U08, 1305, "", 1, 0 +; total TS size = 1308 +camResyncCounter = scalar, U08, 1308, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1312, [0:0] +; total TS size = 1316 +wallFuelCorrection = scalar, F32, 1316, "", 1, 0 +wallFuel = scalar, F32, 1320, "", 1, 0 +; total TS size = 1324 +idleState = bits, S32, 1324, [0:2], "not important" +currentIdlePosition = scalar, F32, 1328 +baseIdlePosition = scalar, F32, 1332 +idleClosedLoop = scalar, F32, 1336 +iacByTpsTaper = scalar, F32, 1340 +throttlePedalUpState = scalar, S32, 1344, "", 1, 0 +mightResetPid = bits, U32, 1348, [0:0] +shouldResetPid = bits, U32, 1348, [1:1] +wasResetPid = bits, U32, 1348, [2:2] +mustResetPid = bits, U32, 1348, [3:3] +isCranking = bits, U32, 1348, [4:4] +isIacTableForCoasting = bits, U32, 1348, [5:5] +notIdling = bits, U32, 1348, [6:6] +needReset = bits, U32, 1348, [7:7] +isInDeadZone = bits, U32, 1348, [8:8] +isBlipping = bits, U32, 1348, [9:9] +useClosedLoop = bits, U32, 1348, [10:10] +badTps = bits, U32, 1348, [11:11] +looksLikeRunning = bits, U32, 1348, [12:12] +looksLikeCoasting = bits, U32, 1348, [13:13] +looksLikeCrankToIdle = bits, U32, 1348, [14:14] +isIdleCoasting = bits, U32, 1348, [15:15] +isIdleClosedLoop = bits, U32, 1348, [16:16] +idleTarget = scalar, S32, 1352, "", 1, 0 +targetRpmByClt = scalar, S32, 1356, "", 1, 0 +targetRpmAc = scalar, S32, 1360, "", 1, 0 +iacByRpmTaper = scalar, F32, 1364 +luaAdd = scalar, F32, 1368 +; total TS size = 1372 +idlePosition0 = scalar, F32, 1372, "per", 1,0 +trim0 = scalar, F32, 1376, "", 1, 0 +luaAdjustment0 = scalar, F32, 1380, "per", 1,0 +m_wastegatePosition0 = scalar, F32, 1384, "per", 1,0 +etbFeedForward0 = scalar, F32, 1388 +etbIntegralError0 = scalar, F32, 1392, "", 1, 0 +etbCurrentTarget0 = scalar, F32, 1396, "%", 1, 0 +etbCurrentAdjustedTarget0 = scalar, F32, 1400, "%", 1, 0 +etbRevLimitActive0 = bits, U32, 1404, [0:0] +jamDetected0 = bits, U32, 1404, [1:1] +etbDutyRateOfChange0 = scalar, F32, 1408, "per", 1,0 +etbDutyAverage0 = scalar, F32, 1412, "per", 1,0 +etbTpsErrorCounter0 = scalar, U16, 1416, "count", 1,0 +etbPpsErrorCounter0 = scalar, U16, 1418, "count", 1,0 +etbErrorCode0 = scalar, S08, 1420, "", 1, 0 +tcEtbDrop0 = scalar, S08, 1421, "", 1, 0 +jamTimer0 = scalar, U16, 1422, "sec", 0.01, 0 ; total TS size = 1424 -dcOutput0 = scalar, F32, 1424, "per", 1,0 -isEnabled0_int = scalar, U08, 1428, "per", 1,0 -isEnabled0 = bits, U32, 1432, [0:0] +faultCode0 = scalar, U08, 1424, "", 1, 0 +heaterDuty0 = scalar, U08, 1425, "%", 1, 0 +pumpDuty0 = scalar, U08, 1426, "%", 1, 0 +tempC0 = scalar, U16, 1428, "C", 1, 0 +nernstVoltage0 = scalar, U16, 1430, "V", 0.001, 0 +esr0 = scalar, U16, 1432, "ohm", 1, 0 ; total TS size = 1436 -value0 = scalar, U16, 1436, "value", 1,0 -value1 = scalar, U16, 1438, "value", 1,0 -errorRate = scalar, F32, 1440, "ratio", 1,0 -; total TS size = 1444 -vvtTarget = scalar, U16, 1444, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1446, "%", 0.5, 0 +dcOutput0 = scalar, F32, 1436, "per", 1,0 +isEnabled0_int = scalar, U08, 1440, "per", 1,0 +isEnabled0 = bits, U32, 1444, [0:0] ; total TS size = 1448 -lambdaCurrentlyGood = bits, U32, 1448, [0:0] -lambdaMonitorCut = bits, U32, 1448, [1:1] -lambdaTimeSinceGood = scalar, U16, 1452, "sec", 0.01, 0 +value0 = scalar, U16, 1448, "value", 1,0 +value1 = scalar, U16, 1450, "value", 1,0 +errorRate = scalar, F32, 1452, "ratio", 1,0 ; total TS size = 1456 +vvtTarget = scalar, U16, 1456, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1458, "%", 0.5, 0 +; total TS size = 1460 +lambdaCurrentlyGood = bits, U32, 1460, [0:0] +lambdaMonitorCut = bits, U32, 1460, [1:1] +lambdaTimeSinceGood = scalar, U16, 1464, "sec", 0.01, 0 +; total TS size = 1468 time = { timeNow } @@ -5402,7 +5405,6 @@ entry = smartChipState, "smartChipState", int, "%d" entry = smartChipRestartCounter, "smartChipRestartCounter", int, "%d" entry = smartChipAliveCounter, "smartChipAliveCounter", int, "%d" entry = startStopPhysicalState, "startStopPhysicalState", int, "%d" -entry = acrStateDup, "acrStateDup", int, "%d" entry = acrEngineMovedRecently, "acrEngineMovedRecently", int, "%d" entry = heaterControlEnabled, "heaterControlEnabled", int, "%d" entry = luaDigitalState0, "luaDigitalState0", int, "%d" @@ -5412,6 +5414,9 @@ entry = luaDigitalState3, "luaDigitalState3", int, "%d" entry = startStopStateToggleCounter, "startStopStateToggleCounter", int, "%d" entry = egtValue1, "egtValue1", float, "%.3f" entry = egtValue2, "egtValue2", float, "%.3f" +entry = luaSoftSparkSkip, "luaSoftSparkSkip", float, "%.3f" +entry = luaHardSparkSkip, "luaHardSparkSkip", float, "%.3f" +entry = tractionControlSparkSkip, "tractionControlSparkSkip", float, "%.3f" entry = desiredRpmLimit, "User-defined RPM hard limit", int, "%d" entry = fuelInjectionCounter, "Fuel: Injection counter", int, "%d" entry = globalSparkCounter, "Ign: Spark counter", int, "%d" @@ -5917,7 +5922,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 @@ -6365,7 +6370,6 @@ indicatorPanel = engine_stateIndicatorPanel, 2 indicator = {lua_luaDisableEtb}, "luaDisableEtb No", "luaDisableEtb Yes" indicator = {lua_luaIgnCut}, "luaIgnCut No", "luaIgnCut Yes" indicator = {startStopPhysicalState}, "startStopPhysicalState No", "startStopPhysicalState Yes" - indicator = {acrStateDup}, "acrStateDup No", "acrStateDup Yes" indicator = {acrEngineMovedRecently}, "acrEngineMovedRecently No", "acrEngineMovedRecently Yes" indicator = {heaterControlEnabled}, "heaterControlEnabled No", "heaterControlEnabled Yes" indicator = {luaDigitalState0}, "luaDigitalState0 No", "luaDigitalState0 Yes" @@ -6401,12 +6405,16 @@ dialog = engine_stateDialog, "engine_state" graphLine = egtValue1 graphLine = egtValue2 liveGraph = engine_state_6_Graph, "Graph", South + graphLine = luaSoftSparkSkip + graphLine = luaHardSparkSkip + graphLine = tractionControlSparkSkip graphLine = desiredRpmLimit + liveGraph = engine_state_7_Graph, "Graph", South graphLine = fuelInjectionCounter graphLine = globalSparkCounter graphLine = fuelingLoad - liveGraph = engine_state_7_Graph, "Graph", South graphLine = ignitionLoad + liveGraph = engine_state_8_Graph, "Graph", South graphLine = veTableYAxis indicatorPanel = tps_accel_stateIndicatorPanel, 2 @@ -7314,6 +7322,10 @@ dialog = lambda_monitorDialog, "lambda_monitor" 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 diff --git a/firmware/tunerstudio/generated/rusefi_nucleo_h743.ini b/firmware/tunerstudio/generated/rusefi_nucleo_h743.ini index c2570f6955..9ad02c3802 100644 --- a/firmware/tunerstudio/generated/rusefi_nucleo_h743.ini +++ b/firmware/tunerstudio/generated/rusefi_nucleo_h743.ini @@ -37,12 +37,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.03.05.nucleo_h743.1352820405" + signature = "rusEFI master.2024.03.05.nucleo_h743.523818637" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.03.05.nucleo_h743.1352820405" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.03.05.nucleo_h743.523818637" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -98,7 +98,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="Disabled", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PB0", "PB1", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue Mar 05 00:53:06 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue Mar 05 01:57:10 UTC 2024 pageSize = 22236 page = 1 @@ -745,6 +745,7 @@ mc33810Gpgd3Mode = bits, U32, 1576, [4:4], "false", "true" enableExtendedCanBroadcast = bits, U32, 1576, [5:5], "false", "true" luaCanRxWorkaround = bits, U32, 1576, [6:6], "false", "true" flexSensorInverted = bits, U32, 1576, [7:7], "false", "true" +useHardSkipInTraction = bits, U32, 1576, [8:8], "false", "true" useAuxSpeedForSlipRatio = bits, U32, 1576, [11:11], "false", "true" useVssAsSecondWheelSpeed = bits, U32, 1576, [12:12], "false", "true" is_enabled_spi_5 = bits, U32, 1576, [13:13], "false", "true" @@ -2468,7 +2469,7 @@ injectorStagingRpmBins = array, U16, 22222, [6], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1456 + ochBlockSize = 1468 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3131,145 +3132,147 @@ smartChipState = scalar, S08, 1102, "", 1, 0 smartChipRestartCounter = scalar, S08, 1103, "", 1, 0 smartChipAliveCounter = scalar, S08, 1104, "", 1, 0 startStopPhysicalState = bits, U32, 1108, [0:0] -acrStateDup = bits, U32, 1108, [1:1] -acrEngineMovedRecently = bits, U32, 1108, [2:2] -heaterControlEnabled = bits, U32, 1108, [3:3] -luaDigitalState0 = bits, U32, 1108, [4:4] -luaDigitalState1 = bits, U32, 1108, [5:5] -luaDigitalState2 = bits, U32, 1108, [6:6] -luaDigitalState3 = bits, U32, 1108, [7:7] +acrEngineMovedRecently = bits, U32, 1108, [1:1] +heaterControlEnabled = bits, U32, 1108, [2:2] +luaDigitalState0 = bits, U32, 1108, [3:3] +luaDigitalState1 = bits, U32, 1108, [4:4] +luaDigitalState2 = bits, U32, 1108, [5:5] +luaDigitalState3 = bits, U32, 1108, [6:6] startStopStateToggleCounter = scalar, U32, 1112, "", 1, 0 egtValue1 = scalar, F32, 1116, "", 1, 0 egtValue2 = scalar, F32, 1120, "", 1, 0 -desiredRpmLimit = scalar, S16, 1124, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1128, "", 1, 0 -globalSparkCounter = scalar, U32, 1132, "", 1, 0 -fuelingLoad = scalar, F32, 1136, "", 1, 0 -ignitionLoad = scalar, F32, 1140, "", 1, 0 -veTableYAxis = scalar, U16, 1144, "%", 0.01, 0 -; total TS size = 1148 -tpsFrom = scalar, F32, 1148 -tpsTo = scalar, F32, 1152 -deltaTps = scalar, F32, 1156 -extraFuel = scalar, F32, 1160, "", 1, 0 -valueFromTable = scalar, F32, 1164, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1168, [0:0] -isBelowDecelThreshold = bits, U32, 1168, [1:1] -isTimeToResetAccumulator = bits, U32, 1168, [2:2] -isFractionalEnrichment = bits, U32, 1168, [3:3] -belowEpsilon = bits, U32, 1168, [4:4] -tooShort = bits, U32, 1168, [5:5] -fractionalInjFuel = scalar, F32, 1172, "", 1, 0 -accumulatedValue = scalar, F32, 1176, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1180, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1184, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1188, "", 1, 0 -cycleCnt = scalar, S32, 1192, "", 1, 0 -; total TS size = 1196 -hwEventCounters1 = scalar, U32, 1196, "", 1, 0 -hwEventCounters2 = scalar, U32, 1200, "", 1, 0 -hwEventCounters3 = scalar, U32, 1204, "", 1, 0 -hwEventCounters4 = scalar, U32, 1208, "", 1, 0 -hwEventCounters5 = scalar, U32, 1212, "", 1, 0 -hwEventCounters6 = scalar, U32, 1216, "", 1, 0 -vvtCamCounter = scalar, U32, 1220, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1224, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1228, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1232, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1233, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1236, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1240, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1244, "", 1, 0 -mapCamPrevToothAngle = scalar, F32, 1248, "deg", 1, 0 -isDecodingMapCam = bits, U32, 1252, [0:0] -; total TS size = 1256 -crankSynchronizationCounter0 = scalar, U32, 1256, "", 1, 0 -vvtSyncGapRatio0 = scalar, F32, 1260, "", 1, 0 -vvtToothDurations00 = scalar, U32, 1264, "us", 1, 0 -vvtCurrentPosition0 = scalar, F32, 1268, "sync: Primary Cam Position", 1, 0 -vvtToothPosition10 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition20 = scalar, F32, 1276, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition30 = scalar, F32, 1280, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition40 = scalar, F32, 1284, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio0 = scalar, F32, 1288, "", 1, 0 -triggerStateIndex0 = scalar, U08, 1292, "", 1, 0 -vvtStateIndex0 = scalar, U08, 1293, "", 1, 0 -; total TS size = 1296 -camResyncCounter = scalar, U08, 1296, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1300, [0:0] -; total TS size = 1304 -wallFuelCorrection = scalar, F32, 1304, "", 1, 0 -wallFuel = scalar, F32, 1308, "", 1, 0 -; total TS size = 1312 -idleState = bits, S32, 1312, [0:2], "not important" -currentIdlePosition = scalar, F32, 1316 -baseIdlePosition = scalar, F32, 1320 -idleClosedLoop = scalar, F32, 1324 -iacByTpsTaper = scalar, F32, 1328 -throttlePedalUpState = scalar, S32, 1332, "", 1, 0 -mightResetPid = bits, U32, 1336, [0:0] -shouldResetPid = bits, U32, 1336, [1:1] -wasResetPid = bits, U32, 1336, [2:2] -mustResetPid = bits, U32, 1336, [3:3] -isCranking = bits, U32, 1336, [4:4] -isIacTableForCoasting = bits, U32, 1336, [5:5] -notIdling = bits, U32, 1336, [6:6] -needReset = bits, U32, 1336, [7:7] -isInDeadZone = bits, U32, 1336, [8:8] -isBlipping = bits, U32, 1336, [9:9] -useClosedLoop = bits, U32, 1336, [10:10] -badTps = bits, U32, 1336, [11:11] -looksLikeRunning = bits, U32, 1336, [12:12] -looksLikeCoasting = bits, U32, 1336, [13:13] -looksLikeCrankToIdle = bits, U32, 1336, [14:14] -isIdleCoasting = bits, U32, 1336, [15:15] -isIdleClosedLoop = bits, U32, 1336, [16:16] -idleTarget = scalar, S32, 1340, "", 1, 0 -targetRpmByClt = scalar, S32, 1344, "", 1, 0 -targetRpmAc = scalar, S32, 1348, "", 1, 0 -iacByRpmTaper = scalar, F32, 1352 -luaAdd = scalar, F32, 1356 -; total TS size = 1360 -idlePosition0 = scalar, F32, 1360, "per", 1,0 -trim0 = scalar, F32, 1364, "", 1, 0 -luaAdjustment0 = scalar, F32, 1368, "per", 1,0 -m_wastegatePosition0 = scalar, F32, 1372, "per", 1,0 -etbFeedForward0 = scalar, F32, 1376 -etbIntegralError0 = scalar, F32, 1380, "", 1, 0 -etbCurrentTarget0 = scalar, F32, 1384, "%", 1, 0 -etbCurrentAdjustedTarget0 = scalar, F32, 1388, "%", 1, 0 -etbRevLimitActive0 = bits, U32, 1392, [0:0] -jamDetected0 = bits, U32, 1392, [1:1] -etbDutyRateOfChange0 = scalar, F32, 1396, "per", 1,0 -etbDutyAverage0 = scalar, F32, 1400, "per", 1,0 -etbTpsErrorCounter0 = scalar, U16, 1404, "count", 1,0 -etbPpsErrorCounter0 = scalar, U16, 1406, "count", 1,0 -etbErrorCode0 = scalar, S08, 1408, "", 1, 0 -tcEtbDrop0 = scalar, S08, 1409, "", 1, 0 -jamTimer0 = scalar, U16, 1410, "sec", 0.01, 0 -; total TS size = 1412 -faultCode0 = scalar, U08, 1412, "", 1, 0 -heaterDuty0 = scalar, U08, 1413, "%", 1, 0 -pumpDuty0 = scalar, U08, 1414, "%", 1, 0 -tempC0 = scalar, U16, 1416, "C", 1, 0 -nernstVoltage0 = scalar, U16, 1418, "V", 0.001, 0 -esr0 = scalar, U16, 1420, "ohm", 1, 0 +luaSoftSparkSkip = scalar, F32, 1124, "", 1, 0 +luaHardSparkSkip = scalar, F32, 1128, "", 1, 0 +tractionControlSparkSkip = scalar, F32, 1132, "", 1, 0 +desiredRpmLimit = scalar, S16, 1136, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 1140, "", 1, 0 +globalSparkCounter = scalar, U32, 1144, "", 1, 0 +fuelingLoad = scalar, F32, 1148, "", 1, 0 +ignitionLoad = scalar, F32, 1152, "", 1, 0 +veTableYAxis = scalar, U16, 1156, "%", 0.01, 0 +; total TS size = 1160 +tpsFrom = scalar, F32, 1160 +tpsTo = scalar, F32, 1164 +deltaTps = scalar, F32, 1168 +extraFuel = scalar, F32, 1172, "", 1, 0 +valueFromTable = scalar, F32, 1176, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1180, [0:0] +isBelowDecelThreshold = bits, U32, 1180, [1:1] +isTimeToResetAccumulator = bits, U32, 1180, [2:2] +isFractionalEnrichment = bits, U32, 1180, [3:3] +belowEpsilon = bits, U32, 1180, [4:4] +tooShort = bits, U32, 1180, [5:5] +fractionalInjFuel = scalar, F32, 1184, "", 1, 0 +accumulatedValue = scalar, F32, 1188, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1192, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1196, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1200, "", 1, 0 +cycleCnt = scalar, S32, 1204, "", 1, 0 +; total TS size = 1208 +hwEventCounters1 = scalar, U32, 1208, "", 1, 0 +hwEventCounters2 = scalar, U32, 1212, "", 1, 0 +hwEventCounters3 = scalar, U32, 1216, "", 1, 0 +hwEventCounters4 = scalar, U32, 1220, "", 1, 0 +hwEventCounters5 = scalar, U32, 1224, "", 1, 0 +hwEventCounters6 = scalar, U32, 1228, "", 1, 0 +vvtCamCounter = scalar, U32, 1232, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1236, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1240, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1244, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1245, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1248, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1252, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1256, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1260, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1264, [0:0] +; total TS size = 1268 +crankSynchronizationCounter0 = scalar, U32, 1268, "", 1, 0 +vvtSyncGapRatio0 = scalar, F32, 1272, "", 1, 0 +vvtToothDurations00 = scalar, U32, 1276, "us", 1, 0 +vvtCurrentPosition0 = scalar, F32, 1280, "sync: Primary Cam Position", 1, 0 +vvtToothPosition10 = scalar, F32, 1284, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition20 = scalar, F32, 1288, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition30 = scalar, F32, 1292, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition40 = scalar, F32, 1296, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio0 = scalar, F32, 1300, "", 1, 0 +triggerStateIndex0 = scalar, U08, 1304, "", 1, 0 +vvtStateIndex0 = scalar, U08, 1305, "", 1, 0 +; total TS size = 1308 +camResyncCounter = scalar, U08, 1308, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1312, [0:0] +; total TS size = 1316 +wallFuelCorrection = scalar, F32, 1316, "", 1, 0 +wallFuel = scalar, F32, 1320, "", 1, 0 +; total TS size = 1324 +idleState = bits, S32, 1324, [0:2], "not important" +currentIdlePosition = scalar, F32, 1328 +baseIdlePosition = scalar, F32, 1332 +idleClosedLoop = scalar, F32, 1336 +iacByTpsTaper = scalar, F32, 1340 +throttlePedalUpState = scalar, S32, 1344, "", 1, 0 +mightResetPid = bits, U32, 1348, [0:0] +shouldResetPid = bits, U32, 1348, [1:1] +wasResetPid = bits, U32, 1348, [2:2] +mustResetPid = bits, U32, 1348, [3:3] +isCranking = bits, U32, 1348, [4:4] +isIacTableForCoasting = bits, U32, 1348, [5:5] +notIdling = bits, U32, 1348, [6:6] +needReset = bits, U32, 1348, [7:7] +isInDeadZone = bits, U32, 1348, [8:8] +isBlipping = bits, U32, 1348, [9:9] +useClosedLoop = bits, U32, 1348, [10:10] +badTps = bits, U32, 1348, [11:11] +looksLikeRunning = bits, U32, 1348, [12:12] +looksLikeCoasting = bits, U32, 1348, [13:13] +looksLikeCrankToIdle = bits, U32, 1348, [14:14] +isIdleCoasting = bits, U32, 1348, [15:15] +isIdleClosedLoop = bits, U32, 1348, [16:16] +idleTarget = scalar, S32, 1352, "", 1, 0 +targetRpmByClt = scalar, S32, 1356, "", 1, 0 +targetRpmAc = scalar, S32, 1360, "", 1, 0 +iacByRpmTaper = scalar, F32, 1364 +luaAdd = scalar, F32, 1368 +; total TS size = 1372 +idlePosition0 = scalar, F32, 1372, "per", 1,0 +trim0 = scalar, F32, 1376, "", 1, 0 +luaAdjustment0 = scalar, F32, 1380, "per", 1,0 +m_wastegatePosition0 = scalar, F32, 1384, "per", 1,0 +etbFeedForward0 = scalar, F32, 1388 +etbIntegralError0 = scalar, F32, 1392, "", 1, 0 +etbCurrentTarget0 = scalar, F32, 1396, "%", 1, 0 +etbCurrentAdjustedTarget0 = scalar, F32, 1400, "%", 1, 0 +etbRevLimitActive0 = bits, U32, 1404, [0:0] +jamDetected0 = bits, U32, 1404, [1:1] +etbDutyRateOfChange0 = scalar, F32, 1408, "per", 1,0 +etbDutyAverage0 = scalar, F32, 1412, "per", 1,0 +etbTpsErrorCounter0 = scalar, U16, 1416, "count", 1,0 +etbPpsErrorCounter0 = scalar, U16, 1418, "count", 1,0 +etbErrorCode0 = scalar, S08, 1420, "", 1, 0 +tcEtbDrop0 = scalar, S08, 1421, "", 1, 0 +jamTimer0 = scalar, U16, 1422, "sec", 0.01, 0 ; total TS size = 1424 -dcOutput0 = scalar, F32, 1424, "per", 1,0 -isEnabled0_int = scalar, U08, 1428, "per", 1,0 -isEnabled0 = bits, U32, 1432, [0:0] +faultCode0 = scalar, U08, 1424, "", 1, 0 +heaterDuty0 = scalar, U08, 1425, "%", 1, 0 +pumpDuty0 = scalar, U08, 1426, "%", 1, 0 +tempC0 = scalar, U16, 1428, "C", 1, 0 +nernstVoltage0 = scalar, U16, 1430, "V", 0.001, 0 +esr0 = scalar, U16, 1432, "ohm", 1, 0 ; total TS size = 1436 -value0 = scalar, U16, 1436, "value", 1,0 -value1 = scalar, U16, 1438, "value", 1,0 -errorRate = scalar, F32, 1440, "ratio", 1,0 -; total TS size = 1444 -vvtTarget = scalar, U16, 1444, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1446, "%", 0.5, 0 +dcOutput0 = scalar, F32, 1436, "per", 1,0 +isEnabled0_int = scalar, U08, 1440, "per", 1,0 +isEnabled0 = bits, U32, 1444, [0:0] ; total TS size = 1448 -lambdaCurrentlyGood = bits, U32, 1448, [0:0] -lambdaMonitorCut = bits, U32, 1448, [1:1] -lambdaTimeSinceGood = scalar, U16, 1452, "sec", 0.01, 0 +value0 = scalar, U16, 1448, "value", 1,0 +value1 = scalar, U16, 1450, "value", 1,0 +errorRate = scalar, F32, 1452, "ratio", 1,0 ; total TS size = 1456 +vvtTarget = scalar, U16, 1456, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1458, "%", 0.5, 0 +; total TS size = 1460 +lambdaCurrentlyGood = bits, U32, 1460, [0:0] +lambdaMonitorCut = bits, U32, 1460, [1:1] +lambdaTimeSinceGood = scalar, U16, 1464, "sec", 0.01, 0 +; total TS size = 1468 time = { timeNow } @@ -5401,7 +5404,6 @@ entry = smartChipState, "smartChipState", int, "%d" entry = smartChipRestartCounter, "smartChipRestartCounter", int, "%d" entry = smartChipAliveCounter, "smartChipAliveCounter", int, "%d" entry = startStopPhysicalState, "startStopPhysicalState", int, "%d" -entry = acrStateDup, "acrStateDup", int, "%d" entry = acrEngineMovedRecently, "acrEngineMovedRecently", int, "%d" entry = heaterControlEnabled, "heaterControlEnabled", int, "%d" entry = luaDigitalState0, "luaDigitalState0", int, "%d" @@ -5411,6 +5413,9 @@ entry = luaDigitalState3, "luaDigitalState3", int, "%d" entry = startStopStateToggleCounter, "startStopStateToggleCounter", int, "%d" entry = egtValue1, "egtValue1", float, "%.3f" entry = egtValue2, "egtValue2", float, "%.3f" +entry = luaSoftSparkSkip, "luaSoftSparkSkip", float, "%.3f" +entry = luaHardSparkSkip, "luaHardSparkSkip", float, "%.3f" +entry = tractionControlSparkSkip, "tractionControlSparkSkip", float, "%.3f" entry = desiredRpmLimit, "User-defined RPM hard limit", int, "%d" entry = fuelInjectionCounter, "Fuel: Injection counter", int, "%d" entry = globalSparkCounter, "Ign: Spark counter", int, "%d" @@ -5912,7 +5917,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 @@ -6360,7 +6365,6 @@ indicatorPanel = engine_stateIndicatorPanel, 2 indicator = {lua_luaDisableEtb}, "luaDisableEtb No", "luaDisableEtb Yes" indicator = {lua_luaIgnCut}, "luaIgnCut No", "luaIgnCut Yes" indicator = {startStopPhysicalState}, "startStopPhysicalState No", "startStopPhysicalState Yes" - indicator = {acrStateDup}, "acrStateDup No", "acrStateDup Yes" indicator = {acrEngineMovedRecently}, "acrEngineMovedRecently No", "acrEngineMovedRecently Yes" indicator = {heaterControlEnabled}, "heaterControlEnabled No", "heaterControlEnabled Yes" indicator = {luaDigitalState0}, "luaDigitalState0 No", "luaDigitalState0 Yes" @@ -6396,12 +6400,16 @@ dialog = engine_stateDialog, "engine_state" graphLine = egtValue1 graphLine = egtValue2 liveGraph = engine_state_6_Graph, "Graph", South + graphLine = luaSoftSparkSkip + graphLine = luaHardSparkSkip + graphLine = tractionControlSparkSkip graphLine = desiredRpmLimit + liveGraph = engine_state_7_Graph, "Graph", South graphLine = fuelInjectionCounter graphLine = globalSparkCounter graphLine = fuelingLoad - liveGraph = engine_state_7_Graph, "Graph", South graphLine = ignitionLoad + liveGraph = engine_state_8_Graph, "Graph", South graphLine = veTableYAxis indicatorPanel = tps_accel_stateIndicatorPanel, 2 @@ -7308,6 +7316,10 @@ dialog = lambda_monitorDialog, "lambda_monitor" 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 diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_405.ini b/firmware/tunerstudio/generated/rusefi_prometheus_405.ini index c291801881..8ed66a3c96 100644 --- a/firmware/tunerstudio/generated/rusefi_prometheus_405.ini +++ b/firmware/tunerstudio/generated/rusefi_prometheus_405.ini @@ -37,12 +37,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.03.05.prometheus_405.1614195493" + signature = "rusEFI master.2024.03.05.prometheus_405.799808285" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.03.05.prometheus_405.1614195493" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.03.05.prometheus_405.799808285" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -98,7 +98,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="Disabled", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PB0", "PB1", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue Mar 05 00:52:54 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue Mar 05 01:56:58 UTC 2024 pageSize = 22236 page = 1 @@ -745,6 +745,7 @@ mc33810Gpgd3Mode = bits, U32, 1576, [4:4], "false", "true" enableExtendedCanBroadcast = bits, U32, 1576, [5:5], "false", "true" luaCanRxWorkaround = bits, U32, 1576, [6:6], "false", "true" flexSensorInverted = bits, U32, 1576, [7:7], "false", "true" +useHardSkipInTraction = bits, U32, 1576, [8:8], "false", "true" useAuxSpeedForSlipRatio = bits, U32, 1576, [11:11], "false", "true" useVssAsSecondWheelSpeed = bits, U32, 1576, [12:12], "false", "true" is_enabled_spi_5 = bits, U32, 1576, [13:13], "false", "true" @@ -2468,7 +2469,7 @@ injectorStagingRpmBins = array, U16, 22222, [6], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1456 + ochBlockSize = 1468 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3131,145 +3132,147 @@ smartChipState = scalar, S08, 1102, "", 1, 0 smartChipRestartCounter = scalar, S08, 1103, "", 1, 0 smartChipAliveCounter = scalar, S08, 1104, "", 1, 0 startStopPhysicalState = bits, U32, 1108, [0:0] -acrStateDup = bits, U32, 1108, [1:1] -acrEngineMovedRecently = bits, U32, 1108, [2:2] -heaterControlEnabled = bits, U32, 1108, [3:3] -luaDigitalState0 = bits, U32, 1108, [4:4] -luaDigitalState1 = bits, U32, 1108, [5:5] -luaDigitalState2 = bits, U32, 1108, [6:6] -luaDigitalState3 = bits, U32, 1108, [7:7] +acrEngineMovedRecently = bits, U32, 1108, [1:1] +heaterControlEnabled = bits, U32, 1108, [2:2] +luaDigitalState0 = bits, U32, 1108, [3:3] +luaDigitalState1 = bits, U32, 1108, [4:4] +luaDigitalState2 = bits, U32, 1108, [5:5] +luaDigitalState3 = bits, U32, 1108, [6:6] startStopStateToggleCounter = scalar, U32, 1112, "", 1, 0 egtValue1 = scalar, F32, 1116, "", 1, 0 egtValue2 = scalar, F32, 1120, "", 1, 0 -desiredRpmLimit = scalar, S16, 1124, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1128, "", 1, 0 -globalSparkCounter = scalar, U32, 1132, "", 1, 0 -fuelingLoad = scalar, F32, 1136, "", 1, 0 -ignitionLoad = scalar, F32, 1140, "", 1, 0 -veTableYAxis = scalar, U16, 1144, "%", 0.01, 0 -; total TS size = 1148 -tpsFrom = scalar, F32, 1148 -tpsTo = scalar, F32, 1152 -deltaTps = scalar, F32, 1156 -extraFuel = scalar, F32, 1160, "", 1, 0 -valueFromTable = scalar, F32, 1164, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1168, [0:0] -isBelowDecelThreshold = bits, U32, 1168, [1:1] -isTimeToResetAccumulator = bits, U32, 1168, [2:2] -isFractionalEnrichment = bits, U32, 1168, [3:3] -belowEpsilon = bits, U32, 1168, [4:4] -tooShort = bits, U32, 1168, [5:5] -fractionalInjFuel = scalar, F32, 1172, "", 1, 0 -accumulatedValue = scalar, F32, 1176, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1180, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1184, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1188, "", 1, 0 -cycleCnt = scalar, S32, 1192, "", 1, 0 -; total TS size = 1196 -hwEventCounters1 = scalar, U32, 1196, "", 1, 0 -hwEventCounters2 = scalar, U32, 1200, "", 1, 0 -hwEventCounters3 = scalar, U32, 1204, "", 1, 0 -hwEventCounters4 = scalar, U32, 1208, "", 1, 0 -hwEventCounters5 = scalar, U32, 1212, "", 1, 0 -hwEventCounters6 = scalar, U32, 1216, "", 1, 0 -vvtCamCounter = scalar, U32, 1220, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1224, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1228, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1232, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1233, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1236, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1240, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1244, "", 1, 0 -mapCamPrevToothAngle = scalar, F32, 1248, "deg", 1, 0 -isDecodingMapCam = bits, U32, 1252, [0:0] -; total TS size = 1256 -crankSynchronizationCounter0 = scalar, U32, 1256, "", 1, 0 -vvtSyncGapRatio0 = scalar, F32, 1260, "", 1, 0 -vvtToothDurations00 = scalar, U32, 1264, "us", 1, 0 -vvtCurrentPosition0 = scalar, F32, 1268, "sync: Primary Cam Position", 1, 0 -vvtToothPosition10 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition20 = scalar, F32, 1276, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition30 = scalar, F32, 1280, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition40 = scalar, F32, 1284, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio0 = scalar, F32, 1288, "", 1, 0 -triggerStateIndex0 = scalar, U08, 1292, "", 1, 0 -vvtStateIndex0 = scalar, U08, 1293, "", 1, 0 -; total TS size = 1296 -camResyncCounter = scalar, U08, 1296, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1300, [0:0] -; total TS size = 1304 -wallFuelCorrection = scalar, F32, 1304, "", 1, 0 -wallFuel = scalar, F32, 1308, "", 1, 0 -; total TS size = 1312 -idleState = bits, S32, 1312, [0:2], "not important" -currentIdlePosition = scalar, F32, 1316 -baseIdlePosition = scalar, F32, 1320 -idleClosedLoop = scalar, F32, 1324 -iacByTpsTaper = scalar, F32, 1328 -throttlePedalUpState = scalar, S32, 1332, "", 1, 0 -mightResetPid = bits, U32, 1336, [0:0] -shouldResetPid = bits, U32, 1336, [1:1] -wasResetPid = bits, U32, 1336, [2:2] -mustResetPid = bits, U32, 1336, [3:3] -isCranking = bits, U32, 1336, [4:4] -isIacTableForCoasting = bits, U32, 1336, [5:5] -notIdling = bits, U32, 1336, [6:6] -needReset = bits, U32, 1336, [7:7] -isInDeadZone = bits, U32, 1336, [8:8] -isBlipping = bits, U32, 1336, [9:9] -useClosedLoop = bits, U32, 1336, [10:10] -badTps = bits, U32, 1336, [11:11] -looksLikeRunning = bits, U32, 1336, [12:12] -looksLikeCoasting = bits, U32, 1336, [13:13] -looksLikeCrankToIdle = bits, U32, 1336, [14:14] -isIdleCoasting = bits, U32, 1336, [15:15] -isIdleClosedLoop = bits, U32, 1336, [16:16] -idleTarget = scalar, S32, 1340, "", 1, 0 -targetRpmByClt = scalar, S32, 1344, "", 1, 0 -targetRpmAc = scalar, S32, 1348, "", 1, 0 -iacByRpmTaper = scalar, F32, 1352 -luaAdd = scalar, F32, 1356 -; total TS size = 1360 -idlePosition0 = scalar, F32, 1360, "per", 1,0 -trim0 = scalar, F32, 1364, "", 1, 0 -luaAdjustment0 = scalar, F32, 1368, "per", 1,0 -m_wastegatePosition0 = scalar, F32, 1372, "per", 1,0 -etbFeedForward0 = scalar, F32, 1376 -etbIntegralError0 = scalar, F32, 1380, "", 1, 0 -etbCurrentTarget0 = scalar, F32, 1384, "%", 1, 0 -etbCurrentAdjustedTarget0 = scalar, F32, 1388, "%", 1, 0 -etbRevLimitActive0 = bits, U32, 1392, [0:0] -jamDetected0 = bits, U32, 1392, [1:1] -etbDutyRateOfChange0 = scalar, F32, 1396, "per", 1,0 -etbDutyAverage0 = scalar, F32, 1400, "per", 1,0 -etbTpsErrorCounter0 = scalar, U16, 1404, "count", 1,0 -etbPpsErrorCounter0 = scalar, U16, 1406, "count", 1,0 -etbErrorCode0 = scalar, S08, 1408, "", 1, 0 -tcEtbDrop0 = scalar, S08, 1409, "", 1, 0 -jamTimer0 = scalar, U16, 1410, "sec", 0.01, 0 -; total TS size = 1412 -faultCode0 = scalar, U08, 1412, "", 1, 0 -heaterDuty0 = scalar, U08, 1413, "%", 1, 0 -pumpDuty0 = scalar, U08, 1414, "%", 1, 0 -tempC0 = scalar, U16, 1416, "C", 1, 0 -nernstVoltage0 = scalar, U16, 1418, "V", 0.001, 0 -esr0 = scalar, U16, 1420, "ohm", 1, 0 +luaSoftSparkSkip = scalar, F32, 1124, "", 1, 0 +luaHardSparkSkip = scalar, F32, 1128, "", 1, 0 +tractionControlSparkSkip = scalar, F32, 1132, "", 1, 0 +desiredRpmLimit = scalar, S16, 1136, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 1140, "", 1, 0 +globalSparkCounter = scalar, U32, 1144, "", 1, 0 +fuelingLoad = scalar, F32, 1148, "", 1, 0 +ignitionLoad = scalar, F32, 1152, "", 1, 0 +veTableYAxis = scalar, U16, 1156, "%", 0.01, 0 +; total TS size = 1160 +tpsFrom = scalar, F32, 1160 +tpsTo = scalar, F32, 1164 +deltaTps = scalar, F32, 1168 +extraFuel = scalar, F32, 1172, "", 1, 0 +valueFromTable = scalar, F32, 1176, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1180, [0:0] +isBelowDecelThreshold = bits, U32, 1180, [1:1] +isTimeToResetAccumulator = bits, U32, 1180, [2:2] +isFractionalEnrichment = bits, U32, 1180, [3:3] +belowEpsilon = bits, U32, 1180, [4:4] +tooShort = bits, U32, 1180, [5:5] +fractionalInjFuel = scalar, F32, 1184, "", 1, 0 +accumulatedValue = scalar, F32, 1188, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1192, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1196, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1200, "", 1, 0 +cycleCnt = scalar, S32, 1204, "", 1, 0 +; total TS size = 1208 +hwEventCounters1 = scalar, U32, 1208, "", 1, 0 +hwEventCounters2 = scalar, U32, 1212, "", 1, 0 +hwEventCounters3 = scalar, U32, 1216, "", 1, 0 +hwEventCounters4 = scalar, U32, 1220, "", 1, 0 +hwEventCounters5 = scalar, U32, 1224, "", 1, 0 +hwEventCounters6 = scalar, U32, 1228, "", 1, 0 +vvtCamCounter = scalar, U32, 1232, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1236, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1240, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1244, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1245, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1248, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1252, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1256, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1260, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1264, [0:0] +; total TS size = 1268 +crankSynchronizationCounter0 = scalar, U32, 1268, "", 1, 0 +vvtSyncGapRatio0 = scalar, F32, 1272, "", 1, 0 +vvtToothDurations00 = scalar, U32, 1276, "us", 1, 0 +vvtCurrentPosition0 = scalar, F32, 1280, "sync: Primary Cam Position", 1, 0 +vvtToothPosition10 = scalar, F32, 1284, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition20 = scalar, F32, 1288, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition30 = scalar, F32, 1292, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition40 = scalar, F32, 1296, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio0 = scalar, F32, 1300, "", 1, 0 +triggerStateIndex0 = scalar, U08, 1304, "", 1, 0 +vvtStateIndex0 = scalar, U08, 1305, "", 1, 0 +; total TS size = 1308 +camResyncCounter = scalar, U08, 1308, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1312, [0:0] +; total TS size = 1316 +wallFuelCorrection = scalar, F32, 1316, "", 1, 0 +wallFuel = scalar, F32, 1320, "", 1, 0 +; total TS size = 1324 +idleState = bits, S32, 1324, [0:2], "not important" +currentIdlePosition = scalar, F32, 1328 +baseIdlePosition = scalar, F32, 1332 +idleClosedLoop = scalar, F32, 1336 +iacByTpsTaper = scalar, F32, 1340 +throttlePedalUpState = scalar, S32, 1344, "", 1, 0 +mightResetPid = bits, U32, 1348, [0:0] +shouldResetPid = bits, U32, 1348, [1:1] +wasResetPid = bits, U32, 1348, [2:2] +mustResetPid = bits, U32, 1348, [3:3] +isCranking = bits, U32, 1348, [4:4] +isIacTableForCoasting = bits, U32, 1348, [5:5] +notIdling = bits, U32, 1348, [6:6] +needReset = bits, U32, 1348, [7:7] +isInDeadZone = bits, U32, 1348, [8:8] +isBlipping = bits, U32, 1348, [9:9] +useClosedLoop = bits, U32, 1348, [10:10] +badTps = bits, U32, 1348, [11:11] +looksLikeRunning = bits, U32, 1348, [12:12] +looksLikeCoasting = bits, U32, 1348, [13:13] +looksLikeCrankToIdle = bits, U32, 1348, [14:14] +isIdleCoasting = bits, U32, 1348, [15:15] +isIdleClosedLoop = bits, U32, 1348, [16:16] +idleTarget = scalar, S32, 1352, "", 1, 0 +targetRpmByClt = scalar, S32, 1356, "", 1, 0 +targetRpmAc = scalar, S32, 1360, "", 1, 0 +iacByRpmTaper = scalar, F32, 1364 +luaAdd = scalar, F32, 1368 +; total TS size = 1372 +idlePosition0 = scalar, F32, 1372, "per", 1,0 +trim0 = scalar, F32, 1376, "", 1, 0 +luaAdjustment0 = scalar, F32, 1380, "per", 1,0 +m_wastegatePosition0 = scalar, F32, 1384, "per", 1,0 +etbFeedForward0 = scalar, F32, 1388 +etbIntegralError0 = scalar, F32, 1392, "", 1, 0 +etbCurrentTarget0 = scalar, F32, 1396, "%", 1, 0 +etbCurrentAdjustedTarget0 = scalar, F32, 1400, "%", 1, 0 +etbRevLimitActive0 = bits, U32, 1404, [0:0] +jamDetected0 = bits, U32, 1404, [1:1] +etbDutyRateOfChange0 = scalar, F32, 1408, "per", 1,0 +etbDutyAverage0 = scalar, F32, 1412, "per", 1,0 +etbTpsErrorCounter0 = scalar, U16, 1416, "count", 1,0 +etbPpsErrorCounter0 = scalar, U16, 1418, "count", 1,0 +etbErrorCode0 = scalar, S08, 1420, "", 1, 0 +tcEtbDrop0 = scalar, S08, 1421, "", 1, 0 +jamTimer0 = scalar, U16, 1422, "sec", 0.01, 0 ; total TS size = 1424 -dcOutput0 = scalar, F32, 1424, "per", 1,0 -isEnabled0_int = scalar, U08, 1428, "per", 1,0 -isEnabled0 = bits, U32, 1432, [0:0] +faultCode0 = scalar, U08, 1424, "", 1, 0 +heaterDuty0 = scalar, U08, 1425, "%", 1, 0 +pumpDuty0 = scalar, U08, 1426, "%", 1, 0 +tempC0 = scalar, U16, 1428, "C", 1, 0 +nernstVoltage0 = scalar, U16, 1430, "V", 0.001, 0 +esr0 = scalar, U16, 1432, "ohm", 1, 0 ; total TS size = 1436 -value0 = scalar, U16, 1436, "value", 1,0 -value1 = scalar, U16, 1438, "value", 1,0 -errorRate = scalar, F32, 1440, "ratio", 1,0 -; total TS size = 1444 -vvtTarget = scalar, U16, 1444, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1446, "%", 0.5, 0 +dcOutput0 = scalar, F32, 1436, "per", 1,0 +isEnabled0_int = scalar, U08, 1440, "per", 1,0 +isEnabled0 = bits, U32, 1444, [0:0] ; total TS size = 1448 -lambdaCurrentlyGood = bits, U32, 1448, [0:0] -lambdaMonitorCut = bits, U32, 1448, [1:1] -lambdaTimeSinceGood = scalar, U16, 1452, "sec", 0.01, 0 +value0 = scalar, U16, 1448, "value", 1,0 +value1 = scalar, U16, 1450, "value", 1,0 +errorRate = scalar, F32, 1452, "ratio", 1,0 ; total TS size = 1456 +vvtTarget = scalar, U16, 1456, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1458, "%", 0.5, 0 +; total TS size = 1460 +lambdaCurrentlyGood = bits, U32, 1460, [0:0] +lambdaMonitorCut = bits, U32, 1460, [1:1] +lambdaTimeSinceGood = scalar, U16, 1464, "sec", 0.01, 0 +; total TS size = 1468 time = { timeNow } @@ -5401,7 +5404,6 @@ entry = smartChipState, "smartChipState", int, "%d" entry = smartChipRestartCounter, "smartChipRestartCounter", int, "%d" entry = smartChipAliveCounter, "smartChipAliveCounter", int, "%d" entry = startStopPhysicalState, "startStopPhysicalState", int, "%d" -entry = acrStateDup, "acrStateDup", int, "%d" entry = acrEngineMovedRecently, "acrEngineMovedRecently", int, "%d" entry = heaterControlEnabled, "heaterControlEnabled", int, "%d" entry = luaDigitalState0, "luaDigitalState0", int, "%d" @@ -5411,6 +5413,9 @@ entry = luaDigitalState3, "luaDigitalState3", int, "%d" entry = startStopStateToggleCounter, "startStopStateToggleCounter", int, "%d" entry = egtValue1, "egtValue1", float, "%.3f" entry = egtValue2, "egtValue2", float, "%.3f" +entry = luaSoftSparkSkip, "luaSoftSparkSkip", float, "%.3f" +entry = luaHardSparkSkip, "luaHardSparkSkip", float, "%.3f" +entry = tractionControlSparkSkip, "tractionControlSparkSkip", float, "%.3f" entry = desiredRpmLimit, "User-defined RPM hard limit", int, "%d" entry = fuelInjectionCounter, "Fuel: Injection counter", int, "%d" entry = globalSparkCounter, "Ign: Spark counter", int, "%d" @@ -5907,7 +5912,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 @@ -6355,7 +6360,6 @@ indicatorPanel = engine_stateIndicatorPanel, 2 indicator = {lua_luaDisableEtb}, "luaDisableEtb No", "luaDisableEtb Yes" indicator = {lua_luaIgnCut}, "luaIgnCut No", "luaIgnCut Yes" indicator = {startStopPhysicalState}, "startStopPhysicalState No", "startStopPhysicalState Yes" - indicator = {acrStateDup}, "acrStateDup No", "acrStateDup Yes" indicator = {acrEngineMovedRecently}, "acrEngineMovedRecently No", "acrEngineMovedRecently Yes" indicator = {heaterControlEnabled}, "heaterControlEnabled No", "heaterControlEnabled Yes" indicator = {luaDigitalState0}, "luaDigitalState0 No", "luaDigitalState0 Yes" @@ -6391,12 +6395,16 @@ dialog = engine_stateDialog, "engine_state" graphLine = egtValue1 graphLine = egtValue2 liveGraph = engine_state_6_Graph, "Graph", South + graphLine = luaSoftSparkSkip + graphLine = luaHardSparkSkip + graphLine = tractionControlSparkSkip graphLine = desiredRpmLimit + liveGraph = engine_state_7_Graph, "Graph", South graphLine = fuelInjectionCounter graphLine = globalSparkCounter graphLine = fuelingLoad - liveGraph = engine_state_7_Graph, "Graph", South graphLine = ignitionLoad + liveGraph = engine_state_8_Graph, "Graph", South graphLine = veTableYAxis indicatorPanel = tps_accel_stateIndicatorPanel, 2 @@ -7303,6 +7311,10 @@ dialog = lambda_monitorDialog, "lambda_monitor" 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 diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_469.ini b/firmware/tunerstudio/generated/rusefi_prometheus_469.ini index bec1f81d38..001418adcd 100644 --- a/firmware/tunerstudio/generated/rusefi_prometheus_469.ini +++ b/firmware/tunerstudio/generated/rusefi_prometheus_469.ini @@ -37,12 +37,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.03.05.prometheus_469.1614195493" + signature = "rusEFI master.2024.03.05.prometheus_469.799808285" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.03.05.prometheus_469.1614195493" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.03.05.prometheus_469.799808285" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -98,7 +98,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="Disabled", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PB0", "PB1", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue Mar 05 00:52:53 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue Mar 05 01:56:57 UTC 2024 pageSize = 22236 page = 1 @@ -745,6 +745,7 @@ mc33810Gpgd3Mode = bits, U32, 1576, [4:4], "false", "true" enableExtendedCanBroadcast = bits, U32, 1576, [5:5], "false", "true" luaCanRxWorkaround = bits, U32, 1576, [6:6], "false", "true" flexSensorInverted = bits, U32, 1576, [7:7], "false", "true" +useHardSkipInTraction = bits, U32, 1576, [8:8], "false", "true" useAuxSpeedForSlipRatio = bits, U32, 1576, [11:11], "false", "true" useVssAsSecondWheelSpeed = bits, U32, 1576, [12:12], "false", "true" is_enabled_spi_5 = bits, U32, 1576, [13:13], "false", "true" @@ -2468,7 +2469,7 @@ injectorStagingRpmBins = array, U16, 22222, [6], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1456 + ochBlockSize = 1468 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3131,145 +3132,147 @@ smartChipState = scalar, S08, 1102, "", 1, 0 smartChipRestartCounter = scalar, S08, 1103, "", 1, 0 smartChipAliveCounter = scalar, S08, 1104, "", 1, 0 startStopPhysicalState = bits, U32, 1108, [0:0] -acrStateDup = bits, U32, 1108, [1:1] -acrEngineMovedRecently = bits, U32, 1108, [2:2] -heaterControlEnabled = bits, U32, 1108, [3:3] -luaDigitalState0 = bits, U32, 1108, [4:4] -luaDigitalState1 = bits, U32, 1108, [5:5] -luaDigitalState2 = bits, U32, 1108, [6:6] -luaDigitalState3 = bits, U32, 1108, [7:7] +acrEngineMovedRecently = bits, U32, 1108, [1:1] +heaterControlEnabled = bits, U32, 1108, [2:2] +luaDigitalState0 = bits, U32, 1108, [3:3] +luaDigitalState1 = bits, U32, 1108, [4:4] +luaDigitalState2 = bits, U32, 1108, [5:5] +luaDigitalState3 = bits, U32, 1108, [6:6] startStopStateToggleCounter = scalar, U32, 1112, "", 1, 0 egtValue1 = scalar, F32, 1116, "", 1, 0 egtValue2 = scalar, F32, 1120, "", 1, 0 -desiredRpmLimit = scalar, S16, 1124, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1128, "", 1, 0 -globalSparkCounter = scalar, U32, 1132, "", 1, 0 -fuelingLoad = scalar, F32, 1136, "", 1, 0 -ignitionLoad = scalar, F32, 1140, "", 1, 0 -veTableYAxis = scalar, U16, 1144, "%", 0.01, 0 -; total TS size = 1148 -tpsFrom = scalar, F32, 1148 -tpsTo = scalar, F32, 1152 -deltaTps = scalar, F32, 1156 -extraFuel = scalar, F32, 1160, "", 1, 0 -valueFromTable = scalar, F32, 1164, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1168, [0:0] -isBelowDecelThreshold = bits, U32, 1168, [1:1] -isTimeToResetAccumulator = bits, U32, 1168, [2:2] -isFractionalEnrichment = bits, U32, 1168, [3:3] -belowEpsilon = bits, U32, 1168, [4:4] -tooShort = bits, U32, 1168, [5:5] -fractionalInjFuel = scalar, F32, 1172, "", 1, 0 -accumulatedValue = scalar, F32, 1176, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1180, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1184, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1188, "", 1, 0 -cycleCnt = scalar, S32, 1192, "", 1, 0 -; total TS size = 1196 -hwEventCounters1 = scalar, U32, 1196, "", 1, 0 -hwEventCounters2 = scalar, U32, 1200, "", 1, 0 -hwEventCounters3 = scalar, U32, 1204, "", 1, 0 -hwEventCounters4 = scalar, U32, 1208, "", 1, 0 -hwEventCounters5 = scalar, U32, 1212, "", 1, 0 -hwEventCounters6 = scalar, U32, 1216, "", 1, 0 -vvtCamCounter = scalar, U32, 1220, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1224, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1228, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1232, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1233, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1236, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1240, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1244, "", 1, 0 -mapCamPrevToothAngle = scalar, F32, 1248, "deg", 1, 0 -isDecodingMapCam = bits, U32, 1252, [0:0] -; total TS size = 1256 -crankSynchronizationCounter0 = scalar, U32, 1256, "", 1, 0 -vvtSyncGapRatio0 = scalar, F32, 1260, "", 1, 0 -vvtToothDurations00 = scalar, U32, 1264, "us", 1, 0 -vvtCurrentPosition0 = scalar, F32, 1268, "sync: Primary Cam Position", 1, 0 -vvtToothPosition10 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition20 = scalar, F32, 1276, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition30 = scalar, F32, 1280, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition40 = scalar, F32, 1284, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio0 = scalar, F32, 1288, "", 1, 0 -triggerStateIndex0 = scalar, U08, 1292, "", 1, 0 -vvtStateIndex0 = scalar, U08, 1293, "", 1, 0 -; total TS size = 1296 -camResyncCounter = scalar, U08, 1296, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1300, [0:0] -; total TS size = 1304 -wallFuelCorrection = scalar, F32, 1304, "", 1, 0 -wallFuel = scalar, F32, 1308, "", 1, 0 -; total TS size = 1312 -idleState = bits, S32, 1312, [0:2], "not important" -currentIdlePosition = scalar, F32, 1316 -baseIdlePosition = scalar, F32, 1320 -idleClosedLoop = scalar, F32, 1324 -iacByTpsTaper = scalar, F32, 1328 -throttlePedalUpState = scalar, S32, 1332, "", 1, 0 -mightResetPid = bits, U32, 1336, [0:0] -shouldResetPid = bits, U32, 1336, [1:1] -wasResetPid = bits, U32, 1336, [2:2] -mustResetPid = bits, U32, 1336, [3:3] -isCranking = bits, U32, 1336, [4:4] -isIacTableForCoasting = bits, U32, 1336, [5:5] -notIdling = bits, U32, 1336, [6:6] -needReset = bits, U32, 1336, [7:7] -isInDeadZone = bits, U32, 1336, [8:8] -isBlipping = bits, U32, 1336, [9:9] -useClosedLoop = bits, U32, 1336, [10:10] -badTps = bits, U32, 1336, [11:11] -looksLikeRunning = bits, U32, 1336, [12:12] -looksLikeCoasting = bits, U32, 1336, [13:13] -looksLikeCrankToIdle = bits, U32, 1336, [14:14] -isIdleCoasting = bits, U32, 1336, [15:15] -isIdleClosedLoop = bits, U32, 1336, [16:16] -idleTarget = scalar, S32, 1340, "", 1, 0 -targetRpmByClt = scalar, S32, 1344, "", 1, 0 -targetRpmAc = scalar, S32, 1348, "", 1, 0 -iacByRpmTaper = scalar, F32, 1352 -luaAdd = scalar, F32, 1356 -; total TS size = 1360 -idlePosition0 = scalar, F32, 1360, "per", 1,0 -trim0 = scalar, F32, 1364, "", 1, 0 -luaAdjustment0 = scalar, F32, 1368, "per", 1,0 -m_wastegatePosition0 = scalar, F32, 1372, "per", 1,0 -etbFeedForward0 = scalar, F32, 1376 -etbIntegralError0 = scalar, F32, 1380, "", 1, 0 -etbCurrentTarget0 = scalar, F32, 1384, "%", 1, 0 -etbCurrentAdjustedTarget0 = scalar, F32, 1388, "%", 1, 0 -etbRevLimitActive0 = bits, U32, 1392, [0:0] -jamDetected0 = bits, U32, 1392, [1:1] -etbDutyRateOfChange0 = scalar, F32, 1396, "per", 1,0 -etbDutyAverage0 = scalar, F32, 1400, "per", 1,0 -etbTpsErrorCounter0 = scalar, U16, 1404, "count", 1,0 -etbPpsErrorCounter0 = scalar, U16, 1406, "count", 1,0 -etbErrorCode0 = scalar, S08, 1408, "", 1, 0 -tcEtbDrop0 = scalar, S08, 1409, "", 1, 0 -jamTimer0 = scalar, U16, 1410, "sec", 0.01, 0 -; total TS size = 1412 -faultCode0 = scalar, U08, 1412, "", 1, 0 -heaterDuty0 = scalar, U08, 1413, "%", 1, 0 -pumpDuty0 = scalar, U08, 1414, "%", 1, 0 -tempC0 = scalar, U16, 1416, "C", 1, 0 -nernstVoltage0 = scalar, U16, 1418, "V", 0.001, 0 -esr0 = scalar, U16, 1420, "ohm", 1, 0 +luaSoftSparkSkip = scalar, F32, 1124, "", 1, 0 +luaHardSparkSkip = scalar, F32, 1128, "", 1, 0 +tractionControlSparkSkip = scalar, F32, 1132, "", 1, 0 +desiredRpmLimit = scalar, S16, 1136, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 1140, "", 1, 0 +globalSparkCounter = scalar, U32, 1144, "", 1, 0 +fuelingLoad = scalar, F32, 1148, "", 1, 0 +ignitionLoad = scalar, F32, 1152, "", 1, 0 +veTableYAxis = scalar, U16, 1156, "%", 0.01, 0 +; total TS size = 1160 +tpsFrom = scalar, F32, 1160 +tpsTo = scalar, F32, 1164 +deltaTps = scalar, F32, 1168 +extraFuel = scalar, F32, 1172, "", 1, 0 +valueFromTable = scalar, F32, 1176, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1180, [0:0] +isBelowDecelThreshold = bits, U32, 1180, [1:1] +isTimeToResetAccumulator = bits, U32, 1180, [2:2] +isFractionalEnrichment = bits, U32, 1180, [3:3] +belowEpsilon = bits, U32, 1180, [4:4] +tooShort = bits, U32, 1180, [5:5] +fractionalInjFuel = scalar, F32, 1184, "", 1, 0 +accumulatedValue = scalar, F32, 1188, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1192, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1196, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1200, "", 1, 0 +cycleCnt = scalar, S32, 1204, "", 1, 0 +; total TS size = 1208 +hwEventCounters1 = scalar, U32, 1208, "", 1, 0 +hwEventCounters2 = scalar, U32, 1212, "", 1, 0 +hwEventCounters3 = scalar, U32, 1216, "", 1, 0 +hwEventCounters4 = scalar, U32, 1220, "", 1, 0 +hwEventCounters5 = scalar, U32, 1224, "", 1, 0 +hwEventCounters6 = scalar, U32, 1228, "", 1, 0 +vvtCamCounter = scalar, U32, 1232, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1236, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1240, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1244, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1245, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1248, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1252, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1256, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1260, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1264, [0:0] +; total TS size = 1268 +crankSynchronizationCounter0 = scalar, U32, 1268, "", 1, 0 +vvtSyncGapRatio0 = scalar, F32, 1272, "", 1, 0 +vvtToothDurations00 = scalar, U32, 1276, "us", 1, 0 +vvtCurrentPosition0 = scalar, F32, 1280, "sync: Primary Cam Position", 1, 0 +vvtToothPosition10 = scalar, F32, 1284, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition20 = scalar, F32, 1288, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition30 = scalar, F32, 1292, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition40 = scalar, F32, 1296, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio0 = scalar, F32, 1300, "", 1, 0 +triggerStateIndex0 = scalar, U08, 1304, "", 1, 0 +vvtStateIndex0 = scalar, U08, 1305, "", 1, 0 +; total TS size = 1308 +camResyncCounter = scalar, U08, 1308, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1312, [0:0] +; total TS size = 1316 +wallFuelCorrection = scalar, F32, 1316, "", 1, 0 +wallFuel = scalar, F32, 1320, "", 1, 0 +; total TS size = 1324 +idleState = bits, S32, 1324, [0:2], "not important" +currentIdlePosition = scalar, F32, 1328 +baseIdlePosition = scalar, F32, 1332 +idleClosedLoop = scalar, F32, 1336 +iacByTpsTaper = scalar, F32, 1340 +throttlePedalUpState = scalar, S32, 1344, "", 1, 0 +mightResetPid = bits, U32, 1348, [0:0] +shouldResetPid = bits, U32, 1348, [1:1] +wasResetPid = bits, U32, 1348, [2:2] +mustResetPid = bits, U32, 1348, [3:3] +isCranking = bits, U32, 1348, [4:4] +isIacTableForCoasting = bits, U32, 1348, [5:5] +notIdling = bits, U32, 1348, [6:6] +needReset = bits, U32, 1348, [7:7] +isInDeadZone = bits, U32, 1348, [8:8] +isBlipping = bits, U32, 1348, [9:9] +useClosedLoop = bits, U32, 1348, [10:10] +badTps = bits, U32, 1348, [11:11] +looksLikeRunning = bits, U32, 1348, [12:12] +looksLikeCoasting = bits, U32, 1348, [13:13] +looksLikeCrankToIdle = bits, U32, 1348, [14:14] +isIdleCoasting = bits, U32, 1348, [15:15] +isIdleClosedLoop = bits, U32, 1348, [16:16] +idleTarget = scalar, S32, 1352, "", 1, 0 +targetRpmByClt = scalar, S32, 1356, "", 1, 0 +targetRpmAc = scalar, S32, 1360, "", 1, 0 +iacByRpmTaper = scalar, F32, 1364 +luaAdd = scalar, F32, 1368 +; total TS size = 1372 +idlePosition0 = scalar, F32, 1372, "per", 1,0 +trim0 = scalar, F32, 1376, "", 1, 0 +luaAdjustment0 = scalar, F32, 1380, "per", 1,0 +m_wastegatePosition0 = scalar, F32, 1384, "per", 1,0 +etbFeedForward0 = scalar, F32, 1388 +etbIntegralError0 = scalar, F32, 1392, "", 1, 0 +etbCurrentTarget0 = scalar, F32, 1396, "%", 1, 0 +etbCurrentAdjustedTarget0 = scalar, F32, 1400, "%", 1, 0 +etbRevLimitActive0 = bits, U32, 1404, [0:0] +jamDetected0 = bits, U32, 1404, [1:1] +etbDutyRateOfChange0 = scalar, F32, 1408, "per", 1,0 +etbDutyAverage0 = scalar, F32, 1412, "per", 1,0 +etbTpsErrorCounter0 = scalar, U16, 1416, "count", 1,0 +etbPpsErrorCounter0 = scalar, U16, 1418, "count", 1,0 +etbErrorCode0 = scalar, S08, 1420, "", 1, 0 +tcEtbDrop0 = scalar, S08, 1421, "", 1, 0 +jamTimer0 = scalar, U16, 1422, "sec", 0.01, 0 ; total TS size = 1424 -dcOutput0 = scalar, F32, 1424, "per", 1,0 -isEnabled0_int = scalar, U08, 1428, "per", 1,0 -isEnabled0 = bits, U32, 1432, [0:0] +faultCode0 = scalar, U08, 1424, "", 1, 0 +heaterDuty0 = scalar, U08, 1425, "%", 1, 0 +pumpDuty0 = scalar, U08, 1426, "%", 1, 0 +tempC0 = scalar, U16, 1428, "C", 1, 0 +nernstVoltage0 = scalar, U16, 1430, "V", 0.001, 0 +esr0 = scalar, U16, 1432, "ohm", 1, 0 ; total TS size = 1436 -value0 = scalar, U16, 1436, "value", 1,0 -value1 = scalar, U16, 1438, "value", 1,0 -errorRate = scalar, F32, 1440, "ratio", 1,0 -; total TS size = 1444 -vvtTarget = scalar, U16, 1444, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1446, "%", 0.5, 0 +dcOutput0 = scalar, F32, 1436, "per", 1,0 +isEnabled0_int = scalar, U08, 1440, "per", 1,0 +isEnabled0 = bits, U32, 1444, [0:0] ; total TS size = 1448 -lambdaCurrentlyGood = bits, U32, 1448, [0:0] -lambdaMonitorCut = bits, U32, 1448, [1:1] -lambdaTimeSinceGood = scalar, U16, 1452, "sec", 0.01, 0 +value0 = scalar, U16, 1448, "value", 1,0 +value1 = scalar, U16, 1450, "value", 1,0 +errorRate = scalar, F32, 1452, "ratio", 1,0 ; total TS size = 1456 +vvtTarget = scalar, U16, 1456, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1458, "%", 0.5, 0 +; total TS size = 1460 +lambdaCurrentlyGood = bits, U32, 1460, [0:0] +lambdaMonitorCut = bits, U32, 1460, [1:1] +lambdaTimeSinceGood = scalar, U16, 1464, "sec", 0.01, 0 +; total TS size = 1468 time = { timeNow } @@ -5401,7 +5404,6 @@ entry = smartChipState, "smartChipState", int, "%d" entry = smartChipRestartCounter, "smartChipRestartCounter", int, "%d" entry = smartChipAliveCounter, "smartChipAliveCounter", int, "%d" entry = startStopPhysicalState, "startStopPhysicalState", int, "%d" -entry = acrStateDup, "acrStateDup", int, "%d" entry = acrEngineMovedRecently, "acrEngineMovedRecently", int, "%d" entry = heaterControlEnabled, "heaterControlEnabled", int, "%d" entry = luaDigitalState0, "luaDigitalState0", int, "%d" @@ -5411,6 +5413,9 @@ entry = luaDigitalState3, "luaDigitalState3", int, "%d" entry = startStopStateToggleCounter, "startStopStateToggleCounter", int, "%d" entry = egtValue1, "egtValue1", float, "%.3f" entry = egtValue2, "egtValue2", float, "%.3f" +entry = luaSoftSparkSkip, "luaSoftSparkSkip", float, "%.3f" +entry = luaHardSparkSkip, "luaHardSparkSkip", float, "%.3f" +entry = tractionControlSparkSkip, "tractionControlSparkSkip", float, "%.3f" entry = desiredRpmLimit, "User-defined RPM hard limit", int, "%d" entry = fuelInjectionCounter, "Fuel: Injection counter", int, "%d" entry = globalSparkCounter, "Ign: Spark counter", int, "%d" @@ -5907,7 +5912,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 @@ -6355,7 +6360,6 @@ indicatorPanel = engine_stateIndicatorPanel, 2 indicator = {lua_luaDisableEtb}, "luaDisableEtb No", "luaDisableEtb Yes" indicator = {lua_luaIgnCut}, "luaIgnCut No", "luaIgnCut Yes" indicator = {startStopPhysicalState}, "startStopPhysicalState No", "startStopPhysicalState Yes" - indicator = {acrStateDup}, "acrStateDup No", "acrStateDup Yes" indicator = {acrEngineMovedRecently}, "acrEngineMovedRecently No", "acrEngineMovedRecently Yes" indicator = {heaterControlEnabled}, "heaterControlEnabled No", "heaterControlEnabled Yes" indicator = {luaDigitalState0}, "luaDigitalState0 No", "luaDigitalState0 Yes" @@ -6391,12 +6395,16 @@ dialog = engine_stateDialog, "engine_state" graphLine = egtValue1 graphLine = egtValue2 liveGraph = engine_state_6_Graph, "Graph", South + graphLine = luaSoftSparkSkip + graphLine = luaHardSparkSkip + graphLine = tractionControlSparkSkip graphLine = desiredRpmLimit + liveGraph = engine_state_7_Graph, "Graph", South graphLine = fuelInjectionCounter graphLine = globalSparkCounter graphLine = fuelingLoad - liveGraph = engine_state_7_Graph, "Graph", South graphLine = ignitionLoad + liveGraph = engine_state_8_Graph, "Graph", South graphLine = veTableYAxis indicatorPanel = tps_accel_stateIndicatorPanel, 2 @@ -7303,6 +7311,10 @@ dialog = lambda_monitorDialog, "lambda_monitor" 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 diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f4.ini b/firmware/tunerstudio/generated/rusefi_proteus_f4.ini index ffd99a4b23..457c88e3fd 100644 --- a/firmware/tunerstudio/generated/rusefi_proteus_f4.ini +++ b/firmware/tunerstudio/generated/rusefi_proteus_f4.ini @@ -37,12 +37,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.03.05.proteus_f4.3488186380" + signature = "rusEFI master.2024.03.05.proteus_f4.2155032628" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.03.05.proteus_f4.3488186380" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.03.05.proteus_f4.2155032628" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -98,7 +98,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","Analog Volt 5","Analog Volt 6","Analog Volt 7","Analog Volt 8","Analog Volt 9","Analog Volt 10","Analog Volt 11","Battery Sense","Analog Temp 3","Analog Temp 4","Analog Volt 1","Analog Volt 2","Analog Volt 3","Analog Volt 4","Analog Temp 1","Analog Temp 2" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue Mar 05 00:52:57 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue Mar 05 01:57:01 UTC 2024 pageSize = 26236 page = 1 @@ -745,6 +745,7 @@ mc33810Gpgd3Mode = bits, U32, 1576, [4:4], "false", "true" enableExtendedCanBroadcast = bits, U32, 1576, [5:5], "false", "true" luaCanRxWorkaround = bits, U32, 1576, [6:6], "false", "true" flexSensorInverted = bits, U32, 1576, [7:7], "false", "true" +useHardSkipInTraction = bits, U32, 1576, [8:8], "false", "true" useAuxSpeedForSlipRatio = bits, U32, 1576, [11:11], "false", "true" useVssAsSecondWheelSpeed = bits, U32, 1576, [12:12], "false", "true" is_enabled_spi_5 = bits, U32, 1576, [13:13], "false", "true" @@ -2468,7 +2469,7 @@ injectorStagingRpmBins = array, U16, 26222, [6], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1456 + ochBlockSize = 1468 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3131,145 +3132,147 @@ smartChipState = scalar, S08, 1102, "", 1, 0 smartChipRestartCounter = scalar, S08, 1103, "", 1, 0 smartChipAliveCounter = scalar, S08, 1104, "", 1, 0 startStopPhysicalState = bits, U32, 1108, [0:0] -acrStateDup = bits, U32, 1108, [1:1] -acrEngineMovedRecently = bits, U32, 1108, [2:2] -heaterControlEnabled = bits, U32, 1108, [3:3] -luaDigitalState0 = bits, U32, 1108, [4:4] -luaDigitalState1 = bits, U32, 1108, [5:5] -luaDigitalState2 = bits, U32, 1108, [6:6] -luaDigitalState3 = bits, U32, 1108, [7:7] +acrEngineMovedRecently = bits, U32, 1108, [1:1] +heaterControlEnabled = bits, U32, 1108, [2:2] +luaDigitalState0 = bits, U32, 1108, [3:3] +luaDigitalState1 = bits, U32, 1108, [4:4] +luaDigitalState2 = bits, U32, 1108, [5:5] +luaDigitalState3 = bits, U32, 1108, [6:6] startStopStateToggleCounter = scalar, U32, 1112, "", 1, 0 egtValue1 = scalar, F32, 1116, "", 1, 0 egtValue2 = scalar, F32, 1120, "", 1, 0 -desiredRpmLimit = scalar, S16, 1124, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1128, "", 1, 0 -globalSparkCounter = scalar, U32, 1132, "", 1, 0 -fuelingLoad = scalar, F32, 1136, "", 1, 0 -ignitionLoad = scalar, F32, 1140, "", 1, 0 -veTableYAxis = scalar, U16, 1144, "%", 0.01, 0 -; total TS size = 1148 -tpsFrom = scalar, F32, 1148 -tpsTo = scalar, F32, 1152 -deltaTps = scalar, F32, 1156 -extraFuel = scalar, F32, 1160, "", 1, 0 -valueFromTable = scalar, F32, 1164, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1168, [0:0] -isBelowDecelThreshold = bits, U32, 1168, [1:1] -isTimeToResetAccumulator = bits, U32, 1168, [2:2] -isFractionalEnrichment = bits, U32, 1168, [3:3] -belowEpsilon = bits, U32, 1168, [4:4] -tooShort = bits, U32, 1168, [5:5] -fractionalInjFuel = scalar, F32, 1172, "", 1, 0 -accumulatedValue = scalar, F32, 1176, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1180, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1184, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1188, "", 1, 0 -cycleCnt = scalar, S32, 1192, "", 1, 0 -; total TS size = 1196 -hwEventCounters1 = scalar, U32, 1196, "", 1, 0 -hwEventCounters2 = scalar, U32, 1200, "", 1, 0 -hwEventCounters3 = scalar, U32, 1204, "", 1, 0 -hwEventCounters4 = scalar, U32, 1208, "", 1, 0 -hwEventCounters5 = scalar, U32, 1212, "", 1, 0 -hwEventCounters6 = scalar, U32, 1216, "", 1, 0 -vvtCamCounter = scalar, U32, 1220, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1224, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1228, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1232, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1233, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1236, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1240, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1244, "", 1, 0 -mapCamPrevToothAngle = scalar, F32, 1248, "deg", 1, 0 -isDecodingMapCam = bits, U32, 1252, [0:0] -; total TS size = 1256 -crankSynchronizationCounter0 = scalar, U32, 1256, "", 1, 0 -vvtSyncGapRatio0 = scalar, F32, 1260, "", 1, 0 -vvtToothDurations00 = scalar, U32, 1264, "us", 1, 0 -vvtCurrentPosition0 = scalar, F32, 1268, "sync: Primary Cam Position", 1, 0 -vvtToothPosition10 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition20 = scalar, F32, 1276, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition30 = scalar, F32, 1280, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition40 = scalar, F32, 1284, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio0 = scalar, F32, 1288, "", 1, 0 -triggerStateIndex0 = scalar, U08, 1292, "", 1, 0 -vvtStateIndex0 = scalar, U08, 1293, "", 1, 0 -; total TS size = 1296 -camResyncCounter = scalar, U08, 1296, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1300, [0:0] -; total TS size = 1304 -wallFuelCorrection = scalar, F32, 1304, "", 1, 0 -wallFuel = scalar, F32, 1308, "", 1, 0 -; total TS size = 1312 -idleState = bits, S32, 1312, [0:2], "not important" -currentIdlePosition = scalar, F32, 1316 -baseIdlePosition = scalar, F32, 1320 -idleClosedLoop = scalar, F32, 1324 -iacByTpsTaper = scalar, F32, 1328 -throttlePedalUpState = scalar, S32, 1332, "", 1, 0 -mightResetPid = bits, U32, 1336, [0:0] -shouldResetPid = bits, U32, 1336, [1:1] -wasResetPid = bits, U32, 1336, [2:2] -mustResetPid = bits, U32, 1336, [3:3] -isCranking = bits, U32, 1336, [4:4] -isIacTableForCoasting = bits, U32, 1336, [5:5] -notIdling = bits, U32, 1336, [6:6] -needReset = bits, U32, 1336, [7:7] -isInDeadZone = bits, U32, 1336, [8:8] -isBlipping = bits, U32, 1336, [9:9] -useClosedLoop = bits, U32, 1336, [10:10] -badTps = bits, U32, 1336, [11:11] -looksLikeRunning = bits, U32, 1336, [12:12] -looksLikeCoasting = bits, U32, 1336, [13:13] -looksLikeCrankToIdle = bits, U32, 1336, [14:14] -isIdleCoasting = bits, U32, 1336, [15:15] -isIdleClosedLoop = bits, U32, 1336, [16:16] -idleTarget = scalar, S32, 1340, "", 1, 0 -targetRpmByClt = scalar, S32, 1344, "", 1, 0 -targetRpmAc = scalar, S32, 1348, "", 1, 0 -iacByRpmTaper = scalar, F32, 1352 -luaAdd = scalar, F32, 1356 -; total TS size = 1360 -idlePosition0 = scalar, F32, 1360, "per", 1,0 -trim0 = scalar, F32, 1364, "", 1, 0 -luaAdjustment0 = scalar, F32, 1368, "per", 1,0 -m_wastegatePosition0 = scalar, F32, 1372, "per", 1,0 -etbFeedForward0 = scalar, F32, 1376 -etbIntegralError0 = scalar, F32, 1380, "", 1, 0 -etbCurrentTarget0 = scalar, F32, 1384, "%", 1, 0 -etbCurrentAdjustedTarget0 = scalar, F32, 1388, "%", 1, 0 -etbRevLimitActive0 = bits, U32, 1392, [0:0] -jamDetected0 = bits, U32, 1392, [1:1] -etbDutyRateOfChange0 = scalar, F32, 1396, "per", 1,0 -etbDutyAverage0 = scalar, F32, 1400, "per", 1,0 -etbTpsErrorCounter0 = scalar, U16, 1404, "count", 1,0 -etbPpsErrorCounter0 = scalar, U16, 1406, "count", 1,0 -etbErrorCode0 = scalar, S08, 1408, "", 1, 0 -tcEtbDrop0 = scalar, S08, 1409, "", 1, 0 -jamTimer0 = scalar, U16, 1410, "sec", 0.01, 0 -; total TS size = 1412 -faultCode0 = scalar, U08, 1412, "", 1, 0 -heaterDuty0 = scalar, U08, 1413, "%", 1, 0 -pumpDuty0 = scalar, U08, 1414, "%", 1, 0 -tempC0 = scalar, U16, 1416, "C", 1, 0 -nernstVoltage0 = scalar, U16, 1418, "V", 0.001, 0 -esr0 = scalar, U16, 1420, "ohm", 1, 0 +luaSoftSparkSkip = scalar, F32, 1124, "", 1, 0 +luaHardSparkSkip = scalar, F32, 1128, "", 1, 0 +tractionControlSparkSkip = scalar, F32, 1132, "", 1, 0 +desiredRpmLimit = scalar, S16, 1136, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 1140, "", 1, 0 +globalSparkCounter = scalar, U32, 1144, "", 1, 0 +fuelingLoad = scalar, F32, 1148, "", 1, 0 +ignitionLoad = scalar, F32, 1152, "", 1, 0 +veTableYAxis = scalar, U16, 1156, "%", 0.01, 0 +; total TS size = 1160 +tpsFrom = scalar, F32, 1160 +tpsTo = scalar, F32, 1164 +deltaTps = scalar, F32, 1168 +extraFuel = scalar, F32, 1172, "", 1, 0 +valueFromTable = scalar, F32, 1176, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1180, [0:0] +isBelowDecelThreshold = bits, U32, 1180, [1:1] +isTimeToResetAccumulator = bits, U32, 1180, [2:2] +isFractionalEnrichment = bits, U32, 1180, [3:3] +belowEpsilon = bits, U32, 1180, [4:4] +tooShort = bits, U32, 1180, [5:5] +fractionalInjFuel = scalar, F32, 1184, "", 1, 0 +accumulatedValue = scalar, F32, 1188, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1192, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1196, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1200, "", 1, 0 +cycleCnt = scalar, S32, 1204, "", 1, 0 +; total TS size = 1208 +hwEventCounters1 = scalar, U32, 1208, "", 1, 0 +hwEventCounters2 = scalar, U32, 1212, "", 1, 0 +hwEventCounters3 = scalar, U32, 1216, "", 1, 0 +hwEventCounters4 = scalar, U32, 1220, "", 1, 0 +hwEventCounters5 = scalar, U32, 1224, "", 1, 0 +hwEventCounters6 = scalar, U32, 1228, "", 1, 0 +vvtCamCounter = scalar, U32, 1232, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1236, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1240, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1244, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1245, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1248, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1252, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1256, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1260, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1264, [0:0] +; total TS size = 1268 +crankSynchronizationCounter0 = scalar, U32, 1268, "", 1, 0 +vvtSyncGapRatio0 = scalar, F32, 1272, "", 1, 0 +vvtToothDurations00 = scalar, U32, 1276, "us", 1, 0 +vvtCurrentPosition0 = scalar, F32, 1280, "sync: Primary Cam Position", 1, 0 +vvtToothPosition10 = scalar, F32, 1284, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition20 = scalar, F32, 1288, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition30 = scalar, F32, 1292, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition40 = scalar, F32, 1296, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio0 = scalar, F32, 1300, "", 1, 0 +triggerStateIndex0 = scalar, U08, 1304, "", 1, 0 +vvtStateIndex0 = scalar, U08, 1305, "", 1, 0 +; total TS size = 1308 +camResyncCounter = scalar, U08, 1308, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1312, [0:0] +; total TS size = 1316 +wallFuelCorrection = scalar, F32, 1316, "", 1, 0 +wallFuel = scalar, F32, 1320, "", 1, 0 +; total TS size = 1324 +idleState = bits, S32, 1324, [0:2], "not important" +currentIdlePosition = scalar, F32, 1328 +baseIdlePosition = scalar, F32, 1332 +idleClosedLoop = scalar, F32, 1336 +iacByTpsTaper = scalar, F32, 1340 +throttlePedalUpState = scalar, S32, 1344, "", 1, 0 +mightResetPid = bits, U32, 1348, [0:0] +shouldResetPid = bits, U32, 1348, [1:1] +wasResetPid = bits, U32, 1348, [2:2] +mustResetPid = bits, U32, 1348, [3:3] +isCranking = bits, U32, 1348, [4:4] +isIacTableForCoasting = bits, U32, 1348, [5:5] +notIdling = bits, U32, 1348, [6:6] +needReset = bits, U32, 1348, [7:7] +isInDeadZone = bits, U32, 1348, [8:8] +isBlipping = bits, U32, 1348, [9:9] +useClosedLoop = bits, U32, 1348, [10:10] +badTps = bits, U32, 1348, [11:11] +looksLikeRunning = bits, U32, 1348, [12:12] +looksLikeCoasting = bits, U32, 1348, [13:13] +looksLikeCrankToIdle = bits, U32, 1348, [14:14] +isIdleCoasting = bits, U32, 1348, [15:15] +isIdleClosedLoop = bits, U32, 1348, [16:16] +idleTarget = scalar, S32, 1352, "", 1, 0 +targetRpmByClt = scalar, S32, 1356, "", 1, 0 +targetRpmAc = scalar, S32, 1360, "", 1, 0 +iacByRpmTaper = scalar, F32, 1364 +luaAdd = scalar, F32, 1368 +; total TS size = 1372 +idlePosition0 = scalar, F32, 1372, "per", 1,0 +trim0 = scalar, F32, 1376, "", 1, 0 +luaAdjustment0 = scalar, F32, 1380, "per", 1,0 +m_wastegatePosition0 = scalar, F32, 1384, "per", 1,0 +etbFeedForward0 = scalar, F32, 1388 +etbIntegralError0 = scalar, F32, 1392, "", 1, 0 +etbCurrentTarget0 = scalar, F32, 1396, "%", 1, 0 +etbCurrentAdjustedTarget0 = scalar, F32, 1400, "%", 1, 0 +etbRevLimitActive0 = bits, U32, 1404, [0:0] +jamDetected0 = bits, U32, 1404, [1:1] +etbDutyRateOfChange0 = scalar, F32, 1408, "per", 1,0 +etbDutyAverage0 = scalar, F32, 1412, "per", 1,0 +etbTpsErrorCounter0 = scalar, U16, 1416, "count", 1,0 +etbPpsErrorCounter0 = scalar, U16, 1418, "count", 1,0 +etbErrorCode0 = scalar, S08, 1420, "", 1, 0 +tcEtbDrop0 = scalar, S08, 1421, "", 1, 0 +jamTimer0 = scalar, U16, 1422, "sec", 0.01, 0 ; total TS size = 1424 -dcOutput0 = scalar, F32, 1424, "per", 1,0 -isEnabled0_int = scalar, U08, 1428, "per", 1,0 -isEnabled0 = bits, U32, 1432, [0:0] +faultCode0 = scalar, U08, 1424, "", 1, 0 +heaterDuty0 = scalar, U08, 1425, "%", 1, 0 +pumpDuty0 = scalar, U08, 1426, "%", 1, 0 +tempC0 = scalar, U16, 1428, "C", 1, 0 +nernstVoltage0 = scalar, U16, 1430, "V", 0.001, 0 +esr0 = scalar, U16, 1432, "ohm", 1, 0 ; total TS size = 1436 -value0 = scalar, U16, 1436, "value", 1,0 -value1 = scalar, U16, 1438, "value", 1,0 -errorRate = scalar, F32, 1440, "ratio", 1,0 -; total TS size = 1444 -vvtTarget = scalar, U16, 1444, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1446, "%", 0.5, 0 +dcOutput0 = scalar, F32, 1436, "per", 1,0 +isEnabled0_int = scalar, U08, 1440, "per", 1,0 +isEnabled0 = bits, U32, 1444, [0:0] ; total TS size = 1448 -lambdaCurrentlyGood = bits, U32, 1448, [0:0] -lambdaMonitorCut = bits, U32, 1448, [1:1] -lambdaTimeSinceGood = scalar, U16, 1452, "sec", 0.01, 0 +value0 = scalar, U16, 1448, "value", 1,0 +value1 = scalar, U16, 1450, "value", 1,0 +errorRate = scalar, F32, 1452, "ratio", 1,0 ; total TS size = 1456 +vvtTarget = scalar, U16, 1456, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1458, "%", 0.5, 0 +; total TS size = 1460 +lambdaCurrentlyGood = bits, U32, 1460, [0:0] +lambdaMonitorCut = bits, U32, 1460, [1:1] +lambdaTimeSinceGood = scalar, U16, 1464, "sec", 0.01, 0 +; total TS size = 1468 time = { timeNow } @@ -5401,7 +5404,6 @@ entry = smartChipState, "smartChipState", int, "%d" entry = smartChipRestartCounter, "smartChipRestartCounter", int, "%d" entry = smartChipAliveCounter, "smartChipAliveCounter", int, "%d" entry = startStopPhysicalState, "startStopPhysicalState", int, "%d" -entry = acrStateDup, "acrStateDup", int, "%d" entry = acrEngineMovedRecently, "acrEngineMovedRecently", int, "%d" entry = heaterControlEnabled, "heaterControlEnabled", int, "%d" entry = luaDigitalState0, "luaDigitalState0", int, "%d" @@ -5411,6 +5413,9 @@ entry = luaDigitalState3, "luaDigitalState3", int, "%d" entry = startStopStateToggleCounter, "startStopStateToggleCounter", int, "%d" entry = egtValue1, "egtValue1", float, "%.3f" entry = egtValue2, "egtValue2", float, "%.3f" +entry = luaSoftSparkSkip, "luaSoftSparkSkip", float, "%.3f" +entry = luaHardSparkSkip, "luaHardSparkSkip", float, "%.3f" +entry = tractionControlSparkSkip, "tractionControlSparkSkip", float, "%.3f" entry = desiredRpmLimit, "User-defined RPM hard limit", int, "%d" entry = fuelInjectionCounter, "Fuel: Injection counter", int, "%d" entry = globalSparkCounter, "Ign: Spark counter", int, "%d" @@ -5911,7 +5916,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 @@ -6372,7 +6377,6 @@ indicatorPanel = engine_stateIndicatorPanel, 2 indicator = {lua_luaDisableEtb}, "luaDisableEtb No", "luaDisableEtb Yes" indicator = {lua_luaIgnCut}, "luaIgnCut No", "luaIgnCut Yes" indicator = {startStopPhysicalState}, "startStopPhysicalState No", "startStopPhysicalState Yes" - indicator = {acrStateDup}, "acrStateDup No", "acrStateDup Yes" indicator = {acrEngineMovedRecently}, "acrEngineMovedRecently No", "acrEngineMovedRecently Yes" indicator = {heaterControlEnabled}, "heaterControlEnabled No", "heaterControlEnabled Yes" indicator = {luaDigitalState0}, "luaDigitalState0 No", "luaDigitalState0 Yes" @@ -6408,12 +6412,16 @@ dialog = engine_stateDialog, "engine_state" graphLine = egtValue1 graphLine = egtValue2 liveGraph = engine_state_6_Graph, "Graph", South + graphLine = luaSoftSparkSkip + graphLine = luaHardSparkSkip + graphLine = tractionControlSparkSkip graphLine = desiredRpmLimit + liveGraph = engine_state_7_Graph, "Graph", South graphLine = fuelInjectionCounter graphLine = globalSparkCounter graphLine = fuelingLoad - liveGraph = engine_state_7_Graph, "Graph", South graphLine = ignitionLoad + liveGraph = engine_state_8_Graph, "Graph", South graphLine = veTableYAxis indicatorPanel = tps_accel_stateIndicatorPanel, 2 @@ -7320,6 +7328,10 @@ dialog = lambda_monitorDialog, "lambda_monitor" 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 diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f7.ini b/firmware/tunerstudio/generated/rusefi_proteus_f7.ini index dbd5a77412..cc4c3a9a55 100644 --- a/firmware/tunerstudio/generated/rusefi_proteus_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_proteus_f7.ini @@ -37,12 +37,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.03.05.proteus_f7.3488186380" + signature = "rusEFI master.2024.03.05.proteus_f7.2155032628" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.03.05.proteus_f7.3488186380" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.03.05.proteus_f7.2155032628" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -98,7 +98,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","Analog Volt 5","Analog Volt 6","Analog Volt 7","Analog Volt 8","Analog Volt 9","Analog Volt 10","Analog Volt 11","Battery Sense","Analog Temp 3","Analog Temp 4","Analog Volt 1","Analog Volt 2","Analog Volt 3","Analog Volt 4","Analog Temp 1","Analog Temp 2" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue Mar 05 00:52:55 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue Mar 05 01:56:59 UTC 2024 pageSize = 26236 page = 1 @@ -745,6 +745,7 @@ mc33810Gpgd3Mode = bits, U32, 1576, [4:4], "false", "true" enableExtendedCanBroadcast = bits, U32, 1576, [5:5], "false", "true" luaCanRxWorkaround = bits, U32, 1576, [6:6], "false", "true" flexSensorInverted = bits, U32, 1576, [7:7], "false", "true" +useHardSkipInTraction = bits, U32, 1576, [8:8], "false", "true" useAuxSpeedForSlipRatio = bits, U32, 1576, [11:11], "false", "true" useVssAsSecondWheelSpeed = bits, U32, 1576, [12:12], "false", "true" is_enabled_spi_5 = bits, U32, 1576, [13:13], "false", "true" @@ -2468,7 +2469,7 @@ injectorStagingRpmBins = array, U16, 26222, [6], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1456 + ochBlockSize = 1468 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3131,145 +3132,147 @@ smartChipState = scalar, S08, 1102, "", 1, 0 smartChipRestartCounter = scalar, S08, 1103, "", 1, 0 smartChipAliveCounter = scalar, S08, 1104, "", 1, 0 startStopPhysicalState = bits, U32, 1108, [0:0] -acrStateDup = bits, U32, 1108, [1:1] -acrEngineMovedRecently = bits, U32, 1108, [2:2] -heaterControlEnabled = bits, U32, 1108, [3:3] -luaDigitalState0 = bits, U32, 1108, [4:4] -luaDigitalState1 = bits, U32, 1108, [5:5] -luaDigitalState2 = bits, U32, 1108, [6:6] -luaDigitalState3 = bits, U32, 1108, [7:7] +acrEngineMovedRecently = bits, U32, 1108, [1:1] +heaterControlEnabled = bits, U32, 1108, [2:2] +luaDigitalState0 = bits, U32, 1108, [3:3] +luaDigitalState1 = bits, U32, 1108, [4:4] +luaDigitalState2 = bits, U32, 1108, [5:5] +luaDigitalState3 = bits, U32, 1108, [6:6] startStopStateToggleCounter = scalar, U32, 1112, "", 1, 0 egtValue1 = scalar, F32, 1116, "", 1, 0 egtValue2 = scalar, F32, 1120, "", 1, 0 -desiredRpmLimit = scalar, S16, 1124, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1128, "", 1, 0 -globalSparkCounter = scalar, U32, 1132, "", 1, 0 -fuelingLoad = scalar, F32, 1136, "", 1, 0 -ignitionLoad = scalar, F32, 1140, "", 1, 0 -veTableYAxis = scalar, U16, 1144, "%", 0.01, 0 -; total TS size = 1148 -tpsFrom = scalar, F32, 1148 -tpsTo = scalar, F32, 1152 -deltaTps = scalar, F32, 1156 -extraFuel = scalar, F32, 1160, "", 1, 0 -valueFromTable = scalar, F32, 1164, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1168, [0:0] -isBelowDecelThreshold = bits, U32, 1168, [1:1] -isTimeToResetAccumulator = bits, U32, 1168, [2:2] -isFractionalEnrichment = bits, U32, 1168, [3:3] -belowEpsilon = bits, U32, 1168, [4:4] -tooShort = bits, U32, 1168, [5:5] -fractionalInjFuel = scalar, F32, 1172, "", 1, 0 -accumulatedValue = scalar, F32, 1176, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1180, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1184, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1188, "", 1, 0 -cycleCnt = scalar, S32, 1192, "", 1, 0 -; total TS size = 1196 -hwEventCounters1 = scalar, U32, 1196, "", 1, 0 -hwEventCounters2 = scalar, U32, 1200, "", 1, 0 -hwEventCounters3 = scalar, U32, 1204, "", 1, 0 -hwEventCounters4 = scalar, U32, 1208, "", 1, 0 -hwEventCounters5 = scalar, U32, 1212, "", 1, 0 -hwEventCounters6 = scalar, U32, 1216, "", 1, 0 -vvtCamCounter = scalar, U32, 1220, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1224, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1228, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1232, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1233, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1236, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1240, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1244, "", 1, 0 -mapCamPrevToothAngle = scalar, F32, 1248, "deg", 1, 0 -isDecodingMapCam = bits, U32, 1252, [0:0] -; total TS size = 1256 -crankSynchronizationCounter0 = scalar, U32, 1256, "", 1, 0 -vvtSyncGapRatio0 = scalar, F32, 1260, "", 1, 0 -vvtToothDurations00 = scalar, U32, 1264, "us", 1, 0 -vvtCurrentPosition0 = scalar, F32, 1268, "sync: Primary Cam Position", 1, 0 -vvtToothPosition10 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition20 = scalar, F32, 1276, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition30 = scalar, F32, 1280, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition40 = scalar, F32, 1284, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio0 = scalar, F32, 1288, "", 1, 0 -triggerStateIndex0 = scalar, U08, 1292, "", 1, 0 -vvtStateIndex0 = scalar, U08, 1293, "", 1, 0 -; total TS size = 1296 -camResyncCounter = scalar, U08, 1296, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1300, [0:0] -; total TS size = 1304 -wallFuelCorrection = scalar, F32, 1304, "", 1, 0 -wallFuel = scalar, F32, 1308, "", 1, 0 -; total TS size = 1312 -idleState = bits, S32, 1312, [0:2], "not important" -currentIdlePosition = scalar, F32, 1316 -baseIdlePosition = scalar, F32, 1320 -idleClosedLoop = scalar, F32, 1324 -iacByTpsTaper = scalar, F32, 1328 -throttlePedalUpState = scalar, S32, 1332, "", 1, 0 -mightResetPid = bits, U32, 1336, [0:0] -shouldResetPid = bits, U32, 1336, [1:1] -wasResetPid = bits, U32, 1336, [2:2] -mustResetPid = bits, U32, 1336, [3:3] -isCranking = bits, U32, 1336, [4:4] -isIacTableForCoasting = bits, U32, 1336, [5:5] -notIdling = bits, U32, 1336, [6:6] -needReset = bits, U32, 1336, [7:7] -isInDeadZone = bits, U32, 1336, [8:8] -isBlipping = bits, U32, 1336, [9:9] -useClosedLoop = bits, U32, 1336, [10:10] -badTps = bits, U32, 1336, [11:11] -looksLikeRunning = bits, U32, 1336, [12:12] -looksLikeCoasting = bits, U32, 1336, [13:13] -looksLikeCrankToIdle = bits, U32, 1336, [14:14] -isIdleCoasting = bits, U32, 1336, [15:15] -isIdleClosedLoop = bits, U32, 1336, [16:16] -idleTarget = scalar, S32, 1340, "", 1, 0 -targetRpmByClt = scalar, S32, 1344, "", 1, 0 -targetRpmAc = scalar, S32, 1348, "", 1, 0 -iacByRpmTaper = scalar, F32, 1352 -luaAdd = scalar, F32, 1356 -; total TS size = 1360 -idlePosition0 = scalar, F32, 1360, "per", 1,0 -trim0 = scalar, F32, 1364, "", 1, 0 -luaAdjustment0 = scalar, F32, 1368, "per", 1,0 -m_wastegatePosition0 = scalar, F32, 1372, "per", 1,0 -etbFeedForward0 = scalar, F32, 1376 -etbIntegralError0 = scalar, F32, 1380, "", 1, 0 -etbCurrentTarget0 = scalar, F32, 1384, "%", 1, 0 -etbCurrentAdjustedTarget0 = scalar, F32, 1388, "%", 1, 0 -etbRevLimitActive0 = bits, U32, 1392, [0:0] -jamDetected0 = bits, U32, 1392, [1:1] -etbDutyRateOfChange0 = scalar, F32, 1396, "per", 1,0 -etbDutyAverage0 = scalar, F32, 1400, "per", 1,0 -etbTpsErrorCounter0 = scalar, U16, 1404, "count", 1,0 -etbPpsErrorCounter0 = scalar, U16, 1406, "count", 1,0 -etbErrorCode0 = scalar, S08, 1408, "", 1, 0 -tcEtbDrop0 = scalar, S08, 1409, "", 1, 0 -jamTimer0 = scalar, U16, 1410, "sec", 0.01, 0 -; total TS size = 1412 -faultCode0 = scalar, U08, 1412, "", 1, 0 -heaterDuty0 = scalar, U08, 1413, "%", 1, 0 -pumpDuty0 = scalar, U08, 1414, "%", 1, 0 -tempC0 = scalar, U16, 1416, "C", 1, 0 -nernstVoltage0 = scalar, U16, 1418, "V", 0.001, 0 -esr0 = scalar, U16, 1420, "ohm", 1, 0 +luaSoftSparkSkip = scalar, F32, 1124, "", 1, 0 +luaHardSparkSkip = scalar, F32, 1128, "", 1, 0 +tractionControlSparkSkip = scalar, F32, 1132, "", 1, 0 +desiredRpmLimit = scalar, S16, 1136, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 1140, "", 1, 0 +globalSparkCounter = scalar, U32, 1144, "", 1, 0 +fuelingLoad = scalar, F32, 1148, "", 1, 0 +ignitionLoad = scalar, F32, 1152, "", 1, 0 +veTableYAxis = scalar, U16, 1156, "%", 0.01, 0 +; total TS size = 1160 +tpsFrom = scalar, F32, 1160 +tpsTo = scalar, F32, 1164 +deltaTps = scalar, F32, 1168 +extraFuel = scalar, F32, 1172, "", 1, 0 +valueFromTable = scalar, F32, 1176, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1180, [0:0] +isBelowDecelThreshold = bits, U32, 1180, [1:1] +isTimeToResetAccumulator = bits, U32, 1180, [2:2] +isFractionalEnrichment = bits, U32, 1180, [3:3] +belowEpsilon = bits, U32, 1180, [4:4] +tooShort = bits, U32, 1180, [5:5] +fractionalInjFuel = scalar, F32, 1184, "", 1, 0 +accumulatedValue = scalar, F32, 1188, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1192, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1196, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1200, "", 1, 0 +cycleCnt = scalar, S32, 1204, "", 1, 0 +; total TS size = 1208 +hwEventCounters1 = scalar, U32, 1208, "", 1, 0 +hwEventCounters2 = scalar, U32, 1212, "", 1, 0 +hwEventCounters3 = scalar, U32, 1216, "", 1, 0 +hwEventCounters4 = scalar, U32, 1220, "", 1, 0 +hwEventCounters5 = scalar, U32, 1224, "", 1, 0 +hwEventCounters6 = scalar, U32, 1228, "", 1, 0 +vvtCamCounter = scalar, U32, 1232, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1236, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1240, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1244, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1245, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1248, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1252, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1256, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1260, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1264, [0:0] +; total TS size = 1268 +crankSynchronizationCounter0 = scalar, U32, 1268, "", 1, 0 +vvtSyncGapRatio0 = scalar, F32, 1272, "", 1, 0 +vvtToothDurations00 = scalar, U32, 1276, "us", 1, 0 +vvtCurrentPosition0 = scalar, F32, 1280, "sync: Primary Cam Position", 1, 0 +vvtToothPosition10 = scalar, F32, 1284, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition20 = scalar, F32, 1288, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition30 = scalar, F32, 1292, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition40 = scalar, F32, 1296, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio0 = scalar, F32, 1300, "", 1, 0 +triggerStateIndex0 = scalar, U08, 1304, "", 1, 0 +vvtStateIndex0 = scalar, U08, 1305, "", 1, 0 +; total TS size = 1308 +camResyncCounter = scalar, U08, 1308, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1312, [0:0] +; total TS size = 1316 +wallFuelCorrection = scalar, F32, 1316, "", 1, 0 +wallFuel = scalar, F32, 1320, "", 1, 0 +; total TS size = 1324 +idleState = bits, S32, 1324, [0:2], "not important" +currentIdlePosition = scalar, F32, 1328 +baseIdlePosition = scalar, F32, 1332 +idleClosedLoop = scalar, F32, 1336 +iacByTpsTaper = scalar, F32, 1340 +throttlePedalUpState = scalar, S32, 1344, "", 1, 0 +mightResetPid = bits, U32, 1348, [0:0] +shouldResetPid = bits, U32, 1348, [1:1] +wasResetPid = bits, U32, 1348, [2:2] +mustResetPid = bits, U32, 1348, [3:3] +isCranking = bits, U32, 1348, [4:4] +isIacTableForCoasting = bits, U32, 1348, [5:5] +notIdling = bits, U32, 1348, [6:6] +needReset = bits, U32, 1348, [7:7] +isInDeadZone = bits, U32, 1348, [8:8] +isBlipping = bits, U32, 1348, [9:9] +useClosedLoop = bits, U32, 1348, [10:10] +badTps = bits, U32, 1348, [11:11] +looksLikeRunning = bits, U32, 1348, [12:12] +looksLikeCoasting = bits, U32, 1348, [13:13] +looksLikeCrankToIdle = bits, U32, 1348, [14:14] +isIdleCoasting = bits, U32, 1348, [15:15] +isIdleClosedLoop = bits, U32, 1348, [16:16] +idleTarget = scalar, S32, 1352, "", 1, 0 +targetRpmByClt = scalar, S32, 1356, "", 1, 0 +targetRpmAc = scalar, S32, 1360, "", 1, 0 +iacByRpmTaper = scalar, F32, 1364 +luaAdd = scalar, F32, 1368 +; total TS size = 1372 +idlePosition0 = scalar, F32, 1372, "per", 1,0 +trim0 = scalar, F32, 1376, "", 1, 0 +luaAdjustment0 = scalar, F32, 1380, "per", 1,0 +m_wastegatePosition0 = scalar, F32, 1384, "per", 1,0 +etbFeedForward0 = scalar, F32, 1388 +etbIntegralError0 = scalar, F32, 1392, "", 1, 0 +etbCurrentTarget0 = scalar, F32, 1396, "%", 1, 0 +etbCurrentAdjustedTarget0 = scalar, F32, 1400, "%", 1, 0 +etbRevLimitActive0 = bits, U32, 1404, [0:0] +jamDetected0 = bits, U32, 1404, [1:1] +etbDutyRateOfChange0 = scalar, F32, 1408, "per", 1,0 +etbDutyAverage0 = scalar, F32, 1412, "per", 1,0 +etbTpsErrorCounter0 = scalar, U16, 1416, "count", 1,0 +etbPpsErrorCounter0 = scalar, U16, 1418, "count", 1,0 +etbErrorCode0 = scalar, S08, 1420, "", 1, 0 +tcEtbDrop0 = scalar, S08, 1421, "", 1, 0 +jamTimer0 = scalar, U16, 1422, "sec", 0.01, 0 ; total TS size = 1424 -dcOutput0 = scalar, F32, 1424, "per", 1,0 -isEnabled0_int = scalar, U08, 1428, "per", 1,0 -isEnabled0 = bits, U32, 1432, [0:0] +faultCode0 = scalar, U08, 1424, "", 1, 0 +heaterDuty0 = scalar, U08, 1425, "%", 1, 0 +pumpDuty0 = scalar, U08, 1426, "%", 1, 0 +tempC0 = scalar, U16, 1428, "C", 1, 0 +nernstVoltage0 = scalar, U16, 1430, "V", 0.001, 0 +esr0 = scalar, U16, 1432, "ohm", 1, 0 ; total TS size = 1436 -value0 = scalar, U16, 1436, "value", 1,0 -value1 = scalar, U16, 1438, "value", 1,0 -errorRate = scalar, F32, 1440, "ratio", 1,0 -; total TS size = 1444 -vvtTarget = scalar, U16, 1444, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1446, "%", 0.5, 0 +dcOutput0 = scalar, F32, 1436, "per", 1,0 +isEnabled0_int = scalar, U08, 1440, "per", 1,0 +isEnabled0 = bits, U32, 1444, [0:0] ; total TS size = 1448 -lambdaCurrentlyGood = bits, U32, 1448, [0:0] -lambdaMonitorCut = bits, U32, 1448, [1:1] -lambdaTimeSinceGood = scalar, U16, 1452, "sec", 0.01, 0 +value0 = scalar, U16, 1448, "value", 1,0 +value1 = scalar, U16, 1450, "value", 1,0 +errorRate = scalar, F32, 1452, "ratio", 1,0 ; total TS size = 1456 +vvtTarget = scalar, U16, 1456, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1458, "%", 0.5, 0 +; total TS size = 1460 +lambdaCurrentlyGood = bits, U32, 1460, [0:0] +lambdaMonitorCut = bits, U32, 1460, [1:1] +lambdaTimeSinceGood = scalar, U16, 1464, "sec", 0.01, 0 +; total TS size = 1468 time = { timeNow } @@ -5401,7 +5404,6 @@ entry = smartChipState, "smartChipState", int, "%d" entry = smartChipRestartCounter, "smartChipRestartCounter", int, "%d" entry = smartChipAliveCounter, "smartChipAliveCounter", int, "%d" entry = startStopPhysicalState, "startStopPhysicalState", int, "%d" -entry = acrStateDup, "acrStateDup", int, "%d" entry = acrEngineMovedRecently, "acrEngineMovedRecently", int, "%d" entry = heaterControlEnabled, "heaterControlEnabled", int, "%d" entry = luaDigitalState0, "luaDigitalState0", int, "%d" @@ -5411,6 +5413,9 @@ entry = luaDigitalState3, "luaDigitalState3", int, "%d" entry = startStopStateToggleCounter, "startStopStateToggleCounter", int, "%d" entry = egtValue1, "egtValue1", float, "%.3f" entry = egtValue2, "egtValue2", float, "%.3f" +entry = luaSoftSparkSkip, "luaSoftSparkSkip", float, "%.3f" +entry = luaHardSparkSkip, "luaHardSparkSkip", float, "%.3f" +entry = tractionControlSparkSkip, "tractionControlSparkSkip", float, "%.3f" entry = desiredRpmLimit, "User-defined RPM hard limit", int, "%d" entry = fuelInjectionCounter, "Fuel: Injection counter", int, "%d" entry = globalSparkCounter, "Ign: Spark counter", int, "%d" @@ -5911,7 +5916,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 @@ -6372,7 +6377,6 @@ indicatorPanel = engine_stateIndicatorPanel, 2 indicator = {lua_luaDisableEtb}, "luaDisableEtb No", "luaDisableEtb Yes" indicator = {lua_luaIgnCut}, "luaIgnCut No", "luaIgnCut Yes" indicator = {startStopPhysicalState}, "startStopPhysicalState No", "startStopPhysicalState Yes" - indicator = {acrStateDup}, "acrStateDup No", "acrStateDup Yes" indicator = {acrEngineMovedRecently}, "acrEngineMovedRecently No", "acrEngineMovedRecently Yes" indicator = {heaterControlEnabled}, "heaterControlEnabled No", "heaterControlEnabled Yes" indicator = {luaDigitalState0}, "luaDigitalState0 No", "luaDigitalState0 Yes" @@ -6408,12 +6412,16 @@ dialog = engine_stateDialog, "engine_state" graphLine = egtValue1 graphLine = egtValue2 liveGraph = engine_state_6_Graph, "Graph", South + graphLine = luaSoftSparkSkip + graphLine = luaHardSparkSkip + graphLine = tractionControlSparkSkip graphLine = desiredRpmLimit + liveGraph = engine_state_7_Graph, "Graph", South graphLine = fuelInjectionCounter graphLine = globalSparkCounter graphLine = fuelingLoad - liveGraph = engine_state_7_Graph, "Graph", South graphLine = ignitionLoad + liveGraph = engine_state_8_Graph, "Graph", South graphLine = veTableYAxis indicatorPanel = tps_accel_stateIndicatorPanel, 2 @@ -7320,6 +7328,10 @@ dialog = lambda_monitorDialog, "lambda_monitor" 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 diff --git a/firmware/tunerstudio/generated/rusefi_proteus_h7.ini b/firmware/tunerstudio/generated/rusefi_proteus_h7.ini index 4a26acb81e..e033537d0c 100644 --- a/firmware/tunerstudio/generated/rusefi_proteus_h7.ini +++ b/firmware/tunerstudio/generated/rusefi_proteus_h7.ini @@ -37,12 +37,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.03.05.proteus_h7.3488186380" + signature = "rusEFI master.2024.03.05.proteus_h7.2155032628" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.03.05.proteus_h7.3488186380" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.03.05.proteus_h7.2155032628" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -98,7 +98,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","Analog Volt 5","Analog Volt 6","Analog Volt 7","Analog Volt 8","Analog Volt 9","Analog Volt 10","Analog Volt 11","Battery Sense","Analog Temp 3","Analog Temp 4","Analog Volt 1","Analog Volt 2","Analog Volt 3","Analog Volt 4","Analog Temp 1","Analog Temp 2" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue Mar 05 00:52:58 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue Mar 05 01:57:02 UTC 2024 pageSize = 26236 page = 1 @@ -745,6 +745,7 @@ mc33810Gpgd3Mode = bits, U32, 1576, [4:4], "false", "true" enableExtendedCanBroadcast = bits, U32, 1576, [5:5], "false", "true" luaCanRxWorkaround = bits, U32, 1576, [6:6], "false", "true" flexSensorInverted = bits, U32, 1576, [7:7], "false", "true" +useHardSkipInTraction = bits, U32, 1576, [8:8], "false", "true" useAuxSpeedForSlipRatio = bits, U32, 1576, [11:11], "false", "true" useVssAsSecondWheelSpeed = bits, U32, 1576, [12:12], "false", "true" is_enabled_spi_5 = bits, U32, 1576, [13:13], "false", "true" @@ -2468,7 +2469,7 @@ injectorStagingRpmBins = array, U16, 26222, [6], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1456 + ochBlockSize = 1468 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3131,145 +3132,147 @@ smartChipState = scalar, S08, 1102, "", 1, 0 smartChipRestartCounter = scalar, S08, 1103, "", 1, 0 smartChipAliveCounter = scalar, S08, 1104, "", 1, 0 startStopPhysicalState = bits, U32, 1108, [0:0] -acrStateDup = bits, U32, 1108, [1:1] -acrEngineMovedRecently = bits, U32, 1108, [2:2] -heaterControlEnabled = bits, U32, 1108, [3:3] -luaDigitalState0 = bits, U32, 1108, [4:4] -luaDigitalState1 = bits, U32, 1108, [5:5] -luaDigitalState2 = bits, U32, 1108, [6:6] -luaDigitalState3 = bits, U32, 1108, [7:7] +acrEngineMovedRecently = bits, U32, 1108, [1:1] +heaterControlEnabled = bits, U32, 1108, [2:2] +luaDigitalState0 = bits, U32, 1108, [3:3] +luaDigitalState1 = bits, U32, 1108, [4:4] +luaDigitalState2 = bits, U32, 1108, [5:5] +luaDigitalState3 = bits, U32, 1108, [6:6] startStopStateToggleCounter = scalar, U32, 1112, "", 1, 0 egtValue1 = scalar, F32, 1116, "", 1, 0 egtValue2 = scalar, F32, 1120, "", 1, 0 -desiredRpmLimit = scalar, S16, 1124, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1128, "", 1, 0 -globalSparkCounter = scalar, U32, 1132, "", 1, 0 -fuelingLoad = scalar, F32, 1136, "", 1, 0 -ignitionLoad = scalar, F32, 1140, "", 1, 0 -veTableYAxis = scalar, U16, 1144, "%", 0.01, 0 -; total TS size = 1148 -tpsFrom = scalar, F32, 1148 -tpsTo = scalar, F32, 1152 -deltaTps = scalar, F32, 1156 -extraFuel = scalar, F32, 1160, "", 1, 0 -valueFromTable = scalar, F32, 1164, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1168, [0:0] -isBelowDecelThreshold = bits, U32, 1168, [1:1] -isTimeToResetAccumulator = bits, U32, 1168, [2:2] -isFractionalEnrichment = bits, U32, 1168, [3:3] -belowEpsilon = bits, U32, 1168, [4:4] -tooShort = bits, U32, 1168, [5:5] -fractionalInjFuel = scalar, F32, 1172, "", 1, 0 -accumulatedValue = scalar, F32, 1176, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1180, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1184, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1188, "", 1, 0 -cycleCnt = scalar, S32, 1192, "", 1, 0 -; total TS size = 1196 -hwEventCounters1 = scalar, U32, 1196, "", 1, 0 -hwEventCounters2 = scalar, U32, 1200, "", 1, 0 -hwEventCounters3 = scalar, U32, 1204, "", 1, 0 -hwEventCounters4 = scalar, U32, 1208, "", 1, 0 -hwEventCounters5 = scalar, U32, 1212, "", 1, 0 -hwEventCounters6 = scalar, U32, 1216, "", 1, 0 -vvtCamCounter = scalar, U32, 1220, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1224, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1228, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1232, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1233, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1236, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1240, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1244, "", 1, 0 -mapCamPrevToothAngle = scalar, F32, 1248, "deg", 1, 0 -isDecodingMapCam = bits, U32, 1252, [0:0] -; total TS size = 1256 -crankSynchronizationCounter0 = scalar, U32, 1256, "", 1, 0 -vvtSyncGapRatio0 = scalar, F32, 1260, "", 1, 0 -vvtToothDurations00 = scalar, U32, 1264, "us", 1, 0 -vvtCurrentPosition0 = scalar, F32, 1268, "sync: Primary Cam Position", 1, 0 -vvtToothPosition10 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition20 = scalar, F32, 1276, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition30 = scalar, F32, 1280, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition40 = scalar, F32, 1284, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio0 = scalar, F32, 1288, "", 1, 0 -triggerStateIndex0 = scalar, U08, 1292, "", 1, 0 -vvtStateIndex0 = scalar, U08, 1293, "", 1, 0 -; total TS size = 1296 -camResyncCounter = scalar, U08, 1296, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1300, [0:0] -; total TS size = 1304 -wallFuelCorrection = scalar, F32, 1304, "", 1, 0 -wallFuel = scalar, F32, 1308, "", 1, 0 -; total TS size = 1312 -idleState = bits, S32, 1312, [0:2], "not important" -currentIdlePosition = scalar, F32, 1316 -baseIdlePosition = scalar, F32, 1320 -idleClosedLoop = scalar, F32, 1324 -iacByTpsTaper = scalar, F32, 1328 -throttlePedalUpState = scalar, S32, 1332, "", 1, 0 -mightResetPid = bits, U32, 1336, [0:0] -shouldResetPid = bits, U32, 1336, [1:1] -wasResetPid = bits, U32, 1336, [2:2] -mustResetPid = bits, U32, 1336, [3:3] -isCranking = bits, U32, 1336, [4:4] -isIacTableForCoasting = bits, U32, 1336, [5:5] -notIdling = bits, U32, 1336, [6:6] -needReset = bits, U32, 1336, [7:7] -isInDeadZone = bits, U32, 1336, [8:8] -isBlipping = bits, U32, 1336, [9:9] -useClosedLoop = bits, U32, 1336, [10:10] -badTps = bits, U32, 1336, [11:11] -looksLikeRunning = bits, U32, 1336, [12:12] -looksLikeCoasting = bits, U32, 1336, [13:13] -looksLikeCrankToIdle = bits, U32, 1336, [14:14] -isIdleCoasting = bits, U32, 1336, [15:15] -isIdleClosedLoop = bits, U32, 1336, [16:16] -idleTarget = scalar, S32, 1340, "", 1, 0 -targetRpmByClt = scalar, S32, 1344, "", 1, 0 -targetRpmAc = scalar, S32, 1348, "", 1, 0 -iacByRpmTaper = scalar, F32, 1352 -luaAdd = scalar, F32, 1356 -; total TS size = 1360 -idlePosition0 = scalar, F32, 1360, "per", 1,0 -trim0 = scalar, F32, 1364, "", 1, 0 -luaAdjustment0 = scalar, F32, 1368, "per", 1,0 -m_wastegatePosition0 = scalar, F32, 1372, "per", 1,0 -etbFeedForward0 = scalar, F32, 1376 -etbIntegralError0 = scalar, F32, 1380, "", 1, 0 -etbCurrentTarget0 = scalar, F32, 1384, "%", 1, 0 -etbCurrentAdjustedTarget0 = scalar, F32, 1388, "%", 1, 0 -etbRevLimitActive0 = bits, U32, 1392, [0:0] -jamDetected0 = bits, U32, 1392, [1:1] -etbDutyRateOfChange0 = scalar, F32, 1396, "per", 1,0 -etbDutyAverage0 = scalar, F32, 1400, "per", 1,0 -etbTpsErrorCounter0 = scalar, U16, 1404, "count", 1,0 -etbPpsErrorCounter0 = scalar, U16, 1406, "count", 1,0 -etbErrorCode0 = scalar, S08, 1408, "", 1, 0 -tcEtbDrop0 = scalar, S08, 1409, "", 1, 0 -jamTimer0 = scalar, U16, 1410, "sec", 0.01, 0 -; total TS size = 1412 -faultCode0 = scalar, U08, 1412, "", 1, 0 -heaterDuty0 = scalar, U08, 1413, "%", 1, 0 -pumpDuty0 = scalar, U08, 1414, "%", 1, 0 -tempC0 = scalar, U16, 1416, "C", 1, 0 -nernstVoltage0 = scalar, U16, 1418, "V", 0.001, 0 -esr0 = scalar, U16, 1420, "ohm", 1, 0 +luaSoftSparkSkip = scalar, F32, 1124, "", 1, 0 +luaHardSparkSkip = scalar, F32, 1128, "", 1, 0 +tractionControlSparkSkip = scalar, F32, 1132, "", 1, 0 +desiredRpmLimit = scalar, S16, 1136, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 1140, "", 1, 0 +globalSparkCounter = scalar, U32, 1144, "", 1, 0 +fuelingLoad = scalar, F32, 1148, "", 1, 0 +ignitionLoad = scalar, F32, 1152, "", 1, 0 +veTableYAxis = scalar, U16, 1156, "%", 0.01, 0 +; total TS size = 1160 +tpsFrom = scalar, F32, 1160 +tpsTo = scalar, F32, 1164 +deltaTps = scalar, F32, 1168 +extraFuel = scalar, F32, 1172, "", 1, 0 +valueFromTable = scalar, F32, 1176, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1180, [0:0] +isBelowDecelThreshold = bits, U32, 1180, [1:1] +isTimeToResetAccumulator = bits, U32, 1180, [2:2] +isFractionalEnrichment = bits, U32, 1180, [3:3] +belowEpsilon = bits, U32, 1180, [4:4] +tooShort = bits, U32, 1180, [5:5] +fractionalInjFuel = scalar, F32, 1184, "", 1, 0 +accumulatedValue = scalar, F32, 1188, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1192, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1196, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1200, "", 1, 0 +cycleCnt = scalar, S32, 1204, "", 1, 0 +; total TS size = 1208 +hwEventCounters1 = scalar, U32, 1208, "", 1, 0 +hwEventCounters2 = scalar, U32, 1212, "", 1, 0 +hwEventCounters3 = scalar, U32, 1216, "", 1, 0 +hwEventCounters4 = scalar, U32, 1220, "", 1, 0 +hwEventCounters5 = scalar, U32, 1224, "", 1, 0 +hwEventCounters6 = scalar, U32, 1228, "", 1, 0 +vvtCamCounter = scalar, U32, 1232, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1236, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1240, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1244, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1245, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1248, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1252, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1256, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1260, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1264, [0:0] +; total TS size = 1268 +crankSynchronizationCounter0 = scalar, U32, 1268, "", 1, 0 +vvtSyncGapRatio0 = scalar, F32, 1272, "", 1, 0 +vvtToothDurations00 = scalar, U32, 1276, "us", 1, 0 +vvtCurrentPosition0 = scalar, F32, 1280, "sync: Primary Cam Position", 1, 0 +vvtToothPosition10 = scalar, F32, 1284, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition20 = scalar, F32, 1288, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition30 = scalar, F32, 1292, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition40 = scalar, F32, 1296, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio0 = scalar, F32, 1300, "", 1, 0 +triggerStateIndex0 = scalar, U08, 1304, "", 1, 0 +vvtStateIndex0 = scalar, U08, 1305, "", 1, 0 +; total TS size = 1308 +camResyncCounter = scalar, U08, 1308, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1312, [0:0] +; total TS size = 1316 +wallFuelCorrection = scalar, F32, 1316, "", 1, 0 +wallFuel = scalar, F32, 1320, "", 1, 0 +; total TS size = 1324 +idleState = bits, S32, 1324, [0:2], "not important" +currentIdlePosition = scalar, F32, 1328 +baseIdlePosition = scalar, F32, 1332 +idleClosedLoop = scalar, F32, 1336 +iacByTpsTaper = scalar, F32, 1340 +throttlePedalUpState = scalar, S32, 1344, "", 1, 0 +mightResetPid = bits, U32, 1348, [0:0] +shouldResetPid = bits, U32, 1348, [1:1] +wasResetPid = bits, U32, 1348, [2:2] +mustResetPid = bits, U32, 1348, [3:3] +isCranking = bits, U32, 1348, [4:4] +isIacTableForCoasting = bits, U32, 1348, [5:5] +notIdling = bits, U32, 1348, [6:6] +needReset = bits, U32, 1348, [7:7] +isInDeadZone = bits, U32, 1348, [8:8] +isBlipping = bits, U32, 1348, [9:9] +useClosedLoop = bits, U32, 1348, [10:10] +badTps = bits, U32, 1348, [11:11] +looksLikeRunning = bits, U32, 1348, [12:12] +looksLikeCoasting = bits, U32, 1348, [13:13] +looksLikeCrankToIdle = bits, U32, 1348, [14:14] +isIdleCoasting = bits, U32, 1348, [15:15] +isIdleClosedLoop = bits, U32, 1348, [16:16] +idleTarget = scalar, S32, 1352, "", 1, 0 +targetRpmByClt = scalar, S32, 1356, "", 1, 0 +targetRpmAc = scalar, S32, 1360, "", 1, 0 +iacByRpmTaper = scalar, F32, 1364 +luaAdd = scalar, F32, 1368 +; total TS size = 1372 +idlePosition0 = scalar, F32, 1372, "per", 1,0 +trim0 = scalar, F32, 1376, "", 1, 0 +luaAdjustment0 = scalar, F32, 1380, "per", 1,0 +m_wastegatePosition0 = scalar, F32, 1384, "per", 1,0 +etbFeedForward0 = scalar, F32, 1388 +etbIntegralError0 = scalar, F32, 1392, "", 1, 0 +etbCurrentTarget0 = scalar, F32, 1396, "%", 1, 0 +etbCurrentAdjustedTarget0 = scalar, F32, 1400, "%", 1, 0 +etbRevLimitActive0 = bits, U32, 1404, [0:0] +jamDetected0 = bits, U32, 1404, [1:1] +etbDutyRateOfChange0 = scalar, F32, 1408, "per", 1,0 +etbDutyAverage0 = scalar, F32, 1412, "per", 1,0 +etbTpsErrorCounter0 = scalar, U16, 1416, "count", 1,0 +etbPpsErrorCounter0 = scalar, U16, 1418, "count", 1,0 +etbErrorCode0 = scalar, S08, 1420, "", 1, 0 +tcEtbDrop0 = scalar, S08, 1421, "", 1, 0 +jamTimer0 = scalar, U16, 1422, "sec", 0.01, 0 ; total TS size = 1424 -dcOutput0 = scalar, F32, 1424, "per", 1,0 -isEnabled0_int = scalar, U08, 1428, "per", 1,0 -isEnabled0 = bits, U32, 1432, [0:0] +faultCode0 = scalar, U08, 1424, "", 1, 0 +heaterDuty0 = scalar, U08, 1425, "%", 1, 0 +pumpDuty0 = scalar, U08, 1426, "%", 1, 0 +tempC0 = scalar, U16, 1428, "C", 1, 0 +nernstVoltage0 = scalar, U16, 1430, "V", 0.001, 0 +esr0 = scalar, U16, 1432, "ohm", 1, 0 ; total TS size = 1436 -value0 = scalar, U16, 1436, "value", 1,0 -value1 = scalar, U16, 1438, "value", 1,0 -errorRate = scalar, F32, 1440, "ratio", 1,0 -; total TS size = 1444 -vvtTarget = scalar, U16, 1444, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1446, "%", 0.5, 0 +dcOutput0 = scalar, F32, 1436, "per", 1,0 +isEnabled0_int = scalar, U08, 1440, "per", 1,0 +isEnabled0 = bits, U32, 1444, [0:0] ; total TS size = 1448 -lambdaCurrentlyGood = bits, U32, 1448, [0:0] -lambdaMonitorCut = bits, U32, 1448, [1:1] -lambdaTimeSinceGood = scalar, U16, 1452, "sec", 0.01, 0 +value0 = scalar, U16, 1448, "value", 1,0 +value1 = scalar, U16, 1450, "value", 1,0 +errorRate = scalar, F32, 1452, "ratio", 1,0 ; total TS size = 1456 +vvtTarget = scalar, U16, 1456, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1458, "%", 0.5, 0 +; total TS size = 1460 +lambdaCurrentlyGood = bits, U32, 1460, [0:0] +lambdaMonitorCut = bits, U32, 1460, [1:1] +lambdaTimeSinceGood = scalar, U16, 1464, "sec", 0.01, 0 +; total TS size = 1468 time = { timeNow } @@ -5401,7 +5404,6 @@ entry = smartChipState, "smartChipState", int, "%d" entry = smartChipRestartCounter, "smartChipRestartCounter", int, "%d" entry = smartChipAliveCounter, "smartChipAliveCounter", int, "%d" entry = startStopPhysicalState, "startStopPhysicalState", int, "%d" -entry = acrStateDup, "acrStateDup", int, "%d" entry = acrEngineMovedRecently, "acrEngineMovedRecently", int, "%d" entry = heaterControlEnabled, "heaterControlEnabled", int, "%d" entry = luaDigitalState0, "luaDigitalState0", int, "%d" @@ -5411,6 +5413,9 @@ entry = luaDigitalState3, "luaDigitalState3", int, "%d" entry = startStopStateToggleCounter, "startStopStateToggleCounter", int, "%d" entry = egtValue1, "egtValue1", float, "%.3f" entry = egtValue2, "egtValue2", float, "%.3f" +entry = luaSoftSparkSkip, "luaSoftSparkSkip", float, "%.3f" +entry = luaHardSparkSkip, "luaHardSparkSkip", float, "%.3f" +entry = tractionControlSparkSkip, "tractionControlSparkSkip", float, "%.3f" entry = desiredRpmLimit, "User-defined RPM hard limit", int, "%d" entry = fuelInjectionCounter, "Fuel: Injection counter", int, "%d" entry = globalSparkCounter, "Ign: Spark counter", int, "%d" @@ -5911,7 +5916,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 @@ -6372,7 +6377,6 @@ indicatorPanel = engine_stateIndicatorPanel, 2 indicator = {lua_luaDisableEtb}, "luaDisableEtb No", "luaDisableEtb Yes" indicator = {lua_luaIgnCut}, "luaIgnCut No", "luaIgnCut Yes" indicator = {startStopPhysicalState}, "startStopPhysicalState No", "startStopPhysicalState Yes" - indicator = {acrStateDup}, "acrStateDup No", "acrStateDup Yes" indicator = {acrEngineMovedRecently}, "acrEngineMovedRecently No", "acrEngineMovedRecently Yes" indicator = {heaterControlEnabled}, "heaterControlEnabled No", "heaterControlEnabled Yes" indicator = {luaDigitalState0}, "luaDigitalState0 No", "luaDigitalState0 Yes" @@ -6408,12 +6412,16 @@ dialog = engine_stateDialog, "engine_state" graphLine = egtValue1 graphLine = egtValue2 liveGraph = engine_state_6_Graph, "Graph", South + graphLine = luaSoftSparkSkip + graphLine = luaHardSparkSkip + graphLine = tractionControlSparkSkip graphLine = desiredRpmLimit + liveGraph = engine_state_7_Graph, "Graph", South graphLine = fuelInjectionCounter graphLine = globalSparkCounter graphLine = fuelingLoad - liveGraph = engine_state_7_Graph, "Graph", South graphLine = ignitionLoad + liveGraph = engine_state_8_Graph, "Graph", South graphLine = veTableYAxis indicatorPanel = tps_accel_stateIndicatorPanel, 2 @@ -7320,6 +7328,10 @@ dialog = lambda_monitorDialog, "lambda_monitor" 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 diff --git a/firmware/tunerstudio/generated/rusefi_s105.ini b/firmware/tunerstudio/generated/rusefi_s105.ini index 9f73af1c38..33cc3190bc 100644 --- a/firmware/tunerstudio/generated/rusefi_s105.ini +++ b/firmware/tunerstudio/generated/rusefi_s105.ini @@ -37,12 +37,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.03.05.s105.381904304" + signature = "rusEFI master.2024.03.05.s105.1499059592" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.03.05.s105.381904304" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.03.05.s105.1499059592" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -98,7 +98,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","56 - MAP","16 - TPS","19 - Knock","39 - CLT","INVALID","opt 55 - AFR 2","opt 21 - AC Press","18 - AFR 1","13 - Ignition switch in (15)","44 - +12 sense (MR)","INVALID","na 37 - MAF","INVALID","INVALID","40 - IAT" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue Mar 05 00:52:49 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue Mar 05 01:56:53 UTC 2024 pageSize = 22236 page = 1 @@ -745,6 +745,7 @@ mc33810Gpgd3Mode = bits, U32, 1576, [4:4], "false", "true" enableExtendedCanBroadcast = bits, U32, 1576, [5:5], "false", "true" luaCanRxWorkaround = bits, U32, 1576, [6:6], "false", "true" flexSensorInverted = bits, U32, 1576, [7:7], "false", "true" +useHardSkipInTraction = bits, U32, 1576, [8:8], "false", "true" useAuxSpeedForSlipRatio = bits, U32, 1576, [11:11], "false", "true" useVssAsSecondWheelSpeed = bits, U32, 1576, [12:12], "false", "true" is_enabled_spi_5 = bits, U32, 1576, [13:13], "false", "true" @@ -2468,7 +2469,7 @@ injectorStagingRpmBins = array, U16, 22222, [6], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1456 + ochBlockSize = 1468 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3131,145 +3132,147 @@ smartChipState = scalar, S08, 1102, "", 1, 0 smartChipRestartCounter = scalar, S08, 1103, "", 1, 0 smartChipAliveCounter = scalar, S08, 1104, "", 1, 0 startStopPhysicalState = bits, U32, 1108, [0:0] -acrStateDup = bits, U32, 1108, [1:1] -acrEngineMovedRecently = bits, U32, 1108, [2:2] -heaterControlEnabled = bits, U32, 1108, [3:3] -luaDigitalState0 = bits, U32, 1108, [4:4] -luaDigitalState1 = bits, U32, 1108, [5:5] -luaDigitalState2 = bits, U32, 1108, [6:6] -luaDigitalState3 = bits, U32, 1108, [7:7] +acrEngineMovedRecently = bits, U32, 1108, [1:1] +heaterControlEnabled = bits, U32, 1108, [2:2] +luaDigitalState0 = bits, U32, 1108, [3:3] +luaDigitalState1 = bits, U32, 1108, [4:4] +luaDigitalState2 = bits, U32, 1108, [5:5] +luaDigitalState3 = bits, U32, 1108, [6:6] startStopStateToggleCounter = scalar, U32, 1112, "", 1, 0 egtValue1 = scalar, F32, 1116, "", 1, 0 egtValue2 = scalar, F32, 1120, "", 1, 0 -desiredRpmLimit = scalar, S16, 1124, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1128, "", 1, 0 -globalSparkCounter = scalar, U32, 1132, "", 1, 0 -fuelingLoad = scalar, F32, 1136, "", 1, 0 -ignitionLoad = scalar, F32, 1140, "", 1, 0 -veTableYAxis = scalar, U16, 1144, "%", 0.01, 0 -; total TS size = 1148 -tpsFrom = scalar, F32, 1148 -tpsTo = scalar, F32, 1152 -deltaTps = scalar, F32, 1156 -extraFuel = scalar, F32, 1160, "", 1, 0 -valueFromTable = scalar, F32, 1164, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1168, [0:0] -isBelowDecelThreshold = bits, U32, 1168, [1:1] -isTimeToResetAccumulator = bits, U32, 1168, [2:2] -isFractionalEnrichment = bits, U32, 1168, [3:3] -belowEpsilon = bits, U32, 1168, [4:4] -tooShort = bits, U32, 1168, [5:5] -fractionalInjFuel = scalar, F32, 1172, "", 1, 0 -accumulatedValue = scalar, F32, 1176, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1180, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1184, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1188, "", 1, 0 -cycleCnt = scalar, S32, 1192, "", 1, 0 -; total TS size = 1196 -hwEventCounters1 = scalar, U32, 1196, "", 1, 0 -hwEventCounters2 = scalar, U32, 1200, "", 1, 0 -hwEventCounters3 = scalar, U32, 1204, "", 1, 0 -hwEventCounters4 = scalar, U32, 1208, "", 1, 0 -hwEventCounters5 = scalar, U32, 1212, "", 1, 0 -hwEventCounters6 = scalar, U32, 1216, "", 1, 0 -vvtCamCounter = scalar, U32, 1220, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1224, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1228, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1232, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1233, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1236, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1240, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1244, "", 1, 0 -mapCamPrevToothAngle = scalar, F32, 1248, "deg", 1, 0 -isDecodingMapCam = bits, U32, 1252, [0:0] -; total TS size = 1256 -crankSynchronizationCounter0 = scalar, U32, 1256, "", 1, 0 -vvtSyncGapRatio0 = scalar, F32, 1260, "", 1, 0 -vvtToothDurations00 = scalar, U32, 1264, "us", 1, 0 -vvtCurrentPosition0 = scalar, F32, 1268, "sync: Primary Cam Position", 1, 0 -vvtToothPosition10 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition20 = scalar, F32, 1276, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition30 = scalar, F32, 1280, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition40 = scalar, F32, 1284, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio0 = scalar, F32, 1288, "", 1, 0 -triggerStateIndex0 = scalar, U08, 1292, "", 1, 0 -vvtStateIndex0 = scalar, U08, 1293, "", 1, 0 -; total TS size = 1296 -camResyncCounter = scalar, U08, 1296, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1300, [0:0] -; total TS size = 1304 -wallFuelCorrection = scalar, F32, 1304, "", 1, 0 -wallFuel = scalar, F32, 1308, "", 1, 0 -; total TS size = 1312 -idleState = bits, S32, 1312, [0:2], "not important" -currentIdlePosition = scalar, F32, 1316 -baseIdlePosition = scalar, F32, 1320 -idleClosedLoop = scalar, F32, 1324 -iacByTpsTaper = scalar, F32, 1328 -throttlePedalUpState = scalar, S32, 1332, "", 1, 0 -mightResetPid = bits, U32, 1336, [0:0] -shouldResetPid = bits, U32, 1336, [1:1] -wasResetPid = bits, U32, 1336, [2:2] -mustResetPid = bits, U32, 1336, [3:3] -isCranking = bits, U32, 1336, [4:4] -isIacTableForCoasting = bits, U32, 1336, [5:5] -notIdling = bits, U32, 1336, [6:6] -needReset = bits, U32, 1336, [7:7] -isInDeadZone = bits, U32, 1336, [8:8] -isBlipping = bits, U32, 1336, [9:9] -useClosedLoop = bits, U32, 1336, [10:10] -badTps = bits, U32, 1336, [11:11] -looksLikeRunning = bits, U32, 1336, [12:12] -looksLikeCoasting = bits, U32, 1336, [13:13] -looksLikeCrankToIdle = bits, U32, 1336, [14:14] -isIdleCoasting = bits, U32, 1336, [15:15] -isIdleClosedLoop = bits, U32, 1336, [16:16] -idleTarget = scalar, S32, 1340, "", 1, 0 -targetRpmByClt = scalar, S32, 1344, "", 1, 0 -targetRpmAc = scalar, S32, 1348, "", 1, 0 -iacByRpmTaper = scalar, F32, 1352 -luaAdd = scalar, F32, 1356 -; total TS size = 1360 -idlePosition0 = scalar, F32, 1360, "per", 1,0 -trim0 = scalar, F32, 1364, "", 1, 0 -luaAdjustment0 = scalar, F32, 1368, "per", 1,0 -m_wastegatePosition0 = scalar, F32, 1372, "per", 1,0 -etbFeedForward0 = scalar, F32, 1376 -etbIntegralError0 = scalar, F32, 1380, "", 1, 0 -etbCurrentTarget0 = scalar, F32, 1384, "%", 1, 0 -etbCurrentAdjustedTarget0 = scalar, F32, 1388, "%", 1, 0 -etbRevLimitActive0 = bits, U32, 1392, [0:0] -jamDetected0 = bits, U32, 1392, [1:1] -etbDutyRateOfChange0 = scalar, F32, 1396, "per", 1,0 -etbDutyAverage0 = scalar, F32, 1400, "per", 1,0 -etbTpsErrorCounter0 = scalar, U16, 1404, "count", 1,0 -etbPpsErrorCounter0 = scalar, U16, 1406, "count", 1,0 -etbErrorCode0 = scalar, S08, 1408, "", 1, 0 -tcEtbDrop0 = scalar, S08, 1409, "", 1, 0 -jamTimer0 = scalar, U16, 1410, "sec", 0.01, 0 -; total TS size = 1412 -faultCode0 = scalar, U08, 1412, "", 1, 0 -heaterDuty0 = scalar, U08, 1413, "%", 1, 0 -pumpDuty0 = scalar, U08, 1414, "%", 1, 0 -tempC0 = scalar, U16, 1416, "C", 1, 0 -nernstVoltage0 = scalar, U16, 1418, "V", 0.001, 0 -esr0 = scalar, U16, 1420, "ohm", 1, 0 +luaSoftSparkSkip = scalar, F32, 1124, "", 1, 0 +luaHardSparkSkip = scalar, F32, 1128, "", 1, 0 +tractionControlSparkSkip = scalar, F32, 1132, "", 1, 0 +desiredRpmLimit = scalar, S16, 1136, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 1140, "", 1, 0 +globalSparkCounter = scalar, U32, 1144, "", 1, 0 +fuelingLoad = scalar, F32, 1148, "", 1, 0 +ignitionLoad = scalar, F32, 1152, "", 1, 0 +veTableYAxis = scalar, U16, 1156, "%", 0.01, 0 +; total TS size = 1160 +tpsFrom = scalar, F32, 1160 +tpsTo = scalar, F32, 1164 +deltaTps = scalar, F32, 1168 +extraFuel = scalar, F32, 1172, "", 1, 0 +valueFromTable = scalar, F32, 1176, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1180, [0:0] +isBelowDecelThreshold = bits, U32, 1180, [1:1] +isTimeToResetAccumulator = bits, U32, 1180, [2:2] +isFractionalEnrichment = bits, U32, 1180, [3:3] +belowEpsilon = bits, U32, 1180, [4:4] +tooShort = bits, U32, 1180, [5:5] +fractionalInjFuel = scalar, F32, 1184, "", 1, 0 +accumulatedValue = scalar, F32, 1188, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1192, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1196, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1200, "", 1, 0 +cycleCnt = scalar, S32, 1204, "", 1, 0 +; total TS size = 1208 +hwEventCounters1 = scalar, U32, 1208, "", 1, 0 +hwEventCounters2 = scalar, U32, 1212, "", 1, 0 +hwEventCounters3 = scalar, U32, 1216, "", 1, 0 +hwEventCounters4 = scalar, U32, 1220, "", 1, 0 +hwEventCounters5 = scalar, U32, 1224, "", 1, 0 +hwEventCounters6 = scalar, U32, 1228, "", 1, 0 +vvtCamCounter = scalar, U32, 1232, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1236, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1240, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1244, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1245, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1248, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1252, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1256, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1260, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1264, [0:0] +; total TS size = 1268 +crankSynchronizationCounter0 = scalar, U32, 1268, "", 1, 0 +vvtSyncGapRatio0 = scalar, F32, 1272, "", 1, 0 +vvtToothDurations00 = scalar, U32, 1276, "us", 1, 0 +vvtCurrentPosition0 = scalar, F32, 1280, "sync: Primary Cam Position", 1, 0 +vvtToothPosition10 = scalar, F32, 1284, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition20 = scalar, F32, 1288, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition30 = scalar, F32, 1292, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition40 = scalar, F32, 1296, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio0 = scalar, F32, 1300, "", 1, 0 +triggerStateIndex0 = scalar, U08, 1304, "", 1, 0 +vvtStateIndex0 = scalar, U08, 1305, "", 1, 0 +; total TS size = 1308 +camResyncCounter = scalar, U08, 1308, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1312, [0:0] +; total TS size = 1316 +wallFuelCorrection = scalar, F32, 1316, "", 1, 0 +wallFuel = scalar, F32, 1320, "", 1, 0 +; total TS size = 1324 +idleState = bits, S32, 1324, [0:2], "not important" +currentIdlePosition = scalar, F32, 1328 +baseIdlePosition = scalar, F32, 1332 +idleClosedLoop = scalar, F32, 1336 +iacByTpsTaper = scalar, F32, 1340 +throttlePedalUpState = scalar, S32, 1344, "", 1, 0 +mightResetPid = bits, U32, 1348, [0:0] +shouldResetPid = bits, U32, 1348, [1:1] +wasResetPid = bits, U32, 1348, [2:2] +mustResetPid = bits, U32, 1348, [3:3] +isCranking = bits, U32, 1348, [4:4] +isIacTableForCoasting = bits, U32, 1348, [5:5] +notIdling = bits, U32, 1348, [6:6] +needReset = bits, U32, 1348, [7:7] +isInDeadZone = bits, U32, 1348, [8:8] +isBlipping = bits, U32, 1348, [9:9] +useClosedLoop = bits, U32, 1348, [10:10] +badTps = bits, U32, 1348, [11:11] +looksLikeRunning = bits, U32, 1348, [12:12] +looksLikeCoasting = bits, U32, 1348, [13:13] +looksLikeCrankToIdle = bits, U32, 1348, [14:14] +isIdleCoasting = bits, U32, 1348, [15:15] +isIdleClosedLoop = bits, U32, 1348, [16:16] +idleTarget = scalar, S32, 1352, "", 1, 0 +targetRpmByClt = scalar, S32, 1356, "", 1, 0 +targetRpmAc = scalar, S32, 1360, "", 1, 0 +iacByRpmTaper = scalar, F32, 1364 +luaAdd = scalar, F32, 1368 +; total TS size = 1372 +idlePosition0 = scalar, F32, 1372, "per", 1,0 +trim0 = scalar, F32, 1376, "", 1, 0 +luaAdjustment0 = scalar, F32, 1380, "per", 1,0 +m_wastegatePosition0 = scalar, F32, 1384, "per", 1,0 +etbFeedForward0 = scalar, F32, 1388 +etbIntegralError0 = scalar, F32, 1392, "", 1, 0 +etbCurrentTarget0 = scalar, F32, 1396, "%", 1, 0 +etbCurrentAdjustedTarget0 = scalar, F32, 1400, "%", 1, 0 +etbRevLimitActive0 = bits, U32, 1404, [0:0] +jamDetected0 = bits, U32, 1404, [1:1] +etbDutyRateOfChange0 = scalar, F32, 1408, "per", 1,0 +etbDutyAverage0 = scalar, F32, 1412, "per", 1,0 +etbTpsErrorCounter0 = scalar, U16, 1416, "count", 1,0 +etbPpsErrorCounter0 = scalar, U16, 1418, "count", 1,0 +etbErrorCode0 = scalar, S08, 1420, "", 1, 0 +tcEtbDrop0 = scalar, S08, 1421, "", 1, 0 +jamTimer0 = scalar, U16, 1422, "sec", 0.01, 0 ; total TS size = 1424 -dcOutput0 = scalar, F32, 1424, "per", 1,0 -isEnabled0_int = scalar, U08, 1428, "per", 1,0 -isEnabled0 = bits, U32, 1432, [0:0] +faultCode0 = scalar, U08, 1424, "", 1, 0 +heaterDuty0 = scalar, U08, 1425, "%", 1, 0 +pumpDuty0 = scalar, U08, 1426, "%", 1, 0 +tempC0 = scalar, U16, 1428, "C", 1, 0 +nernstVoltage0 = scalar, U16, 1430, "V", 0.001, 0 +esr0 = scalar, U16, 1432, "ohm", 1, 0 ; total TS size = 1436 -value0 = scalar, U16, 1436, "value", 1,0 -value1 = scalar, U16, 1438, "value", 1,0 -errorRate = scalar, F32, 1440, "ratio", 1,0 -; total TS size = 1444 -vvtTarget = scalar, U16, 1444, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1446, "%", 0.5, 0 +dcOutput0 = scalar, F32, 1436, "per", 1,0 +isEnabled0_int = scalar, U08, 1440, "per", 1,0 +isEnabled0 = bits, U32, 1444, [0:0] ; total TS size = 1448 -lambdaCurrentlyGood = bits, U32, 1448, [0:0] -lambdaMonitorCut = bits, U32, 1448, [1:1] -lambdaTimeSinceGood = scalar, U16, 1452, "sec", 0.01, 0 +value0 = scalar, U16, 1448, "value", 1,0 +value1 = scalar, U16, 1450, "value", 1,0 +errorRate = scalar, F32, 1452, "ratio", 1,0 ; total TS size = 1456 +vvtTarget = scalar, U16, 1456, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1458, "%", 0.5, 0 +; total TS size = 1460 +lambdaCurrentlyGood = bits, U32, 1460, [0:0] +lambdaMonitorCut = bits, U32, 1460, [1:1] +lambdaTimeSinceGood = scalar, U16, 1464, "sec", 0.01, 0 +; total TS size = 1468 time = { timeNow } @@ -5401,7 +5404,6 @@ entry = smartChipState, "smartChipState", int, "%d" entry = smartChipRestartCounter, "smartChipRestartCounter", int, "%d" entry = smartChipAliveCounter, "smartChipAliveCounter", int, "%d" entry = startStopPhysicalState, "startStopPhysicalState", int, "%d" -entry = acrStateDup, "acrStateDup", int, "%d" entry = acrEngineMovedRecently, "acrEngineMovedRecently", int, "%d" entry = heaterControlEnabled, "heaterControlEnabled", int, "%d" entry = luaDigitalState0, "luaDigitalState0", int, "%d" @@ -5411,6 +5413,9 @@ entry = luaDigitalState3, "luaDigitalState3", int, "%d" entry = startStopStateToggleCounter, "startStopStateToggleCounter", int, "%d" entry = egtValue1, "egtValue1", float, "%.3f" entry = egtValue2, "egtValue2", float, "%.3f" +entry = luaSoftSparkSkip, "luaSoftSparkSkip", float, "%.3f" +entry = luaHardSparkSkip, "luaHardSparkSkip", float, "%.3f" +entry = tractionControlSparkSkip, "tractionControlSparkSkip", float, "%.3f" entry = desiredRpmLimit, "User-defined RPM hard limit", int, "%d" entry = fuelInjectionCounter, "Fuel: Injection counter", int, "%d" entry = globalSparkCounter, "Ign: Spark counter", int, "%d" @@ -5913,7 +5918,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 @@ -6361,7 +6366,6 @@ indicatorPanel = engine_stateIndicatorPanel, 2 indicator = {lua_luaDisableEtb}, "luaDisableEtb No", "luaDisableEtb Yes" indicator = {lua_luaIgnCut}, "luaIgnCut No", "luaIgnCut Yes" indicator = {startStopPhysicalState}, "startStopPhysicalState No", "startStopPhysicalState Yes" - indicator = {acrStateDup}, "acrStateDup No", "acrStateDup Yes" indicator = {acrEngineMovedRecently}, "acrEngineMovedRecently No", "acrEngineMovedRecently Yes" indicator = {heaterControlEnabled}, "heaterControlEnabled No", "heaterControlEnabled Yes" indicator = {luaDigitalState0}, "luaDigitalState0 No", "luaDigitalState0 Yes" @@ -6397,12 +6401,16 @@ dialog = engine_stateDialog, "engine_state" graphLine = egtValue1 graphLine = egtValue2 liveGraph = engine_state_6_Graph, "Graph", South + graphLine = luaSoftSparkSkip + graphLine = luaHardSparkSkip + graphLine = tractionControlSparkSkip graphLine = desiredRpmLimit + liveGraph = engine_state_7_Graph, "Graph", South graphLine = fuelInjectionCounter graphLine = globalSparkCounter graphLine = fuelingLoad - liveGraph = engine_state_7_Graph, "Graph", South graphLine = ignitionLoad + liveGraph = engine_state_8_Graph, "Graph", South graphLine = veTableYAxis indicatorPanel = tps_accel_stateIndicatorPanel, 2 @@ -7309,6 +7317,10 @@ dialog = lambda_monitorDialog, "lambda_monitor" 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 diff --git a/firmware/tunerstudio/generated/rusefi_small-can-board.ini b/firmware/tunerstudio/generated/rusefi_small-can-board.ini index 1451dc03e7..364cbe7455 100644 --- a/firmware/tunerstudio/generated/rusefi_small-can-board.ini +++ b/firmware/tunerstudio/generated/rusefi_small-can-board.ini @@ -37,12 +37,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.03.05.small-can-board.1845733948" + signature = "rusEFI master.2024.03.05.small-can-board.563681796" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.03.05.small-can-board.1845733948" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.03.05.small-can-board.563681796" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -98,7 +98,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","INVALID","INVALID","B2 - Analog/Digital Input","B3 - Analog/Digital Input","B4 - Analog/Digital Input","B5 - Analog/Digital Input","B7 - Analog/Digital Input","C1 - Analog/Digital Input 6","INVALID","INVALID","INVALID","A2 Battery Sense","INVALID","INVALID","C2 - Analog/Digital Input 7","C4 - Analog/Digital Input 8" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue Mar 05 00:52:43 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue Mar 05 01:56:47 UTC 2024 pageSize = 22236 page = 1 @@ -745,6 +745,7 @@ mc33810Gpgd3Mode = bits, U32, 1576, [4:4], "false", "true" enableExtendedCanBroadcast = bits, U32, 1576, [5:5], "false", "true" luaCanRxWorkaround = bits, U32, 1576, [6:6], "false", "true" flexSensorInverted = bits, U32, 1576, [7:7], "false", "true" +useHardSkipInTraction = bits, U32, 1576, [8:8], "false", "true" useAuxSpeedForSlipRatio = bits, U32, 1576, [11:11], "false", "true" useVssAsSecondWheelSpeed = bits, U32, 1576, [12:12], "false", "true" is_enabled_spi_5 = bits, U32, 1576, [13:13], "false", "true" @@ -2468,7 +2469,7 @@ injectorStagingRpmBins = array, U16, 22222, [6], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1456 + ochBlockSize = 1468 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3131,145 +3132,147 @@ smartChipState = scalar, S08, 1102, "", 1, 0 smartChipRestartCounter = scalar, S08, 1103, "", 1, 0 smartChipAliveCounter = scalar, S08, 1104, "", 1, 0 startStopPhysicalState = bits, U32, 1108, [0:0] -acrStateDup = bits, U32, 1108, [1:1] -acrEngineMovedRecently = bits, U32, 1108, [2:2] -heaterControlEnabled = bits, U32, 1108, [3:3] -luaDigitalState0 = bits, U32, 1108, [4:4] -luaDigitalState1 = bits, U32, 1108, [5:5] -luaDigitalState2 = bits, U32, 1108, [6:6] -luaDigitalState3 = bits, U32, 1108, [7:7] +acrEngineMovedRecently = bits, U32, 1108, [1:1] +heaterControlEnabled = bits, U32, 1108, [2:2] +luaDigitalState0 = bits, U32, 1108, [3:3] +luaDigitalState1 = bits, U32, 1108, [4:4] +luaDigitalState2 = bits, U32, 1108, [5:5] +luaDigitalState3 = bits, U32, 1108, [6:6] startStopStateToggleCounter = scalar, U32, 1112, "", 1, 0 egtValue1 = scalar, F32, 1116, "", 1, 0 egtValue2 = scalar, F32, 1120, "", 1, 0 -desiredRpmLimit = scalar, S16, 1124, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1128, "", 1, 0 -globalSparkCounter = scalar, U32, 1132, "", 1, 0 -fuelingLoad = scalar, F32, 1136, "", 1, 0 -ignitionLoad = scalar, F32, 1140, "", 1, 0 -veTableYAxis = scalar, U16, 1144, "%", 0.01, 0 -; total TS size = 1148 -tpsFrom = scalar, F32, 1148 -tpsTo = scalar, F32, 1152 -deltaTps = scalar, F32, 1156 -extraFuel = scalar, F32, 1160, "", 1, 0 -valueFromTable = scalar, F32, 1164, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1168, [0:0] -isBelowDecelThreshold = bits, U32, 1168, [1:1] -isTimeToResetAccumulator = bits, U32, 1168, [2:2] -isFractionalEnrichment = bits, U32, 1168, [3:3] -belowEpsilon = bits, U32, 1168, [4:4] -tooShort = bits, U32, 1168, [5:5] -fractionalInjFuel = scalar, F32, 1172, "", 1, 0 -accumulatedValue = scalar, F32, 1176, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1180, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1184, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1188, "", 1, 0 -cycleCnt = scalar, S32, 1192, "", 1, 0 -; total TS size = 1196 -hwEventCounters1 = scalar, U32, 1196, "", 1, 0 -hwEventCounters2 = scalar, U32, 1200, "", 1, 0 -hwEventCounters3 = scalar, U32, 1204, "", 1, 0 -hwEventCounters4 = scalar, U32, 1208, "", 1, 0 -hwEventCounters5 = scalar, U32, 1212, "", 1, 0 -hwEventCounters6 = scalar, U32, 1216, "", 1, 0 -vvtCamCounter = scalar, U32, 1220, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1224, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1228, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1232, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1233, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1236, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1240, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1244, "", 1, 0 -mapCamPrevToothAngle = scalar, F32, 1248, "deg", 1, 0 -isDecodingMapCam = bits, U32, 1252, [0:0] -; total TS size = 1256 -crankSynchronizationCounter0 = scalar, U32, 1256, "", 1, 0 -vvtSyncGapRatio0 = scalar, F32, 1260, "", 1, 0 -vvtToothDurations00 = scalar, U32, 1264, "us", 1, 0 -vvtCurrentPosition0 = scalar, F32, 1268, "sync: Primary Cam Position", 1, 0 -vvtToothPosition10 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition20 = scalar, F32, 1276, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition30 = scalar, F32, 1280, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition40 = scalar, F32, 1284, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio0 = scalar, F32, 1288, "", 1, 0 -triggerStateIndex0 = scalar, U08, 1292, "", 1, 0 -vvtStateIndex0 = scalar, U08, 1293, "", 1, 0 -; total TS size = 1296 -camResyncCounter = scalar, U08, 1296, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1300, [0:0] -; total TS size = 1304 -wallFuelCorrection = scalar, F32, 1304, "", 1, 0 -wallFuel = scalar, F32, 1308, "", 1, 0 -; total TS size = 1312 -idleState = bits, S32, 1312, [0:2], "not important" -currentIdlePosition = scalar, F32, 1316 -baseIdlePosition = scalar, F32, 1320 -idleClosedLoop = scalar, F32, 1324 -iacByTpsTaper = scalar, F32, 1328 -throttlePedalUpState = scalar, S32, 1332, "", 1, 0 -mightResetPid = bits, U32, 1336, [0:0] -shouldResetPid = bits, U32, 1336, [1:1] -wasResetPid = bits, U32, 1336, [2:2] -mustResetPid = bits, U32, 1336, [3:3] -isCranking = bits, U32, 1336, [4:4] -isIacTableForCoasting = bits, U32, 1336, [5:5] -notIdling = bits, U32, 1336, [6:6] -needReset = bits, U32, 1336, [7:7] -isInDeadZone = bits, U32, 1336, [8:8] -isBlipping = bits, U32, 1336, [9:9] -useClosedLoop = bits, U32, 1336, [10:10] -badTps = bits, U32, 1336, [11:11] -looksLikeRunning = bits, U32, 1336, [12:12] -looksLikeCoasting = bits, U32, 1336, [13:13] -looksLikeCrankToIdle = bits, U32, 1336, [14:14] -isIdleCoasting = bits, U32, 1336, [15:15] -isIdleClosedLoop = bits, U32, 1336, [16:16] -idleTarget = scalar, S32, 1340, "", 1, 0 -targetRpmByClt = scalar, S32, 1344, "", 1, 0 -targetRpmAc = scalar, S32, 1348, "", 1, 0 -iacByRpmTaper = scalar, F32, 1352 -luaAdd = scalar, F32, 1356 -; total TS size = 1360 -idlePosition0 = scalar, F32, 1360, "per", 1,0 -trim0 = scalar, F32, 1364, "", 1, 0 -luaAdjustment0 = scalar, F32, 1368, "per", 1,0 -m_wastegatePosition0 = scalar, F32, 1372, "per", 1,0 -etbFeedForward0 = scalar, F32, 1376 -etbIntegralError0 = scalar, F32, 1380, "", 1, 0 -etbCurrentTarget0 = scalar, F32, 1384, "%", 1, 0 -etbCurrentAdjustedTarget0 = scalar, F32, 1388, "%", 1, 0 -etbRevLimitActive0 = bits, U32, 1392, [0:0] -jamDetected0 = bits, U32, 1392, [1:1] -etbDutyRateOfChange0 = scalar, F32, 1396, "per", 1,0 -etbDutyAverage0 = scalar, F32, 1400, "per", 1,0 -etbTpsErrorCounter0 = scalar, U16, 1404, "count", 1,0 -etbPpsErrorCounter0 = scalar, U16, 1406, "count", 1,0 -etbErrorCode0 = scalar, S08, 1408, "", 1, 0 -tcEtbDrop0 = scalar, S08, 1409, "", 1, 0 -jamTimer0 = scalar, U16, 1410, "sec", 0.01, 0 -; total TS size = 1412 -faultCode0 = scalar, U08, 1412, "", 1, 0 -heaterDuty0 = scalar, U08, 1413, "%", 1, 0 -pumpDuty0 = scalar, U08, 1414, "%", 1, 0 -tempC0 = scalar, U16, 1416, "C", 1, 0 -nernstVoltage0 = scalar, U16, 1418, "V", 0.001, 0 -esr0 = scalar, U16, 1420, "ohm", 1, 0 +luaSoftSparkSkip = scalar, F32, 1124, "", 1, 0 +luaHardSparkSkip = scalar, F32, 1128, "", 1, 0 +tractionControlSparkSkip = scalar, F32, 1132, "", 1, 0 +desiredRpmLimit = scalar, S16, 1136, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 1140, "", 1, 0 +globalSparkCounter = scalar, U32, 1144, "", 1, 0 +fuelingLoad = scalar, F32, 1148, "", 1, 0 +ignitionLoad = scalar, F32, 1152, "", 1, 0 +veTableYAxis = scalar, U16, 1156, "%", 0.01, 0 +; total TS size = 1160 +tpsFrom = scalar, F32, 1160 +tpsTo = scalar, F32, 1164 +deltaTps = scalar, F32, 1168 +extraFuel = scalar, F32, 1172, "", 1, 0 +valueFromTable = scalar, F32, 1176, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1180, [0:0] +isBelowDecelThreshold = bits, U32, 1180, [1:1] +isTimeToResetAccumulator = bits, U32, 1180, [2:2] +isFractionalEnrichment = bits, U32, 1180, [3:3] +belowEpsilon = bits, U32, 1180, [4:4] +tooShort = bits, U32, 1180, [5:5] +fractionalInjFuel = scalar, F32, 1184, "", 1, 0 +accumulatedValue = scalar, F32, 1188, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1192, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1196, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1200, "", 1, 0 +cycleCnt = scalar, S32, 1204, "", 1, 0 +; total TS size = 1208 +hwEventCounters1 = scalar, U32, 1208, "", 1, 0 +hwEventCounters2 = scalar, U32, 1212, "", 1, 0 +hwEventCounters3 = scalar, U32, 1216, "", 1, 0 +hwEventCounters4 = scalar, U32, 1220, "", 1, 0 +hwEventCounters5 = scalar, U32, 1224, "", 1, 0 +hwEventCounters6 = scalar, U32, 1228, "", 1, 0 +vvtCamCounter = scalar, U32, 1232, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1236, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1240, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1244, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1245, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1248, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1252, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1256, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1260, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1264, [0:0] +; total TS size = 1268 +crankSynchronizationCounter0 = scalar, U32, 1268, "", 1, 0 +vvtSyncGapRatio0 = scalar, F32, 1272, "", 1, 0 +vvtToothDurations00 = scalar, U32, 1276, "us", 1, 0 +vvtCurrentPosition0 = scalar, F32, 1280, "sync: Primary Cam Position", 1, 0 +vvtToothPosition10 = scalar, F32, 1284, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition20 = scalar, F32, 1288, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition30 = scalar, F32, 1292, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition40 = scalar, F32, 1296, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio0 = scalar, F32, 1300, "", 1, 0 +triggerStateIndex0 = scalar, U08, 1304, "", 1, 0 +vvtStateIndex0 = scalar, U08, 1305, "", 1, 0 +; total TS size = 1308 +camResyncCounter = scalar, U08, 1308, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1312, [0:0] +; total TS size = 1316 +wallFuelCorrection = scalar, F32, 1316, "", 1, 0 +wallFuel = scalar, F32, 1320, "", 1, 0 +; total TS size = 1324 +idleState = bits, S32, 1324, [0:2], "not important" +currentIdlePosition = scalar, F32, 1328 +baseIdlePosition = scalar, F32, 1332 +idleClosedLoop = scalar, F32, 1336 +iacByTpsTaper = scalar, F32, 1340 +throttlePedalUpState = scalar, S32, 1344, "", 1, 0 +mightResetPid = bits, U32, 1348, [0:0] +shouldResetPid = bits, U32, 1348, [1:1] +wasResetPid = bits, U32, 1348, [2:2] +mustResetPid = bits, U32, 1348, [3:3] +isCranking = bits, U32, 1348, [4:4] +isIacTableForCoasting = bits, U32, 1348, [5:5] +notIdling = bits, U32, 1348, [6:6] +needReset = bits, U32, 1348, [7:7] +isInDeadZone = bits, U32, 1348, [8:8] +isBlipping = bits, U32, 1348, [9:9] +useClosedLoop = bits, U32, 1348, [10:10] +badTps = bits, U32, 1348, [11:11] +looksLikeRunning = bits, U32, 1348, [12:12] +looksLikeCoasting = bits, U32, 1348, [13:13] +looksLikeCrankToIdle = bits, U32, 1348, [14:14] +isIdleCoasting = bits, U32, 1348, [15:15] +isIdleClosedLoop = bits, U32, 1348, [16:16] +idleTarget = scalar, S32, 1352, "", 1, 0 +targetRpmByClt = scalar, S32, 1356, "", 1, 0 +targetRpmAc = scalar, S32, 1360, "", 1, 0 +iacByRpmTaper = scalar, F32, 1364 +luaAdd = scalar, F32, 1368 +; total TS size = 1372 +idlePosition0 = scalar, F32, 1372, "per", 1,0 +trim0 = scalar, F32, 1376, "", 1, 0 +luaAdjustment0 = scalar, F32, 1380, "per", 1,0 +m_wastegatePosition0 = scalar, F32, 1384, "per", 1,0 +etbFeedForward0 = scalar, F32, 1388 +etbIntegralError0 = scalar, F32, 1392, "", 1, 0 +etbCurrentTarget0 = scalar, F32, 1396, "%", 1, 0 +etbCurrentAdjustedTarget0 = scalar, F32, 1400, "%", 1, 0 +etbRevLimitActive0 = bits, U32, 1404, [0:0] +jamDetected0 = bits, U32, 1404, [1:1] +etbDutyRateOfChange0 = scalar, F32, 1408, "per", 1,0 +etbDutyAverage0 = scalar, F32, 1412, "per", 1,0 +etbTpsErrorCounter0 = scalar, U16, 1416, "count", 1,0 +etbPpsErrorCounter0 = scalar, U16, 1418, "count", 1,0 +etbErrorCode0 = scalar, S08, 1420, "", 1, 0 +tcEtbDrop0 = scalar, S08, 1421, "", 1, 0 +jamTimer0 = scalar, U16, 1422, "sec", 0.01, 0 ; total TS size = 1424 -dcOutput0 = scalar, F32, 1424, "per", 1,0 -isEnabled0_int = scalar, U08, 1428, "per", 1,0 -isEnabled0 = bits, U32, 1432, [0:0] +faultCode0 = scalar, U08, 1424, "", 1, 0 +heaterDuty0 = scalar, U08, 1425, "%", 1, 0 +pumpDuty0 = scalar, U08, 1426, "%", 1, 0 +tempC0 = scalar, U16, 1428, "C", 1, 0 +nernstVoltage0 = scalar, U16, 1430, "V", 0.001, 0 +esr0 = scalar, U16, 1432, "ohm", 1, 0 ; total TS size = 1436 -value0 = scalar, U16, 1436, "value", 1,0 -value1 = scalar, U16, 1438, "value", 1,0 -errorRate = scalar, F32, 1440, "ratio", 1,0 -; total TS size = 1444 -vvtTarget = scalar, U16, 1444, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1446, "%", 0.5, 0 +dcOutput0 = scalar, F32, 1436, "per", 1,0 +isEnabled0_int = scalar, U08, 1440, "per", 1,0 +isEnabled0 = bits, U32, 1444, [0:0] ; total TS size = 1448 -lambdaCurrentlyGood = bits, U32, 1448, [0:0] -lambdaMonitorCut = bits, U32, 1448, [1:1] -lambdaTimeSinceGood = scalar, U16, 1452, "sec", 0.01, 0 +value0 = scalar, U16, 1448, "value", 1,0 +value1 = scalar, U16, 1450, "value", 1,0 +errorRate = scalar, F32, 1452, "ratio", 1,0 ; total TS size = 1456 +vvtTarget = scalar, U16, 1456, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1458, "%", 0.5, 0 +; total TS size = 1460 +lambdaCurrentlyGood = bits, U32, 1460, [0:0] +lambdaMonitorCut = bits, U32, 1460, [1:1] +lambdaTimeSinceGood = scalar, U16, 1464, "sec", 0.01, 0 +; total TS size = 1468 time = { timeNow } @@ -5401,7 +5404,6 @@ entry = smartChipState, "smartChipState", int, "%d" entry = smartChipRestartCounter, "smartChipRestartCounter", int, "%d" entry = smartChipAliveCounter, "smartChipAliveCounter", int, "%d" entry = startStopPhysicalState, "startStopPhysicalState", int, "%d" -entry = acrStateDup, "acrStateDup", int, "%d" entry = acrEngineMovedRecently, "acrEngineMovedRecently", int, "%d" entry = heaterControlEnabled, "heaterControlEnabled", int, "%d" entry = luaDigitalState0, "luaDigitalState0", int, "%d" @@ -5411,6 +5413,9 @@ entry = luaDigitalState3, "luaDigitalState3", int, "%d" entry = startStopStateToggleCounter, "startStopStateToggleCounter", int, "%d" entry = egtValue1, "egtValue1", float, "%.3f" entry = egtValue2, "egtValue2", float, "%.3f" +entry = luaSoftSparkSkip, "luaSoftSparkSkip", float, "%.3f" +entry = luaHardSparkSkip, "luaHardSparkSkip", float, "%.3f" +entry = tractionControlSparkSkip, "tractionControlSparkSkip", float, "%.3f" entry = desiredRpmLimit, "User-defined RPM hard limit", int, "%d" entry = fuelInjectionCounter, "Fuel: Injection counter", int, "%d" entry = globalSparkCounter, "Ign: Spark counter", int, "%d" @@ -5911,7 +5916,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 @@ -6360,7 +6365,6 @@ indicatorPanel = engine_stateIndicatorPanel, 2 indicator = {lua_luaDisableEtb}, "luaDisableEtb No", "luaDisableEtb Yes" indicator = {lua_luaIgnCut}, "luaIgnCut No", "luaIgnCut Yes" indicator = {startStopPhysicalState}, "startStopPhysicalState No", "startStopPhysicalState Yes" - indicator = {acrStateDup}, "acrStateDup No", "acrStateDup Yes" indicator = {acrEngineMovedRecently}, "acrEngineMovedRecently No", "acrEngineMovedRecently Yes" indicator = {heaterControlEnabled}, "heaterControlEnabled No", "heaterControlEnabled Yes" indicator = {luaDigitalState0}, "luaDigitalState0 No", "luaDigitalState0 Yes" @@ -6396,12 +6400,16 @@ dialog = engine_stateDialog, "engine_state" graphLine = egtValue1 graphLine = egtValue2 liveGraph = engine_state_6_Graph, "Graph", South + graphLine = luaSoftSparkSkip + graphLine = luaHardSparkSkip + graphLine = tractionControlSparkSkip graphLine = desiredRpmLimit + liveGraph = engine_state_7_Graph, "Graph", South graphLine = fuelInjectionCounter graphLine = globalSparkCounter graphLine = fuelingLoad - liveGraph = engine_state_7_Graph, "Graph", South graphLine = ignitionLoad + liveGraph = engine_state_8_Graph, "Graph", South graphLine = veTableYAxis indicatorPanel = tps_accel_stateIndicatorPanel, 2 @@ -7308,6 +7316,10 @@ dialog = lambda_monitorDialog, "lambda_monitor" 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 diff --git a/firmware/tunerstudio/generated/rusefi_stm32f413_nucleo.ini b/firmware/tunerstudio/generated/rusefi_stm32f413_nucleo.ini index b41e066504..c01b25fb3c 100644 --- a/firmware/tunerstudio/generated/rusefi_stm32f413_nucleo.ini +++ b/firmware/tunerstudio/generated/rusefi_stm32f413_nucleo.ini @@ -37,12 +37,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.03.05.stm32f413_nucleo.1352820405" + signature = "rusEFI master.2024.03.05.stm32f413_nucleo.523818637" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.03.05.stm32f413_nucleo.1352820405" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.03.05.stm32f413_nucleo.523818637" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -98,7 +98,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="Disabled", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PB0", "PB1", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue Mar 05 00:53:02 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue Mar 05 01:57:06 UTC 2024 pageSize = 22236 page = 1 @@ -745,6 +745,7 @@ mc33810Gpgd3Mode = bits, U32, 1576, [4:4], "false", "true" enableExtendedCanBroadcast = bits, U32, 1576, [5:5], "false", "true" luaCanRxWorkaround = bits, U32, 1576, [6:6], "false", "true" flexSensorInverted = bits, U32, 1576, [7:7], "false", "true" +useHardSkipInTraction = bits, U32, 1576, [8:8], "false", "true" useAuxSpeedForSlipRatio = bits, U32, 1576, [11:11], "false", "true" useVssAsSecondWheelSpeed = bits, U32, 1576, [12:12], "false", "true" is_enabled_spi_5 = bits, U32, 1576, [13:13], "false", "true" @@ -2468,7 +2469,7 @@ injectorStagingRpmBins = array, U16, 22222, [6], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1456 + ochBlockSize = 1468 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3131,145 +3132,147 @@ smartChipState = scalar, S08, 1102, "", 1, 0 smartChipRestartCounter = scalar, S08, 1103, "", 1, 0 smartChipAliveCounter = scalar, S08, 1104, "", 1, 0 startStopPhysicalState = bits, U32, 1108, [0:0] -acrStateDup = bits, U32, 1108, [1:1] -acrEngineMovedRecently = bits, U32, 1108, [2:2] -heaterControlEnabled = bits, U32, 1108, [3:3] -luaDigitalState0 = bits, U32, 1108, [4:4] -luaDigitalState1 = bits, U32, 1108, [5:5] -luaDigitalState2 = bits, U32, 1108, [6:6] -luaDigitalState3 = bits, U32, 1108, [7:7] +acrEngineMovedRecently = bits, U32, 1108, [1:1] +heaterControlEnabled = bits, U32, 1108, [2:2] +luaDigitalState0 = bits, U32, 1108, [3:3] +luaDigitalState1 = bits, U32, 1108, [4:4] +luaDigitalState2 = bits, U32, 1108, [5:5] +luaDigitalState3 = bits, U32, 1108, [6:6] startStopStateToggleCounter = scalar, U32, 1112, "", 1, 0 egtValue1 = scalar, F32, 1116, "", 1, 0 egtValue2 = scalar, F32, 1120, "", 1, 0 -desiredRpmLimit = scalar, S16, 1124, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1128, "", 1, 0 -globalSparkCounter = scalar, U32, 1132, "", 1, 0 -fuelingLoad = scalar, F32, 1136, "", 1, 0 -ignitionLoad = scalar, F32, 1140, "", 1, 0 -veTableYAxis = scalar, U16, 1144, "%", 0.01, 0 -; total TS size = 1148 -tpsFrom = scalar, F32, 1148 -tpsTo = scalar, F32, 1152 -deltaTps = scalar, F32, 1156 -extraFuel = scalar, F32, 1160, "", 1, 0 -valueFromTable = scalar, F32, 1164, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1168, [0:0] -isBelowDecelThreshold = bits, U32, 1168, [1:1] -isTimeToResetAccumulator = bits, U32, 1168, [2:2] -isFractionalEnrichment = bits, U32, 1168, [3:3] -belowEpsilon = bits, U32, 1168, [4:4] -tooShort = bits, U32, 1168, [5:5] -fractionalInjFuel = scalar, F32, 1172, "", 1, 0 -accumulatedValue = scalar, F32, 1176, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1180, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1184, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1188, "", 1, 0 -cycleCnt = scalar, S32, 1192, "", 1, 0 -; total TS size = 1196 -hwEventCounters1 = scalar, U32, 1196, "", 1, 0 -hwEventCounters2 = scalar, U32, 1200, "", 1, 0 -hwEventCounters3 = scalar, U32, 1204, "", 1, 0 -hwEventCounters4 = scalar, U32, 1208, "", 1, 0 -hwEventCounters5 = scalar, U32, 1212, "", 1, 0 -hwEventCounters6 = scalar, U32, 1216, "", 1, 0 -vvtCamCounter = scalar, U32, 1220, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1224, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1228, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1232, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1233, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1236, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1240, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1244, "", 1, 0 -mapCamPrevToothAngle = scalar, F32, 1248, "deg", 1, 0 -isDecodingMapCam = bits, U32, 1252, [0:0] -; total TS size = 1256 -crankSynchronizationCounter0 = scalar, U32, 1256, "", 1, 0 -vvtSyncGapRatio0 = scalar, F32, 1260, "", 1, 0 -vvtToothDurations00 = scalar, U32, 1264, "us", 1, 0 -vvtCurrentPosition0 = scalar, F32, 1268, "sync: Primary Cam Position", 1, 0 -vvtToothPosition10 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition20 = scalar, F32, 1276, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition30 = scalar, F32, 1280, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition40 = scalar, F32, 1284, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio0 = scalar, F32, 1288, "", 1, 0 -triggerStateIndex0 = scalar, U08, 1292, "", 1, 0 -vvtStateIndex0 = scalar, U08, 1293, "", 1, 0 -; total TS size = 1296 -camResyncCounter = scalar, U08, 1296, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1300, [0:0] -; total TS size = 1304 -wallFuelCorrection = scalar, F32, 1304, "", 1, 0 -wallFuel = scalar, F32, 1308, "", 1, 0 -; total TS size = 1312 -idleState = bits, S32, 1312, [0:2], "not important" -currentIdlePosition = scalar, F32, 1316 -baseIdlePosition = scalar, F32, 1320 -idleClosedLoop = scalar, F32, 1324 -iacByTpsTaper = scalar, F32, 1328 -throttlePedalUpState = scalar, S32, 1332, "", 1, 0 -mightResetPid = bits, U32, 1336, [0:0] -shouldResetPid = bits, U32, 1336, [1:1] -wasResetPid = bits, U32, 1336, [2:2] -mustResetPid = bits, U32, 1336, [3:3] -isCranking = bits, U32, 1336, [4:4] -isIacTableForCoasting = bits, U32, 1336, [5:5] -notIdling = bits, U32, 1336, [6:6] -needReset = bits, U32, 1336, [7:7] -isInDeadZone = bits, U32, 1336, [8:8] -isBlipping = bits, U32, 1336, [9:9] -useClosedLoop = bits, U32, 1336, [10:10] -badTps = bits, U32, 1336, [11:11] -looksLikeRunning = bits, U32, 1336, [12:12] -looksLikeCoasting = bits, U32, 1336, [13:13] -looksLikeCrankToIdle = bits, U32, 1336, [14:14] -isIdleCoasting = bits, U32, 1336, [15:15] -isIdleClosedLoop = bits, U32, 1336, [16:16] -idleTarget = scalar, S32, 1340, "", 1, 0 -targetRpmByClt = scalar, S32, 1344, "", 1, 0 -targetRpmAc = scalar, S32, 1348, "", 1, 0 -iacByRpmTaper = scalar, F32, 1352 -luaAdd = scalar, F32, 1356 -; total TS size = 1360 -idlePosition0 = scalar, F32, 1360, "per", 1,0 -trim0 = scalar, F32, 1364, "", 1, 0 -luaAdjustment0 = scalar, F32, 1368, "per", 1,0 -m_wastegatePosition0 = scalar, F32, 1372, "per", 1,0 -etbFeedForward0 = scalar, F32, 1376 -etbIntegralError0 = scalar, F32, 1380, "", 1, 0 -etbCurrentTarget0 = scalar, F32, 1384, "%", 1, 0 -etbCurrentAdjustedTarget0 = scalar, F32, 1388, "%", 1, 0 -etbRevLimitActive0 = bits, U32, 1392, [0:0] -jamDetected0 = bits, U32, 1392, [1:1] -etbDutyRateOfChange0 = scalar, F32, 1396, "per", 1,0 -etbDutyAverage0 = scalar, F32, 1400, "per", 1,0 -etbTpsErrorCounter0 = scalar, U16, 1404, "count", 1,0 -etbPpsErrorCounter0 = scalar, U16, 1406, "count", 1,0 -etbErrorCode0 = scalar, S08, 1408, "", 1, 0 -tcEtbDrop0 = scalar, S08, 1409, "", 1, 0 -jamTimer0 = scalar, U16, 1410, "sec", 0.01, 0 -; total TS size = 1412 -faultCode0 = scalar, U08, 1412, "", 1, 0 -heaterDuty0 = scalar, U08, 1413, "%", 1, 0 -pumpDuty0 = scalar, U08, 1414, "%", 1, 0 -tempC0 = scalar, U16, 1416, "C", 1, 0 -nernstVoltage0 = scalar, U16, 1418, "V", 0.001, 0 -esr0 = scalar, U16, 1420, "ohm", 1, 0 +luaSoftSparkSkip = scalar, F32, 1124, "", 1, 0 +luaHardSparkSkip = scalar, F32, 1128, "", 1, 0 +tractionControlSparkSkip = scalar, F32, 1132, "", 1, 0 +desiredRpmLimit = scalar, S16, 1136, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 1140, "", 1, 0 +globalSparkCounter = scalar, U32, 1144, "", 1, 0 +fuelingLoad = scalar, F32, 1148, "", 1, 0 +ignitionLoad = scalar, F32, 1152, "", 1, 0 +veTableYAxis = scalar, U16, 1156, "%", 0.01, 0 +; total TS size = 1160 +tpsFrom = scalar, F32, 1160 +tpsTo = scalar, F32, 1164 +deltaTps = scalar, F32, 1168 +extraFuel = scalar, F32, 1172, "", 1, 0 +valueFromTable = scalar, F32, 1176, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1180, [0:0] +isBelowDecelThreshold = bits, U32, 1180, [1:1] +isTimeToResetAccumulator = bits, U32, 1180, [2:2] +isFractionalEnrichment = bits, U32, 1180, [3:3] +belowEpsilon = bits, U32, 1180, [4:4] +tooShort = bits, U32, 1180, [5:5] +fractionalInjFuel = scalar, F32, 1184, "", 1, 0 +accumulatedValue = scalar, F32, 1188, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1192, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1196, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1200, "", 1, 0 +cycleCnt = scalar, S32, 1204, "", 1, 0 +; total TS size = 1208 +hwEventCounters1 = scalar, U32, 1208, "", 1, 0 +hwEventCounters2 = scalar, U32, 1212, "", 1, 0 +hwEventCounters3 = scalar, U32, 1216, "", 1, 0 +hwEventCounters4 = scalar, U32, 1220, "", 1, 0 +hwEventCounters5 = scalar, U32, 1224, "", 1, 0 +hwEventCounters6 = scalar, U32, 1228, "", 1, 0 +vvtCamCounter = scalar, U32, 1232, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1236, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1240, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1244, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1245, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1248, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1252, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1256, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1260, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1264, [0:0] +; total TS size = 1268 +crankSynchronizationCounter0 = scalar, U32, 1268, "", 1, 0 +vvtSyncGapRatio0 = scalar, F32, 1272, "", 1, 0 +vvtToothDurations00 = scalar, U32, 1276, "us", 1, 0 +vvtCurrentPosition0 = scalar, F32, 1280, "sync: Primary Cam Position", 1, 0 +vvtToothPosition10 = scalar, F32, 1284, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition20 = scalar, F32, 1288, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition30 = scalar, F32, 1292, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition40 = scalar, F32, 1296, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio0 = scalar, F32, 1300, "", 1, 0 +triggerStateIndex0 = scalar, U08, 1304, "", 1, 0 +vvtStateIndex0 = scalar, U08, 1305, "", 1, 0 +; total TS size = 1308 +camResyncCounter = scalar, U08, 1308, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1312, [0:0] +; total TS size = 1316 +wallFuelCorrection = scalar, F32, 1316, "", 1, 0 +wallFuel = scalar, F32, 1320, "", 1, 0 +; total TS size = 1324 +idleState = bits, S32, 1324, [0:2], "not important" +currentIdlePosition = scalar, F32, 1328 +baseIdlePosition = scalar, F32, 1332 +idleClosedLoop = scalar, F32, 1336 +iacByTpsTaper = scalar, F32, 1340 +throttlePedalUpState = scalar, S32, 1344, "", 1, 0 +mightResetPid = bits, U32, 1348, [0:0] +shouldResetPid = bits, U32, 1348, [1:1] +wasResetPid = bits, U32, 1348, [2:2] +mustResetPid = bits, U32, 1348, [3:3] +isCranking = bits, U32, 1348, [4:4] +isIacTableForCoasting = bits, U32, 1348, [5:5] +notIdling = bits, U32, 1348, [6:6] +needReset = bits, U32, 1348, [7:7] +isInDeadZone = bits, U32, 1348, [8:8] +isBlipping = bits, U32, 1348, [9:9] +useClosedLoop = bits, U32, 1348, [10:10] +badTps = bits, U32, 1348, [11:11] +looksLikeRunning = bits, U32, 1348, [12:12] +looksLikeCoasting = bits, U32, 1348, [13:13] +looksLikeCrankToIdle = bits, U32, 1348, [14:14] +isIdleCoasting = bits, U32, 1348, [15:15] +isIdleClosedLoop = bits, U32, 1348, [16:16] +idleTarget = scalar, S32, 1352, "", 1, 0 +targetRpmByClt = scalar, S32, 1356, "", 1, 0 +targetRpmAc = scalar, S32, 1360, "", 1, 0 +iacByRpmTaper = scalar, F32, 1364 +luaAdd = scalar, F32, 1368 +; total TS size = 1372 +idlePosition0 = scalar, F32, 1372, "per", 1,0 +trim0 = scalar, F32, 1376, "", 1, 0 +luaAdjustment0 = scalar, F32, 1380, "per", 1,0 +m_wastegatePosition0 = scalar, F32, 1384, "per", 1,0 +etbFeedForward0 = scalar, F32, 1388 +etbIntegralError0 = scalar, F32, 1392, "", 1, 0 +etbCurrentTarget0 = scalar, F32, 1396, "%", 1, 0 +etbCurrentAdjustedTarget0 = scalar, F32, 1400, "%", 1, 0 +etbRevLimitActive0 = bits, U32, 1404, [0:0] +jamDetected0 = bits, U32, 1404, [1:1] +etbDutyRateOfChange0 = scalar, F32, 1408, "per", 1,0 +etbDutyAverage0 = scalar, F32, 1412, "per", 1,0 +etbTpsErrorCounter0 = scalar, U16, 1416, "count", 1,0 +etbPpsErrorCounter0 = scalar, U16, 1418, "count", 1,0 +etbErrorCode0 = scalar, S08, 1420, "", 1, 0 +tcEtbDrop0 = scalar, S08, 1421, "", 1, 0 +jamTimer0 = scalar, U16, 1422, "sec", 0.01, 0 ; total TS size = 1424 -dcOutput0 = scalar, F32, 1424, "per", 1,0 -isEnabled0_int = scalar, U08, 1428, "per", 1,0 -isEnabled0 = bits, U32, 1432, [0:0] +faultCode0 = scalar, U08, 1424, "", 1, 0 +heaterDuty0 = scalar, U08, 1425, "%", 1, 0 +pumpDuty0 = scalar, U08, 1426, "%", 1, 0 +tempC0 = scalar, U16, 1428, "C", 1, 0 +nernstVoltage0 = scalar, U16, 1430, "V", 0.001, 0 +esr0 = scalar, U16, 1432, "ohm", 1, 0 ; total TS size = 1436 -value0 = scalar, U16, 1436, "value", 1,0 -value1 = scalar, U16, 1438, "value", 1,0 -errorRate = scalar, F32, 1440, "ratio", 1,0 -; total TS size = 1444 -vvtTarget = scalar, U16, 1444, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1446, "%", 0.5, 0 +dcOutput0 = scalar, F32, 1436, "per", 1,0 +isEnabled0_int = scalar, U08, 1440, "per", 1,0 +isEnabled0 = bits, U32, 1444, [0:0] ; total TS size = 1448 -lambdaCurrentlyGood = bits, U32, 1448, [0:0] -lambdaMonitorCut = bits, U32, 1448, [1:1] -lambdaTimeSinceGood = scalar, U16, 1452, "sec", 0.01, 0 +value0 = scalar, U16, 1448, "value", 1,0 +value1 = scalar, U16, 1450, "value", 1,0 +errorRate = scalar, F32, 1452, "ratio", 1,0 ; total TS size = 1456 +vvtTarget = scalar, U16, 1456, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1458, "%", 0.5, 0 +; total TS size = 1460 +lambdaCurrentlyGood = bits, U32, 1460, [0:0] +lambdaMonitorCut = bits, U32, 1460, [1:1] +lambdaTimeSinceGood = scalar, U16, 1464, "sec", 0.01, 0 +; total TS size = 1468 time = { timeNow } @@ -5401,7 +5404,6 @@ entry = smartChipState, "smartChipState", int, "%d" entry = smartChipRestartCounter, "smartChipRestartCounter", int, "%d" entry = smartChipAliveCounter, "smartChipAliveCounter", int, "%d" entry = startStopPhysicalState, "startStopPhysicalState", int, "%d" -entry = acrStateDup, "acrStateDup", int, "%d" entry = acrEngineMovedRecently, "acrEngineMovedRecently", int, "%d" entry = heaterControlEnabled, "heaterControlEnabled", int, "%d" entry = luaDigitalState0, "luaDigitalState0", int, "%d" @@ -5411,6 +5413,9 @@ entry = luaDigitalState3, "luaDigitalState3", int, "%d" entry = startStopStateToggleCounter, "startStopStateToggleCounter", int, "%d" entry = egtValue1, "egtValue1", float, "%.3f" entry = egtValue2, "egtValue2", float, "%.3f" +entry = luaSoftSparkSkip, "luaSoftSparkSkip", float, "%.3f" +entry = luaHardSparkSkip, "luaHardSparkSkip", float, "%.3f" +entry = tractionControlSparkSkip, "tractionControlSparkSkip", float, "%.3f" entry = desiredRpmLimit, "User-defined RPM hard limit", int, "%d" entry = fuelInjectionCounter, "Fuel: Injection counter", int, "%d" entry = globalSparkCounter, "Ign: Spark counter", int, "%d" @@ -5912,7 +5917,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 @@ -6360,7 +6365,6 @@ indicatorPanel = engine_stateIndicatorPanel, 2 indicator = {lua_luaDisableEtb}, "luaDisableEtb No", "luaDisableEtb Yes" indicator = {lua_luaIgnCut}, "luaIgnCut No", "luaIgnCut Yes" indicator = {startStopPhysicalState}, "startStopPhysicalState No", "startStopPhysicalState Yes" - indicator = {acrStateDup}, "acrStateDup No", "acrStateDup Yes" indicator = {acrEngineMovedRecently}, "acrEngineMovedRecently No", "acrEngineMovedRecently Yes" indicator = {heaterControlEnabled}, "heaterControlEnabled No", "heaterControlEnabled Yes" indicator = {luaDigitalState0}, "luaDigitalState0 No", "luaDigitalState0 Yes" @@ -6396,12 +6400,16 @@ dialog = engine_stateDialog, "engine_state" graphLine = egtValue1 graphLine = egtValue2 liveGraph = engine_state_6_Graph, "Graph", South + graphLine = luaSoftSparkSkip + graphLine = luaHardSparkSkip + graphLine = tractionControlSparkSkip graphLine = desiredRpmLimit + liveGraph = engine_state_7_Graph, "Graph", South graphLine = fuelInjectionCounter graphLine = globalSparkCounter graphLine = fuelingLoad - liveGraph = engine_state_7_Graph, "Graph", South graphLine = ignitionLoad + liveGraph = engine_state_8_Graph, "Graph", South graphLine = veTableYAxis indicatorPanel = tps_accel_stateIndicatorPanel, 2 @@ -7308,6 +7316,10 @@ dialog = lambda_monitorDialog, "lambda_monitor" 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 diff --git a/firmware/tunerstudio/generated/rusefi_stm32f429_nucleo.ini b/firmware/tunerstudio/generated/rusefi_stm32f429_nucleo.ini index 80c533a063..60098b2b78 100644 --- a/firmware/tunerstudio/generated/rusefi_stm32f429_nucleo.ini +++ b/firmware/tunerstudio/generated/rusefi_stm32f429_nucleo.ini @@ -37,12 +37,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.03.05.stm32f429_nucleo.1352820405" + signature = "rusEFI master.2024.03.05.stm32f429_nucleo.523818637" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.03.05.stm32f429_nucleo.1352820405" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.03.05.stm32f429_nucleo.523818637" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -98,7 +98,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="Disabled", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PB0", "PB1", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue Mar 05 00:53:04 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue Mar 05 01:57:07 UTC 2024 pageSize = 22236 page = 1 @@ -745,6 +745,7 @@ mc33810Gpgd3Mode = bits, U32, 1576, [4:4], "false", "true" enableExtendedCanBroadcast = bits, U32, 1576, [5:5], "false", "true" luaCanRxWorkaround = bits, U32, 1576, [6:6], "false", "true" flexSensorInverted = bits, U32, 1576, [7:7], "false", "true" +useHardSkipInTraction = bits, U32, 1576, [8:8], "false", "true" useAuxSpeedForSlipRatio = bits, U32, 1576, [11:11], "false", "true" useVssAsSecondWheelSpeed = bits, U32, 1576, [12:12], "false", "true" is_enabled_spi_5 = bits, U32, 1576, [13:13], "false", "true" @@ -2468,7 +2469,7 @@ injectorStagingRpmBins = array, U16, 22222, [6], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1456 + ochBlockSize = 1468 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3131,145 +3132,147 @@ smartChipState = scalar, S08, 1102, "", 1, 0 smartChipRestartCounter = scalar, S08, 1103, "", 1, 0 smartChipAliveCounter = scalar, S08, 1104, "", 1, 0 startStopPhysicalState = bits, U32, 1108, [0:0] -acrStateDup = bits, U32, 1108, [1:1] -acrEngineMovedRecently = bits, U32, 1108, [2:2] -heaterControlEnabled = bits, U32, 1108, [3:3] -luaDigitalState0 = bits, U32, 1108, [4:4] -luaDigitalState1 = bits, U32, 1108, [5:5] -luaDigitalState2 = bits, U32, 1108, [6:6] -luaDigitalState3 = bits, U32, 1108, [7:7] +acrEngineMovedRecently = bits, U32, 1108, [1:1] +heaterControlEnabled = bits, U32, 1108, [2:2] +luaDigitalState0 = bits, U32, 1108, [3:3] +luaDigitalState1 = bits, U32, 1108, [4:4] +luaDigitalState2 = bits, U32, 1108, [5:5] +luaDigitalState3 = bits, U32, 1108, [6:6] startStopStateToggleCounter = scalar, U32, 1112, "", 1, 0 egtValue1 = scalar, F32, 1116, "", 1, 0 egtValue2 = scalar, F32, 1120, "", 1, 0 -desiredRpmLimit = scalar, S16, 1124, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1128, "", 1, 0 -globalSparkCounter = scalar, U32, 1132, "", 1, 0 -fuelingLoad = scalar, F32, 1136, "", 1, 0 -ignitionLoad = scalar, F32, 1140, "", 1, 0 -veTableYAxis = scalar, U16, 1144, "%", 0.01, 0 -; total TS size = 1148 -tpsFrom = scalar, F32, 1148 -tpsTo = scalar, F32, 1152 -deltaTps = scalar, F32, 1156 -extraFuel = scalar, F32, 1160, "", 1, 0 -valueFromTable = scalar, F32, 1164, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1168, [0:0] -isBelowDecelThreshold = bits, U32, 1168, [1:1] -isTimeToResetAccumulator = bits, U32, 1168, [2:2] -isFractionalEnrichment = bits, U32, 1168, [3:3] -belowEpsilon = bits, U32, 1168, [4:4] -tooShort = bits, U32, 1168, [5:5] -fractionalInjFuel = scalar, F32, 1172, "", 1, 0 -accumulatedValue = scalar, F32, 1176, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1180, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1184, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1188, "", 1, 0 -cycleCnt = scalar, S32, 1192, "", 1, 0 -; total TS size = 1196 -hwEventCounters1 = scalar, U32, 1196, "", 1, 0 -hwEventCounters2 = scalar, U32, 1200, "", 1, 0 -hwEventCounters3 = scalar, U32, 1204, "", 1, 0 -hwEventCounters4 = scalar, U32, 1208, "", 1, 0 -hwEventCounters5 = scalar, U32, 1212, "", 1, 0 -hwEventCounters6 = scalar, U32, 1216, "", 1, 0 -vvtCamCounter = scalar, U32, 1220, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1224, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1228, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1232, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1233, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1236, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1240, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1244, "", 1, 0 -mapCamPrevToothAngle = scalar, F32, 1248, "deg", 1, 0 -isDecodingMapCam = bits, U32, 1252, [0:0] -; total TS size = 1256 -crankSynchronizationCounter0 = scalar, U32, 1256, "", 1, 0 -vvtSyncGapRatio0 = scalar, F32, 1260, "", 1, 0 -vvtToothDurations00 = scalar, U32, 1264, "us", 1, 0 -vvtCurrentPosition0 = scalar, F32, 1268, "sync: Primary Cam Position", 1, 0 -vvtToothPosition10 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition20 = scalar, F32, 1276, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition30 = scalar, F32, 1280, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition40 = scalar, F32, 1284, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio0 = scalar, F32, 1288, "", 1, 0 -triggerStateIndex0 = scalar, U08, 1292, "", 1, 0 -vvtStateIndex0 = scalar, U08, 1293, "", 1, 0 -; total TS size = 1296 -camResyncCounter = scalar, U08, 1296, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1300, [0:0] -; total TS size = 1304 -wallFuelCorrection = scalar, F32, 1304, "", 1, 0 -wallFuel = scalar, F32, 1308, "", 1, 0 -; total TS size = 1312 -idleState = bits, S32, 1312, [0:2], "not important" -currentIdlePosition = scalar, F32, 1316 -baseIdlePosition = scalar, F32, 1320 -idleClosedLoop = scalar, F32, 1324 -iacByTpsTaper = scalar, F32, 1328 -throttlePedalUpState = scalar, S32, 1332, "", 1, 0 -mightResetPid = bits, U32, 1336, [0:0] -shouldResetPid = bits, U32, 1336, [1:1] -wasResetPid = bits, U32, 1336, [2:2] -mustResetPid = bits, U32, 1336, [3:3] -isCranking = bits, U32, 1336, [4:4] -isIacTableForCoasting = bits, U32, 1336, [5:5] -notIdling = bits, U32, 1336, [6:6] -needReset = bits, U32, 1336, [7:7] -isInDeadZone = bits, U32, 1336, [8:8] -isBlipping = bits, U32, 1336, [9:9] -useClosedLoop = bits, U32, 1336, [10:10] -badTps = bits, U32, 1336, [11:11] -looksLikeRunning = bits, U32, 1336, [12:12] -looksLikeCoasting = bits, U32, 1336, [13:13] -looksLikeCrankToIdle = bits, U32, 1336, [14:14] -isIdleCoasting = bits, U32, 1336, [15:15] -isIdleClosedLoop = bits, U32, 1336, [16:16] -idleTarget = scalar, S32, 1340, "", 1, 0 -targetRpmByClt = scalar, S32, 1344, "", 1, 0 -targetRpmAc = scalar, S32, 1348, "", 1, 0 -iacByRpmTaper = scalar, F32, 1352 -luaAdd = scalar, F32, 1356 -; total TS size = 1360 -idlePosition0 = scalar, F32, 1360, "per", 1,0 -trim0 = scalar, F32, 1364, "", 1, 0 -luaAdjustment0 = scalar, F32, 1368, "per", 1,0 -m_wastegatePosition0 = scalar, F32, 1372, "per", 1,0 -etbFeedForward0 = scalar, F32, 1376 -etbIntegralError0 = scalar, F32, 1380, "", 1, 0 -etbCurrentTarget0 = scalar, F32, 1384, "%", 1, 0 -etbCurrentAdjustedTarget0 = scalar, F32, 1388, "%", 1, 0 -etbRevLimitActive0 = bits, U32, 1392, [0:0] -jamDetected0 = bits, U32, 1392, [1:1] -etbDutyRateOfChange0 = scalar, F32, 1396, "per", 1,0 -etbDutyAverage0 = scalar, F32, 1400, "per", 1,0 -etbTpsErrorCounter0 = scalar, U16, 1404, "count", 1,0 -etbPpsErrorCounter0 = scalar, U16, 1406, "count", 1,0 -etbErrorCode0 = scalar, S08, 1408, "", 1, 0 -tcEtbDrop0 = scalar, S08, 1409, "", 1, 0 -jamTimer0 = scalar, U16, 1410, "sec", 0.01, 0 -; total TS size = 1412 -faultCode0 = scalar, U08, 1412, "", 1, 0 -heaterDuty0 = scalar, U08, 1413, "%", 1, 0 -pumpDuty0 = scalar, U08, 1414, "%", 1, 0 -tempC0 = scalar, U16, 1416, "C", 1, 0 -nernstVoltage0 = scalar, U16, 1418, "V", 0.001, 0 -esr0 = scalar, U16, 1420, "ohm", 1, 0 +luaSoftSparkSkip = scalar, F32, 1124, "", 1, 0 +luaHardSparkSkip = scalar, F32, 1128, "", 1, 0 +tractionControlSparkSkip = scalar, F32, 1132, "", 1, 0 +desiredRpmLimit = scalar, S16, 1136, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 1140, "", 1, 0 +globalSparkCounter = scalar, U32, 1144, "", 1, 0 +fuelingLoad = scalar, F32, 1148, "", 1, 0 +ignitionLoad = scalar, F32, 1152, "", 1, 0 +veTableYAxis = scalar, U16, 1156, "%", 0.01, 0 +; total TS size = 1160 +tpsFrom = scalar, F32, 1160 +tpsTo = scalar, F32, 1164 +deltaTps = scalar, F32, 1168 +extraFuel = scalar, F32, 1172, "", 1, 0 +valueFromTable = scalar, F32, 1176, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1180, [0:0] +isBelowDecelThreshold = bits, U32, 1180, [1:1] +isTimeToResetAccumulator = bits, U32, 1180, [2:2] +isFractionalEnrichment = bits, U32, 1180, [3:3] +belowEpsilon = bits, U32, 1180, [4:4] +tooShort = bits, U32, 1180, [5:5] +fractionalInjFuel = scalar, F32, 1184, "", 1, 0 +accumulatedValue = scalar, F32, 1188, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1192, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1196, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1200, "", 1, 0 +cycleCnt = scalar, S32, 1204, "", 1, 0 +; total TS size = 1208 +hwEventCounters1 = scalar, U32, 1208, "", 1, 0 +hwEventCounters2 = scalar, U32, 1212, "", 1, 0 +hwEventCounters3 = scalar, U32, 1216, "", 1, 0 +hwEventCounters4 = scalar, U32, 1220, "", 1, 0 +hwEventCounters5 = scalar, U32, 1224, "", 1, 0 +hwEventCounters6 = scalar, U32, 1228, "", 1, 0 +vvtCamCounter = scalar, U32, 1232, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1236, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1240, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1244, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1245, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1248, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1252, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1256, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1260, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1264, [0:0] +; total TS size = 1268 +crankSynchronizationCounter0 = scalar, U32, 1268, "", 1, 0 +vvtSyncGapRatio0 = scalar, F32, 1272, "", 1, 0 +vvtToothDurations00 = scalar, U32, 1276, "us", 1, 0 +vvtCurrentPosition0 = scalar, F32, 1280, "sync: Primary Cam Position", 1, 0 +vvtToothPosition10 = scalar, F32, 1284, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition20 = scalar, F32, 1288, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition30 = scalar, F32, 1292, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition40 = scalar, F32, 1296, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio0 = scalar, F32, 1300, "", 1, 0 +triggerStateIndex0 = scalar, U08, 1304, "", 1, 0 +vvtStateIndex0 = scalar, U08, 1305, "", 1, 0 +; total TS size = 1308 +camResyncCounter = scalar, U08, 1308, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1312, [0:0] +; total TS size = 1316 +wallFuelCorrection = scalar, F32, 1316, "", 1, 0 +wallFuel = scalar, F32, 1320, "", 1, 0 +; total TS size = 1324 +idleState = bits, S32, 1324, [0:2], "not important" +currentIdlePosition = scalar, F32, 1328 +baseIdlePosition = scalar, F32, 1332 +idleClosedLoop = scalar, F32, 1336 +iacByTpsTaper = scalar, F32, 1340 +throttlePedalUpState = scalar, S32, 1344, "", 1, 0 +mightResetPid = bits, U32, 1348, [0:0] +shouldResetPid = bits, U32, 1348, [1:1] +wasResetPid = bits, U32, 1348, [2:2] +mustResetPid = bits, U32, 1348, [3:3] +isCranking = bits, U32, 1348, [4:4] +isIacTableForCoasting = bits, U32, 1348, [5:5] +notIdling = bits, U32, 1348, [6:6] +needReset = bits, U32, 1348, [7:7] +isInDeadZone = bits, U32, 1348, [8:8] +isBlipping = bits, U32, 1348, [9:9] +useClosedLoop = bits, U32, 1348, [10:10] +badTps = bits, U32, 1348, [11:11] +looksLikeRunning = bits, U32, 1348, [12:12] +looksLikeCoasting = bits, U32, 1348, [13:13] +looksLikeCrankToIdle = bits, U32, 1348, [14:14] +isIdleCoasting = bits, U32, 1348, [15:15] +isIdleClosedLoop = bits, U32, 1348, [16:16] +idleTarget = scalar, S32, 1352, "", 1, 0 +targetRpmByClt = scalar, S32, 1356, "", 1, 0 +targetRpmAc = scalar, S32, 1360, "", 1, 0 +iacByRpmTaper = scalar, F32, 1364 +luaAdd = scalar, F32, 1368 +; total TS size = 1372 +idlePosition0 = scalar, F32, 1372, "per", 1,0 +trim0 = scalar, F32, 1376, "", 1, 0 +luaAdjustment0 = scalar, F32, 1380, "per", 1,0 +m_wastegatePosition0 = scalar, F32, 1384, "per", 1,0 +etbFeedForward0 = scalar, F32, 1388 +etbIntegralError0 = scalar, F32, 1392, "", 1, 0 +etbCurrentTarget0 = scalar, F32, 1396, "%", 1, 0 +etbCurrentAdjustedTarget0 = scalar, F32, 1400, "%", 1, 0 +etbRevLimitActive0 = bits, U32, 1404, [0:0] +jamDetected0 = bits, U32, 1404, [1:1] +etbDutyRateOfChange0 = scalar, F32, 1408, "per", 1,0 +etbDutyAverage0 = scalar, F32, 1412, "per", 1,0 +etbTpsErrorCounter0 = scalar, U16, 1416, "count", 1,0 +etbPpsErrorCounter0 = scalar, U16, 1418, "count", 1,0 +etbErrorCode0 = scalar, S08, 1420, "", 1, 0 +tcEtbDrop0 = scalar, S08, 1421, "", 1, 0 +jamTimer0 = scalar, U16, 1422, "sec", 0.01, 0 ; total TS size = 1424 -dcOutput0 = scalar, F32, 1424, "per", 1,0 -isEnabled0_int = scalar, U08, 1428, "per", 1,0 -isEnabled0 = bits, U32, 1432, [0:0] +faultCode0 = scalar, U08, 1424, "", 1, 0 +heaterDuty0 = scalar, U08, 1425, "%", 1, 0 +pumpDuty0 = scalar, U08, 1426, "%", 1, 0 +tempC0 = scalar, U16, 1428, "C", 1, 0 +nernstVoltage0 = scalar, U16, 1430, "V", 0.001, 0 +esr0 = scalar, U16, 1432, "ohm", 1, 0 ; total TS size = 1436 -value0 = scalar, U16, 1436, "value", 1,0 -value1 = scalar, U16, 1438, "value", 1,0 -errorRate = scalar, F32, 1440, "ratio", 1,0 -; total TS size = 1444 -vvtTarget = scalar, U16, 1444, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1446, "%", 0.5, 0 +dcOutput0 = scalar, F32, 1436, "per", 1,0 +isEnabled0_int = scalar, U08, 1440, "per", 1,0 +isEnabled0 = bits, U32, 1444, [0:0] ; total TS size = 1448 -lambdaCurrentlyGood = bits, U32, 1448, [0:0] -lambdaMonitorCut = bits, U32, 1448, [1:1] -lambdaTimeSinceGood = scalar, U16, 1452, "sec", 0.01, 0 +value0 = scalar, U16, 1448, "value", 1,0 +value1 = scalar, U16, 1450, "value", 1,0 +errorRate = scalar, F32, 1452, "ratio", 1,0 ; total TS size = 1456 +vvtTarget = scalar, U16, 1456, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1458, "%", 0.5, 0 +; total TS size = 1460 +lambdaCurrentlyGood = bits, U32, 1460, [0:0] +lambdaMonitorCut = bits, U32, 1460, [1:1] +lambdaTimeSinceGood = scalar, U16, 1464, "sec", 0.01, 0 +; total TS size = 1468 time = { timeNow } @@ -5401,7 +5404,6 @@ entry = smartChipState, "smartChipState", int, "%d" entry = smartChipRestartCounter, "smartChipRestartCounter", int, "%d" entry = smartChipAliveCounter, "smartChipAliveCounter", int, "%d" entry = startStopPhysicalState, "startStopPhysicalState", int, "%d" -entry = acrStateDup, "acrStateDup", int, "%d" entry = acrEngineMovedRecently, "acrEngineMovedRecently", int, "%d" entry = heaterControlEnabled, "heaterControlEnabled", int, "%d" entry = luaDigitalState0, "luaDigitalState0", int, "%d" @@ -5411,6 +5413,9 @@ entry = luaDigitalState3, "luaDigitalState3", int, "%d" entry = startStopStateToggleCounter, "startStopStateToggleCounter", int, "%d" entry = egtValue1, "egtValue1", float, "%.3f" entry = egtValue2, "egtValue2", float, "%.3f" +entry = luaSoftSparkSkip, "luaSoftSparkSkip", float, "%.3f" +entry = luaHardSparkSkip, "luaHardSparkSkip", float, "%.3f" +entry = tractionControlSparkSkip, "tractionControlSparkSkip", float, "%.3f" entry = desiredRpmLimit, "User-defined RPM hard limit", int, "%d" entry = fuelInjectionCounter, "Fuel: Injection counter", int, "%d" entry = globalSparkCounter, "Ign: Spark counter", int, "%d" @@ -5912,7 +5917,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 @@ -6360,7 +6365,6 @@ indicatorPanel = engine_stateIndicatorPanel, 2 indicator = {lua_luaDisableEtb}, "luaDisableEtb No", "luaDisableEtb Yes" indicator = {lua_luaIgnCut}, "luaIgnCut No", "luaIgnCut Yes" indicator = {startStopPhysicalState}, "startStopPhysicalState No", "startStopPhysicalState Yes" - indicator = {acrStateDup}, "acrStateDup No", "acrStateDup Yes" indicator = {acrEngineMovedRecently}, "acrEngineMovedRecently No", "acrEngineMovedRecently Yes" indicator = {heaterControlEnabled}, "heaterControlEnabled No", "heaterControlEnabled Yes" indicator = {luaDigitalState0}, "luaDigitalState0 No", "luaDigitalState0 Yes" @@ -6396,12 +6400,16 @@ dialog = engine_stateDialog, "engine_state" graphLine = egtValue1 graphLine = egtValue2 liveGraph = engine_state_6_Graph, "Graph", South + graphLine = luaSoftSparkSkip + graphLine = luaHardSparkSkip + graphLine = tractionControlSparkSkip graphLine = desiredRpmLimit + liveGraph = engine_state_7_Graph, "Graph", South graphLine = fuelInjectionCounter graphLine = globalSparkCounter graphLine = fuelingLoad - liveGraph = engine_state_7_Graph, "Graph", South graphLine = ignitionLoad + liveGraph = engine_state_8_Graph, "Graph", South graphLine = veTableYAxis indicatorPanel = tps_accel_stateIndicatorPanel, 2 @@ -7308,6 +7316,10 @@ dialog = lambda_monitorDialog, "lambda_monitor" 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 diff --git a/firmware/tunerstudio/generated/rusefi_stm32f767_nucleo.ini b/firmware/tunerstudio/generated/rusefi_stm32f767_nucleo.ini index 5276051543..73031fec8e 100644 --- a/firmware/tunerstudio/generated/rusefi_stm32f767_nucleo.ini +++ b/firmware/tunerstudio/generated/rusefi_stm32f767_nucleo.ini @@ -37,12 +37,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.03.05.stm32f767_nucleo.1352820405" + signature = "rusEFI master.2024.03.05.stm32f767_nucleo.523818637" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.03.05.stm32f767_nucleo.1352820405" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.03.05.stm32f767_nucleo.523818637" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -98,7 +98,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="Disabled", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PB0", "PB1", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue Mar 05 00:53:05 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue Mar 05 01:57:09 UTC 2024 pageSize = 22236 page = 1 @@ -745,6 +745,7 @@ mc33810Gpgd3Mode = bits, U32, 1576, [4:4], "false", "true" enableExtendedCanBroadcast = bits, U32, 1576, [5:5], "false", "true" luaCanRxWorkaround = bits, U32, 1576, [6:6], "false", "true" flexSensorInverted = bits, U32, 1576, [7:7], "false", "true" +useHardSkipInTraction = bits, U32, 1576, [8:8], "false", "true" useAuxSpeedForSlipRatio = bits, U32, 1576, [11:11], "false", "true" useVssAsSecondWheelSpeed = bits, U32, 1576, [12:12], "false", "true" is_enabled_spi_5 = bits, U32, 1576, [13:13], "false", "true" @@ -2468,7 +2469,7 @@ injectorStagingRpmBins = array, U16, 22222, [6], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1456 + ochBlockSize = 1468 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3131,145 +3132,147 @@ smartChipState = scalar, S08, 1102, "", 1, 0 smartChipRestartCounter = scalar, S08, 1103, "", 1, 0 smartChipAliveCounter = scalar, S08, 1104, "", 1, 0 startStopPhysicalState = bits, U32, 1108, [0:0] -acrStateDup = bits, U32, 1108, [1:1] -acrEngineMovedRecently = bits, U32, 1108, [2:2] -heaterControlEnabled = bits, U32, 1108, [3:3] -luaDigitalState0 = bits, U32, 1108, [4:4] -luaDigitalState1 = bits, U32, 1108, [5:5] -luaDigitalState2 = bits, U32, 1108, [6:6] -luaDigitalState3 = bits, U32, 1108, [7:7] +acrEngineMovedRecently = bits, U32, 1108, [1:1] +heaterControlEnabled = bits, U32, 1108, [2:2] +luaDigitalState0 = bits, U32, 1108, [3:3] +luaDigitalState1 = bits, U32, 1108, [4:4] +luaDigitalState2 = bits, U32, 1108, [5:5] +luaDigitalState3 = bits, U32, 1108, [6:6] startStopStateToggleCounter = scalar, U32, 1112, "", 1, 0 egtValue1 = scalar, F32, 1116, "", 1, 0 egtValue2 = scalar, F32, 1120, "", 1, 0 -desiredRpmLimit = scalar, S16, 1124, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1128, "", 1, 0 -globalSparkCounter = scalar, U32, 1132, "", 1, 0 -fuelingLoad = scalar, F32, 1136, "", 1, 0 -ignitionLoad = scalar, F32, 1140, "", 1, 0 -veTableYAxis = scalar, U16, 1144, "%", 0.01, 0 -; total TS size = 1148 -tpsFrom = scalar, F32, 1148 -tpsTo = scalar, F32, 1152 -deltaTps = scalar, F32, 1156 -extraFuel = scalar, F32, 1160, "", 1, 0 -valueFromTable = scalar, F32, 1164, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1168, [0:0] -isBelowDecelThreshold = bits, U32, 1168, [1:1] -isTimeToResetAccumulator = bits, U32, 1168, [2:2] -isFractionalEnrichment = bits, U32, 1168, [3:3] -belowEpsilon = bits, U32, 1168, [4:4] -tooShort = bits, U32, 1168, [5:5] -fractionalInjFuel = scalar, F32, 1172, "", 1, 0 -accumulatedValue = scalar, F32, 1176, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1180, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1184, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1188, "", 1, 0 -cycleCnt = scalar, S32, 1192, "", 1, 0 -; total TS size = 1196 -hwEventCounters1 = scalar, U32, 1196, "", 1, 0 -hwEventCounters2 = scalar, U32, 1200, "", 1, 0 -hwEventCounters3 = scalar, U32, 1204, "", 1, 0 -hwEventCounters4 = scalar, U32, 1208, "", 1, 0 -hwEventCounters5 = scalar, U32, 1212, "", 1, 0 -hwEventCounters6 = scalar, U32, 1216, "", 1, 0 -vvtCamCounter = scalar, U32, 1220, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1224, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1228, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1232, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1233, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1236, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1240, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1244, "", 1, 0 -mapCamPrevToothAngle = scalar, F32, 1248, "deg", 1, 0 -isDecodingMapCam = bits, U32, 1252, [0:0] -; total TS size = 1256 -crankSynchronizationCounter0 = scalar, U32, 1256, "", 1, 0 -vvtSyncGapRatio0 = scalar, F32, 1260, "", 1, 0 -vvtToothDurations00 = scalar, U32, 1264, "us", 1, 0 -vvtCurrentPosition0 = scalar, F32, 1268, "sync: Primary Cam Position", 1, 0 -vvtToothPosition10 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition20 = scalar, F32, 1276, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition30 = scalar, F32, 1280, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition40 = scalar, F32, 1284, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio0 = scalar, F32, 1288, "", 1, 0 -triggerStateIndex0 = scalar, U08, 1292, "", 1, 0 -vvtStateIndex0 = scalar, U08, 1293, "", 1, 0 -; total TS size = 1296 -camResyncCounter = scalar, U08, 1296, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1300, [0:0] -; total TS size = 1304 -wallFuelCorrection = scalar, F32, 1304, "", 1, 0 -wallFuel = scalar, F32, 1308, "", 1, 0 -; total TS size = 1312 -idleState = bits, S32, 1312, [0:2], "not important" -currentIdlePosition = scalar, F32, 1316 -baseIdlePosition = scalar, F32, 1320 -idleClosedLoop = scalar, F32, 1324 -iacByTpsTaper = scalar, F32, 1328 -throttlePedalUpState = scalar, S32, 1332, "", 1, 0 -mightResetPid = bits, U32, 1336, [0:0] -shouldResetPid = bits, U32, 1336, [1:1] -wasResetPid = bits, U32, 1336, [2:2] -mustResetPid = bits, U32, 1336, [3:3] -isCranking = bits, U32, 1336, [4:4] -isIacTableForCoasting = bits, U32, 1336, [5:5] -notIdling = bits, U32, 1336, [6:6] -needReset = bits, U32, 1336, [7:7] -isInDeadZone = bits, U32, 1336, [8:8] -isBlipping = bits, U32, 1336, [9:9] -useClosedLoop = bits, U32, 1336, [10:10] -badTps = bits, U32, 1336, [11:11] -looksLikeRunning = bits, U32, 1336, [12:12] -looksLikeCoasting = bits, U32, 1336, [13:13] -looksLikeCrankToIdle = bits, U32, 1336, [14:14] -isIdleCoasting = bits, U32, 1336, [15:15] -isIdleClosedLoop = bits, U32, 1336, [16:16] -idleTarget = scalar, S32, 1340, "", 1, 0 -targetRpmByClt = scalar, S32, 1344, "", 1, 0 -targetRpmAc = scalar, S32, 1348, "", 1, 0 -iacByRpmTaper = scalar, F32, 1352 -luaAdd = scalar, F32, 1356 -; total TS size = 1360 -idlePosition0 = scalar, F32, 1360, "per", 1,0 -trim0 = scalar, F32, 1364, "", 1, 0 -luaAdjustment0 = scalar, F32, 1368, "per", 1,0 -m_wastegatePosition0 = scalar, F32, 1372, "per", 1,0 -etbFeedForward0 = scalar, F32, 1376 -etbIntegralError0 = scalar, F32, 1380, "", 1, 0 -etbCurrentTarget0 = scalar, F32, 1384, "%", 1, 0 -etbCurrentAdjustedTarget0 = scalar, F32, 1388, "%", 1, 0 -etbRevLimitActive0 = bits, U32, 1392, [0:0] -jamDetected0 = bits, U32, 1392, [1:1] -etbDutyRateOfChange0 = scalar, F32, 1396, "per", 1,0 -etbDutyAverage0 = scalar, F32, 1400, "per", 1,0 -etbTpsErrorCounter0 = scalar, U16, 1404, "count", 1,0 -etbPpsErrorCounter0 = scalar, U16, 1406, "count", 1,0 -etbErrorCode0 = scalar, S08, 1408, "", 1, 0 -tcEtbDrop0 = scalar, S08, 1409, "", 1, 0 -jamTimer0 = scalar, U16, 1410, "sec", 0.01, 0 -; total TS size = 1412 -faultCode0 = scalar, U08, 1412, "", 1, 0 -heaterDuty0 = scalar, U08, 1413, "%", 1, 0 -pumpDuty0 = scalar, U08, 1414, "%", 1, 0 -tempC0 = scalar, U16, 1416, "C", 1, 0 -nernstVoltage0 = scalar, U16, 1418, "V", 0.001, 0 -esr0 = scalar, U16, 1420, "ohm", 1, 0 +luaSoftSparkSkip = scalar, F32, 1124, "", 1, 0 +luaHardSparkSkip = scalar, F32, 1128, "", 1, 0 +tractionControlSparkSkip = scalar, F32, 1132, "", 1, 0 +desiredRpmLimit = scalar, S16, 1136, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 1140, "", 1, 0 +globalSparkCounter = scalar, U32, 1144, "", 1, 0 +fuelingLoad = scalar, F32, 1148, "", 1, 0 +ignitionLoad = scalar, F32, 1152, "", 1, 0 +veTableYAxis = scalar, U16, 1156, "%", 0.01, 0 +; total TS size = 1160 +tpsFrom = scalar, F32, 1160 +tpsTo = scalar, F32, 1164 +deltaTps = scalar, F32, 1168 +extraFuel = scalar, F32, 1172, "", 1, 0 +valueFromTable = scalar, F32, 1176, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1180, [0:0] +isBelowDecelThreshold = bits, U32, 1180, [1:1] +isTimeToResetAccumulator = bits, U32, 1180, [2:2] +isFractionalEnrichment = bits, U32, 1180, [3:3] +belowEpsilon = bits, U32, 1180, [4:4] +tooShort = bits, U32, 1180, [5:5] +fractionalInjFuel = scalar, F32, 1184, "", 1, 0 +accumulatedValue = scalar, F32, 1188, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1192, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1196, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1200, "", 1, 0 +cycleCnt = scalar, S32, 1204, "", 1, 0 +; total TS size = 1208 +hwEventCounters1 = scalar, U32, 1208, "", 1, 0 +hwEventCounters2 = scalar, U32, 1212, "", 1, 0 +hwEventCounters3 = scalar, U32, 1216, "", 1, 0 +hwEventCounters4 = scalar, U32, 1220, "", 1, 0 +hwEventCounters5 = scalar, U32, 1224, "", 1, 0 +hwEventCounters6 = scalar, U32, 1228, "", 1, 0 +vvtCamCounter = scalar, U32, 1232, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1236, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1240, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1244, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1245, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1248, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1252, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1256, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1260, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1264, [0:0] +; total TS size = 1268 +crankSynchronizationCounter0 = scalar, U32, 1268, "", 1, 0 +vvtSyncGapRatio0 = scalar, F32, 1272, "", 1, 0 +vvtToothDurations00 = scalar, U32, 1276, "us", 1, 0 +vvtCurrentPosition0 = scalar, F32, 1280, "sync: Primary Cam Position", 1, 0 +vvtToothPosition10 = scalar, F32, 1284, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition20 = scalar, F32, 1288, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition30 = scalar, F32, 1292, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition40 = scalar, F32, 1296, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio0 = scalar, F32, 1300, "", 1, 0 +triggerStateIndex0 = scalar, U08, 1304, "", 1, 0 +vvtStateIndex0 = scalar, U08, 1305, "", 1, 0 +; total TS size = 1308 +camResyncCounter = scalar, U08, 1308, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1312, [0:0] +; total TS size = 1316 +wallFuelCorrection = scalar, F32, 1316, "", 1, 0 +wallFuel = scalar, F32, 1320, "", 1, 0 +; total TS size = 1324 +idleState = bits, S32, 1324, [0:2], "not important" +currentIdlePosition = scalar, F32, 1328 +baseIdlePosition = scalar, F32, 1332 +idleClosedLoop = scalar, F32, 1336 +iacByTpsTaper = scalar, F32, 1340 +throttlePedalUpState = scalar, S32, 1344, "", 1, 0 +mightResetPid = bits, U32, 1348, [0:0] +shouldResetPid = bits, U32, 1348, [1:1] +wasResetPid = bits, U32, 1348, [2:2] +mustResetPid = bits, U32, 1348, [3:3] +isCranking = bits, U32, 1348, [4:4] +isIacTableForCoasting = bits, U32, 1348, [5:5] +notIdling = bits, U32, 1348, [6:6] +needReset = bits, U32, 1348, [7:7] +isInDeadZone = bits, U32, 1348, [8:8] +isBlipping = bits, U32, 1348, [9:9] +useClosedLoop = bits, U32, 1348, [10:10] +badTps = bits, U32, 1348, [11:11] +looksLikeRunning = bits, U32, 1348, [12:12] +looksLikeCoasting = bits, U32, 1348, [13:13] +looksLikeCrankToIdle = bits, U32, 1348, [14:14] +isIdleCoasting = bits, U32, 1348, [15:15] +isIdleClosedLoop = bits, U32, 1348, [16:16] +idleTarget = scalar, S32, 1352, "", 1, 0 +targetRpmByClt = scalar, S32, 1356, "", 1, 0 +targetRpmAc = scalar, S32, 1360, "", 1, 0 +iacByRpmTaper = scalar, F32, 1364 +luaAdd = scalar, F32, 1368 +; total TS size = 1372 +idlePosition0 = scalar, F32, 1372, "per", 1,0 +trim0 = scalar, F32, 1376, "", 1, 0 +luaAdjustment0 = scalar, F32, 1380, "per", 1,0 +m_wastegatePosition0 = scalar, F32, 1384, "per", 1,0 +etbFeedForward0 = scalar, F32, 1388 +etbIntegralError0 = scalar, F32, 1392, "", 1, 0 +etbCurrentTarget0 = scalar, F32, 1396, "%", 1, 0 +etbCurrentAdjustedTarget0 = scalar, F32, 1400, "%", 1, 0 +etbRevLimitActive0 = bits, U32, 1404, [0:0] +jamDetected0 = bits, U32, 1404, [1:1] +etbDutyRateOfChange0 = scalar, F32, 1408, "per", 1,0 +etbDutyAverage0 = scalar, F32, 1412, "per", 1,0 +etbTpsErrorCounter0 = scalar, U16, 1416, "count", 1,0 +etbPpsErrorCounter0 = scalar, U16, 1418, "count", 1,0 +etbErrorCode0 = scalar, S08, 1420, "", 1, 0 +tcEtbDrop0 = scalar, S08, 1421, "", 1, 0 +jamTimer0 = scalar, U16, 1422, "sec", 0.01, 0 ; total TS size = 1424 -dcOutput0 = scalar, F32, 1424, "per", 1,0 -isEnabled0_int = scalar, U08, 1428, "per", 1,0 -isEnabled0 = bits, U32, 1432, [0:0] +faultCode0 = scalar, U08, 1424, "", 1, 0 +heaterDuty0 = scalar, U08, 1425, "%", 1, 0 +pumpDuty0 = scalar, U08, 1426, "%", 1, 0 +tempC0 = scalar, U16, 1428, "C", 1, 0 +nernstVoltage0 = scalar, U16, 1430, "V", 0.001, 0 +esr0 = scalar, U16, 1432, "ohm", 1, 0 ; total TS size = 1436 -value0 = scalar, U16, 1436, "value", 1,0 -value1 = scalar, U16, 1438, "value", 1,0 -errorRate = scalar, F32, 1440, "ratio", 1,0 -; total TS size = 1444 -vvtTarget = scalar, U16, 1444, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1446, "%", 0.5, 0 +dcOutput0 = scalar, F32, 1436, "per", 1,0 +isEnabled0_int = scalar, U08, 1440, "per", 1,0 +isEnabled0 = bits, U32, 1444, [0:0] ; total TS size = 1448 -lambdaCurrentlyGood = bits, U32, 1448, [0:0] -lambdaMonitorCut = bits, U32, 1448, [1:1] -lambdaTimeSinceGood = scalar, U16, 1452, "sec", 0.01, 0 +value0 = scalar, U16, 1448, "value", 1,0 +value1 = scalar, U16, 1450, "value", 1,0 +errorRate = scalar, F32, 1452, "ratio", 1,0 ; total TS size = 1456 +vvtTarget = scalar, U16, 1456, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1458, "%", 0.5, 0 +; total TS size = 1460 +lambdaCurrentlyGood = bits, U32, 1460, [0:0] +lambdaMonitorCut = bits, U32, 1460, [1:1] +lambdaTimeSinceGood = scalar, U16, 1464, "sec", 0.01, 0 +; total TS size = 1468 time = { timeNow } @@ -5401,7 +5404,6 @@ entry = smartChipState, "smartChipState", int, "%d" entry = smartChipRestartCounter, "smartChipRestartCounter", int, "%d" entry = smartChipAliveCounter, "smartChipAliveCounter", int, "%d" entry = startStopPhysicalState, "startStopPhysicalState", int, "%d" -entry = acrStateDup, "acrStateDup", int, "%d" entry = acrEngineMovedRecently, "acrEngineMovedRecently", int, "%d" entry = heaterControlEnabled, "heaterControlEnabled", int, "%d" entry = luaDigitalState0, "luaDigitalState0", int, "%d" @@ -5411,6 +5413,9 @@ entry = luaDigitalState3, "luaDigitalState3", int, "%d" entry = startStopStateToggleCounter, "startStopStateToggleCounter", int, "%d" entry = egtValue1, "egtValue1", float, "%.3f" entry = egtValue2, "egtValue2", float, "%.3f" +entry = luaSoftSparkSkip, "luaSoftSparkSkip", float, "%.3f" +entry = luaHardSparkSkip, "luaHardSparkSkip", float, "%.3f" +entry = tractionControlSparkSkip, "tractionControlSparkSkip", float, "%.3f" entry = desiredRpmLimit, "User-defined RPM hard limit", int, "%d" entry = fuelInjectionCounter, "Fuel: Injection counter", int, "%d" entry = globalSparkCounter, "Ign: Spark counter", int, "%d" @@ -5912,7 +5917,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 @@ -6360,7 +6365,6 @@ indicatorPanel = engine_stateIndicatorPanel, 2 indicator = {lua_luaDisableEtb}, "luaDisableEtb No", "luaDisableEtb Yes" indicator = {lua_luaIgnCut}, "luaIgnCut No", "luaIgnCut Yes" indicator = {startStopPhysicalState}, "startStopPhysicalState No", "startStopPhysicalState Yes" - indicator = {acrStateDup}, "acrStateDup No", "acrStateDup Yes" indicator = {acrEngineMovedRecently}, "acrEngineMovedRecently No", "acrEngineMovedRecently Yes" indicator = {heaterControlEnabled}, "heaterControlEnabled No", "heaterControlEnabled Yes" indicator = {luaDigitalState0}, "luaDigitalState0 No", "luaDigitalState0 Yes" @@ -6396,12 +6400,16 @@ dialog = engine_stateDialog, "engine_state" graphLine = egtValue1 graphLine = egtValue2 liveGraph = engine_state_6_Graph, "Graph", South + graphLine = luaSoftSparkSkip + graphLine = luaHardSparkSkip + graphLine = tractionControlSparkSkip graphLine = desiredRpmLimit + liveGraph = engine_state_7_Graph, "Graph", South graphLine = fuelInjectionCounter graphLine = globalSparkCounter graphLine = fuelingLoad - liveGraph = engine_state_7_Graph, "Graph", South graphLine = ignitionLoad + liveGraph = engine_state_8_Graph, "Graph", South graphLine = veTableYAxis indicatorPanel = tps_accel_stateIndicatorPanel, 2 @@ -7308,6 +7316,10 @@ dialog = lambda_monitorDialog, "lambda_monitor" 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 diff --git a/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini b/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini index 900b55ed07..7ff93f2e85 100644 --- a/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini @@ -37,12 +37,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.03.05.subaru_eg33_f7.3812913245" + signature = "rusEFI master.2024.03.05.subaru_eg33_f7.2900279397" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.03.05.subaru_eg33_f7.3812913245" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.03.05.subaru_eg33_f7.2900279397" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -98,7 +98,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","AUX0_18 - MAP Ain","INVALID","INVALID","B05 - MAF Ain","INVALID","AUX0_19 - IAT Ain","A02 - VBat","INVALID","A06 - Oxyg 2 Ain","A04 - EGR t Ain","INVALID","A18 - AUX0 Ain","B02 - TPS Ain","INVALID","A03 - Coolant t Ain","A06 - Oxyg 1 Ain" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue Mar 05 00:52:14 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue Mar 05 01:56:19 UTC 2024 pageSize = 22236 page = 1 @@ -745,6 +745,7 @@ mc33810Gpgd3Mode = bits, U32, 1576, [4:4], "false", "true" enableExtendedCanBroadcast = bits, U32, 1576, [5:5], "false", "true" luaCanRxWorkaround = bits, U32, 1576, [6:6], "false", "true" flexSensorInverted = bits, U32, 1576, [7:7], "false", "true" +useHardSkipInTraction = bits, U32, 1576, [8:8], "false", "true" useAuxSpeedForSlipRatio = bits, U32, 1576, [11:11], "false", "true" useVssAsSecondWheelSpeed = bits, U32, 1576, [12:12], "false", "true" is_enabled_spi_5 = bits, U32, 1576, [13:13], "false", "true" @@ -2468,7 +2469,7 @@ injectorStagingRpmBins = array, U16, 22222, [6], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1456 + ochBlockSize = 1468 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3131,145 +3132,147 @@ smartChipState = scalar, S08, 1102, "", 1, 0 smartChipRestartCounter = scalar, S08, 1103, "", 1, 0 smartChipAliveCounter = scalar, S08, 1104, "", 1, 0 startStopPhysicalState = bits, U32, 1108, [0:0] -acrStateDup = bits, U32, 1108, [1:1] -acrEngineMovedRecently = bits, U32, 1108, [2:2] -heaterControlEnabled = bits, U32, 1108, [3:3] -luaDigitalState0 = bits, U32, 1108, [4:4] -luaDigitalState1 = bits, U32, 1108, [5:5] -luaDigitalState2 = bits, U32, 1108, [6:6] -luaDigitalState3 = bits, U32, 1108, [7:7] +acrEngineMovedRecently = bits, U32, 1108, [1:1] +heaterControlEnabled = bits, U32, 1108, [2:2] +luaDigitalState0 = bits, U32, 1108, [3:3] +luaDigitalState1 = bits, U32, 1108, [4:4] +luaDigitalState2 = bits, U32, 1108, [5:5] +luaDigitalState3 = bits, U32, 1108, [6:6] startStopStateToggleCounter = scalar, U32, 1112, "", 1, 0 egtValue1 = scalar, F32, 1116, "", 1, 0 egtValue2 = scalar, F32, 1120, "", 1, 0 -desiredRpmLimit = scalar, S16, 1124, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1128, "", 1, 0 -globalSparkCounter = scalar, U32, 1132, "", 1, 0 -fuelingLoad = scalar, F32, 1136, "", 1, 0 -ignitionLoad = scalar, F32, 1140, "", 1, 0 -veTableYAxis = scalar, U16, 1144, "%", 0.01, 0 -; total TS size = 1148 -tpsFrom = scalar, F32, 1148 -tpsTo = scalar, F32, 1152 -deltaTps = scalar, F32, 1156 -extraFuel = scalar, F32, 1160, "", 1, 0 -valueFromTable = scalar, F32, 1164, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1168, [0:0] -isBelowDecelThreshold = bits, U32, 1168, [1:1] -isTimeToResetAccumulator = bits, U32, 1168, [2:2] -isFractionalEnrichment = bits, U32, 1168, [3:3] -belowEpsilon = bits, U32, 1168, [4:4] -tooShort = bits, U32, 1168, [5:5] -fractionalInjFuel = scalar, F32, 1172, "", 1, 0 -accumulatedValue = scalar, F32, 1176, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1180, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1184, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1188, "", 1, 0 -cycleCnt = scalar, S32, 1192, "", 1, 0 -; total TS size = 1196 -hwEventCounters1 = scalar, U32, 1196, "", 1, 0 -hwEventCounters2 = scalar, U32, 1200, "", 1, 0 -hwEventCounters3 = scalar, U32, 1204, "", 1, 0 -hwEventCounters4 = scalar, U32, 1208, "", 1, 0 -hwEventCounters5 = scalar, U32, 1212, "", 1, 0 -hwEventCounters6 = scalar, U32, 1216, "", 1, 0 -vvtCamCounter = scalar, U32, 1220, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1224, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1228, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1232, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1233, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1236, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1240, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1244, "", 1, 0 -mapCamPrevToothAngle = scalar, F32, 1248, "deg", 1, 0 -isDecodingMapCam = bits, U32, 1252, [0:0] -; total TS size = 1256 -crankSynchronizationCounter0 = scalar, U32, 1256, "", 1, 0 -vvtSyncGapRatio0 = scalar, F32, 1260, "", 1, 0 -vvtToothDurations00 = scalar, U32, 1264, "us", 1, 0 -vvtCurrentPosition0 = scalar, F32, 1268, "sync: Primary Cam Position", 1, 0 -vvtToothPosition10 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition20 = scalar, F32, 1276, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition30 = scalar, F32, 1280, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition40 = scalar, F32, 1284, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio0 = scalar, F32, 1288, "", 1, 0 -triggerStateIndex0 = scalar, U08, 1292, "", 1, 0 -vvtStateIndex0 = scalar, U08, 1293, "", 1, 0 -; total TS size = 1296 -camResyncCounter = scalar, U08, 1296, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1300, [0:0] -; total TS size = 1304 -wallFuelCorrection = scalar, F32, 1304, "", 1, 0 -wallFuel = scalar, F32, 1308, "", 1, 0 -; total TS size = 1312 -idleState = bits, S32, 1312, [0:2], "not important" -currentIdlePosition = scalar, F32, 1316 -baseIdlePosition = scalar, F32, 1320 -idleClosedLoop = scalar, F32, 1324 -iacByTpsTaper = scalar, F32, 1328 -throttlePedalUpState = scalar, S32, 1332, "", 1, 0 -mightResetPid = bits, U32, 1336, [0:0] -shouldResetPid = bits, U32, 1336, [1:1] -wasResetPid = bits, U32, 1336, [2:2] -mustResetPid = bits, U32, 1336, [3:3] -isCranking = bits, U32, 1336, [4:4] -isIacTableForCoasting = bits, U32, 1336, [5:5] -notIdling = bits, U32, 1336, [6:6] -needReset = bits, U32, 1336, [7:7] -isInDeadZone = bits, U32, 1336, [8:8] -isBlipping = bits, U32, 1336, [9:9] -useClosedLoop = bits, U32, 1336, [10:10] -badTps = bits, U32, 1336, [11:11] -looksLikeRunning = bits, U32, 1336, [12:12] -looksLikeCoasting = bits, U32, 1336, [13:13] -looksLikeCrankToIdle = bits, U32, 1336, [14:14] -isIdleCoasting = bits, U32, 1336, [15:15] -isIdleClosedLoop = bits, U32, 1336, [16:16] -idleTarget = scalar, S32, 1340, "", 1, 0 -targetRpmByClt = scalar, S32, 1344, "", 1, 0 -targetRpmAc = scalar, S32, 1348, "", 1, 0 -iacByRpmTaper = scalar, F32, 1352 -luaAdd = scalar, F32, 1356 -; total TS size = 1360 -idlePosition0 = scalar, F32, 1360, "per", 1,0 -trim0 = scalar, F32, 1364, "", 1, 0 -luaAdjustment0 = scalar, F32, 1368, "per", 1,0 -m_wastegatePosition0 = scalar, F32, 1372, "per", 1,0 -etbFeedForward0 = scalar, F32, 1376 -etbIntegralError0 = scalar, F32, 1380, "", 1, 0 -etbCurrentTarget0 = scalar, F32, 1384, "%", 1, 0 -etbCurrentAdjustedTarget0 = scalar, F32, 1388, "%", 1, 0 -etbRevLimitActive0 = bits, U32, 1392, [0:0] -jamDetected0 = bits, U32, 1392, [1:1] -etbDutyRateOfChange0 = scalar, F32, 1396, "per", 1,0 -etbDutyAverage0 = scalar, F32, 1400, "per", 1,0 -etbTpsErrorCounter0 = scalar, U16, 1404, "count", 1,0 -etbPpsErrorCounter0 = scalar, U16, 1406, "count", 1,0 -etbErrorCode0 = scalar, S08, 1408, "", 1, 0 -tcEtbDrop0 = scalar, S08, 1409, "", 1, 0 -jamTimer0 = scalar, U16, 1410, "sec", 0.01, 0 -; total TS size = 1412 -faultCode0 = scalar, U08, 1412, "", 1, 0 -heaterDuty0 = scalar, U08, 1413, "%", 1, 0 -pumpDuty0 = scalar, U08, 1414, "%", 1, 0 -tempC0 = scalar, U16, 1416, "C", 1, 0 -nernstVoltage0 = scalar, U16, 1418, "V", 0.001, 0 -esr0 = scalar, U16, 1420, "ohm", 1, 0 +luaSoftSparkSkip = scalar, F32, 1124, "", 1, 0 +luaHardSparkSkip = scalar, F32, 1128, "", 1, 0 +tractionControlSparkSkip = scalar, F32, 1132, "", 1, 0 +desiredRpmLimit = scalar, S16, 1136, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 1140, "", 1, 0 +globalSparkCounter = scalar, U32, 1144, "", 1, 0 +fuelingLoad = scalar, F32, 1148, "", 1, 0 +ignitionLoad = scalar, F32, 1152, "", 1, 0 +veTableYAxis = scalar, U16, 1156, "%", 0.01, 0 +; total TS size = 1160 +tpsFrom = scalar, F32, 1160 +tpsTo = scalar, F32, 1164 +deltaTps = scalar, F32, 1168 +extraFuel = scalar, F32, 1172, "", 1, 0 +valueFromTable = scalar, F32, 1176, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1180, [0:0] +isBelowDecelThreshold = bits, U32, 1180, [1:1] +isTimeToResetAccumulator = bits, U32, 1180, [2:2] +isFractionalEnrichment = bits, U32, 1180, [3:3] +belowEpsilon = bits, U32, 1180, [4:4] +tooShort = bits, U32, 1180, [5:5] +fractionalInjFuel = scalar, F32, 1184, "", 1, 0 +accumulatedValue = scalar, F32, 1188, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1192, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1196, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1200, "", 1, 0 +cycleCnt = scalar, S32, 1204, "", 1, 0 +; total TS size = 1208 +hwEventCounters1 = scalar, U32, 1208, "", 1, 0 +hwEventCounters2 = scalar, U32, 1212, "", 1, 0 +hwEventCounters3 = scalar, U32, 1216, "", 1, 0 +hwEventCounters4 = scalar, U32, 1220, "", 1, 0 +hwEventCounters5 = scalar, U32, 1224, "", 1, 0 +hwEventCounters6 = scalar, U32, 1228, "", 1, 0 +vvtCamCounter = scalar, U32, 1232, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1236, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1240, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1244, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1245, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1248, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1252, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1256, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1260, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1264, [0:0] +; total TS size = 1268 +crankSynchronizationCounter0 = scalar, U32, 1268, "", 1, 0 +vvtSyncGapRatio0 = scalar, F32, 1272, "", 1, 0 +vvtToothDurations00 = scalar, U32, 1276, "us", 1, 0 +vvtCurrentPosition0 = scalar, F32, 1280, "sync: Primary Cam Position", 1, 0 +vvtToothPosition10 = scalar, F32, 1284, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition20 = scalar, F32, 1288, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition30 = scalar, F32, 1292, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition40 = scalar, F32, 1296, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio0 = scalar, F32, 1300, "", 1, 0 +triggerStateIndex0 = scalar, U08, 1304, "", 1, 0 +vvtStateIndex0 = scalar, U08, 1305, "", 1, 0 +; total TS size = 1308 +camResyncCounter = scalar, U08, 1308, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1312, [0:0] +; total TS size = 1316 +wallFuelCorrection = scalar, F32, 1316, "", 1, 0 +wallFuel = scalar, F32, 1320, "", 1, 0 +; total TS size = 1324 +idleState = bits, S32, 1324, [0:2], "not important" +currentIdlePosition = scalar, F32, 1328 +baseIdlePosition = scalar, F32, 1332 +idleClosedLoop = scalar, F32, 1336 +iacByTpsTaper = scalar, F32, 1340 +throttlePedalUpState = scalar, S32, 1344, "", 1, 0 +mightResetPid = bits, U32, 1348, [0:0] +shouldResetPid = bits, U32, 1348, [1:1] +wasResetPid = bits, U32, 1348, [2:2] +mustResetPid = bits, U32, 1348, [3:3] +isCranking = bits, U32, 1348, [4:4] +isIacTableForCoasting = bits, U32, 1348, [5:5] +notIdling = bits, U32, 1348, [6:6] +needReset = bits, U32, 1348, [7:7] +isInDeadZone = bits, U32, 1348, [8:8] +isBlipping = bits, U32, 1348, [9:9] +useClosedLoop = bits, U32, 1348, [10:10] +badTps = bits, U32, 1348, [11:11] +looksLikeRunning = bits, U32, 1348, [12:12] +looksLikeCoasting = bits, U32, 1348, [13:13] +looksLikeCrankToIdle = bits, U32, 1348, [14:14] +isIdleCoasting = bits, U32, 1348, [15:15] +isIdleClosedLoop = bits, U32, 1348, [16:16] +idleTarget = scalar, S32, 1352, "", 1, 0 +targetRpmByClt = scalar, S32, 1356, "", 1, 0 +targetRpmAc = scalar, S32, 1360, "", 1, 0 +iacByRpmTaper = scalar, F32, 1364 +luaAdd = scalar, F32, 1368 +; total TS size = 1372 +idlePosition0 = scalar, F32, 1372, "per", 1,0 +trim0 = scalar, F32, 1376, "", 1, 0 +luaAdjustment0 = scalar, F32, 1380, "per", 1,0 +m_wastegatePosition0 = scalar, F32, 1384, "per", 1,0 +etbFeedForward0 = scalar, F32, 1388 +etbIntegralError0 = scalar, F32, 1392, "", 1, 0 +etbCurrentTarget0 = scalar, F32, 1396, "%", 1, 0 +etbCurrentAdjustedTarget0 = scalar, F32, 1400, "%", 1, 0 +etbRevLimitActive0 = bits, U32, 1404, [0:0] +jamDetected0 = bits, U32, 1404, [1:1] +etbDutyRateOfChange0 = scalar, F32, 1408, "per", 1,0 +etbDutyAverage0 = scalar, F32, 1412, "per", 1,0 +etbTpsErrorCounter0 = scalar, U16, 1416, "count", 1,0 +etbPpsErrorCounter0 = scalar, U16, 1418, "count", 1,0 +etbErrorCode0 = scalar, S08, 1420, "", 1, 0 +tcEtbDrop0 = scalar, S08, 1421, "", 1, 0 +jamTimer0 = scalar, U16, 1422, "sec", 0.01, 0 ; total TS size = 1424 -dcOutput0 = scalar, F32, 1424, "per", 1,0 -isEnabled0_int = scalar, U08, 1428, "per", 1,0 -isEnabled0 = bits, U32, 1432, [0:0] +faultCode0 = scalar, U08, 1424, "", 1, 0 +heaterDuty0 = scalar, U08, 1425, "%", 1, 0 +pumpDuty0 = scalar, U08, 1426, "%", 1, 0 +tempC0 = scalar, U16, 1428, "C", 1, 0 +nernstVoltage0 = scalar, U16, 1430, "V", 0.001, 0 +esr0 = scalar, U16, 1432, "ohm", 1, 0 ; total TS size = 1436 -value0 = scalar, U16, 1436, "value", 1,0 -value1 = scalar, U16, 1438, "value", 1,0 -errorRate = scalar, F32, 1440, "ratio", 1,0 -; total TS size = 1444 -vvtTarget = scalar, U16, 1444, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1446, "%", 0.5, 0 +dcOutput0 = scalar, F32, 1436, "per", 1,0 +isEnabled0_int = scalar, U08, 1440, "per", 1,0 +isEnabled0 = bits, U32, 1444, [0:0] ; total TS size = 1448 -lambdaCurrentlyGood = bits, U32, 1448, [0:0] -lambdaMonitorCut = bits, U32, 1448, [1:1] -lambdaTimeSinceGood = scalar, U16, 1452, "sec", 0.01, 0 +value0 = scalar, U16, 1448, "value", 1,0 +value1 = scalar, U16, 1450, "value", 1,0 +errorRate = scalar, F32, 1452, "ratio", 1,0 ; total TS size = 1456 +vvtTarget = scalar, U16, 1456, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1458, "%", 0.5, 0 +; total TS size = 1460 +lambdaCurrentlyGood = bits, U32, 1460, [0:0] +lambdaMonitorCut = bits, U32, 1460, [1:1] +lambdaTimeSinceGood = scalar, U16, 1464, "sec", 0.01, 0 +; total TS size = 1468 time = { timeNow } @@ -5401,7 +5404,6 @@ entry = smartChipState, "smartChipState", int, "%d" entry = smartChipRestartCounter, "smartChipRestartCounter", int, "%d" entry = smartChipAliveCounter, "smartChipAliveCounter", int, "%d" entry = startStopPhysicalState, "startStopPhysicalState", int, "%d" -entry = acrStateDup, "acrStateDup", int, "%d" entry = acrEngineMovedRecently, "acrEngineMovedRecently", int, "%d" entry = heaterControlEnabled, "heaterControlEnabled", int, "%d" entry = luaDigitalState0, "luaDigitalState0", int, "%d" @@ -5411,6 +5413,9 @@ entry = luaDigitalState3, "luaDigitalState3", int, "%d" entry = startStopStateToggleCounter, "startStopStateToggleCounter", int, "%d" entry = egtValue1, "egtValue1", float, "%.3f" entry = egtValue2, "egtValue2", float, "%.3f" +entry = luaSoftSparkSkip, "luaSoftSparkSkip", float, "%.3f" +entry = luaHardSparkSkip, "luaHardSparkSkip", float, "%.3f" +entry = tractionControlSparkSkip, "tractionControlSparkSkip", float, "%.3f" entry = desiredRpmLimit, "User-defined RPM hard limit", int, "%d" entry = fuelInjectionCounter, "Fuel: Injection counter", int, "%d" entry = globalSparkCounter, "Ign: Spark counter", int, "%d" @@ -5913,7 +5918,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)" @@ -6362,7 +6367,6 @@ indicatorPanel = engine_stateIndicatorPanel, 2 indicator = {lua_luaDisableEtb}, "luaDisableEtb No", "luaDisableEtb Yes" indicator = {lua_luaIgnCut}, "luaIgnCut No", "luaIgnCut Yes" indicator = {startStopPhysicalState}, "startStopPhysicalState No", "startStopPhysicalState Yes" - indicator = {acrStateDup}, "acrStateDup No", "acrStateDup Yes" indicator = {acrEngineMovedRecently}, "acrEngineMovedRecently No", "acrEngineMovedRecently Yes" indicator = {heaterControlEnabled}, "heaterControlEnabled No", "heaterControlEnabled Yes" indicator = {luaDigitalState0}, "luaDigitalState0 No", "luaDigitalState0 Yes" @@ -6398,12 +6402,16 @@ dialog = engine_stateDialog, "engine_state" graphLine = egtValue1 graphLine = egtValue2 liveGraph = engine_state_6_Graph, "Graph", South + graphLine = luaSoftSparkSkip + graphLine = luaHardSparkSkip + graphLine = tractionControlSparkSkip graphLine = desiredRpmLimit + liveGraph = engine_state_7_Graph, "Graph", South graphLine = fuelInjectionCounter graphLine = globalSparkCounter graphLine = fuelingLoad - liveGraph = engine_state_7_Graph, "Graph", South graphLine = ignitionLoad + liveGraph = engine_state_8_Graph, "Graph", South graphLine = veTableYAxis indicatorPanel = tps_accel_stateIndicatorPanel, 2 @@ -7310,6 +7318,10 @@ dialog = lambda_monitorDialog, "lambda_monitor" 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 diff --git a/firmware/tunerstudio/generated/rusefi_t-b-g.ini b/firmware/tunerstudio/generated/rusefi_t-b-g.ini index f89af90366..16e1567f3c 100644 --- a/firmware/tunerstudio/generated/rusefi_t-b-g.ini +++ b/firmware/tunerstudio/generated/rusefi_t-b-g.ini @@ -37,12 +37,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.03.05.t-b-g.1352820405" + signature = "rusEFI master.2024.03.05.t-b-g.523818637" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.03.05.t-b-g.1352820405" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.03.05.t-b-g.523818637" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -98,7 +98,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="Disabled", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PB0", "PB1", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue Mar 05 00:52:50 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue Mar 05 01:56:54 UTC 2024 pageSize = 22236 page = 1 @@ -745,6 +745,7 @@ mc33810Gpgd3Mode = bits, U32, 1576, [4:4], "false", "true" enableExtendedCanBroadcast = bits, U32, 1576, [5:5], "false", "true" luaCanRxWorkaround = bits, U32, 1576, [6:6], "false", "true" flexSensorInverted = bits, U32, 1576, [7:7], "false", "true" +useHardSkipInTraction = bits, U32, 1576, [8:8], "false", "true" useAuxSpeedForSlipRatio = bits, U32, 1576, [11:11], "false", "true" useVssAsSecondWheelSpeed = bits, U32, 1576, [12:12], "false", "true" is_enabled_spi_5 = bits, U32, 1576, [13:13], "false", "true" @@ -2468,7 +2469,7 @@ injectorStagingRpmBins = array, U16, 22222, [6], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1456 + ochBlockSize = 1468 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3131,145 +3132,147 @@ smartChipState = scalar, S08, 1102, "", 1, 0 smartChipRestartCounter = scalar, S08, 1103, "", 1, 0 smartChipAliveCounter = scalar, S08, 1104, "", 1, 0 startStopPhysicalState = bits, U32, 1108, [0:0] -acrStateDup = bits, U32, 1108, [1:1] -acrEngineMovedRecently = bits, U32, 1108, [2:2] -heaterControlEnabled = bits, U32, 1108, [3:3] -luaDigitalState0 = bits, U32, 1108, [4:4] -luaDigitalState1 = bits, U32, 1108, [5:5] -luaDigitalState2 = bits, U32, 1108, [6:6] -luaDigitalState3 = bits, U32, 1108, [7:7] +acrEngineMovedRecently = bits, U32, 1108, [1:1] +heaterControlEnabled = bits, U32, 1108, [2:2] +luaDigitalState0 = bits, U32, 1108, [3:3] +luaDigitalState1 = bits, U32, 1108, [4:4] +luaDigitalState2 = bits, U32, 1108, [5:5] +luaDigitalState3 = bits, U32, 1108, [6:6] startStopStateToggleCounter = scalar, U32, 1112, "", 1, 0 egtValue1 = scalar, F32, 1116, "", 1, 0 egtValue2 = scalar, F32, 1120, "", 1, 0 -desiredRpmLimit = scalar, S16, 1124, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1128, "", 1, 0 -globalSparkCounter = scalar, U32, 1132, "", 1, 0 -fuelingLoad = scalar, F32, 1136, "", 1, 0 -ignitionLoad = scalar, F32, 1140, "", 1, 0 -veTableYAxis = scalar, U16, 1144, "%", 0.01, 0 -; total TS size = 1148 -tpsFrom = scalar, F32, 1148 -tpsTo = scalar, F32, 1152 -deltaTps = scalar, F32, 1156 -extraFuel = scalar, F32, 1160, "", 1, 0 -valueFromTable = scalar, F32, 1164, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1168, [0:0] -isBelowDecelThreshold = bits, U32, 1168, [1:1] -isTimeToResetAccumulator = bits, U32, 1168, [2:2] -isFractionalEnrichment = bits, U32, 1168, [3:3] -belowEpsilon = bits, U32, 1168, [4:4] -tooShort = bits, U32, 1168, [5:5] -fractionalInjFuel = scalar, F32, 1172, "", 1, 0 -accumulatedValue = scalar, F32, 1176, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1180, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1184, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1188, "", 1, 0 -cycleCnt = scalar, S32, 1192, "", 1, 0 -; total TS size = 1196 -hwEventCounters1 = scalar, U32, 1196, "", 1, 0 -hwEventCounters2 = scalar, U32, 1200, "", 1, 0 -hwEventCounters3 = scalar, U32, 1204, "", 1, 0 -hwEventCounters4 = scalar, U32, 1208, "", 1, 0 -hwEventCounters5 = scalar, U32, 1212, "", 1, 0 -hwEventCounters6 = scalar, U32, 1216, "", 1, 0 -vvtCamCounter = scalar, U32, 1220, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1224, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1228, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1232, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1233, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1236, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1240, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1244, "", 1, 0 -mapCamPrevToothAngle = scalar, F32, 1248, "deg", 1, 0 -isDecodingMapCam = bits, U32, 1252, [0:0] -; total TS size = 1256 -crankSynchronizationCounter0 = scalar, U32, 1256, "", 1, 0 -vvtSyncGapRatio0 = scalar, F32, 1260, "", 1, 0 -vvtToothDurations00 = scalar, U32, 1264, "us", 1, 0 -vvtCurrentPosition0 = scalar, F32, 1268, "sync: Primary Cam Position", 1, 0 -vvtToothPosition10 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition20 = scalar, F32, 1276, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition30 = scalar, F32, 1280, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition40 = scalar, F32, 1284, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio0 = scalar, F32, 1288, "", 1, 0 -triggerStateIndex0 = scalar, U08, 1292, "", 1, 0 -vvtStateIndex0 = scalar, U08, 1293, "", 1, 0 -; total TS size = 1296 -camResyncCounter = scalar, U08, 1296, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1300, [0:0] -; total TS size = 1304 -wallFuelCorrection = scalar, F32, 1304, "", 1, 0 -wallFuel = scalar, F32, 1308, "", 1, 0 -; total TS size = 1312 -idleState = bits, S32, 1312, [0:2], "not important" -currentIdlePosition = scalar, F32, 1316 -baseIdlePosition = scalar, F32, 1320 -idleClosedLoop = scalar, F32, 1324 -iacByTpsTaper = scalar, F32, 1328 -throttlePedalUpState = scalar, S32, 1332, "", 1, 0 -mightResetPid = bits, U32, 1336, [0:0] -shouldResetPid = bits, U32, 1336, [1:1] -wasResetPid = bits, U32, 1336, [2:2] -mustResetPid = bits, U32, 1336, [3:3] -isCranking = bits, U32, 1336, [4:4] -isIacTableForCoasting = bits, U32, 1336, [5:5] -notIdling = bits, U32, 1336, [6:6] -needReset = bits, U32, 1336, [7:7] -isInDeadZone = bits, U32, 1336, [8:8] -isBlipping = bits, U32, 1336, [9:9] -useClosedLoop = bits, U32, 1336, [10:10] -badTps = bits, U32, 1336, [11:11] -looksLikeRunning = bits, U32, 1336, [12:12] -looksLikeCoasting = bits, U32, 1336, [13:13] -looksLikeCrankToIdle = bits, U32, 1336, [14:14] -isIdleCoasting = bits, U32, 1336, [15:15] -isIdleClosedLoop = bits, U32, 1336, [16:16] -idleTarget = scalar, S32, 1340, "", 1, 0 -targetRpmByClt = scalar, S32, 1344, "", 1, 0 -targetRpmAc = scalar, S32, 1348, "", 1, 0 -iacByRpmTaper = scalar, F32, 1352 -luaAdd = scalar, F32, 1356 -; total TS size = 1360 -idlePosition0 = scalar, F32, 1360, "per", 1,0 -trim0 = scalar, F32, 1364, "", 1, 0 -luaAdjustment0 = scalar, F32, 1368, "per", 1,0 -m_wastegatePosition0 = scalar, F32, 1372, "per", 1,0 -etbFeedForward0 = scalar, F32, 1376 -etbIntegralError0 = scalar, F32, 1380, "", 1, 0 -etbCurrentTarget0 = scalar, F32, 1384, "%", 1, 0 -etbCurrentAdjustedTarget0 = scalar, F32, 1388, "%", 1, 0 -etbRevLimitActive0 = bits, U32, 1392, [0:0] -jamDetected0 = bits, U32, 1392, [1:1] -etbDutyRateOfChange0 = scalar, F32, 1396, "per", 1,0 -etbDutyAverage0 = scalar, F32, 1400, "per", 1,0 -etbTpsErrorCounter0 = scalar, U16, 1404, "count", 1,0 -etbPpsErrorCounter0 = scalar, U16, 1406, "count", 1,0 -etbErrorCode0 = scalar, S08, 1408, "", 1, 0 -tcEtbDrop0 = scalar, S08, 1409, "", 1, 0 -jamTimer0 = scalar, U16, 1410, "sec", 0.01, 0 -; total TS size = 1412 -faultCode0 = scalar, U08, 1412, "", 1, 0 -heaterDuty0 = scalar, U08, 1413, "%", 1, 0 -pumpDuty0 = scalar, U08, 1414, "%", 1, 0 -tempC0 = scalar, U16, 1416, "C", 1, 0 -nernstVoltage0 = scalar, U16, 1418, "V", 0.001, 0 -esr0 = scalar, U16, 1420, "ohm", 1, 0 +luaSoftSparkSkip = scalar, F32, 1124, "", 1, 0 +luaHardSparkSkip = scalar, F32, 1128, "", 1, 0 +tractionControlSparkSkip = scalar, F32, 1132, "", 1, 0 +desiredRpmLimit = scalar, S16, 1136, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 1140, "", 1, 0 +globalSparkCounter = scalar, U32, 1144, "", 1, 0 +fuelingLoad = scalar, F32, 1148, "", 1, 0 +ignitionLoad = scalar, F32, 1152, "", 1, 0 +veTableYAxis = scalar, U16, 1156, "%", 0.01, 0 +; total TS size = 1160 +tpsFrom = scalar, F32, 1160 +tpsTo = scalar, F32, 1164 +deltaTps = scalar, F32, 1168 +extraFuel = scalar, F32, 1172, "", 1, 0 +valueFromTable = scalar, F32, 1176, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1180, [0:0] +isBelowDecelThreshold = bits, U32, 1180, [1:1] +isTimeToResetAccumulator = bits, U32, 1180, [2:2] +isFractionalEnrichment = bits, U32, 1180, [3:3] +belowEpsilon = bits, U32, 1180, [4:4] +tooShort = bits, U32, 1180, [5:5] +fractionalInjFuel = scalar, F32, 1184, "", 1, 0 +accumulatedValue = scalar, F32, 1188, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1192, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1196, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1200, "", 1, 0 +cycleCnt = scalar, S32, 1204, "", 1, 0 +; total TS size = 1208 +hwEventCounters1 = scalar, U32, 1208, "", 1, 0 +hwEventCounters2 = scalar, U32, 1212, "", 1, 0 +hwEventCounters3 = scalar, U32, 1216, "", 1, 0 +hwEventCounters4 = scalar, U32, 1220, "", 1, 0 +hwEventCounters5 = scalar, U32, 1224, "", 1, 0 +hwEventCounters6 = scalar, U32, 1228, "", 1, 0 +vvtCamCounter = scalar, U32, 1232, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1236, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1240, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1244, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1245, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1248, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1252, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1256, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1260, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1264, [0:0] +; total TS size = 1268 +crankSynchronizationCounter0 = scalar, U32, 1268, "", 1, 0 +vvtSyncGapRatio0 = scalar, F32, 1272, "", 1, 0 +vvtToothDurations00 = scalar, U32, 1276, "us", 1, 0 +vvtCurrentPosition0 = scalar, F32, 1280, "sync: Primary Cam Position", 1, 0 +vvtToothPosition10 = scalar, F32, 1284, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition20 = scalar, F32, 1288, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition30 = scalar, F32, 1292, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition40 = scalar, F32, 1296, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio0 = scalar, F32, 1300, "", 1, 0 +triggerStateIndex0 = scalar, U08, 1304, "", 1, 0 +vvtStateIndex0 = scalar, U08, 1305, "", 1, 0 +; total TS size = 1308 +camResyncCounter = scalar, U08, 1308, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1312, [0:0] +; total TS size = 1316 +wallFuelCorrection = scalar, F32, 1316, "", 1, 0 +wallFuel = scalar, F32, 1320, "", 1, 0 +; total TS size = 1324 +idleState = bits, S32, 1324, [0:2], "not important" +currentIdlePosition = scalar, F32, 1328 +baseIdlePosition = scalar, F32, 1332 +idleClosedLoop = scalar, F32, 1336 +iacByTpsTaper = scalar, F32, 1340 +throttlePedalUpState = scalar, S32, 1344, "", 1, 0 +mightResetPid = bits, U32, 1348, [0:0] +shouldResetPid = bits, U32, 1348, [1:1] +wasResetPid = bits, U32, 1348, [2:2] +mustResetPid = bits, U32, 1348, [3:3] +isCranking = bits, U32, 1348, [4:4] +isIacTableForCoasting = bits, U32, 1348, [5:5] +notIdling = bits, U32, 1348, [6:6] +needReset = bits, U32, 1348, [7:7] +isInDeadZone = bits, U32, 1348, [8:8] +isBlipping = bits, U32, 1348, [9:9] +useClosedLoop = bits, U32, 1348, [10:10] +badTps = bits, U32, 1348, [11:11] +looksLikeRunning = bits, U32, 1348, [12:12] +looksLikeCoasting = bits, U32, 1348, [13:13] +looksLikeCrankToIdle = bits, U32, 1348, [14:14] +isIdleCoasting = bits, U32, 1348, [15:15] +isIdleClosedLoop = bits, U32, 1348, [16:16] +idleTarget = scalar, S32, 1352, "", 1, 0 +targetRpmByClt = scalar, S32, 1356, "", 1, 0 +targetRpmAc = scalar, S32, 1360, "", 1, 0 +iacByRpmTaper = scalar, F32, 1364 +luaAdd = scalar, F32, 1368 +; total TS size = 1372 +idlePosition0 = scalar, F32, 1372, "per", 1,0 +trim0 = scalar, F32, 1376, "", 1, 0 +luaAdjustment0 = scalar, F32, 1380, "per", 1,0 +m_wastegatePosition0 = scalar, F32, 1384, "per", 1,0 +etbFeedForward0 = scalar, F32, 1388 +etbIntegralError0 = scalar, F32, 1392, "", 1, 0 +etbCurrentTarget0 = scalar, F32, 1396, "%", 1, 0 +etbCurrentAdjustedTarget0 = scalar, F32, 1400, "%", 1, 0 +etbRevLimitActive0 = bits, U32, 1404, [0:0] +jamDetected0 = bits, U32, 1404, [1:1] +etbDutyRateOfChange0 = scalar, F32, 1408, "per", 1,0 +etbDutyAverage0 = scalar, F32, 1412, "per", 1,0 +etbTpsErrorCounter0 = scalar, U16, 1416, "count", 1,0 +etbPpsErrorCounter0 = scalar, U16, 1418, "count", 1,0 +etbErrorCode0 = scalar, S08, 1420, "", 1, 0 +tcEtbDrop0 = scalar, S08, 1421, "", 1, 0 +jamTimer0 = scalar, U16, 1422, "sec", 0.01, 0 ; total TS size = 1424 -dcOutput0 = scalar, F32, 1424, "per", 1,0 -isEnabled0_int = scalar, U08, 1428, "per", 1,0 -isEnabled0 = bits, U32, 1432, [0:0] +faultCode0 = scalar, U08, 1424, "", 1, 0 +heaterDuty0 = scalar, U08, 1425, "%", 1, 0 +pumpDuty0 = scalar, U08, 1426, "%", 1, 0 +tempC0 = scalar, U16, 1428, "C", 1, 0 +nernstVoltage0 = scalar, U16, 1430, "V", 0.001, 0 +esr0 = scalar, U16, 1432, "ohm", 1, 0 ; total TS size = 1436 -value0 = scalar, U16, 1436, "value", 1,0 -value1 = scalar, U16, 1438, "value", 1,0 -errorRate = scalar, F32, 1440, "ratio", 1,0 -; total TS size = 1444 -vvtTarget = scalar, U16, 1444, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1446, "%", 0.5, 0 +dcOutput0 = scalar, F32, 1436, "per", 1,0 +isEnabled0_int = scalar, U08, 1440, "per", 1,0 +isEnabled0 = bits, U32, 1444, [0:0] ; total TS size = 1448 -lambdaCurrentlyGood = bits, U32, 1448, [0:0] -lambdaMonitorCut = bits, U32, 1448, [1:1] -lambdaTimeSinceGood = scalar, U16, 1452, "sec", 0.01, 0 +value0 = scalar, U16, 1448, "value", 1,0 +value1 = scalar, U16, 1450, "value", 1,0 +errorRate = scalar, F32, 1452, "ratio", 1,0 ; total TS size = 1456 +vvtTarget = scalar, U16, 1456, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1458, "%", 0.5, 0 +; total TS size = 1460 +lambdaCurrentlyGood = bits, U32, 1460, [0:0] +lambdaMonitorCut = bits, U32, 1460, [1:1] +lambdaTimeSinceGood = scalar, U16, 1464, "sec", 0.01, 0 +; total TS size = 1468 time = { timeNow } @@ -5401,7 +5404,6 @@ entry = smartChipState, "smartChipState", int, "%d" entry = smartChipRestartCounter, "smartChipRestartCounter", int, "%d" entry = smartChipAliveCounter, "smartChipAliveCounter", int, "%d" entry = startStopPhysicalState, "startStopPhysicalState", int, "%d" -entry = acrStateDup, "acrStateDup", int, "%d" entry = acrEngineMovedRecently, "acrEngineMovedRecently", int, "%d" entry = heaterControlEnabled, "heaterControlEnabled", int, "%d" entry = luaDigitalState0, "luaDigitalState0", int, "%d" @@ -5411,6 +5413,9 @@ entry = luaDigitalState3, "luaDigitalState3", int, "%d" entry = startStopStateToggleCounter, "startStopStateToggleCounter", int, "%d" entry = egtValue1, "egtValue1", float, "%.3f" entry = egtValue2, "egtValue2", float, "%.3f" +entry = luaSoftSparkSkip, "luaSoftSparkSkip", float, "%.3f" +entry = luaHardSparkSkip, "luaHardSparkSkip", float, "%.3f" +entry = tractionControlSparkSkip, "tractionControlSparkSkip", float, "%.3f" entry = desiredRpmLimit, "User-defined RPM hard limit", int, "%d" entry = fuelInjectionCounter, "Fuel: Injection counter", int, "%d" entry = globalSparkCounter, "Ign: Spark counter", int, "%d" @@ -5912,7 +5917,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 @@ -6360,7 +6365,6 @@ indicatorPanel = engine_stateIndicatorPanel, 2 indicator = {lua_luaDisableEtb}, "luaDisableEtb No", "luaDisableEtb Yes" indicator = {lua_luaIgnCut}, "luaIgnCut No", "luaIgnCut Yes" indicator = {startStopPhysicalState}, "startStopPhysicalState No", "startStopPhysicalState Yes" - indicator = {acrStateDup}, "acrStateDup No", "acrStateDup Yes" indicator = {acrEngineMovedRecently}, "acrEngineMovedRecently No", "acrEngineMovedRecently Yes" indicator = {heaterControlEnabled}, "heaterControlEnabled No", "heaterControlEnabled Yes" indicator = {luaDigitalState0}, "luaDigitalState0 No", "luaDigitalState0 Yes" @@ -6396,12 +6400,16 @@ dialog = engine_stateDialog, "engine_state" graphLine = egtValue1 graphLine = egtValue2 liveGraph = engine_state_6_Graph, "Graph", South + graphLine = luaSoftSparkSkip + graphLine = luaHardSparkSkip + graphLine = tractionControlSparkSkip graphLine = desiredRpmLimit + liveGraph = engine_state_7_Graph, "Graph", South graphLine = fuelInjectionCounter graphLine = globalSparkCounter graphLine = fuelingLoad - liveGraph = engine_state_7_Graph, "Graph", South graphLine = ignitionLoad + liveGraph = engine_state_8_Graph, "Graph", South graphLine = veTableYAxis indicatorPanel = tps_accel_stateIndicatorPanel, 2 @@ -7308,6 +7316,10 @@ dialog = lambda_monitorDialog, "lambda_monitor" 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 diff --git a/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini b/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini index a31cdc0bd3..2b7ec60e4d 100644 --- a/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini +++ b/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini @@ -37,12 +37,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.03.05.tdg-pdm8.3658238615" + signature = "rusEFI master.2024.03.05.tdg-pdm8.2509699759" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.03.05.tdg-pdm8.3658238615" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.03.05.tdg-pdm8.2509699759" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -98,7 +98,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","INVALID","INVALID","INVALID","INVALID","Battery Sense","INVALID","INVALID","INVALID","Sense 7","Sense 8","Sense 1","Sense 2","Sense 3","Sense 4","Sense 5","Sense 6" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue Mar 05 00:53:09 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue Mar 05 01:57:12 UTC 2024 pageSize = 22236 page = 1 @@ -745,6 +745,7 @@ mc33810Gpgd3Mode = bits, U32, 1576, [4:4], "false", "true" enableExtendedCanBroadcast = bits, U32, 1576, [5:5], "false", "true" luaCanRxWorkaround = bits, U32, 1576, [6:6], "false", "true" flexSensorInverted = bits, U32, 1576, [7:7], "false", "true" +useHardSkipInTraction = bits, U32, 1576, [8:8], "false", "true" useAuxSpeedForSlipRatio = bits, U32, 1576, [11:11], "false", "true" useVssAsSecondWheelSpeed = bits, U32, 1576, [12:12], "false", "true" is_enabled_spi_5 = bits, U32, 1576, [13:13], "false", "true" @@ -2468,7 +2469,7 @@ injectorStagingRpmBins = array, U16, 22222, [6], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1456 + ochBlockSize = 1468 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3131,145 +3132,147 @@ smartChipState = scalar, S08, 1102, "", 1, 0 smartChipRestartCounter = scalar, S08, 1103, "", 1, 0 smartChipAliveCounter = scalar, S08, 1104, "", 1, 0 startStopPhysicalState = bits, U32, 1108, [0:0] -acrStateDup = bits, U32, 1108, [1:1] -acrEngineMovedRecently = bits, U32, 1108, [2:2] -heaterControlEnabled = bits, U32, 1108, [3:3] -luaDigitalState0 = bits, U32, 1108, [4:4] -luaDigitalState1 = bits, U32, 1108, [5:5] -luaDigitalState2 = bits, U32, 1108, [6:6] -luaDigitalState3 = bits, U32, 1108, [7:7] +acrEngineMovedRecently = bits, U32, 1108, [1:1] +heaterControlEnabled = bits, U32, 1108, [2:2] +luaDigitalState0 = bits, U32, 1108, [3:3] +luaDigitalState1 = bits, U32, 1108, [4:4] +luaDigitalState2 = bits, U32, 1108, [5:5] +luaDigitalState3 = bits, U32, 1108, [6:6] startStopStateToggleCounter = scalar, U32, 1112, "", 1, 0 egtValue1 = scalar, F32, 1116, "", 1, 0 egtValue2 = scalar, F32, 1120, "", 1, 0 -desiredRpmLimit = scalar, S16, 1124, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1128, "", 1, 0 -globalSparkCounter = scalar, U32, 1132, "", 1, 0 -fuelingLoad = scalar, F32, 1136, "", 1, 0 -ignitionLoad = scalar, F32, 1140, "", 1, 0 -veTableYAxis = scalar, U16, 1144, "%", 0.01, 0 -; total TS size = 1148 -tpsFrom = scalar, F32, 1148 -tpsTo = scalar, F32, 1152 -deltaTps = scalar, F32, 1156 -extraFuel = scalar, F32, 1160, "", 1, 0 -valueFromTable = scalar, F32, 1164, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1168, [0:0] -isBelowDecelThreshold = bits, U32, 1168, [1:1] -isTimeToResetAccumulator = bits, U32, 1168, [2:2] -isFractionalEnrichment = bits, U32, 1168, [3:3] -belowEpsilon = bits, U32, 1168, [4:4] -tooShort = bits, U32, 1168, [5:5] -fractionalInjFuel = scalar, F32, 1172, "", 1, 0 -accumulatedValue = scalar, F32, 1176, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1180, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1184, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1188, "", 1, 0 -cycleCnt = scalar, S32, 1192, "", 1, 0 -; total TS size = 1196 -hwEventCounters1 = scalar, U32, 1196, "", 1, 0 -hwEventCounters2 = scalar, U32, 1200, "", 1, 0 -hwEventCounters3 = scalar, U32, 1204, "", 1, 0 -hwEventCounters4 = scalar, U32, 1208, "", 1, 0 -hwEventCounters5 = scalar, U32, 1212, "", 1, 0 -hwEventCounters6 = scalar, U32, 1216, "", 1, 0 -vvtCamCounter = scalar, U32, 1220, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1224, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1228, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1232, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1233, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1236, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1240, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1244, "", 1, 0 -mapCamPrevToothAngle = scalar, F32, 1248, "deg", 1, 0 -isDecodingMapCam = bits, U32, 1252, [0:0] -; total TS size = 1256 -crankSynchronizationCounter0 = scalar, U32, 1256, "", 1, 0 -vvtSyncGapRatio0 = scalar, F32, 1260, "", 1, 0 -vvtToothDurations00 = scalar, U32, 1264, "us", 1, 0 -vvtCurrentPosition0 = scalar, F32, 1268, "sync: Primary Cam Position", 1, 0 -vvtToothPosition10 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition20 = scalar, F32, 1276, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition30 = scalar, F32, 1280, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition40 = scalar, F32, 1284, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio0 = scalar, F32, 1288, "", 1, 0 -triggerStateIndex0 = scalar, U08, 1292, "", 1, 0 -vvtStateIndex0 = scalar, U08, 1293, "", 1, 0 -; total TS size = 1296 -camResyncCounter = scalar, U08, 1296, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1300, [0:0] -; total TS size = 1304 -wallFuelCorrection = scalar, F32, 1304, "", 1, 0 -wallFuel = scalar, F32, 1308, "", 1, 0 -; total TS size = 1312 -idleState = bits, S32, 1312, [0:2], "not important" -currentIdlePosition = scalar, F32, 1316 -baseIdlePosition = scalar, F32, 1320 -idleClosedLoop = scalar, F32, 1324 -iacByTpsTaper = scalar, F32, 1328 -throttlePedalUpState = scalar, S32, 1332, "", 1, 0 -mightResetPid = bits, U32, 1336, [0:0] -shouldResetPid = bits, U32, 1336, [1:1] -wasResetPid = bits, U32, 1336, [2:2] -mustResetPid = bits, U32, 1336, [3:3] -isCranking = bits, U32, 1336, [4:4] -isIacTableForCoasting = bits, U32, 1336, [5:5] -notIdling = bits, U32, 1336, [6:6] -needReset = bits, U32, 1336, [7:7] -isInDeadZone = bits, U32, 1336, [8:8] -isBlipping = bits, U32, 1336, [9:9] -useClosedLoop = bits, U32, 1336, [10:10] -badTps = bits, U32, 1336, [11:11] -looksLikeRunning = bits, U32, 1336, [12:12] -looksLikeCoasting = bits, U32, 1336, [13:13] -looksLikeCrankToIdle = bits, U32, 1336, [14:14] -isIdleCoasting = bits, U32, 1336, [15:15] -isIdleClosedLoop = bits, U32, 1336, [16:16] -idleTarget = scalar, S32, 1340, "", 1, 0 -targetRpmByClt = scalar, S32, 1344, "", 1, 0 -targetRpmAc = scalar, S32, 1348, "", 1, 0 -iacByRpmTaper = scalar, F32, 1352 -luaAdd = scalar, F32, 1356 -; total TS size = 1360 -idlePosition0 = scalar, F32, 1360, "per", 1,0 -trim0 = scalar, F32, 1364, "", 1, 0 -luaAdjustment0 = scalar, F32, 1368, "per", 1,0 -m_wastegatePosition0 = scalar, F32, 1372, "per", 1,0 -etbFeedForward0 = scalar, F32, 1376 -etbIntegralError0 = scalar, F32, 1380, "", 1, 0 -etbCurrentTarget0 = scalar, F32, 1384, "%", 1, 0 -etbCurrentAdjustedTarget0 = scalar, F32, 1388, "%", 1, 0 -etbRevLimitActive0 = bits, U32, 1392, [0:0] -jamDetected0 = bits, U32, 1392, [1:1] -etbDutyRateOfChange0 = scalar, F32, 1396, "per", 1,0 -etbDutyAverage0 = scalar, F32, 1400, "per", 1,0 -etbTpsErrorCounter0 = scalar, U16, 1404, "count", 1,0 -etbPpsErrorCounter0 = scalar, U16, 1406, "count", 1,0 -etbErrorCode0 = scalar, S08, 1408, "", 1, 0 -tcEtbDrop0 = scalar, S08, 1409, "", 1, 0 -jamTimer0 = scalar, U16, 1410, "sec", 0.01, 0 -; total TS size = 1412 -faultCode0 = scalar, U08, 1412, "", 1, 0 -heaterDuty0 = scalar, U08, 1413, "%", 1, 0 -pumpDuty0 = scalar, U08, 1414, "%", 1, 0 -tempC0 = scalar, U16, 1416, "C", 1, 0 -nernstVoltage0 = scalar, U16, 1418, "V", 0.001, 0 -esr0 = scalar, U16, 1420, "ohm", 1, 0 +luaSoftSparkSkip = scalar, F32, 1124, "", 1, 0 +luaHardSparkSkip = scalar, F32, 1128, "", 1, 0 +tractionControlSparkSkip = scalar, F32, 1132, "", 1, 0 +desiredRpmLimit = scalar, S16, 1136, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 1140, "", 1, 0 +globalSparkCounter = scalar, U32, 1144, "", 1, 0 +fuelingLoad = scalar, F32, 1148, "", 1, 0 +ignitionLoad = scalar, F32, 1152, "", 1, 0 +veTableYAxis = scalar, U16, 1156, "%", 0.01, 0 +; total TS size = 1160 +tpsFrom = scalar, F32, 1160 +tpsTo = scalar, F32, 1164 +deltaTps = scalar, F32, 1168 +extraFuel = scalar, F32, 1172, "", 1, 0 +valueFromTable = scalar, F32, 1176, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1180, [0:0] +isBelowDecelThreshold = bits, U32, 1180, [1:1] +isTimeToResetAccumulator = bits, U32, 1180, [2:2] +isFractionalEnrichment = bits, U32, 1180, [3:3] +belowEpsilon = bits, U32, 1180, [4:4] +tooShort = bits, U32, 1180, [5:5] +fractionalInjFuel = scalar, F32, 1184, "", 1, 0 +accumulatedValue = scalar, F32, 1188, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1192, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1196, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1200, "", 1, 0 +cycleCnt = scalar, S32, 1204, "", 1, 0 +; total TS size = 1208 +hwEventCounters1 = scalar, U32, 1208, "", 1, 0 +hwEventCounters2 = scalar, U32, 1212, "", 1, 0 +hwEventCounters3 = scalar, U32, 1216, "", 1, 0 +hwEventCounters4 = scalar, U32, 1220, "", 1, 0 +hwEventCounters5 = scalar, U32, 1224, "", 1, 0 +hwEventCounters6 = scalar, U32, 1228, "", 1, 0 +vvtCamCounter = scalar, U32, 1232, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1236, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1240, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1244, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1245, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1248, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1252, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1256, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1260, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1264, [0:0] +; total TS size = 1268 +crankSynchronizationCounter0 = scalar, U32, 1268, "", 1, 0 +vvtSyncGapRatio0 = scalar, F32, 1272, "", 1, 0 +vvtToothDurations00 = scalar, U32, 1276, "us", 1, 0 +vvtCurrentPosition0 = scalar, F32, 1280, "sync: Primary Cam Position", 1, 0 +vvtToothPosition10 = scalar, F32, 1284, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition20 = scalar, F32, 1288, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition30 = scalar, F32, 1292, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition40 = scalar, F32, 1296, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio0 = scalar, F32, 1300, "", 1, 0 +triggerStateIndex0 = scalar, U08, 1304, "", 1, 0 +vvtStateIndex0 = scalar, U08, 1305, "", 1, 0 +; total TS size = 1308 +camResyncCounter = scalar, U08, 1308, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1312, [0:0] +; total TS size = 1316 +wallFuelCorrection = scalar, F32, 1316, "", 1, 0 +wallFuel = scalar, F32, 1320, "", 1, 0 +; total TS size = 1324 +idleState = bits, S32, 1324, [0:2], "not important" +currentIdlePosition = scalar, F32, 1328 +baseIdlePosition = scalar, F32, 1332 +idleClosedLoop = scalar, F32, 1336 +iacByTpsTaper = scalar, F32, 1340 +throttlePedalUpState = scalar, S32, 1344, "", 1, 0 +mightResetPid = bits, U32, 1348, [0:0] +shouldResetPid = bits, U32, 1348, [1:1] +wasResetPid = bits, U32, 1348, [2:2] +mustResetPid = bits, U32, 1348, [3:3] +isCranking = bits, U32, 1348, [4:4] +isIacTableForCoasting = bits, U32, 1348, [5:5] +notIdling = bits, U32, 1348, [6:6] +needReset = bits, U32, 1348, [7:7] +isInDeadZone = bits, U32, 1348, [8:8] +isBlipping = bits, U32, 1348, [9:9] +useClosedLoop = bits, U32, 1348, [10:10] +badTps = bits, U32, 1348, [11:11] +looksLikeRunning = bits, U32, 1348, [12:12] +looksLikeCoasting = bits, U32, 1348, [13:13] +looksLikeCrankToIdle = bits, U32, 1348, [14:14] +isIdleCoasting = bits, U32, 1348, [15:15] +isIdleClosedLoop = bits, U32, 1348, [16:16] +idleTarget = scalar, S32, 1352, "", 1, 0 +targetRpmByClt = scalar, S32, 1356, "", 1, 0 +targetRpmAc = scalar, S32, 1360, "", 1, 0 +iacByRpmTaper = scalar, F32, 1364 +luaAdd = scalar, F32, 1368 +; total TS size = 1372 +idlePosition0 = scalar, F32, 1372, "per", 1,0 +trim0 = scalar, F32, 1376, "", 1, 0 +luaAdjustment0 = scalar, F32, 1380, "per", 1,0 +m_wastegatePosition0 = scalar, F32, 1384, "per", 1,0 +etbFeedForward0 = scalar, F32, 1388 +etbIntegralError0 = scalar, F32, 1392, "", 1, 0 +etbCurrentTarget0 = scalar, F32, 1396, "%", 1, 0 +etbCurrentAdjustedTarget0 = scalar, F32, 1400, "%", 1, 0 +etbRevLimitActive0 = bits, U32, 1404, [0:0] +jamDetected0 = bits, U32, 1404, [1:1] +etbDutyRateOfChange0 = scalar, F32, 1408, "per", 1,0 +etbDutyAverage0 = scalar, F32, 1412, "per", 1,0 +etbTpsErrorCounter0 = scalar, U16, 1416, "count", 1,0 +etbPpsErrorCounter0 = scalar, U16, 1418, "count", 1,0 +etbErrorCode0 = scalar, S08, 1420, "", 1, 0 +tcEtbDrop0 = scalar, S08, 1421, "", 1, 0 +jamTimer0 = scalar, U16, 1422, "sec", 0.01, 0 ; total TS size = 1424 -dcOutput0 = scalar, F32, 1424, "per", 1,0 -isEnabled0_int = scalar, U08, 1428, "per", 1,0 -isEnabled0 = bits, U32, 1432, [0:0] +faultCode0 = scalar, U08, 1424, "", 1, 0 +heaterDuty0 = scalar, U08, 1425, "%", 1, 0 +pumpDuty0 = scalar, U08, 1426, "%", 1, 0 +tempC0 = scalar, U16, 1428, "C", 1, 0 +nernstVoltage0 = scalar, U16, 1430, "V", 0.001, 0 +esr0 = scalar, U16, 1432, "ohm", 1, 0 ; total TS size = 1436 -value0 = scalar, U16, 1436, "value", 1,0 -value1 = scalar, U16, 1438, "value", 1,0 -errorRate = scalar, F32, 1440, "ratio", 1,0 -; total TS size = 1444 -vvtTarget = scalar, U16, 1444, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1446, "%", 0.5, 0 +dcOutput0 = scalar, F32, 1436, "per", 1,0 +isEnabled0_int = scalar, U08, 1440, "per", 1,0 +isEnabled0 = bits, U32, 1444, [0:0] ; total TS size = 1448 -lambdaCurrentlyGood = bits, U32, 1448, [0:0] -lambdaMonitorCut = bits, U32, 1448, [1:1] -lambdaTimeSinceGood = scalar, U16, 1452, "sec", 0.01, 0 +value0 = scalar, U16, 1448, "value", 1,0 +value1 = scalar, U16, 1450, "value", 1,0 +errorRate = scalar, F32, 1452, "ratio", 1,0 ; total TS size = 1456 +vvtTarget = scalar, U16, 1456, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1458, "%", 0.5, 0 +; total TS size = 1460 +lambdaCurrentlyGood = bits, U32, 1460, [0:0] +lambdaMonitorCut = bits, U32, 1460, [1:1] +lambdaTimeSinceGood = scalar, U16, 1464, "sec", 0.01, 0 +; total TS size = 1468 time = { timeNow } @@ -5401,7 +5404,6 @@ entry = smartChipState, "smartChipState", int, "%d" entry = smartChipRestartCounter, "smartChipRestartCounter", int, "%d" entry = smartChipAliveCounter, "smartChipAliveCounter", int, "%d" entry = startStopPhysicalState, "startStopPhysicalState", int, "%d" -entry = acrStateDup, "acrStateDup", int, "%d" entry = acrEngineMovedRecently, "acrEngineMovedRecently", int, "%d" entry = heaterControlEnabled, "heaterControlEnabled", int, "%d" entry = luaDigitalState0, "luaDigitalState0", int, "%d" @@ -5411,6 +5413,9 @@ entry = luaDigitalState3, "luaDigitalState3", int, "%d" entry = startStopStateToggleCounter, "startStopStateToggleCounter", int, "%d" entry = egtValue1, "egtValue1", float, "%.3f" entry = egtValue2, "egtValue2", float, "%.3f" +entry = luaSoftSparkSkip, "luaSoftSparkSkip", float, "%.3f" +entry = luaHardSparkSkip, "luaHardSparkSkip", float, "%.3f" +entry = tractionControlSparkSkip, "tractionControlSparkSkip", float, "%.3f" entry = desiredRpmLimit, "User-defined RPM hard limit", int, "%d" entry = fuelInjectionCounter, "Fuel: Injection counter", int, "%d" entry = globalSparkCounter, "Ign: Spark counter", int, "%d" @@ -5912,7 +5917,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 @@ -6360,7 +6365,6 @@ indicatorPanel = engine_stateIndicatorPanel, 2 indicator = {lua_luaDisableEtb}, "luaDisableEtb No", "luaDisableEtb Yes" indicator = {lua_luaIgnCut}, "luaIgnCut No", "luaIgnCut Yes" indicator = {startStopPhysicalState}, "startStopPhysicalState No", "startStopPhysicalState Yes" - indicator = {acrStateDup}, "acrStateDup No", "acrStateDup Yes" indicator = {acrEngineMovedRecently}, "acrEngineMovedRecently No", "acrEngineMovedRecently Yes" indicator = {heaterControlEnabled}, "heaterControlEnabled No", "heaterControlEnabled Yes" indicator = {luaDigitalState0}, "luaDigitalState0 No", "luaDigitalState0 Yes" @@ -6396,12 +6400,16 @@ dialog = engine_stateDialog, "engine_state" graphLine = egtValue1 graphLine = egtValue2 liveGraph = engine_state_6_Graph, "Graph", South + graphLine = luaSoftSparkSkip + graphLine = luaHardSparkSkip + graphLine = tractionControlSparkSkip graphLine = desiredRpmLimit + liveGraph = engine_state_7_Graph, "Graph", South graphLine = fuelInjectionCounter graphLine = globalSparkCounter graphLine = fuelingLoad - liveGraph = engine_state_7_Graph, "Graph", South graphLine = ignitionLoad + liveGraph = engine_state_8_Graph, "Graph", South graphLine = veTableYAxis indicatorPanel = tps_accel_stateIndicatorPanel, 2 @@ -7308,6 +7316,10 @@ dialog = lambda_monitorDialog, "lambda_monitor" 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 diff --git a/firmware/tunerstudio/generated/rusefi_uaefi.ini b/firmware/tunerstudio/generated/rusefi_uaefi.ini index 07dec0e4a6..751a066b56 100644 --- a/firmware/tunerstudio/generated/rusefi_uaefi.ini +++ b/firmware/tunerstudio/generated/rusefi_uaefi.ini @@ -37,12 +37,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.03.05.uaefi.3713663592" + signature = "rusEFI master.2024.03.05.uaefi.2462102096" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.03.05.uaefi.3713663592" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.03.05.uaefi.2462102096" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -98,7 +98,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","D1 AUX1","C3 AUX2","INVALID","D6 PPS1","D13 TPS1","A7 Voltage From Key","INVALID","C15 Fuel Pressure / AUX3","C14 TPS2","INVALID","D9 MAP","On-board MAP","D16 CLT Coolant","D15 IAT","C4 PPS2" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue Mar 05 00:52:32 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue Mar 05 01:56:36 UTC 2024 pageSize = 22236 page = 1 @@ -745,6 +745,7 @@ mc33810Gpgd3Mode = bits, U32, 1576, [4:4], "false", "true" enableExtendedCanBroadcast = bits, U32, 1576, [5:5], "false", "true" luaCanRxWorkaround = bits, U32, 1576, [6:6], "false", "true" flexSensorInverted = bits, U32, 1576, [7:7], "false", "true" +useHardSkipInTraction = bits, U32, 1576, [8:8], "false", "true" useAuxSpeedForSlipRatio = bits, U32, 1576, [11:11], "false", "true" useVssAsSecondWheelSpeed = bits, U32, 1576, [12:12], "false", "true" is_enabled_spi_5 = bits, U32, 1576, [13:13], "false", "true" @@ -2468,7 +2469,7 @@ injectorStagingRpmBins = array, U16, 22222, [6], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1456 + ochBlockSize = 1468 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3131,145 +3132,147 @@ smartChipState = scalar, S08, 1102, "", 1, 0 smartChipRestartCounter = scalar, S08, 1103, "", 1, 0 smartChipAliveCounter = scalar, S08, 1104, "", 1, 0 startStopPhysicalState = bits, U32, 1108, [0:0] -acrStateDup = bits, U32, 1108, [1:1] -acrEngineMovedRecently = bits, U32, 1108, [2:2] -heaterControlEnabled = bits, U32, 1108, [3:3] -luaDigitalState0 = bits, U32, 1108, [4:4] -luaDigitalState1 = bits, U32, 1108, [5:5] -luaDigitalState2 = bits, U32, 1108, [6:6] -luaDigitalState3 = bits, U32, 1108, [7:7] +acrEngineMovedRecently = bits, U32, 1108, [1:1] +heaterControlEnabled = bits, U32, 1108, [2:2] +luaDigitalState0 = bits, U32, 1108, [3:3] +luaDigitalState1 = bits, U32, 1108, [4:4] +luaDigitalState2 = bits, U32, 1108, [5:5] +luaDigitalState3 = bits, U32, 1108, [6:6] startStopStateToggleCounter = scalar, U32, 1112, "", 1, 0 egtValue1 = scalar, F32, 1116, "", 1, 0 egtValue2 = scalar, F32, 1120, "", 1, 0 -desiredRpmLimit = scalar, S16, 1124, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1128, "", 1, 0 -globalSparkCounter = scalar, U32, 1132, "", 1, 0 -fuelingLoad = scalar, F32, 1136, "", 1, 0 -ignitionLoad = scalar, F32, 1140, "", 1, 0 -veTableYAxis = scalar, U16, 1144, "%", 0.01, 0 -; total TS size = 1148 -tpsFrom = scalar, F32, 1148 -tpsTo = scalar, F32, 1152 -deltaTps = scalar, F32, 1156 -extraFuel = scalar, F32, 1160, "", 1, 0 -valueFromTable = scalar, F32, 1164, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1168, [0:0] -isBelowDecelThreshold = bits, U32, 1168, [1:1] -isTimeToResetAccumulator = bits, U32, 1168, [2:2] -isFractionalEnrichment = bits, U32, 1168, [3:3] -belowEpsilon = bits, U32, 1168, [4:4] -tooShort = bits, U32, 1168, [5:5] -fractionalInjFuel = scalar, F32, 1172, "", 1, 0 -accumulatedValue = scalar, F32, 1176, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1180, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1184, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1188, "", 1, 0 -cycleCnt = scalar, S32, 1192, "", 1, 0 -; total TS size = 1196 -hwEventCounters1 = scalar, U32, 1196, "", 1, 0 -hwEventCounters2 = scalar, U32, 1200, "", 1, 0 -hwEventCounters3 = scalar, U32, 1204, "", 1, 0 -hwEventCounters4 = scalar, U32, 1208, "", 1, 0 -hwEventCounters5 = scalar, U32, 1212, "", 1, 0 -hwEventCounters6 = scalar, U32, 1216, "", 1, 0 -vvtCamCounter = scalar, U32, 1220, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1224, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1228, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1232, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1233, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1236, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1240, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1244, "", 1, 0 -mapCamPrevToothAngle = scalar, F32, 1248, "deg", 1, 0 -isDecodingMapCam = bits, U32, 1252, [0:0] -; total TS size = 1256 -crankSynchronizationCounter0 = scalar, U32, 1256, "", 1, 0 -vvtSyncGapRatio0 = scalar, F32, 1260, "", 1, 0 -vvtToothDurations00 = scalar, U32, 1264, "us", 1, 0 -vvtCurrentPosition0 = scalar, F32, 1268, "sync: Primary Cam Position", 1, 0 -vvtToothPosition10 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition20 = scalar, F32, 1276, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition30 = scalar, F32, 1280, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition40 = scalar, F32, 1284, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio0 = scalar, F32, 1288, "", 1, 0 -triggerStateIndex0 = scalar, U08, 1292, "", 1, 0 -vvtStateIndex0 = scalar, U08, 1293, "", 1, 0 -; total TS size = 1296 -camResyncCounter = scalar, U08, 1296, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1300, [0:0] -; total TS size = 1304 -wallFuelCorrection = scalar, F32, 1304, "", 1, 0 -wallFuel = scalar, F32, 1308, "", 1, 0 -; total TS size = 1312 -idleState = bits, S32, 1312, [0:2], "not important" -currentIdlePosition = scalar, F32, 1316 -baseIdlePosition = scalar, F32, 1320 -idleClosedLoop = scalar, F32, 1324 -iacByTpsTaper = scalar, F32, 1328 -throttlePedalUpState = scalar, S32, 1332, "", 1, 0 -mightResetPid = bits, U32, 1336, [0:0] -shouldResetPid = bits, U32, 1336, [1:1] -wasResetPid = bits, U32, 1336, [2:2] -mustResetPid = bits, U32, 1336, [3:3] -isCranking = bits, U32, 1336, [4:4] -isIacTableForCoasting = bits, U32, 1336, [5:5] -notIdling = bits, U32, 1336, [6:6] -needReset = bits, U32, 1336, [7:7] -isInDeadZone = bits, U32, 1336, [8:8] -isBlipping = bits, U32, 1336, [9:9] -useClosedLoop = bits, U32, 1336, [10:10] -badTps = bits, U32, 1336, [11:11] -looksLikeRunning = bits, U32, 1336, [12:12] -looksLikeCoasting = bits, U32, 1336, [13:13] -looksLikeCrankToIdle = bits, U32, 1336, [14:14] -isIdleCoasting = bits, U32, 1336, [15:15] -isIdleClosedLoop = bits, U32, 1336, [16:16] -idleTarget = scalar, S32, 1340, "", 1, 0 -targetRpmByClt = scalar, S32, 1344, "", 1, 0 -targetRpmAc = scalar, S32, 1348, "", 1, 0 -iacByRpmTaper = scalar, F32, 1352 -luaAdd = scalar, F32, 1356 -; total TS size = 1360 -idlePosition0 = scalar, F32, 1360, "per", 1,0 -trim0 = scalar, F32, 1364, "", 1, 0 -luaAdjustment0 = scalar, F32, 1368, "per", 1,0 -m_wastegatePosition0 = scalar, F32, 1372, "per", 1,0 -etbFeedForward0 = scalar, F32, 1376 -etbIntegralError0 = scalar, F32, 1380, "", 1, 0 -etbCurrentTarget0 = scalar, F32, 1384, "%", 1, 0 -etbCurrentAdjustedTarget0 = scalar, F32, 1388, "%", 1, 0 -etbRevLimitActive0 = bits, U32, 1392, [0:0] -jamDetected0 = bits, U32, 1392, [1:1] -etbDutyRateOfChange0 = scalar, F32, 1396, "per", 1,0 -etbDutyAverage0 = scalar, F32, 1400, "per", 1,0 -etbTpsErrorCounter0 = scalar, U16, 1404, "count", 1,0 -etbPpsErrorCounter0 = scalar, U16, 1406, "count", 1,0 -etbErrorCode0 = scalar, S08, 1408, "", 1, 0 -tcEtbDrop0 = scalar, S08, 1409, "", 1, 0 -jamTimer0 = scalar, U16, 1410, "sec", 0.01, 0 -; total TS size = 1412 -faultCode0 = scalar, U08, 1412, "", 1, 0 -heaterDuty0 = scalar, U08, 1413, "%", 1, 0 -pumpDuty0 = scalar, U08, 1414, "%", 1, 0 -tempC0 = scalar, U16, 1416, "C", 1, 0 -nernstVoltage0 = scalar, U16, 1418, "V", 0.001, 0 -esr0 = scalar, U16, 1420, "ohm", 1, 0 +luaSoftSparkSkip = scalar, F32, 1124, "", 1, 0 +luaHardSparkSkip = scalar, F32, 1128, "", 1, 0 +tractionControlSparkSkip = scalar, F32, 1132, "", 1, 0 +desiredRpmLimit = scalar, S16, 1136, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 1140, "", 1, 0 +globalSparkCounter = scalar, U32, 1144, "", 1, 0 +fuelingLoad = scalar, F32, 1148, "", 1, 0 +ignitionLoad = scalar, F32, 1152, "", 1, 0 +veTableYAxis = scalar, U16, 1156, "%", 0.01, 0 +; total TS size = 1160 +tpsFrom = scalar, F32, 1160 +tpsTo = scalar, F32, 1164 +deltaTps = scalar, F32, 1168 +extraFuel = scalar, F32, 1172, "", 1, 0 +valueFromTable = scalar, F32, 1176, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1180, [0:0] +isBelowDecelThreshold = bits, U32, 1180, [1:1] +isTimeToResetAccumulator = bits, U32, 1180, [2:2] +isFractionalEnrichment = bits, U32, 1180, [3:3] +belowEpsilon = bits, U32, 1180, [4:4] +tooShort = bits, U32, 1180, [5:5] +fractionalInjFuel = scalar, F32, 1184, "", 1, 0 +accumulatedValue = scalar, F32, 1188, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1192, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1196, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1200, "", 1, 0 +cycleCnt = scalar, S32, 1204, "", 1, 0 +; total TS size = 1208 +hwEventCounters1 = scalar, U32, 1208, "", 1, 0 +hwEventCounters2 = scalar, U32, 1212, "", 1, 0 +hwEventCounters3 = scalar, U32, 1216, "", 1, 0 +hwEventCounters4 = scalar, U32, 1220, "", 1, 0 +hwEventCounters5 = scalar, U32, 1224, "", 1, 0 +hwEventCounters6 = scalar, U32, 1228, "", 1, 0 +vvtCamCounter = scalar, U32, 1232, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1236, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1240, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1244, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1245, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1248, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1252, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1256, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1260, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1264, [0:0] +; total TS size = 1268 +crankSynchronizationCounter0 = scalar, U32, 1268, "", 1, 0 +vvtSyncGapRatio0 = scalar, F32, 1272, "", 1, 0 +vvtToothDurations00 = scalar, U32, 1276, "us", 1, 0 +vvtCurrentPosition0 = scalar, F32, 1280, "sync: Primary Cam Position", 1, 0 +vvtToothPosition10 = scalar, F32, 1284, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition20 = scalar, F32, 1288, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition30 = scalar, F32, 1292, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition40 = scalar, F32, 1296, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio0 = scalar, F32, 1300, "", 1, 0 +triggerStateIndex0 = scalar, U08, 1304, "", 1, 0 +vvtStateIndex0 = scalar, U08, 1305, "", 1, 0 +; total TS size = 1308 +camResyncCounter = scalar, U08, 1308, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1312, [0:0] +; total TS size = 1316 +wallFuelCorrection = scalar, F32, 1316, "", 1, 0 +wallFuel = scalar, F32, 1320, "", 1, 0 +; total TS size = 1324 +idleState = bits, S32, 1324, [0:2], "not important" +currentIdlePosition = scalar, F32, 1328 +baseIdlePosition = scalar, F32, 1332 +idleClosedLoop = scalar, F32, 1336 +iacByTpsTaper = scalar, F32, 1340 +throttlePedalUpState = scalar, S32, 1344, "", 1, 0 +mightResetPid = bits, U32, 1348, [0:0] +shouldResetPid = bits, U32, 1348, [1:1] +wasResetPid = bits, U32, 1348, [2:2] +mustResetPid = bits, U32, 1348, [3:3] +isCranking = bits, U32, 1348, [4:4] +isIacTableForCoasting = bits, U32, 1348, [5:5] +notIdling = bits, U32, 1348, [6:6] +needReset = bits, U32, 1348, [7:7] +isInDeadZone = bits, U32, 1348, [8:8] +isBlipping = bits, U32, 1348, [9:9] +useClosedLoop = bits, U32, 1348, [10:10] +badTps = bits, U32, 1348, [11:11] +looksLikeRunning = bits, U32, 1348, [12:12] +looksLikeCoasting = bits, U32, 1348, [13:13] +looksLikeCrankToIdle = bits, U32, 1348, [14:14] +isIdleCoasting = bits, U32, 1348, [15:15] +isIdleClosedLoop = bits, U32, 1348, [16:16] +idleTarget = scalar, S32, 1352, "", 1, 0 +targetRpmByClt = scalar, S32, 1356, "", 1, 0 +targetRpmAc = scalar, S32, 1360, "", 1, 0 +iacByRpmTaper = scalar, F32, 1364 +luaAdd = scalar, F32, 1368 +; total TS size = 1372 +idlePosition0 = scalar, F32, 1372, "per", 1,0 +trim0 = scalar, F32, 1376, "", 1, 0 +luaAdjustment0 = scalar, F32, 1380, "per", 1,0 +m_wastegatePosition0 = scalar, F32, 1384, "per", 1,0 +etbFeedForward0 = scalar, F32, 1388 +etbIntegralError0 = scalar, F32, 1392, "", 1, 0 +etbCurrentTarget0 = scalar, F32, 1396, "%", 1, 0 +etbCurrentAdjustedTarget0 = scalar, F32, 1400, "%", 1, 0 +etbRevLimitActive0 = bits, U32, 1404, [0:0] +jamDetected0 = bits, U32, 1404, [1:1] +etbDutyRateOfChange0 = scalar, F32, 1408, "per", 1,0 +etbDutyAverage0 = scalar, F32, 1412, "per", 1,0 +etbTpsErrorCounter0 = scalar, U16, 1416, "count", 1,0 +etbPpsErrorCounter0 = scalar, U16, 1418, "count", 1,0 +etbErrorCode0 = scalar, S08, 1420, "", 1, 0 +tcEtbDrop0 = scalar, S08, 1421, "", 1, 0 +jamTimer0 = scalar, U16, 1422, "sec", 0.01, 0 ; total TS size = 1424 -dcOutput0 = scalar, F32, 1424, "per", 1,0 -isEnabled0_int = scalar, U08, 1428, "per", 1,0 -isEnabled0 = bits, U32, 1432, [0:0] +faultCode0 = scalar, U08, 1424, "", 1, 0 +heaterDuty0 = scalar, U08, 1425, "%", 1, 0 +pumpDuty0 = scalar, U08, 1426, "%", 1, 0 +tempC0 = scalar, U16, 1428, "C", 1, 0 +nernstVoltage0 = scalar, U16, 1430, "V", 0.001, 0 +esr0 = scalar, U16, 1432, "ohm", 1, 0 ; total TS size = 1436 -value0 = scalar, U16, 1436, "value", 1,0 -value1 = scalar, U16, 1438, "value", 1,0 -errorRate = scalar, F32, 1440, "ratio", 1,0 -; total TS size = 1444 -vvtTarget = scalar, U16, 1444, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1446, "%", 0.5, 0 +dcOutput0 = scalar, F32, 1436, "per", 1,0 +isEnabled0_int = scalar, U08, 1440, "per", 1,0 +isEnabled0 = bits, U32, 1444, [0:0] ; total TS size = 1448 -lambdaCurrentlyGood = bits, U32, 1448, [0:0] -lambdaMonitorCut = bits, U32, 1448, [1:1] -lambdaTimeSinceGood = scalar, U16, 1452, "sec", 0.01, 0 +value0 = scalar, U16, 1448, "value", 1,0 +value1 = scalar, U16, 1450, "value", 1,0 +errorRate = scalar, F32, 1452, "ratio", 1,0 ; total TS size = 1456 +vvtTarget = scalar, U16, 1456, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1458, "%", 0.5, 0 +; total TS size = 1460 +lambdaCurrentlyGood = bits, U32, 1460, [0:0] +lambdaMonitorCut = bits, U32, 1460, [1:1] +lambdaTimeSinceGood = scalar, U16, 1464, "sec", 0.01, 0 +; total TS size = 1468 time = { timeNow } @@ -5401,7 +5404,6 @@ entry = smartChipState, "smartChipState", int, "%d" entry = smartChipRestartCounter, "smartChipRestartCounter", int, "%d" entry = smartChipAliveCounter, "smartChipAliveCounter", int, "%d" entry = startStopPhysicalState, "startStopPhysicalState", int, "%d" -entry = acrStateDup, "acrStateDup", int, "%d" entry = acrEngineMovedRecently, "acrEngineMovedRecently", int, "%d" entry = heaterControlEnabled, "heaterControlEnabled", int, "%d" entry = luaDigitalState0, "luaDigitalState0", int, "%d" @@ -5411,6 +5413,9 @@ entry = luaDigitalState3, "luaDigitalState3", int, "%d" entry = startStopStateToggleCounter, "startStopStateToggleCounter", int, "%d" entry = egtValue1, "egtValue1", float, "%.3f" entry = egtValue2, "egtValue2", float, "%.3f" +entry = luaSoftSparkSkip, "luaSoftSparkSkip", float, "%.3f" +entry = luaHardSparkSkip, "luaHardSparkSkip", float, "%.3f" +entry = tractionControlSparkSkip, "tractionControlSparkSkip", float, "%.3f" entry = desiredRpmLimit, "User-defined RPM hard limit", int, "%d" entry = fuelInjectionCounter, "Fuel: Injection counter", int, "%d" entry = globalSparkCounter, "Ign: Spark counter", int, "%d" @@ -5912,7 +5917,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 @@ -6362,7 +6367,6 @@ indicatorPanel = engine_stateIndicatorPanel, 2 indicator = {lua_luaDisableEtb}, "luaDisableEtb No", "luaDisableEtb Yes" indicator = {lua_luaIgnCut}, "luaIgnCut No", "luaIgnCut Yes" indicator = {startStopPhysicalState}, "startStopPhysicalState No", "startStopPhysicalState Yes" - indicator = {acrStateDup}, "acrStateDup No", "acrStateDup Yes" indicator = {acrEngineMovedRecently}, "acrEngineMovedRecently No", "acrEngineMovedRecently Yes" indicator = {heaterControlEnabled}, "heaterControlEnabled No", "heaterControlEnabled Yes" indicator = {luaDigitalState0}, "luaDigitalState0 No", "luaDigitalState0 Yes" @@ -6398,12 +6402,16 @@ dialog = engine_stateDialog, "engine_state" graphLine = egtValue1 graphLine = egtValue2 liveGraph = engine_state_6_Graph, "Graph", South + graphLine = luaSoftSparkSkip + graphLine = luaHardSparkSkip + graphLine = tractionControlSparkSkip graphLine = desiredRpmLimit + liveGraph = engine_state_7_Graph, "Graph", South graphLine = fuelInjectionCounter graphLine = globalSparkCounter graphLine = fuelingLoad - liveGraph = engine_state_7_Graph, "Graph", South graphLine = ignitionLoad + liveGraph = engine_state_8_Graph, "Graph", South graphLine = veTableYAxis indicatorPanel = tps_accel_stateIndicatorPanel, 2 @@ -7310,6 +7318,10 @@ dialog = lambda_monitorDialog, "lambda_monitor" 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 diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/DcMotors.java b/java_console/models/src/main/java/com/rusefi/config/generated/DcMotors.java index 4ac0fe8978..7753d92706 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/DcMotors.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/DcMotors.java @@ -1,6 +1,6 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEFI tool config_definition_base.jar based on (unknown script) controllers/actuators/dc_motors.txt Sun Jan 07 23:16:15 UTC 2024 +// this file was generated automatically by rusEFI tool config_definition_base-all.jar based on (unknown script) controllers/actuators/dc_motors.txt Tue Mar 05 01:56:09 UTC 2024 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -172,10 +172,10 @@ public class DcMotors { public static final int TCU_GEAR_COUNT = 10; public static final int TPS_2_BYTE_PACKING_MULT = 100; public static final int VE_BLEND_COUNT = 4; - public static final Field DCOUTPUT0 = Field.create("DCOUTPUT0", 0, FieldType.FLOAT).setBaseOffset(1424); - public static final Field ISENABLED0_INT = Field.create("ISENABLED0_INT", 4, FieldType.INT8).setScale(1.0).setBaseOffset(1424); - public static final Field ALIGNMENTFILL_AT_5 = Field.create("ALIGNMENTFILL_AT_5", 5, FieldType.INT8).setScale(1.0).setBaseOffset(1424); - public static final Field ISENABLED0 = Field.create("ISENABLED0", 8, FieldType.BIT, 0).setBaseOffset(1424); + public static final Field DCOUTPUT0 = Field.create("DCOUTPUT0", 0, FieldType.FLOAT).setBaseOffset(1436); + public static final Field ISENABLED0_INT = Field.create("ISENABLED0_INT", 4, FieldType.INT8).setScale(1.0).setBaseOffset(1436); + public static final Field ALIGNMENTFILL_AT_5 = Field.create("ALIGNMENTFILL_AT_5", 5, FieldType.INT8).setScale(1.0).setBaseOffset(1436); + public static final Field ISENABLED0 = Field.create("ISENABLED0", 8, FieldType.BIT, 0).setBaseOffset(1436); public static final Field[] VALUES = { DCOUTPUT0, ISENABLED0_INT, diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/ElectronicThrottle.java b/java_console/models/src/main/java/com/rusefi/config/generated/ElectronicThrottle.java index f54f2e5aae..66a7b2e5ad 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/ElectronicThrottle.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/ElectronicThrottle.java @@ -1,6 +1,6 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEFI tool config_definition_base.jar based on (unknown script) controllers/actuators/electronic_throttle.txt Sun Jan 07 23:16:15 UTC 2024 +// this file was generated automatically by rusEFI tool config_definition_base-all.jar based on (unknown script) controllers/actuators/electronic_throttle.txt Tue Mar 05 01:56:09 UTC 2024 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -172,23 +172,23 @@ public class ElectronicThrottle { public static final int TCU_GEAR_COUNT = 10; public static final int TPS_2_BYTE_PACKING_MULT = 100; public static final int VE_BLEND_COUNT = 4; - public static final Field IDLEPOSITION = Field.create("IDLEPOSITION", 0, FieldType.FLOAT).setBaseOffset(1360); - public static final Field TRIM = Field.create("TRIM", 4, FieldType.FLOAT).setBaseOffset(1360); - public static final Field LUAADJUSTMENT = Field.create("LUAADJUSTMENT", 8, FieldType.FLOAT).setBaseOffset(1360); - public static final Field M_WASTEGATEPOSITION = Field.create("M_WASTEGATEPOSITION", 12, FieldType.FLOAT).setBaseOffset(1360); - public static final Field ETBFEEDFORWARD = Field.create("ETBFEEDFORWARD", 16, FieldType.FLOAT).setBaseOffset(1360); - public static final Field ETBINTEGRALERROR = Field.create("ETBINTEGRALERROR", 20, FieldType.FLOAT).setBaseOffset(1360); - public static final Field ETBCURRENTTARGET = Field.create("ETBCURRENTTARGET", 24, FieldType.FLOAT).setBaseOffset(1360); - public static final Field ETBCURRENTADJUSTEDTARGET = Field.create("ETBCURRENTADJUSTEDTARGET", 28, FieldType.FLOAT).setBaseOffset(1360); - public static final Field ETBREVLIMITACTIVE = Field.create("ETBREVLIMITACTIVE", 32, FieldType.BIT, 0).setBaseOffset(1360); - public static final Field JAMDETECTED = Field.create("JAMDETECTED", 32, FieldType.BIT, 1).setBaseOffset(1360); - public static final Field ETBDUTYRATEOFCHANGE = Field.create("ETBDUTYRATEOFCHANGE", 36, FieldType.FLOAT).setBaseOffset(1360); - public static final Field ETBDUTYAVERAGE = Field.create("ETBDUTYAVERAGE", 40, FieldType.FLOAT).setBaseOffset(1360); - public static final Field ETBTPSERRORCOUNTER = Field.create("ETBTPSERRORCOUNTER", 44, FieldType.INT16).setScale(1.0).setBaseOffset(1360); - public static final Field ETBPPSERRORCOUNTER = Field.create("ETBPPSERRORCOUNTER", 46, FieldType.INT16).setScale(1.0).setBaseOffset(1360); - public static final Field ETBERRORCODE = Field.create("ETBERRORCODE", 48, FieldType.INT8).setScale(1.0).setBaseOffset(1360); - public static final Field TCETBDROP = Field.create("TCETBDROP", 49, FieldType.INT8).setScale(1.0).setBaseOffset(1360); - public static final Field JAMTIMER = Field.create("JAMTIMER", 50, FieldType.INT16).setScale(0.01).setBaseOffset(1360); + public static final Field IDLEPOSITION = Field.create("IDLEPOSITION", 0, FieldType.FLOAT).setBaseOffset(1372); + public static final Field TRIM = Field.create("TRIM", 4, FieldType.FLOAT).setBaseOffset(1372); + public static final Field LUAADJUSTMENT = Field.create("LUAADJUSTMENT", 8, FieldType.FLOAT).setBaseOffset(1372); + public static final Field M_WASTEGATEPOSITION = Field.create("M_WASTEGATEPOSITION", 12, FieldType.FLOAT).setBaseOffset(1372); + public static final Field ETBFEEDFORWARD = Field.create("ETBFEEDFORWARD", 16, FieldType.FLOAT).setBaseOffset(1372); + public static final Field ETBINTEGRALERROR = Field.create("ETBINTEGRALERROR", 20, FieldType.FLOAT).setBaseOffset(1372); + public static final Field ETBCURRENTTARGET = Field.create("ETBCURRENTTARGET", 24, FieldType.FLOAT).setBaseOffset(1372); + public static final Field ETBCURRENTADJUSTEDTARGET = Field.create("ETBCURRENTADJUSTEDTARGET", 28, FieldType.FLOAT).setBaseOffset(1372); + public static final Field ETBREVLIMITACTIVE = Field.create("ETBREVLIMITACTIVE", 32, FieldType.BIT, 0).setBaseOffset(1372); + public static final Field JAMDETECTED = Field.create("JAMDETECTED", 32, FieldType.BIT, 1).setBaseOffset(1372); + public static final Field ETBDUTYRATEOFCHANGE = Field.create("ETBDUTYRATEOFCHANGE", 36, FieldType.FLOAT).setBaseOffset(1372); + public static final Field ETBDUTYAVERAGE = Field.create("ETBDUTYAVERAGE", 40, FieldType.FLOAT).setBaseOffset(1372); + public static final Field ETBTPSERRORCOUNTER = Field.create("ETBTPSERRORCOUNTER", 44, FieldType.INT16).setScale(1.0).setBaseOffset(1372); + public static final Field ETBPPSERRORCOUNTER = Field.create("ETBPPSERRORCOUNTER", 46, FieldType.INT16).setScale(1.0).setBaseOffset(1372); + public static final Field ETBERRORCODE = Field.create("ETBERRORCODE", 48, FieldType.INT8).setScale(1.0).setBaseOffset(1372); + public static final Field TCETBDROP = Field.create("TCETBDROP", 49, FieldType.INT8).setScale(1.0).setBaseOffset(1372); + public static final Field JAMTIMER = Field.create("JAMTIMER", 50, FieldType.INT16).setScale(0.01).setBaseOffset(1372); public static final Field[] VALUES = { IDLEPOSITION, TRIM, diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/EngineState.java b/java_console/models/src/main/java/com/rusefi/config/generated/EngineState.java index 7e60a53c47..f2caefaf77 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/EngineState.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/EngineState.java @@ -1,6 +1,6 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEFI tool config_definition_base-all.jar based on (unknown script) controllers/algo/engine_state.txt Thu Feb 29 05:30:55 UTC 2024 +// this file was generated automatically by rusEFI tool config_definition_base-all.jar based on (unknown script) controllers/algo/engine_state.txt Tue Mar 05 01:56:09 UTC 2024 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -198,24 +198,26 @@ public class EngineState { public static final Field SMARTCHIPALIVECOUNTER = Field.create("SMARTCHIPALIVECOUNTER", 48, FieldType.INT8).setScale(1.0).setBaseOffset(1056); public static final Field ALIGNMENTFILL_AT_49 = Field.create("ALIGNMENTFILL_AT_49", 49, FieldType.INT8).setScale(1.0).setBaseOffset(1056); public static final Field STARTSTOPPHYSICALSTATE = Field.create("STARTSTOPPHYSICALSTATE", 52, FieldType.BIT, 0).setBaseOffset(1056); - public static final Field ACRSTATEDUP = Field.create("ACRSTATEDUP", 52, FieldType.BIT, 1).setBaseOffset(1056); - public static final Field ACRENGINEMOVEDRECENTLY = Field.create("ACRENGINEMOVEDRECENTLY", 52, FieldType.BIT, 2).setBaseOffset(1056); - public static final Field HEATERCONTROLENABLED = Field.create("HEATERCONTROLENABLED", 52, FieldType.BIT, 3).setBaseOffset(1056); - public static final Field LUADIGITALSTATE0 = Field.create("LUADIGITALSTATE0", 52, FieldType.BIT, 4).setBaseOffset(1056); - public static final Field LUADIGITALSTATE1 = Field.create("LUADIGITALSTATE1", 52, FieldType.BIT, 5).setBaseOffset(1056); - public static final Field LUADIGITALSTATE2 = Field.create("LUADIGITALSTATE2", 52, FieldType.BIT, 6).setBaseOffset(1056); - public static final Field LUADIGITALSTATE3 = Field.create("LUADIGITALSTATE3", 52, FieldType.BIT, 7).setBaseOffset(1056); + public static final Field ACRENGINEMOVEDRECENTLY = Field.create("ACRENGINEMOVEDRECENTLY", 52, FieldType.BIT, 1).setBaseOffset(1056); + public static final Field HEATERCONTROLENABLED = Field.create("HEATERCONTROLENABLED", 52, FieldType.BIT, 2).setBaseOffset(1056); + public static final Field LUADIGITALSTATE0 = Field.create("LUADIGITALSTATE0", 52, FieldType.BIT, 3).setBaseOffset(1056); + public static final Field LUADIGITALSTATE1 = Field.create("LUADIGITALSTATE1", 52, FieldType.BIT, 4).setBaseOffset(1056); + public static final Field LUADIGITALSTATE2 = Field.create("LUADIGITALSTATE2", 52, FieldType.BIT, 5).setBaseOffset(1056); + public static final Field LUADIGITALSTATE3 = Field.create("LUADIGITALSTATE3", 52, FieldType.BIT, 6).setBaseOffset(1056); public static final Field STARTSTOPSTATETOGGLECOUNTER = Field.create("STARTSTOPSTATETOGGLECOUNTER", 56, FieldType.INT).setScale(1.0).setBaseOffset(1056); public static final Field EGTVALUE1 = Field.create("EGTVALUE1", 60, FieldType.FLOAT).setBaseOffset(1056); public static final Field EGTVALUE2 = Field.create("EGTVALUE2", 64, FieldType.FLOAT).setBaseOffset(1056); - public static final Field DESIREDRPMLIMIT = Field.create("DESIREDRPMLIMIT", 68, FieldType.INT16).setScale(1.0).setBaseOffset(1056); - public static final Field ALIGNMENTFILL_AT_70 = Field.create("ALIGNMENTFILL_AT_70", 70, FieldType.INT8).setScale(1.0).setBaseOffset(1056); - public static final Field FUELINJECTIONCOUNTER = Field.create("FUELINJECTIONCOUNTER", 72, FieldType.INT).setScale(1.0).setBaseOffset(1056); - public static final Field GLOBALSPARKCOUNTER = Field.create("GLOBALSPARKCOUNTER", 76, FieldType.INT).setScale(1.0).setBaseOffset(1056); - public static final Field FUELINGLOAD = Field.create("FUELINGLOAD", 80, FieldType.FLOAT).setBaseOffset(1056); - public static final Field IGNITIONLOAD = Field.create("IGNITIONLOAD", 84, FieldType.FLOAT).setBaseOffset(1056); - public static final Field VETABLEYAXIS = Field.create("VETABLEYAXIS", 88, FieldType.INT16).setScale(0.01).setBaseOffset(1056); - public static final Field ALIGNMENTFILL_AT_90 = Field.create("ALIGNMENTFILL_AT_90", 90, FieldType.INT8).setScale(1.0).setBaseOffset(1056); + public static final Field LUASOFTSPARKSKIP = Field.create("LUASOFTSPARKSKIP", 68, FieldType.FLOAT).setBaseOffset(1056); + public static final Field LUAHARDSPARKSKIP = Field.create("LUAHARDSPARKSKIP", 72, FieldType.FLOAT).setBaseOffset(1056); + public static final Field TRACTIONCONTROLSPARKSKIP = Field.create("TRACTIONCONTROLSPARKSKIP", 76, FieldType.FLOAT).setBaseOffset(1056); + public static final Field DESIREDRPMLIMIT = Field.create("DESIREDRPMLIMIT", 80, FieldType.INT16).setScale(1.0).setBaseOffset(1056); + public static final Field ALIGNMENTFILL_AT_82 = Field.create("ALIGNMENTFILL_AT_82", 82, FieldType.INT8).setScale(1.0).setBaseOffset(1056); + public static final Field FUELINJECTIONCOUNTER = Field.create("FUELINJECTIONCOUNTER", 84, FieldType.INT).setScale(1.0).setBaseOffset(1056); + public static final Field GLOBALSPARKCOUNTER = Field.create("GLOBALSPARKCOUNTER", 88, FieldType.INT).setScale(1.0).setBaseOffset(1056); + public static final Field FUELINGLOAD = Field.create("FUELINGLOAD", 92, FieldType.FLOAT).setBaseOffset(1056); + public static final Field IGNITIONLOAD = Field.create("IGNITIONLOAD", 96, FieldType.FLOAT).setBaseOffset(1056); + public static final Field VETABLEYAXIS = Field.create("VETABLEYAXIS", 100, FieldType.INT16).setScale(0.01).setBaseOffset(1056); + public static final Field ALIGNMENTFILL_AT_102 = Field.create("ALIGNMENTFILL_AT_102", 102, FieldType.INT8).setScale(1.0).setBaseOffset(1056); public static final Field[] VALUES = { LUA_FUELADD, LUA_FUELMULT, @@ -243,7 +245,6 @@ public class EngineState { SMARTCHIPALIVECOUNTER, ALIGNMENTFILL_AT_49, STARTSTOPPHYSICALSTATE, - ACRSTATEDUP, ACRENGINEMOVEDRECENTLY, HEATERCONTROLENABLED, LUADIGITALSTATE0, @@ -253,13 +254,16 @@ public class EngineState { STARTSTOPSTATETOGGLECOUNTER, EGTVALUE1, EGTVALUE2, + LUASOFTSPARKSKIP, + LUAHARDSPARKSKIP, + TRACTIONCONTROLSPARKSKIP, DESIREDRPMLIMIT, - ALIGNMENTFILL_AT_70, + ALIGNMENTFILL_AT_82, FUELINJECTIONCOUNTER, GLOBALSPARKCOUNTER, FUELINGLOAD, IGNITIONLOAD, VETABLEYAXIS, - ALIGNMENTFILL_AT_90, + ALIGNMENTFILL_AT_102, }; } diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/Fields.java b/java_console/models/src/main/java/com/rusefi/config/generated/Fields.java index f12e725b2b..8087a6fd55 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/Fields.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/Fields.java @@ -1,6 +1,6 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue Mar 05 00:53:15 UTC 2024 +// this file was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue Mar 05 01:57:18 UTC 2024 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -1345,11 +1345,11 @@ public class Fields { public static final int TS_RESPONSE_UNDERRUN = 0x80; public static final int TS_RESPONSE_UNRECOGNIZED_COMMAND = 0x83; public static final char TS_SET_LOGGER_SWITCH = 'l'; - public static final String TS_SIGNATURE = "rusEFI master.2024.03.05.f407-discovery.3808613738"; + public static final String TS_SIGNATURE = "rusEFI master.2024.03.05.f407-discovery.2895668562"; public static final char TS_SIMULATE_CAN = '>'; public static final char TS_SINGLE_WRITE_COMMAND = 'W'; public static final char TS_TEST_COMMAND = 't'; - public static final int TS_TOTAL_OUTPUT_SIZE = 1456; + public static final int TS_TOTAL_OUTPUT_SIZE = 1468; public static final String TS_TRIGGER_SCOPE_CHANNEL_1_NAME = "Channel 1"; public static final String TS_TRIGGER_SCOPE_CHANNEL_2_NAME = "Channel 2"; public static final int TS_TRIGGER_SCOPE_DISABLE = 5; @@ -2110,6 +2110,7 @@ public class Fields { public static final Field ENABLEEXTENDEDCANBROADCAST = Field.create("ENABLEEXTENDEDCANBROADCAST", 1576, FieldType.BIT, 5).setBaseOffset(0); public static final Field LUACANRXWORKAROUND = Field.create("LUACANRXWORKAROUND", 1576, FieldType.BIT, 6).setBaseOffset(0); public static final Field FLEXSENSORINVERTED = Field.create("FLEXSENSORINVERTED", 1576, FieldType.BIT, 7).setBaseOffset(0); + public static final Field USEHARDSKIPINTRACTION = Field.create("USEHARDSKIPINTRACTION", 1576, FieldType.BIT, 8).setBaseOffset(0); public static final Field USEAUXSPEEDFORSLIPRATIO = Field.create("USEAUXSPEEDFORSLIPRATIO", 1576, FieldType.BIT, 11).setBaseOffset(0); public static final Field USEVSSASSECONDWHEELSPEED = Field.create("USEVSSASSECONDWHEELSPEED", 1576, FieldType.BIT, 12).setBaseOffset(0); public static final Field IS_ENABLED_SPI_5 = Field.create("IS_ENABLED_SPI_5", 1576, FieldType.BIT, 13).setBaseOffset(0); @@ -3753,6 +3754,7 @@ public class Fields { ENABLEEXTENDEDCANBROADCAST, LUACANRXWORKAROUND, FLEXSENSORINVERTED, + USEHARDSKIPINTRACTION, USEAUXSPEEDFORSLIPRATIO, USEVSSASSECONDWHEELSPEED, IS_ENABLED_SPI_5, diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/IdleState.java b/java_console/models/src/main/java/com/rusefi/config/generated/IdleState.java index 8ea1be0035..b14c1f81b8 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/IdleState.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/IdleState.java @@ -1,6 +1,6 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEFI tool config_definition_base.jar based on (unknown script) controllers/actuators/idle_state.txt Sun Jan 07 23:16:15 UTC 2024 +// this file was generated automatically by rusEFI tool config_definition_base-all.jar based on (unknown script) controllers/actuators/idle_state.txt Tue Mar 05 01:56:09 UTC 2024 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -172,34 +172,34 @@ public class IdleState { public static final int TCU_GEAR_COUNT = 10; public static final int TPS_2_BYTE_PACKING_MULT = 100; public static final int VE_BLEND_COUNT = 4; - public static final Field IDLESTATE = Field.create("IDLESTATE", 0, FieldType.INT).setScale(1.0).setBaseOffset(1312); - public static final Field CURRENTIDLEPOSITION = Field.create("CURRENTIDLEPOSITION", 4, FieldType.FLOAT).setBaseOffset(1312); - public static final Field BASEIDLEPOSITION = Field.create("BASEIDLEPOSITION", 8, FieldType.FLOAT).setBaseOffset(1312); - public static final Field IDLECLOSEDLOOP = Field.create("IDLECLOSEDLOOP", 12, FieldType.FLOAT).setBaseOffset(1312); - public static final Field IACBYTPSTAPER = Field.create("IACBYTPSTAPER", 16, FieldType.FLOAT).setBaseOffset(1312); - public static final Field THROTTLEPEDALUPSTATE = Field.create("THROTTLEPEDALUPSTATE", 20, FieldType.INT).setScale(1.0).setBaseOffset(1312); - public static final Field MIGHTRESETPID = Field.create("MIGHTRESETPID", 24, FieldType.BIT, 0).setBaseOffset(1312); - public static final Field SHOULDRESETPID = Field.create("SHOULDRESETPID", 24, FieldType.BIT, 1).setBaseOffset(1312); - public static final Field WASRESETPID = Field.create("WASRESETPID", 24, FieldType.BIT, 2).setBaseOffset(1312); - public static final Field MUSTRESETPID = Field.create("MUSTRESETPID", 24, FieldType.BIT, 3).setBaseOffset(1312); - public static final Field ISCRANKING = Field.create("ISCRANKING", 24, FieldType.BIT, 4).setBaseOffset(1312); - public static final Field ISIACTABLEFORCOASTING = Field.create("ISIACTABLEFORCOASTING", 24, FieldType.BIT, 5).setBaseOffset(1312); - public static final Field NOTIDLING = Field.create("NOTIDLING", 24, FieldType.BIT, 6).setBaseOffset(1312); - public static final Field NEEDRESET = Field.create("NEEDRESET", 24, FieldType.BIT, 7).setBaseOffset(1312); - public static final Field ISINDEADZONE = Field.create("ISINDEADZONE", 24, FieldType.BIT, 8).setBaseOffset(1312); - public static final Field ISBLIPPING = Field.create("ISBLIPPING", 24, FieldType.BIT, 9).setBaseOffset(1312); - public static final Field USECLOSEDLOOP = Field.create("USECLOSEDLOOP", 24, FieldType.BIT, 10).setBaseOffset(1312); - public static final Field BADTPS = Field.create("BADTPS", 24, FieldType.BIT, 11).setBaseOffset(1312); - public static final Field LOOKSLIKERUNNING = Field.create("LOOKSLIKERUNNING", 24, FieldType.BIT, 12).setBaseOffset(1312); - public static final Field LOOKSLIKECOASTING = Field.create("LOOKSLIKECOASTING", 24, FieldType.BIT, 13).setBaseOffset(1312); - public static final Field LOOKSLIKECRANKTOIDLE = Field.create("LOOKSLIKECRANKTOIDLE", 24, FieldType.BIT, 14).setBaseOffset(1312); - public static final Field ISIDLECOASTING = Field.create("ISIDLECOASTING", 24, FieldType.BIT, 15).setBaseOffset(1312); - public static final Field ISIDLECLOSEDLOOP = Field.create("ISIDLECLOSEDLOOP", 24, FieldType.BIT, 16).setBaseOffset(1312); - public static final Field IDLETARGET = Field.create("IDLETARGET", 28, FieldType.INT).setScale(1.0).setBaseOffset(1312); - public static final Field TARGETRPMBYCLT = Field.create("TARGETRPMBYCLT", 32, FieldType.INT).setScale(1.0).setBaseOffset(1312); - public static final Field TARGETRPMAC = Field.create("TARGETRPMAC", 36, FieldType.INT).setScale(1.0).setBaseOffset(1312); - public static final Field IACBYRPMTAPER = Field.create("IACBYRPMTAPER", 40, FieldType.FLOAT).setBaseOffset(1312); - public static final Field LUAADD = Field.create("LUAADD", 44, FieldType.FLOAT).setBaseOffset(1312); + public static final Field IDLESTATE = Field.create("IDLESTATE", 0, FieldType.INT).setScale(1.0).setBaseOffset(1324); + public static final Field CURRENTIDLEPOSITION = Field.create("CURRENTIDLEPOSITION", 4, FieldType.FLOAT).setBaseOffset(1324); + public static final Field BASEIDLEPOSITION = Field.create("BASEIDLEPOSITION", 8, FieldType.FLOAT).setBaseOffset(1324); + public static final Field IDLECLOSEDLOOP = Field.create("IDLECLOSEDLOOP", 12, FieldType.FLOAT).setBaseOffset(1324); + public static final Field IACBYTPSTAPER = Field.create("IACBYTPSTAPER", 16, FieldType.FLOAT).setBaseOffset(1324); + public static final Field THROTTLEPEDALUPSTATE = Field.create("THROTTLEPEDALUPSTATE", 20, FieldType.INT).setScale(1.0).setBaseOffset(1324); + public static final Field MIGHTRESETPID = Field.create("MIGHTRESETPID", 24, FieldType.BIT, 0).setBaseOffset(1324); + public static final Field SHOULDRESETPID = Field.create("SHOULDRESETPID", 24, FieldType.BIT, 1).setBaseOffset(1324); + public static final Field WASRESETPID = Field.create("WASRESETPID", 24, FieldType.BIT, 2).setBaseOffset(1324); + public static final Field MUSTRESETPID = Field.create("MUSTRESETPID", 24, FieldType.BIT, 3).setBaseOffset(1324); + public static final Field ISCRANKING = Field.create("ISCRANKING", 24, FieldType.BIT, 4).setBaseOffset(1324); + public static final Field ISIACTABLEFORCOASTING = Field.create("ISIACTABLEFORCOASTING", 24, FieldType.BIT, 5).setBaseOffset(1324); + public static final Field NOTIDLING = Field.create("NOTIDLING", 24, FieldType.BIT, 6).setBaseOffset(1324); + public static final Field NEEDRESET = Field.create("NEEDRESET", 24, FieldType.BIT, 7).setBaseOffset(1324); + public static final Field ISINDEADZONE = Field.create("ISINDEADZONE", 24, FieldType.BIT, 8).setBaseOffset(1324); + public static final Field ISBLIPPING = Field.create("ISBLIPPING", 24, FieldType.BIT, 9).setBaseOffset(1324); + public static final Field USECLOSEDLOOP = Field.create("USECLOSEDLOOP", 24, FieldType.BIT, 10).setBaseOffset(1324); + public static final Field BADTPS = Field.create("BADTPS", 24, FieldType.BIT, 11).setBaseOffset(1324); + public static final Field LOOKSLIKERUNNING = Field.create("LOOKSLIKERUNNING", 24, FieldType.BIT, 12).setBaseOffset(1324); + public static final Field LOOKSLIKECOASTING = Field.create("LOOKSLIKECOASTING", 24, FieldType.BIT, 13).setBaseOffset(1324); + public static final Field LOOKSLIKECRANKTOIDLE = Field.create("LOOKSLIKECRANKTOIDLE", 24, FieldType.BIT, 14).setBaseOffset(1324); + public static final Field ISIDLECOASTING = Field.create("ISIDLECOASTING", 24, FieldType.BIT, 15).setBaseOffset(1324); + public static final Field ISIDLECLOSEDLOOP = Field.create("ISIDLECLOSEDLOOP", 24, FieldType.BIT, 16).setBaseOffset(1324); + public static final Field IDLETARGET = Field.create("IDLETARGET", 28, FieldType.INT).setScale(1.0).setBaseOffset(1324); + public static final Field TARGETRPMBYCLT = Field.create("TARGETRPMBYCLT", 32, FieldType.INT).setScale(1.0).setBaseOffset(1324); + public static final Field TARGETRPMAC = Field.create("TARGETRPMAC", 36, FieldType.INT).setScale(1.0).setBaseOffset(1324); + public static final Field IACBYRPMTAPER = Field.create("IACBYRPMTAPER", 40, FieldType.FLOAT).setBaseOffset(1324); + public static final Field LUAADD = Field.create("LUAADD", 44, FieldType.FLOAT).setBaseOffset(1324); public static final Field[] VALUES = { IDLESTATE, CURRENTIDLEPOSITION, diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/LambdaMonitor.java b/java_console/models/src/main/java/com/rusefi/config/generated/LambdaMonitor.java index a355324057..91384d4876 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/LambdaMonitor.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/LambdaMonitor.java @@ -1,15 +1,15 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEFI tool config_definition_base.jar based on (unknown script) controllers/math/lambda_monitor.txt Sun Jan 07 19:53:44 UTC 2024 +// this file was generated automatically by rusEFI tool config_definition_base-all.jar based on (unknown script) controllers/math/lambda_monitor.txt Tue Mar 05 01:56:09 UTC 2024 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; public class LambdaMonitor { - public static final Field LAMBDACURRENTLYGOOD = Field.create("LAMBDACURRENTLYGOOD", 0, FieldType.BIT, 0).setBaseOffset(1448); - public static final Field LAMBDAMONITORCUT = Field.create("LAMBDAMONITORCUT", 0, FieldType.BIT, 1).setBaseOffset(1448); - public static final Field LAMBDATIMESINCEGOOD = Field.create("LAMBDATIMESINCEGOOD", 4, FieldType.INT16).setScale(0.01).setBaseOffset(1448); - public static final Field ALIGNMENTFILL_AT_6 = Field.create("ALIGNMENTFILL_AT_6", 6, FieldType.INT8).setScale(1.0).setBaseOffset(1448); + public static final Field LAMBDACURRENTLYGOOD = Field.create("LAMBDACURRENTLYGOOD", 0, FieldType.BIT, 0).setBaseOffset(1460); + public static final Field LAMBDAMONITORCUT = Field.create("LAMBDAMONITORCUT", 0, FieldType.BIT, 1).setBaseOffset(1460); + public static final Field LAMBDATIMESINCEGOOD = Field.create("LAMBDATIMESINCEGOOD", 4, FieldType.INT16).setScale(0.01).setBaseOffset(1460); + public static final Field ALIGNMENTFILL_AT_6 = Field.create("ALIGNMENTFILL_AT_6", 6, FieldType.INT8).setScale(1.0).setBaseOffset(1460); public static final Field[] VALUES = { LAMBDACURRENTLYGOOD, LAMBDAMONITORCUT, diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/SentState.java b/java_console/models/src/main/java/com/rusefi/config/generated/SentState.java index 3e40a367dc..a23e26c55f 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/SentState.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/SentState.java @@ -1,6 +1,6 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEFI tool config_definition_base.jar based on (unknown script) controllers/sensors/sent_state.txt Sun Jan 07 23:16:15 UTC 2024 +// this file was generated automatically by rusEFI tool config_definition_base-all.jar based on (unknown script) controllers/sensors/sent_state.txt Tue Mar 05 01:56:09 UTC 2024 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -172,9 +172,9 @@ public class SentState { public static final int TCU_GEAR_COUNT = 10; public static final int TPS_2_BYTE_PACKING_MULT = 100; public static final int VE_BLEND_COUNT = 4; - public static final Field VALUE0 = Field.create("VALUE0", 0, FieldType.INT16).setScale(1.0).setBaseOffset(1436); - public static final Field VALUE1 = Field.create("VALUE1", 2, FieldType.INT16).setScale(1.0).setBaseOffset(1436); - public static final Field ERRORRATE = Field.create("ERRORRATE", 4, FieldType.FLOAT).setBaseOffset(1436); + public static final Field VALUE0 = Field.create("VALUE0", 0, FieldType.INT16).setScale(1.0).setBaseOffset(1448); + public static final Field VALUE1 = Field.create("VALUE1", 2, FieldType.INT16).setScale(1.0).setBaseOffset(1448); + public static final Field ERRORRATE = Field.create("ERRORRATE", 4, FieldType.FLOAT).setBaseOffset(1448); public static final Field[] VALUES = { VALUE0, VALUE1, diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/TpsAccelState.java b/java_console/models/src/main/java/com/rusefi/config/generated/TpsAccelState.java index ce19eaf1d8..8d0448b8b6 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/TpsAccelState.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/TpsAccelState.java @@ -1,6 +1,6 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEFI tool config_definition_base.jar based on (unknown script) controllers/algo/tps_accel_state.txt Sun Jan 07 23:16:15 UTC 2024 +// this file was generated automatically by rusEFI tool config_definition_base-all.jar based on (unknown script) controllers/algo/tps_accel_state.txt Tue Mar 05 01:56:09 UTC 2024 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -172,23 +172,23 @@ public class TpsAccelState { public static final int TCU_GEAR_COUNT = 10; public static final int TPS_2_BYTE_PACKING_MULT = 100; public static final int VE_BLEND_COUNT = 4; - public static final Field TPSFROM = Field.create("TPSFROM", 0, FieldType.FLOAT).setBaseOffset(1148); - public static final Field TPSTO = Field.create("TPSTO", 4, FieldType.FLOAT).setBaseOffset(1148); - public static final Field DELTATPS = Field.create("DELTATPS", 8, FieldType.FLOAT).setBaseOffset(1148); - public static final Field EXTRAFUEL = Field.create("EXTRAFUEL", 12, FieldType.FLOAT).setBaseOffset(1148); - public static final Field VALUEFROMTABLE = Field.create("VALUEFROMTABLE", 16, FieldType.FLOAT).setBaseOffset(1148); - public static final Field ISABOVEACCELTHRESHOLD = Field.create("ISABOVEACCELTHRESHOLD", 20, FieldType.BIT, 0).setBaseOffset(1148); - public static final Field ISBELOWDECELTHRESHOLD = Field.create("ISBELOWDECELTHRESHOLD", 20, FieldType.BIT, 1).setBaseOffset(1148); - public static final Field ISTIMETORESETACCUMULATOR = Field.create("ISTIMETORESETACCUMULATOR", 20, FieldType.BIT, 2).setBaseOffset(1148); - public static final Field ISFRACTIONALENRICHMENT = Field.create("ISFRACTIONALENRICHMENT", 20, FieldType.BIT, 3).setBaseOffset(1148); - public static final Field BELOWEPSILON = Field.create("BELOWEPSILON", 20, FieldType.BIT, 4).setBaseOffset(1148); - public static final Field TOOSHORT = Field.create("TOOSHORT", 20, FieldType.BIT, 5).setBaseOffset(1148); - public static final Field FRACTIONALINJFUEL = Field.create("FRACTIONALINJFUEL", 24, FieldType.FLOAT).setBaseOffset(1148); - public static final Field ACCUMULATEDVALUE = Field.create("ACCUMULATEDVALUE", 28, FieldType.FLOAT).setBaseOffset(1148); - public static final Field MAXEXTRAPERCYCLE = Field.create("MAXEXTRAPERCYCLE", 32, FieldType.FLOAT).setBaseOffset(1148); - public static final Field MAXEXTRAPERPERIOD = Field.create("MAXEXTRAPERPERIOD", 36, FieldType.FLOAT).setBaseOffset(1148); - public static final Field MAXINJECTEDPERPERIOD = Field.create("MAXINJECTEDPERPERIOD", 40, FieldType.FLOAT).setBaseOffset(1148); - public static final Field CYCLECNT = Field.create("CYCLECNT", 44, FieldType.INT).setScale(1.0).setBaseOffset(1148); + public static final Field TPSFROM = Field.create("TPSFROM", 0, FieldType.FLOAT).setBaseOffset(1160); + public static final Field TPSTO = Field.create("TPSTO", 4, FieldType.FLOAT).setBaseOffset(1160); + public static final Field DELTATPS = Field.create("DELTATPS", 8, FieldType.FLOAT).setBaseOffset(1160); + public static final Field EXTRAFUEL = Field.create("EXTRAFUEL", 12, FieldType.FLOAT).setBaseOffset(1160); + public static final Field VALUEFROMTABLE = Field.create("VALUEFROMTABLE", 16, FieldType.FLOAT).setBaseOffset(1160); + public static final Field ISABOVEACCELTHRESHOLD = Field.create("ISABOVEACCELTHRESHOLD", 20, FieldType.BIT, 0).setBaseOffset(1160); + public static final Field ISBELOWDECELTHRESHOLD = Field.create("ISBELOWDECELTHRESHOLD", 20, FieldType.BIT, 1).setBaseOffset(1160); + public static final Field ISTIMETORESETACCUMULATOR = Field.create("ISTIMETORESETACCUMULATOR", 20, FieldType.BIT, 2).setBaseOffset(1160); + public static final Field ISFRACTIONALENRICHMENT = Field.create("ISFRACTIONALENRICHMENT", 20, FieldType.BIT, 3).setBaseOffset(1160); + public static final Field BELOWEPSILON = Field.create("BELOWEPSILON", 20, FieldType.BIT, 4).setBaseOffset(1160); + public static final Field TOOSHORT = Field.create("TOOSHORT", 20, FieldType.BIT, 5).setBaseOffset(1160); + public static final Field FRACTIONALINJFUEL = Field.create("FRACTIONALINJFUEL", 24, FieldType.FLOAT).setBaseOffset(1160); + public static final Field ACCUMULATEDVALUE = Field.create("ACCUMULATEDVALUE", 28, FieldType.FLOAT).setBaseOffset(1160); + public static final Field MAXEXTRAPERCYCLE = Field.create("MAXEXTRAPERCYCLE", 32, FieldType.FLOAT).setBaseOffset(1160); + public static final Field MAXEXTRAPERPERIOD = Field.create("MAXEXTRAPERPERIOD", 36, FieldType.FLOAT).setBaseOffset(1160); + public static final Field MAXINJECTEDPERPERIOD = Field.create("MAXINJECTEDPERPERIOD", 40, FieldType.FLOAT).setBaseOffset(1160); + public static final Field CYCLECNT = Field.create("CYCLECNT", 44, FieldType.INT).setScale(1.0).setBaseOffset(1160); public static final Field[] VALUES = { TPSFROM, TPSTO, diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/TriggerCentral.java b/java_console/models/src/main/java/com/rusefi/config/generated/TriggerCentral.java index d7e4f1083a..0d00ddbaf1 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/TriggerCentral.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/TriggerCentral.java @@ -1,30 +1,30 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEFI tool config_definition_base.jar based on (unknown script) controllers/trigger/trigger_central.txt Sun Jan 07 19:53:44 UTC 2024 +// this file was generated automatically by rusEFI tool config_definition_base-all.jar based on (unknown script) controllers/trigger/trigger_central.txt Tue Mar 05 01:56:09 UTC 2024 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; public class TriggerCentral { public static final int HW_EVENT_TYPES = 6; - public static final Field HWEVENTCOUNTERS1 = Field.create("HWEVENTCOUNTERS1", 0, FieldType.INT).setScale(1.0).setBaseOffset(1196); - public static final Field HWEVENTCOUNTERS2 = Field.create("HWEVENTCOUNTERS2", 4, FieldType.INT).setScale(1.0).setBaseOffset(1196); - public static final Field HWEVENTCOUNTERS3 = Field.create("HWEVENTCOUNTERS3", 8, FieldType.INT).setScale(1.0).setBaseOffset(1196); - public static final Field HWEVENTCOUNTERS4 = Field.create("HWEVENTCOUNTERS4", 12, FieldType.INT).setScale(1.0).setBaseOffset(1196); - public static final Field HWEVENTCOUNTERS5 = Field.create("HWEVENTCOUNTERS5", 16, FieldType.INT).setScale(1.0).setBaseOffset(1196); - public static final Field HWEVENTCOUNTERS6 = Field.create("HWEVENTCOUNTERS6", 20, FieldType.INT).setScale(1.0).setBaseOffset(1196); - public static final Field VVTCAMCOUNTER = Field.create("VVTCAMCOUNTER", 24, FieldType.INT).setScale(1.0).setBaseOffset(1196); - public static final Field MAPVVT_MAP_AT_SPECIAL_POINT = Field.create("MAPVVT_MAP_AT_SPECIAL_POINT", 28, FieldType.FLOAT).setBaseOffset(1196); - public static final Field MAPVVT_MAP_AT_DIFF = Field.create("MAPVVT_MAP_AT_DIFF", 32, FieldType.FLOAT).setBaseOffset(1196); - public static final Field MAPVVT_MAP_AT_CYCLE_COUNT = Field.create("MAPVVT_MAP_AT_CYCLE_COUNT", 36, FieldType.INT8).setScale(1.0).setBaseOffset(1196); - public static final Field MAPVVT_MAP_PEAK = Field.create("MAPVVT_MAP_PEAK", 37, FieldType.INT8).setScale(1.0).setBaseOffset(1196); - public static final Field ALIGNMENTFILL_AT_38 = Field.create("ALIGNMENTFILL_AT_38", 38, FieldType.INT8).setScale(1.0).setBaseOffset(1196); - public static final Field CURRENTENGINEDECODEDPHASE = Field.create("CURRENTENGINEDECODEDPHASE", 40, FieldType.FLOAT).setBaseOffset(1196); - public static final Field TRIGGERTOOTHANGLEERROR = Field.create("TRIGGERTOOTHANGLEERROR", 44, FieldType.FLOAT).setBaseOffset(1196); - public static final Field TRIGGERIGNOREDTOOTHCOUNT = Field.create("TRIGGERIGNOREDTOOTHCOUNT", 48, FieldType.INT8).setScale(1.0).setBaseOffset(1196); - public static final Field ALIGNMENTFILL_AT_49 = Field.create("ALIGNMENTFILL_AT_49", 49, FieldType.INT8).setScale(1.0).setBaseOffset(1196); - public static final Field MAPCAMPREVTOOTHANGLE = Field.create("MAPCAMPREVTOOTHANGLE", 52, FieldType.FLOAT).setBaseOffset(1196); - public static final Field ISDECODINGMAPCAM = Field.create("ISDECODINGMAPCAM", 56, FieldType.BIT, 0).setBaseOffset(1196); + public static final Field HWEVENTCOUNTERS1 = Field.create("HWEVENTCOUNTERS1", 0, FieldType.INT).setScale(1.0).setBaseOffset(1208); + public static final Field HWEVENTCOUNTERS2 = Field.create("HWEVENTCOUNTERS2", 4, FieldType.INT).setScale(1.0).setBaseOffset(1208); + public static final Field HWEVENTCOUNTERS3 = Field.create("HWEVENTCOUNTERS3", 8, FieldType.INT).setScale(1.0).setBaseOffset(1208); + public static final Field HWEVENTCOUNTERS4 = Field.create("HWEVENTCOUNTERS4", 12, FieldType.INT).setScale(1.0).setBaseOffset(1208); + public static final Field HWEVENTCOUNTERS5 = Field.create("HWEVENTCOUNTERS5", 16, FieldType.INT).setScale(1.0).setBaseOffset(1208); + public static final Field HWEVENTCOUNTERS6 = Field.create("HWEVENTCOUNTERS6", 20, FieldType.INT).setScale(1.0).setBaseOffset(1208); + public static final Field VVTCAMCOUNTER = Field.create("VVTCAMCOUNTER", 24, FieldType.INT).setScale(1.0).setBaseOffset(1208); + public static final Field MAPVVT_MAP_AT_SPECIAL_POINT = Field.create("MAPVVT_MAP_AT_SPECIAL_POINT", 28, FieldType.FLOAT).setBaseOffset(1208); + public static final Field MAPVVT_MAP_AT_DIFF = Field.create("MAPVVT_MAP_AT_DIFF", 32, FieldType.FLOAT).setBaseOffset(1208); + public static final Field MAPVVT_MAP_AT_CYCLE_COUNT = Field.create("MAPVVT_MAP_AT_CYCLE_COUNT", 36, FieldType.INT8).setScale(1.0).setBaseOffset(1208); + public static final Field MAPVVT_MAP_PEAK = Field.create("MAPVVT_MAP_PEAK", 37, FieldType.INT8).setScale(1.0).setBaseOffset(1208); + public static final Field ALIGNMENTFILL_AT_38 = Field.create("ALIGNMENTFILL_AT_38", 38, FieldType.INT8).setScale(1.0).setBaseOffset(1208); + public static final Field CURRENTENGINEDECODEDPHASE = Field.create("CURRENTENGINEDECODEDPHASE", 40, FieldType.FLOAT).setBaseOffset(1208); + public static final Field TRIGGERTOOTHANGLEERROR = Field.create("TRIGGERTOOTHANGLEERROR", 44, FieldType.FLOAT).setBaseOffset(1208); + public static final Field TRIGGERIGNOREDTOOTHCOUNT = Field.create("TRIGGERIGNOREDTOOTHCOUNT", 48, FieldType.INT8).setScale(1.0).setBaseOffset(1208); + public static final Field ALIGNMENTFILL_AT_49 = Field.create("ALIGNMENTFILL_AT_49", 49, FieldType.INT8).setScale(1.0).setBaseOffset(1208); + public static final Field MAPCAMPREVTOOTHANGLE = Field.create("MAPCAMPREVTOOTHANGLE", 52, FieldType.FLOAT).setBaseOffset(1208); + public static final Field ISDECODINGMAPCAM = Field.create("ISDECODINGMAPCAM", 56, FieldType.BIT, 0).setBaseOffset(1208); public static final Field[] VALUES = { HWEVENTCOUNTERS1, HWEVENTCOUNTERS2, diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/TriggerState.java b/java_console/models/src/main/java/com/rusefi/config/generated/TriggerState.java index da302ffc72..65db073a9f 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/TriggerState.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/TriggerState.java @@ -1,6 +1,6 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEFI tool config_definition_base.jar based on (unknown script) controllers/trigger/trigger_state.txt Sun Jan 07 23:16:15 UTC 2024 +// this file was generated automatically by rusEFI tool config_definition_base-all.jar based on (unknown script) controllers/trigger/trigger_state.txt Tue Mar 05 01:56:09 UTC 2024 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -172,18 +172,18 @@ public class TriggerState { public static final int TCU_GEAR_COUNT = 10; public static final int TPS_2_BYTE_PACKING_MULT = 100; public static final int VE_BLEND_COUNT = 4; - public static final Field CRANKSYNCHRONIZATIONCOUNTER = Field.create("CRANKSYNCHRONIZATIONCOUNTER", 0, FieldType.INT).setScale(1.0).setBaseOffset(1256); - public static final Field VVTSYNCGAPRATIO = Field.create("VVTSYNCGAPRATIO", 4, FieldType.FLOAT).setBaseOffset(1256); - public static final Field VVTTOOTHDURATIONS0 = Field.create("VVTTOOTHDURATIONS0", 8, FieldType.INT).setScale(1.0).setBaseOffset(1256); - public static final Field VVTCURRENTPOSITION = Field.create("VVTCURRENTPOSITION", 12, FieldType.FLOAT).setBaseOffset(1256); - public static final Field VVTTOOTHPOSITION1 = Field.create("VVTTOOTHPOSITION1", 16, FieldType.FLOAT).setBaseOffset(1256); - public static final Field VVTTOOTHPOSITION2 = Field.create("VVTTOOTHPOSITION2", 20, FieldType.FLOAT).setBaseOffset(1256); - public static final Field VVTTOOTHPOSITION3 = Field.create("VVTTOOTHPOSITION3", 24, FieldType.FLOAT).setBaseOffset(1256); - public static final Field VVTTOOTHPOSITION4 = Field.create("VVTTOOTHPOSITION4", 28, FieldType.FLOAT).setBaseOffset(1256); - public static final Field TRIGGERSYNCGAPRATIO = Field.create("TRIGGERSYNCGAPRATIO", 32, FieldType.FLOAT).setBaseOffset(1256); - public static final Field TRIGGERSTATEINDEX = Field.create("TRIGGERSTATEINDEX", 36, FieldType.INT8).setScale(1.0).setBaseOffset(1256); - public static final Field VVTSTATEINDEX = Field.create("VVTSTATEINDEX", 37, FieldType.INT8).setScale(1.0).setBaseOffset(1256); - public static final Field ALIGNMENTFILL_AT_38 = Field.create("ALIGNMENTFILL_AT_38", 38, FieldType.INT8).setScale(1.0).setBaseOffset(1256); + public static final Field CRANKSYNCHRONIZATIONCOUNTER = Field.create("CRANKSYNCHRONIZATIONCOUNTER", 0, FieldType.INT).setScale(1.0).setBaseOffset(1268); + public static final Field VVTSYNCGAPRATIO = Field.create("VVTSYNCGAPRATIO", 4, FieldType.FLOAT).setBaseOffset(1268); + public static final Field VVTTOOTHDURATIONS0 = Field.create("VVTTOOTHDURATIONS0", 8, FieldType.INT).setScale(1.0).setBaseOffset(1268); + public static final Field VVTCURRENTPOSITION = Field.create("VVTCURRENTPOSITION", 12, FieldType.FLOAT).setBaseOffset(1268); + public static final Field VVTTOOTHPOSITION1 = Field.create("VVTTOOTHPOSITION1", 16, FieldType.FLOAT).setBaseOffset(1268); + public static final Field VVTTOOTHPOSITION2 = Field.create("VVTTOOTHPOSITION2", 20, FieldType.FLOAT).setBaseOffset(1268); + public static final Field VVTTOOTHPOSITION3 = Field.create("VVTTOOTHPOSITION3", 24, FieldType.FLOAT).setBaseOffset(1268); + public static final Field VVTTOOTHPOSITION4 = Field.create("VVTTOOTHPOSITION4", 28, FieldType.FLOAT).setBaseOffset(1268); + public static final Field TRIGGERSYNCGAPRATIO = Field.create("TRIGGERSYNCGAPRATIO", 32, FieldType.FLOAT).setBaseOffset(1268); + public static final Field TRIGGERSTATEINDEX = Field.create("TRIGGERSTATEINDEX", 36, FieldType.INT8).setScale(1.0).setBaseOffset(1268); + public static final Field VVTSTATEINDEX = Field.create("VVTSTATEINDEX", 37, FieldType.INT8).setScale(1.0).setBaseOffset(1268); + public static final Field ALIGNMENTFILL_AT_38 = Field.create("ALIGNMENTFILL_AT_38", 38, FieldType.INT8).setScale(1.0).setBaseOffset(1268); public static final Field[] VALUES = { CRANKSYNCHRONIZATIONCOUNTER, VVTSYNCGAPRATIO, diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/TriggerStatePrimary.java b/java_console/models/src/main/java/com/rusefi/config/generated/TriggerStatePrimary.java index 6cc6a63c1e..b369a856b8 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/TriggerStatePrimary.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/TriggerStatePrimary.java @@ -1,6 +1,6 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEFI tool config_definition_base.jar based on (unknown script) controllers/trigger/trigger_state_primary.txt Sun Jan 07 23:16:15 UTC 2024 +// this file was generated automatically by rusEFI tool config_definition_base-all.jar based on (unknown script) controllers/trigger/trigger_state_primary.txt Tue Mar 05 01:56:09 UTC 2024 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -172,9 +172,9 @@ public class TriggerStatePrimary { public static final int TCU_GEAR_COUNT = 10; public static final int TPS_2_BYTE_PACKING_MULT = 100; public static final int VE_BLEND_COUNT = 4; - public static final Field CAMRESYNCCOUNTER = Field.create("CAMRESYNCCOUNTER", 0, FieldType.INT8).setScale(1.0).setBaseOffset(1296); - public static final Field ALIGNMENTFILL_AT_1 = Field.create("ALIGNMENTFILL_AT_1", 1, FieldType.INT8).setScale(1.0).setBaseOffset(1296); - public static final Field M_HASSYNCHRONIZEDPHASE = Field.create("M_HASSYNCHRONIZEDPHASE", 4, FieldType.BIT, 0).setBaseOffset(1296); + public static final Field CAMRESYNCCOUNTER = Field.create("CAMRESYNCCOUNTER", 0, FieldType.INT8).setScale(1.0).setBaseOffset(1308); + public static final Field ALIGNMENTFILL_AT_1 = Field.create("ALIGNMENTFILL_AT_1", 1, FieldType.INT8).setScale(1.0).setBaseOffset(1308); + public static final Field M_HASSYNCHRONIZEDPHASE = Field.create("M_HASSYNCHRONIZEDPHASE", 4, FieldType.BIT, 0).setBaseOffset(1308); public static final Field[] VALUES = { CAMRESYNCCOUNTER, ALIGNMENTFILL_AT_1, diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/VvtState.java b/java_console/models/src/main/java/com/rusefi/config/generated/VvtState.java index 0a799e6e46..a4aeefffcb 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/VvtState.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/VvtState.java @@ -1,14 +1,14 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEFI tool config_definition_base.jar based on (unknown script) controllers/actuators/vvt.txt Sun Jan 07 19:53:44 UTC 2024 +// this file was generated automatically by rusEFI tool config_definition_base-all.jar based on (unknown script) controllers/actuators/vvt.txt Tue Mar 05 01:56:09 UTC 2024 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; public class VvtState { - public static final Field VVTTARGET = Field.create("VVTTARGET", 0, FieldType.INT16).setScale(0.1).setBaseOffset(1444); - public static final Field VVTOUTPUT = Field.create("VVTOUTPUT", 2, FieldType.INT8).setScale(0.5).setBaseOffset(1444); - public static final Field ALIGNMENTFILL_AT_3 = Field.create("ALIGNMENTFILL_AT_3", 3, FieldType.INT8).setScale(1.0).setBaseOffset(1444); + public static final Field VVTTARGET = Field.create("VVTTARGET", 0, FieldType.INT16).setScale(0.1).setBaseOffset(1456); + public static final Field VVTOUTPUT = Field.create("VVTOUTPUT", 2, FieldType.INT8).setScale(0.5).setBaseOffset(1456); + public static final Field ALIGNMENTFILL_AT_3 = Field.create("ALIGNMENTFILL_AT_3", 3, FieldType.INT8).setScale(1.0).setBaseOffset(1456); public static final Field[] VALUES = { VVTTARGET, VVTOUTPUT, diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/WallFuelState.java b/java_console/models/src/main/java/com/rusefi/config/generated/WallFuelState.java index 30c075971d..a2db44796a 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/WallFuelState.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/WallFuelState.java @@ -1,13 +1,13 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEFI tool config_definition_base.jar based on (unknown script) controllers/algo/wall_fuel_state.txt Sun Jan 07 19:53:44 UTC 2024 +// this file was generated automatically by rusEFI tool config_definition_base-all.jar based on (unknown script) controllers/algo/wall_fuel_state.txt Tue Mar 05 01:56:09 UTC 2024 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; public class WallFuelState { - public static final Field WALLFUELCORRECTION = Field.create("WALLFUELCORRECTION", 0, FieldType.FLOAT).setBaseOffset(1304); - public static final Field WALLFUEL = Field.create("WALLFUEL", 4, FieldType.FLOAT).setBaseOffset(1304); + public static final Field WALLFUELCORRECTION = Field.create("WALLFUELCORRECTION", 0, FieldType.FLOAT).setBaseOffset(1316); + public static final Field WALLFUEL = Field.create("WALLFUEL", 4, FieldType.FLOAT).setBaseOffset(1316); public static final Field[] VALUES = { WALLFUELCORRECTION, WALLFUEL, diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/WidebandController.java b/java_console/models/src/main/java/com/rusefi/config/generated/WidebandController.java index 5e79cf65f5..e782946f1b 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/WidebandController.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/WidebandController.java @@ -1,19 +1,19 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEFI tool config_definition_base.jar based on (unknown script) controllers/sensors//wideband_state.txt Sun Jan 07 19:53:44 UTC 2024 +// this file was generated automatically by rusEFI tool config_definition_base-all.jar based on (unknown script) controllers/sensors//wideband_state.txt Tue Mar 05 01:56:09 UTC 2024 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; public class WidebandController { - public static final Field FAULTCODE = Field.create("FAULTCODE", 0, FieldType.INT8).setScale(1.0).setBaseOffset(1412); - public static final Field HEATERDUTY = Field.create("HEATERDUTY", 1, FieldType.INT8).setScale(1.0).setBaseOffset(1412); - public static final Field PUMPDUTY = Field.create("PUMPDUTY", 2, FieldType.INT8).setScale(1.0).setBaseOffset(1412); - public static final Field ALIGNMENTFILL_AT_3 = Field.create("ALIGNMENTFILL_AT_3", 3, FieldType.INT8).setScale(1.0).setBaseOffset(1412); - public static final Field TEMPC = Field.create("TEMPC", 4, FieldType.INT16).setScale(1.0).setBaseOffset(1412); - public static final Field NERNSTVOLTAGE = Field.create("NERNSTVOLTAGE", 6, FieldType.INT16).setScale(0.001).setBaseOffset(1412); - public static final Field ESR = Field.create("ESR", 8, FieldType.INT16).setScale(1.0).setBaseOffset(1412); - public static final Field ALIGNMENTFILL_AT_10 = Field.create("ALIGNMENTFILL_AT_10", 10, FieldType.INT8).setScale(1.0).setBaseOffset(1412); + public static final Field FAULTCODE = Field.create("FAULTCODE", 0, FieldType.INT8).setScale(1.0).setBaseOffset(1424); + public static final Field HEATERDUTY = Field.create("HEATERDUTY", 1, FieldType.INT8).setScale(1.0).setBaseOffset(1424); + public static final Field PUMPDUTY = Field.create("PUMPDUTY", 2, FieldType.INT8).setScale(1.0).setBaseOffset(1424); + public static final Field ALIGNMENTFILL_AT_3 = Field.create("ALIGNMENTFILL_AT_3", 3, FieldType.INT8).setScale(1.0).setBaseOffset(1424); + public static final Field TEMPC = Field.create("TEMPC", 4, FieldType.INT16).setScale(1.0).setBaseOffset(1424); + public static final Field NERNSTVOLTAGE = Field.create("NERNSTVOLTAGE", 6, FieldType.INT16).setScale(0.001).setBaseOffset(1424); + public static final Field ESR = Field.create("ESR", 8, FieldType.INT16).setScale(1.0).setBaseOffset(1424); + public static final Field ALIGNMENTFILL_AT_10 = Field.create("ALIGNMENTFILL_AT_10", 10, FieldType.INT8).setScale(1.0).setBaseOffset(1424); public static final Field[] VALUES = { FAULTCODE, HEATERDUTY,