diff --git a/firmware/config/boards/cypress/config/controllers/algo/rusefi_generated.h b/firmware/config/boards/cypress/config/controllers/algo/rusefi_generated.h index 155362809a..268b1581e5 100644 --- a/firmware/config/boards/cypress/config/controllers/algo/rusefi_generated.h +++ b/firmware/config/boards/cypress/config/controllers/algo/rusefi_generated.h @@ -812,7 +812,7 @@ #define SentEtbType_NONE 0 #define show_Frankenso_presets true #define show_test_presets true -#define SIGNATURE_HASH 914902541 +#define SIGNATURE_HASH 634710875 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define spi_device_e_auto_enum 0="SPI_NONE",1="SPI_DEVICE_1",2="SPI_DEVICE_2",3="SPI_DEVICE_3",4="SPI_DEVICE_4" #define spi_device_e_SPI_DEVICE_1 1 @@ -871,7 +871,7 @@ #define TransmissionControllerMode_SimpleTransmissionController 1 #define TRIGGER_COMMENT "#" #define trigger_config_s_size 12 -#define TRIGGER_CRANK_BASED trigger_type == 2 || trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 21 || trigger_type == 26 || trigger_type == 27 || trigger_type == 33 || trigger_type == 38 || trigger_type == 39 || trigger_type == 44 || trigger_type == 45 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 58 || trigger_type == 61 || trigger_type == 62 || trigger_type == 68 || trigger_type == 70 || trigger_type == 71 || trigger_type == 72 || trigger_type == 74 || trigger_type == 75 || trigger_type == 76 || trigger_type == 77 || trigger_type == 79 +#define TRIGGER_CRANK_BASED trigger_type == 2 || trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 21 || trigger_type == 26 || trigger_type == 27 || trigger_type == 33 || trigger_type == 38 || trigger_type == 39 || trigger_type == 44 || trigger_type == 45 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 58 || trigger_type == 61 || trigger_type == 62 || trigger_type == 68 || trigger_type == 70 || trigger_type == 71 || trigger_type == 72 || trigger_type == 74 || trigger_type == 75 || trigger_type == 76 || trigger_type == 77 #define TRIGGER_CYCLE_DURATION "cycleDuration" #define TRIGGER_GAP_FROM "gapFrom" #define TRIGGER_GAP_TO "gapTo" @@ -1108,14 +1108,14 @@ #define ts_show_vr_threshold_2 true #define ts_show_vr_threshold_all true #define ts_show_vr_threshold_pins true -#define TS_SIGNATURE "rusEFI master.2023.11.08.cypress.914902541" +#define TS_SIGNATURE "rusEFI master.2023.11.09.cypress.634710875" #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 1440 +#define TS_TOTAL_OUTPUT_SIZE 1444 #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/rusefi_generated.h b/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h index 6cfb57b7d4..20a1d22215 100644 --- a/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h +++ b/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h @@ -812,7 +812,7 @@ #define SentEtbType_NONE 0 #define show_Frankenso_presets true #define show_test_presets true -#define SIGNATURE_HASH 1952024995 +#define SIGNATURE_HASH 1728392437 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define spi_device_e_auto_enum 0="SPI_NONE",1="SPI_DEVICE_1",2="SPI_DEVICE_2",3="SPI_DEVICE_3",4="SPI_DEVICE_4" #define spi_device_e_SPI_DEVICE_1 1 @@ -871,7 +871,7 @@ #define TransmissionControllerMode_SimpleTransmissionController 1 #define TRIGGER_COMMENT "#" #define trigger_config_s_size 12 -#define TRIGGER_CRANK_BASED trigger_type == 2 || trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 21 || trigger_type == 26 || trigger_type == 27 || trigger_type == 33 || trigger_type == 38 || trigger_type == 39 || trigger_type == 44 || trigger_type == 45 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 58 || trigger_type == 61 || trigger_type == 62 || trigger_type == 68 || trigger_type == 70 || trigger_type == 71 || trigger_type == 72 || trigger_type == 74 || trigger_type == 75 || trigger_type == 76 || trigger_type == 77 || trigger_type == 79 +#define TRIGGER_CRANK_BASED trigger_type == 2 || trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 21 || trigger_type == 26 || trigger_type == 27 || trigger_type == 33 || trigger_type == 38 || trigger_type == 39 || trigger_type == 44 || trigger_type == 45 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 58 || trigger_type == 61 || trigger_type == 62 || trigger_type == 68 || trigger_type == 70 || trigger_type == 71 || trigger_type == 72 || trigger_type == 74 || trigger_type == 75 || trigger_type == 76 || trigger_type == 77 #define TRIGGER_CYCLE_DURATION "cycleDuration" #define TRIGGER_GAP_FROM "gapFrom" #define TRIGGER_GAP_TO "gapTo" @@ -1108,14 +1108,14 @@ #define ts_show_vr_threshold_2 true #define ts_show_vr_threshold_all true #define ts_show_vr_threshold_pins true -#define TS_SIGNATURE "rusEFI master.2023.11.08.kin.1952024995" +#define TS_SIGNATURE "rusEFI master.2023.11.09.kin.1728392437" #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 1440 +#define TS_TOTAL_OUTPUT_SIZE 1444 #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/rusefi_generated.h b/firmware/config/boards/subaru_eg33/config/controllers/algo/rusefi_generated.h index 04d5db4e70..c260c4510c 100644 --- a/firmware/config/boards/subaru_eg33/config/controllers/algo/rusefi_generated.h +++ b/firmware/config/boards/subaru_eg33/config/controllers/algo/rusefi_generated.h @@ -1050,7 +1050,7 @@ #define show_Frankenso_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 822446362 +#define SIGNATURE_HASH 576269388 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define spi_device_e_auto_enum 0="SPI_NONE",1="SPI_DEVICE_1",2="SPI_DEVICE_2",3="SPI_DEVICE_3",4="SPI_DEVICE_4" #define spi_device_e_SPI_DEVICE_1 1 @@ -1109,7 +1109,7 @@ #define TransmissionControllerMode_SimpleTransmissionController 1 #define TRIGGER_COMMENT "#" #define trigger_config_s_size 12 -#define TRIGGER_CRANK_BASED trigger_type == 2 || trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 21 || trigger_type == 26 || trigger_type == 27 || trigger_type == 33 || trigger_type == 38 || trigger_type == 39 || trigger_type == 44 || trigger_type == 45 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 58 || trigger_type == 61 || trigger_type == 62 || trigger_type == 68 || trigger_type == 70 || trigger_type == 71 || trigger_type == 72 || trigger_type == 74 || trigger_type == 75 || trigger_type == 76 || trigger_type == 77 || trigger_type == 79 +#define TRIGGER_CRANK_BASED trigger_type == 2 || trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 21 || trigger_type == 26 || trigger_type == 27 || trigger_type == 33 || trigger_type == 38 || trigger_type == 39 || trigger_type == 44 || trigger_type == 45 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 58 || trigger_type == 61 || trigger_type == 62 || trigger_type == 68 || trigger_type == 70 || trigger_type == 71 || trigger_type == 72 || trigger_type == 74 || trigger_type == 75 || trigger_type == 76 || trigger_type == 77 #define TRIGGER_CYCLE_DURATION "cycleDuration" #define TRIGGER_GAP_FROM "gapFrom" #define TRIGGER_GAP_TO "gapTo" @@ -1346,14 +1346,14 @@ #define ts_show_vr_threshold_2 true #define ts_show_vr_threshold_all true #define ts_show_vr_threshold_pins true -#define TS_SIGNATURE "rusEFI master.2023.11.08.subaru_eg33_f7.822446362" +#define TS_SIGNATURE "rusEFI master.2023.11.09.subaru_eg33_f7.576269388" #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 1440 +#define TS_TOTAL_OUTPUT_SIZE 1444 #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 02bef7ea24..7f3b37ab8b 100644 --- a/firmware/console/binary/generated/data_logs.ini +++ b/firmware/console/binary/generated/data_logs.ini @@ -506,6 +506,7 @@ entry = brakePedalState, "Brake switch", int, "%d" entry = startStopState, "startStopState", int, "%d" entry = startStopPhysicalState, "startStopPhysicalState", int, "%d" entry = startStopStateToggleCounter, "startStopStateToggleCounter", int, "%d" +entry = startStopStateTempPhysicalCounter, "startStopStateTempPhysicalCounter", int, "%d" entry = egtValue1, "egtValue1", float, "%.3f" entry = egtValue2, "egtValue2", float, "%.3f" entry = desiredRpmLimit, "User-defined RPM hard limit", int, "%d" diff --git a/firmware/console/binary/generated/fancy_content.ini b/firmware/console/binary/generated/fancy_content.ini index ce77cf9404..7b0e1148d0 100644 --- a/firmware/console/binary/generated/fancy_content.ini +++ b/firmware/console/binary/generated/fancy_content.ini @@ -235,13 +235,14 @@ dialog = engine_stateDialog, "engine_state" graphLine = brakePedalState graphLine = startStopState graphLine = startStopStateToggleCounter - graphLine = egtValue1 + graphLine = startStopStateTempPhysicalCounter liveGraph = engine_state_5_Graph, "Graph", South + graphLine = egtValue1 graphLine = egtValue2 graphLine = desiredRpmLimit graphLine = fuelInjectionCounter - graphLine = sparkCounter liveGraph = engine_state_6_Graph, "Graph", South + graphLine = sparkCounter graphLine = fuelingLoad graphLine = ignitionLoad graphLine = veTableYAxis diff --git a/firmware/console/binary/generated/live_data_ids.h b/firmware/console/binary/generated/live_data_ids.h index b9e7463610..ba41cf83de 100644 --- a/firmware/console/binary/generated/live_data_ids.h +++ b/firmware/console/binary/generated/live_data_ids.h @@ -45,15 +45,15 @@ LDS_lambda_monitor, #define FUEL_PUMP_CONTROL_BASE_ADDRESS 1040 #define MAIN_RELAY_BASE_ADDRESS 1044 #define ENGINE_STATE_BASE_ADDRESS 1048 -#define TPS_ACCEL_STATE_BASE_ADDRESS 1136 -#define TRIGGER_CENTRAL_BASE_ADDRESS 1184 -#define TRIGGER_STATE_BASE_ADDRESS 1244 -#define TRIGGER_STATE_PRIMARY_BASE_ADDRESS 1284 -#define WALL_FUEL_STATE_BASE_ADDRESS 1288 -#define IDLE_STATE_BASE_ADDRESS 1296 -#define ELECTRONIC_THROTTLE_BASE_ADDRESS 1344 -#define WIDEBAND_STATE_BASE_ADDRESS 1396 -#define DC_MOTORS_BASE_ADDRESS 1408 -#define SENT_STATE_BASE_ADDRESS 1420 -#define VVT_BASE_ADDRESS 1428 -#define LAMBDA_MONITOR_BASE_ADDRESS 1432 +#define TPS_ACCEL_STATE_BASE_ADDRESS 1140 +#define TRIGGER_CENTRAL_BASE_ADDRESS 1188 +#define TRIGGER_STATE_BASE_ADDRESS 1248 +#define TRIGGER_STATE_PRIMARY_BASE_ADDRESS 1288 +#define WALL_FUEL_STATE_BASE_ADDRESS 1292 +#define IDLE_STATE_BASE_ADDRESS 1300 +#define ELECTRONIC_THROTTLE_BASE_ADDRESS 1348 +#define WIDEBAND_STATE_BASE_ADDRESS 1400 +#define DC_MOTORS_BASE_ADDRESS 1412 +#define SENT_STATE_BASE_ADDRESS 1424 +#define VVT_BASE_ADDRESS 1432 +#define LAMBDA_MONITOR_BASE_ADDRESS 1436 diff --git a/firmware/console/binary/generated/output_channels.ini b/firmware/console/binary/generated/output_channels.ini index 5c93a660f5..254df45e68 100644 --- a/firmware/console/binary/generated/output_channels.ini +++ b/firmware/console/binary/generated/output_channels.ini @@ -641,133 +641,134 @@ brakePedalState = scalar, S08, 1092, "", 1, 0 startStopState = scalar, S08, 1093, "", 1, 0 startStopPhysicalState = bits, U32, 1096, [0:0] startStopStateToggleCounter = scalar, U32, 1100, "", 1, 0 -egtValue1 = scalar, F32, 1104, "", 1, 0 -egtValue2 = scalar, F32, 1108, "", 1, 0 -desiredRpmLimit = scalar, S16, 1112, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1116, "", 1, 0 -sparkCounter = scalar, U32, 1120, "", 1, 0 -fuelingLoad = scalar, F32, 1124, "", 1, 0 -ignitionLoad = scalar, F32, 1128, "", 1, 0 -veTableYAxis = scalar, U16, 1132, "%", 0.01, 0 -; total TS size = 1136 -tpsFrom = scalar, F32, 1136 -tpsTo = scalar, F32, 1140 -deltaTps = scalar, F32, 1144 -extraFuel = scalar, F32, 1148, "", 1, 0 -valueFromTable = scalar, F32, 1152, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1156, [0:0] -isBelowDecelThreshold = bits, U32, 1156, [1:1] -isTimeToResetAccumulator = bits, U32, 1156, [2:2] -isFractionalEnrichment = bits, U32, 1156, [3:3] -belowEpsilon = bits, U32, 1156, [4:4] -tooShort = bits, U32, 1156, [5:5] -fractionalInjFuel = scalar, F32, 1160, "", 1, 0 -accumulatedValue = scalar, F32, 1164, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1168, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1172, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1176, "", 1, 0 -cycleCnt = scalar, S32, 1180, "", 1, 0 -; total TS size = 1184 -hwEventCounters1 = scalar, U32, 1184, "", 1, 0 -hwEventCounters2 = scalar, U32, 1188, "", 1, 0 -hwEventCounters3 = scalar, U32, 1192, "", 1, 0 -hwEventCounters4 = scalar, U32, 1196, "", 1, 0 -hwEventCounters5 = scalar, U32, 1200, "", 1, 0 -hwEventCounters6 = scalar, U32, 1204, "", 1, 0 -vvtCamCounter = scalar, U32, 1208, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1212, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1216, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1220, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1221, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1224, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1228, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1232, "", 1, 0 -mapCamPrevToothAngle = scalar, F32, 1236, "deg", 1, 0 -isDecodingMapCam = bits, U32, 1240, [0:0] -; total TS size = 1244 -crankSynchronizationCounter = scalar, U32, 1244, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1248, "", 1, 0 -vvtToothDurations0 = scalar, U32, 1252, "us", 1, 0 -vvtCurrentPosition = scalar, F32, 1256, "sync: Primary Cam Position", 1, 0 -vvtToothPosition1 = scalar, F32, 1260, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition2 = scalar, F32, 1264, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition3 = scalar, F32, 1268, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition4 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio = scalar, F32, 1276, "", 1, 0 -triggerStateIndex = scalar, U08, 1280, "", 1, 0 -camResyncCounter = scalar, U08, 1281, "", 1, 0 -vvtStateIndex = scalar, U08, 1282, "", 1, 0 -; total TS size = 1284 -m_hasSynchronizedPhase = bits, U32, 1284, [0:0] +startStopStateTempPhysicalCounter = scalar, U32, 1104, "", 1, 0 +egtValue1 = scalar, F32, 1108, "", 1, 0 +egtValue2 = scalar, F32, 1112, "", 1, 0 +desiredRpmLimit = scalar, S16, 1116, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 1120, "", 1, 0 +sparkCounter = scalar, U32, 1124, "", 1, 0 +fuelingLoad = scalar, F32, 1128, "", 1, 0 +ignitionLoad = scalar, F32, 1132, "", 1, 0 +veTableYAxis = scalar, U16, 1136, "%", 0.01, 0 +; total TS size = 1140 +tpsFrom = scalar, F32, 1140 +tpsTo = scalar, F32, 1144 +deltaTps = scalar, F32, 1148 +extraFuel = scalar, F32, 1152, "", 1, 0 +valueFromTable = scalar, F32, 1156, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1160, [0:0] +isBelowDecelThreshold = bits, U32, 1160, [1:1] +isTimeToResetAccumulator = bits, U32, 1160, [2:2] +isFractionalEnrichment = bits, U32, 1160, [3:3] +belowEpsilon = bits, U32, 1160, [4:4] +tooShort = bits, U32, 1160, [5:5] +fractionalInjFuel = scalar, F32, 1164, "", 1, 0 +accumulatedValue = scalar, F32, 1168, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1172, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1176, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1180, "", 1, 0 +cycleCnt = scalar, S32, 1184, "", 1, 0 +; total TS size = 1188 +hwEventCounters1 = scalar, U32, 1188, "", 1, 0 +hwEventCounters2 = scalar, U32, 1192, "", 1, 0 +hwEventCounters3 = scalar, U32, 1196, "", 1, 0 +hwEventCounters4 = scalar, U32, 1200, "", 1, 0 +hwEventCounters5 = scalar, U32, 1204, "", 1, 0 +hwEventCounters6 = scalar, U32, 1208, "", 1, 0 +vvtCamCounter = scalar, U32, 1212, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1216, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1220, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1224, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1225, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1228, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1232, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1236, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1240, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1244, [0:0] +; total TS size = 1248 +crankSynchronizationCounter = scalar, U32, 1248, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1252, "", 1, 0 +vvtToothDurations0 = scalar, U32, 1256, "us", 1, 0 +vvtCurrentPosition = scalar, F32, 1260, "sync: Primary Cam Position", 1, 0 +vvtToothPosition1 = scalar, F32, 1264, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition2 = scalar, F32, 1268, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition3 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition4 = scalar, F32, 1276, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio = scalar, F32, 1280, "", 1, 0 +triggerStateIndex = scalar, U08, 1284, "", 1, 0 +camResyncCounter = scalar, U08, 1285, "", 1, 0 +vvtStateIndex = scalar, U08, 1286, "", 1, 0 ; total TS size = 1288 -wallFuelCorrection = scalar, F32, 1288, "", 1, 0 -wallFuel = scalar, F32, 1292, "", 1, 0 -; total TS size = 1296 -idleState = bits, S32, 1296, [0:2], "not important" -currentIdlePosition = scalar, F32, 1300 -baseIdlePosition = scalar, F32, 1304 -idleClosedLoop = scalar, F32, 1308 -iacByTpsTaper = scalar, F32, 1312 -throttlePedalUpState = scalar, S32, 1316, "", 1, 0 -mightResetPid = bits, U32, 1320, [0:0] -shouldResetPid = bits, U32, 1320, [1:1] -wasResetPid = bits, U32, 1320, [2:2] -mustResetPid = bits, U32, 1320, [3:3] -isCranking = bits, U32, 1320, [4:4] -isIacTableForCoasting = bits, U32, 1320, [5:5] -notIdling = bits, U32, 1320, [6:6] -needReset = bits, U32, 1320, [7:7] -isInDeadZone = bits, U32, 1320, [8:8] -isBlipping = bits, U32, 1320, [9:9] -useClosedLoop = bits, U32, 1320, [10:10] -badTps = bits, U32, 1320, [11:11] -looksLikeRunning = bits, U32, 1320, [12:12] -looksLikeCoasting = bits, U32, 1320, [13:13] -looksLikeCrankToIdle = bits, U32, 1320, [14:14] -isIdleCoasting = bits, U32, 1320, [15:15] -isIdleClosedLoop = bits, U32, 1320, [16:16] -idleTarget = scalar, S32, 1324, "", 1, 0 -targetRpmByClt = scalar, S32, 1328, "", 1, 0 -targetRpmAc = scalar, S32, 1332, "", 1, 0 -iacByRpmTaper = scalar, F32, 1336 -luaAdd = scalar, F32, 1340 -; total TS size = 1344 -idlePosition = scalar, F32, 1344, "per", 1,0 -trim = scalar, F32, 1348, "", 1, 0 -luaAdjustment = scalar, F32, 1352, "per", 1,0 -m_wastegatePosition = scalar, F32, 1356, "per", 1,0 -etbFeedForward = scalar, F32, 1360 -etbIntegralError = scalar, F32, 1364, "", 1, 0 -etbCurrentTarget = scalar, F32, 1368, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1372, "%", 1, 0 -etbRevLimitActive = bits, U32, 1376, [0:0] -jamDetected = bits, U32, 1376, [1:1] -etbDutyRateOfChange = scalar, F32, 1380, "per", 1,0 -etbDutyAverage = scalar, F32, 1384, "per", 1,0 -etbTpsErrorCounter = scalar, U16, 1388, "count", 1,0 -etbPpsErrorCounter = scalar, U16, 1390, "count", 1,0 -etbErrorCode = scalar, S08, 1392, "", 1, 0 -jamTimer = scalar, U16, 1394, "sec", 0.01, 0 -; total TS size = 1396 -faultCode = scalar, U08, 1396, "", 1, 0 -heaterDuty = scalar, U08, 1397, "%", 1, 0 -pumpDuty = scalar, U08, 1398, "%", 1, 0 -tempC = scalar, U16, 1400, "C", 1, 0 -nernstVoltage = scalar, U16, 1402, "V", 0.001, 0 -esr = scalar, U16, 1404, "ohm", 1, 0 -; total TS size = 1408 -dcOutput0 = scalar, F32, 1408, "per", 1,0 -isEnabled0_int = scalar, U08, 1412, "per", 1,0 -isEnabled0 = bits, U32, 1416, [0:0] -; total TS size = 1420 -value0 = scalar, U16, 1420, "value", 1,0 -value1 = scalar, U16, 1422, "value", 1,0 -errorRate = scalar, F32, 1424, "ratio", 1,0 -; total TS size = 1428 -vvtTarget = scalar, U16, 1428, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1430, "%", 0.5, 0 +m_hasSynchronizedPhase = bits, U32, 1288, [0:0] +; total TS size = 1292 +wallFuelCorrection = scalar, F32, 1292, "", 1, 0 +wallFuel = scalar, F32, 1296, "", 1, 0 +; total TS size = 1300 +idleState = bits, S32, 1300, [0:2], "not important" +currentIdlePosition = scalar, F32, 1304 +baseIdlePosition = scalar, F32, 1308 +idleClosedLoop = scalar, F32, 1312 +iacByTpsTaper = scalar, F32, 1316 +throttlePedalUpState = scalar, S32, 1320, "", 1, 0 +mightResetPid = bits, U32, 1324, [0:0] +shouldResetPid = bits, U32, 1324, [1:1] +wasResetPid = bits, U32, 1324, [2:2] +mustResetPid = bits, U32, 1324, [3:3] +isCranking = bits, U32, 1324, [4:4] +isIacTableForCoasting = bits, U32, 1324, [5:5] +notIdling = bits, U32, 1324, [6:6] +needReset = bits, U32, 1324, [7:7] +isInDeadZone = bits, U32, 1324, [8:8] +isBlipping = bits, U32, 1324, [9:9] +useClosedLoop = bits, U32, 1324, [10:10] +badTps = bits, U32, 1324, [11:11] +looksLikeRunning = bits, U32, 1324, [12:12] +looksLikeCoasting = bits, U32, 1324, [13:13] +looksLikeCrankToIdle = bits, U32, 1324, [14:14] +isIdleCoasting = bits, U32, 1324, [15:15] +isIdleClosedLoop = bits, U32, 1324, [16:16] +idleTarget = scalar, S32, 1328, "", 1, 0 +targetRpmByClt = scalar, S32, 1332, "", 1, 0 +targetRpmAc = scalar, S32, 1336, "", 1, 0 +iacByRpmTaper = scalar, F32, 1340 +luaAdd = scalar, F32, 1344 +; total TS size = 1348 +idlePosition = scalar, F32, 1348, "per", 1,0 +trim = scalar, F32, 1352, "", 1, 0 +luaAdjustment = scalar, F32, 1356, "per", 1,0 +m_wastegatePosition = scalar, F32, 1360, "per", 1,0 +etbFeedForward = scalar, F32, 1364 +etbIntegralError = scalar, F32, 1368, "", 1, 0 +etbCurrentTarget = scalar, F32, 1372, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1376, "%", 1, 0 +etbRevLimitActive = bits, U32, 1380, [0:0] +jamDetected = bits, U32, 1380, [1:1] +etbDutyRateOfChange = scalar, F32, 1384, "per", 1,0 +etbDutyAverage = scalar, F32, 1388, "per", 1,0 +etbTpsErrorCounter = scalar, U16, 1392, "count", 1,0 +etbPpsErrorCounter = scalar, U16, 1394, "count", 1,0 +etbErrorCode = scalar, S08, 1396, "", 1, 0 +jamTimer = scalar, U16, 1398, "sec", 0.01, 0 +; total TS size = 1400 +faultCode = scalar, U08, 1400, "", 1, 0 +heaterDuty = scalar, U08, 1401, "%", 1, 0 +pumpDuty = scalar, U08, 1402, "%", 1, 0 +tempC = scalar, U16, 1404, "C", 1, 0 +nernstVoltage = scalar, U16, 1406, "V", 0.001, 0 +esr = scalar, U16, 1408, "ohm", 1, 0 +; total TS size = 1412 +dcOutput0 = scalar, F32, 1412, "per", 1,0 +isEnabled0_int = scalar, U08, 1416, "per", 1,0 +isEnabled0 = bits, U32, 1420, [0:0] +; total TS size = 1424 +value0 = scalar, U16, 1424, "value", 1,0 +value1 = scalar, U16, 1426, "value", 1,0 +errorRate = scalar, F32, 1428, "ratio", 1,0 ; total TS size = 1432 -lambdaCurrentlyGood = bits, U32, 1432, [0:0] -lambdaMonitorCut = bits, U32, 1432, [1:1] -lambdaTimeSinceGood = scalar, U16, 1436, "sec", 0.01, 0 -; total TS size = 1440 +vvtTarget = scalar, U16, 1432, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1434, "%", 0.5, 0 +; total TS size = 1436 +lambdaCurrentlyGood = bits, U32, 1436, [0:0] +lambdaMonitorCut = bits, U32, 1436, [1:1] +lambdaTimeSinceGood = scalar, U16, 1440, "sec", 0.01, 0 +; total TS size = 1444 diff --git a/firmware/console/binary/generated/sensors.java b/firmware/console/binary/generated/sensors.java index 8a66505b9f..3219738c96 100644 --- a/firmware/console/binary/generated/sensors.java +++ b/firmware/console/binary/generated/sensors.java @@ -461,101 +461,102 @@ brakePedalState("Brake switch", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 10 startStopState("startStopState", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1093, 1.0, -1.0, -1.0, ""), alignmentFill_at_46("need 4 byte alignment", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1094, 1.0, -20.0, 100.0, "units"), startStopStateToggleCounter("startStopStateToggleCounter", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1100, 1.0, -1.0, -1.0, ""), -egtValue1("egtValue1", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1104, 1.0, -1.0, -1.0, ""), -egtValue2("egtValue2", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1108, 1.0, -1.0, -1.0, ""), -desiredRpmLimit("User-defined RPM hard limit", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1112, 1.0, 0.0, 30000.0, "rpm"), -alignmentFill_at_66("need 4 byte alignment", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1114, 1.0, -20.0, 100.0, "units"), -fuelInjectionCounter("Fuel: Injection counter", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1116, 1.0, -1.0, -1.0, ""), -sparkCounter("Ign: Spark counter", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1120, 1.0, -1.0, -1.0, ""), -fuelingLoad("Fuel: Load", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1124, 1.0, -1.0, -1.0, ""), -ignitionLoad("Ignition: load", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1128, 1.0, -1.0, -1.0, ""), -veTableYAxis("veTableYAxis", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1132, 0.01, 0.0, 0.0, "%"), -alignmentFill_at_86("need 4 byte alignment", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1134, 1.0, -20.0, 100.0, "units"), -tpsFrom("Fuel: TPS AE from", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1136, 1.0, -1.0, -1.0, ""), -tpsTo("Fuel: TPS AE to", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1140, 1.0, -1.0, -1.0, ""), -deltaTps("Fuel: TPS AE change", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1144, 1.0, -1.0, -1.0, ""), -extraFuel("extraFuel", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1148, 1.0, -1.0, -1.0, ""), -valueFromTable("valueFromTable", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1152, 1.0, -1.0, -1.0, ""), -fractionalInjFuel("fractionalInjFuel", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1160, 1.0, -1.0, -1.0, ""), -accumulatedValue("accumulatedValue", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1164, 1.0, -1.0, -1.0, ""), -maxExtraPerCycle("maxExtraPerCycle", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1168, 1.0, -1.0, -1.0, ""), -maxExtraPerPeriod("maxExtraPerPeriod", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1172, 1.0, -1.0, -1.0, ""), -maxInjectedPerPeriod("maxInjectedPerPeriod", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1176, 1.0, -1.0, -1.0, ""), -cycleCnt("cycleCnt", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1180, 1.0, -1.0, -1.0, ""), -hwEventCounters1("Hardware events since boot 1", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1184, 1.0, -1.0, -1.0, ""), -hwEventCounters2("Hardware events since boot 2", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1188, 1.0, -1.0, -1.0, ""), -hwEventCounters3("Hardware events since boot 3", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1192, 1.0, -1.0, -1.0, ""), -hwEventCounters4("Hardware events since boot 4", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1196, 1.0, -1.0, -1.0, ""), -hwEventCounters5("Hardware events since boot 5", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1200, 1.0, -1.0, -1.0, ""), -hwEventCounters6("Hardware events since boot 6", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1204, 1.0, -1.0, -1.0, ""), -vvtCamCounter("Sync: total cams front counter", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1208, 1.0, -1.0, -1.0, ""), -mapVvt_MAP_AT_SPECIAL_POINT("mapVvt_MAP_AT_SPECIAL_POINT", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1212, 1.0, -10000.0, 10000.0, ""), -mapVvt_MAP_AT_DIFF("mapVvt_MAP_AT_DIFF", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1216, 1.0, -10000.0, 10000.0, ""), -mapVvt_MAP_AT_CYCLE_COUNT("mapVvt_MAP_AT_CYCLE_COUNT", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1220, 1.0, -10000.0, 10000.0, ""), -mapVvt_map_peak("mapVvt_map_peak", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1221, 1.0, -10000.0, 10000.0, ""), -alignmentFill_at_38("need 4 byte alignment", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1222, 1.0, -20.0, 100.0, "units"), -currentEngineDecodedPhase("Sync: Engine Phase", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1224, 1.0, 0.0, 0.0, "deg"), -triggerToothAngleError("Sync: trigger angle error", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1228, 1.0, -30.0, 30.0, "deg"), -triggerIgnoredToothCount("triggerIgnoredToothCount", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1232, 1.0, -1.0, -1.0, ""), -alignmentFill_at_49("need 4 byte alignment", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1233, 1.0, -20.0, 100.0, "units"), -mapCamPrevToothAngle("Sync: MAP: prev angle", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1236, 1.0, -3000.0, 3000.0, "deg"), -crankSynchronizationCounter("sync: Crank sync counter\nUsually matches crank revolutions", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1244, 1.0, -1.0, -1.0, ""), -vvtSyncGapRatio("vvtSyncGapRatio", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1248, 1.0, -10000.0, 10000.0, ""), -vvtToothDurations0("vvtToothDurations0", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1252, 1.0, 0.0, 100000.0, "us"), -vvtCurrentPosition("vvtCurrentPosition", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1256, 1.0, -10000.0, 10000.0, "sync: Primary Cam Position"), -vvtToothPosition1("vvtToothPosition 1", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1260, 1.0, -10000.0, 10000.0, "sync: Cam Tooth Position"), -vvtToothPosition2("vvtToothPosition 2", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1264, 1.0, -10000.0, 10000.0, "sync: Cam Tooth Position"), -vvtToothPosition3("vvtToothPosition 3", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1268, 1.0, -10000.0, 10000.0, "sync: Cam Tooth Position"), -vvtToothPosition4("vvtToothPosition 4", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1272, 1.0, -10000.0, 10000.0, "sync: Cam Tooth Position"), -triggerSyncGapRatio("Trigger Sync Latest Ratio", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1276, 1.0, -10000.0, 10000.0, ""), -triggerStateIndex("triggerStateIndex", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1280, 1.0, -1.0, -1.0, ""), -camResyncCounter("sync: Phase Re-Sync Counter", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1281, 1.0, -1.0, -1.0, ""), -vvtStateIndex("vvtStateIndex", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1282, 1.0, -1.0, -1.0, ""), -alignmentFill_at_39("need 4 byte alignment", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1283, 1.0, -20.0, 100.0, "units"), -wallFuelCorrection("fuel wallwetting injection time\n correction to account for wall wetting effect for current cycle", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1288, 1.0, -1.0, -1.0, ""), -wallFuel("Fuel on the wall\nin ms of injector open time for each injector.", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1292, 1.0, -1.0, -1.0, ""), -idleState("idleState", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1296, 1.0, -1.0, -1.0, ""), -currentIdlePosition("Idle: Position", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1300, 1.0, 0.0, 0.0, "%"), -baseIdlePosition("idle: base value\ncurrent position without adjustments (iacByTpsTaper, afterCrankingIACtaperDuration)", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1304, 1.0, -1.0, -1.0, ""), -idleClosedLoop("Idle: Closed loop", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1308, 1.0, -1.0, -1.0, ""), -iacByTpsTaper("idle: iacByTpsTaper portion", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1312, 1.0, -1.0, -1.0, ""), -throttlePedalUpState("idle: throttlePedalUpState\ntrue in IDLE throttle pedal state, false if driver is touching the pedal\ntodo: better name for this field?", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1316, 1.0, -1.0, -1.0, ""), -idleTarget("Idle: Target RPM", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1324, 1.0, -1.0, -1.0, ""), -targetRpmByClt("Idle: Target RPM base", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1328, 1.0, -1.0, -1.0, ""), -targetRpmAc("Idle: Target A/C RPM", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1332, 1.0, -1.0, -1.0, ""), -iacByRpmTaper("idle: iacByRpmTaper portion", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1336, 1.0, -1.0, -1.0, ""), -luaAdd("idle: Lua Adder", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1340, 1.0, -1.0, -1.0, ""), -idlePosition("ETB: idlePosition", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1344, 1.0, 0.0, 10.0, "per"), -trim("ETB: trim", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1348, 1.0, -1.0, -1.0, ""), -luaAdjustment("ETB: luaAdjustment", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1352, 1.0, 0.0, 3.0, "per"), -m_wastegatePosition("DC: wastegatePosition", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1356, 1.0, 0.0, 3.0, "per"), -etbFeedForward("etbFeedForward", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1360, 1.0, -1.0, -1.0, ""), -etbIntegralError("etbIntegralError", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1364, 1.0, -10000.0, 10000.0, ""), -etbCurrentTarget("etbCurrentTarget", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1368, 1.0, -10000.0, 10000.0, "%"), -etbCurrentAdjustedTarget("etbCurrentAdjustedTarget", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1372, 1.0, -10000.0, 10000.0, "%"), -etbDutyRateOfChange("ETB duty rate of change", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1380, 1.0, 0.0, 25.0, "per"), -etbDutyAverage("ETB average duty", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1384, 1.0, -20.0, 50.0, "per"), -etbTpsErrorCounter("ETB TPS error counter", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1388, 1.0, 0.0, 3.0, "count"), -etbPpsErrorCounter("ETB pedal error counter", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1390, 1.0, 0.0, 3.0, "count"), -etbErrorCode("etbErrorCode", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1392, 1.0, -1.0, -1.0, ""), -alignmentFill_at_49("need 4 byte alignment", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1393, 1.0, -20.0, 100.0, "units"), -jamTimer("ETB jam timer", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1394, 0.01, 0.0, 100.0, "sec"), -faultCode("WBO: Fault code", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1396, 1.0, -1.0, -1.0, ""), -heaterDuty("WBO: Heater duty", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1397, 1.0, 0.0, 100.0, "%"), -pumpDuty("WBO: Pump duty", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1398, 1.0, 0.0, 100.0, "%"), -alignmentFill_at_3("need 4 byte alignment", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1399, 1.0, -20.0, 100.0, "units"), -tempC("WBO: Temperature", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1400, 1.0, 500.0, 1000.0, "C"), -nernstVoltage("WBO: Nernst Voltage", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1402, 0.001, 0.0, 1.0, "V"), -esr("WBO: ESR", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1404, 1.0, 0.0, 10000.0, "ohm"), -alignmentFill_at_10("need 4 byte alignment", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1406, 1.0, -20.0, 100.0, "units"), -dcOutput0("DC: output0", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1408, 1.0, 0.0, 10.0, "per"), -isEnabled0_int("DC: en0", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1412, 1.0, 0.0, 10.0, "per"), -alignmentFill_at_5("need 4 byte alignment", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1413, 1.0, -20.0, 100.0, "units"), -value0("ETB: SENT value0", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1420, 1.0, 0.0, 3.0, "value"), -value1("ETB: SENT value1", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1422, 1.0, 0.0, 3.0, "value"), -errorRate("ETB: SENT error rate", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1424, 1.0, 0.0, 3.0, "ratio"), -vvtTarget("vvtTarget", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1428, 0.1, -90.0, 90.0, "deg"), -vvtOutput("vvtOutput", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1430, 0.5, 100.0, 1.0, "%"), -alignmentFill_at_3("need 4 byte alignment", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1431, 1.0, -20.0, 100.0, "units"), -lambdaTimeSinceGood("lambdaTimeSinceGood", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1436, 0.01, 0.0, 1.0, "sec"), -alignmentFill_at_6("need 4 byte alignment", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1438, 1.0, -20.0, 100.0, "units"), +startStopStateTempPhysicalCounter("startStopStateTempPhysicalCounter", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1104, 1.0, -1.0, -1.0, ""), +egtValue1("egtValue1", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1108, 1.0, -1.0, -1.0, ""), +egtValue2("egtValue2", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1112, 1.0, -1.0, -1.0, ""), +desiredRpmLimit("User-defined RPM hard limit", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1116, 1.0, 0.0, 30000.0, "rpm"), +alignmentFill_at_70("need 4 byte alignment", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1118, 1.0, -20.0, 100.0, "units"), +fuelInjectionCounter("Fuel: Injection counter", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1120, 1.0, -1.0, -1.0, ""), +sparkCounter("Ign: Spark counter", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1124, 1.0, -1.0, -1.0, ""), +fuelingLoad("Fuel: Load", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1128, 1.0, -1.0, -1.0, ""), +ignitionLoad("Ignition: load", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1132, 1.0, -1.0, -1.0, ""), +veTableYAxis("veTableYAxis", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1136, 0.01, 0.0, 0.0, "%"), +alignmentFill_at_90("need 4 byte alignment", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1138, 1.0, -20.0, 100.0, "units"), +tpsFrom("Fuel: TPS AE from", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1140, 1.0, -1.0, -1.0, ""), +tpsTo("Fuel: TPS AE to", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1144, 1.0, -1.0, -1.0, ""), +deltaTps("Fuel: TPS AE change", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1148, 1.0, -1.0, -1.0, ""), +extraFuel("extraFuel", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1152, 1.0, -1.0, -1.0, ""), +valueFromTable("valueFromTable", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1156, 1.0, -1.0, -1.0, ""), +fractionalInjFuel("fractionalInjFuel", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1164, 1.0, -1.0, -1.0, ""), +accumulatedValue("accumulatedValue", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1168, 1.0, -1.0, -1.0, ""), +maxExtraPerCycle("maxExtraPerCycle", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1172, 1.0, -1.0, -1.0, ""), +maxExtraPerPeriod("maxExtraPerPeriod", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1176, 1.0, -1.0, -1.0, ""), +maxInjectedPerPeriod("maxInjectedPerPeriod", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1180, 1.0, -1.0, -1.0, ""), +cycleCnt("cycleCnt", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1184, 1.0, -1.0, -1.0, ""), +hwEventCounters1("Hardware events since boot 1", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1188, 1.0, -1.0, -1.0, ""), +hwEventCounters2("Hardware events since boot 2", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1192, 1.0, -1.0, -1.0, ""), +hwEventCounters3("Hardware events since boot 3", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1196, 1.0, -1.0, -1.0, ""), +hwEventCounters4("Hardware events since boot 4", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1200, 1.0, -1.0, -1.0, ""), +hwEventCounters5("Hardware events since boot 5", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1204, 1.0, -1.0, -1.0, ""), +hwEventCounters6("Hardware events since boot 6", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1208, 1.0, -1.0, -1.0, ""), +vvtCamCounter("Sync: total cams front counter", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1212, 1.0, -1.0, -1.0, ""), +mapVvt_MAP_AT_SPECIAL_POINT("mapVvt_MAP_AT_SPECIAL_POINT", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1216, 1.0, -10000.0, 10000.0, ""), +mapVvt_MAP_AT_DIFF("mapVvt_MAP_AT_DIFF", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1220, 1.0, -10000.0, 10000.0, ""), +mapVvt_MAP_AT_CYCLE_COUNT("mapVvt_MAP_AT_CYCLE_COUNT", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1224, 1.0, -10000.0, 10000.0, ""), +mapVvt_map_peak("mapVvt_map_peak", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1225, 1.0, -10000.0, 10000.0, ""), +alignmentFill_at_38("need 4 byte alignment", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1226, 1.0, -20.0, 100.0, "units"), +currentEngineDecodedPhase("Sync: Engine Phase", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1228, 1.0, 0.0, 0.0, "deg"), +triggerToothAngleError("Sync: trigger angle error", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1232, 1.0, -30.0, 30.0, "deg"), +triggerIgnoredToothCount("triggerIgnoredToothCount", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1236, 1.0, -1.0, -1.0, ""), +alignmentFill_at_49("need 4 byte alignment", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1237, 1.0, -20.0, 100.0, "units"), +mapCamPrevToothAngle("Sync: MAP: prev angle", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1240, 1.0, -3000.0, 3000.0, "deg"), +crankSynchronizationCounter("sync: Crank sync counter\nUsually matches crank revolutions", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1248, 1.0, -1.0, -1.0, ""), +vvtSyncGapRatio("vvtSyncGapRatio", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1252, 1.0, -10000.0, 10000.0, ""), +vvtToothDurations0("vvtToothDurations0", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1256, 1.0, 0.0, 100000.0, "us"), +vvtCurrentPosition("vvtCurrentPosition", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1260, 1.0, -10000.0, 10000.0, "sync: Primary Cam Position"), +vvtToothPosition1("vvtToothPosition 1", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1264, 1.0, -10000.0, 10000.0, "sync: Cam Tooth Position"), +vvtToothPosition2("vvtToothPosition 2", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1268, 1.0, -10000.0, 10000.0, "sync: Cam Tooth Position"), +vvtToothPosition3("vvtToothPosition 3", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1272, 1.0, -10000.0, 10000.0, "sync: Cam Tooth Position"), +vvtToothPosition4("vvtToothPosition 4", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1276, 1.0, -10000.0, 10000.0, "sync: Cam Tooth Position"), +triggerSyncGapRatio("Trigger Sync Latest Ratio", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1280, 1.0, -10000.0, 10000.0, ""), +triggerStateIndex("triggerStateIndex", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1284, 1.0, -1.0, -1.0, ""), +camResyncCounter("sync: Phase Re-Sync Counter", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1285, 1.0, -1.0, -1.0, ""), +vvtStateIndex("vvtStateIndex", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1286, 1.0, -1.0, -1.0, ""), +alignmentFill_at_39("need 4 byte alignment", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1287, 1.0, -20.0, 100.0, "units"), +wallFuelCorrection("fuel wallwetting injection time\n correction to account for wall wetting effect for current cycle", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1292, 1.0, -1.0, -1.0, ""), +wallFuel("Fuel on the wall\nin ms of injector open time for each injector.", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1296, 1.0, -1.0, -1.0, ""), +idleState("idleState", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1300, 1.0, -1.0, -1.0, ""), +currentIdlePosition("Idle: Position", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1304, 1.0, 0.0, 0.0, "%"), +baseIdlePosition("idle: base value\ncurrent position without adjustments (iacByTpsTaper, afterCrankingIACtaperDuration)", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1308, 1.0, -1.0, -1.0, ""), +idleClosedLoop("Idle: Closed loop", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1312, 1.0, -1.0, -1.0, ""), +iacByTpsTaper("idle: iacByTpsTaper portion", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1316, 1.0, -1.0, -1.0, ""), +throttlePedalUpState("idle: throttlePedalUpState\ntrue in IDLE throttle pedal state, false if driver is touching the pedal\ntodo: better name for this field?", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1320, 1.0, -1.0, -1.0, ""), +idleTarget("Idle: Target RPM", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1328, 1.0, -1.0, -1.0, ""), +targetRpmByClt("Idle: Target RPM base", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1332, 1.0, -1.0, -1.0, ""), +targetRpmAc("Idle: Target A/C RPM", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1336, 1.0, -1.0, -1.0, ""), +iacByRpmTaper("idle: iacByRpmTaper portion", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1340, 1.0, -1.0, -1.0, ""), +luaAdd("idle: Lua Adder", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1344, 1.0, -1.0, -1.0, ""), +idlePosition("ETB: idlePosition", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1348, 1.0, 0.0, 10.0, "per"), +trim("ETB: trim", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1352, 1.0, -1.0, -1.0, ""), +luaAdjustment("ETB: luaAdjustment", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1356, 1.0, 0.0, 3.0, "per"), +m_wastegatePosition("DC: wastegatePosition", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1360, 1.0, 0.0, 3.0, "per"), +etbFeedForward("etbFeedForward", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1364, 1.0, -1.0, -1.0, ""), +etbIntegralError("etbIntegralError", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1368, 1.0, -10000.0, 10000.0, ""), +etbCurrentTarget("etbCurrentTarget", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1372, 1.0, -10000.0, 10000.0, "%"), +etbCurrentAdjustedTarget("etbCurrentAdjustedTarget", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1376, 1.0, -10000.0, 10000.0, "%"), +etbDutyRateOfChange("ETB duty rate of change", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1384, 1.0, 0.0, 25.0, "per"), +etbDutyAverage("ETB average duty", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1388, 1.0, -20.0, 50.0, "per"), +etbTpsErrorCounter("ETB TPS error counter", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1392, 1.0, 0.0, 3.0, "count"), +etbPpsErrorCounter("ETB pedal error counter", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1394, 1.0, 0.0, 3.0, "count"), +etbErrorCode("etbErrorCode", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1396, 1.0, -1.0, -1.0, ""), +alignmentFill_at_49("need 4 byte alignment", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1397, 1.0, -20.0, 100.0, "units"), +jamTimer("ETB jam timer", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1398, 0.01, 0.0, 100.0, "sec"), +faultCode("WBO: Fault code", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1400, 1.0, -1.0, -1.0, ""), +heaterDuty("WBO: Heater duty", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1401, 1.0, 0.0, 100.0, "%"), +pumpDuty("WBO: Pump duty", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1402, 1.0, 0.0, 100.0, "%"), +alignmentFill_at_3("need 4 byte alignment", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1403, 1.0, -20.0, 100.0, "units"), +tempC("WBO: Temperature", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1404, 1.0, 500.0, 1000.0, "C"), +nernstVoltage("WBO: Nernst Voltage", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1406, 0.001, 0.0, 1.0, "V"), +esr("WBO: ESR", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1408, 1.0, 0.0, 10000.0, "ohm"), +alignmentFill_at_10("need 4 byte alignment", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1410, 1.0, -20.0, 100.0, "units"), +dcOutput0("DC: output0", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1412, 1.0, 0.0, 10.0, "per"), +isEnabled0_int("DC: en0", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1416, 1.0, 0.0, 10.0, "per"), +alignmentFill_at_5("need 4 byte alignment", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1417, 1.0, -20.0, 100.0, "units"), +value0("ETB: SENT value0", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1424, 1.0, 0.0, 3.0, "value"), +value1("ETB: SENT value1", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1426, 1.0, 0.0, 3.0, "value"), +errorRate("ETB: SENT error rate", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1428, 1.0, 0.0, 3.0, "ratio"), +vvtTarget("vvtTarget", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1432, 0.1, -90.0, 90.0, "deg"), +vvtOutput("vvtOutput", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1434, 0.5, 100.0, 1.0, "%"), +alignmentFill_at_3("need 4 byte alignment", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1435, 1.0, -20.0, 100.0, "units"), +lambdaTimeSinceGood("lambdaTimeSinceGood", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1440, 0.01, 0.0, 1.0, "sec"), +alignmentFill_at_6("need 4 byte alignment", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1442, 1.0, -20.0, 100.0, "units"), diff --git a/firmware/console/binary/generated/total_live_data_generated.h b/firmware/console/binary/generated/total_live_data_generated.h index 8b2b1e7b81..175a646759 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 1440 \ No newline at end of file +#define TS_TOTAL_OUTPUT_SIZE 1444 \ 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 ceac052b80..10f15cba6c 100644 --- a/firmware/console/binary_log/log_fields_generated.h +++ b/firmware/console/binary_log/log_fields_generated.h @@ -385,6 +385,7 @@ static constexpr LogField fields[] = { {engine->engineState.brakePedalState, "Brake switch", "", 0}, {engine->engineState.startStopState, "startStopState", "", 0}, {engine->engineState.startStopStateToggleCounter, "startStopStateToggleCounter", "", 0}, + {engine->engineState.startStopStateTempPhysicalCounter, "startStopStateTempPhysicalCounter", "", 0}, {engine->engineState.egtValue1, "egtValue1", "", 0}, {engine->engineState.egtValue2, "egtValue2", "", 0}, {engine->engineState.desiredRpmLimit, "User-defined RPM hard limit", "rpm", 0}, diff --git a/firmware/controllers/algo/engine_state_generated.h b/firmware/controllers/algo/engine_state_generated.h index ffd0e3f5bc..6e60ae1878 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 Mon Sep 25 18:12:01 UTC 2023 +// this section was generated automatically by rusEFI tool config_definition_base.jar based on (unknown script) controllers/algo/engine_state.txt Thu Nov 09 02:06:25 UTC 2023 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -322,56 +322,60 @@ struct engine_state_s { /** * offset 56 */ - float egtValue1 = (float)0; + uint32_t startStopStateTempPhysicalCounter = (uint32_t)0; /** * offset 60 */ + float egtValue1 = (float)0; + /** + * offset 64 + */ float egtValue2 = (float)0; /** * User-defined RPM hard limit rpm - * offset 64 + * offset 68 */ int16_t desiredRpmLimit = (int16_t)0; /** * need 4 byte alignment units - * offset 66 + * offset 70 */ - uint8_t alignmentFill_at_66[2]; + uint8_t alignmentFill_at_70[2]; /** * Fuel: Injection counter - * offset 68 + * offset 72 */ uint32_t fuelInjectionCounter = (uint32_t)0; /** * Ign: Spark counter - * offset 72 + * offset 76 */ uint32_t sparkCounter = (uint32_t)0; /** * @@GAUGE_NAME_FUEL_LOAD@@ - * offset 76 + * offset 80 */ float fuelingLoad = (float)0; /** * @@GAUGE_NAME_IGNITION_LOAD@@ - * offset 80 + * offset 84 */ float ignitionLoad = (float)0; /** % - * offset 84 + * offset 88 */ scaled_channel veTableYAxis = (uint16_t)0; /** * need 4 byte alignment units - * offset 86 + * offset 90 */ - uint8_t alignmentFill_at_86[2]; + uint8_t alignmentFill_at_90[2]; }; -static_assert(sizeof(engine_state_s) == 88); +static_assert(sizeof(engine_state_s) == 92); // end -// this section was generated automatically by rusEFI tool config_definition_base.jar based on (unknown script) controllers/algo/engine_state.txt Mon Sep 25 18:12:01 UTC 2023 +// this section was generated automatically by rusEFI tool config_definition_base.jar based on (unknown script) controllers/algo/engine_state.txt Thu Nov 09 02:06:25 UTC 2023 diff --git a/firmware/controllers/generated/rusefi_generated.h b/firmware/controllers/generated/rusefi_generated.h index fdec3841f6..17c3b7313f 100644 --- a/firmware/controllers/generated/rusefi_generated.h +++ b/firmware/controllers/generated/rusefi_generated.h @@ -1103,7 +1103,7 @@ #define SentEtbType_NONE 0 #define show_Frankenso_presets true #define show_test_presets true -#define SIGNATURE_HASH 2509298742 +#define SIGNATURE_HASH 2261547360 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define spi_device_e_auto_enum 0="SPI_NONE",1="SPI_DEVICE_1",2="SPI_DEVICE_2",3="SPI_DEVICE_3",4="SPI_DEVICE_4" #define spi_device_e_SPI_DEVICE_1 1 @@ -1162,7 +1162,7 @@ #define TransmissionControllerMode_SimpleTransmissionController 1 #define TRIGGER_COMMENT "#" #define trigger_config_s_size 12 -#define TRIGGER_CRANK_BASED trigger_type == 2 || trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 21 || trigger_type == 26 || trigger_type == 27 || trigger_type == 33 || trigger_type == 38 || trigger_type == 39 || trigger_type == 44 || trigger_type == 45 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 58 || trigger_type == 61 || trigger_type == 62 || trigger_type == 68 || trigger_type == 70 || trigger_type == 71 || trigger_type == 72 || trigger_type == 74 || trigger_type == 75 || trigger_type == 76 || trigger_type == 77 || trigger_type == 79 +#define TRIGGER_CRANK_BASED trigger_type == 2 || trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 21 || trigger_type == 26 || trigger_type == 27 || trigger_type == 33 || trigger_type == 38 || trigger_type == 39 || trigger_type == 44 || trigger_type == 45 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 58 || trigger_type == 61 || trigger_type == 62 || trigger_type == 68 || trigger_type == 70 || trigger_type == 71 || trigger_type == 72 || trigger_type == 74 || trigger_type == 75 || trigger_type == 76 || trigger_type == 77 #define TRIGGER_CYCLE_DURATION "cycleDuration" #define TRIGGER_GAP_FROM "gapFrom" #define TRIGGER_GAP_TO "gapTo" @@ -1399,14 +1399,14 @@ #define ts_show_vr_threshold_2 true #define ts_show_vr_threshold_all true #define ts_show_vr_threshold_pins true -#define TS_SIGNATURE "rusEFI master.2023.11.08.f407-discovery.2509298742" +#define TS_SIGNATURE "rusEFI master.2023.11.09.f407-discovery.2261547360" #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 1440 +#define TS_TOTAL_OUTPUT_SIZE 1444 #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 a3b468d474..d6dbb07632 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.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 1191049738 -#define TS_SIGNATURE "rusEFI master.2023.11.08.alphax-2chan.1191049738" +#define SIGNATURE_HASH 1436639068 +#define TS_SIGNATURE "rusEFI master.2023.11.09.alphax-2chan.1436639068" diff --git a/firmware/controllers/generated/signature_alphax-4chan.h b/firmware/controllers/generated/signature_alphax-4chan.h index 58642baf0a..34ef8e41ee 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.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 4002463964 -#define TS_SIGNATURE "rusEFI master.2023.11.08.alphax-4chan.4002463964" +#define SIGNATURE_HASH 4258030986 +#define TS_SIGNATURE "rusEFI master.2023.11.09.alphax-4chan.4258030986" diff --git a/firmware/controllers/generated/signature_alphax-4chan_f7.h b/firmware/controllers/generated/signature_alphax-4chan_f7.h index fe286e03ee..cbb1284320 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.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 4002463964 -#define TS_SIGNATURE "rusEFI master.2023.11.08.alphax-4chan_f7.4002463964" +#define SIGNATURE_HASH 4258030986 +#define TS_SIGNATURE "rusEFI master.2023.11.09.alphax-4chan_f7.4258030986" diff --git a/firmware/controllers/generated/signature_alphax-8chan-revA.h b/firmware/controllers/generated/signature_alphax-8chan-revA.h index e696d80cdb..09bd0023f1 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.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 125538318 -#define TS_SIGNATURE "rusEFI master.2023.11.08.alphax-8chan-revA.125538318" +#define SIGNATURE_HASH 338113880 +#define TS_SIGNATURE "rusEFI master.2023.11.09.alphax-8chan-revA.338113880" diff --git a/firmware/controllers/generated/signature_alphax-8chan.h b/firmware/controllers/generated/signature_alphax-8chan.h index ba2e12d21d..419236552d 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.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 902388248 -#define TS_SIGNATURE "rusEFI master.2023.11.08.alphax-8chan.902388248" +#define SIGNATURE_HASH 647364430 +#define TS_SIGNATURE "rusEFI master.2023.11.09.alphax-8chan.647364430" diff --git a/firmware/controllers/generated/signature_alphax-8chan_f7.h b/firmware/controllers/generated/signature_alphax-8chan_f7.h index cb4712674f..ecb1b91879 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.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 902388248 -#define TS_SIGNATURE "rusEFI master.2023.11.08.alphax-8chan_f7.902388248" +#define SIGNATURE_HASH 647364430 +#define TS_SIGNATURE "rusEFI master.2023.11.09.alphax-8chan_f7.647364430" diff --git a/firmware/controllers/generated/signature_at_start_f435.h b/firmware/controllers/generated/signature_at_start_f435.h index c2fac1c469..818d41fcc7 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.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 914902541 -#define TS_SIGNATURE "rusEFI master.2023.11.08.at_start_f435.914902541" +#define SIGNATURE_HASH 634710875 +#define TS_SIGNATURE "rusEFI master.2023.11.09.at_start_f435.634710875" diff --git a/firmware/controllers/generated/signature_atlas.h b/firmware/controllers/generated/signature_atlas.h index 02f6f63b00..fdc9988fed 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.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 1922013763 -#define TS_SIGNATURE "rusEFI master.2023.11.08.atlas.1922013763" +#define SIGNATURE_HASH 1641234197 +#define TS_SIGNATURE "rusEFI master.2023.11.09.atlas.1641234197" diff --git a/firmware/controllers/generated/signature_core8.h b/firmware/controllers/generated/signature_core8.h index a84c072d67..b6d246f08f 100644 --- a/firmware/controllers/generated/signature_core8.h +++ b/firmware/controllers/generated/signature_core8.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 246367163 -#define TS_SIGNATURE "rusEFI master.2023.11.08.core8.246367163" +#define SIGNATURE_HASH 502523629 +#define TS_SIGNATURE "rusEFI master.2023.11.09.core8.502523629" diff --git a/firmware/controllers/generated/signature_cypress.h b/firmware/controllers/generated/signature_cypress.h index 04ae5ebbd1..4a28fdbaf1 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.jar based on hellen_cypress_gen_config.bat by SignatureConsumer // -#define SIGNATURE_HASH 914902541 -#define TS_SIGNATURE "rusEFI master.2023.11.08.cypress.914902541" +#define SIGNATURE_HASH 634710875 +#define TS_SIGNATURE "rusEFI master.2023.11.09.cypress.634710875" diff --git a/firmware/controllers/generated/signature_f407-discovery.h b/firmware/controllers/generated/signature_f407-discovery.h index 3d5399d21b..95ab502e81 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.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 2509298742 -#define TS_SIGNATURE "rusEFI master.2023.11.08.f407-discovery.2509298742" +#define SIGNATURE_HASH 2261547360 +#define TS_SIGNATURE "rusEFI master.2023.11.09.f407-discovery.2261547360" diff --git a/firmware/controllers/generated/signature_f429-discovery.h b/firmware/controllers/generated/signature_f429-discovery.h index 0b7229a8f8..9ef361891b 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.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 914902541 -#define TS_SIGNATURE "rusEFI master.2023.11.08.f429-discovery.914902541" +#define SIGNATURE_HASH 634710875 +#define TS_SIGNATURE "rusEFI master.2023.11.09.f429-discovery.634710875" diff --git a/firmware/controllers/generated/signature_frankenso_na6.h b/firmware/controllers/generated/signature_frankenso_na6.h index abd8d50b8f..637bb9cf7a 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.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 349875911 -#define TS_SIGNATURE "rusEFI master.2023.11.08.frankenso_na6.349875911" +#define SIGNATURE_HASH 126225297 +#define TS_SIGNATURE "rusEFI master.2023.11.09.frankenso_na6.126225297" diff --git a/firmware/controllers/generated/signature_harley81.h b/firmware/controllers/generated/signature_harley81.h index b617bcd115..77af1145c6 100644 --- a/firmware/controllers/generated/signature_harley81.h +++ b/firmware/controllers/generated/signature_harley81.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 516185716 -#define TS_SIGNATURE "rusEFI master.2023.11.08.harley81.516185716" +#define SIGNATURE_HASH 228129570 +#define TS_SIGNATURE "rusEFI master.2023.11.09.harley81.228129570" diff --git a/firmware/controllers/generated/signature_hellen-112-17.h b/firmware/controllers/generated/signature_hellen-112-17.h index 8d92e3c034..0384195878 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.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 1343953697 -#define TS_SIGNATURE "rusEFI master.2023.11.08.hellen-112-17.1343953697" +#define SIGNATURE_HASH 1128775287 +#define TS_SIGNATURE "rusEFI master.2023.11.09.hellen-112-17.1128775287" diff --git a/firmware/controllers/generated/signature_hellen-112-mg1.h b/firmware/controllers/generated/signature_hellen-112-mg1.h index eeed5c11fc..2c64c7853a 100644 --- a/firmware/controllers/generated/signature_hellen-112-mg1.h +++ b/firmware/controllers/generated/signature_hellen-112-mg1.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 3828826975 -#define TS_SIGNATURE "rusEFI master.2023.11.08.hellen-112-mg1.3828826975" +#define SIGNATURE_HASH 4151043593 +#define TS_SIGNATURE "rusEFI master.2023.11.09.hellen-112-mg1.4151043593" diff --git a/firmware/controllers/generated/signature_hellen-gm-e67.h b/firmware/controllers/generated/signature_hellen-gm-e67.h index c363e45161..ad2520de93 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.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 2256206077 -#define TS_SIGNATURE "rusEFI master.2023.11.08.hellen-gm-e67.2256206077" +#define SIGNATURE_HASH 2502319531 +#define TS_SIGNATURE "rusEFI master.2023.11.09.hellen-gm-e67.2502319531" diff --git a/firmware/controllers/generated/signature_hellen-honda-k.h b/firmware/controllers/generated/signature_hellen-honda-k.h index bb8bda78f3..ceec5c5bcc 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.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 4016599086 -#define TS_SIGNATURE "rusEFI master.2023.11.08.hellen-honda-k.4016599086" +#define SIGNATURE_HASH 4231320952 +#define TS_SIGNATURE "rusEFI master.2023.11.09.hellen-honda-k.4231320952" diff --git a/firmware/controllers/generated/signature_hellen-nb1.h b/firmware/controllers/generated/signature_hellen-nb1.h index 4987b66121..ac12c086c8 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.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 1498039066 -#define TS_SIGNATURE "rusEFI master.2023.11.08.hellen-nb1.1498039066" +#define SIGNATURE_HASH 1243014732 +#define TS_SIGNATURE "rusEFI master.2023.11.09.hellen-nb1.1243014732" diff --git a/firmware/controllers/generated/signature_hellen121nissan.h b/firmware/controllers/generated/signature_hellen121nissan.h index b79aa5198e..e29e57270c 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.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 2948507705 -#define TS_SIGNATURE "rusEFI master.2023.11.08.hellen121nissan.2948507705" +#define SIGNATURE_HASH 3168931183 +#define TS_SIGNATURE "rusEFI master.2023.11.09.hellen121nissan.3168931183" diff --git a/firmware/controllers/generated/signature_hellen121vag.h b/firmware/controllers/generated/signature_hellen121vag.h index 0ec323c573..8c2b5d067e 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.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 2734051790 -#define TS_SIGNATURE "rusEFI master.2023.11.08.hellen121vag.2734051790" +#define SIGNATURE_HASH 2980770968 +#define TS_SIGNATURE "rusEFI master.2023.11.09.hellen121vag.2980770968" diff --git a/firmware/controllers/generated/signature_hellen128.h b/firmware/controllers/generated/signature_hellen128.h index e8b39012bc..5487df59da 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.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 4183476583 -#define TS_SIGNATURE "rusEFI master.2023.11.08.hellen128.4183476583" +#define SIGNATURE_HASH 3926289457 +#define TS_SIGNATURE "rusEFI master.2023.11.09.hellen128.3926289457" diff --git a/firmware/controllers/generated/signature_hellen154hyundai.h b/firmware/controllers/generated/signature_hellen154hyundai.h index 6972b143d9..afe52cec24 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.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 3888858295 -#define TS_SIGNATURE "rusEFI master.2023.11.08.hellen154hyundai.3888858295" +#define SIGNATURE_HASH 4103594465 +#define TS_SIGNATURE "rusEFI master.2023.11.09.hellen154hyundai.4103594465" diff --git a/firmware/controllers/generated/signature_hellen72.h b/firmware/controllers/generated/signature_hellen72.h index 3683e272f2..978377e856 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.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 1523337248 -#define TS_SIGNATURE "rusEFI master.2023.11.08.hellen72.1523337248" +#define SIGNATURE_HASH 1234234742 +#define TS_SIGNATURE "rusEFI master.2023.11.09.hellen72.1234234742" diff --git a/firmware/controllers/generated/signature_hellen81.h b/firmware/controllers/generated/signature_hellen81.h index b02cba3408..bc6a4fb2bb 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.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 3957046370 -#define TS_SIGNATURE "rusEFI master.2023.11.08.hellen81.3957046370" +#define SIGNATURE_HASH 4169603380 +#define TS_SIGNATURE "rusEFI master.2023.11.09.hellen81.4169603380" diff --git a/firmware/controllers/generated/signature_hellen88bmw.h b/firmware/controllers/generated/signature_hellen88bmw.h index af2e363dc4..a9dc80a798 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.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 3635266505 -#define TS_SIGNATURE "rusEFI master.2023.11.08.hellen88bmw.3635266505" +#define SIGNATURE_HASH 3421595295 +#define TS_SIGNATURE "rusEFI master.2023.11.09.hellen88bmw.3421595295" diff --git a/firmware/controllers/generated/signature_hellenNA6.h b/firmware/controllers/generated/signature_hellenNA6.h index 58815de2c7..285fa23914 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.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 3716534825 -#define TS_SIGNATURE "rusEFI master.2023.11.08.hellenNA6.3716534825" +#define SIGNATURE_HASH 3470358399 +#define TS_SIGNATURE "rusEFI master.2023.11.09.hellenNA6.3470358399" diff --git a/firmware/controllers/generated/signature_hellenNA8_96.h b/firmware/controllers/generated/signature_hellenNA8_96.h index 05d229bae1..c11dbab877 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.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 3139748582 -#define TS_SIGNATURE "rusEFI master.2023.11.08.hellenNA8_96.3139748582" +#define SIGNATURE_HASH 2826463152 +#define TS_SIGNATURE "rusEFI master.2023.11.09.hellenNA8_96.2826463152" diff --git a/firmware/controllers/generated/signature_kin.h b/firmware/controllers/generated/signature_kin.h index d9b56f0bb8..e52b229c1f 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.jar based on kinetis_gen_config.bat by SignatureConsumer // -#define SIGNATURE_HASH 1952024995 -#define TS_SIGNATURE "rusEFI master.2023.11.08.kin.1952024995" +#define SIGNATURE_HASH 1728392437 +#define TS_SIGNATURE "rusEFI master.2023.11.09.kin.1728392437" diff --git a/firmware/controllers/generated/signature_m74_9.h b/firmware/controllers/generated/signature_m74_9.h index c798ac5616..0e710d7df4 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.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 1722355185 -#define TS_SIGNATURE "rusEFI master.2023.11.08.m74_9.1722355185" +#define SIGNATURE_HASH 1979033767 +#define TS_SIGNATURE "rusEFI master.2023.11.09.m74_9.1979033767" diff --git a/firmware/controllers/generated/signature_mre_f4.h b/firmware/controllers/generated/signature_mre_f4.h index ab27083037..584c1c17fc 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.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 367372173 -#define TS_SIGNATURE "rusEFI master.2023.11.08.mre_f4.367372173" +#define SIGNATURE_HASH 112788187 +#define TS_SIGNATURE "rusEFI master.2023.11.09.mre_f4.112788187" diff --git a/firmware/controllers/generated/signature_mre_f7.h b/firmware/controllers/generated/signature_mre_f7.h index 903b6a548c..3a38d9c9f2 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.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 367372173 -#define TS_SIGNATURE "rusEFI master.2023.11.08.mre_f7.367372173" +#define SIGNATURE_HASH 112788187 +#define TS_SIGNATURE "rusEFI master.2023.11.09.mre_f7.112788187" diff --git a/firmware/controllers/generated/signature_nucleo_f429.h b/firmware/controllers/generated/signature_nucleo_f429.h index 2bfaccd13c..b0f31b59f2 100644 --- a/firmware/controllers/generated/signature_nucleo_f429.h +++ b/firmware/controllers/generated/signature_nucleo_f429.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 914902541 -#define TS_SIGNATURE "rusEFI master.2023.11.08.nucleo_f429.914902541" +#define SIGNATURE_HASH 634710875 +#define TS_SIGNATURE "rusEFI master.2023.11.09.nucleo_f429.634710875" diff --git a/firmware/controllers/generated/signature_nucleo_f767.h b/firmware/controllers/generated/signature_nucleo_f767.h index 37b69502c9..0a74039b6c 100644 --- a/firmware/controllers/generated/signature_nucleo_f767.h +++ b/firmware/controllers/generated/signature_nucleo_f767.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 914902541 -#define TS_SIGNATURE "rusEFI master.2023.11.08.nucleo_f767.914902541" +#define SIGNATURE_HASH 634710875 +#define TS_SIGNATURE "rusEFI master.2023.11.09.nucleo_f767.634710875" diff --git a/firmware/controllers/generated/signature_nucleo_h743.h b/firmware/controllers/generated/signature_nucleo_h743.h index 7f3a0a0f28..f895ec7dc4 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.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 914902541 -#define TS_SIGNATURE "rusEFI master.2023.11.08.nucleo_h743.914902541" +#define SIGNATURE_HASH 634710875 +#define TS_SIGNATURE "rusEFI master.2023.11.09.nucleo_h743.634710875" diff --git a/firmware/controllers/generated/signature_prometheus_405.h b/firmware/controllers/generated/signature_prometheus_405.h index 15e9fb2f42..2ea19b1265 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.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 102531997 -#define TS_SIGNATURE "rusEFI master.2023.11.08.prometheus_405.102531997" +#define SIGNATURE_HASH 356525771 +#define TS_SIGNATURE "rusEFI master.2023.11.09.prometheus_405.356525771" diff --git a/firmware/controllers/generated/signature_prometheus_469.h b/firmware/controllers/generated/signature_prometheus_469.h index 97bcfd98e0..557f8eea44 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.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 102531997 -#define TS_SIGNATURE "rusEFI master.2023.11.08.prometheus_469.102531997" +#define SIGNATURE_HASH 356525771 +#define TS_SIGNATURE "rusEFI master.2023.11.09.prometheus_469.356525771" diff --git a/firmware/controllers/generated/signature_proteus_f4.h b/firmware/controllers/generated/signature_proteus_f4.h index 1eef5b8e90..3060171ef0 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.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 916172919 -#define TS_SIGNATURE "rusEFI master.2023.11.08.proteus_f4.916172919" +#define SIGNATURE_HASH 633804065 +#define TS_SIGNATURE "rusEFI master.2023.11.09.proteus_f4.633804065" diff --git a/firmware/controllers/generated/signature_proteus_f7.h b/firmware/controllers/generated/signature_proteus_f7.h index 420d61c4f6..033dae87bb 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.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 916172919 -#define TS_SIGNATURE "rusEFI master.2023.11.08.proteus_f7.916172919" +#define SIGNATURE_HASH 633804065 +#define TS_SIGNATURE "rusEFI master.2023.11.09.proteus_f7.633804065" diff --git a/firmware/controllers/generated/signature_proteus_h7.h b/firmware/controllers/generated/signature_proteus_h7.h index 7ee8d9615f..d2800bc3dd 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.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 916172919 -#define TS_SIGNATURE "rusEFI master.2023.11.08.proteus_h7.916172919" +#define SIGNATURE_HASH 633804065 +#define TS_SIGNATURE "rusEFI master.2023.11.09.proteus_h7.633804065" diff --git a/firmware/controllers/generated/signature_s105.h b/firmware/controllers/generated/signature_s105.h index 8f51cbd31b..6e9db304f9 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.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 1503899243 -#define TS_SIGNATURE "rusEFI master.2023.11.08.s105.1503899243" +#define SIGNATURE_HASH 1258228541 +#define TS_SIGNATURE "rusEFI master.2023.11.09.s105.1258228541" diff --git a/firmware/controllers/generated/signature_small-can-board.h b/firmware/controllers/generated/signature_small-can-board.h index cbde70e45b..ed1a793e6b 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.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 991457793 -#define TS_SIGNATURE "rusEFI master.2023.11.08.small-can-board.991457793" +#define SIGNATURE_HASH 675600215 +#define TS_SIGNATURE "rusEFI master.2023.11.09.small-can-board.675600215" diff --git a/firmware/controllers/generated/signature_subaru_eg33_f7.h b/firmware/controllers/generated/signature_subaru_eg33_f7.h index 320aa5ad4e..ae44b3b33e 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.jar based on config/boards/subaru_eg33/config/gen_subaru_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 822446362 -#define TS_SIGNATURE "rusEFI master.2023.11.08.subaru_eg33_f7.822446362" +#define SIGNATURE_HASH 576269388 +#define TS_SIGNATURE "rusEFI master.2023.11.09.subaru_eg33_f7.576269388" diff --git a/firmware/controllers/generated/signature_t-b-g.h b/firmware/controllers/generated/signature_t-b-g.h index 95099db160..5e8f9eb4d5 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.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 914902541 -#define TS_SIGNATURE "rusEFI master.2023.11.08.t-b-g.914902541" +#define SIGNATURE_HASH 634710875 +#define TS_SIGNATURE "rusEFI master.2023.11.09.t-b-g.634710875" diff --git a/firmware/controllers/generated/signature_tdg-pdm8.h b/firmware/controllers/generated/signature_tdg-pdm8.h index ef08072a06..81669e339f 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.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 3156632111 -#define TS_SIGNATURE "rusEFI master.2023.11.08.tdg-pdm8.3156632111" +#define SIGNATURE_HASH 2944059257 +#define TS_SIGNATURE "rusEFI master.2023.11.09.tdg-pdm8.2944059257" diff --git a/firmware/controllers/generated/signature_uaefi.h b/firmware/controllers/generated/signature_uaefi.h index fa896121b6..2a33b20063 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.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 2564102526 -#define TS_SIGNATURE "rusEFI master.2023.11.08.uaefi.2564102526" +#define SIGNATURE_HASH 2341059624 +#define TS_SIGNATURE "rusEFI master.2023.11.09.uaefi.2341059624" diff --git a/firmware/controllers/lua/generated/output_lookup_generated.cpp b/firmware/controllers/lua/generated/output_lookup_generated.cpp index 9c3e06f503..ebb18e2626 100644 --- a/firmware/controllers/lua/generated/output_lookup_generated.cpp +++ b/firmware/controllers/lua/generated/output_lookup_generated.cpp @@ -1080,6 +1080,9 @@ float getOutputValueByName(const char *name) { // startStopStateToggleCounter case -960645892: return engine->engineState.startStopStateToggleCounter; +// startStopStateTempPhysicalCounter + case 755349965: + return engine->engineState.startStopStateTempPhysicalCounter; // egtValue1 case -244414221: return engine->engineState.egtValue1; diff --git a/firmware/tunerstudio/generated/rusefi.ini b/firmware/tunerstudio/generated/rusefi.ini index 46e7da0b7c..6b2f91fa7a 100644 --- a/firmware/tunerstudio/generated/rusefi.ini +++ b/firmware/tunerstudio/generated/rusefi.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.11.08.f407-discovery.2509298742" + signature = "rusEFI master.2023.11.09.f407-discovery.2261547360" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.11.08.f407-discovery.2509298742" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.11.09.f407-discovery.2261547360" ; 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 @@ -92,7 +92,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.jar based on (unknown script) integration/rusefi_config.txt Wed Nov 08 20:04:03 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Thu Nov 09 02:08:24 UTC 2023 pageSize = 23880 page = 1 @@ -2347,7 +2347,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23870, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1440 + ochBlockSize = 1444 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3001,136 +3001,137 @@ brakePedalState = scalar, S08, 1092, "", 1, 0 startStopState = scalar, S08, 1093, "", 1, 0 startStopPhysicalState = bits, U32, 1096, [0:0] startStopStateToggleCounter = scalar, U32, 1100, "", 1, 0 -egtValue1 = scalar, F32, 1104, "", 1, 0 -egtValue2 = scalar, F32, 1108, "", 1, 0 -desiredRpmLimit = scalar, S16, 1112, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1116, "", 1, 0 -sparkCounter = scalar, U32, 1120, "", 1, 0 -fuelingLoad = scalar, F32, 1124, "", 1, 0 -ignitionLoad = scalar, F32, 1128, "", 1, 0 -veTableYAxis = scalar, U16, 1132, "%", 0.01, 0 -; total TS size = 1136 -tpsFrom = scalar, F32, 1136 -tpsTo = scalar, F32, 1140 -deltaTps = scalar, F32, 1144 -extraFuel = scalar, F32, 1148, "", 1, 0 -valueFromTable = scalar, F32, 1152, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1156, [0:0] -isBelowDecelThreshold = bits, U32, 1156, [1:1] -isTimeToResetAccumulator = bits, U32, 1156, [2:2] -isFractionalEnrichment = bits, U32, 1156, [3:3] -belowEpsilon = bits, U32, 1156, [4:4] -tooShort = bits, U32, 1156, [5:5] -fractionalInjFuel = scalar, F32, 1160, "", 1, 0 -accumulatedValue = scalar, F32, 1164, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1168, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1172, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1176, "", 1, 0 -cycleCnt = scalar, S32, 1180, "", 1, 0 -; total TS size = 1184 -hwEventCounters1 = scalar, U32, 1184, "", 1, 0 -hwEventCounters2 = scalar, U32, 1188, "", 1, 0 -hwEventCounters3 = scalar, U32, 1192, "", 1, 0 -hwEventCounters4 = scalar, U32, 1196, "", 1, 0 -hwEventCounters5 = scalar, U32, 1200, "", 1, 0 -hwEventCounters6 = scalar, U32, 1204, "", 1, 0 -vvtCamCounter = scalar, U32, 1208, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1212, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1216, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1220, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1221, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1224, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1228, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1232, "", 1, 0 -mapCamPrevToothAngle = scalar, F32, 1236, "deg", 1, 0 -isDecodingMapCam = bits, U32, 1240, [0:0] -; total TS size = 1244 -crankSynchronizationCounter = scalar, U32, 1244, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1248, "", 1, 0 -vvtToothDurations0 = scalar, U32, 1252, "us", 1, 0 -vvtCurrentPosition = scalar, F32, 1256, "sync: Primary Cam Position", 1, 0 -vvtToothPosition1 = scalar, F32, 1260, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition2 = scalar, F32, 1264, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition3 = scalar, F32, 1268, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition4 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio = scalar, F32, 1276, "", 1, 0 -triggerStateIndex = scalar, U08, 1280, "", 1, 0 -camResyncCounter = scalar, U08, 1281, "", 1, 0 -vvtStateIndex = scalar, U08, 1282, "", 1, 0 -; total TS size = 1284 -m_hasSynchronizedPhase = bits, U32, 1284, [0:0] +startStopStateTempPhysicalCounter = scalar, U32, 1104, "", 1, 0 +egtValue1 = scalar, F32, 1108, "", 1, 0 +egtValue2 = scalar, F32, 1112, "", 1, 0 +desiredRpmLimit = scalar, S16, 1116, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 1120, "", 1, 0 +sparkCounter = scalar, U32, 1124, "", 1, 0 +fuelingLoad = scalar, F32, 1128, "", 1, 0 +ignitionLoad = scalar, F32, 1132, "", 1, 0 +veTableYAxis = scalar, U16, 1136, "%", 0.01, 0 +; total TS size = 1140 +tpsFrom = scalar, F32, 1140 +tpsTo = scalar, F32, 1144 +deltaTps = scalar, F32, 1148 +extraFuel = scalar, F32, 1152, "", 1, 0 +valueFromTable = scalar, F32, 1156, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1160, [0:0] +isBelowDecelThreshold = bits, U32, 1160, [1:1] +isTimeToResetAccumulator = bits, U32, 1160, [2:2] +isFractionalEnrichment = bits, U32, 1160, [3:3] +belowEpsilon = bits, U32, 1160, [4:4] +tooShort = bits, U32, 1160, [5:5] +fractionalInjFuel = scalar, F32, 1164, "", 1, 0 +accumulatedValue = scalar, F32, 1168, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1172, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1176, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1180, "", 1, 0 +cycleCnt = scalar, S32, 1184, "", 1, 0 +; total TS size = 1188 +hwEventCounters1 = scalar, U32, 1188, "", 1, 0 +hwEventCounters2 = scalar, U32, 1192, "", 1, 0 +hwEventCounters3 = scalar, U32, 1196, "", 1, 0 +hwEventCounters4 = scalar, U32, 1200, "", 1, 0 +hwEventCounters5 = scalar, U32, 1204, "", 1, 0 +hwEventCounters6 = scalar, U32, 1208, "", 1, 0 +vvtCamCounter = scalar, U32, 1212, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1216, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1220, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1224, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1225, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1228, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1232, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1236, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1240, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1244, [0:0] +; total TS size = 1248 +crankSynchronizationCounter = scalar, U32, 1248, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1252, "", 1, 0 +vvtToothDurations0 = scalar, U32, 1256, "us", 1, 0 +vvtCurrentPosition = scalar, F32, 1260, "sync: Primary Cam Position", 1, 0 +vvtToothPosition1 = scalar, F32, 1264, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition2 = scalar, F32, 1268, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition3 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition4 = scalar, F32, 1276, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio = scalar, F32, 1280, "", 1, 0 +triggerStateIndex = scalar, U08, 1284, "", 1, 0 +camResyncCounter = scalar, U08, 1285, "", 1, 0 +vvtStateIndex = scalar, U08, 1286, "", 1, 0 ; total TS size = 1288 -wallFuelCorrection = scalar, F32, 1288, "", 1, 0 -wallFuel = scalar, F32, 1292, "", 1, 0 -; total TS size = 1296 -idleState = bits, S32, 1296, [0:2], "not important" -currentIdlePosition = scalar, F32, 1300 -baseIdlePosition = scalar, F32, 1304 -idleClosedLoop = scalar, F32, 1308 -iacByTpsTaper = scalar, F32, 1312 -throttlePedalUpState = scalar, S32, 1316, "", 1, 0 -mightResetPid = bits, U32, 1320, [0:0] -shouldResetPid = bits, U32, 1320, [1:1] -wasResetPid = bits, U32, 1320, [2:2] -mustResetPid = bits, U32, 1320, [3:3] -isCranking = bits, U32, 1320, [4:4] -isIacTableForCoasting = bits, U32, 1320, [5:5] -notIdling = bits, U32, 1320, [6:6] -needReset = bits, U32, 1320, [7:7] -isInDeadZone = bits, U32, 1320, [8:8] -isBlipping = bits, U32, 1320, [9:9] -useClosedLoop = bits, U32, 1320, [10:10] -badTps = bits, U32, 1320, [11:11] -looksLikeRunning = bits, U32, 1320, [12:12] -looksLikeCoasting = bits, U32, 1320, [13:13] -looksLikeCrankToIdle = bits, U32, 1320, [14:14] -isIdleCoasting = bits, U32, 1320, [15:15] -isIdleClosedLoop = bits, U32, 1320, [16:16] -idleTarget = scalar, S32, 1324, "", 1, 0 -targetRpmByClt = scalar, S32, 1328, "", 1, 0 -targetRpmAc = scalar, S32, 1332, "", 1, 0 -iacByRpmTaper = scalar, F32, 1336 -luaAdd = scalar, F32, 1340 -; total TS size = 1344 -idlePosition = scalar, F32, 1344, "per", 1,0 -trim = scalar, F32, 1348, "", 1, 0 -luaAdjustment = scalar, F32, 1352, "per", 1,0 -m_wastegatePosition = scalar, F32, 1356, "per", 1,0 -etbFeedForward = scalar, F32, 1360 -etbIntegralError = scalar, F32, 1364, "", 1, 0 -etbCurrentTarget = scalar, F32, 1368, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1372, "%", 1, 0 -etbRevLimitActive = bits, U32, 1376, [0:0] -jamDetected = bits, U32, 1376, [1:1] -etbDutyRateOfChange = scalar, F32, 1380, "per", 1,0 -etbDutyAverage = scalar, F32, 1384, "per", 1,0 -etbTpsErrorCounter = scalar, U16, 1388, "count", 1,0 -etbPpsErrorCounter = scalar, U16, 1390, "count", 1,0 -etbErrorCode = scalar, S08, 1392, "", 1, 0 -jamTimer = scalar, U16, 1394, "sec", 0.01, 0 -; total TS size = 1396 -faultCode = scalar, U08, 1396, "", 1, 0 -heaterDuty = scalar, U08, 1397, "%", 1, 0 -pumpDuty = scalar, U08, 1398, "%", 1, 0 -tempC = scalar, U16, 1400, "C", 1, 0 -nernstVoltage = scalar, U16, 1402, "V", 0.001, 0 -esr = scalar, U16, 1404, "ohm", 1, 0 -; total TS size = 1408 -dcOutput0 = scalar, F32, 1408, "per", 1,0 -isEnabled0_int = scalar, U08, 1412, "per", 1,0 -isEnabled0 = bits, U32, 1416, [0:0] -; total TS size = 1420 -value0 = scalar, U16, 1420, "value", 1,0 -value1 = scalar, U16, 1422, "value", 1,0 -errorRate = scalar, F32, 1424, "ratio", 1,0 -; total TS size = 1428 -vvtTarget = scalar, U16, 1428, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1430, "%", 0.5, 0 +m_hasSynchronizedPhase = bits, U32, 1288, [0:0] +; total TS size = 1292 +wallFuelCorrection = scalar, F32, 1292, "", 1, 0 +wallFuel = scalar, F32, 1296, "", 1, 0 +; total TS size = 1300 +idleState = bits, S32, 1300, [0:2], "not important" +currentIdlePosition = scalar, F32, 1304 +baseIdlePosition = scalar, F32, 1308 +idleClosedLoop = scalar, F32, 1312 +iacByTpsTaper = scalar, F32, 1316 +throttlePedalUpState = scalar, S32, 1320, "", 1, 0 +mightResetPid = bits, U32, 1324, [0:0] +shouldResetPid = bits, U32, 1324, [1:1] +wasResetPid = bits, U32, 1324, [2:2] +mustResetPid = bits, U32, 1324, [3:3] +isCranking = bits, U32, 1324, [4:4] +isIacTableForCoasting = bits, U32, 1324, [5:5] +notIdling = bits, U32, 1324, [6:6] +needReset = bits, U32, 1324, [7:7] +isInDeadZone = bits, U32, 1324, [8:8] +isBlipping = bits, U32, 1324, [9:9] +useClosedLoop = bits, U32, 1324, [10:10] +badTps = bits, U32, 1324, [11:11] +looksLikeRunning = bits, U32, 1324, [12:12] +looksLikeCoasting = bits, U32, 1324, [13:13] +looksLikeCrankToIdle = bits, U32, 1324, [14:14] +isIdleCoasting = bits, U32, 1324, [15:15] +isIdleClosedLoop = bits, U32, 1324, [16:16] +idleTarget = scalar, S32, 1328, "", 1, 0 +targetRpmByClt = scalar, S32, 1332, "", 1, 0 +targetRpmAc = scalar, S32, 1336, "", 1, 0 +iacByRpmTaper = scalar, F32, 1340 +luaAdd = scalar, F32, 1344 +; total TS size = 1348 +idlePosition = scalar, F32, 1348, "per", 1,0 +trim = scalar, F32, 1352, "", 1, 0 +luaAdjustment = scalar, F32, 1356, "per", 1,0 +m_wastegatePosition = scalar, F32, 1360, "per", 1,0 +etbFeedForward = scalar, F32, 1364 +etbIntegralError = scalar, F32, 1368, "", 1, 0 +etbCurrentTarget = scalar, F32, 1372, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1376, "%", 1, 0 +etbRevLimitActive = bits, U32, 1380, [0:0] +jamDetected = bits, U32, 1380, [1:1] +etbDutyRateOfChange = scalar, F32, 1384, "per", 1,0 +etbDutyAverage = scalar, F32, 1388, "per", 1,0 +etbTpsErrorCounter = scalar, U16, 1392, "count", 1,0 +etbPpsErrorCounter = scalar, U16, 1394, "count", 1,0 +etbErrorCode = scalar, S08, 1396, "", 1, 0 +jamTimer = scalar, U16, 1398, "sec", 0.01, 0 +; total TS size = 1400 +faultCode = scalar, U08, 1400, "", 1, 0 +heaterDuty = scalar, U08, 1401, "%", 1, 0 +pumpDuty = scalar, U08, 1402, "%", 1, 0 +tempC = scalar, U16, 1404, "C", 1, 0 +nernstVoltage = scalar, U16, 1406, "V", 0.001, 0 +esr = scalar, U16, 1408, "ohm", 1, 0 +; total TS size = 1412 +dcOutput0 = scalar, F32, 1412, "per", 1,0 +isEnabled0_int = scalar, U08, 1416, "per", 1,0 +isEnabled0 = bits, U32, 1420, [0:0] +; total TS size = 1424 +value0 = scalar, U16, 1424, "value", 1,0 +value1 = scalar, U16, 1426, "value", 1,0 +errorRate = scalar, F32, 1428, "ratio", 1,0 ; total TS size = 1432 -lambdaCurrentlyGood = bits, U32, 1432, [0:0] -lambdaMonitorCut = bits, U32, 1432, [1:1] -lambdaTimeSinceGood = scalar, U16, 1436, "sec", 0.01, 0 -; total TS size = 1440 +vvtTarget = scalar, U16, 1432, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1434, "%", 0.5, 0 +; total TS size = 1436 +lambdaCurrentlyGood = bits, U32, 1436, [0:0] +lambdaMonitorCut = bits, U32, 1436, [1:1] +lambdaTimeSinceGood = scalar, U16, 1440, "sec", 0.01, 0 +; total TS size = 1444 time = { timeNow } @@ -5196,6 +5197,7 @@ entry = brakePedalState, "Brake switch", int, "%d" entry = startStopState, "startStopState", int, "%d" entry = startStopPhysicalState, "startStopPhysicalState", int, "%d" entry = startStopStateToggleCounter, "startStopStateToggleCounter", int, "%d" +entry = startStopStateTempPhysicalCounter, "startStopStateTempPhysicalCounter", int, "%d" entry = egtValue1, "egtValue1", float, "%.3f" entry = egtValue2, "egtValue2", float, "%.3f" entry = desiredRpmLimit, "User-defined RPM hard limit", int, "%d" @@ -6079,13 +6081,14 @@ dialog = engine_stateDialog, "engine_state" graphLine = brakePedalState graphLine = startStopState graphLine = startStopStateToggleCounter - graphLine = egtValue1 + graphLine = startStopStateTempPhysicalCounter liveGraph = engine_state_5_Graph, "Graph", South + graphLine = egtValue1 graphLine = egtValue2 graphLine = desiredRpmLimit graphLine = fuelInjectionCounter - graphLine = sparkCounter liveGraph = engine_state_6_Graph, "Graph", South + graphLine = sparkCounter graphLine = fuelingLoad graphLine = ignitionLoad graphLine = veTableYAxis @@ -6421,8 +6424,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" ; cam if ; two-stroke, or ; not crank trigger and ((vague trigger and cam choice) or not vague trigger) - field = "Cam Sensor (Primary channel)", triggerInputPins1, 1, {twoStroke == 1 || ( !(trigger_type == 2 || trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 21 || trigger_type == 26 || trigger_type == 27 || trigger_type == 33 || trigger_type == 38 || trigger_type == 39 || trigger_type == 44 || trigger_type == 45 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 58 || trigger_type == 61 || trigger_type == 62 || trigger_type == 68 || trigger_type == 70 || trigger_type == 71 || trigger_type == 72 || trigger_type == 74 || trigger_type == 75 || trigger_type == 76 || trigger_type == 77 || trigger_type == 79) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) ) ) } - field = "Crank Sensor (Primary channel)", triggerInputPins1, 1, { !(twoStroke == 1 || ( !(trigger_type == 2 || trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 21 || trigger_type == 26 || trigger_type == 27 || trigger_type == 33 || trigger_type == 38 || trigger_type == 39 || trigger_type == 44 || trigger_type == 45 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 58 || trigger_type == 61 || trigger_type == 62 || trigger_type == 68 || trigger_type == 70 || trigger_type == 71 || trigger_type == 72 || trigger_type == 74 || trigger_type == 75 || trigger_type == 76 || trigger_type == 77 || trigger_type == 79) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) ) )) } + field = "Cam Sensor (Primary channel)", triggerInputPins1, 1, {twoStroke == 1 || ( !(trigger_type == 2 || trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 21 || trigger_type == 26 || trigger_type == 27 || trigger_type == 33 || trigger_type == 38 || trigger_type == 39 || trigger_type == 44 || trigger_type == 45 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 58 || trigger_type == 61 || trigger_type == 62 || trigger_type == 68 || trigger_type == 70 || trigger_type == 71 || trigger_type == 72 || trigger_type == 74 || trigger_type == 75 || trigger_type == 76 || trigger_type == 77) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) ) ) } + field = "Crank Sensor (Primary channel)", triggerInputPins1, 1, { !(twoStroke == 1 || ( !(trigger_type == 2 || trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 21 || trigger_type == 26 || trigger_type == 27 || trigger_type == 33 || trigger_type == 38 || trigger_type == 39 || trigger_type == 44 || trigger_type == 45 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 58 || trigger_type == 61 || trigger_type == 62 || trigger_type == 68 || trigger_type == 70 || trigger_type == 71 || trigger_type == 72 || trigger_type == 74 || trigger_type == 75 || trigger_type == 76 || trigger_type == 77) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) ) )) } field = "Invert Primary", invertPrimaryTriggerSignal field = "Secondary channel", triggerInputPins2, { triggerInputPins2 != 0 || (triggerInputPins1 != 0 && (trigger_type == 1 || trigger_type == 3 || trigger_type == 15 || trigger_type == 16 || trigger_type == 19 || trigger_type == 25 || trigger_type == 28 || trigger_type == 31 || trigger_type == 35 || trigger_type == 36 || trigger_type == 37 || trigger_type == 40 || trigger_type == 49 || trigger_type == 50 || trigger_type == 53 || trigger_type == 54 || trigger_type == 63 || trigger_type == 64) ) } field = "Invert Secondary", invertSecondaryTriggerSignal, {triggerInputPins2 != 0 && (trigger_type == 1 || trigger_type == 3 || trigger_type == 15 || trigger_type == 16 || trigger_type == 19 || trigger_type == 25 || trigger_type == 28 || trigger_type == 31 || trigger_type == 35 || trigger_type == 36 || trigger_type == 37 || trigger_type == 40 || trigger_type == 49 || trigger_type == 50 || trigger_type == 53 || trigger_type == 54 || trigger_type == 63 || trigger_type == 64) } diff --git a/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini b/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini index 8331122729..f10316275d 100644 --- a/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini +++ b/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.11.08.alphax-2chan.1191049738" + signature = "rusEFI master.2023.11.09.alphax-2chan.1436639068" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.11.08.alphax-2chan.1191049738" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.11.09.alphax-2chan.1436639068" ; 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 @@ -92,7 +92,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","X7 - AIN4","X1 - AIN1","INVALID","INVALID","B2 - MAP","B7 - CLT","B3 - IAT","X3 - AIN2" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Nov 08 20:01:31 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Thu Nov 09 02:06:38 UTC 2023 pageSize = 23880 page = 1 @@ -2347,7 +2347,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23870, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1440 + ochBlockSize = 1444 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3001,136 +3001,137 @@ brakePedalState = scalar, S08, 1092, "", 1, 0 startStopState = scalar, S08, 1093, "", 1, 0 startStopPhysicalState = bits, U32, 1096, [0:0] startStopStateToggleCounter = scalar, U32, 1100, "", 1, 0 -egtValue1 = scalar, F32, 1104, "", 1, 0 -egtValue2 = scalar, F32, 1108, "", 1, 0 -desiredRpmLimit = scalar, S16, 1112, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1116, "", 1, 0 -sparkCounter = scalar, U32, 1120, "", 1, 0 -fuelingLoad = scalar, F32, 1124, "", 1, 0 -ignitionLoad = scalar, F32, 1128, "", 1, 0 -veTableYAxis = scalar, U16, 1132, "%", 0.01, 0 -; total TS size = 1136 -tpsFrom = scalar, F32, 1136 -tpsTo = scalar, F32, 1140 -deltaTps = scalar, F32, 1144 -extraFuel = scalar, F32, 1148, "", 1, 0 -valueFromTable = scalar, F32, 1152, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1156, [0:0] -isBelowDecelThreshold = bits, U32, 1156, [1:1] -isTimeToResetAccumulator = bits, U32, 1156, [2:2] -isFractionalEnrichment = bits, U32, 1156, [3:3] -belowEpsilon = bits, U32, 1156, [4:4] -tooShort = bits, U32, 1156, [5:5] -fractionalInjFuel = scalar, F32, 1160, "", 1, 0 -accumulatedValue = scalar, F32, 1164, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1168, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1172, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1176, "", 1, 0 -cycleCnt = scalar, S32, 1180, "", 1, 0 -; total TS size = 1184 -hwEventCounters1 = scalar, U32, 1184, "", 1, 0 -hwEventCounters2 = scalar, U32, 1188, "", 1, 0 -hwEventCounters3 = scalar, U32, 1192, "", 1, 0 -hwEventCounters4 = scalar, U32, 1196, "", 1, 0 -hwEventCounters5 = scalar, U32, 1200, "", 1, 0 -hwEventCounters6 = scalar, U32, 1204, "", 1, 0 -vvtCamCounter = scalar, U32, 1208, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1212, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1216, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1220, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1221, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1224, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1228, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1232, "", 1, 0 -mapCamPrevToothAngle = scalar, F32, 1236, "deg", 1, 0 -isDecodingMapCam = bits, U32, 1240, [0:0] -; total TS size = 1244 -crankSynchronizationCounter = scalar, U32, 1244, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1248, "", 1, 0 -vvtToothDurations0 = scalar, U32, 1252, "us", 1, 0 -vvtCurrentPosition = scalar, F32, 1256, "sync: Primary Cam Position", 1, 0 -vvtToothPosition1 = scalar, F32, 1260, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition2 = scalar, F32, 1264, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition3 = scalar, F32, 1268, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition4 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio = scalar, F32, 1276, "", 1, 0 -triggerStateIndex = scalar, U08, 1280, "", 1, 0 -camResyncCounter = scalar, U08, 1281, "", 1, 0 -vvtStateIndex = scalar, U08, 1282, "", 1, 0 -; total TS size = 1284 -m_hasSynchronizedPhase = bits, U32, 1284, [0:0] +startStopStateTempPhysicalCounter = scalar, U32, 1104, "", 1, 0 +egtValue1 = scalar, F32, 1108, "", 1, 0 +egtValue2 = scalar, F32, 1112, "", 1, 0 +desiredRpmLimit = scalar, S16, 1116, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 1120, "", 1, 0 +sparkCounter = scalar, U32, 1124, "", 1, 0 +fuelingLoad = scalar, F32, 1128, "", 1, 0 +ignitionLoad = scalar, F32, 1132, "", 1, 0 +veTableYAxis = scalar, U16, 1136, "%", 0.01, 0 +; total TS size = 1140 +tpsFrom = scalar, F32, 1140 +tpsTo = scalar, F32, 1144 +deltaTps = scalar, F32, 1148 +extraFuel = scalar, F32, 1152, "", 1, 0 +valueFromTable = scalar, F32, 1156, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1160, [0:0] +isBelowDecelThreshold = bits, U32, 1160, [1:1] +isTimeToResetAccumulator = bits, U32, 1160, [2:2] +isFractionalEnrichment = bits, U32, 1160, [3:3] +belowEpsilon = bits, U32, 1160, [4:4] +tooShort = bits, U32, 1160, [5:5] +fractionalInjFuel = scalar, F32, 1164, "", 1, 0 +accumulatedValue = scalar, F32, 1168, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1172, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1176, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1180, "", 1, 0 +cycleCnt = scalar, S32, 1184, "", 1, 0 +; total TS size = 1188 +hwEventCounters1 = scalar, U32, 1188, "", 1, 0 +hwEventCounters2 = scalar, U32, 1192, "", 1, 0 +hwEventCounters3 = scalar, U32, 1196, "", 1, 0 +hwEventCounters4 = scalar, U32, 1200, "", 1, 0 +hwEventCounters5 = scalar, U32, 1204, "", 1, 0 +hwEventCounters6 = scalar, U32, 1208, "", 1, 0 +vvtCamCounter = scalar, U32, 1212, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1216, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1220, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1224, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1225, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1228, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1232, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1236, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1240, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1244, [0:0] +; total TS size = 1248 +crankSynchronizationCounter = scalar, U32, 1248, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1252, "", 1, 0 +vvtToothDurations0 = scalar, U32, 1256, "us", 1, 0 +vvtCurrentPosition = scalar, F32, 1260, "sync: Primary Cam Position", 1, 0 +vvtToothPosition1 = scalar, F32, 1264, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition2 = scalar, F32, 1268, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition3 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition4 = scalar, F32, 1276, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio = scalar, F32, 1280, "", 1, 0 +triggerStateIndex = scalar, U08, 1284, "", 1, 0 +camResyncCounter = scalar, U08, 1285, "", 1, 0 +vvtStateIndex = scalar, U08, 1286, "", 1, 0 ; total TS size = 1288 -wallFuelCorrection = scalar, F32, 1288, "", 1, 0 -wallFuel = scalar, F32, 1292, "", 1, 0 -; total TS size = 1296 -idleState = bits, S32, 1296, [0:2], "not important" -currentIdlePosition = scalar, F32, 1300 -baseIdlePosition = scalar, F32, 1304 -idleClosedLoop = scalar, F32, 1308 -iacByTpsTaper = scalar, F32, 1312 -throttlePedalUpState = scalar, S32, 1316, "", 1, 0 -mightResetPid = bits, U32, 1320, [0:0] -shouldResetPid = bits, U32, 1320, [1:1] -wasResetPid = bits, U32, 1320, [2:2] -mustResetPid = bits, U32, 1320, [3:3] -isCranking = bits, U32, 1320, [4:4] -isIacTableForCoasting = bits, U32, 1320, [5:5] -notIdling = bits, U32, 1320, [6:6] -needReset = bits, U32, 1320, [7:7] -isInDeadZone = bits, U32, 1320, [8:8] -isBlipping = bits, U32, 1320, [9:9] -useClosedLoop = bits, U32, 1320, [10:10] -badTps = bits, U32, 1320, [11:11] -looksLikeRunning = bits, U32, 1320, [12:12] -looksLikeCoasting = bits, U32, 1320, [13:13] -looksLikeCrankToIdle = bits, U32, 1320, [14:14] -isIdleCoasting = bits, U32, 1320, [15:15] -isIdleClosedLoop = bits, U32, 1320, [16:16] -idleTarget = scalar, S32, 1324, "", 1, 0 -targetRpmByClt = scalar, S32, 1328, "", 1, 0 -targetRpmAc = scalar, S32, 1332, "", 1, 0 -iacByRpmTaper = scalar, F32, 1336 -luaAdd = scalar, F32, 1340 -; total TS size = 1344 -idlePosition = scalar, F32, 1344, "per", 1,0 -trim = scalar, F32, 1348, "", 1, 0 -luaAdjustment = scalar, F32, 1352, "per", 1,0 -m_wastegatePosition = scalar, F32, 1356, "per", 1,0 -etbFeedForward = scalar, F32, 1360 -etbIntegralError = scalar, F32, 1364, "", 1, 0 -etbCurrentTarget = scalar, F32, 1368, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1372, "%", 1, 0 -etbRevLimitActive = bits, U32, 1376, [0:0] -jamDetected = bits, U32, 1376, [1:1] -etbDutyRateOfChange = scalar, F32, 1380, "per", 1,0 -etbDutyAverage = scalar, F32, 1384, "per", 1,0 -etbTpsErrorCounter = scalar, U16, 1388, "count", 1,0 -etbPpsErrorCounter = scalar, U16, 1390, "count", 1,0 -etbErrorCode = scalar, S08, 1392, "", 1, 0 -jamTimer = scalar, U16, 1394, "sec", 0.01, 0 -; total TS size = 1396 -faultCode = scalar, U08, 1396, "", 1, 0 -heaterDuty = scalar, U08, 1397, "%", 1, 0 -pumpDuty = scalar, U08, 1398, "%", 1, 0 -tempC = scalar, U16, 1400, "C", 1, 0 -nernstVoltage = scalar, U16, 1402, "V", 0.001, 0 -esr = scalar, U16, 1404, "ohm", 1, 0 -; total TS size = 1408 -dcOutput0 = scalar, F32, 1408, "per", 1,0 -isEnabled0_int = scalar, U08, 1412, "per", 1,0 -isEnabled0 = bits, U32, 1416, [0:0] -; total TS size = 1420 -value0 = scalar, U16, 1420, "value", 1,0 -value1 = scalar, U16, 1422, "value", 1,0 -errorRate = scalar, F32, 1424, "ratio", 1,0 -; total TS size = 1428 -vvtTarget = scalar, U16, 1428, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1430, "%", 0.5, 0 +m_hasSynchronizedPhase = bits, U32, 1288, [0:0] +; total TS size = 1292 +wallFuelCorrection = scalar, F32, 1292, "", 1, 0 +wallFuel = scalar, F32, 1296, "", 1, 0 +; total TS size = 1300 +idleState = bits, S32, 1300, [0:2], "not important" +currentIdlePosition = scalar, F32, 1304 +baseIdlePosition = scalar, F32, 1308 +idleClosedLoop = scalar, F32, 1312 +iacByTpsTaper = scalar, F32, 1316 +throttlePedalUpState = scalar, S32, 1320, "", 1, 0 +mightResetPid = bits, U32, 1324, [0:0] +shouldResetPid = bits, U32, 1324, [1:1] +wasResetPid = bits, U32, 1324, [2:2] +mustResetPid = bits, U32, 1324, [3:3] +isCranking = bits, U32, 1324, [4:4] +isIacTableForCoasting = bits, U32, 1324, [5:5] +notIdling = bits, U32, 1324, [6:6] +needReset = bits, U32, 1324, [7:7] +isInDeadZone = bits, U32, 1324, [8:8] +isBlipping = bits, U32, 1324, [9:9] +useClosedLoop = bits, U32, 1324, [10:10] +badTps = bits, U32, 1324, [11:11] +looksLikeRunning = bits, U32, 1324, [12:12] +looksLikeCoasting = bits, U32, 1324, [13:13] +looksLikeCrankToIdle = bits, U32, 1324, [14:14] +isIdleCoasting = bits, U32, 1324, [15:15] +isIdleClosedLoop = bits, U32, 1324, [16:16] +idleTarget = scalar, S32, 1328, "", 1, 0 +targetRpmByClt = scalar, S32, 1332, "", 1, 0 +targetRpmAc = scalar, S32, 1336, "", 1, 0 +iacByRpmTaper = scalar, F32, 1340 +luaAdd = scalar, F32, 1344 +; total TS size = 1348 +idlePosition = scalar, F32, 1348, "per", 1,0 +trim = scalar, F32, 1352, "", 1, 0 +luaAdjustment = scalar, F32, 1356, "per", 1,0 +m_wastegatePosition = scalar, F32, 1360, "per", 1,0 +etbFeedForward = scalar, F32, 1364 +etbIntegralError = scalar, F32, 1368, "", 1, 0 +etbCurrentTarget = scalar, F32, 1372, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1376, "%", 1, 0 +etbRevLimitActive = bits, U32, 1380, [0:0] +jamDetected = bits, U32, 1380, [1:1] +etbDutyRateOfChange = scalar, F32, 1384, "per", 1,0 +etbDutyAverage = scalar, F32, 1388, "per", 1,0 +etbTpsErrorCounter = scalar, U16, 1392, "count", 1,0 +etbPpsErrorCounter = scalar, U16, 1394, "count", 1,0 +etbErrorCode = scalar, S08, 1396, "", 1, 0 +jamTimer = scalar, U16, 1398, "sec", 0.01, 0 +; total TS size = 1400 +faultCode = scalar, U08, 1400, "", 1, 0 +heaterDuty = scalar, U08, 1401, "%", 1, 0 +pumpDuty = scalar, U08, 1402, "%", 1, 0 +tempC = scalar, U16, 1404, "C", 1, 0 +nernstVoltage = scalar, U16, 1406, "V", 0.001, 0 +esr = scalar, U16, 1408, "ohm", 1, 0 +; total TS size = 1412 +dcOutput0 = scalar, F32, 1412, "per", 1,0 +isEnabled0_int = scalar, U08, 1416, "per", 1,0 +isEnabled0 = bits, U32, 1420, [0:0] +; total TS size = 1424 +value0 = scalar, U16, 1424, "value", 1,0 +value1 = scalar, U16, 1426, "value", 1,0 +errorRate = scalar, F32, 1428, "ratio", 1,0 ; total TS size = 1432 -lambdaCurrentlyGood = bits, U32, 1432, [0:0] -lambdaMonitorCut = bits, U32, 1432, [1:1] -lambdaTimeSinceGood = scalar, U16, 1436, "sec", 0.01, 0 -; total TS size = 1440 +vvtTarget = scalar, U16, 1432, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1434, "%", 0.5, 0 +; total TS size = 1436 +lambdaCurrentlyGood = bits, U32, 1436, [0:0] +lambdaMonitorCut = bits, U32, 1436, [1:1] +lambdaTimeSinceGood = scalar, U16, 1440, "sec", 0.01, 0 +; total TS size = 1444 time = { timeNow } @@ -5196,6 +5197,7 @@ entry = brakePedalState, "Brake switch", int, "%d" entry = startStopState, "startStopState", int, "%d" entry = startStopPhysicalState, "startStopPhysicalState", int, "%d" entry = startStopStateToggleCounter, "startStopStateToggleCounter", int, "%d" +entry = startStopStateTempPhysicalCounter, "startStopStateTempPhysicalCounter", int, "%d" entry = egtValue1, "egtValue1", float, "%.3f" entry = egtValue2, "egtValue2", float, "%.3f" entry = desiredRpmLimit, "User-defined RPM hard limit", int, "%d" @@ -6075,13 +6077,14 @@ dialog = engine_stateDialog, "engine_state" graphLine = brakePedalState graphLine = startStopState graphLine = startStopStateToggleCounter - graphLine = egtValue1 + graphLine = startStopStateTempPhysicalCounter liveGraph = engine_state_5_Graph, "Graph", South + graphLine = egtValue1 graphLine = egtValue2 graphLine = desiredRpmLimit graphLine = fuelInjectionCounter - graphLine = sparkCounter liveGraph = engine_state_6_Graph, "Graph", South + graphLine = sparkCounter graphLine = fuelingLoad graphLine = ignitionLoad graphLine = veTableYAxis @@ -6417,8 +6420,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" ; cam if ; two-stroke, or ; not crank trigger and ((vague trigger and cam choice) or not vague trigger) - field = "Cam Sensor (Primary channel)", triggerInputPins1, 1, {twoStroke == 1 || ( !(trigger_type == 2 || trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 21 || trigger_type == 26 || trigger_type == 27 || trigger_type == 33 || trigger_type == 38 || trigger_type == 39 || trigger_type == 44 || trigger_type == 45 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 58 || trigger_type == 61 || trigger_type == 62 || trigger_type == 68 || trigger_type == 70 || trigger_type == 71 || trigger_type == 72 || trigger_type == 74 || trigger_type == 75 || trigger_type == 76 || trigger_type == 77 || trigger_type == 79) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) ) ) } - field = "Crank Sensor (Primary channel)", triggerInputPins1, 1, { !(twoStroke == 1 || ( !(trigger_type == 2 || trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 21 || trigger_type == 26 || trigger_type == 27 || trigger_type == 33 || trigger_type == 38 || trigger_type == 39 || trigger_type == 44 || trigger_type == 45 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 58 || trigger_type == 61 || trigger_type == 62 || trigger_type == 68 || trigger_type == 70 || trigger_type == 71 || trigger_type == 72 || trigger_type == 74 || trigger_type == 75 || trigger_type == 76 || trigger_type == 77 || trigger_type == 79) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) ) )) } + field = "Cam Sensor (Primary channel)", triggerInputPins1, 1, {twoStroke == 1 || ( !(trigger_type == 2 || trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 21 || trigger_type == 26 || trigger_type == 27 || trigger_type == 33 || trigger_type == 38 || trigger_type == 39 || trigger_type == 44 || trigger_type == 45 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 58 || trigger_type == 61 || trigger_type == 62 || trigger_type == 68 || trigger_type == 70 || trigger_type == 71 || trigger_type == 72 || trigger_type == 74 || trigger_type == 75 || trigger_type == 76 || trigger_type == 77) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) ) ) } + field = "Crank Sensor (Primary channel)", triggerInputPins1, 1, { !(twoStroke == 1 || ( !(trigger_type == 2 || trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 21 || trigger_type == 26 || trigger_type == 27 || trigger_type == 33 || trigger_type == 38 || trigger_type == 39 || trigger_type == 44 || trigger_type == 45 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 58 || trigger_type == 61 || trigger_type == 62 || trigger_type == 68 || trigger_type == 70 || trigger_type == 71 || trigger_type == 72 || trigger_type == 74 || trigger_type == 75 || trigger_type == 76 || trigger_type == 77) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) ) )) } field = "Invert Primary", invertPrimaryTriggerSignal field = "Secondary channel", triggerInputPins2, { triggerInputPins2 != 0 || (triggerInputPins1 != 0 && (trigger_type == 1 || trigger_type == 3 || trigger_type == 15 || trigger_type == 16 || trigger_type == 19 || trigger_type == 25 || trigger_type == 28 || trigger_type == 31 || trigger_type == 35 || trigger_type == 36 || trigger_type == 37 || trigger_type == 40 || trigger_type == 49 || trigger_type == 50 || trigger_type == 53 || trigger_type == 54 || trigger_type == 63 || trigger_type == 64) ) } field = "Invert Secondary", invertSecondaryTriggerSignal, {triggerInputPins2 != 0 && (trigger_type == 1 || trigger_type == 3 || trigger_type == 15 || trigger_type == 16 || trigger_type == 19 || trigger_type == 25 || trigger_type == 28 || trigger_type == 31 || trigger_type == 35 || trigger_type == 36 || trigger_type == 37 || trigger_type == 40 || trigger_type == 49 || trigger_type == 50 || trigger_type == 53 || trigger_type == 54 || trigger_type == 63 || trigger_type == 64) } @@ -8531,8 +8534,8 @@ dialog = tcuControls, "Transmission Settings" dialog = fancyHardwareDialog, "Fancy Boards" field = "A4 Tachometer Output 5V/12V Pull-Up", boardUseTachPullUp field = "B3/B7 Temperature Inputs Pull-Up", boardUseTempPullUp - field = "С3 Crank+ Input Pull-Up", boardUseCrankPullUp - field = "С4 2-step input Pull-Down", boardUse2stepPullDown + field = "C3 Crank+ Input Pull-Up", boardUseCrankPullUp + field = "C4 2-step input Pull-Down", boardUse2stepPullDown field = "C7 CAM Input Pull-Down", boardUseCamPullDown field = "etbDutyThreshold", etbDutyThreshold field = "etbDutyShutdownThreshold", etbDutyShutdownThreshold diff --git a/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini b/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini index 7b5ba3a0ec..6debb525a5 100644 --- a/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini +++ b/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.11.08.alphax-4chan.4002463964" + signature = "rusEFI master.2023.11.09.alphax-4chan.4258030986" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.11.08.alphax-4chan.4002463964" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.11.09.alphax-4chan.4258030986" ; 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 @@ -92,7 +92,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","INVALID","D4 - TPS2","INVALID","X5 - AIN3","B2 - MAP","B7 - CLT","B3 - IAT","F6 - PPS2","X7 - AIN4","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.jar based on (unknown script) integration/rusefi_config.txt Wed Nov 08 20:01:34 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Thu Nov 09 02:06:40 UTC 2023 pageSize = 23880 page = 1 @@ -2347,7 +2347,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23870, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1440 + ochBlockSize = 1444 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3001,136 +3001,137 @@ brakePedalState = scalar, S08, 1092, "", 1, 0 startStopState = scalar, S08, 1093, "", 1, 0 startStopPhysicalState = bits, U32, 1096, [0:0] startStopStateToggleCounter = scalar, U32, 1100, "", 1, 0 -egtValue1 = scalar, F32, 1104, "", 1, 0 -egtValue2 = scalar, F32, 1108, "", 1, 0 -desiredRpmLimit = scalar, S16, 1112, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1116, "", 1, 0 -sparkCounter = scalar, U32, 1120, "", 1, 0 -fuelingLoad = scalar, F32, 1124, "", 1, 0 -ignitionLoad = scalar, F32, 1128, "", 1, 0 -veTableYAxis = scalar, U16, 1132, "%", 0.01, 0 -; total TS size = 1136 -tpsFrom = scalar, F32, 1136 -tpsTo = scalar, F32, 1140 -deltaTps = scalar, F32, 1144 -extraFuel = scalar, F32, 1148, "", 1, 0 -valueFromTable = scalar, F32, 1152, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1156, [0:0] -isBelowDecelThreshold = bits, U32, 1156, [1:1] -isTimeToResetAccumulator = bits, U32, 1156, [2:2] -isFractionalEnrichment = bits, U32, 1156, [3:3] -belowEpsilon = bits, U32, 1156, [4:4] -tooShort = bits, U32, 1156, [5:5] -fractionalInjFuel = scalar, F32, 1160, "", 1, 0 -accumulatedValue = scalar, F32, 1164, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1168, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1172, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1176, "", 1, 0 -cycleCnt = scalar, S32, 1180, "", 1, 0 -; total TS size = 1184 -hwEventCounters1 = scalar, U32, 1184, "", 1, 0 -hwEventCounters2 = scalar, U32, 1188, "", 1, 0 -hwEventCounters3 = scalar, U32, 1192, "", 1, 0 -hwEventCounters4 = scalar, U32, 1196, "", 1, 0 -hwEventCounters5 = scalar, U32, 1200, "", 1, 0 -hwEventCounters6 = scalar, U32, 1204, "", 1, 0 -vvtCamCounter = scalar, U32, 1208, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1212, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1216, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1220, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1221, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1224, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1228, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1232, "", 1, 0 -mapCamPrevToothAngle = scalar, F32, 1236, "deg", 1, 0 -isDecodingMapCam = bits, U32, 1240, [0:0] -; total TS size = 1244 -crankSynchronizationCounter = scalar, U32, 1244, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1248, "", 1, 0 -vvtToothDurations0 = scalar, U32, 1252, "us", 1, 0 -vvtCurrentPosition = scalar, F32, 1256, "sync: Primary Cam Position", 1, 0 -vvtToothPosition1 = scalar, F32, 1260, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition2 = scalar, F32, 1264, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition3 = scalar, F32, 1268, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition4 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio = scalar, F32, 1276, "", 1, 0 -triggerStateIndex = scalar, U08, 1280, "", 1, 0 -camResyncCounter = scalar, U08, 1281, "", 1, 0 -vvtStateIndex = scalar, U08, 1282, "", 1, 0 -; total TS size = 1284 -m_hasSynchronizedPhase = bits, U32, 1284, [0:0] +startStopStateTempPhysicalCounter = scalar, U32, 1104, "", 1, 0 +egtValue1 = scalar, F32, 1108, "", 1, 0 +egtValue2 = scalar, F32, 1112, "", 1, 0 +desiredRpmLimit = scalar, S16, 1116, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 1120, "", 1, 0 +sparkCounter = scalar, U32, 1124, "", 1, 0 +fuelingLoad = scalar, F32, 1128, "", 1, 0 +ignitionLoad = scalar, F32, 1132, "", 1, 0 +veTableYAxis = scalar, U16, 1136, "%", 0.01, 0 +; total TS size = 1140 +tpsFrom = scalar, F32, 1140 +tpsTo = scalar, F32, 1144 +deltaTps = scalar, F32, 1148 +extraFuel = scalar, F32, 1152, "", 1, 0 +valueFromTable = scalar, F32, 1156, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1160, [0:0] +isBelowDecelThreshold = bits, U32, 1160, [1:1] +isTimeToResetAccumulator = bits, U32, 1160, [2:2] +isFractionalEnrichment = bits, U32, 1160, [3:3] +belowEpsilon = bits, U32, 1160, [4:4] +tooShort = bits, U32, 1160, [5:5] +fractionalInjFuel = scalar, F32, 1164, "", 1, 0 +accumulatedValue = scalar, F32, 1168, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1172, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1176, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1180, "", 1, 0 +cycleCnt = scalar, S32, 1184, "", 1, 0 +; total TS size = 1188 +hwEventCounters1 = scalar, U32, 1188, "", 1, 0 +hwEventCounters2 = scalar, U32, 1192, "", 1, 0 +hwEventCounters3 = scalar, U32, 1196, "", 1, 0 +hwEventCounters4 = scalar, U32, 1200, "", 1, 0 +hwEventCounters5 = scalar, U32, 1204, "", 1, 0 +hwEventCounters6 = scalar, U32, 1208, "", 1, 0 +vvtCamCounter = scalar, U32, 1212, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1216, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1220, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1224, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1225, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1228, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1232, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1236, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1240, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1244, [0:0] +; total TS size = 1248 +crankSynchronizationCounter = scalar, U32, 1248, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1252, "", 1, 0 +vvtToothDurations0 = scalar, U32, 1256, "us", 1, 0 +vvtCurrentPosition = scalar, F32, 1260, "sync: Primary Cam Position", 1, 0 +vvtToothPosition1 = scalar, F32, 1264, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition2 = scalar, F32, 1268, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition3 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition4 = scalar, F32, 1276, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio = scalar, F32, 1280, "", 1, 0 +triggerStateIndex = scalar, U08, 1284, "", 1, 0 +camResyncCounter = scalar, U08, 1285, "", 1, 0 +vvtStateIndex = scalar, U08, 1286, "", 1, 0 ; total TS size = 1288 -wallFuelCorrection = scalar, F32, 1288, "", 1, 0 -wallFuel = scalar, F32, 1292, "", 1, 0 -; total TS size = 1296 -idleState = bits, S32, 1296, [0:2], "not important" -currentIdlePosition = scalar, F32, 1300 -baseIdlePosition = scalar, F32, 1304 -idleClosedLoop = scalar, F32, 1308 -iacByTpsTaper = scalar, F32, 1312 -throttlePedalUpState = scalar, S32, 1316, "", 1, 0 -mightResetPid = bits, U32, 1320, [0:0] -shouldResetPid = bits, U32, 1320, [1:1] -wasResetPid = bits, U32, 1320, [2:2] -mustResetPid = bits, U32, 1320, [3:3] -isCranking = bits, U32, 1320, [4:4] -isIacTableForCoasting = bits, U32, 1320, [5:5] -notIdling = bits, U32, 1320, [6:6] -needReset = bits, U32, 1320, [7:7] -isInDeadZone = bits, U32, 1320, [8:8] -isBlipping = bits, U32, 1320, [9:9] -useClosedLoop = bits, U32, 1320, [10:10] -badTps = bits, U32, 1320, [11:11] -looksLikeRunning = bits, U32, 1320, [12:12] -looksLikeCoasting = bits, U32, 1320, [13:13] -looksLikeCrankToIdle = bits, U32, 1320, [14:14] -isIdleCoasting = bits, U32, 1320, [15:15] -isIdleClosedLoop = bits, U32, 1320, [16:16] -idleTarget = scalar, S32, 1324, "", 1, 0 -targetRpmByClt = scalar, S32, 1328, "", 1, 0 -targetRpmAc = scalar, S32, 1332, "", 1, 0 -iacByRpmTaper = scalar, F32, 1336 -luaAdd = scalar, F32, 1340 -; total TS size = 1344 -idlePosition = scalar, F32, 1344, "per", 1,0 -trim = scalar, F32, 1348, "", 1, 0 -luaAdjustment = scalar, F32, 1352, "per", 1,0 -m_wastegatePosition = scalar, F32, 1356, "per", 1,0 -etbFeedForward = scalar, F32, 1360 -etbIntegralError = scalar, F32, 1364, "", 1, 0 -etbCurrentTarget = scalar, F32, 1368, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1372, "%", 1, 0 -etbRevLimitActive = bits, U32, 1376, [0:0] -jamDetected = bits, U32, 1376, [1:1] -etbDutyRateOfChange = scalar, F32, 1380, "per", 1,0 -etbDutyAverage = scalar, F32, 1384, "per", 1,0 -etbTpsErrorCounter = scalar, U16, 1388, "count", 1,0 -etbPpsErrorCounter = scalar, U16, 1390, "count", 1,0 -etbErrorCode = scalar, S08, 1392, "", 1, 0 -jamTimer = scalar, U16, 1394, "sec", 0.01, 0 -; total TS size = 1396 -faultCode = scalar, U08, 1396, "", 1, 0 -heaterDuty = scalar, U08, 1397, "%", 1, 0 -pumpDuty = scalar, U08, 1398, "%", 1, 0 -tempC = scalar, U16, 1400, "C", 1, 0 -nernstVoltage = scalar, U16, 1402, "V", 0.001, 0 -esr = scalar, U16, 1404, "ohm", 1, 0 -; total TS size = 1408 -dcOutput0 = scalar, F32, 1408, "per", 1,0 -isEnabled0_int = scalar, U08, 1412, "per", 1,0 -isEnabled0 = bits, U32, 1416, [0:0] -; total TS size = 1420 -value0 = scalar, U16, 1420, "value", 1,0 -value1 = scalar, U16, 1422, "value", 1,0 -errorRate = scalar, F32, 1424, "ratio", 1,0 -; total TS size = 1428 -vvtTarget = scalar, U16, 1428, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1430, "%", 0.5, 0 +m_hasSynchronizedPhase = bits, U32, 1288, [0:0] +; total TS size = 1292 +wallFuelCorrection = scalar, F32, 1292, "", 1, 0 +wallFuel = scalar, F32, 1296, "", 1, 0 +; total TS size = 1300 +idleState = bits, S32, 1300, [0:2], "not important" +currentIdlePosition = scalar, F32, 1304 +baseIdlePosition = scalar, F32, 1308 +idleClosedLoop = scalar, F32, 1312 +iacByTpsTaper = scalar, F32, 1316 +throttlePedalUpState = scalar, S32, 1320, "", 1, 0 +mightResetPid = bits, U32, 1324, [0:0] +shouldResetPid = bits, U32, 1324, [1:1] +wasResetPid = bits, U32, 1324, [2:2] +mustResetPid = bits, U32, 1324, [3:3] +isCranking = bits, U32, 1324, [4:4] +isIacTableForCoasting = bits, U32, 1324, [5:5] +notIdling = bits, U32, 1324, [6:6] +needReset = bits, U32, 1324, [7:7] +isInDeadZone = bits, U32, 1324, [8:8] +isBlipping = bits, U32, 1324, [9:9] +useClosedLoop = bits, U32, 1324, [10:10] +badTps = bits, U32, 1324, [11:11] +looksLikeRunning = bits, U32, 1324, [12:12] +looksLikeCoasting = bits, U32, 1324, [13:13] +looksLikeCrankToIdle = bits, U32, 1324, [14:14] +isIdleCoasting = bits, U32, 1324, [15:15] +isIdleClosedLoop = bits, U32, 1324, [16:16] +idleTarget = scalar, S32, 1328, "", 1, 0 +targetRpmByClt = scalar, S32, 1332, "", 1, 0 +targetRpmAc = scalar, S32, 1336, "", 1, 0 +iacByRpmTaper = scalar, F32, 1340 +luaAdd = scalar, F32, 1344 +; total TS size = 1348 +idlePosition = scalar, F32, 1348, "per", 1,0 +trim = scalar, F32, 1352, "", 1, 0 +luaAdjustment = scalar, F32, 1356, "per", 1,0 +m_wastegatePosition = scalar, F32, 1360, "per", 1,0 +etbFeedForward = scalar, F32, 1364 +etbIntegralError = scalar, F32, 1368, "", 1, 0 +etbCurrentTarget = scalar, F32, 1372, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1376, "%", 1, 0 +etbRevLimitActive = bits, U32, 1380, [0:0] +jamDetected = bits, U32, 1380, [1:1] +etbDutyRateOfChange = scalar, F32, 1384, "per", 1,0 +etbDutyAverage = scalar, F32, 1388, "per", 1,0 +etbTpsErrorCounter = scalar, U16, 1392, "count", 1,0 +etbPpsErrorCounter = scalar, U16, 1394, "count", 1,0 +etbErrorCode = scalar, S08, 1396, "", 1, 0 +jamTimer = scalar, U16, 1398, "sec", 0.01, 0 +; total TS size = 1400 +faultCode = scalar, U08, 1400, "", 1, 0 +heaterDuty = scalar, U08, 1401, "%", 1, 0 +pumpDuty = scalar, U08, 1402, "%", 1, 0 +tempC = scalar, U16, 1404, "C", 1, 0 +nernstVoltage = scalar, U16, 1406, "V", 0.001, 0 +esr = scalar, U16, 1408, "ohm", 1, 0 +; total TS size = 1412 +dcOutput0 = scalar, F32, 1412, "per", 1,0 +isEnabled0_int = scalar, U08, 1416, "per", 1,0 +isEnabled0 = bits, U32, 1420, [0:0] +; total TS size = 1424 +value0 = scalar, U16, 1424, "value", 1,0 +value1 = scalar, U16, 1426, "value", 1,0 +errorRate = scalar, F32, 1428, "ratio", 1,0 ; total TS size = 1432 -lambdaCurrentlyGood = bits, U32, 1432, [0:0] -lambdaMonitorCut = bits, U32, 1432, [1:1] -lambdaTimeSinceGood = scalar, U16, 1436, "sec", 0.01, 0 -; total TS size = 1440 +vvtTarget = scalar, U16, 1432, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1434, "%", 0.5, 0 +; total TS size = 1436 +lambdaCurrentlyGood = bits, U32, 1436, [0:0] +lambdaMonitorCut = bits, U32, 1436, [1:1] +lambdaTimeSinceGood = scalar, U16, 1440, "sec", 0.01, 0 +; total TS size = 1444 time = { timeNow } @@ -5196,6 +5197,7 @@ entry = brakePedalState, "Brake switch", int, "%d" entry = startStopState, "startStopState", int, "%d" entry = startStopPhysicalState, "startStopPhysicalState", int, "%d" entry = startStopStateToggleCounter, "startStopStateToggleCounter", int, "%d" +entry = startStopStateTempPhysicalCounter, "startStopStateTempPhysicalCounter", int, "%d" entry = egtValue1, "egtValue1", float, "%.3f" entry = egtValue2, "egtValue2", float, "%.3f" entry = desiredRpmLimit, "User-defined RPM hard limit", int, "%d" @@ -6078,13 +6080,14 @@ dialog = engine_stateDialog, "engine_state" graphLine = brakePedalState graphLine = startStopState graphLine = startStopStateToggleCounter - graphLine = egtValue1 + graphLine = startStopStateTempPhysicalCounter liveGraph = engine_state_5_Graph, "Graph", South + graphLine = egtValue1 graphLine = egtValue2 graphLine = desiredRpmLimit graphLine = fuelInjectionCounter - graphLine = sparkCounter liveGraph = engine_state_6_Graph, "Graph", South + graphLine = sparkCounter graphLine = fuelingLoad graphLine = ignitionLoad graphLine = veTableYAxis @@ -6420,8 +6423,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" ; cam if ; two-stroke, or ; not crank trigger and ((vague trigger and cam choice) or not vague trigger) - field = "Cam Sensor (Primary channel)", triggerInputPins1, 1, {twoStroke == 1 || ( !(trigger_type == 2 || trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 21 || trigger_type == 26 || trigger_type == 27 || trigger_type == 33 || trigger_type == 38 || trigger_type == 39 || trigger_type == 44 || trigger_type == 45 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 58 || trigger_type == 61 || trigger_type == 62 || trigger_type == 68 || trigger_type == 70 || trigger_type == 71 || trigger_type == 72 || trigger_type == 74 || trigger_type == 75 || trigger_type == 76 || trigger_type == 77 || trigger_type == 79) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) ) ) } - field = "Crank Sensor (Primary channel)", triggerInputPins1, 1, { !(twoStroke == 1 || ( !(trigger_type == 2 || trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 21 || trigger_type == 26 || trigger_type == 27 || trigger_type == 33 || trigger_type == 38 || trigger_type == 39 || trigger_type == 44 || trigger_type == 45 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 58 || trigger_type == 61 || trigger_type == 62 || trigger_type == 68 || trigger_type == 70 || trigger_type == 71 || trigger_type == 72 || trigger_type == 74 || trigger_type == 75 || trigger_type == 76 || trigger_type == 77 || trigger_type == 79) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) ) )) } + field = "Cam Sensor (Primary channel)", triggerInputPins1, 1, {twoStroke == 1 || ( !(trigger_type == 2 || trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 21 || trigger_type == 26 || trigger_type == 27 || trigger_type == 33 || trigger_type == 38 || trigger_type == 39 || trigger_type == 44 || trigger_type == 45 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 58 || trigger_type == 61 || trigger_type == 62 || trigger_type == 68 || trigger_type == 70 || trigger_type == 71 || trigger_type == 72 || trigger_type == 74 || trigger_type == 75 || trigger_type == 76 || trigger_type == 77) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) ) ) } + field = "Crank Sensor (Primary channel)", triggerInputPins1, 1, { !(twoStroke == 1 || ( !(trigger_type == 2 || trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 21 || trigger_type == 26 || trigger_type == 27 || trigger_type == 33 || trigger_type == 38 || trigger_type == 39 || trigger_type == 44 || trigger_type == 45 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 58 || trigger_type == 61 || trigger_type == 62 || trigger_type == 68 || trigger_type == 70 || trigger_type == 71 || trigger_type == 72 || trigger_type == 74 || trigger_type == 75 || trigger_type == 76 || trigger_type == 77) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) ) )) } field = "Invert Primary", invertPrimaryTriggerSignal field = "Secondary channel", triggerInputPins2, { triggerInputPins2 != 0 || (triggerInputPins1 != 0 && (trigger_type == 1 || trigger_type == 3 || trigger_type == 15 || trigger_type == 16 || trigger_type == 19 || trigger_type == 25 || trigger_type == 28 || trigger_type == 31 || trigger_type == 35 || trigger_type == 36 || trigger_type == 37 || trigger_type == 40 || trigger_type == 49 || trigger_type == 50 || trigger_type == 53 || trigger_type == 54 || trigger_type == 63 || trigger_type == 64) ) } field = "Invert Secondary", invertSecondaryTriggerSignal, {triggerInputPins2 != 0 && (trigger_type == 1 || trigger_type == 3 || trigger_type == 15 || trigger_type == 16 || trigger_type == 19 || trigger_type == 25 || trigger_type == 28 || trigger_type == 31 || trigger_type == 35 || trigger_type == 36 || trigger_type == 37 || trigger_type == 40 || trigger_type == 49 || trigger_type == 50 || trigger_type == 53 || trigger_type == 54 || trigger_type == 63 || trigger_type == 64) } @@ -8536,8 +8539,8 @@ dialog = tcuControls, "Transmission Settings" dialog = fancyHardwareDialog, "Fancy Boards" field = "A4 Tachometer Output 5V/12V Pull-Up", boardUseTachPullUp field = "B3/B7 Temperature Inputs Pull-Up", boardUseTempPullUp - field = "С3 Crank+ Input Pull-Up", boardUseCrankPullUp - field = "С4 2-step input Pull-Down", boardUse2stepPullDown + field = "C3 Crank+ Input Pull-Up", boardUseCrankPullUp + field = "C4 2-step input Pull-Down", boardUse2stepPullDown field = "C7 CAM Hall Input Pull-Down", boardUseCamPullDown field = "E6 CAM VR+ Input Pull-Up", boardUseCamVrPullUp field = "D3 Digital Input 2 Pull-Down", boardUseD2PullDown diff --git a/firmware/tunerstudio/generated/rusefi_alphax-4chan_f7.ini b/firmware/tunerstudio/generated/rusefi_alphax-4chan_f7.ini index 733b4fad48..f19532c34f 100644 --- a/firmware/tunerstudio/generated/rusefi_alphax-4chan_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_alphax-4chan_f7.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.11.08.alphax-4chan_f7.4002463964" + signature = "rusEFI master.2023.11.09.alphax-4chan_f7.4258030986" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.11.08.alphax-4chan_f7.4002463964" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.11.09.alphax-4chan_f7.4258030986" ; 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 @@ -92,7 +92,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","INVALID","D4 - TPS2","INVALID","X5 - AIN3","B2 - MAP","B7 - CLT","B3 - IAT","F6 - PPS2","X7 - AIN4","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.jar based on (unknown script) integration/rusefi_config.txt Wed Nov 08 20:01:38 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Thu Nov 09 02:06:43 UTC 2023 pageSize = 23880 page = 1 @@ -2347,7 +2347,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23870, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1440 + ochBlockSize = 1444 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3001,136 +3001,137 @@ brakePedalState = scalar, S08, 1092, "", 1, 0 startStopState = scalar, S08, 1093, "", 1, 0 startStopPhysicalState = bits, U32, 1096, [0:0] startStopStateToggleCounter = scalar, U32, 1100, "", 1, 0 -egtValue1 = scalar, F32, 1104, "", 1, 0 -egtValue2 = scalar, F32, 1108, "", 1, 0 -desiredRpmLimit = scalar, S16, 1112, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1116, "", 1, 0 -sparkCounter = scalar, U32, 1120, "", 1, 0 -fuelingLoad = scalar, F32, 1124, "", 1, 0 -ignitionLoad = scalar, F32, 1128, "", 1, 0 -veTableYAxis = scalar, U16, 1132, "%", 0.01, 0 -; total TS size = 1136 -tpsFrom = scalar, F32, 1136 -tpsTo = scalar, F32, 1140 -deltaTps = scalar, F32, 1144 -extraFuel = scalar, F32, 1148, "", 1, 0 -valueFromTable = scalar, F32, 1152, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1156, [0:0] -isBelowDecelThreshold = bits, U32, 1156, [1:1] -isTimeToResetAccumulator = bits, U32, 1156, [2:2] -isFractionalEnrichment = bits, U32, 1156, [3:3] -belowEpsilon = bits, U32, 1156, [4:4] -tooShort = bits, U32, 1156, [5:5] -fractionalInjFuel = scalar, F32, 1160, "", 1, 0 -accumulatedValue = scalar, F32, 1164, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1168, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1172, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1176, "", 1, 0 -cycleCnt = scalar, S32, 1180, "", 1, 0 -; total TS size = 1184 -hwEventCounters1 = scalar, U32, 1184, "", 1, 0 -hwEventCounters2 = scalar, U32, 1188, "", 1, 0 -hwEventCounters3 = scalar, U32, 1192, "", 1, 0 -hwEventCounters4 = scalar, U32, 1196, "", 1, 0 -hwEventCounters5 = scalar, U32, 1200, "", 1, 0 -hwEventCounters6 = scalar, U32, 1204, "", 1, 0 -vvtCamCounter = scalar, U32, 1208, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1212, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1216, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1220, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1221, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1224, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1228, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1232, "", 1, 0 -mapCamPrevToothAngle = scalar, F32, 1236, "deg", 1, 0 -isDecodingMapCam = bits, U32, 1240, [0:0] -; total TS size = 1244 -crankSynchronizationCounter = scalar, U32, 1244, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1248, "", 1, 0 -vvtToothDurations0 = scalar, U32, 1252, "us", 1, 0 -vvtCurrentPosition = scalar, F32, 1256, "sync: Primary Cam Position", 1, 0 -vvtToothPosition1 = scalar, F32, 1260, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition2 = scalar, F32, 1264, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition3 = scalar, F32, 1268, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition4 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio = scalar, F32, 1276, "", 1, 0 -triggerStateIndex = scalar, U08, 1280, "", 1, 0 -camResyncCounter = scalar, U08, 1281, "", 1, 0 -vvtStateIndex = scalar, U08, 1282, "", 1, 0 -; total TS size = 1284 -m_hasSynchronizedPhase = bits, U32, 1284, [0:0] +startStopStateTempPhysicalCounter = scalar, U32, 1104, "", 1, 0 +egtValue1 = scalar, F32, 1108, "", 1, 0 +egtValue2 = scalar, F32, 1112, "", 1, 0 +desiredRpmLimit = scalar, S16, 1116, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 1120, "", 1, 0 +sparkCounter = scalar, U32, 1124, "", 1, 0 +fuelingLoad = scalar, F32, 1128, "", 1, 0 +ignitionLoad = scalar, F32, 1132, "", 1, 0 +veTableYAxis = scalar, U16, 1136, "%", 0.01, 0 +; total TS size = 1140 +tpsFrom = scalar, F32, 1140 +tpsTo = scalar, F32, 1144 +deltaTps = scalar, F32, 1148 +extraFuel = scalar, F32, 1152, "", 1, 0 +valueFromTable = scalar, F32, 1156, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1160, [0:0] +isBelowDecelThreshold = bits, U32, 1160, [1:1] +isTimeToResetAccumulator = bits, U32, 1160, [2:2] +isFractionalEnrichment = bits, U32, 1160, [3:3] +belowEpsilon = bits, U32, 1160, [4:4] +tooShort = bits, U32, 1160, [5:5] +fractionalInjFuel = scalar, F32, 1164, "", 1, 0 +accumulatedValue = scalar, F32, 1168, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1172, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1176, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1180, "", 1, 0 +cycleCnt = scalar, S32, 1184, "", 1, 0 +; total TS size = 1188 +hwEventCounters1 = scalar, U32, 1188, "", 1, 0 +hwEventCounters2 = scalar, U32, 1192, "", 1, 0 +hwEventCounters3 = scalar, U32, 1196, "", 1, 0 +hwEventCounters4 = scalar, U32, 1200, "", 1, 0 +hwEventCounters5 = scalar, U32, 1204, "", 1, 0 +hwEventCounters6 = scalar, U32, 1208, "", 1, 0 +vvtCamCounter = scalar, U32, 1212, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1216, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1220, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1224, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1225, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1228, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1232, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1236, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1240, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1244, [0:0] +; total TS size = 1248 +crankSynchronizationCounter = scalar, U32, 1248, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1252, "", 1, 0 +vvtToothDurations0 = scalar, U32, 1256, "us", 1, 0 +vvtCurrentPosition = scalar, F32, 1260, "sync: Primary Cam Position", 1, 0 +vvtToothPosition1 = scalar, F32, 1264, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition2 = scalar, F32, 1268, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition3 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition4 = scalar, F32, 1276, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio = scalar, F32, 1280, "", 1, 0 +triggerStateIndex = scalar, U08, 1284, "", 1, 0 +camResyncCounter = scalar, U08, 1285, "", 1, 0 +vvtStateIndex = scalar, U08, 1286, "", 1, 0 ; total TS size = 1288 -wallFuelCorrection = scalar, F32, 1288, "", 1, 0 -wallFuel = scalar, F32, 1292, "", 1, 0 -; total TS size = 1296 -idleState = bits, S32, 1296, [0:2], "not important" -currentIdlePosition = scalar, F32, 1300 -baseIdlePosition = scalar, F32, 1304 -idleClosedLoop = scalar, F32, 1308 -iacByTpsTaper = scalar, F32, 1312 -throttlePedalUpState = scalar, S32, 1316, "", 1, 0 -mightResetPid = bits, U32, 1320, [0:0] -shouldResetPid = bits, U32, 1320, [1:1] -wasResetPid = bits, U32, 1320, [2:2] -mustResetPid = bits, U32, 1320, [3:3] -isCranking = bits, U32, 1320, [4:4] -isIacTableForCoasting = bits, U32, 1320, [5:5] -notIdling = bits, U32, 1320, [6:6] -needReset = bits, U32, 1320, [7:7] -isInDeadZone = bits, U32, 1320, [8:8] -isBlipping = bits, U32, 1320, [9:9] -useClosedLoop = bits, U32, 1320, [10:10] -badTps = bits, U32, 1320, [11:11] -looksLikeRunning = bits, U32, 1320, [12:12] -looksLikeCoasting = bits, U32, 1320, [13:13] -looksLikeCrankToIdle = bits, U32, 1320, [14:14] -isIdleCoasting = bits, U32, 1320, [15:15] -isIdleClosedLoop = bits, U32, 1320, [16:16] -idleTarget = scalar, S32, 1324, "", 1, 0 -targetRpmByClt = scalar, S32, 1328, "", 1, 0 -targetRpmAc = scalar, S32, 1332, "", 1, 0 -iacByRpmTaper = scalar, F32, 1336 -luaAdd = scalar, F32, 1340 -; total TS size = 1344 -idlePosition = scalar, F32, 1344, "per", 1,0 -trim = scalar, F32, 1348, "", 1, 0 -luaAdjustment = scalar, F32, 1352, "per", 1,0 -m_wastegatePosition = scalar, F32, 1356, "per", 1,0 -etbFeedForward = scalar, F32, 1360 -etbIntegralError = scalar, F32, 1364, "", 1, 0 -etbCurrentTarget = scalar, F32, 1368, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1372, "%", 1, 0 -etbRevLimitActive = bits, U32, 1376, [0:0] -jamDetected = bits, U32, 1376, [1:1] -etbDutyRateOfChange = scalar, F32, 1380, "per", 1,0 -etbDutyAverage = scalar, F32, 1384, "per", 1,0 -etbTpsErrorCounter = scalar, U16, 1388, "count", 1,0 -etbPpsErrorCounter = scalar, U16, 1390, "count", 1,0 -etbErrorCode = scalar, S08, 1392, "", 1, 0 -jamTimer = scalar, U16, 1394, "sec", 0.01, 0 -; total TS size = 1396 -faultCode = scalar, U08, 1396, "", 1, 0 -heaterDuty = scalar, U08, 1397, "%", 1, 0 -pumpDuty = scalar, U08, 1398, "%", 1, 0 -tempC = scalar, U16, 1400, "C", 1, 0 -nernstVoltage = scalar, U16, 1402, "V", 0.001, 0 -esr = scalar, U16, 1404, "ohm", 1, 0 -; total TS size = 1408 -dcOutput0 = scalar, F32, 1408, "per", 1,0 -isEnabled0_int = scalar, U08, 1412, "per", 1,0 -isEnabled0 = bits, U32, 1416, [0:0] -; total TS size = 1420 -value0 = scalar, U16, 1420, "value", 1,0 -value1 = scalar, U16, 1422, "value", 1,0 -errorRate = scalar, F32, 1424, "ratio", 1,0 -; total TS size = 1428 -vvtTarget = scalar, U16, 1428, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1430, "%", 0.5, 0 +m_hasSynchronizedPhase = bits, U32, 1288, [0:0] +; total TS size = 1292 +wallFuelCorrection = scalar, F32, 1292, "", 1, 0 +wallFuel = scalar, F32, 1296, "", 1, 0 +; total TS size = 1300 +idleState = bits, S32, 1300, [0:2], "not important" +currentIdlePosition = scalar, F32, 1304 +baseIdlePosition = scalar, F32, 1308 +idleClosedLoop = scalar, F32, 1312 +iacByTpsTaper = scalar, F32, 1316 +throttlePedalUpState = scalar, S32, 1320, "", 1, 0 +mightResetPid = bits, U32, 1324, [0:0] +shouldResetPid = bits, U32, 1324, [1:1] +wasResetPid = bits, U32, 1324, [2:2] +mustResetPid = bits, U32, 1324, [3:3] +isCranking = bits, U32, 1324, [4:4] +isIacTableForCoasting = bits, U32, 1324, [5:5] +notIdling = bits, U32, 1324, [6:6] +needReset = bits, U32, 1324, [7:7] +isInDeadZone = bits, U32, 1324, [8:8] +isBlipping = bits, U32, 1324, [9:9] +useClosedLoop = bits, U32, 1324, [10:10] +badTps = bits, U32, 1324, [11:11] +looksLikeRunning = bits, U32, 1324, [12:12] +looksLikeCoasting = bits, U32, 1324, [13:13] +looksLikeCrankToIdle = bits, U32, 1324, [14:14] +isIdleCoasting = bits, U32, 1324, [15:15] +isIdleClosedLoop = bits, U32, 1324, [16:16] +idleTarget = scalar, S32, 1328, "", 1, 0 +targetRpmByClt = scalar, S32, 1332, "", 1, 0 +targetRpmAc = scalar, S32, 1336, "", 1, 0 +iacByRpmTaper = scalar, F32, 1340 +luaAdd = scalar, F32, 1344 +; total TS size = 1348 +idlePosition = scalar, F32, 1348, "per", 1,0 +trim = scalar, F32, 1352, "", 1, 0 +luaAdjustment = scalar, F32, 1356, "per", 1,0 +m_wastegatePosition = scalar, F32, 1360, "per", 1,0 +etbFeedForward = scalar, F32, 1364 +etbIntegralError = scalar, F32, 1368, "", 1, 0 +etbCurrentTarget = scalar, F32, 1372, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1376, "%", 1, 0 +etbRevLimitActive = bits, U32, 1380, [0:0] +jamDetected = bits, U32, 1380, [1:1] +etbDutyRateOfChange = scalar, F32, 1384, "per", 1,0 +etbDutyAverage = scalar, F32, 1388, "per", 1,0 +etbTpsErrorCounter = scalar, U16, 1392, "count", 1,0 +etbPpsErrorCounter = scalar, U16, 1394, "count", 1,0 +etbErrorCode = scalar, S08, 1396, "", 1, 0 +jamTimer = scalar, U16, 1398, "sec", 0.01, 0 +; total TS size = 1400 +faultCode = scalar, U08, 1400, "", 1, 0 +heaterDuty = scalar, U08, 1401, "%", 1, 0 +pumpDuty = scalar, U08, 1402, "%", 1, 0 +tempC = scalar, U16, 1404, "C", 1, 0 +nernstVoltage = scalar, U16, 1406, "V", 0.001, 0 +esr = scalar, U16, 1408, "ohm", 1, 0 +; total TS size = 1412 +dcOutput0 = scalar, F32, 1412, "per", 1,0 +isEnabled0_int = scalar, U08, 1416, "per", 1,0 +isEnabled0 = bits, U32, 1420, [0:0] +; total TS size = 1424 +value0 = scalar, U16, 1424, "value", 1,0 +value1 = scalar, U16, 1426, "value", 1,0 +errorRate = scalar, F32, 1428, "ratio", 1,0 ; total TS size = 1432 -lambdaCurrentlyGood = bits, U32, 1432, [0:0] -lambdaMonitorCut = bits, U32, 1432, [1:1] -lambdaTimeSinceGood = scalar, U16, 1436, "sec", 0.01, 0 -; total TS size = 1440 +vvtTarget = scalar, U16, 1432, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1434, "%", 0.5, 0 +; total TS size = 1436 +lambdaCurrentlyGood = bits, U32, 1436, [0:0] +lambdaMonitorCut = bits, U32, 1436, [1:1] +lambdaTimeSinceGood = scalar, U16, 1440, "sec", 0.01, 0 +; total TS size = 1444 time = { timeNow } @@ -5196,6 +5197,7 @@ entry = brakePedalState, "Brake switch", int, "%d" entry = startStopState, "startStopState", int, "%d" entry = startStopPhysicalState, "startStopPhysicalState", int, "%d" entry = startStopStateToggleCounter, "startStopStateToggleCounter", int, "%d" +entry = startStopStateTempPhysicalCounter, "startStopStateTempPhysicalCounter", int, "%d" entry = egtValue1, "egtValue1", float, "%.3f" entry = egtValue2, "egtValue2", float, "%.3f" entry = desiredRpmLimit, "User-defined RPM hard limit", int, "%d" @@ -6078,13 +6080,14 @@ dialog = engine_stateDialog, "engine_state" graphLine = brakePedalState graphLine = startStopState graphLine = startStopStateToggleCounter - graphLine = egtValue1 + graphLine = startStopStateTempPhysicalCounter liveGraph = engine_state_5_Graph, "Graph", South + graphLine = egtValue1 graphLine = egtValue2 graphLine = desiredRpmLimit graphLine = fuelInjectionCounter - graphLine = sparkCounter liveGraph = engine_state_6_Graph, "Graph", South + graphLine = sparkCounter graphLine = fuelingLoad graphLine = ignitionLoad graphLine = veTableYAxis @@ -6420,8 +6423,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" ; cam if ; two-stroke, or ; not crank trigger and ((vague trigger and cam choice) or not vague trigger) - field = "Cam Sensor (Primary channel)", triggerInputPins1, 1, {twoStroke == 1 || ( !(trigger_type == 2 || trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 21 || trigger_type == 26 || trigger_type == 27 || trigger_type == 33 || trigger_type == 38 || trigger_type == 39 || trigger_type == 44 || trigger_type == 45 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 58 || trigger_type == 61 || trigger_type == 62 || trigger_type == 68 || trigger_type == 70 || trigger_type == 71 || trigger_type == 72 || trigger_type == 74 || trigger_type == 75 || trigger_type == 76 || trigger_type == 77 || trigger_type == 79) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) ) ) } - field = "Crank Sensor (Primary channel)", triggerInputPins1, 1, { !(twoStroke == 1 || ( !(trigger_type == 2 || trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 21 || trigger_type == 26 || trigger_type == 27 || trigger_type == 33 || trigger_type == 38 || trigger_type == 39 || trigger_type == 44 || trigger_type == 45 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 58 || trigger_type == 61 || trigger_type == 62 || trigger_type == 68 || trigger_type == 70 || trigger_type == 71 || trigger_type == 72 || trigger_type == 74 || trigger_type == 75 || trigger_type == 76 || trigger_type == 77 || trigger_type == 79) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) ) )) } + field = "Cam Sensor (Primary channel)", triggerInputPins1, 1, {twoStroke == 1 || ( !(trigger_type == 2 || trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 21 || trigger_type == 26 || trigger_type == 27 || trigger_type == 33 || trigger_type == 38 || trigger_type == 39 || trigger_type == 44 || trigger_type == 45 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 58 || trigger_type == 61 || trigger_type == 62 || trigger_type == 68 || trigger_type == 70 || trigger_type == 71 || trigger_type == 72 || trigger_type == 74 || trigger_type == 75 || trigger_type == 76 || trigger_type == 77) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) ) ) } + field = "Crank Sensor (Primary channel)", triggerInputPins1, 1, { !(twoStroke == 1 || ( !(trigger_type == 2 || trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 21 || trigger_type == 26 || trigger_type == 27 || trigger_type == 33 || trigger_type == 38 || trigger_type == 39 || trigger_type == 44 || trigger_type == 45 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 58 || trigger_type == 61 || trigger_type == 62 || trigger_type == 68 || trigger_type == 70 || trigger_type == 71 || trigger_type == 72 || trigger_type == 74 || trigger_type == 75 || trigger_type == 76 || trigger_type == 77) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) ) )) } field = "Invert Primary", invertPrimaryTriggerSignal field = "Secondary channel", triggerInputPins2, { triggerInputPins2 != 0 || (triggerInputPins1 != 0 && (trigger_type == 1 || trigger_type == 3 || trigger_type == 15 || trigger_type == 16 || trigger_type == 19 || trigger_type == 25 || trigger_type == 28 || trigger_type == 31 || trigger_type == 35 || trigger_type == 36 || trigger_type == 37 || trigger_type == 40 || trigger_type == 49 || trigger_type == 50 || trigger_type == 53 || trigger_type == 54 || trigger_type == 63 || trigger_type == 64) ) } field = "Invert Secondary", invertSecondaryTriggerSignal, {triggerInputPins2 != 0 && (trigger_type == 1 || trigger_type == 3 || trigger_type == 15 || trigger_type == 16 || trigger_type == 19 || trigger_type == 25 || trigger_type == 28 || trigger_type == 31 || trigger_type == 35 || trigger_type == 36 || trigger_type == 37 || trigger_type == 40 || trigger_type == 49 || trigger_type == 50 || trigger_type == 53 || trigger_type == 54 || trigger_type == 63 || trigger_type == 64) } @@ -8536,8 +8539,8 @@ dialog = tcuControls, "Transmission Settings" dialog = fancyHardwareDialog, "Fancy Boards" field = "A4 Tachometer Output 5V/12V Pull-Up", boardUseTachPullUp field = "B3/B7 Temperature Inputs Pull-Up", boardUseTempPullUp - field = "С3 Crank+ Input Pull-Up", boardUseCrankPullUp - field = "С4 2-step input Pull-Down", boardUse2stepPullDown + field = "C3 Crank+ Input Pull-Up", boardUseCrankPullUp + field = "C4 2-step input Pull-Down", boardUse2stepPullDown field = "C7 CAM Hall Input Pull-Down", boardUseCamPullDown field = "E6 CAM VR+ Input Pull-Up", boardUseCamVrPullUp field = "D3 Digital Input 2 Pull-Down", boardUseD2PullDown diff --git a/firmware/tunerstudio/generated/rusefi_alphax-8chan-revA.ini b/firmware/tunerstudio/generated/rusefi_alphax-8chan-revA.ini index 664eef06cb..ccca034f7b 100644 --- a/firmware/tunerstudio/generated/rusefi_alphax-8chan-revA.ini +++ b/firmware/tunerstudio/generated/rusefi_alphax-8chan-revA.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.11.08.alphax-8chan-revA.125538318" + signature = "rusEFI master.2023.11.09.alphax-8chan-revA.338113880" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.11.08.alphax-8chan-revA.125538318" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.11.09.alphax-8chan-revA.338113880" ; 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 @@ -92,7 +92,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.jar based on (unknown script) integration/rusefi_config.txt Wed Nov 08 20:01:49 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Thu Nov 09 02:06:50 UTC 2023 pageSize = 23880 page = 1 @@ -2347,7 +2347,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23870, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1440 + ochBlockSize = 1444 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3001,136 +3001,137 @@ brakePedalState = scalar, S08, 1092, "", 1, 0 startStopState = scalar, S08, 1093, "", 1, 0 startStopPhysicalState = bits, U32, 1096, [0:0] startStopStateToggleCounter = scalar, U32, 1100, "", 1, 0 -egtValue1 = scalar, F32, 1104, "", 1, 0 -egtValue2 = scalar, F32, 1108, "", 1, 0 -desiredRpmLimit = scalar, S16, 1112, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1116, "", 1, 0 -sparkCounter = scalar, U32, 1120, "", 1, 0 -fuelingLoad = scalar, F32, 1124, "", 1, 0 -ignitionLoad = scalar, F32, 1128, "", 1, 0 -veTableYAxis = scalar, U16, 1132, "%", 0.01, 0 -; total TS size = 1136 -tpsFrom = scalar, F32, 1136 -tpsTo = scalar, F32, 1140 -deltaTps = scalar, F32, 1144 -extraFuel = scalar, F32, 1148, "", 1, 0 -valueFromTable = scalar, F32, 1152, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1156, [0:0] -isBelowDecelThreshold = bits, U32, 1156, [1:1] -isTimeToResetAccumulator = bits, U32, 1156, [2:2] -isFractionalEnrichment = bits, U32, 1156, [3:3] -belowEpsilon = bits, U32, 1156, [4:4] -tooShort = bits, U32, 1156, [5:5] -fractionalInjFuel = scalar, F32, 1160, "", 1, 0 -accumulatedValue = scalar, F32, 1164, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1168, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1172, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1176, "", 1, 0 -cycleCnt = scalar, S32, 1180, "", 1, 0 -; total TS size = 1184 -hwEventCounters1 = scalar, U32, 1184, "", 1, 0 -hwEventCounters2 = scalar, U32, 1188, "", 1, 0 -hwEventCounters3 = scalar, U32, 1192, "", 1, 0 -hwEventCounters4 = scalar, U32, 1196, "", 1, 0 -hwEventCounters5 = scalar, U32, 1200, "", 1, 0 -hwEventCounters6 = scalar, U32, 1204, "", 1, 0 -vvtCamCounter = scalar, U32, 1208, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1212, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1216, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1220, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1221, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1224, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1228, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1232, "", 1, 0 -mapCamPrevToothAngle = scalar, F32, 1236, "deg", 1, 0 -isDecodingMapCam = bits, U32, 1240, [0:0] -; total TS size = 1244 -crankSynchronizationCounter = scalar, U32, 1244, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1248, "", 1, 0 -vvtToothDurations0 = scalar, U32, 1252, "us", 1, 0 -vvtCurrentPosition = scalar, F32, 1256, "sync: Primary Cam Position", 1, 0 -vvtToothPosition1 = scalar, F32, 1260, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition2 = scalar, F32, 1264, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition3 = scalar, F32, 1268, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition4 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio = scalar, F32, 1276, "", 1, 0 -triggerStateIndex = scalar, U08, 1280, "", 1, 0 -camResyncCounter = scalar, U08, 1281, "", 1, 0 -vvtStateIndex = scalar, U08, 1282, "", 1, 0 -; total TS size = 1284 -m_hasSynchronizedPhase = bits, U32, 1284, [0:0] +startStopStateTempPhysicalCounter = scalar, U32, 1104, "", 1, 0 +egtValue1 = scalar, F32, 1108, "", 1, 0 +egtValue2 = scalar, F32, 1112, "", 1, 0 +desiredRpmLimit = scalar, S16, 1116, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 1120, "", 1, 0 +sparkCounter = scalar, U32, 1124, "", 1, 0 +fuelingLoad = scalar, F32, 1128, "", 1, 0 +ignitionLoad = scalar, F32, 1132, "", 1, 0 +veTableYAxis = scalar, U16, 1136, "%", 0.01, 0 +; total TS size = 1140 +tpsFrom = scalar, F32, 1140 +tpsTo = scalar, F32, 1144 +deltaTps = scalar, F32, 1148 +extraFuel = scalar, F32, 1152, "", 1, 0 +valueFromTable = scalar, F32, 1156, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1160, [0:0] +isBelowDecelThreshold = bits, U32, 1160, [1:1] +isTimeToResetAccumulator = bits, U32, 1160, [2:2] +isFractionalEnrichment = bits, U32, 1160, [3:3] +belowEpsilon = bits, U32, 1160, [4:4] +tooShort = bits, U32, 1160, [5:5] +fractionalInjFuel = scalar, F32, 1164, "", 1, 0 +accumulatedValue = scalar, F32, 1168, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1172, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1176, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1180, "", 1, 0 +cycleCnt = scalar, S32, 1184, "", 1, 0 +; total TS size = 1188 +hwEventCounters1 = scalar, U32, 1188, "", 1, 0 +hwEventCounters2 = scalar, U32, 1192, "", 1, 0 +hwEventCounters3 = scalar, U32, 1196, "", 1, 0 +hwEventCounters4 = scalar, U32, 1200, "", 1, 0 +hwEventCounters5 = scalar, U32, 1204, "", 1, 0 +hwEventCounters6 = scalar, U32, 1208, "", 1, 0 +vvtCamCounter = scalar, U32, 1212, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1216, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1220, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1224, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1225, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1228, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1232, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1236, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1240, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1244, [0:0] +; total TS size = 1248 +crankSynchronizationCounter = scalar, U32, 1248, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1252, "", 1, 0 +vvtToothDurations0 = scalar, U32, 1256, "us", 1, 0 +vvtCurrentPosition = scalar, F32, 1260, "sync: Primary Cam Position", 1, 0 +vvtToothPosition1 = scalar, F32, 1264, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition2 = scalar, F32, 1268, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition3 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition4 = scalar, F32, 1276, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio = scalar, F32, 1280, "", 1, 0 +triggerStateIndex = scalar, U08, 1284, "", 1, 0 +camResyncCounter = scalar, U08, 1285, "", 1, 0 +vvtStateIndex = scalar, U08, 1286, "", 1, 0 ; total TS size = 1288 -wallFuelCorrection = scalar, F32, 1288, "", 1, 0 -wallFuel = scalar, F32, 1292, "", 1, 0 -; total TS size = 1296 -idleState = bits, S32, 1296, [0:2], "not important" -currentIdlePosition = scalar, F32, 1300 -baseIdlePosition = scalar, F32, 1304 -idleClosedLoop = scalar, F32, 1308 -iacByTpsTaper = scalar, F32, 1312 -throttlePedalUpState = scalar, S32, 1316, "", 1, 0 -mightResetPid = bits, U32, 1320, [0:0] -shouldResetPid = bits, U32, 1320, [1:1] -wasResetPid = bits, U32, 1320, [2:2] -mustResetPid = bits, U32, 1320, [3:3] -isCranking = bits, U32, 1320, [4:4] -isIacTableForCoasting = bits, U32, 1320, [5:5] -notIdling = bits, U32, 1320, [6:6] -needReset = bits, U32, 1320, [7:7] -isInDeadZone = bits, U32, 1320, [8:8] -isBlipping = bits, U32, 1320, [9:9] -useClosedLoop = bits, U32, 1320, [10:10] -badTps = bits, U32, 1320, [11:11] -looksLikeRunning = bits, U32, 1320, [12:12] -looksLikeCoasting = bits, U32, 1320, [13:13] -looksLikeCrankToIdle = bits, U32, 1320, [14:14] -isIdleCoasting = bits, U32, 1320, [15:15] -isIdleClosedLoop = bits, U32, 1320, [16:16] -idleTarget = scalar, S32, 1324, "", 1, 0 -targetRpmByClt = scalar, S32, 1328, "", 1, 0 -targetRpmAc = scalar, S32, 1332, "", 1, 0 -iacByRpmTaper = scalar, F32, 1336 -luaAdd = scalar, F32, 1340 -; total TS size = 1344 -idlePosition = scalar, F32, 1344, "per", 1,0 -trim = scalar, F32, 1348, "", 1, 0 -luaAdjustment = scalar, F32, 1352, "per", 1,0 -m_wastegatePosition = scalar, F32, 1356, "per", 1,0 -etbFeedForward = scalar, F32, 1360 -etbIntegralError = scalar, F32, 1364, "", 1, 0 -etbCurrentTarget = scalar, F32, 1368, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1372, "%", 1, 0 -etbRevLimitActive = bits, U32, 1376, [0:0] -jamDetected = bits, U32, 1376, [1:1] -etbDutyRateOfChange = scalar, F32, 1380, "per", 1,0 -etbDutyAverage = scalar, F32, 1384, "per", 1,0 -etbTpsErrorCounter = scalar, U16, 1388, "count", 1,0 -etbPpsErrorCounter = scalar, U16, 1390, "count", 1,0 -etbErrorCode = scalar, S08, 1392, "", 1, 0 -jamTimer = scalar, U16, 1394, "sec", 0.01, 0 -; total TS size = 1396 -faultCode = scalar, U08, 1396, "", 1, 0 -heaterDuty = scalar, U08, 1397, "%", 1, 0 -pumpDuty = scalar, U08, 1398, "%", 1, 0 -tempC = scalar, U16, 1400, "C", 1, 0 -nernstVoltage = scalar, U16, 1402, "V", 0.001, 0 -esr = scalar, U16, 1404, "ohm", 1, 0 -; total TS size = 1408 -dcOutput0 = scalar, F32, 1408, "per", 1,0 -isEnabled0_int = scalar, U08, 1412, "per", 1,0 -isEnabled0 = bits, U32, 1416, [0:0] -; total TS size = 1420 -value0 = scalar, U16, 1420, "value", 1,0 -value1 = scalar, U16, 1422, "value", 1,0 -errorRate = scalar, F32, 1424, "ratio", 1,0 -; total TS size = 1428 -vvtTarget = scalar, U16, 1428, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1430, "%", 0.5, 0 +m_hasSynchronizedPhase = bits, U32, 1288, [0:0] +; total TS size = 1292 +wallFuelCorrection = scalar, F32, 1292, "", 1, 0 +wallFuel = scalar, F32, 1296, "", 1, 0 +; total TS size = 1300 +idleState = bits, S32, 1300, [0:2], "not important" +currentIdlePosition = scalar, F32, 1304 +baseIdlePosition = scalar, F32, 1308 +idleClosedLoop = scalar, F32, 1312 +iacByTpsTaper = scalar, F32, 1316 +throttlePedalUpState = scalar, S32, 1320, "", 1, 0 +mightResetPid = bits, U32, 1324, [0:0] +shouldResetPid = bits, U32, 1324, [1:1] +wasResetPid = bits, U32, 1324, [2:2] +mustResetPid = bits, U32, 1324, [3:3] +isCranking = bits, U32, 1324, [4:4] +isIacTableForCoasting = bits, U32, 1324, [5:5] +notIdling = bits, U32, 1324, [6:6] +needReset = bits, U32, 1324, [7:7] +isInDeadZone = bits, U32, 1324, [8:8] +isBlipping = bits, U32, 1324, [9:9] +useClosedLoop = bits, U32, 1324, [10:10] +badTps = bits, U32, 1324, [11:11] +looksLikeRunning = bits, U32, 1324, [12:12] +looksLikeCoasting = bits, U32, 1324, [13:13] +looksLikeCrankToIdle = bits, U32, 1324, [14:14] +isIdleCoasting = bits, U32, 1324, [15:15] +isIdleClosedLoop = bits, U32, 1324, [16:16] +idleTarget = scalar, S32, 1328, "", 1, 0 +targetRpmByClt = scalar, S32, 1332, "", 1, 0 +targetRpmAc = scalar, S32, 1336, "", 1, 0 +iacByRpmTaper = scalar, F32, 1340 +luaAdd = scalar, F32, 1344 +; total TS size = 1348 +idlePosition = scalar, F32, 1348, "per", 1,0 +trim = scalar, F32, 1352, "", 1, 0 +luaAdjustment = scalar, F32, 1356, "per", 1,0 +m_wastegatePosition = scalar, F32, 1360, "per", 1,0 +etbFeedForward = scalar, F32, 1364 +etbIntegralError = scalar, F32, 1368, "", 1, 0 +etbCurrentTarget = scalar, F32, 1372, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1376, "%", 1, 0 +etbRevLimitActive = bits, U32, 1380, [0:0] +jamDetected = bits, U32, 1380, [1:1] +etbDutyRateOfChange = scalar, F32, 1384, "per", 1,0 +etbDutyAverage = scalar, F32, 1388, "per", 1,0 +etbTpsErrorCounter = scalar, U16, 1392, "count", 1,0 +etbPpsErrorCounter = scalar, U16, 1394, "count", 1,0 +etbErrorCode = scalar, S08, 1396, "", 1, 0 +jamTimer = scalar, U16, 1398, "sec", 0.01, 0 +; total TS size = 1400 +faultCode = scalar, U08, 1400, "", 1, 0 +heaterDuty = scalar, U08, 1401, "%", 1, 0 +pumpDuty = scalar, U08, 1402, "%", 1, 0 +tempC = scalar, U16, 1404, "C", 1, 0 +nernstVoltage = scalar, U16, 1406, "V", 0.001, 0 +esr = scalar, U16, 1408, "ohm", 1, 0 +; total TS size = 1412 +dcOutput0 = scalar, F32, 1412, "per", 1,0 +isEnabled0_int = scalar, U08, 1416, "per", 1,0 +isEnabled0 = bits, U32, 1420, [0:0] +; total TS size = 1424 +value0 = scalar, U16, 1424, "value", 1,0 +value1 = scalar, U16, 1426, "value", 1,0 +errorRate = scalar, F32, 1428, "ratio", 1,0 ; total TS size = 1432 -lambdaCurrentlyGood = bits, U32, 1432, [0:0] -lambdaMonitorCut = bits, U32, 1432, [1:1] -lambdaTimeSinceGood = scalar, U16, 1436, "sec", 0.01, 0 -; total TS size = 1440 +vvtTarget = scalar, U16, 1432, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1434, "%", 0.5, 0 +; total TS size = 1436 +lambdaCurrentlyGood = bits, U32, 1436, [0:0] +lambdaMonitorCut = bits, U32, 1436, [1:1] +lambdaTimeSinceGood = scalar, U16, 1440, "sec", 0.01, 0 +; total TS size = 1444 time = { timeNow } @@ -5196,6 +5197,7 @@ entry = brakePedalState, "Brake switch", int, "%d" entry = startStopState, "startStopState", int, "%d" entry = startStopPhysicalState, "startStopPhysicalState", int, "%d" entry = startStopStateToggleCounter, "startStopStateToggleCounter", int, "%d" +entry = startStopStateTempPhysicalCounter, "startStopStateTempPhysicalCounter", int, "%d" entry = egtValue1, "egtValue1", float, "%.3f" entry = egtValue2, "egtValue2", float, "%.3f" entry = desiredRpmLimit, "User-defined RPM hard limit", int, "%d" @@ -6079,13 +6081,14 @@ dialog = engine_stateDialog, "engine_state" graphLine = brakePedalState graphLine = startStopState graphLine = startStopStateToggleCounter - graphLine = egtValue1 + graphLine = startStopStateTempPhysicalCounter liveGraph = engine_state_5_Graph, "Graph", South + graphLine = egtValue1 graphLine = egtValue2 graphLine = desiredRpmLimit graphLine = fuelInjectionCounter - graphLine = sparkCounter liveGraph = engine_state_6_Graph, "Graph", South + graphLine = sparkCounter graphLine = fuelingLoad graphLine = ignitionLoad graphLine = veTableYAxis @@ -6421,8 +6424,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" ; cam if ; two-stroke, or ; not crank trigger and ((vague trigger and cam choice) or not vague trigger) - field = "Cam Sensor (Primary channel)", triggerInputPins1, 1, {twoStroke == 1 || ( !(trigger_type == 2 || trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 21 || trigger_type == 26 || trigger_type == 27 || trigger_type == 33 || trigger_type == 38 || trigger_type == 39 || trigger_type == 44 || trigger_type == 45 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 58 || trigger_type == 61 || trigger_type == 62 || trigger_type == 68 || trigger_type == 70 || trigger_type == 71 || trigger_type == 72 || trigger_type == 74 || trigger_type == 75 || trigger_type == 76 || trigger_type == 77 || trigger_type == 79) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) ) ) } - field = "Crank Sensor (Primary channel)", triggerInputPins1, 1, { !(twoStroke == 1 || ( !(trigger_type == 2 || trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 21 || trigger_type == 26 || trigger_type == 27 || trigger_type == 33 || trigger_type == 38 || trigger_type == 39 || trigger_type == 44 || trigger_type == 45 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 58 || trigger_type == 61 || trigger_type == 62 || trigger_type == 68 || trigger_type == 70 || trigger_type == 71 || trigger_type == 72 || trigger_type == 74 || trigger_type == 75 || trigger_type == 76 || trigger_type == 77 || trigger_type == 79) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) ) )) } + field = "Cam Sensor (Primary channel)", triggerInputPins1, 1, {twoStroke == 1 || ( !(trigger_type == 2 || trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 21 || trigger_type == 26 || trigger_type == 27 || trigger_type == 33 || trigger_type == 38 || trigger_type == 39 || trigger_type == 44 || trigger_type == 45 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 58 || trigger_type == 61 || trigger_type == 62 || trigger_type == 68 || trigger_type == 70 || trigger_type == 71 || trigger_type == 72 || trigger_type == 74 || trigger_type == 75 || trigger_type == 76 || trigger_type == 77) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) ) ) } + field = "Crank Sensor (Primary channel)", triggerInputPins1, 1, { !(twoStroke == 1 || ( !(trigger_type == 2 || trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 21 || trigger_type == 26 || trigger_type == 27 || trigger_type == 33 || trigger_type == 38 || trigger_type == 39 || trigger_type == 44 || trigger_type == 45 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 58 || trigger_type == 61 || trigger_type == 62 || trigger_type == 68 || trigger_type == 70 || trigger_type == 71 || trigger_type == 72 || trigger_type == 74 || trigger_type == 75 || trigger_type == 76 || trigger_type == 77) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) ) )) } field = "Invert Primary", invertPrimaryTriggerSignal field = "Secondary channel", triggerInputPins2, { triggerInputPins2 != 0 || (triggerInputPins1 != 0 && (trigger_type == 1 || trigger_type == 3 || trigger_type == 15 || trigger_type == 16 || trigger_type == 19 || trigger_type == 25 || trigger_type == 28 || trigger_type == 31 || trigger_type == 35 || trigger_type == 36 || trigger_type == 37 || trigger_type == 40 || trigger_type == 49 || trigger_type == 50 || trigger_type == 53 || trigger_type == 54 || trigger_type == 63 || trigger_type == 64) ) } field = "Invert Secondary", invertSecondaryTriggerSignal, {triggerInputPins2 != 0 && (trigger_type == 1 || trigger_type == 3 || trigger_type == 15 || trigger_type == 16 || trigger_type == 19 || trigger_type == 25 || trigger_type == 28 || trigger_type == 31 || trigger_type == 35 || trigger_type == 36 || trigger_type == 37 || trigger_type == 40 || trigger_type == 49 || trigger_type == 50 || trigger_type == 53 || trigger_type == 54 || trigger_type == 63 || trigger_type == 64) } @@ -8534,7 +8537,7 @@ dialog = tcuControls, "Transmission Settings" field = "D2 Tachometer Output 5V/12V Pull-Up", boardUseTachPullUp field = "A15/A16 Temperature Inputs Pull-Up", boardUseTempPullUp field = "A8 Crank+ Input Pull-Up", boardUseCrankPullUp - field = "С21 2-step input Pull-Down", boardUse2stepPullDown + field = "C21 2-step input Pull-Down", boardUse2stepPullDown field = "A23 CAM Hall Input Pull-Down", boardUseCamPullDown field = "B14 Digital Input 2 Pull-Down", boardUseD2PullDown field = "B15 Digital Input 3 Pull-Down", boardUseD3PullDown diff --git a/firmware/tunerstudio/generated/rusefi_alphax-8chan.ini b/firmware/tunerstudio/generated/rusefi_alphax-8chan.ini index 1c3a79563c..a87644458e 100644 --- a/firmware/tunerstudio/generated/rusefi_alphax-8chan.ini +++ b/firmware/tunerstudio/generated/rusefi_alphax-8chan.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.11.08.alphax-8chan.902388248" + signature = "rusEFI master.2023.11.09.alphax-8chan.647364430" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.11.08.alphax-8chan.902388248" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.11.09.alphax-8chan.647364430" ; 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 @@ -92,7 +92,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.jar based on (unknown script) integration/rusefi_config.txt Wed Nov 08 20:01:42 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Thu Nov 09 02:06:45 UTC 2023 pageSize = 23880 page = 1 @@ -2347,7 +2347,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23870, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1440 + ochBlockSize = 1444 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3001,136 +3001,137 @@ brakePedalState = scalar, S08, 1092, "", 1, 0 startStopState = scalar, S08, 1093, "", 1, 0 startStopPhysicalState = bits, U32, 1096, [0:0] startStopStateToggleCounter = scalar, U32, 1100, "", 1, 0 -egtValue1 = scalar, F32, 1104, "", 1, 0 -egtValue2 = scalar, F32, 1108, "", 1, 0 -desiredRpmLimit = scalar, S16, 1112, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1116, "", 1, 0 -sparkCounter = scalar, U32, 1120, "", 1, 0 -fuelingLoad = scalar, F32, 1124, "", 1, 0 -ignitionLoad = scalar, F32, 1128, "", 1, 0 -veTableYAxis = scalar, U16, 1132, "%", 0.01, 0 -; total TS size = 1136 -tpsFrom = scalar, F32, 1136 -tpsTo = scalar, F32, 1140 -deltaTps = scalar, F32, 1144 -extraFuel = scalar, F32, 1148, "", 1, 0 -valueFromTable = scalar, F32, 1152, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1156, [0:0] -isBelowDecelThreshold = bits, U32, 1156, [1:1] -isTimeToResetAccumulator = bits, U32, 1156, [2:2] -isFractionalEnrichment = bits, U32, 1156, [3:3] -belowEpsilon = bits, U32, 1156, [4:4] -tooShort = bits, U32, 1156, [5:5] -fractionalInjFuel = scalar, F32, 1160, "", 1, 0 -accumulatedValue = scalar, F32, 1164, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1168, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1172, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1176, "", 1, 0 -cycleCnt = scalar, S32, 1180, "", 1, 0 -; total TS size = 1184 -hwEventCounters1 = scalar, U32, 1184, "", 1, 0 -hwEventCounters2 = scalar, U32, 1188, "", 1, 0 -hwEventCounters3 = scalar, U32, 1192, "", 1, 0 -hwEventCounters4 = scalar, U32, 1196, "", 1, 0 -hwEventCounters5 = scalar, U32, 1200, "", 1, 0 -hwEventCounters6 = scalar, U32, 1204, "", 1, 0 -vvtCamCounter = scalar, U32, 1208, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1212, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1216, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1220, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1221, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1224, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1228, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1232, "", 1, 0 -mapCamPrevToothAngle = scalar, F32, 1236, "deg", 1, 0 -isDecodingMapCam = bits, U32, 1240, [0:0] -; total TS size = 1244 -crankSynchronizationCounter = scalar, U32, 1244, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1248, "", 1, 0 -vvtToothDurations0 = scalar, U32, 1252, "us", 1, 0 -vvtCurrentPosition = scalar, F32, 1256, "sync: Primary Cam Position", 1, 0 -vvtToothPosition1 = scalar, F32, 1260, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition2 = scalar, F32, 1264, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition3 = scalar, F32, 1268, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition4 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio = scalar, F32, 1276, "", 1, 0 -triggerStateIndex = scalar, U08, 1280, "", 1, 0 -camResyncCounter = scalar, U08, 1281, "", 1, 0 -vvtStateIndex = scalar, U08, 1282, "", 1, 0 -; total TS size = 1284 -m_hasSynchronizedPhase = bits, U32, 1284, [0:0] +startStopStateTempPhysicalCounter = scalar, U32, 1104, "", 1, 0 +egtValue1 = scalar, F32, 1108, "", 1, 0 +egtValue2 = scalar, F32, 1112, "", 1, 0 +desiredRpmLimit = scalar, S16, 1116, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 1120, "", 1, 0 +sparkCounter = scalar, U32, 1124, "", 1, 0 +fuelingLoad = scalar, F32, 1128, "", 1, 0 +ignitionLoad = scalar, F32, 1132, "", 1, 0 +veTableYAxis = scalar, U16, 1136, "%", 0.01, 0 +; total TS size = 1140 +tpsFrom = scalar, F32, 1140 +tpsTo = scalar, F32, 1144 +deltaTps = scalar, F32, 1148 +extraFuel = scalar, F32, 1152, "", 1, 0 +valueFromTable = scalar, F32, 1156, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1160, [0:0] +isBelowDecelThreshold = bits, U32, 1160, [1:1] +isTimeToResetAccumulator = bits, U32, 1160, [2:2] +isFractionalEnrichment = bits, U32, 1160, [3:3] +belowEpsilon = bits, U32, 1160, [4:4] +tooShort = bits, U32, 1160, [5:5] +fractionalInjFuel = scalar, F32, 1164, "", 1, 0 +accumulatedValue = scalar, F32, 1168, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1172, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1176, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1180, "", 1, 0 +cycleCnt = scalar, S32, 1184, "", 1, 0 +; total TS size = 1188 +hwEventCounters1 = scalar, U32, 1188, "", 1, 0 +hwEventCounters2 = scalar, U32, 1192, "", 1, 0 +hwEventCounters3 = scalar, U32, 1196, "", 1, 0 +hwEventCounters4 = scalar, U32, 1200, "", 1, 0 +hwEventCounters5 = scalar, U32, 1204, "", 1, 0 +hwEventCounters6 = scalar, U32, 1208, "", 1, 0 +vvtCamCounter = scalar, U32, 1212, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1216, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1220, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1224, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1225, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1228, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1232, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1236, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1240, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1244, [0:0] +; total TS size = 1248 +crankSynchronizationCounter = scalar, U32, 1248, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1252, "", 1, 0 +vvtToothDurations0 = scalar, U32, 1256, "us", 1, 0 +vvtCurrentPosition = scalar, F32, 1260, "sync: Primary Cam Position", 1, 0 +vvtToothPosition1 = scalar, F32, 1264, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition2 = scalar, F32, 1268, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition3 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition4 = scalar, F32, 1276, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio = scalar, F32, 1280, "", 1, 0 +triggerStateIndex = scalar, U08, 1284, "", 1, 0 +camResyncCounter = scalar, U08, 1285, "", 1, 0 +vvtStateIndex = scalar, U08, 1286, "", 1, 0 ; total TS size = 1288 -wallFuelCorrection = scalar, F32, 1288, "", 1, 0 -wallFuel = scalar, F32, 1292, "", 1, 0 -; total TS size = 1296 -idleState = bits, S32, 1296, [0:2], "not important" -currentIdlePosition = scalar, F32, 1300 -baseIdlePosition = scalar, F32, 1304 -idleClosedLoop = scalar, F32, 1308 -iacByTpsTaper = scalar, F32, 1312 -throttlePedalUpState = scalar, S32, 1316, "", 1, 0 -mightResetPid = bits, U32, 1320, [0:0] -shouldResetPid = bits, U32, 1320, [1:1] -wasResetPid = bits, U32, 1320, [2:2] -mustResetPid = bits, U32, 1320, [3:3] -isCranking = bits, U32, 1320, [4:4] -isIacTableForCoasting = bits, U32, 1320, [5:5] -notIdling = bits, U32, 1320, [6:6] -needReset = bits, U32, 1320, [7:7] -isInDeadZone = bits, U32, 1320, [8:8] -isBlipping = bits, U32, 1320, [9:9] -useClosedLoop = bits, U32, 1320, [10:10] -badTps = bits, U32, 1320, [11:11] -looksLikeRunning = bits, U32, 1320, [12:12] -looksLikeCoasting = bits, U32, 1320, [13:13] -looksLikeCrankToIdle = bits, U32, 1320, [14:14] -isIdleCoasting = bits, U32, 1320, [15:15] -isIdleClosedLoop = bits, U32, 1320, [16:16] -idleTarget = scalar, S32, 1324, "", 1, 0 -targetRpmByClt = scalar, S32, 1328, "", 1, 0 -targetRpmAc = scalar, S32, 1332, "", 1, 0 -iacByRpmTaper = scalar, F32, 1336 -luaAdd = scalar, F32, 1340 -; total TS size = 1344 -idlePosition = scalar, F32, 1344, "per", 1,0 -trim = scalar, F32, 1348, "", 1, 0 -luaAdjustment = scalar, F32, 1352, "per", 1,0 -m_wastegatePosition = scalar, F32, 1356, "per", 1,0 -etbFeedForward = scalar, F32, 1360 -etbIntegralError = scalar, F32, 1364, "", 1, 0 -etbCurrentTarget = scalar, F32, 1368, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1372, "%", 1, 0 -etbRevLimitActive = bits, U32, 1376, [0:0] -jamDetected = bits, U32, 1376, [1:1] -etbDutyRateOfChange = scalar, F32, 1380, "per", 1,0 -etbDutyAverage = scalar, F32, 1384, "per", 1,0 -etbTpsErrorCounter = scalar, U16, 1388, "count", 1,0 -etbPpsErrorCounter = scalar, U16, 1390, "count", 1,0 -etbErrorCode = scalar, S08, 1392, "", 1, 0 -jamTimer = scalar, U16, 1394, "sec", 0.01, 0 -; total TS size = 1396 -faultCode = scalar, U08, 1396, "", 1, 0 -heaterDuty = scalar, U08, 1397, "%", 1, 0 -pumpDuty = scalar, U08, 1398, "%", 1, 0 -tempC = scalar, U16, 1400, "C", 1, 0 -nernstVoltage = scalar, U16, 1402, "V", 0.001, 0 -esr = scalar, U16, 1404, "ohm", 1, 0 -; total TS size = 1408 -dcOutput0 = scalar, F32, 1408, "per", 1,0 -isEnabled0_int = scalar, U08, 1412, "per", 1,0 -isEnabled0 = bits, U32, 1416, [0:0] -; total TS size = 1420 -value0 = scalar, U16, 1420, "value", 1,0 -value1 = scalar, U16, 1422, "value", 1,0 -errorRate = scalar, F32, 1424, "ratio", 1,0 -; total TS size = 1428 -vvtTarget = scalar, U16, 1428, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1430, "%", 0.5, 0 +m_hasSynchronizedPhase = bits, U32, 1288, [0:0] +; total TS size = 1292 +wallFuelCorrection = scalar, F32, 1292, "", 1, 0 +wallFuel = scalar, F32, 1296, "", 1, 0 +; total TS size = 1300 +idleState = bits, S32, 1300, [0:2], "not important" +currentIdlePosition = scalar, F32, 1304 +baseIdlePosition = scalar, F32, 1308 +idleClosedLoop = scalar, F32, 1312 +iacByTpsTaper = scalar, F32, 1316 +throttlePedalUpState = scalar, S32, 1320, "", 1, 0 +mightResetPid = bits, U32, 1324, [0:0] +shouldResetPid = bits, U32, 1324, [1:1] +wasResetPid = bits, U32, 1324, [2:2] +mustResetPid = bits, U32, 1324, [3:3] +isCranking = bits, U32, 1324, [4:4] +isIacTableForCoasting = bits, U32, 1324, [5:5] +notIdling = bits, U32, 1324, [6:6] +needReset = bits, U32, 1324, [7:7] +isInDeadZone = bits, U32, 1324, [8:8] +isBlipping = bits, U32, 1324, [9:9] +useClosedLoop = bits, U32, 1324, [10:10] +badTps = bits, U32, 1324, [11:11] +looksLikeRunning = bits, U32, 1324, [12:12] +looksLikeCoasting = bits, U32, 1324, [13:13] +looksLikeCrankToIdle = bits, U32, 1324, [14:14] +isIdleCoasting = bits, U32, 1324, [15:15] +isIdleClosedLoop = bits, U32, 1324, [16:16] +idleTarget = scalar, S32, 1328, "", 1, 0 +targetRpmByClt = scalar, S32, 1332, "", 1, 0 +targetRpmAc = scalar, S32, 1336, "", 1, 0 +iacByRpmTaper = scalar, F32, 1340 +luaAdd = scalar, F32, 1344 +; total TS size = 1348 +idlePosition = scalar, F32, 1348, "per", 1,0 +trim = scalar, F32, 1352, "", 1, 0 +luaAdjustment = scalar, F32, 1356, "per", 1,0 +m_wastegatePosition = scalar, F32, 1360, "per", 1,0 +etbFeedForward = scalar, F32, 1364 +etbIntegralError = scalar, F32, 1368, "", 1, 0 +etbCurrentTarget = scalar, F32, 1372, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1376, "%", 1, 0 +etbRevLimitActive = bits, U32, 1380, [0:0] +jamDetected = bits, U32, 1380, [1:1] +etbDutyRateOfChange = scalar, F32, 1384, "per", 1,0 +etbDutyAverage = scalar, F32, 1388, "per", 1,0 +etbTpsErrorCounter = scalar, U16, 1392, "count", 1,0 +etbPpsErrorCounter = scalar, U16, 1394, "count", 1,0 +etbErrorCode = scalar, S08, 1396, "", 1, 0 +jamTimer = scalar, U16, 1398, "sec", 0.01, 0 +; total TS size = 1400 +faultCode = scalar, U08, 1400, "", 1, 0 +heaterDuty = scalar, U08, 1401, "%", 1, 0 +pumpDuty = scalar, U08, 1402, "%", 1, 0 +tempC = scalar, U16, 1404, "C", 1, 0 +nernstVoltage = scalar, U16, 1406, "V", 0.001, 0 +esr = scalar, U16, 1408, "ohm", 1, 0 +; total TS size = 1412 +dcOutput0 = scalar, F32, 1412, "per", 1,0 +isEnabled0_int = scalar, U08, 1416, "per", 1,0 +isEnabled0 = bits, U32, 1420, [0:0] +; total TS size = 1424 +value0 = scalar, U16, 1424, "value", 1,0 +value1 = scalar, U16, 1426, "value", 1,0 +errorRate = scalar, F32, 1428, "ratio", 1,0 ; total TS size = 1432 -lambdaCurrentlyGood = bits, U32, 1432, [0:0] -lambdaMonitorCut = bits, U32, 1432, [1:1] -lambdaTimeSinceGood = scalar, U16, 1436, "sec", 0.01, 0 -; total TS size = 1440 +vvtTarget = scalar, U16, 1432, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1434, "%", 0.5, 0 +; total TS size = 1436 +lambdaCurrentlyGood = bits, U32, 1436, [0:0] +lambdaMonitorCut = bits, U32, 1436, [1:1] +lambdaTimeSinceGood = scalar, U16, 1440, "sec", 0.01, 0 +; total TS size = 1444 time = { timeNow } @@ -5196,6 +5197,7 @@ entry = brakePedalState, "Brake switch", int, "%d" entry = startStopState, "startStopState", int, "%d" entry = startStopPhysicalState, "startStopPhysicalState", int, "%d" entry = startStopStateToggleCounter, "startStopStateToggleCounter", int, "%d" +entry = startStopStateTempPhysicalCounter, "startStopStateTempPhysicalCounter", int, "%d" entry = egtValue1, "egtValue1", float, "%.3f" entry = egtValue2, "egtValue2", float, "%.3f" entry = desiredRpmLimit, "User-defined RPM hard limit", int, "%d" @@ -6079,13 +6081,14 @@ dialog = engine_stateDialog, "engine_state" graphLine = brakePedalState graphLine = startStopState graphLine = startStopStateToggleCounter - graphLine = egtValue1 + graphLine = startStopStateTempPhysicalCounter liveGraph = engine_state_5_Graph, "Graph", South + graphLine = egtValue1 graphLine = egtValue2 graphLine = desiredRpmLimit graphLine = fuelInjectionCounter - graphLine = sparkCounter liveGraph = engine_state_6_Graph, "Graph", South + graphLine = sparkCounter graphLine = fuelingLoad graphLine = ignitionLoad graphLine = veTableYAxis @@ -6421,8 +6424,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" ; cam if ; two-stroke, or ; not crank trigger and ((vague trigger and cam choice) or not vague trigger) - field = "Cam Sensor (Primary channel)", triggerInputPins1, 1, {twoStroke == 1 || ( !(trigger_type == 2 || trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 21 || trigger_type == 26 || trigger_type == 27 || trigger_type == 33 || trigger_type == 38 || trigger_type == 39 || trigger_type == 44 || trigger_type == 45 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 58 || trigger_type == 61 || trigger_type == 62 || trigger_type == 68 || trigger_type == 70 || trigger_type == 71 || trigger_type == 72 || trigger_type == 74 || trigger_type == 75 || trigger_type == 76 || trigger_type == 77 || trigger_type == 79) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) ) ) } - field = "Crank Sensor (Primary channel)", triggerInputPins1, 1, { !(twoStroke == 1 || ( !(trigger_type == 2 || trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 21 || trigger_type == 26 || trigger_type == 27 || trigger_type == 33 || trigger_type == 38 || trigger_type == 39 || trigger_type == 44 || trigger_type == 45 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 58 || trigger_type == 61 || trigger_type == 62 || trigger_type == 68 || trigger_type == 70 || trigger_type == 71 || trigger_type == 72 || trigger_type == 74 || trigger_type == 75 || trigger_type == 76 || trigger_type == 77 || trigger_type == 79) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) ) )) } + field = "Cam Sensor (Primary channel)", triggerInputPins1, 1, {twoStroke == 1 || ( !(trigger_type == 2 || trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 21 || trigger_type == 26 || trigger_type == 27 || trigger_type == 33 || trigger_type == 38 || trigger_type == 39 || trigger_type == 44 || trigger_type == 45 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 58 || trigger_type == 61 || trigger_type == 62 || trigger_type == 68 || trigger_type == 70 || trigger_type == 71 || trigger_type == 72 || trigger_type == 74 || trigger_type == 75 || trigger_type == 76 || trigger_type == 77) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) ) ) } + field = "Crank Sensor (Primary channel)", triggerInputPins1, 1, { !(twoStroke == 1 || ( !(trigger_type == 2 || trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 21 || trigger_type == 26 || trigger_type == 27 || trigger_type == 33 || trigger_type == 38 || trigger_type == 39 || trigger_type == 44 || trigger_type == 45 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 58 || trigger_type == 61 || trigger_type == 62 || trigger_type == 68 || trigger_type == 70 || trigger_type == 71 || trigger_type == 72 || trigger_type == 74 || trigger_type == 75 || trigger_type == 76 || trigger_type == 77) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) ) )) } field = "Invert Primary", invertPrimaryTriggerSignal field = "Secondary channel", triggerInputPins2, { triggerInputPins2 != 0 || (triggerInputPins1 != 0 && (trigger_type == 1 || trigger_type == 3 || trigger_type == 15 || trigger_type == 16 || trigger_type == 19 || trigger_type == 25 || trigger_type == 28 || trigger_type == 31 || trigger_type == 35 || trigger_type == 36 || trigger_type == 37 || trigger_type == 40 || trigger_type == 49 || trigger_type == 50 || trigger_type == 53 || trigger_type == 54 || trigger_type == 63 || trigger_type == 64) ) } field = "Invert Secondary", invertSecondaryTriggerSignal, {triggerInputPins2 != 0 && (trigger_type == 1 || trigger_type == 3 || trigger_type == 15 || trigger_type == 16 || trigger_type == 19 || trigger_type == 25 || trigger_type == 28 || trigger_type == 31 || trigger_type == 35 || trigger_type == 36 || trigger_type == 37 || trigger_type == 40 || trigger_type == 49 || trigger_type == 50 || trigger_type == 53 || trigger_type == 54 || trigger_type == 63 || trigger_type == 64) } @@ -8534,7 +8537,7 @@ dialog = tcuControls, "Transmission Settings" field = "D2 Tachometer Output 5V/12V Pull-Up", boardUseTachPullUp field = "A15/A16 Temperature Inputs Pull-Up", boardUseTempPullUp field = "A8 Crank+ Input Pull-Up", boardUseCrankPullUp - field = "С21 2-step input Pull-Down", boardUse2stepPullDown + field = "C21 2-step input Pull-Down", boardUse2stepPullDown field = "A23 CAM Hall Input Pull-Down", boardUseCamPullDown field = "B14 Digital Input 2 Pull-Down", boardUseD2PullDown field = "B15 Digital Input 3 Pull-Down", boardUseD3PullDown diff --git a/firmware/tunerstudio/generated/rusefi_alphax-8chan_f7.ini b/firmware/tunerstudio/generated/rusefi_alphax-8chan_f7.ini index fe05b2b7f5..72b9948efc 100644 --- a/firmware/tunerstudio/generated/rusefi_alphax-8chan_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_alphax-8chan_f7.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.11.08.alphax-8chan_f7.902388248" + signature = "rusEFI master.2023.11.09.alphax-8chan_f7.647364430" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.11.08.alphax-8chan_f7.902388248" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.11.09.alphax-8chan_f7.647364430" ; 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 @@ -92,7 +92,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.jar based on (unknown script) integration/rusefi_config.txt Wed Nov 08 20:01:45 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Thu Nov 09 02:06:48 UTC 2023 pageSize = 23880 page = 1 @@ -2347,7 +2347,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23870, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1440 + ochBlockSize = 1444 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3001,136 +3001,137 @@ brakePedalState = scalar, S08, 1092, "", 1, 0 startStopState = scalar, S08, 1093, "", 1, 0 startStopPhysicalState = bits, U32, 1096, [0:0] startStopStateToggleCounter = scalar, U32, 1100, "", 1, 0 -egtValue1 = scalar, F32, 1104, "", 1, 0 -egtValue2 = scalar, F32, 1108, "", 1, 0 -desiredRpmLimit = scalar, S16, 1112, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1116, "", 1, 0 -sparkCounter = scalar, U32, 1120, "", 1, 0 -fuelingLoad = scalar, F32, 1124, "", 1, 0 -ignitionLoad = scalar, F32, 1128, "", 1, 0 -veTableYAxis = scalar, U16, 1132, "%", 0.01, 0 -; total TS size = 1136 -tpsFrom = scalar, F32, 1136 -tpsTo = scalar, F32, 1140 -deltaTps = scalar, F32, 1144 -extraFuel = scalar, F32, 1148, "", 1, 0 -valueFromTable = scalar, F32, 1152, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1156, [0:0] -isBelowDecelThreshold = bits, U32, 1156, [1:1] -isTimeToResetAccumulator = bits, U32, 1156, [2:2] -isFractionalEnrichment = bits, U32, 1156, [3:3] -belowEpsilon = bits, U32, 1156, [4:4] -tooShort = bits, U32, 1156, [5:5] -fractionalInjFuel = scalar, F32, 1160, "", 1, 0 -accumulatedValue = scalar, F32, 1164, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1168, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1172, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1176, "", 1, 0 -cycleCnt = scalar, S32, 1180, "", 1, 0 -; total TS size = 1184 -hwEventCounters1 = scalar, U32, 1184, "", 1, 0 -hwEventCounters2 = scalar, U32, 1188, "", 1, 0 -hwEventCounters3 = scalar, U32, 1192, "", 1, 0 -hwEventCounters4 = scalar, U32, 1196, "", 1, 0 -hwEventCounters5 = scalar, U32, 1200, "", 1, 0 -hwEventCounters6 = scalar, U32, 1204, "", 1, 0 -vvtCamCounter = scalar, U32, 1208, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1212, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1216, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1220, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1221, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1224, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1228, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1232, "", 1, 0 -mapCamPrevToothAngle = scalar, F32, 1236, "deg", 1, 0 -isDecodingMapCam = bits, U32, 1240, [0:0] -; total TS size = 1244 -crankSynchronizationCounter = scalar, U32, 1244, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1248, "", 1, 0 -vvtToothDurations0 = scalar, U32, 1252, "us", 1, 0 -vvtCurrentPosition = scalar, F32, 1256, "sync: Primary Cam Position", 1, 0 -vvtToothPosition1 = scalar, F32, 1260, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition2 = scalar, F32, 1264, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition3 = scalar, F32, 1268, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition4 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio = scalar, F32, 1276, "", 1, 0 -triggerStateIndex = scalar, U08, 1280, "", 1, 0 -camResyncCounter = scalar, U08, 1281, "", 1, 0 -vvtStateIndex = scalar, U08, 1282, "", 1, 0 -; total TS size = 1284 -m_hasSynchronizedPhase = bits, U32, 1284, [0:0] +startStopStateTempPhysicalCounter = scalar, U32, 1104, "", 1, 0 +egtValue1 = scalar, F32, 1108, "", 1, 0 +egtValue2 = scalar, F32, 1112, "", 1, 0 +desiredRpmLimit = scalar, S16, 1116, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 1120, "", 1, 0 +sparkCounter = scalar, U32, 1124, "", 1, 0 +fuelingLoad = scalar, F32, 1128, "", 1, 0 +ignitionLoad = scalar, F32, 1132, "", 1, 0 +veTableYAxis = scalar, U16, 1136, "%", 0.01, 0 +; total TS size = 1140 +tpsFrom = scalar, F32, 1140 +tpsTo = scalar, F32, 1144 +deltaTps = scalar, F32, 1148 +extraFuel = scalar, F32, 1152, "", 1, 0 +valueFromTable = scalar, F32, 1156, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1160, [0:0] +isBelowDecelThreshold = bits, U32, 1160, [1:1] +isTimeToResetAccumulator = bits, U32, 1160, [2:2] +isFractionalEnrichment = bits, U32, 1160, [3:3] +belowEpsilon = bits, U32, 1160, [4:4] +tooShort = bits, U32, 1160, [5:5] +fractionalInjFuel = scalar, F32, 1164, "", 1, 0 +accumulatedValue = scalar, F32, 1168, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1172, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1176, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1180, "", 1, 0 +cycleCnt = scalar, S32, 1184, "", 1, 0 +; total TS size = 1188 +hwEventCounters1 = scalar, U32, 1188, "", 1, 0 +hwEventCounters2 = scalar, U32, 1192, "", 1, 0 +hwEventCounters3 = scalar, U32, 1196, "", 1, 0 +hwEventCounters4 = scalar, U32, 1200, "", 1, 0 +hwEventCounters5 = scalar, U32, 1204, "", 1, 0 +hwEventCounters6 = scalar, U32, 1208, "", 1, 0 +vvtCamCounter = scalar, U32, 1212, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1216, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1220, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1224, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1225, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1228, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1232, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1236, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1240, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1244, [0:0] +; total TS size = 1248 +crankSynchronizationCounter = scalar, U32, 1248, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1252, "", 1, 0 +vvtToothDurations0 = scalar, U32, 1256, "us", 1, 0 +vvtCurrentPosition = scalar, F32, 1260, "sync: Primary Cam Position", 1, 0 +vvtToothPosition1 = scalar, F32, 1264, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition2 = scalar, F32, 1268, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition3 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition4 = scalar, F32, 1276, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio = scalar, F32, 1280, "", 1, 0 +triggerStateIndex = scalar, U08, 1284, "", 1, 0 +camResyncCounter = scalar, U08, 1285, "", 1, 0 +vvtStateIndex = scalar, U08, 1286, "", 1, 0 ; total TS size = 1288 -wallFuelCorrection = scalar, F32, 1288, "", 1, 0 -wallFuel = scalar, F32, 1292, "", 1, 0 -; total TS size = 1296 -idleState = bits, S32, 1296, [0:2], "not important" -currentIdlePosition = scalar, F32, 1300 -baseIdlePosition = scalar, F32, 1304 -idleClosedLoop = scalar, F32, 1308 -iacByTpsTaper = scalar, F32, 1312 -throttlePedalUpState = scalar, S32, 1316, "", 1, 0 -mightResetPid = bits, U32, 1320, [0:0] -shouldResetPid = bits, U32, 1320, [1:1] -wasResetPid = bits, U32, 1320, [2:2] -mustResetPid = bits, U32, 1320, [3:3] -isCranking = bits, U32, 1320, [4:4] -isIacTableForCoasting = bits, U32, 1320, [5:5] -notIdling = bits, U32, 1320, [6:6] -needReset = bits, U32, 1320, [7:7] -isInDeadZone = bits, U32, 1320, [8:8] -isBlipping = bits, U32, 1320, [9:9] -useClosedLoop = bits, U32, 1320, [10:10] -badTps = bits, U32, 1320, [11:11] -looksLikeRunning = bits, U32, 1320, [12:12] -looksLikeCoasting = bits, U32, 1320, [13:13] -looksLikeCrankToIdle = bits, U32, 1320, [14:14] -isIdleCoasting = bits, U32, 1320, [15:15] -isIdleClosedLoop = bits, U32, 1320, [16:16] -idleTarget = scalar, S32, 1324, "", 1, 0 -targetRpmByClt = scalar, S32, 1328, "", 1, 0 -targetRpmAc = scalar, S32, 1332, "", 1, 0 -iacByRpmTaper = scalar, F32, 1336 -luaAdd = scalar, F32, 1340 -; total TS size = 1344 -idlePosition = scalar, F32, 1344, "per", 1,0 -trim = scalar, F32, 1348, "", 1, 0 -luaAdjustment = scalar, F32, 1352, "per", 1,0 -m_wastegatePosition = scalar, F32, 1356, "per", 1,0 -etbFeedForward = scalar, F32, 1360 -etbIntegralError = scalar, F32, 1364, "", 1, 0 -etbCurrentTarget = scalar, F32, 1368, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1372, "%", 1, 0 -etbRevLimitActive = bits, U32, 1376, [0:0] -jamDetected = bits, U32, 1376, [1:1] -etbDutyRateOfChange = scalar, F32, 1380, "per", 1,0 -etbDutyAverage = scalar, F32, 1384, "per", 1,0 -etbTpsErrorCounter = scalar, U16, 1388, "count", 1,0 -etbPpsErrorCounter = scalar, U16, 1390, "count", 1,0 -etbErrorCode = scalar, S08, 1392, "", 1, 0 -jamTimer = scalar, U16, 1394, "sec", 0.01, 0 -; total TS size = 1396 -faultCode = scalar, U08, 1396, "", 1, 0 -heaterDuty = scalar, U08, 1397, "%", 1, 0 -pumpDuty = scalar, U08, 1398, "%", 1, 0 -tempC = scalar, U16, 1400, "C", 1, 0 -nernstVoltage = scalar, U16, 1402, "V", 0.001, 0 -esr = scalar, U16, 1404, "ohm", 1, 0 -; total TS size = 1408 -dcOutput0 = scalar, F32, 1408, "per", 1,0 -isEnabled0_int = scalar, U08, 1412, "per", 1,0 -isEnabled0 = bits, U32, 1416, [0:0] -; total TS size = 1420 -value0 = scalar, U16, 1420, "value", 1,0 -value1 = scalar, U16, 1422, "value", 1,0 -errorRate = scalar, F32, 1424, "ratio", 1,0 -; total TS size = 1428 -vvtTarget = scalar, U16, 1428, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1430, "%", 0.5, 0 +m_hasSynchronizedPhase = bits, U32, 1288, [0:0] +; total TS size = 1292 +wallFuelCorrection = scalar, F32, 1292, "", 1, 0 +wallFuel = scalar, F32, 1296, "", 1, 0 +; total TS size = 1300 +idleState = bits, S32, 1300, [0:2], "not important" +currentIdlePosition = scalar, F32, 1304 +baseIdlePosition = scalar, F32, 1308 +idleClosedLoop = scalar, F32, 1312 +iacByTpsTaper = scalar, F32, 1316 +throttlePedalUpState = scalar, S32, 1320, "", 1, 0 +mightResetPid = bits, U32, 1324, [0:0] +shouldResetPid = bits, U32, 1324, [1:1] +wasResetPid = bits, U32, 1324, [2:2] +mustResetPid = bits, U32, 1324, [3:3] +isCranking = bits, U32, 1324, [4:4] +isIacTableForCoasting = bits, U32, 1324, [5:5] +notIdling = bits, U32, 1324, [6:6] +needReset = bits, U32, 1324, [7:7] +isInDeadZone = bits, U32, 1324, [8:8] +isBlipping = bits, U32, 1324, [9:9] +useClosedLoop = bits, U32, 1324, [10:10] +badTps = bits, U32, 1324, [11:11] +looksLikeRunning = bits, U32, 1324, [12:12] +looksLikeCoasting = bits, U32, 1324, [13:13] +looksLikeCrankToIdle = bits, U32, 1324, [14:14] +isIdleCoasting = bits, U32, 1324, [15:15] +isIdleClosedLoop = bits, U32, 1324, [16:16] +idleTarget = scalar, S32, 1328, "", 1, 0 +targetRpmByClt = scalar, S32, 1332, "", 1, 0 +targetRpmAc = scalar, S32, 1336, "", 1, 0 +iacByRpmTaper = scalar, F32, 1340 +luaAdd = scalar, F32, 1344 +; total TS size = 1348 +idlePosition = scalar, F32, 1348, "per", 1,0 +trim = scalar, F32, 1352, "", 1, 0 +luaAdjustment = scalar, F32, 1356, "per", 1,0 +m_wastegatePosition = scalar, F32, 1360, "per", 1,0 +etbFeedForward = scalar, F32, 1364 +etbIntegralError = scalar, F32, 1368, "", 1, 0 +etbCurrentTarget = scalar, F32, 1372, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1376, "%", 1, 0 +etbRevLimitActive = bits, U32, 1380, [0:0] +jamDetected = bits, U32, 1380, [1:1] +etbDutyRateOfChange = scalar, F32, 1384, "per", 1,0 +etbDutyAverage = scalar, F32, 1388, "per", 1,0 +etbTpsErrorCounter = scalar, U16, 1392, "count", 1,0 +etbPpsErrorCounter = scalar, U16, 1394, "count", 1,0 +etbErrorCode = scalar, S08, 1396, "", 1, 0 +jamTimer = scalar, U16, 1398, "sec", 0.01, 0 +; total TS size = 1400 +faultCode = scalar, U08, 1400, "", 1, 0 +heaterDuty = scalar, U08, 1401, "%", 1, 0 +pumpDuty = scalar, U08, 1402, "%", 1, 0 +tempC = scalar, U16, 1404, "C", 1, 0 +nernstVoltage = scalar, U16, 1406, "V", 0.001, 0 +esr = scalar, U16, 1408, "ohm", 1, 0 +; total TS size = 1412 +dcOutput0 = scalar, F32, 1412, "per", 1,0 +isEnabled0_int = scalar, U08, 1416, "per", 1,0 +isEnabled0 = bits, U32, 1420, [0:0] +; total TS size = 1424 +value0 = scalar, U16, 1424, "value", 1,0 +value1 = scalar, U16, 1426, "value", 1,0 +errorRate = scalar, F32, 1428, "ratio", 1,0 ; total TS size = 1432 -lambdaCurrentlyGood = bits, U32, 1432, [0:0] -lambdaMonitorCut = bits, U32, 1432, [1:1] -lambdaTimeSinceGood = scalar, U16, 1436, "sec", 0.01, 0 -; total TS size = 1440 +vvtTarget = scalar, U16, 1432, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1434, "%", 0.5, 0 +; total TS size = 1436 +lambdaCurrentlyGood = bits, U32, 1436, [0:0] +lambdaMonitorCut = bits, U32, 1436, [1:1] +lambdaTimeSinceGood = scalar, U16, 1440, "sec", 0.01, 0 +; total TS size = 1444 time = { timeNow } @@ -5196,6 +5197,7 @@ entry = brakePedalState, "Brake switch", int, "%d" entry = startStopState, "startStopState", int, "%d" entry = startStopPhysicalState, "startStopPhysicalState", int, "%d" entry = startStopStateToggleCounter, "startStopStateToggleCounter", int, "%d" +entry = startStopStateTempPhysicalCounter, "startStopStateTempPhysicalCounter", int, "%d" entry = egtValue1, "egtValue1", float, "%.3f" entry = egtValue2, "egtValue2", float, "%.3f" entry = desiredRpmLimit, "User-defined RPM hard limit", int, "%d" @@ -6079,13 +6081,14 @@ dialog = engine_stateDialog, "engine_state" graphLine = brakePedalState graphLine = startStopState graphLine = startStopStateToggleCounter - graphLine = egtValue1 + graphLine = startStopStateTempPhysicalCounter liveGraph = engine_state_5_Graph, "Graph", South + graphLine = egtValue1 graphLine = egtValue2 graphLine = desiredRpmLimit graphLine = fuelInjectionCounter - graphLine = sparkCounter liveGraph = engine_state_6_Graph, "Graph", South + graphLine = sparkCounter graphLine = fuelingLoad graphLine = ignitionLoad graphLine = veTableYAxis @@ -6421,8 +6424,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" ; cam if ; two-stroke, or ; not crank trigger and ((vague trigger and cam choice) or not vague trigger) - field = "Cam Sensor (Primary channel)", triggerInputPins1, 1, {twoStroke == 1 || ( !(trigger_type == 2 || trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 21 || trigger_type == 26 || trigger_type == 27 || trigger_type == 33 || trigger_type == 38 || trigger_type == 39 || trigger_type == 44 || trigger_type == 45 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 58 || trigger_type == 61 || trigger_type == 62 || trigger_type == 68 || trigger_type == 70 || trigger_type == 71 || trigger_type == 72 || trigger_type == 74 || trigger_type == 75 || trigger_type == 76 || trigger_type == 77 || trigger_type == 79) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) ) ) } - field = "Crank Sensor (Primary channel)", triggerInputPins1, 1, { !(twoStroke == 1 || ( !(trigger_type == 2 || trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 21 || trigger_type == 26 || trigger_type == 27 || trigger_type == 33 || trigger_type == 38 || trigger_type == 39 || trigger_type == 44 || trigger_type == 45 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 58 || trigger_type == 61 || trigger_type == 62 || trigger_type == 68 || trigger_type == 70 || trigger_type == 71 || trigger_type == 72 || trigger_type == 74 || trigger_type == 75 || trigger_type == 76 || trigger_type == 77 || trigger_type == 79) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) ) )) } + field = "Cam Sensor (Primary channel)", triggerInputPins1, 1, {twoStroke == 1 || ( !(trigger_type == 2 || trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 21 || trigger_type == 26 || trigger_type == 27 || trigger_type == 33 || trigger_type == 38 || trigger_type == 39 || trigger_type == 44 || trigger_type == 45 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 58 || trigger_type == 61 || trigger_type == 62 || trigger_type == 68 || trigger_type == 70 || trigger_type == 71 || trigger_type == 72 || trigger_type == 74 || trigger_type == 75 || trigger_type == 76 || trigger_type == 77) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) ) ) } + field = "Crank Sensor (Primary channel)", triggerInputPins1, 1, { !(twoStroke == 1 || ( !(trigger_type == 2 || trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 21 || trigger_type == 26 || trigger_type == 27 || trigger_type == 33 || trigger_type == 38 || trigger_type == 39 || trigger_type == 44 || trigger_type == 45 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 58 || trigger_type == 61 || trigger_type == 62 || trigger_type == 68 || trigger_type == 70 || trigger_type == 71 || trigger_type == 72 || trigger_type == 74 || trigger_type == 75 || trigger_type == 76 || trigger_type == 77) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) ) )) } field = "Invert Primary", invertPrimaryTriggerSignal field = "Secondary channel", triggerInputPins2, { triggerInputPins2 != 0 || (triggerInputPins1 != 0 && (trigger_type == 1 || trigger_type == 3 || trigger_type == 15 || trigger_type == 16 || trigger_type == 19 || trigger_type == 25 || trigger_type == 28 || trigger_type == 31 || trigger_type == 35 || trigger_type == 36 || trigger_type == 37 || trigger_type == 40 || trigger_type == 49 || trigger_type == 50 || trigger_type == 53 || trigger_type == 54 || trigger_type == 63 || trigger_type == 64) ) } field = "Invert Secondary", invertSecondaryTriggerSignal, {triggerInputPins2 != 0 && (trigger_type == 1 || trigger_type == 3 || trigger_type == 15 || trigger_type == 16 || trigger_type == 19 || trigger_type == 25 || trigger_type == 28 || trigger_type == 31 || trigger_type == 35 || trigger_type == 36 || trigger_type == 37 || trigger_type == 40 || trigger_type == 49 || trigger_type == 50 || trigger_type == 53 || trigger_type == 54 || trigger_type == 63 || trigger_type == 64) } @@ -8534,7 +8537,7 @@ dialog = tcuControls, "Transmission Settings" field = "D2 Tachometer Output 5V/12V Pull-Up", boardUseTachPullUp field = "A15/A16 Temperature Inputs Pull-Up", boardUseTempPullUp field = "A8 Crank+ Input Pull-Up", boardUseCrankPullUp - field = "С21 2-step input Pull-Down", boardUse2stepPullDown + field = "C21 2-step input Pull-Down", boardUse2stepPullDown field = "A23 CAM Hall Input Pull-Down", boardUseCamPullDown field = "B14 Digital Input 2 Pull-Down", boardUseD2PullDown field = "B15 Digital Input 3 Pull-Down", boardUseD3PullDown diff --git a/firmware/tunerstudio/generated/rusefi_at_start_f435.ini b/firmware/tunerstudio/generated/rusefi_at_start_f435.ini index 08c562b01b..e351923f79 100644 --- a/firmware/tunerstudio/generated/rusefi_at_start_f435.ini +++ b/firmware/tunerstudio/generated/rusefi_at_start_f435.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.11.08.at_start_f435.914902541" + signature = "rusEFI master.2023.11.09.at_start_f435.634710875" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.11.08.at_start_f435.914902541" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.11.09.at_start_f435.634710875" ; 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 @@ -92,7 +92,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.jar based on (unknown script) integration/rusefi_config.txt Wed Nov 08 20:03:58 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Thu Nov 09 02:08:20 UTC 2023 pageSize = 23880 page = 1 @@ -2347,7 +2347,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23870, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1440 + ochBlockSize = 1444 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3001,136 +3001,137 @@ brakePedalState = scalar, S08, 1092, "", 1, 0 startStopState = scalar, S08, 1093, "", 1, 0 startStopPhysicalState = bits, U32, 1096, [0:0] startStopStateToggleCounter = scalar, U32, 1100, "", 1, 0 -egtValue1 = scalar, F32, 1104, "", 1, 0 -egtValue2 = scalar, F32, 1108, "", 1, 0 -desiredRpmLimit = scalar, S16, 1112, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1116, "", 1, 0 -sparkCounter = scalar, U32, 1120, "", 1, 0 -fuelingLoad = scalar, F32, 1124, "", 1, 0 -ignitionLoad = scalar, F32, 1128, "", 1, 0 -veTableYAxis = scalar, U16, 1132, "%", 0.01, 0 -; total TS size = 1136 -tpsFrom = scalar, F32, 1136 -tpsTo = scalar, F32, 1140 -deltaTps = scalar, F32, 1144 -extraFuel = scalar, F32, 1148, "", 1, 0 -valueFromTable = scalar, F32, 1152, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1156, [0:0] -isBelowDecelThreshold = bits, U32, 1156, [1:1] -isTimeToResetAccumulator = bits, U32, 1156, [2:2] -isFractionalEnrichment = bits, U32, 1156, [3:3] -belowEpsilon = bits, U32, 1156, [4:4] -tooShort = bits, U32, 1156, [5:5] -fractionalInjFuel = scalar, F32, 1160, "", 1, 0 -accumulatedValue = scalar, F32, 1164, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1168, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1172, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1176, "", 1, 0 -cycleCnt = scalar, S32, 1180, "", 1, 0 -; total TS size = 1184 -hwEventCounters1 = scalar, U32, 1184, "", 1, 0 -hwEventCounters2 = scalar, U32, 1188, "", 1, 0 -hwEventCounters3 = scalar, U32, 1192, "", 1, 0 -hwEventCounters4 = scalar, U32, 1196, "", 1, 0 -hwEventCounters5 = scalar, U32, 1200, "", 1, 0 -hwEventCounters6 = scalar, U32, 1204, "", 1, 0 -vvtCamCounter = scalar, U32, 1208, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1212, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1216, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1220, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1221, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1224, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1228, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1232, "", 1, 0 -mapCamPrevToothAngle = scalar, F32, 1236, "deg", 1, 0 -isDecodingMapCam = bits, U32, 1240, [0:0] -; total TS size = 1244 -crankSynchronizationCounter = scalar, U32, 1244, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1248, "", 1, 0 -vvtToothDurations0 = scalar, U32, 1252, "us", 1, 0 -vvtCurrentPosition = scalar, F32, 1256, "sync: Primary Cam Position", 1, 0 -vvtToothPosition1 = scalar, F32, 1260, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition2 = scalar, F32, 1264, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition3 = scalar, F32, 1268, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition4 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio = scalar, F32, 1276, "", 1, 0 -triggerStateIndex = scalar, U08, 1280, "", 1, 0 -camResyncCounter = scalar, U08, 1281, "", 1, 0 -vvtStateIndex = scalar, U08, 1282, "", 1, 0 -; total TS size = 1284 -m_hasSynchronizedPhase = bits, U32, 1284, [0:0] +startStopStateTempPhysicalCounter = scalar, U32, 1104, "", 1, 0 +egtValue1 = scalar, F32, 1108, "", 1, 0 +egtValue2 = scalar, F32, 1112, "", 1, 0 +desiredRpmLimit = scalar, S16, 1116, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 1120, "", 1, 0 +sparkCounter = scalar, U32, 1124, "", 1, 0 +fuelingLoad = scalar, F32, 1128, "", 1, 0 +ignitionLoad = scalar, F32, 1132, "", 1, 0 +veTableYAxis = scalar, U16, 1136, "%", 0.01, 0 +; total TS size = 1140 +tpsFrom = scalar, F32, 1140 +tpsTo = scalar, F32, 1144 +deltaTps = scalar, F32, 1148 +extraFuel = scalar, F32, 1152, "", 1, 0 +valueFromTable = scalar, F32, 1156, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1160, [0:0] +isBelowDecelThreshold = bits, U32, 1160, [1:1] +isTimeToResetAccumulator = bits, U32, 1160, [2:2] +isFractionalEnrichment = bits, U32, 1160, [3:3] +belowEpsilon = bits, U32, 1160, [4:4] +tooShort = bits, U32, 1160, [5:5] +fractionalInjFuel = scalar, F32, 1164, "", 1, 0 +accumulatedValue = scalar, F32, 1168, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1172, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1176, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1180, "", 1, 0 +cycleCnt = scalar, S32, 1184, "", 1, 0 +; total TS size = 1188 +hwEventCounters1 = scalar, U32, 1188, "", 1, 0 +hwEventCounters2 = scalar, U32, 1192, "", 1, 0 +hwEventCounters3 = scalar, U32, 1196, "", 1, 0 +hwEventCounters4 = scalar, U32, 1200, "", 1, 0 +hwEventCounters5 = scalar, U32, 1204, "", 1, 0 +hwEventCounters6 = scalar, U32, 1208, "", 1, 0 +vvtCamCounter = scalar, U32, 1212, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1216, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1220, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1224, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1225, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1228, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1232, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1236, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1240, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1244, [0:0] +; total TS size = 1248 +crankSynchronizationCounter = scalar, U32, 1248, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1252, "", 1, 0 +vvtToothDurations0 = scalar, U32, 1256, "us", 1, 0 +vvtCurrentPosition = scalar, F32, 1260, "sync: Primary Cam Position", 1, 0 +vvtToothPosition1 = scalar, F32, 1264, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition2 = scalar, F32, 1268, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition3 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition4 = scalar, F32, 1276, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio = scalar, F32, 1280, "", 1, 0 +triggerStateIndex = scalar, U08, 1284, "", 1, 0 +camResyncCounter = scalar, U08, 1285, "", 1, 0 +vvtStateIndex = scalar, U08, 1286, "", 1, 0 ; total TS size = 1288 -wallFuelCorrection = scalar, F32, 1288, "", 1, 0 -wallFuel = scalar, F32, 1292, "", 1, 0 -; total TS size = 1296 -idleState = bits, S32, 1296, [0:2], "not important" -currentIdlePosition = scalar, F32, 1300 -baseIdlePosition = scalar, F32, 1304 -idleClosedLoop = scalar, F32, 1308 -iacByTpsTaper = scalar, F32, 1312 -throttlePedalUpState = scalar, S32, 1316, "", 1, 0 -mightResetPid = bits, U32, 1320, [0:0] -shouldResetPid = bits, U32, 1320, [1:1] -wasResetPid = bits, U32, 1320, [2:2] -mustResetPid = bits, U32, 1320, [3:3] -isCranking = bits, U32, 1320, [4:4] -isIacTableForCoasting = bits, U32, 1320, [5:5] -notIdling = bits, U32, 1320, [6:6] -needReset = bits, U32, 1320, [7:7] -isInDeadZone = bits, U32, 1320, [8:8] -isBlipping = bits, U32, 1320, [9:9] -useClosedLoop = bits, U32, 1320, [10:10] -badTps = bits, U32, 1320, [11:11] -looksLikeRunning = bits, U32, 1320, [12:12] -looksLikeCoasting = bits, U32, 1320, [13:13] -looksLikeCrankToIdle = bits, U32, 1320, [14:14] -isIdleCoasting = bits, U32, 1320, [15:15] -isIdleClosedLoop = bits, U32, 1320, [16:16] -idleTarget = scalar, S32, 1324, "", 1, 0 -targetRpmByClt = scalar, S32, 1328, "", 1, 0 -targetRpmAc = scalar, S32, 1332, "", 1, 0 -iacByRpmTaper = scalar, F32, 1336 -luaAdd = scalar, F32, 1340 -; total TS size = 1344 -idlePosition = scalar, F32, 1344, "per", 1,0 -trim = scalar, F32, 1348, "", 1, 0 -luaAdjustment = scalar, F32, 1352, "per", 1,0 -m_wastegatePosition = scalar, F32, 1356, "per", 1,0 -etbFeedForward = scalar, F32, 1360 -etbIntegralError = scalar, F32, 1364, "", 1, 0 -etbCurrentTarget = scalar, F32, 1368, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1372, "%", 1, 0 -etbRevLimitActive = bits, U32, 1376, [0:0] -jamDetected = bits, U32, 1376, [1:1] -etbDutyRateOfChange = scalar, F32, 1380, "per", 1,0 -etbDutyAverage = scalar, F32, 1384, "per", 1,0 -etbTpsErrorCounter = scalar, U16, 1388, "count", 1,0 -etbPpsErrorCounter = scalar, U16, 1390, "count", 1,0 -etbErrorCode = scalar, S08, 1392, "", 1, 0 -jamTimer = scalar, U16, 1394, "sec", 0.01, 0 -; total TS size = 1396 -faultCode = scalar, U08, 1396, "", 1, 0 -heaterDuty = scalar, U08, 1397, "%", 1, 0 -pumpDuty = scalar, U08, 1398, "%", 1, 0 -tempC = scalar, U16, 1400, "C", 1, 0 -nernstVoltage = scalar, U16, 1402, "V", 0.001, 0 -esr = scalar, U16, 1404, "ohm", 1, 0 -; total TS size = 1408 -dcOutput0 = scalar, F32, 1408, "per", 1,0 -isEnabled0_int = scalar, U08, 1412, "per", 1,0 -isEnabled0 = bits, U32, 1416, [0:0] -; total TS size = 1420 -value0 = scalar, U16, 1420, "value", 1,0 -value1 = scalar, U16, 1422, "value", 1,0 -errorRate = scalar, F32, 1424, "ratio", 1,0 -; total TS size = 1428 -vvtTarget = scalar, U16, 1428, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1430, "%", 0.5, 0 +m_hasSynchronizedPhase = bits, U32, 1288, [0:0] +; total TS size = 1292 +wallFuelCorrection = scalar, F32, 1292, "", 1, 0 +wallFuel = scalar, F32, 1296, "", 1, 0 +; total TS size = 1300 +idleState = bits, S32, 1300, [0:2], "not important" +currentIdlePosition = scalar, F32, 1304 +baseIdlePosition = scalar, F32, 1308 +idleClosedLoop = scalar, F32, 1312 +iacByTpsTaper = scalar, F32, 1316 +throttlePedalUpState = scalar, S32, 1320, "", 1, 0 +mightResetPid = bits, U32, 1324, [0:0] +shouldResetPid = bits, U32, 1324, [1:1] +wasResetPid = bits, U32, 1324, [2:2] +mustResetPid = bits, U32, 1324, [3:3] +isCranking = bits, U32, 1324, [4:4] +isIacTableForCoasting = bits, U32, 1324, [5:5] +notIdling = bits, U32, 1324, [6:6] +needReset = bits, U32, 1324, [7:7] +isInDeadZone = bits, U32, 1324, [8:8] +isBlipping = bits, U32, 1324, [9:9] +useClosedLoop = bits, U32, 1324, [10:10] +badTps = bits, U32, 1324, [11:11] +looksLikeRunning = bits, U32, 1324, [12:12] +looksLikeCoasting = bits, U32, 1324, [13:13] +looksLikeCrankToIdle = bits, U32, 1324, [14:14] +isIdleCoasting = bits, U32, 1324, [15:15] +isIdleClosedLoop = bits, U32, 1324, [16:16] +idleTarget = scalar, S32, 1328, "", 1, 0 +targetRpmByClt = scalar, S32, 1332, "", 1, 0 +targetRpmAc = scalar, S32, 1336, "", 1, 0 +iacByRpmTaper = scalar, F32, 1340 +luaAdd = scalar, F32, 1344 +; total TS size = 1348 +idlePosition = scalar, F32, 1348, "per", 1,0 +trim = scalar, F32, 1352, "", 1, 0 +luaAdjustment = scalar, F32, 1356, "per", 1,0 +m_wastegatePosition = scalar, F32, 1360, "per", 1,0 +etbFeedForward = scalar, F32, 1364 +etbIntegralError = scalar, F32, 1368, "", 1, 0 +etbCurrentTarget = scalar, F32, 1372, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1376, "%", 1, 0 +etbRevLimitActive = bits, U32, 1380, [0:0] +jamDetected = bits, U32, 1380, [1:1] +etbDutyRateOfChange = scalar, F32, 1384, "per", 1,0 +etbDutyAverage = scalar, F32, 1388, "per", 1,0 +etbTpsErrorCounter = scalar, U16, 1392, "count", 1,0 +etbPpsErrorCounter = scalar, U16, 1394, "count", 1,0 +etbErrorCode = scalar, S08, 1396, "", 1, 0 +jamTimer = scalar, U16, 1398, "sec", 0.01, 0 +; total TS size = 1400 +faultCode = scalar, U08, 1400, "", 1, 0 +heaterDuty = scalar, U08, 1401, "%", 1, 0 +pumpDuty = scalar, U08, 1402, "%", 1, 0 +tempC = scalar, U16, 1404, "C", 1, 0 +nernstVoltage = scalar, U16, 1406, "V", 0.001, 0 +esr = scalar, U16, 1408, "ohm", 1, 0 +; total TS size = 1412 +dcOutput0 = scalar, F32, 1412, "per", 1,0 +isEnabled0_int = scalar, U08, 1416, "per", 1,0 +isEnabled0 = bits, U32, 1420, [0:0] +; total TS size = 1424 +value0 = scalar, U16, 1424, "value", 1,0 +value1 = scalar, U16, 1426, "value", 1,0 +errorRate = scalar, F32, 1428, "ratio", 1,0 ; total TS size = 1432 -lambdaCurrentlyGood = bits, U32, 1432, [0:0] -lambdaMonitorCut = bits, U32, 1432, [1:1] -lambdaTimeSinceGood = scalar, U16, 1436, "sec", 0.01, 0 -; total TS size = 1440 +vvtTarget = scalar, U16, 1432, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1434, "%", 0.5, 0 +; total TS size = 1436 +lambdaCurrentlyGood = bits, U32, 1436, [0:0] +lambdaMonitorCut = bits, U32, 1436, [1:1] +lambdaTimeSinceGood = scalar, U16, 1440, "sec", 0.01, 0 +; total TS size = 1444 time = { timeNow } @@ -5196,6 +5197,7 @@ entry = brakePedalState, "Brake switch", int, "%d" entry = startStopState, "startStopState", int, "%d" entry = startStopPhysicalState, "startStopPhysicalState", int, "%d" entry = startStopStateToggleCounter, "startStopStateToggleCounter", int, "%d" +entry = startStopStateTempPhysicalCounter, "startStopStateTempPhysicalCounter", int, "%d" entry = egtValue1, "egtValue1", float, "%.3f" entry = egtValue2, "egtValue2", float, "%.3f" entry = desiredRpmLimit, "User-defined RPM hard limit", int, "%d" @@ -6077,13 +6079,14 @@ dialog = engine_stateDialog, "engine_state" graphLine = brakePedalState graphLine = startStopState graphLine = startStopStateToggleCounter - graphLine = egtValue1 + graphLine = startStopStateTempPhysicalCounter liveGraph = engine_state_5_Graph, "Graph", South + graphLine = egtValue1 graphLine = egtValue2 graphLine = desiredRpmLimit graphLine = fuelInjectionCounter - graphLine = sparkCounter liveGraph = engine_state_6_Graph, "Graph", South + graphLine = sparkCounter graphLine = fuelingLoad graphLine = ignitionLoad graphLine = veTableYAxis @@ -6419,8 +6422,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" ; cam if ; two-stroke, or ; not crank trigger and ((vague trigger and cam choice) or not vague trigger) - field = "Cam Sensor (Primary channel)", triggerInputPins1, 1, {twoStroke == 1 || ( !(trigger_type == 2 || trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 21 || trigger_type == 26 || trigger_type == 27 || trigger_type == 33 || trigger_type == 38 || trigger_type == 39 || trigger_type == 44 || trigger_type == 45 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 58 || trigger_type == 61 || trigger_type == 62 || trigger_type == 68 || trigger_type == 70 || trigger_type == 71 || trigger_type == 72 || trigger_type == 74 || trigger_type == 75 || trigger_type == 76 || trigger_type == 77 || trigger_type == 79) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) ) ) } - field = "Crank Sensor (Primary channel)", triggerInputPins1, 1, { !(twoStroke == 1 || ( !(trigger_type == 2 || trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 21 || trigger_type == 26 || trigger_type == 27 || trigger_type == 33 || trigger_type == 38 || trigger_type == 39 || trigger_type == 44 || trigger_type == 45 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 58 || trigger_type == 61 || trigger_type == 62 || trigger_type == 68 || trigger_type == 70 || trigger_type == 71 || trigger_type == 72 || trigger_type == 74 || trigger_type == 75 || trigger_type == 76 || trigger_type == 77 || trigger_type == 79) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) ) )) } + field = "Cam Sensor (Primary channel)", triggerInputPins1, 1, {twoStroke == 1 || ( !(trigger_type == 2 || trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 21 || trigger_type == 26 || trigger_type == 27 || trigger_type == 33 || trigger_type == 38 || trigger_type == 39 || trigger_type == 44 || trigger_type == 45 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 58 || trigger_type == 61 || trigger_type == 62 || trigger_type == 68 || trigger_type == 70 || trigger_type == 71 || trigger_type == 72 || trigger_type == 74 || trigger_type == 75 || trigger_type == 76 || trigger_type == 77) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) ) ) } + field = "Crank Sensor (Primary channel)", triggerInputPins1, 1, { !(twoStroke == 1 || ( !(trigger_type == 2 || trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 21 || trigger_type == 26 || trigger_type == 27 || trigger_type == 33 || trigger_type == 38 || trigger_type == 39 || trigger_type == 44 || trigger_type == 45 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 58 || trigger_type == 61 || trigger_type == 62 || trigger_type == 68 || trigger_type == 70 || trigger_type == 71 || trigger_type == 72 || trigger_type == 74 || trigger_type == 75 || trigger_type == 76 || trigger_type == 77) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) ) )) } field = "Invert Primary", invertPrimaryTriggerSignal field = "Secondary channel", triggerInputPins2, { triggerInputPins2 != 0 || (triggerInputPins1 != 0 && (trigger_type == 1 || trigger_type == 3 || trigger_type == 15 || trigger_type == 16 || trigger_type == 19 || trigger_type == 25 || trigger_type == 28 || trigger_type == 31 || trigger_type == 35 || trigger_type == 36 || trigger_type == 37 || trigger_type == 40 || trigger_type == 49 || trigger_type == 50 || trigger_type == 53 || trigger_type == 54 || trigger_type == 63 || trigger_type == 64) ) } field = "Invert Secondary", invertSecondaryTriggerSignal, {triggerInputPins2 != 0 && (trigger_type == 1 || trigger_type == 3 || trigger_type == 15 || trigger_type == 16 || trigger_type == 19 || trigger_type == 25 || trigger_type == 28 || trigger_type == 31 || trigger_type == 35 || trigger_type == 36 || trigger_type == 37 || trigger_type == 40 || trigger_type == 49 || trigger_type == 50 || trigger_type == 53 || trigger_type == 54 || trigger_type == 63 || trigger_type == 64) } diff --git a/firmware/tunerstudio/generated/rusefi_atlas.ini b/firmware/tunerstudio/generated/rusefi_atlas.ini index 213c8427b3..d141984d9e 100644 --- a/firmware/tunerstudio/generated/rusefi_atlas.ini +++ b/firmware/tunerstudio/generated/rusefi_atlas.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.11.08.atlas.1922013763" + signature = "rusEFI master.2023.11.09.atlas.1641234197" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.11.08.atlas.1922013763" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.11.09.atlas.1641234197" ; 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 @@ -92,7 +92,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.jar based on (unknown script) integration/rusefi_config.txt Wed Nov 08 20:03:48 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Thu Nov 09 02:08:13 UTC 2023 pageSize = 23380 page = 1 @@ -2347,7 +2347,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23370, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1440 + ochBlockSize = 1444 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3001,136 +3001,137 @@ brakePedalState = scalar, S08, 1092, "", 1, 0 startStopState = scalar, S08, 1093, "", 1, 0 startStopPhysicalState = bits, U32, 1096, [0:0] startStopStateToggleCounter = scalar, U32, 1100, "", 1, 0 -egtValue1 = scalar, F32, 1104, "", 1, 0 -egtValue2 = scalar, F32, 1108, "", 1, 0 -desiredRpmLimit = scalar, S16, 1112, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1116, "", 1, 0 -sparkCounter = scalar, U32, 1120, "", 1, 0 -fuelingLoad = scalar, F32, 1124, "", 1, 0 -ignitionLoad = scalar, F32, 1128, "", 1, 0 -veTableYAxis = scalar, U16, 1132, "%", 0.01, 0 -; total TS size = 1136 -tpsFrom = scalar, F32, 1136 -tpsTo = scalar, F32, 1140 -deltaTps = scalar, F32, 1144 -extraFuel = scalar, F32, 1148, "", 1, 0 -valueFromTable = scalar, F32, 1152, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1156, [0:0] -isBelowDecelThreshold = bits, U32, 1156, [1:1] -isTimeToResetAccumulator = bits, U32, 1156, [2:2] -isFractionalEnrichment = bits, U32, 1156, [3:3] -belowEpsilon = bits, U32, 1156, [4:4] -tooShort = bits, U32, 1156, [5:5] -fractionalInjFuel = scalar, F32, 1160, "", 1, 0 -accumulatedValue = scalar, F32, 1164, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1168, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1172, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1176, "", 1, 0 -cycleCnt = scalar, S32, 1180, "", 1, 0 -; total TS size = 1184 -hwEventCounters1 = scalar, U32, 1184, "", 1, 0 -hwEventCounters2 = scalar, U32, 1188, "", 1, 0 -hwEventCounters3 = scalar, U32, 1192, "", 1, 0 -hwEventCounters4 = scalar, U32, 1196, "", 1, 0 -hwEventCounters5 = scalar, U32, 1200, "", 1, 0 -hwEventCounters6 = scalar, U32, 1204, "", 1, 0 -vvtCamCounter = scalar, U32, 1208, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1212, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1216, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1220, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1221, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1224, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1228, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1232, "", 1, 0 -mapCamPrevToothAngle = scalar, F32, 1236, "deg", 1, 0 -isDecodingMapCam = bits, U32, 1240, [0:0] -; total TS size = 1244 -crankSynchronizationCounter = scalar, U32, 1244, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1248, "", 1, 0 -vvtToothDurations0 = scalar, U32, 1252, "us", 1, 0 -vvtCurrentPosition = scalar, F32, 1256, "sync: Primary Cam Position", 1, 0 -vvtToothPosition1 = scalar, F32, 1260, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition2 = scalar, F32, 1264, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition3 = scalar, F32, 1268, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition4 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio = scalar, F32, 1276, "", 1, 0 -triggerStateIndex = scalar, U08, 1280, "", 1, 0 -camResyncCounter = scalar, U08, 1281, "", 1, 0 -vvtStateIndex = scalar, U08, 1282, "", 1, 0 -; total TS size = 1284 -m_hasSynchronizedPhase = bits, U32, 1284, [0:0] +startStopStateTempPhysicalCounter = scalar, U32, 1104, "", 1, 0 +egtValue1 = scalar, F32, 1108, "", 1, 0 +egtValue2 = scalar, F32, 1112, "", 1, 0 +desiredRpmLimit = scalar, S16, 1116, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 1120, "", 1, 0 +sparkCounter = scalar, U32, 1124, "", 1, 0 +fuelingLoad = scalar, F32, 1128, "", 1, 0 +ignitionLoad = scalar, F32, 1132, "", 1, 0 +veTableYAxis = scalar, U16, 1136, "%", 0.01, 0 +; total TS size = 1140 +tpsFrom = scalar, F32, 1140 +tpsTo = scalar, F32, 1144 +deltaTps = scalar, F32, 1148 +extraFuel = scalar, F32, 1152, "", 1, 0 +valueFromTable = scalar, F32, 1156, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1160, [0:0] +isBelowDecelThreshold = bits, U32, 1160, [1:1] +isTimeToResetAccumulator = bits, U32, 1160, [2:2] +isFractionalEnrichment = bits, U32, 1160, [3:3] +belowEpsilon = bits, U32, 1160, [4:4] +tooShort = bits, U32, 1160, [5:5] +fractionalInjFuel = scalar, F32, 1164, "", 1, 0 +accumulatedValue = scalar, F32, 1168, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1172, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1176, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1180, "", 1, 0 +cycleCnt = scalar, S32, 1184, "", 1, 0 +; total TS size = 1188 +hwEventCounters1 = scalar, U32, 1188, "", 1, 0 +hwEventCounters2 = scalar, U32, 1192, "", 1, 0 +hwEventCounters3 = scalar, U32, 1196, "", 1, 0 +hwEventCounters4 = scalar, U32, 1200, "", 1, 0 +hwEventCounters5 = scalar, U32, 1204, "", 1, 0 +hwEventCounters6 = scalar, U32, 1208, "", 1, 0 +vvtCamCounter = scalar, U32, 1212, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1216, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1220, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1224, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1225, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1228, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1232, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1236, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1240, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1244, [0:0] +; total TS size = 1248 +crankSynchronizationCounter = scalar, U32, 1248, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1252, "", 1, 0 +vvtToothDurations0 = scalar, U32, 1256, "us", 1, 0 +vvtCurrentPosition = scalar, F32, 1260, "sync: Primary Cam Position", 1, 0 +vvtToothPosition1 = scalar, F32, 1264, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition2 = scalar, F32, 1268, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition3 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition4 = scalar, F32, 1276, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio = scalar, F32, 1280, "", 1, 0 +triggerStateIndex = scalar, U08, 1284, "", 1, 0 +camResyncCounter = scalar, U08, 1285, "", 1, 0 +vvtStateIndex = scalar, U08, 1286, "", 1, 0 ; total TS size = 1288 -wallFuelCorrection = scalar, F32, 1288, "", 1, 0 -wallFuel = scalar, F32, 1292, "", 1, 0 -; total TS size = 1296 -idleState = bits, S32, 1296, [0:2], "not important" -currentIdlePosition = scalar, F32, 1300 -baseIdlePosition = scalar, F32, 1304 -idleClosedLoop = scalar, F32, 1308 -iacByTpsTaper = scalar, F32, 1312 -throttlePedalUpState = scalar, S32, 1316, "", 1, 0 -mightResetPid = bits, U32, 1320, [0:0] -shouldResetPid = bits, U32, 1320, [1:1] -wasResetPid = bits, U32, 1320, [2:2] -mustResetPid = bits, U32, 1320, [3:3] -isCranking = bits, U32, 1320, [4:4] -isIacTableForCoasting = bits, U32, 1320, [5:5] -notIdling = bits, U32, 1320, [6:6] -needReset = bits, U32, 1320, [7:7] -isInDeadZone = bits, U32, 1320, [8:8] -isBlipping = bits, U32, 1320, [9:9] -useClosedLoop = bits, U32, 1320, [10:10] -badTps = bits, U32, 1320, [11:11] -looksLikeRunning = bits, U32, 1320, [12:12] -looksLikeCoasting = bits, U32, 1320, [13:13] -looksLikeCrankToIdle = bits, U32, 1320, [14:14] -isIdleCoasting = bits, U32, 1320, [15:15] -isIdleClosedLoop = bits, U32, 1320, [16:16] -idleTarget = scalar, S32, 1324, "", 1, 0 -targetRpmByClt = scalar, S32, 1328, "", 1, 0 -targetRpmAc = scalar, S32, 1332, "", 1, 0 -iacByRpmTaper = scalar, F32, 1336 -luaAdd = scalar, F32, 1340 -; total TS size = 1344 -idlePosition = scalar, F32, 1344, "per", 1,0 -trim = scalar, F32, 1348, "", 1, 0 -luaAdjustment = scalar, F32, 1352, "per", 1,0 -m_wastegatePosition = scalar, F32, 1356, "per", 1,0 -etbFeedForward = scalar, F32, 1360 -etbIntegralError = scalar, F32, 1364, "", 1, 0 -etbCurrentTarget = scalar, F32, 1368, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1372, "%", 1, 0 -etbRevLimitActive = bits, U32, 1376, [0:0] -jamDetected = bits, U32, 1376, [1:1] -etbDutyRateOfChange = scalar, F32, 1380, "per", 1,0 -etbDutyAverage = scalar, F32, 1384, "per", 1,0 -etbTpsErrorCounter = scalar, U16, 1388, "count", 1,0 -etbPpsErrorCounter = scalar, U16, 1390, "count", 1,0 -etbErrorCode = scalar, S08, 1392, "", 1, 0 -jamTimer = scalar, U16, 1394, "sec", 0.01, 0 -; total TS size = 1396 -faultCode = scalar, U08, 1396, "", 1, 0 -heaterDuty = scalar, U08, 1397, "%", 1, 0 -pumpDuty = scalar, U08, 1398, "%", 1, 0 -tempC = scalar, U16, 1400, "C", 1, 0 -nernstVoltage = scalar, U16, 1402, "V", 0.001, 0 -esr = scalar, U16, 1404, "ohm", 1, 0 -; total TS size = 1408 -dcOutput0 = scalar, F32, 1408, "per", 1,0 -isEnabled0_int = scalar, U08, 1412, "per", 1,0 -isEnabled0 = bits, U32, 1416, [0:0] -; total TS size = 1420 -value0 = scalar, U16, 1420, "value", 1,0 -value1 = scalar, U16, 1422, "value", 1,0 -errorRate = scalar, F32, 1424, "ratio", 1,0 -; total TS size = 1428 -vvtTarget = scalar, U16, 1428, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1430, "%", 0.5, 0 +m_hasSynchronizedPhase = bits, U32, 1288, [0:0] +; total TS size = 1292 +wallFuelCorrection = scalar, F32, 1292, "", 1, 0 +wallFuel = scalar, F32, 1296, "", 1, 0 +; total TS size = 1300 +idleState = bits, S32, 1300, [0:2], "not important" +currentIdlePosition = scalar, F32, 1304 +baseIdlePosition = scalar, F32, 1308 +idleClosedLoop = scalar, F32, 1312 +iacByTpsTaper = scalar, F32, 1316 +throttlePedalUpState = scalar, S32, 1320, "", 1, 0 +mightResetPid = bits, U32, 1324, [0:0] +shouldResetPid = bits, U32, 1324, [1:1] +wasResetPid = bits, U32, 1324, [2:2] +mustResetPid = bits, U32, 1324, [3:3] +isCranking = bits, U32, 1324, [4:4] +isIacTableForCoasting = bits, U32, 1324, [5:5] +notIdling = bits, U32, 1324, [6:6] +needReset = bits, U32, 1324, [7:7] +isInDeadZone = bits, U32, 1324, [8:8] +isBlipping = bits, U32, 1324, [9:9] +useClosedLoop = bits, U32, 1324, [10:10] +badTps = bits, U32, 1324, [11:11] +looksLikeRunning = bits, U32, 1324, [12:12] +looksLikeCoasting = bits, U32, 1324, [13:13] +looksLikeCrankToIdle = bits, U32, 1324, [14:14] +isIdleCoasting = bits, U32, 1324, [15:15] +isIdleClosedLoop = bits, U32, 1324, [16:16] +idleTarget = scalar, S32, 1328, "", 1, 0 +targetRpmByClt = scalar, S32, 1332, "", 1, 0 +targetRpmAc = scalar, S32, 1336, "", 1, 0 +iacByRpmTaper = scalar, F32, 1340 +luaAdd = scalar, F32, 1344 +; total TS size = 1348 +idlePosition = scalar, F32, 1348, "per", 1,0 +trim = scalar, F32, 1352, "", 1, 0 +luaAdjustment = scalar, F32, 1356, "per", 1,0 +m_wastegatePosition = scalar, F32, 1360, "per", 1,0 +etbFeedForward = scalar, F32, 1364 +etbIntegralError = scalar, F32, 1368, "", 1, 0 +etbCurrentTarget = scalar, F32, 1372, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1376, "%", 1, 0 +etbRevLimitActive = bits, U32, 1380, [0:0] +jamDetected = bits, U32, 1380, [1:1] +etbDutyRateOfChange = scalar, F32, 1384, "per", 1,0 +etbDutyAverage = scalar, F32, 1388, "per", 1,0 +etbTpsErrorCounter = scalar, U16, 1392, "count", 1,0 +etbPpsErrorCounter = scalar, U16, 1394, "count", 1,0 +etbErrorCode = scalar, S08, 1396, "", 1, 0 +jamTimer = scalar, U16, 1398, "sec", 0.01, 0 +; total TS size = 1400 +faultCode = scalar, U08, 1400, "", 1, 0 +heaterDuty = scalar, U08, 1401, "%", 1, 0 +pumpDuty = scalar, U08, 1402, "%", 1, 0 +tempC = scalar, U16, 1404, "C", 1, 0 +nernstVoltage = scalar, U16, 1406, "V", 0.001, 0 +esr = scalar, U16, 1408, "ohm", 1, 0 +; total TS size = 1412 +dcOutput0 = scalar, F32, 1412, "per", 1,0 +isEnabled0_int = scalar, U08, 1416, "per", 1,0 +isEnabled0 = bits, U32, 1420, [0:0] +; total TS size = 1424 +value0 = scalar, U16, 1424, "value", 1,0 +value1 = scalar, U16, 1426, "value", 1,0 +errorRate = scalar, F32, 1428, "ratio", 1,0 ; total TS size = 1432 -lambdaCurrentlyGood = bits, U32, 1432, [0:0] -lambdaMonitorCut = bits, U32, 1432, [1:1] -lambdaTimeSinceGood = scalar, U16, 1436, "sec", 0.01, 0 -; total TS size = 1440 +vvtTarget = scalar, U16, 1432, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1434, "%", 0.5, 0 +; total TS size = 1436 +lambdaCurrentlyGood = bits, U32, 1436, [0:0] +lambdaMonitorCut = bits, U32, 1436, [1:1] +lambdaTimeSinceGood = scalar, U16, 1440, "sec", 0.01, 0 +; total TS size = 1444 time = { timeNow } @@ -5196,6 +5197,7 @@ entry = brakePedalState, "Brake switch", int, "%d" entry = startStopState, "startStopState", int, "%d" entry = startStopPhysicalState, "startStopPhysicalState", int, "%d" entry = startStopStateToggleCounter, "startStopStateToggleCounter", int, "%d" +entry = startStopStateTempPhysicalCounter, "startStopStateTempPhysicalCounter", int, "%d" entry = egtValue1, "egtValue1", float, "%.3f" entry = egtValue2, "egtValue2", float, "%.3f" entry = desiredRpmLimit, "User-defined RPM hard limit", int, "%d" @@ -6077,13 +6079,14 @@ dialog = engine_stateDialog, "engine_state" graphLine = brakePedalState graphLine = startStopState graphLine = startStopStateToggleCounter - graphLine = egtValue1 + graphLine = startStopStateTempPhysicalCounter liveGraph = engine_state_5_Graph, "Graph", South + graphLine = egtValue1 graphLine = egtValue2 graphLine = desiredRpmLimit graphLine = fuelInjectionCounter - graphLine = sparkCounter liveGraph = engine_state_6_Graph, "Graph", South + graphLine = sparkCounter graphLine = fuelingLoad graphLine = ignitionLoad graphLine = veTableYAxis @@ -6419,8 +6422,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" ; cam if ; two-stroke, or ; not crank trigger and ((vague trigger and cam choice) or not vague trigger) - field = "Cam Sensor (Primary channel)", triggerInputPins1, 1, {twoStroke == 1 || ( !(trigger_type == 2 || trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 21 || trigger_type == 26 || trigger_type == 27 || trigger_type == 33 || trigger_type == 38 || trigger_type == 39 || trigger_type == 44 || trigger_type == 45 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 58 || trigger_type == 61 || trigger_type == 62 || trigger_type == 68 || trigger_type == 70 || trigger_type == 71 || trigger_type == 72 || trigger_type == 74 || trigger_type == 75 || trigger_type == 76 || trigger_type == 77 || trigger_type == 79) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) ) ) } - field = "Crank Sensor (Primary channel)", triggerInputPins1, 1, { !(twoStroke == 1 || ( !(trigger_type == 2 || trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 21 || trigger_type == 26 || trigger_type == 27 || trigger_type == 33 || trigger_type == 38 || trigger_type == 39 || trigger_type == 44 || trigger_type == 45 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 58 || trigger_type == 61 || trigger_type == 62 || trigger_type == 68 || trigger_type == 70 || trigger_type == 71 || trigger_type == 72 || trigger_type == 74 || trigger_type == 75 || trigger_type == 76 || trigger_type == 77 || trigger_type == 79) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) ) )) } + field = "Cam Sensor (Primary channel)", triggerInputPins1, 1, {twoStroke == 1 || ( !(trigger_type == 2 || trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 21 || trigger_type == 26 || trigger_type == 27 || trigger_type == 33 || trigger_type == 38 || trigger_type == 39 || trigger_type == 44 || trigger_type == 45 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 58 || trigger_type == 61 || trigger_type == 62 || trigger_type == 68 || trigger_type == 70 || trigger_type == 71 || trigger_type == 72 || trigger_type == 74 || trigger_type == 75 || trigger_type == 76 || trigger_type == 77) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) ) ) } + field = "Crank Sensor (Primary channel)", triggerInputPins1, 1, { !(twoStroke == 1 || ( !(trigger_type == 2 || trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 21 || trigger_type == 26 || trigger_type == 27 || trigger_type == 33 || trigger_type == 38 || trigger_type == 39 || trigger_type == 44 || trigger_type == 45 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 58 || trigger_type == 61 || trigger_type == 62 || trigger_type == 68 || trigger_type == 70 || trigger_type == 71 || trigger_type == 72 || trigger_type == 74 || trigger_type == 75 || trigger_type == 76 || trigger_type == 77) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) ) )) } field = "Invert Primary", invertPrimaryTriggerSignal field = "Secondary channel", triggerInputPins2, { triggerInputPins2 != 0 || (triggerInputPins1 != 0 && (trigger_type == 1 || trigger_type == 3 || trigger_type == 15 || trigger_type == 16 || trigger_type == 19 || trigger_type == 25 || trigger_type == 28 || trigger_type == 31 || trigger_type == 35 || trigger_type == 36 || trigger_type == 37 || trigger_type == 40 || trigger_type == 49 || trigger_type == 50 || trigger_type == 53 || trigger_type == 54 || trigger_type == 63 || trigger_type == 64) ) } field = "Invert Secondary", invertSecondaryTriggerSignal, {triggerInputPins2 != 0 && (trigger_type == 1 || trigger_type == 3 || trigger_type == 15 || trigger_type == 16 || trigger_type == 19 || trigger_type == 25 || trigger_type == 28 || trigger_type == 31 || trigger_type == 35 || trigger_type == 36 || trigger_type == 37 || trigger_type == 40 || trigger_type == 49 || trigger_type == 50 || trigger_type == 53 || trigger_type == 54 || trigger_type == 63 || trigger_type == 64) } diff --git a/firmware/tunerstudio/generated/rusefi_core8.ini b/firmware/tunerstudio/generated/rusefi_core8.ini index 4c14ce63f3..48a9420774 100644 --- a/firmware/tunerstudio/generated/rusefi_core8.ini +++ b/firmware/tunerstudio/generated/rusefi_core8.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.11.08.core8.246367163" + signature = "rusEFI master.2023.11.09.core8.502523629" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.11.08.core8.246367163" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.11.09.core8.502523629" ; 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 @@ -92,7 +92,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","On-board Battery Sense (A0)","Analog Inputs 1 (A1)","Analog Inputs 2 (A2)","Analog Inputs 3 (A3)","Analog Inputs 4 (A4)","On-board MAP (A5)","Analog Inputs 6 (A6)","Analog Inputs 7 (A7)","On-board BARO (B0)","Analog Inputs 9 (B1)","Analog Inputs 10 (C0)","Primary On-board O2 (C1)","Secondary On-board O2 (C2)","Analog Inputs 13 (C3)","Analog Inputs 14 (C4)","Analog Inputs 15 (C5)" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Nov 08 20:03:00 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Thu Nov 09 02:07:39 UTC 2023 pageSize = 23880 page = 1 @@ -2347,7 +2347,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23870, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1440 + ochBlockSize = 1444 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3001,136 +3001,137 @@ brakePedalState = scalar, S08, 1092, "", 1, 0 startStopState = scalar, S08, 1093, "", 1, 0 startStopPhysicalState = bits, U32, 1096, [0:0] startStopStateToggleCounter = scalar, U32, 1100, "", 1, 0 -egtValue1 = scalar, F32, 1104, "", 1, 0 -egtValue2 = scalar, F32, 1108, "", 1, 0 -desiredRpmLimit = scalar, S16, 1112, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1116, "", 1, 0 -sparkCounter = scalar, U32, 1120, "", 1, 0 -fuelingLoad = scalar, F32, 1124, "", 1, 0 -ignitionLoad = scalar, F32, 1128, "", 1, 0 -veTableYAxis = scalar, U16, 1132, "%", 0.01, 0 -; total TS size = 1136 -tpsFrom = scalar, F32, 1136 -tpsTo = scalar, F32, 1140 -deltaTps = scalar, F32, 1144 -extraFuel = scalar, F32, 1148, "", 1, 0 -valueFromTable = scalar, F32, 1152, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1156, [0:0] -isBelowDecelThreshold = bits, U32, 1156, [1:1] -isTimeToResetAccumulator = bits, U32, 1156, [2:2] -isFractionalEnrichment = bits, U32, 1156, [3:3] -belowEpsilon = bits, U32, 1156, [4:4] -tooShort = bits, U32, 1156, [5:5] -fractionalInjFuel = scalar, F32, 1160, "", 1, 0 -accumulatedValue = scalar, F32, 1164, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1168, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1172, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1176, "", 1, 0 -cycleCnt = scalar, S32, 1180, "", 1, 0 -; total TS size = 1184 -hwEventCounters1 = scalar, U32, 1184, "", 1, 0 -hwEventCounters2 = scalar, U32, 1188, "", 1, 0 -hwEventCounters3 = scalar, U32, 1192, "", 1, 0 -hwEventCounters4 = scalar, U32, 1196, "", 1, 0 -hwEventCounters5 = scalar, U32, 1200, "", 1, 0 -hwEventCounters6 = scalar, U32, 1204, "", 1, 0 -vvtCamCounter = scalar, U32, 1208, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1212, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1216, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1220, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1221, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1224, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1228, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1232, "", 1, 0 -mapCamPrevToothAngle = scalar, F32, 1236, "deg", 1, 0 -isDecodingMapCam = bits, U32, 1240, [0:0] -; total TS size = 1244 -crankSynchronizationCounter = scalar, U32, 1244, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1248, "", 1, 0 -vvtToothDurations0 = scalar, U32, 1252, "us", 1, 0 -vvtCurrentPosition = scalar, F32, 1256, "sync: Primary Cam Position", 1, 0 -vvtToothPosition1 = scalar, F32, 1260, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition2 = scalar, F32, 1264, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition3 = scalar, F32, 1268, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition4 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio = scalar, F32, 1276, "", 1, 0 -triggerStateIndex = scalar, U08, 1280, "", 1, 0 -camResyncCounter = scalar, U08, 1281, "", 1, 0 -vvtStateIndex = scalar, U08, 1282, "", 1, 0 -; total TS size = 1284 -m_hasSynchronizedPhase = bits, U32, 1284, [0:0] +startStopStateTempPhysicalCounter = scalar, U32, 1104, "", 1, 0 +egtValue1 = scalar, F32, 1108, "", 1, 0 +egtValue2 = scalar, F32, 1112, "", 1, 0 +desiredRpmLimit = scalar, S16, 1116, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 1120, "", 1, 0 +sparkCounter = scalar, U32, 1124, "", 1, 0 +fuelingLoad = scalar, F32, 1128, "", 1, 0 +ignitionLoad = scalar, F32, 1132, "", 1, 0 +veTableYAxis = scalar, U16, 1136, "%", 0.01, 0 +; total TS size = 1140 +tpsFrom = scalar, F32, 1140 +tpsTo = scalar, F32, 1144 +deltaTps = scalar, F32, 1148 +extraFuel = scalar, F32, 1152, "", 1, 0 +valueFromTable = scalar, F32, 1156, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1160, [0:0] +isBelowDecelThreshold = bits, U32, 1160, [1:1] +isTimeToResetAccumulator = bits, U32, 1160, [2:2] +isFractionalEnrichment = bits, U32, 1160, [3:3] +belowEpsilon = bits, U32, 1160, [4:4] +tooShort = bits, U32, 1160, [5:5] +fractionalInjFuel = scalar, F32, 1164, "", 1, 0 +accumulatedValue = scalar, F32, 1168, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1172, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1176, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1180, "", 1, 0 +cycleCnt = scalar, S32, 1184, "", 1, 0 +; total TS size = 1188 +hwEventCounters1 = scalar, U32, 1188, "", 1, 0 +hwEventCounters2 = scalar, U32, 1192, "", 1, 0 +hwEventCounters3 = scalar, U32, 1196, "", 1, 0 +hwEventCounters4 = scalar, U32, 1200, "", 1, 0 +hwEventCounters5 = scalar, U32, 1204, "", 1, 0 +hwEventCounters6 = scalar, U32, 1208, "", 1, 0 +vvtCamCounter = scalar, U32, 1212, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1216, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1220, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1224, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1225, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1228, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1232, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1236, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1240, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1244, [0:0] +; total TS size = 1248 +crankSynchronizationCounter = scalar, U32, 1248, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1252, "", 1, 0 +vvtToothDurations0 = scalar, U32, 1256, "us", 1, 0 +vvtCurrentPosition = scalar, F32, 1260, "sync: Primary Cam Position", 1, 0 +vvtToothPosition1 = scalar, F32, 1264, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition2 = scalar, F32, 1268, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition3 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition4 = scalar, F32, 1276, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio = scalar, F32, 1280, "", 1, 0 +triggerStateIndex = scalar, U08, 1284, "", 1, 0 +camResyncCounter = scalar, U08, 1285, "", 1, 0 +vvtStateIndex = scalar, U08, 1286, "", 1, 0 ; total TS size = 1288 -wallFuelCorrection = scalar, F32, 1288, "", 1, 0 -wallFuel = scalar, F32, 1292, "", 1, 0 -; total TS size = 1296 -idleState = bits, S32, 1296, [0:2], "not important" -currentIdlePosition = scalar, F32, 1300 -baseIdlePosition = scalar, F32, 1304 -idleClosedLoop = scalar, F32, 1308 -iacByTpsTaper = scalar, F32, 1312 -throttlePedalUpState = scalar, S32, 1316, "", 1, 0 -mightResetPid = bits, U32, 1320, [0:0] -shouldResetPid = bits, U32, 1320, [1:1] -wasResetPid = bits, U32, 1320, [2:2] -mustResetPid = bits, U32, 1320, [3:3] -isCranking = bits, U32, 1320, [4:4] -isIacTableForCoasting = bits, U32, 1320, [5:5] -notIdling = bits, U32, 1320, [6:6] -needReset = bits, U32, 1320, [7:7] -isInDeadZone = bits, U32, 1320, [8:8] -isBlipping = bits, U32, 1320, [9:9] -useClosedLoop = bits, U32, 1320, [10:10] -badTps = bits, U32, 1320, [11:11] -looksLikeRunning = bits, U32, 1320, [12:12] -looksLikeCoasting = bits, U32, 1320, [13:13] -looksLikeCrankToIdle = bits, U32, 1320, [14:14] -isIdleCoasting = bits, U32, 1320, [15:15] -isIdleClosedLoop = bits, U32, 1320, [16:16] -idleTarget = scalar, S32, 1324, "", 1, 0 -targetRpmByClt = scalar, S32, 1328, "", 1, 0 -targetRpmAc = scalar, S32, 1332, "", 1, 0 -iacByRpmTaper = scalar, F32, 1336 -luaAdd = scalar, F32, 1340 -; total TS size = 1344 -idlePosition = scalar, F32, 1344, "per", 1,0 -trim = scalar, F32, 1348, "", 1, 0 -luaAdjustment = scalar, F32, 1352, "per", 1,0 -m_wastegatePosition = scalar, F32, 1356, "per", 1,0 -etbFeedForward = scalar, F32, 1360 -etbIntegralError = scalar, F32, 1364, "", 1, 0 -etbCurrentTarget = scalar, F32, 1368, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1372, "%", 1, 0 -etbRevLimitActive = bits, U32, 1376, [0:0] -jamDetected = bits, U32, 1376, [1:1] -etbDutyRateOfChange = scalar, F32, 1380, "per", 1,0 -etbDutyAverage = scalar, F32, 1384, "per", 1,0 -etbTpsErrorCounter = scalar, U16, 1388, "count", 1,0 -etbPpsErrorCounter = scalar, U16, 1390, "count", 1,0 -etbErrorCode = scalar, S08, 1392, "", 1, 0 -jamTimer = scalar, U16, 1394, "sec", 0.01, 0 -; total TS size = 1396 -faultCode = scalar, U08, 1396, "", 1, 0 -heaterDuty = scalar, U08, 1397, "%", 1, 0 -pumpDuty = scalar, U08, 1398, "%", 1, 0 -tempC = scalar, U16, 1400, "C", 1, 0 -nernstVoltage = scalar, U16, 1402, "V", 0.001, 0 -esr = scalar, U16, 1404, "ohm", 1, 0 -; total TS size = 1408 -dcOutput0 = scalar, F32, 1408, "per", 1,0 -isEnabled0_int = scalar, U08, 1412, "per", 1,0 -isEnabled0 = bits, U32, 1416, [0:0] -; total TS size = 1420 -value0 = scalar, U16, 1420, "value", 1,0 -value1 = scalar, U16, 1422, "value", 1,0 -errorRate = scalar, F32, 1424, "ratio", 1,0 -; total TS size = 1428 -vvtTarget = scalar, U16, 1428, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1430, "%", 0.5, 0 +m_hasSynchronizedPhase = bits, U32, 1288, [0:0] +; total TS size = 1292 +wallFuelCorrection = scalar, F32, 1292, "", 1, 0 +wallFuel = scalar, F32, 1296, "", 1, 0 +; total TS size = 1300 +idleState = bits, S32, 1300, [0:2], "not important" +currentIdlePosition = scalar, F32, 1304 +baseIdlePosition = scalar, F32, 1308 +idleClosedLoop = scalar, F32, 1312 +iacByTpsTaper = scalar, F32, 1316 +throttlePedalUpState = scalar, S32, 1320, "", 1, 0 +mightResetPid = bits, U32, 1324, [0:0] +shouldResetPid = bits, U32, 1324, [1:1] +wasResetPid = bits, U32, 1324, [2:2] +mustResetPid = bits, U32, 1324, [3:3] +isCranking = bits, U32, 1324, [4:4] +isIacTableForCoasting = bits, U32, 1324, [5:5] +notIdling = bits, U32, 1324, [6:6] +needReset = bits, U32, 1324, [7:7] +isInDeadZone = bits, U32, 1324, [8:8] +isBlipping = bits, U32, 1324, [9:9] +useClosedLoop = bits, U32, 1324, [10:10] +badTps = bits, U32, 1324, [11:11] +looksLikeRunning = bits, U32, 1324, [12:12] +looksLikeCoasting = bits, U32, 1324, [13:13] +looksLikeCrankToIdle = bits, U32, 1324, [14:14] +isIdleCoasting = bits, U32, 1324, [15:15] +isIdleClosedLoop = bits, U32, 1324, [16:16] +idleTarget = scalar, S32, 1328, "", 1, 0 +targetRpmByClt = scalar, S32, 1332, "", 1, 0 +targetRpmAc = scalar, S32, 1336, "", 1, 0 +iacByRpmTaper = scalar, F32, 1340 +luaAdd = scalar, F32, 1344 +; total TS size = 1348 +idlePosition = scalar, F32, 1348, "per", 1,0 +trim = scalar, F32, 1352, "", 1, 0 +luaAdjustment = scalar, F32, 1356, "per", 1,0 +m_wastegatePosition = scalar, F32, 1360, "per", 1,0 +etbFeedForward = scalar, F32, 1364 +etbIntegralError = scalar, F32, 1368, "", 1, 0 +etbCurrentTarget = scalar, F32, 1372, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1376, "%", 1, 0 +etbRevLimitActive = bits, U32, 1380, [0:0] +jamDetected = bits, U32, 1380, [1:1] +etbDutyRateOfChange = scalar, F32, 1384, "per", 1,0 +etbDutyAverage = scalar, F32, 1388, "per", 1,0 +etbTpsErrorCounter = scalar, U16, 1392, "count", 1,0 +etbPpsErrorCounter = scalar, U16, 1394, "count", 1,0 +etbErrorCode = scalar, S08, 1396, "", 1, 0 +jamTimer = scalar, U16, 1398, "sec", 0.01, 0 +; total TS size = 1400 +faultCode = scalar, U08, 1400, "", 1, 0 +heaterDuty = scalar, U08, 1401, "%", 1, 0 +pumpDuty = scalar, U08, 1402, "%", 1, 0 +tempC = scalar, U16, 1404, "C", 1, 0 +nernstVoltage = scalar, U16, 1406, "V", 0.001, 0 +esr = scalar, U16, 1408, "ohm", 1, 0 +; total TS size = 1412 +dcOutput0 = scalar, F32, 1412, "per", 1,0 +isEnabled0_int = scalar, U08, 1416, "per", 1,0 +isEnabled0 = bits, U32, 1420, [0:0] +; total TS size = 1424 +value0 = scalar, U16, 1424, "value", 1,0 +value1 = scalar, U16, 1426, "value", 1,0 +errorRate = scalar, F32, 1428, "ratio", 1,0 ; total TS size = 1432 -lambdaCurrentlyGood = bits, U32, 1432, [0:0] -lambdaMonitorCut = bits, U32, 1432, [1:1] -lambdaTimeSinceGood = scalar, U16, 1436, "sec", 0.01, 0 -; total TS size = 1440 +vvtTarget = scalar, U16, 1432, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1434, "%", 0.5, 0 +; total TS size = 1436 +lambdaCurrentlyGood = bits, U32, 1436, [0:0] +lambdaMonitorCut = bits, U32, 1436, [1:1] +lambdaTimeSinceGood = scalar, U16, 1440, "sec", 0.01, 0 +; total TS size = 1444 time = { timeNow } @@ -5196,6 +5197,7 @@ entry = brakePedalState, "Brake switch", int, "%d" entry = startStopState, "startStopState", int, "%d" entry = startStopPhysicalState, "startStopPhysicalState", int, "%d" entry = startStopStateToggleCounter, "startStopStateToggleCounter", int, "%d" +entry = startStopStateTempPhysicalCounter, "startStopStateTempPhysicalCounter", int, "%d" entry = egtValue1, "egtValue1", float, "%.3f" entry = egtValue2, "egtValue2", float, "%.3f" entry = desiredRpmLimit, "User-defined RPM hard limit", int, "%d" @@ -6079,13 +6081,14 @@ dialog = engine_stateDialog, "engine_state" graphLine = brakePedalState graphLine = startStopState graphLine = startStopStateToggleCounter - graphLine = egtValue1 + graphLine = startStopStateTempPhysicalCounter liveGraph = engine_state_5_Graph, "Graph", South + graphLine = egtValue1 graphLine = egtValue2 graphLine = desiredRpmLimit graphLine = fuelInjectionCounter - graphLine = sparkCounter liveGraph = engine_state_6_Graph, "Graph", South + graphLine = sparkCounter graphLine = fuelingLoad graphLine = ignitionLoad graphLine = veTableYAxis @@ -6421,8 +6424,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" ; cam if ; two-stroke, or ; not crank trigger and ((vague trigger and cam choice) or not vague trigger) - field = "Cam Sensor (Primary channel)", triggerInputPins1, 1, {twoStroke == 1 || ( !(trigger_type == 2 || trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 21 || trigger_type == 26 || trigger_type == 27 || trigger_type == 33 || trigger_type == 38 || trigger_type == 39 || trigger_type == 44 || trigger_type == 45 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 58 || trigger_type == 61 || trigger_type == 62 || trigger_type == 68 || trigger_type == 70 || trigger_type == 71 || trigger_type == 72 || trigger_type == 74 || trigger_type == 75 || trigger_type == 76 || trigger_type == 77 || trigger_type == 79) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) ) ) } - field = "Crank Sensor (Primary channel)", triggerInputPins1, 1, { !(twoStroke == 1 || ( !(trigger_type == 2 || trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 21 || trigger_type == 26 || trigger_type == 27 || trigger_type == 33 || trigger_type == 38 || trigger_type == 39 || trigger_type == 44 || trigger_type == 45 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 58 || trigger_type == 61 || trigger_type == 62 || trigger_type == 68 || trigger_type == 70 || trigger_type == 71 || trigger_type == 72 || trigger_type == 74 || trigger_type == 75 || trigger_type == 76 || trigger_type == 77 || trigger_type == 79) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) ) )) } + field = "Cam Sensor (Primary channel)", triggerInputPins1, 1, {twoStroke == 1 || ( !(trigger_type == 2 || trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 21 || trigger_type == 26 || trigger_type == 27 || trigger_type == 33 || trigger_type == 38 || trigger_type == 39 || trigger_type == 44 || trigger_type == 45 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 58 || trigger_type == 61 || trigger_type == 62 || trigger_type == 68 || trigger_type == 70 || trigger_type == 71 || trigger_type == 72 || trigger_type == 74 || trigger_type == 75 || trigger_type == 76 || trigger_type == 77) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) ) ) } + field = "Crank Sensor (Primary channel)", triggerInputPins1, 1, { !(twoStroke == 1 || ( !(trigger_type == 2 || trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 21 || trigger_type == 26 || trigger_type == 27 || trigger_type == 33 || trigger_type == 38 || trigger_type == 39 || trigger_type == 44 || trigger_type == 45 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 58 || trigger_type == 61 || trigger_type == 62 || trigger_type == 68 || trigger_type == 70 || trigger_type == 71 || trigger_type == 72 || trigger_type == 74 || trigger_type == 75 || trigger_type == 76 || trigger_type == 77) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) ) )) } field = "Invert Primary", invertPrimaryTriggerSignal field = "Secondary channel", triggerInputPins2, { triggerInputPins2 != 0 || (triggerInputPins1 != 0 && (trigger_type == 1 || trigger_type == 3 || trigger_type == 15 || trigger_type == 16 || trigger_type == 19 || trigger_type == 25 || trigger_type == 28 || trigger_type == 31 || trigger_type == 35 || trigger_type == 36 || trigger_type == 37 || trigger_type == 40 || trigger_type == 49 || trigger_type == 50 || trigger_type == 53 || trigger_type == 54 || trigger_type == 63 || trigger_type == 64) ) } field = "Invert Secondary", invertSecondaryTriggerSignal, {triggerInputPins2 != 0 && (trigger_type == 1 || trigger_type == 3 || trigger_type == 15 || trigger_type == 16 || trigger_type == 19 || trigger_type == 25 || trigger_type == 28 || trigger_type == 31 || trigger_type == 35 || trigger_type == 36 || trigger_type == 37 || trigger_type == 40 || trigger_type == 49 || trigger_type == 50 || trigger_type == 53 || trigger_type == 54 || trigger_type == 63 || trigger_type == 64) } diff --git a/firmware/tunerstudio/generated/rusefi_cypress.ini b/firmware/tunerstudio/generated/rusefi_cypress.ini index 4d88f5827b..2a1ecde41a 100644 --- a/firmware/tunerstudio/generated/rusefi_cypress.ini +++ b/firmware/tunerstudio/generated/rusefi_cypress.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.11.08.cypress.914902541" + signature = "rusEFI master.2023.11.09.cypress.634710875" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.11.08.cypress.914902541" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.11.09.cypress.634710875" ; 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 @@ -92,7 +92,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.jar based on (unknown script) integration/rusefi_config.txt Wed Nov 08 20:01:26 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Thu Nov 09 02:06:34 UTC 2023 pageSize = 23880 page = 1 @@ -2347,7 +2347,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23870, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1440 + ochBlockSize = 1444 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3001,136 +3001,137 @@ brakePedalState = scalar, S08, 1092, "", 1, 0 startStopState = scalar, S08, 1093, "", 1, 0 startStopPhysicalState = bits, U32, 1096, [0:0] startStopStateToggleCounter = scalar, U32, 1100, "", 1, 0 -egtValue1 = scalar, F32, 1104, "", 1, 0 -egtValue2 = scalar, F32, 1108, "", 1, 0 -desiredRpmLimit = scalar, S16, 1112, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1116, "", 1, 0 -sparkCounter = scalar, U32, 1120, "", 1, 0 -fuelingLoad = scalar, F32, 1124, "", 1, 0 -ignitionLoad = scalar, F32, 1128, "", 1, 0 -veTableYAxis = scalar, U16, 1132, "%", 0.01, 0 -; total TS size = 1136 -tpsFrom = scalar, F32, 1136 -tpsTo = scalar, F32, 1140 -deltaTps = scalar, F32, 1144 -extraFuel = scalar, F32, 1148, "", 1, 0 -valueFromTable = scalar, F32, 1152, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1156, [0:0] -isBelowDecelThreshold = bits, U32, 1156, [1:1] -isTimeToResetAccumulator = bits, U32, 1156, [2:2] -isFractionalEnrichment = bits, U32, 1156, [3:3] -belowEpsilon = bits, U32, 1156, [4:4] -tooShort = bits, U32, 1156, [5:5] -fractionalInjFuel = scalar, F32, 1160, "", 1, 0 -accumulatedValue = scalar, F32, 1164, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1168, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1172, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1176, "", 1, 0 -cycleCnt = scalar, S32, 1180, "", 1, 0 -; total TS size = 1184 -hwEventCounters1 = scalar, U32, 1184, "", 1, 0 -hwEventCounters2 = scalar, U32, 1188, "", 1, 0 -hwEventCounters3 = scalar, U32, 1192, "", 1, 0 -hwEventCounters4 = scalar, U32, 1196, "", 1, 0 -hwEventCounters5 = scalar, U32, 1200, "", 1, 0 -hwEventCounters6 = scalar, U32, 1204, "", 1, 0 -vvtCamCounter = scalar, U32, 1208, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1212, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1216, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1220, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1221, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1224, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1228, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1232, "", 1, 0 -mapCamPrevToothAngle = scalar, F32, 1236, "deg", 1, 0 -isDecodingMapCam = bits, U32, 1240, [0:0] -; total TS size = 1244 -crankSynchronizationCounter = scalar, U32, 1244, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1248, "", 1, 0 -vvtToothDurations0 = scalar, U32, 1252, "us", 1, 0 -vvtCurrentPosition = scalar, F32, 1256, "sync: Primary Cam Position", 1, 0 -vvtToothPosition1 = scalar, F32, 1260, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition2 = scalar, F32, 1264, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition3 = scalar, F32, 1268, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition4 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio = scalar, F32, 1276, "", 1, 0 -triggerStateIndex = scalar, U08, 1280, "", 1, 0 -camResyncCounter = scalar, U08, 1281, "", 1, 0 -vvtStateIndex = scalar, U08, 1282, "", 1, 0 -; total TS size = 1284 -m_hasSynchronizedPhase = bits, U32, 1284, [0:0] +startStopStateTempPhysicalCounter = scalar, U32, 1104, "", 1, 0 +egtValue1 = scalar, F32, 1108, "", 1, 0 +egtValue2 = scalar, F32, 1112, "", 1, 0 +desiredRpmLimit = scalar, S16, 1116, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 1120, "", 1, 0 +sparkCounter = scalar, U32, 1124, "", 1, 0 +fuelingLoad = scalar, F32, 1128, "", 1, 0 +ignitionLoad = scalar, F32, 1132, "", 1, 0 +veTableYAxis = scalar, U16, 1136, "%", 0.01, 0 +; total TS size = 1140 +tpsFrom = scalar, F32, 1140 +tpsTo = scalar, F32, 1144 +deltaTps = scalar, F32, 1148 +extraFuel = scalar, F32, 1152, "", 1, 0 +valueFromTable = scalar, F32, 1156, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1160, [0:0] +isBelowDecelThreshold = bits, U32, 1160, [1:1] +isTimeToResetAccumulator = bits, U32, 1160, [2:2] +isFractionalEnrichment = bits, U32, 1160, [3:3] +belowEpsilon = bits, U32, 1160, [4:4] +tooShort = bits, U32, 1160, [5:5] +fractionalInjFuel = scalar, F32, 1164, "", 1, 0 +accumulatedValue = scalar, F32, 1168, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1172, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1176, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1180, "", 1, 0 +cycleCnt = scalar, S32, 1184, "", 1, 0 +; total TS size = 1188 +hwEventCounters1 = scalar, U32, 1188, "", 1, 0 +hwEventCounters2 = scalar, U32, 1192, "", 1, 0 +hwEventCounters3 = scalar, U32, 1196, "", 1, 0 +hwEventCounters4 = scalar, U32, 1200, "", 1, 0 +hwEventCounters5 = scalar, U32, 1204, "", 1, 0 +hwEventCounters6 = scalar, U32, 1208, "", 1, 0 +vvtCamCounter = scalar, U32, 1212, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1216, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1220, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1224, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1225, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1228, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1232, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1236, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1240, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1244, [0:0] +; total TS size = 1248 +crankSynchronizationCounter = scalar, U32, 1248, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1252, "", 1, 0 +vvtToothDurations0 = scalar, U32, 1256, "us", 1, 0 +vvtCurrentPosition = scalar, F32, 1260, "sync: Primary Cam Position", 1, 0 +vvtToothPosition1 = scalar, F32, 1264, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition2 = scalar, F32, 1268, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition3 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition4 = scalar, F32, 1276, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio = scalar, F32, 1280, "", 1, 0 +triggerStateIndex = scalar, U08, 1284, "", 1, 0 +camResyncCounter = scalar, U08, 1285, "", 1, 0 +vvtStateIndex = scalar, U08, 1286, "", 1, 0 ; total TS size = 1288 -wallFuelCorrection = scalar, F32, 1288, "", 1, 0 -wallFuel = scalar, F32, 1292, "", 1, 0 -; total TS size = 1296 -idleState = bits, S32, 1296, [0:2], "not important" -currentIdlePosition = scalar, F32, 1300 -baseIdlePosition = scalar, F32, 1304 -idleClosedLoop = scalar, F32, 1308 -iacByTpsTaper = scalar, F32, 1312 -throttlePedalUpState = scalar, S32, 1316, "", 1, 0 -mightResetPid = bits, U32, 1320, [0:0] -shouldResetPid = bits, U32, 1320, [1:1] -wasResetPid = bits, U32, 1320, [2:2] -mustResetPid = bits, U32, 1320, [3:3] -isCranking = bits, U32, 1320, [4:4] -isIacTableForCoasting = bits, U32, 1320, [5:5] -notIdling = bits, U32, 1320, [6:6] -needReset = bits, U32, 1320, [7:7] -isInDeadZone = bits, U32, 1320, [8:8] -isBlipping = bits, U32, 1320, [9:9] -useClosedLoop = bits, U32, 1320, [10:10] -badTps = bits, U32, 1320, [11:11] -looksLikeRunning = bits, U32, 1320, [12:12] -looksLikeCoasting = bits, U32, 1320, [13:13] -looksLikeCrankToIdle = bits, U32, 1320, [14:14] -isIdleCoasting = bits, U32, 1320, [15:15] -isIdleClosedLoop = bits, U32, 1320, [16:16] -idleTarget = scalar, S32, 1324, "", 1, 0 -targetRpmByClt = scalar, S32, 1328, "", 1, 0 -targetRpmAc = scalar, S32, 1332, "", 1, 0 -iacByRpmTaper = scalar, F32, 1336 -luaAdd = scalar, F32, 1340 -; total TS size = 1344 -idlePosition = scalar, F32, 1344, "per", 1,0 -trim = scalar, F32, 1348, "", 1, 0 -luaAdjustment = scalar, F32, 1352, "per", 1,0 -m_wastegatePosition = scalar, F32, 1356, "per", 1,0 -etbFeedForward = scalar, F32, 1360 -etbIntegralError = scalar, F32, 1364, "", 1, 0 -etbCurrentTarget = scalar, F32, 1368, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1372, "%", 1, 0 -etbRevLimitActive = bits, U32, 1376, [0:0] -jamDetected = bits, U32, 1376, [1:1] -etbDutyRateOfChange = scalar, F32, 1380, "per", 1,0 -etbDutyAverage = scalar, F32, 1384, "per", 1,0 -etbTpsErrorCounter = scalar, U16, 1388, "count", 1,0 -etbPpsErrorCounter = scalar, U16, 1390, "count", 1,0 -etbErrorCode = scalar, S08, 1392, "", 1, 0 -jamTimer = scalar, U16, 1394, "sec", 0.01, 0 -; total TS size = 1396 -faultCode = scalar, U08, 1396, "", 1, 0 -heaterDuty = scalar, U08, 1397, "%", 1, 0 -pumpDuty = scalar, U08, 1398, "%", 1, 0 -tempC = scalar, U16, 1400, "C", 1, 0 -nernstVoltage = scalar, U16, 1402, "V", 0.001, 0 -esr = scalar, U16, 1404, "ohm", 1, 0 -; total TS size = 1408 -dcOutput0 = scalar, F32, 1408, "per", 1,0 -isEnabled0_int = scalar, U08, 1412, "per", 1,0 -isEnabled0 = bits, U32, 1416, [0:0] -; total TS size = 1420 -value0 = scalar, U16, 1420, "value", 1,0 -value1 = scalar, U16, 1422, "value", 1,0 -errorRate = scalar, F32, 1424, "ratio", 1,0 -; total TS size = 1428 -vvtTarget = scalar, U16, 1428, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1430, "%", 0.5, 0 +m_hasSynchronizedPhase = bits, U32, 1288, [0:0] +; total TS size = 1292 +wallFuelCorrection = scalar, F32, 1292, "", 1, 0 +wallFuel = scalar, F32, 1296, "", 1, 0 +; total TS size = 1300 +idleState = bits, S32, 1300, [0:2], "not important" +currentIdlePosition = scalar, F32, 1304 +baseIdlePosition = scalar, F32, 1308 +idleClosedLoop = scalar, F32, 1312 +iacByTpsTaper = scalar, F32, 1316 +throttlePedalUpState = scalar, S32, 1320, "", 1, 0 +mightResetPid = bits, U32, 1324, [0:0] +shouldResetPid = bits, U32, 1324, [1:1] +wasResetPid = bits, U32, 1324, [2:2] +mustResetPid = bits, U32, 1324, [3:3] +isCranking = bits, U32, 1324, [4:4] +isIacTableForCoasting = bits, U32, 1324, [5:5] +notIdling = bits, U32, 1324, [6:6] +needReset = bits, U32, 1324, [7:7] +isInDeadZone = bits, U32, 1324, [8:8] +isBlipping = bits, U32, 1324, [9:9] +useClosedLoop = bits, U32, 1324, [10:10] +badTps = bits, U32, 1324, [11:11] +looksLikeRunning = bits, U32, 1324, [12:12] +looksLikeCoasting = bits, U32, 1324, [13:13] +looksLikeCrankToIdle = bits, U32, 1324, [14:14] +isIdleCoasting = bits, U32, 1324, [15:15] +isIdleClosedLoop = bits, U32, 1324, [16:16] +idleTarget = scalar, S32, 1328, "", 1, 0 +targetRpmByClt = scalar, S32, 1332, "", 1, 0 +targetRpmAc = scalar, S32, 1336, "", 1, 0 +iacByRpmTaper = scalar, F32, 1340 +luaAdd = scalar, F32, 1344 +; total TS size = 1348 +idlePosition = scalar, F32, 1348, "per", 1,0 +trim = scalar, F32, 1352, "", 1, 0 +luaAdjustment = scalar, F32, 1356, "per", 1,0 +m_wastegatePosition = scalar, F32, 1360, "per", 1,0 +etbFeedForward = scalar, F32, 1364 +etbIntegralError = scalar, F32, 1368, "", 1, 0 +etbCurrentTarget = scalar, F32, 1372, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1376, "%", 1, 0 +etbRevLimitActive = bits, U32, 1380, [0:0] +jamDetected = bits, U32, 1380, [1:1] +etbDutyRateOfChange = scalar, F32, 1384, "per", 1,0 +etbDutyAverage = scalar, F32, 1388, "per", 1,0 +etbTpsErrorCounter = scalar, U16, 1392, "count", 1,0 +etbPpsErrorCounter = scalar, U16, 1394, "count", 1,0 +etbErrorCode = scalar, S08, 1396, "", 1, 0 +jamTimer = scalar, U16, 1398, "sec", 0.01, 0 +; total TS size = 1400 +faultCode = scalar, U08, 1400, "", 1, 0 +heaterDuty = scalar, U08, 1401, "%", 1, 0 +pumpDuty = scalar, U08, 1402, "%", 1, 0 +tempC = scalar, U16, 1404, "C", 1, 0 +nernstVoltage = scalar, U16, 1406, "V", 0.001, 0 +esr = scalar, U16, 1408, "ohm", 1, 0 +; total TS size = 1412 +dcOutput0 = scalar, F32, 1412, "per", 1,0 +isEnabled0_int = scalar, U08, 1416, "per", 1,0 +isEnabled0 = bits, U32, 1420, [0:0] +; total TS size = 1424 +value0 = scalar, U16, 1424, "value", 1,0 +value1 = scalar, U16, 1426, "value", 1,0 +errorRate = scalar, F32, 1428, "ratio", 1,0 ; total TS size = 1432 -lambdaCurrentlyGood = bits, U32, 1432, [0:0] -lambdaMonitorCut = bits, U32, 1432, [1:1] -lambdaTimeSinceGood = scalar, U16, 1436, "sec", 0.01, 0 -; total TS size = 1440 +vvtTarget = scalar, U16, 1432, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1434, "%", 0.5, 0 +; total TS size = 1436 +lambdaCurrentlyGood = bits, U32, 1436, [0:0] +lambdaMonitorCut = bits, U32, 1436, [1:1] +lambdaTimeSinceGood = scalar, U16, 1440, "sec", 0.01, 0 +; total TS size = 1444 time = { timeNow } @@ -5196,6 +5197,7 @@ entry = brakePedalState, "Brake switch", int, "%d" entry = startStopState, "startStopState", int, "%d" entry = startStopPhysicalState, "startStopPhysicalState", int, "%d" entry = startStopStateToggleCounter, "startStopStateToggleCounter", int, "%d" +entry = startStopStateTempPhysicalCounter, "startStopStateTempPhysicalCounter", int, "%d" entry = egtValue1, "egtValue1", float, "%.3f" entry = egtValue2, "egtValue2", float, "%.3f" entry = desiredRpmLimit, "User-defined RPM hard limit", int, "%d" @@ -6077,13 +6079,14 @@ dialog = engine_stateDialog, "engine_state" graphLine = brakePedalState graphLine = startStopState graphLine = startStopStateToggleCounter - graphLine = egtValue1 + graphLine = startStopStateTempPhysicalCounter liveGraph = engine_state_5_Graph, "Graph", South + graphLine = egtValue1 graphLine = egtValue2 graphLine = desiredRpmLimit graphLine = fuelInjectionCounter - graphLine = sparkCounter liveGraph = engine_state_6_Graph, "Graph", South + graphLine = sparkCounter graphLine = fuelingLoad graphLine = ignitionLoad graphLine = veTableYAxis @@ -6419,8 +6422,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" ; cam if ; two-stroke, or ; not crank trigger and ((vague trigger and cam choice) or not vague trigger) - field = "Cam Sensor (Primary channel)", triggerInputPins1, 1, {twoStroke == 1 || ( !(trigger_type == 2 || trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 21 || trigger_type == 26 || trigger_type == 27 || trigger_type == 33 || trigger_type == 38 || trigger_type == 39 || trigger_type == 44 || trigger_type == 45 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 58 || trigger_type == 61 || trigger_type == 62 || trigger_type == 68 || trigger_type == 70 || trigger_type == 71 || trigger_type == 72 || trigger_type == 74 || trigger_type == 75 || trigger_type == 76 || trigger_type == 77 || trigger_type == 79) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) ) ) } - field = "Crank Sensor (Primary channel)", triggerInputPins1, 1, { !(twoStroke == 1 || ( !(trigger_type == 2 || trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 21 || trigger_type == 26 || trigger_type == 27 || trigger_type == 33 || trigger_type == 38 || trigger_type == 39 || trigger_type == 44 || trigger_type == 45 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 58 || trigger_type == 61 || trigger_type == 62 || trigger_type == 68 || trigger_type == 70 || trigger_type == 71 || trigger_type == 72 || trigger_type == 74 || trigger_type == 75 || trigger_type == 76 || trigger_type == 77 || trigger_type == 79) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) ) )) } + field = "Cam Sensor (Primary channel)", triggerInputPins1, 1, {twoStroke == 1 || ( !(trigger_type == 2 || trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 21 || trigger_type == 26 || trigger_type == 27 || trigger_type == 33 || trigger_type == 38 || trigger_type == 39 || trigger_type == 44 || trigger_type == 45 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 58 || trigger_type == 61 || trigger_type == 62 || trigger_type == 68 || trigger_type == 70 || trigger_type == 71 || trigger_type == 72 || trigger_type == 74 || trigger_type == 75 || trigger_type == 76 || trigger_type == 77) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) ) ) } + field = "Crank Sensor (Primary channel)", triggerInputPins1, 1, { !(twoStroke == 1 || ( !(trigger_type == 2 || trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 21 || trigger_type == 26 || trigger_type == 27 || trigger_type == 33 || trigger_type == 38 || trigger_type == 39 || trigger_type == 44 || trigger_type == 45 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 58 || trigger_type == 61 || trigger_type == 62 || trigger_type == 68 || trigger_type == 70 || trigger_type == 71 || trigger_type == 72 || trigger_type == 74 || trigger_type == 75 || trigger_type == 76 || trigger_type == 77) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) ) )) } field = "Invert Primary", invertPrimaryTriggerSignal field = "Secondary channel", triggerInputPins2, { triggerInputPins2 != 0 || (triggerInputPins1 != 0 && (trigger_type == 1 || trigger_type == 3 || trigger_type == 15 || trigger_type == 16 || trigger_type == 19 || trigger_type == 25 || trigger_type == 28 || trigger_type == 31 || trigger_type == 35 || trigger_type == 36 || trigger_type == 37 || trigger_type == 40 || trigger_type == 49 || trigger_type == 50 || trigger_type == 53 || trigger_type == 54 || trigger_type == 63 || trigger_type == 64) ) } field = "Invert Secondary", invertSecondaryTriggerSignal, {triggerInputPins2 != 0 && (trigger_type == 1 || trigger_type == 3 || trigger_type == 15 || trigger_type == 16 || trigger_type == 19 || trigger_type == 25 || trigger_type == 28 || trigger_type == 31 || trigger_type == 35 || trigger_type == 36 || trigger_type == 37 || trigger_type == 40 || trigger_type == 49 || trigger_type == 50 || trigger_type == 53 || trigger_type == 54 || trigger_type == 63 || trigger_type == 64) } diff --git a/firmware/tunerstudio/generated/rusefi_f407-discovery.ini b/firmware/tunerstudio/generated/rusefi_f407-discovery.ini index a3322f16ad..8d8df8d5b1 100644 --- a/firmware/tunerstudio/generated/rusefi_f407-discovery.ini +++ b/firmware/tunerstudio/generated/rusefi_f407-discovery.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.11.08.f407-discovery.2509298742" + signature = "rusEFI master.2023.11.09.f407-discovery.2261547360" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.11.08.f407-discovery.2509298742" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.11.09.f407-discovery.2261547360" ; 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 @@ -92,7 +92,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.jar based on (unknown script) integration/rusefi_config.txt Wed Nov 08 20:03:55 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Thu Nov 09 02:08:17 UTC 2023 pageSize = 23880 page = 1 @@ -2347,7 +2347,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23870, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1440 + ochBlockSize = 1444 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3001,136 +3001,137 @@ brakePedalState = scalar, S08, 1092, "", 1, 0 startStopState = scalar, S08, 1093, "", 1, 0 startStopPhysicalState = bits, U32, 1096, [0:0] startStopStateToggleCounter = scalar, U32, 1100, "", 1, 0 -egtValue1 = scalar, F32, 1104, "", 1, 0 -egtValue2 = scalar, F32, 1108, "", 1, 0 -desiredRpmLimit = scalar, S16, 1112, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1116, "", 1, 0 -sparkCounter = scalar, U32, 1120, "", 1, 0 -fuelingLoad = scalar, F32, 1124, "", 1, 0 -ignitionLoad = scalar, F32, 1128, "", 1, 0 -veTableYAxis = scalar, U16, 1132, "%", 0.01, 0 -; total TS size = 1136 -tpsFrom = scalar, F32, 1136 -tpsTo = scalar, F32, 1140 -deltaTps = scalar, F32, 1144 -extraFuel = scalar, F32, 1148, "", 1, 0 -valueFromTable = scalar, F32, 1152, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1156, [0:0] -isBelowDecelThreshold = bits, U32, 1156, [1:1] -isTimeToResetAccumulator = bits, U32, 1156, [2:2] -isFractionalEnrichment = bits, U32, 1156, [3:3] -belowEpsilon = bits, U32, 1156, [4:4] -tooShort = bits, U32, 1156, [5:5] -fractionalInjFuel = scalar, F32, 1160, "", 1, 0 -accumulatedValue = scalar, F32, 1164, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1168, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1172, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1176, "", 1, 0 -cycleCnt = scalar, S32, 1180, "", 1, 0 -; total TS size = 1184 -hwEventCounters1 = scalar, U32, 1184, "", 1, 0 -hwEventCounters2 = scalar, U32, 1188, "", 1, 0 -hwEventCounters3 = scalar, U32, 1192, "", 1, 0 -hwEventCounters4 = scalar, U32, 1196, "", 1, 0 -hwEventCounters5 = scalar, U32, 1200, "", 1, 0 -hwEventCounters6 = scalar, U32, 1204, "", 1, 0 -vvtCamCounter = scalar, U32, 1208, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1212, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1216, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1220, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1221, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1224, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1228, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1232, "", 1, 0 -mapCamPrevToothAngle = scalar, F32, 1236, "deg", 1, 0 -isDecodingMapCam = bits, U32, 1240, [0:0] -; total TS size = 1244 -crankSynchronizationCounter = scalar, U32, 1244, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1248, "", 1, 0 -vvtToothDurations0 = scalar, U32, 1252, "us", 1, 0 -vvtCurrentPosition = scalar, F32, 1256, "sync: Primary Cam Position", 1, 0 -vvtToothPosition1 = scalar, F32, 1260, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition2 = scalar, F32, 1264, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition3 = scalar, F32, 1268, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition4 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio = scalar, F32, 1276, "", 1, 0 -triggerStateIndex = scalar, U08, 1280, "", 1, 0 -camResyncCounter = scalar, U08, 1281, "", 1, 0 -vvtStateIndex = scalar, U08, 1282, "", 1, 0 -; total TS size = 1284 -m_hasSynchronizedPhase = bits, U32, 1284, [0:0] +startStopStateTempPhysicalCounter = scalar, U32, 1104, "", 1, 0 +egtValue1 = scalar, F32, 1108, "", 1, 0 +egtValue2 = scalar, F32, 1112, "", 1, 0 +desiredRpmLimit = scalar, S16, 1116, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 1120, "", 1, 0 +sparkCounter = scalar, U32, 1124, "", 1, 0 +fuelingLoad = scalar, F32, 1128, "", 1, 0 +ignitionLoad = scalar, F32, 1132, "", 1, 0 +veTableYAxis = scalar, U16, 1136, "%", 0.01, 0 +; total TS size = 1140 +tpsFrom = scalar, F32, 1140 +tpsTo = scalar, F32, 1144 +deltaTps = scalar, F32, 1148 +extraFuel = scalar, F32, 1152, "", 1, 0 +valueFromTable = scalar, F32, 1156, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1160, [0:0] +isBelowDecelThreshold = bits, U32, 1160, [1:1] +isTimeToResetAccumulator = bits, U32, 1160, [2:2] +isFractionalEnrichment = bits, U32, 1160, [3:3] +belowEpsilon = bits, U32, 1160, [4:4] +tooShort = bits, U32, 1160, [5:5] +fractionalInjFuel = scalar, F32, 1164, "", 1, 0 +accumulatedValue = scalar, F32, 1168, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1172, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1176, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1180, "", 1, 0 +cycleCnt = scalar, S32, 1184, "", 1, 0 +; total TS size = 1188 +hwEventCounters1 = scalar, U32, 1188, "", 1, 0 +hwEventCounters2 = scalar, U32, 1192, "", 1, 0 +hwEventCounters3 = scalar, U32, 1196, "", 1, 0 +hwEventCounters4 = scalar, U32, 1200, "", 1, 0 +hwEventCounters5 = scalar, U32, 1204, "", 1, 0 +hwEventCounters6 = scalar, U32, 1208, "", 1, 0 +vvtCamCounter = scalar, U32, 1212, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1216, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1220, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1224, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1225, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1228, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1232, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1236, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1240, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1244, [0:0] +; total TS size = 1248 +crankSynchronizationCounter = scalar, U32, 1248, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1252, "", 1, 0 +vvtToothDurations0 = scalar, U32, 1256, "us", 1, 0 +vvtCurrentPosition = scalar, F32, 1260, "sync: Primary Cam Position", 1, 0 +vvtToothPosition1 = scalar, F32, 1264, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition2 = scalar, F32, 1268, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition3 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition4 = scalar, F32, 1276, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio = scalar, F32, 1280, "", 1, 0 +triggerStateIndex = scalar, U08, 1284, "", 1, 0 +camResyncCounter = scalar, U08, 1285, "", 1, 0 +vvtStateIndex = scalar, U08, 1286, "", 1, 0 ; total TS size = 1288 -wallFuelCorrection = scalar, F32, 1288, "", 1, 0 -wallFuel = scalar, F32, 1292, "", 1, 0 -; total TS size = 1296 -idleState = bits, S32, 1296, [0:2], "not important" -currentIdlePosition = scalar, F32, 1300 -baseIdlePosition = scalar, F32, 1304 -idleClosedLoop = scalar, F32, 1308 -iacByTpsTaper = scalar, F32, 1312 -throttlePedalUpState = scalar, S32, 1316, "", 1, 0 -mightResetPid = bits, U32, 1320, [0:0] -shouldResetPid = bits, U32, 1320, [1:1] -wasResetPid = bits, U32, 1320, [2:2] -mustResetPid = bits, U32, 1320, [3:3] -isCranking = bits, U32, 1320, [4:4] -isIacTableForCoasting = bits, U32, 1320, [5:5] -notIdling = bits, U32, 1320, [6:6] -needReset = bits, U32, 1320, [7:7] -isInDeadZone = bits, U32, 1320, [8:8] -isBlipping = bits, U32, 1320, [9:9] -useClosedLoop = bits, U32, 1320, [10:10] -badTps = bits, U32, 1320, [11:11] -looksLikeRunning = bits, U32, 1320, [12:12] -looksLikeCoasting = bits, U32, 1320, [13:13] -looksLikeCrankToIdle = bits, U32, 1320, [14:14] -isIdleCoasting = bits, U32, 1320, [15:15] -isIdleClosedLoop = bits, U32, 1320, [16:16] -idleTarget = scalar, S32, 1324, "", 1, 0 -targetRpmByClt = scalar, S32, 1328, "", 1, 0 -targetRpmAc = scalar, S32, 1332, "", 1, 0 -iacByRpmTaper = scalar, F32, 1336 -luaAdd = scalar, F32, 1340 -; total TS size = 1344 -idlePosition = scalar, F32, 1344, "per", 1,0 -trim = scalar, F32, 1348, "", 1, 0 -luaAdjustment = scalar, F32, 1352, "per", 1,0 -m_wastegatePosition = scalar, F32, 1356, "per", 1,0 -etbFeedForward = scalar, F32, 1360 -etbIntegralError = scalar, F32, 1364, "", 1, 0 -etbCurrentTarget = scalar, F32, 1368, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1372, "%", 1, 0 -etbRevLimitActive = bits, U32, 1376, [0:0] -jamDetected = bits, U32, 1376, [1:1] -etbDutyRateOfChange = scalar, F32, 1380, "per", 1,0 -etbDutyAverage = scalar, F32, 1384, "per", 1,0 -etbTpsErrorCounter = scalar, U16, 1388, "count", 1,0 -etbPpsErrorCounter = scalar, U16, 1390, "count", 1,0 -etbErrorCode = scalar, S08, 1392, "", 1, 0 -jamTimer = scalar, U16, 1394, "sec", 0.01, 0 -; total TS size = 1396 -faultCode = scalar, U08, 1396, "", 1, 0 -heaterDuty = scalar, U08, 1397, "%", 1, 0 -pumpDuty = scalar, U08, 1398, "%", 1, 0 -tempC = scalar, U16, 1400, "C", 1, 0 -nernstVoltage = scalar, U16, 1402, "V", 0.001, 0 -esr = scalar, U16, 1404, "ohm", 1, 0 -; total TS size = 1408 -dcOutput0 = scalar, F32, 1408, "per", 1,0 -isEnabled0_int = scalar, U08, 1412, "per", 1,0 -isEnabled0 = bits, U32, 1416, [0:0] -; total TS size = 1420 -value0 = scalar, U16, 1420, "value", 1,0 -value1 = scalar, U16, 1422, "value", 1,0 -errorRate = scalar, F32, 1424, "ratio", 1,0 -; total TS size = 1428 -vvtTarget = scalar, U16, 1428, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1430, "%", 0.5, 0 +m_hasSynchronizedPhase = bits, U32, 1288, [0:0] +; total TS size = 1292 +wallFuelCorrection = scalar, F32, 1292, "", 1, 0 +wallFuel = scalar, F32, 1296, "", 1, 0 +; total TS size = 1300 +idleState = bits, S32, 1300, [0:2], "not important" +currentIdlePosition = scalar, F32, 1304 +baseIdlePosition = scalar, F32, 1308 +idleClosedLoop = scalar, F32, 1312 +iacByTpsTaper = scalar, F32, 1316 +throttlePedalUpState = scalar, S32, 1320, "", 1, 0 +mightResetPid = bits, U32, 1324, [0:0] +shouldResetPid = bits, U32, 1324, [1:1] +wasResetPid = bits, U32, 1324, [2:2] +mustResetPid = bits, U32, 1324, [3:3] +isCranking = bits, U32, 1324, [4:4] +isIacTableForCoasting = bits, U32, 1324, [5:5] +notIdling = bits, U32, 1324, [6:6] +needReset = bits, U32, 1324, [7:7] +isInDeadZone = bits, U32, 1324, [8:8] +isBlipping = bits, U32, 1324, [9:9] +useClosedLoop = bits, U32, 1324, [10:10] +badTps = bits, U32, 1324, [11:11] +looksLikeRunning = bits, U32, 1324, [12:12] +looksLikeCoasting = bits, U32, 1324, [13:13] +looksLikeCrankToIdle = bits, U32, 1324, [14:14] +isIdleCoasting = bits, U32, 1324, [15:15] +isIdleClosedLoop = bits, U32, 1324, [16:16] +idleTarget = scalar, S32, 1328, "", 1, 0 +targetRpmByClt = scalar, S32, 1332, "", 1, 0 +targetRpmAc = scalar, S32, 1336, "", 1, 0 +iacByRpmTaper = scalar, F32, 1340 +luaAdd = scalar, F32, 1344 +; total TS size = 1348 +idlePosition = scalar, F32, 1348, "per", 1,0 +trim = scalar, F32, 1352, "", 1, 0 +luaAdjustment = scalar, F32, 1356, "per", 1,0 +m_wastegatePosition = scalar, F32, 1360, "per", 1,0 +etbFeedForward = scalar, F32, 1364 +etbIntegralError = scalar, F32, 1368, "", 1, 0 +etbCurrentTarget = scalar, F32, 1372, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1376, "%", 1, 0 +etbRevLimitActive = bits, U32, 1380, [0:0] +jamDetected = bits, U32, 1380, [1:1] +etbDutyRateOfChange = scalar, F32, 1384, "per", 1,0 +etbDutyAverage = scalar, F32, 1388, "per", 1,0 +etbTpsErrorCounter = scalar, U16, 1392, "count", 1,0 +etbPpsErrorCounter = scalar, U16, 1394, "count", 1,0 +etbErrorCode = scalar, S08, 1396, "", 1, 0 +jamTimer = scalar, U16, 1398, "sec", 0.01, 0 +; total TS size = 1400 +faultCode = scalar, U08, 1400, "", 1, 0 +heaterDuty = scalar, U08, 1401, "%", 1, 0 +pumpDuty = scalar, U08, 1402, "%", 1, 0 +tempC = scalar, U16, 1404, "C", 1, 0 +nernstVoltage = scalar, U16, 1406, "V", 0.001, 0 +esr = scalar, U16, 1408, "ohm", 1, 0 +; total TS size = 1412 +dcOutput0 = scalar, F32, 1412, "per", 1,0 +isEnabled0_int = scalar, U08, 1416, "per", 1,0 +isEnabled0 = bits, U32, 1420, [0:0] +; total TS size = 1424 +value0 = scalar, U16, 1424, "value", 1,0 +value1 = scalar, U16, 1426, "value", 1,0 +errorRate = scalar, F32, 1428, "ratio", 1,0 ; total TS size = 1432 -lambdaCurrentlyGood = bits, U32, 1432, [0:0] -lambdaMonitorCut = bits, U32, 1432, [1:1] -lambdaTimeSinceGood = scalar, U16, 1436, "sec", 0.01, 0 -; total TS size = 1440 +vvtTarget = scalar, U16, 1432, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1434, "%", 0.5, 0 +; total TS size = 1436 +lambdaCurrentlyGood = bits, U32, 1436, [0:0] +lambdaMonitorCut = bits, U32, 1436, [1:1] +lambdaTimeSinceGood = scalar, U16, 1440, "sec", 0.01, 0 +; total TS size = 1444 time = { timeNow } @@ -5196,6 +5197,7 @@ entry = brakePedalState, "Brake switch", int, "%d" entry = startStopState, "startStopState", int, "%d" entry = startStopPhysicalState, "startStopPhysicalState", int, "%d" entry = startStopStateToggleCounter, "startStopStateToggleCounter", int, "%d" +entry = startStopStateTempPhysicalCounter, "startStopStateTempPhysicalCounter", int, "%d" entry = egtValue1, "egtValue1", float, "%.3f" entry = egtValue2, "egtValue2", float, "%.3f" entry = desiredRpmLimit, "User-defined RPM hard limit", int, "%d" @@ -6079,13 +6081,14 @@ dialog = engine_stateDialog, "engine_state" graphLine = brakePedalState graphLine = startStopState graphLine = startStopStateToggleCounter - graphLine = egtValue1 + graphLine = startStopStateTempPhysicalCounter liveGraph = engine_state_5_Graph, "Graph", South + graphLine = egtValue1 graphLine = egtValue2 graphLine = desiredRpmLimit graphLine = fuelInjectionCounter - graphLine = sparkCounter liveGraph = engine_state_6_Graph, "Graph", South + graphLine = sparkCounter graphLine = fuelingLoad graphLine = ignitionLoad graphLine = veTableYAxis @@ -6421,8 +6424,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" ; cam if ; two-stroke, or ; not crank trigger and ((vague trigger and cam choice) or not vague trigger) - field = "Cam Sensor (Primary channel)", triggerInputPins1, 1, {twoStroke == 1 || ( !(trigger_type == 2 || trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 21 || trigger_type == 26 || trigger_type == 27 || trigger_type == 33 || trigger_type == 38 || trigger_type == 39 || trigger_type == 44 || trigger_type == 45 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 58 || trigger_type == 61 || trigger_type == 62 || trigger_type == 68 || trigger_type == 70 || trigger_type == 71 || trigger_type == 72 || trigger_type == 74 || trigger_type == 75 || trigger_type == 76 || trigger_type == 77 || trigger_type == 79) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) ) ) } - field = "Crank Sensor (Primary channel)", triggerInputPins1, 1, { !(twoStroke == 1 || ( !(trigger_type == 2 || trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 21 || trigger_type == 26 || trigger_type == 27 || trigger_type == 33 || trigger_type == 38 || trigger_type == 39 || trigger_type == 44 || trigger_type == 45 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 58 || trigger_type == 61 || trigger_type == 62 || trigger_type == 68 || trigger_type == 70 || trigger_type == 71 || trigger_type == 72 || trigger_type == 74 || trigger_type == 75 || trigger_type == 76 || trigger_type == 77 || trigger_type == 79) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) ) )) } + field = "Cam Sensor (Primary channel)", triggerInputPins1, 1, {twoStroke == 1 || ( !(trigger_type == 2 || trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 21 || trigger_type == 26 || trigger_type == 27 || trigger_type == 33 || trigger_type == 38 || trigger_type == 39 || trigger_type == 44 || trigger_type == 45 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 58 || trigger_type == 61 || trigger_type == 62 || trigger_type == 68 || trigger_type == 70 || trigger_type == 71 || trigger_type == 72 || trigger_type == 74 || trigger_type == 75 || trigger_type == 76 || trigger_type == 77) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) ) ) } + field = "Crank Sensor (Primary channel)", triggerInputPins1, 1, { !(twoStroke == 1 || ( !(trigger_type == 2 || trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 21 || trigger_type == 26 || trigger_type == 27 || trigger_type == 33 || trigger_type == 38 || trigger_type == 39 || trigger_type == 44 || trigger_type == 45 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 58 || trigger_type == 61 || trigger_type == 62 || trigger_type == 68 || trigger_type == 70 || trigger_type == 71 || trigger_type == 72 || trigger_type == 74 || trigger_type == 75 || trigger_type == 76 || trigger_type == 77) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) ) )) } field = "Invert Primary", invertPrimaryTriggerSignal field = "Secondary channel", triggerInputPins2, { triggerInputPins2 != 0 || (triggerInputPins1 != 0 && (trigger_type == 1 || trigger_type == 3 || trigger_type == 15 || trigger_type == 16 || trigger_type == 19 || trigger_type == 25 || trigger_type == 28 || trigger_type == 31 || trigger_type == 35 || trigger_type == 36 || trigger_type == 37 || trigger_type == 40 || trigger_type == 49 || trigger_type == 50 || trigger_type == 53 || trigger_type == 54 || trigger_type == 63 || trigger_type == 64) ) } field = "Invert Secondary", invertSecondaryTriggerSignal, {triggerInputPins2 != 0 && (trigger_type == 1 || trigger_type == 3 || trigger_type == 15 || trigger_type == 16 || trigger_type == 19 || trigger_type == 25 || trigger_type == 28 || trigger_type == 31 || trigger_type == 35 || trigger_type == 36 || trigger_type == 37 || trigger_type == 40 || trigger_type == 49 || trigger_type == 50 || trigger_type == 53 || trigger_type == 54 || trigger_type == 63 || trigger_type == 64) } diff --git a/firmware/tunerstudio/generated/rusefi_f429-discovery.ini b/firmware/tunerstudio/generated/rusefi_f429-discovery.ini index 201e9c19f2..0447928d29 100644 --- a/firmware/tunerstudio/generated/rusefi_f429-discovery.ini +++ b/firmware/tunerstudio/generated/rusefi_f429-discovery.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.11.08.f429-discovery.914902541" + signature = "rusEFI master.2023.11.09.f429-discovery.634710875" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.11.08.f429-discovery.914902541" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.11.09.f429-discovery.634710875" ; 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 @@ -92,7 +92,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.jar based on (unknown script) integration/rusefi_config.txt Wed Nov 08 20:03:34 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Thu Nov 09 02:08:03 UTC 2023 pageSize = 23880 page = 1 @@ -2347,7 +2347,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23870, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1440 + ochBlockSize = 1444 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3001,136 +3001,137 @@ brakePedalState = scalar, S08, 1092, "", 1, 0 startStopState = scalar, S08, 1093, "", 1, 0 startStopPhysicalState = bits, U32, 1096, [0:0] startStopStateToggleCounter = scalar, U32, 1100, "", 1, 0 -egtValue1 = scalar, F32, 1104, "", 1, 0 -egtValue2 = scalar, F32, 1108, "", 1, 0 -desiredRpmLimit = scalar, S16, 1112, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1116, "", 1, 0 -sparkCounter = scalar, U32, 1120, "", 1, 0 -fuelingLoad = scalar, F32, 1124, "", 1, 0 -ignitionLoad = scalar, F32, 1128, "", 1, 0 -veTableYAxis = scalar, U16, 1132, "%", 0.01, 0 -; total TS size = 1136 -tpsFrom = scalar, F32, 1136 -tpsTo = scalar, F32, 1140 -deltaTps = scalar, F32, 1144 -extraFuel = scalar, F32, 1148, "", 1, 0 -valueFromTable = scalar, F32, 1152, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1156, [0:0] -isBelowDecelThreshold = bits, U32, 1156, [1:1] -isTimeToResetAccumulator = bits, U32, 1156, [2:2] -isFractionalEnrichment = bits, U32, 1156, [3:3] -belowEpsilon = bits, U32, 1156, [4:4] -tooShort = bits, U32, 1156, [5:5] -fractionalInjFuel = scalar, F32, 1160, "", 1, 0 -accumulatedValue = scalar, F32, 1164, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1168, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1172, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1176, "", 1, 0 -cycleCnt = scalar, S32, 1180, "", 1, 0 -; total TS size = 1184 -hwEventCounters1 = scalar, U32, 1184, "", 1, 0 -hwEventCounters2 = scalar, U32, 1188, "", 1, 0 -hwEventCounters3 = scalar, U32, 1192, "", 1, 0 -hwEventCounters4 = scalar, U32, 1196, "", 1, 0 -hwEventCounters5 = scalar, U32, 1200, "", 1, 0 -hwEventCounters6 = scalar, U32, 1204, "", 1, 0 -vvtCamCounter = scalar, U32, 1208, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1212, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1216, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1220, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1221, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1224, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1228, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1232, "", 1, 0 -mapCamPrevToothAngle = scalar, F32, 1236, "deg", 1, 0 -isDecodingMapCam = bits, U32, 1240, [0:0] -; total TS size = 1244 -crankSynchronizationCounter = scalar, U32, 1244, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1248, "", 1, 0 -vvtToothDurations0 = scalar, U32, 1252, "us", 1, 0 -vvtCurrentPosition = scalar, F32, 1256, "sync: Primary Cam Position", 1, 0 -vvtToothPosition1 = scalar, F32, 1260, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition2 = scalar, F32, 1264, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition3 = scalar, F32, 1268, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition4 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio = scalar, F32, 1276, "", 1, 0 -triggerStateIndex = scalar, U08, 1280, "", 1, 0 -camResyncCounter = scalar, U08, 1281, "", 1, 0 -vvtStateIndex = scalar, U08, 1282, "", 1, 0 -; total TS size = 1284 -m_hasSynchronizedPhase = bits, U32, 1284, [0:0] +startStopStateTempPhysicalCounter = scalar, U32, 1104, "", 1, 0 +egtValue1 = scalar, F32, 1108, "", 1, 0 +egtValue2 = scalar, F32, 1112, "", 1, 0 +desiredRpmLimit = scalar, S16, 1116, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 1120, "", 1, 0 +sparkCounter = scalar, U32, 1124, "", 1, 0 +fuelingLoad = scalar, F32, 1128, "", 1, 0 +ignitionLoad = scalar, F32, 1132, "", 1, 0 +veTableYAxis = scalar, U16, 1136, "%", 0.01, 0 +; total TS size = 1140 +tpsFrom = scalar, F32, 1140 +tpsTo = scalar, F32, 1144 +deltaTps = scalar, F32, 1148 +extraFuel = scalar, F32, 1152, "", 1, 0 +valueFromTable = scalar, F32, 1156, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1160, [0:0] +isBelowDecelThreshold = bits, U32, 1160, [1:1] +isTimeToResetAccumulator = bits, U32, 1160, [2:2] +isFractionalEnrichment = bits, U32, 1160, [3:3] +belowEpsilon = bits, U32, 1160, [4:4] +tooShort = bits, U32, 1160, [5:5] +fractionalInjFuel = scalar, F32, 1164, "", 1, 0 +accumulatedValue = scalar, F32, 1168, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1172, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1176, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1180, "", 1, 0 +cycleCnt = scalar, S32, 1184, "", 1, 0 +; total TS size = 1188 +hwEventCounters1 = scalar, U32, 1188, "", 1, 0 +hwEventCounters2 = scalar, U32, 1192, "", 1, 0 +hwEventCounters3 = scalar, U32, 1196, "", 1, 0 +hwEventCounters4 = scalar, U32, 1200, "", 1, 0 +hwEventCounters5 = scalar, U32, 1204, "", 1, 0 +hwEventCounters6 = scalar, U32, 1208, "", 1, 0 +vvtCamCounter = scalar, U32, 1212, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1216, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1220, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1224, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1225, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1228, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1232, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1236, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1240, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1244, [0:0] +; total TS size = 1248 +crankSynchronizationCounter = scalar, U32, 1248, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1252, "", 1, 0 +vvtToothDurations0 = scalar, U32, 1256, "us", 1, 0 +vvtCurrentPosition = scalar, F32, 1260, "sync: Primary Cam Position", 1, 0 +vvtToothPosition1 = scalar, F32, 1264, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition2 = scalar, F32, 1268, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition3 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition4 = scalar, F32, 1276, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio = scalar, F32, 1280, "", 1, 0 +triggerStateIndex = scalar, U08, 1284, "", 1, 0 +camResyncCounter = scalar, U08, 1285, "", 1, 0 +vvtStateIndex = scalar, U08, 1286, "", 1, 0 ; total TS size = 1288 -wallFuelCorrection = scalar, F32, 1288, "", 1, 0 -wallFuel = scalar, F32, 1292, "", 1, 0 -; total TS size = 1296 -idleState = bits, S32, 1296, [0:2], "not important" -currentIdlePosition = scalar, F32, 1300 -baseIdlePosition = scalar, F32, 1304 -idleClosedLoop = scalar, F32, 1308 -iacByTpsTaper = scalar, F32, 1312 -throttlePedalUpState = scalar, S32, 1316, "", 1, 0 -mightResetPid = bits, U32, 1320, [0:0] -shouldResetPid = bits, U32, 1320, [1:1] -wasResetPid = bits, U32, 1320, [2:2] -mustResetPid = bits, U32, 1320, [3:3] -isCranking = bits, U32, 1320, [4:4] -isIacTableForCoasting = bits, U32, 1320, [5:5] -notIdling = bits, U32, 1320, [6:6] -needReset = bits, U32, 1320, [7:7] -isInDeadZone = bits, U32, 1320, [8:8] -isBlipping = bits, U32, 1320, [9:9] -useClosedLoop = bits, U32, 1320, [10:10] -badTps = bits, U32, 1320, [11:11] -looksLikeRunning = bits, U32, 1320, [12:12] -looksLikeCoasting = bits, U32, 1320, [13:13] -looksLikeCrankToIdle = bits, U32, 1320, [14:14] -isIdleCoasting = bits, U32, 1320, [15:15] -isIdleClosedLoop = bits, U32, 1320, [16:16] -idleTarget = scalar, S32, 1324, "", 1, 0 -targetRpmByClt = scalar, S32, 1328, "", 1, 0 -targetRpmAc = scalar, S32, 1332, "", 1, 0 -iacByRpmTaper = scalar, F32, 1336 -luaAdd = scalar, F32, 1340 -; total TS size = 1344 -idlePosition = scalar, F32, 1344, "per", 1,0 -trim = scalar, F32, 1348, "", 1, 0 -luaAdjustment = scalar, F32, 1352, "per", 1,0 -m_wastegatePosition = scalar, F32, 1356, "per", 1,0 -etbFeedForward = scalar, F32, 1360 -etbIntegralError = scalar, F32, 1364, "", 1, 0 -etbCurrentTarget = scalar, F32, 1368, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1372, "%", 1, 0 -etbRevLimitActive = bits, U32, 1376, [0:0] -jamDetected = bits, U32, 1376, [1:1] -etbDutyRateOfChange = scalar, F32, 1380, "per", 1,0 -etbDutyAverage = scalar, F32, 1384, "per", 1,0 -etbTpsErrorCounter = scalar, U16, 1388, "count", 1,0 -etbPpsErrorCounter = scalar, U16, 1390, "count", 1,0 -etbErrorCode = scalar, S08, 1392, "", 1, 0 -jamTimer = scalar, U16, 1394, "sec", 0.01, 0 -; total TS size = 1396 -faultCode = scalar, U08, 1396, "", 1, 0 -heaterDuty = scalar, U08, 1397, "%", 1, 0 -pumpDuty = scalar, U08, 1398, "%", 1, 0 -tempC = scalar, U16, 1400, "C", 1, 0 -nernstVoltage = scalar, U16, 1402, "V", 0.001, 0 -esr = scalar, U16, 1404, "ohm", 1, 0 -; total TS size = 1408 -dcOutput0 = scalar, F32, 1408, "per", 1,0 -isEnabled0_int = scalar, U08, 1412, "per", 1,0 -isEnabled0 = bits, U32, 1416, [0:0] -; total TS size = 1420 -value0 = scalar, U16, 1420, "value", 1,0 -value1 = scalar, U16, 1422, "value", 1,0 -errorRate = scalar, F32, 1424, "ratio", 1,0 -; total TS size = 1428 -vvtTarget = scalar, U16, 1428, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1430, "%", 0.5, 0 +m_hasSynchronizedPhase = bits, U32, 1288, [0:0] +; total TS size = 1292 +wallFuelCorrection = scalar, F32, 1292, "", 1, 0 +wallFuel = scalar, F32, 1296, "", 1, 0 +; total TS size = 1300 +idleState = bits, S32, 1300, [0:2], "not important" +currentIdlePosition = scalar, F32, 1304 +baseIdlePosition = scalar, F32, 1308 +idleClosedLoop = scalar, F32, 1312 +iacByTpsTaper = scalar, F32, 1316 +throttlePedalUpState = scalar, S32, 1320, "", 1, 0 +mightResetPid = bits, U32, 1324, [0:0] +shouldResetPid = bits, U32, 1324, [1:1] +wasResetPid = bits, U32, 1324, [2:2] +mustResetPid = bits, U32, 1324, [3:3] +isCranking = bits, U32, 1324, [4:4] +isIacTableForCoasting = bits, U32, 1324, [5:5] +notIdling = bits, U32, 1324, [6:6] +needReset = bits, U32, 1324, [7:7] +isInDeadZone = bits, U32, 1324, [8:8] +isBlipping = bits, U32, 1324, [9:9] +useClosedLoop = bits, U32, 1324, [10:10] +badTps = bits, U32, 1324, [11:11] +looksLikeRunning = bits, U32, 1324, [12:12] +looksLikeCoasting = bits, U32, 1324, [13:13] +looksLikeCrankToIdle = bits, U32, 1324, [14:14] +isIdleCoasting = bits, U32, 1324, [15:15] +isIdleClosedLoop = bits, U32, 1324, [16:16] +idleTarget = scalar, S32, 1328, "", 1, 0 +targetRpmByClt = scalar, S32, 1332, "", 1, 0 +targetRpmAc = scalar, S32, 1336, "", 1, 0 +iacByRpmTaper = scalar, F32, 1340 +luaAdd = scalar, F32, 1344 +; total TS size = 1348 +idlePosition = scalar, F32, 1348, "per", 1,0 +trim = scalar, F32, 1352, "", 1, 0 +luaAdjustment = scalar, F32, 1356, "per", 1,0 +m_wastegatePosition = scalar, F32, 1360, "per", 1,0 +etbFeedForward = scalar, F32, 1364 +etbIntegralError = scalar, F32, 1368, "", 1, 0 +etbCurrentTarget = scalar, F32, 1372, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1376, "%", 1, 0 +etbRevLimitActive = bits, U32, 1380, [0:0] +jamDetected = bits, U32, 1380, [1:1] +etbDutyRateOfChange = scalar, F32, 1384, "per", 1,0 +etbDutyAverage = scalar, F32, 1388, "per", 1,0 +etbTpsErrorCounter = scalar, U16, 1392, "count", 1,0 +etbPpsErrorCounter = scalar, U16, 1394, "count", 1,0 +etbErrorCode = scalar, S08, 1396, "", 1, 0 +jamTimer = scalar, U16, 1398, "sec", 0.01, 0 +; total TS size = 1400 +faultCode = scalar, U08, 1400, "", 1, 0 +heaterDuty = scalar, U08, 1401, "%", 1, 0 +pumpDuty = scalar, U08, 1402, "%", 1, 0 +tempC = scalar, U16, 1404, "C", 1, 0 +nernstVoltage = scalar, U16, 1406, "V", 0.001, 0 +esr = scalar, U16, 1408, "ohm", 1, 0 +; total TS size = 1412 +dcOutput0 = scalar, F32, 1412, "per", 1,0 +isEnabled0_int = scalar, U08, 1416, "per", 1,0 +isEnabled0 = bits, U32, 1420, [0:0] +; total TS size = 1424 +value0 = scalar, U16, 1424, "value", 1,0 +value1 = scalar, U16, 1426, "value", 1,0 +errorRate = scalar, F32, 1428, "ratio", 1,0 ; total TS size = 1432 -lambdaCurrentlyGood = bits, U32, 1432, [0:0] -lambdaMonitorCut = bits, U32, 1432, [1:1] -lambdaTimeSinceGood = scalar, U16, 1436, "sec", 0.01, 0 -; total TS size = 1440 +vvtTarget = scalar, U16, 1432, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1434, "%", 0.5, 0 +; total TS size = 1436 +lambdaCurrentlyGood = bits, U32, 1436, [0:0] +lambdaMonitorCut = bits, U32, 1436, [1:1] +lambdaTimeSinceGood = scalar, U16, 1440, "sec", 0.01, 0 +; total TS size = 1444 time = { timeNow } @@ -5196,6 +5197,7 @@ entry = brakePedalState, "Brake switch", int, "%d" entry = startStopState, "startStopState", int, "%d" entry = startStopPhysicalState, "startStopPhysicalState", int, "%d" entry = startStopStateToggleCounter, "startStopStateToggleCounter", int, "%d" +entry = startStopStateTempPhysicalCounter, "startStopStateTempPhysicalCounter", int, "%d" entry = egtValue1, "egtValue1", float, "%.3f" entry = egtValue2, "egtValue2", float, "%.3f" entry = desiredRpmLimit, "User-defined RPM hard limit", int, "%d" @@ -6077,13 +6079,14 @@ dialog = engine_stateDialog, "engine_state" graphLine = brakePedalState graphLine = startStopState graphLine = startStopStateToggleCounter - graphLine = egtValue1 + graphLine = startStopStateTempPhysicalCounter liveGraph = engine_state_5_Graph, "Graph", South + graphLine = egtValue1 graphLine = egtValue2 graphLine = desiredRpmLimit graphLine = fuelInjectionCounter - graphLine = sparkCounter liveGraph = engine_state_6_Graph, "Graph", South + graphLine = sparkCounter graphLine = fuelingLoad graphLine = ignitionLoad graphLine = veTableYAxis @@ -6419,8 +6422,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" ; cam if ; two-stroke, or ; not crank trigger and ((vague trigger and cam choice) or not vague trigger) - field = "Cam Sensor (Primary channel)", triggerInputPins1, 1, {twoStroke == 1 || ( !(trigger_type == 2 || trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 21 || trigger_type == 26 || trigger_type == 27 || trigger_type == 33 || trigger_type == 38 || trigger_type == 39 || trigger_type == 44 || trigger_type == 45 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 58 || trigger_type == 61 || trigger_type == 62 || trigger_type == 68 || trigger_type == 70 || trigger_type == 71 || trigger_type == 72 || trigger_type == 74 || trigger_type == 75 || trigger_type == 76 || trigger_type == 77 || trigger_type == 79) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) ) ) } - field = "Crank Sensor (Primary channel)", triggerInputPins1, 1, { !(twoStroke == 1 || ( !(trigger_type == 2 || trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 21 || trigger_type == 26 || trigger_type == 27 || trigger_type == 33 || trigger_type == 38 || trigger_type == 39 || trigger_type == 44 || trigger_type == 45 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 58 || trigger_type == 61 || trigger_type == 62 || trigger_type == 68 || trigger_type == 70 || trigger_type == 71 || trigger_type == 72 || trigger_type == 74 || trigger_type == 75 || trigger_type == 76 || trigger_type == 77 || trigger_type == 79) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) ) )) } + field = "Cam Sensor (Primary channel)", triggerInputPins1, 1, {twoStroke == 1 || ( !(trigger_type == 2 || trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 21 || trigger_type == 26 || trigger_type == 27 || trigger_type == 33 || trigger_type == 38 || trigger_type == 39 || trigger_type == 44 || trigger_type == 45 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 58 || trigger_type == 61 || trigger_type == 62 || trigger_type == 68 || trigger_type == 70 || trigger_type == 71 || trigger_type == 72 || trigger_type == 74 || trigger_type == 75 || trigger_type == 76 || trigger_type == 77) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) ) ) } + field = "Crank Sensor (Primary channel)", triggerInputPins1, 1, { !(twoStroke == 1 || ( !(trigger_type == 2 || trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 21 || trigger_type == 26 || trigger_type == 27 || trigger_type == 33 || trigger_type == 38 || trigger_type == 39 || trigger_type == 44 || trigger_type == 45 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 58 || trigger_type == 61 || trigger_type == 62 || trigger_type == 68 || trigger_type == 70 || trigger_type == 71 || trigger_type == 72 || trigger_type == 74 || trigger_type == 75 || trigger_type == 76 || trigger_type == 77) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) ) )) } field = "Invert Primary", invertPrimaryTriggerSignal field = "Secondary channel", triggerInputPins2, { triggerInputPins2 != 0 || (triggerInputPins1 != 0 && (trigger_type == 1 || trigger_type == 3 || trigger_type == 15 || trigger_type == 16 || trigger_type == 19 || trigger_type == 25 || trigger_type == 28 || trigger_type == 31 || trigger_type == 35 || trigger_type == 36 || trigger_type == 37 || trigger_type == 40 || trigger_type == 49 || trigger_type == 50 || trigger_type == 53 || trigger_type == 54 || trigger_type == 63 || trigger_type == 64) ) } field = "Invert Secondary", invertSecondaryTriggerSignal, {triggerInputPins2 != 0 && (trigger_type == 1 || trigger_type == 3 || trigger_type == 15 || trigger_type == 16 || trigger_type == 19 || trigger_type == 25 || trigger_type == 28 || trigger_type == 31 || trigger_type == 35 || trigger_type == 36 || trigger_type == 37 || trigger_type == 40 || trigger_type == 49 || trigger_type == 50 || trigger_type == 53 || trigger_type == 54 || trigger_type == 63 || trigger_type == 64) } diff --git a/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini b/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini index 011556a23a..e2e4aae361 100644 --- a/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini +++ b/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.11.08.frankenso_na6.349875911" + signature = "rusEFI master.2023.11.09.frankenso_na6.126225297" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.11.08.frankenso_na6.349875911" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.11.09.frankenso_na6.126225297" ; 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 @@ -92,7 +92,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.jar based on (unknown script) integration/rusefi_config.txt Wed Nov 08 20:03:14 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Thu Nov 09 02:07:48 UTC 2023 pageSize = 23880 page = 1 @@ -2347,7 +2347,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23870, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1440 + ochBlockSize = 1444 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3001,136 +3001,137 @@ brakePedalState = scalar, S08, 1092, "", 1, 0 startStopState = scalar, S08, 1093, "", 1, 0 startStopPhysicalState = bits, U32, 1096, [0:0] startStopStateToggleCounter = scalar, U32, 1100, "", 1, 0 -egtValue1 = scalar, F32, 1104, "", 1, 0 -egtValue2 = scalar, F32, 1108, "", 1, 0 -desiredRpmLimit = scalar, S16, 1112, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1116, "", 1, 0 -sparkCounter = scalar, U32, 1120, "", 1, 0 -fuelingLoad = scalar, F32, 1124, "", 1, 0 -ignitionLoad = scalar, F32, 1128, "", 1, 0 -veTableYAxis = scalar, U16, 1132, "%", 0.01, 0 -; total TS size = 1136 -tpsFrom = scalar, F32, 1136 -tpsTo = scalar, F32, 1140 -deltaTps = scalar, F32, 1144 -extraFuel = scalar, F32, 1148, "", 1, 0 -valueFromTable = scalar, F32, 1152, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1156, [0:0] -isBelowDecelThreshold = bits, U32, 1156, [1:1] -isTimeToResetAccumulator = bits, U32, 1156, [2:2] -isFractionalEnrichment = bits, U32, 1156, [3:3] -belowEpsilon = bits, U32, 1156, [4:4] -tooShort = bits, U32, 1156, [5:5] -fractionalInjFuel = scalar, F32, 1160, "", 1, 0 -accumulatedValue = scalar, F32, 1164, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1168, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1172, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1176, "", 1, 0 -cycleCnt = scalar, S32, 1180, "", 1, 0 -; total TS size = 1184 -hwEventCounters1 = scalar, U32, 1184, "", 1, 0 -hwEventCounters2 = scalar, U32, 1188, "", 1, 0 -hwEventCounters3 = scalar, U32, 1192, "", 1, 0 -hwEventCounters4 = scalar, U32, 1196, "", 1, 0 -hwEventCounters5 = scalar, U32, 1200, "", 1, 0 -hwEventCounters6 = scalar, U32, 1204, "", 1, 0 -vvtCamCounter = scalar, U32, 1208, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1212, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1216, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1220, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1221, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1224, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1228, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1232, "", 1, 0 -mapCamPrevToothAngle = scalar, F32, 1236, "deg", 1, 0 -isDecodingMapCam = bits, U32, 1240, [0:0] -; total TS size = 1244 -crankSynchronizationCounter = scalar, U32, 1244, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1248, "", 1, 0 -vvtToothDurations0 = scalar, U32, 1252, "us", 1, 0 -vvtCurrentPosition = scalar, F32, 1256, "sync: Primary Cam Position", 1, 0 -vvtToothPosition1 = scalar, F32, 1260, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition2 = scalar, F32, 1264, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition3 = scalar, F32, 1268, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition4 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio = scalar, F32, 1276, "", 1, 0 -triggerStateIndex = scalar, U08, 1280, "", 1, 0 -camResyncCounter = scalar, U08, 1281, "", 1, 0 -vvtStateIndex = scalar, U08, 1282, "", 1, 0 -; total TS size = 1284 -m_hasSynchronizedPhase = bits, U32, 1284, [0:0] +startStopStateTempPhysicalCounter = scalar, U32, 1104, "", 1, 0 +egtValue1 = scalar, F32, 1108, "", 1, 0 +egtValue2 = scalar, F32, 1112, "", 1, 0 +desiredRpmLimit = scalar, S16, 1116, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 1120, "", 1, 0 +sparkCounter = scalar, U32, 1124, "", 1, 0 +fuelingLoad = scalar, F32, 1128, "", 1, 0 +ignitionLoad = scalar, F32, 1132, "", 1, 0 +veTableYAxis = scalar, U16, 1136, "%", 0.01, 0 +; total TS size = 1140 +tpsFrom = scalar, F32, 1140 +tpsTo = scalar, F32, 1144 +deltaTps = scalar, F32, 1148 +extraFuel = scalar, F32, 1152, "", 1, 0 +valueFromTable = scalar, F32, 1156, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1160, [0:0] +isBelowDecelThreshold = bits, U32, 1160, [1:1] +isTimeToResetAccumulator = bits, U32, 1160, [2:2] +isFractionalEnrichment = bits, U32, 1160, [3:3] +belowEpsilon = bits, U32, 1160, [4:4] +tooShort = bits, U32, 1160, [5:5] +fractionalInjFuel = scalar, F32, 1164, "", 1, 0 +accumulatedValue = scalar, F32, 1168, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1172, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1176, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1180, "", 1, 0 +cycleCnt = scalar, S32, 1184, "", 1, 0 +; total TS size = 1188 +hwEventCounters1 = scalar, U32, 1188, "", 1, 0 +hwEventCounters2 = scalar, U32, 1192, "", 1, 0 +hwEventCounters3 = scalar, U32, 1196, "", 1, 0 +hwEventCounters4 = scalar, U32, 1200, "", 1, 0 +hwEventCounters5 = scalar, U32, 1204, "", 1, 0 +hwEventCounters6 = scalar, U32, 1208, "", 1, 0 +vvtCamCounter = scalar, U32, 1212, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1216, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1220, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1224, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1225, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1228, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1232, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1236, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1240, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1244, [0:0] +; total TS size = 1248 +crankSynchronizationCounter = scalar, U32, 1248, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1252, "", 1, 0 +vvtToothDurations0 = scalar, U32, 1256, "us", 1, 0 +vvtCurrentPosition = scalar, F32, 1260, "sync: Primary Cam Position", 1, 0 +vvtToothPosition1 = scalar, F32, 1264, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition2 = scalar, F32, 1268, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition3 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition4 = scalar, F32, 1276, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio = scalar, F32, 1280, "", 1, 0 +triggerStateIndex = scalar, U08, 1284, "", 1, 0 +camResyncCounter = scalar, U08, 1285, "", 1, 0 +vvtStateIndex = scalar, U08, 1286, "", 1, 0 ; total TS size = 1288 -wallFuelCorrection = scalar, F32, 1288, "", 1, 0 -wallFuel = scalar, F32, 1292, "", 1, 0 -; total TS size = 1296 -idleState = bits, S32, 1296, [0:2], "not important" -currentIdlePosition = scalar, F32, 1300 -baseIdlePosition = scalar, F32, 1304 -idleClosedLoop = scalar, F32, 1308 -iacByTpsTaper = scalar, F32, 1312 -throttlePedalUpState = scalar, S32, 1316, "", 1, 0 -mightResetPid = bits, U32, 1320, [0:0] -shouldResetPid = bits, U32, 1320, [1:1] -wasResetPid = bits, U32, 1320, [2:2] -mustResetPid = bits, U32, 1320, [3:3] -isCranking = bits, U32, 1320, [4:4] -isIacTableForCoasting = bits, U32, 1320, [5:5] -notIdling = bits, U32, 1320, [6:6] -needReset = bits, U32, 1320, [7:7] -isInDeadZone = bits, U32, 1320, [8:8] -isBlipping = bits, U32, 1320, [9:9] -useClosedLoop = bits, U32, 1320, [10:10] -badTps = bits, U32, 1320, [11:11] -looksLikeRunning = bits, U32, 1320, [12:12] -looksLikeCoasting = bits, U32, 1320, [13:13] -looksLikeCrankToIdle = bits, U32, 1320, [14:14] -isIdleCoasting = bits, U32, 1320, [15:15] -isIdleClosedLoop = bits, U32, 1320, [16:16] -idleTarget = scalar, S32, 1324, "", 1, 0 -targetRpmByClt = scalar, S32, 1328, "", 1, 0 -targetRpmAc = scalar, S32, 1332, "", 1, 0 -iacByRpmTaper = scalar, F32, 1336 -luaAdd = scalar, F32, 1340 -; total TS size = 1344 -idlePosition = scalar, F32, 1344, "per", 1,0 -trim = scalar, F32, 1348, "", 1, 0 -luaAdjustment = scalar, F32, 1352, "per", 1,0 -m_wastegatePosition = scalar, F32, 1356, "per", 1,0 -etbFeedForward = scalar, F32, 1360 -etbIntegralError = scalar, F32, 1364, "", 1, 0 -etbCurrentTarget = scalar, F32, 1368, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1372, "%", 1, 0 -etbRevLimitActive = bits, U32, 1376, [0:0] -jamDetected = bits, U32, 1376, [1:1] -etbDutyRateOfChange = scalar, F32, 1380, "per", 1,0 -etbDutyAverage = scalar, F32, 1384, "per", 1,0 -etbTpsErrorCounter = scalar, U16, 1388, "count", 1,0 -etbPpsErrorCounter = scalar, U16, 1390, "count", 1,0 -etbErrorCode = scalar, S08, 1392, "", 1, 0 -jamTimer = scalar, U16, 1394, "sec", 0.01, 0 -; total TS size = 1396 -faultCode = scalar, U08, 1396, "", 1, 0 -heaterDuty = scalar, U08, 1397, "%", 1, 0 -pumpDuty = scalar, U08, 1398, "%", 1, 0 -tempC = scalar, U16, 1400, "C", 1, 0 -nernstVoltage = scalar, U16, 1402, "V", 0.001, 0 -esr = scalar, U16, 1404, "ohm", 1, 0 -; total TS size = 1408 -dcOutput0 = scalar, F32, 1408, "per", 1,0 -isEnabled0_int = scalar, U08, 1412, "per", 1,0 -isEnabled0 = bits, U32, 1416, [0:0] -; total TS size = 1420 -value0 = scalar, U16, 1420, "value", 1,0 -value1 = scalar, U16, 1422, "value", 1,0 -errorRate = scalar, F32, 1424, "ratio", 1,0 -; total TS size = 1428 -vvtTarget = scalar, U16, 1428, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1430, "%", 0.5, 0 +m_hasSynchronizedPhase = bits, U32, 1288, [0:0] +; total TS size = 1292 +wallFuelCorrection = scalar, F32, 1292, "", 1, 0 +wallFuel = scalar, F32, 1296, "", 1, 0 +; total TS size = 1300 +idleState = bits, S32, 1300, [0:2], "not important" +currentIdlePosition = scalar, F32, 1304 +baseIdlePosition = scalar, F32, 1308 +idleClosedLoop = scalar, F32, 1312 +iacByTpsTaper = scalar, F32, 1316 +throttlePedalUpState = scalar, S32, 1320, "", 1, 0 +mightResetPid = bits, U32, 1324, [0:0] +shouldResetPid = bits, U32, 1324, [1:1] +wasResetPid = bits, U32, 1324, [2:2] +mustResetPid = bits, U32, 1324, [3:3] +isCranking = bits, U32, 1324, [4:4] +isIacTableForCoasting = bits, U32, 1324, [5:5] +notIdling = bits, U32, 1324, [6:6] +needReset = bits, U32, 1324, [7:7] +isInDeadZone = bits, U32, 1324, [8:8] +isBlipping = bits, U32, 1324, [9:9] +useClosedLoop = bits, U32, 1324, [10:10] +badTps = bits, U32, 1324, [11:11] +looksLikeRunning = bits, U32, 1324, [12:12] +looksLikeCoasting = bits, U32, 1324, [13:13] +looksLikeCrankToIdle = bits, U32, 1324, [14:14] +isIdleCoasting = bits, U32, 1324, [15:15] +isIdleClosedLoop = bits, U32, 1324, [16:16] +idleTarget = scalar, S32, 1328, "", 1, 0 +targetRpmByClt = scalar, S32, 1332, "", 1, 0 +targetRpmAc = scalar, S32, 1336, "", 1, 0 +iacByRpmTaper = scalar, F32, 1340 +luaAdd = scalar, F32, 1344 +; total TS size = 1348 +idlePosition = scalar, F32, 1348, "per", 1,0 +trim = scalar, F32, 1352, "", 1, 0 +luaAdjustment = scalar, F32, 1356, "per", 1,0 +m_wastegatePosition = scalar, F32, 1360, "per", 1,0 +etbFeedForward = scalar, F32, 1364 +etbIntegralError = scalar, F32, 1368, "", 1, 0 +etbCurrentTarget = scalar, F32, 1372, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1376, "%", 1, 0 +etbRevLimitActive = bits, U32, 1380, [0:0] +jamDetected = bits, U32, 1380, [1:1] +etbDutyRateOfChange = scalar, F32, 1384, "per", 1,0 +etbDutyAverage = scalar, F32, 1388, "per", 1,0 +etbTpsErrorCounter = scalar, U16, 1392, "count", 1,0 +etbPpsErrorCounter = scalar, U16, 1394, "count", 1,0 +etbErrorCode = scalar, S08, 1396, "", 1, 0 +jamTimer = scalar, U16, 1398, "sec", 0.01, 0 +; total TS size = 1400 +faultCode = scalar, U08, 1400, "", 1, 0 +heaterDuty = scalar, U08, 1401, "%", 1, 0 +pumpDuty = scalar, U08, 1402, "%", 1, 0 +tempC = scalar, U16, 1404, "C", 1, 0 +nernstVoltage = scalar, U16, 1406, "V", 0.001, 0 +esr = scalar, U16, 1408, "ohm", 1, 0 +; total TS size = 1412 +dcOutput0 = scalar, F32, 1412, "per", 1,0 +isEnabled0_int = scalar, U08, 1416, "per", 1,0 +isEnabled0 = bits, U32, 1420, [0:0] +; total TS size = 1424 +value0 = scalar, U16, 1424, "value", 1,0 +value1 = scalar, U16, 1426, "value", 1,0 +errorRate = scalar, F32, 1428, "ratio", 1,0 ; total TS size = 1432 -lambdaCurrentlyGood = bits, U32, 1432, [0:0] -lambdaMonitorCut = bits, U32, 1432, [1:1] -lambdaTimeSinceGood = scalar, U16, 1436, "sec", 0.01, 0 -; total TS size = 1440 +vvtTarget = scalar, U16, 1432, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1434, "%", 0.5, 0 +; total TS size = 1436 +lambdaCurrentlyGood = bits, U32, 1436, [0:0] +lambdaMonitorCut = bits, U32, 1436, [1:1] +lambdaTimeSinceGood = scalar, U16, 1440, "sec", 0.01, 0 +; total TS size = 1444 time = { timeNow } @@ -5196,6 +5197,7 @@ entry = brakePedalState, "Brake switch", int, "%d" entry = startStopState, "startStopState", int, "%d" entry = startStopPhysicalState, "startStopPhysicalState", int, "%d" entry = startStopStateToggleCounter, "startStopStateToggleCounter", int, "%d" +entry = startStopStateTempPhysicalCounter, "startStopStateTempPhysicalCounter", int, "%d" entry = egtValue1, "egtValue1", float, "%.3f" entry = egtValue2, "egtValue2", float, "%.3f" entry = desiredRpmLimit, "User-defined RPM hard limit", int, "%d" @@ -6077,13 +6079,14 @@ dialog = engine_stateDialog, "engine_state" graphLine = brakePedalState graphLine = startStopState graphLine = startStopStateToggleCounter - graphLine = egtValue1 + graphLine = startStopStateTempPhysicalCounter liveGraph = engine_state_5_Graph, "Graph", South + graphLine = egtValue1 graphLine = egtValue2 graphLine = desiredRpmLimit graphLine = fuelInjectionCounter - graphLine = sparkCounter liveGraph = engine_state_6_Graph, "Graph", South + graphLine = sparkCounter graphLine = fuelingLoad graphLine = ignitionLoad graphLine = veTableYAxis @@ -6419,8 +6422,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" ; cam if ; two-stroke, or ; not crank trigger and ((vague trigger and cam choice) or not vague trigger) - field = "Cam Sensor (Primary channel)", triggerInputPins1, 1, {twoStroke == 1 || ( !(trigger_type == 2 || trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 21 || trigger_type == 26 || trigger_type == 27 || trigger_type == 33 || trigger_type == 38 || trigger_type == 39 || trigger_type == 44 || trigger_type == 45 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 58 || trigger_type == 61 || trigger_type == 62 || trigger_type == 68 || trigger_type == 70 || trigger_type == 71 || trigger_type == 72 || trigger_type == 74 || trigger_type == 75 || trigger_type == 76 || trigger_type == 77 || trigger_type == 79) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) ) ) } - field = "Crank Sensor (Primary channel)", triggerInputPins1, 1, { !(twoStroke == 1 || ( !(trigger_type == 2 || trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 21 || trigger_type == 26 || trigger_type == 27 || trigger_type == 33 || trigger_type == 38 || trigger_type == 39 || trigger_type == 44 || trigger_type == 45 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 58 || trigger_type == 61 || trigger_type == 62 || trigger_type == 68 || trigger_type == 70 || trigger_type == 71 || trigger_type == 72 || trigger_type == 74 || trigger_type == 75 || trigger_type == 76 || trigger_type == 77 || trigger_type == 79) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) ) )) } + field = "Cam Sensor (Primary channel)", triggerInputPins1, 1, {twoStroke == 1 || ( !(trigger_type == 2 || trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 21 || trigger_type == 26 || trigger_type == 27 || trigger_type == 33 || trigger_type == 38 || trigger_type == 39 || trigger_type == 44 || trigger_type == 45 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 58 || trigger_type == 61 || trigger_type == 62 || trigger_type == 68 || trigger_type == 70 || trigger_type == 71 || trigger_type == 72 || trigger_type == 74 || trigger_type == 75 || trigger_type == 76 || trigger_type == 77) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) ) ) } + field = "Crank Sensor (Primary channel)", triggerInputPins1, 1, { !(twoStroke == 1 || ( !(trigger_type == 2 || trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 21 || trigger_type == 26 || trigger_type == 27 || trigger_type == 33 || trigger_type == 38 || trigger_type == 39 || trigger_type == 44 || trigger_type == 45 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 58 || trigger_type == 61 || trigger_type == 62 || trigger_type == 68 || trigger_type == 70 || trigger_type == 71 || trigger_type == 72 || trigger_type == 74 || trigger_type == 75 || trigger_type == 76 || trigger_type == 77) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) ) )) } field = "Invert Primary", invertPrimaryTriggerSignal field = "Secondary channel", triggerInputPins2, { triggerInputPins2 != 0 || (triggerInputPins1 != 0 && (trigger_type == 1 || trigger_type == 3 || trigger_type == 15 || trigger_type == 16 || trigger_type == 19 || trigger_type == 25 || trigger_type == 28 || trigger_type == 31 || trigger_type == 35 || trigger_type == 36 || trigger_type == 37 || trigger_type == 40 || trigger_type == 49 || trigger_type == 50 || trigger_type == 53 || trigger_type == 54 || trigger_type == 63 || trigger_type == 64) ) } field = "Invert Secondary", invertSecondaryTriggerSignal, {triggerInputPins2 != 0 && (trigger_type == 1 || trigger_type == 3 || trigger_type == 15 || trigger_type == 16 || trigger_type == 19 || trigger_type == 25 || trigger_type == 28 || trigger_type == 31 || trigger_type == 35 || trigger_type == 36 || trigger_type == 37 || trigger_type == 40 || trigger_type == 49 || trigger_type == 50 || trigger_type == 53 || trigger_type == 54 || trigger_type == 63 || trigger_type == 64) } diff --git a/firmware/tunerstudio/generated/rusefi_harley81.ini b/firmware/tunerstudio/generated/rusefi_harley81.ini index a117f16e4a..05ee43e832 100644 --- a/firmware/tunerstudio/generated/rusefi_harley81.ini +++ b/firmware/tunerstudio/generated/rusefi_harley81.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.11.08.harley81.516185716" + signature = "rusEFI master.2023.11.09.harley81.228129570" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.11.08.harley81.516185716" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.11.09.harley81.228129570" ; 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 @@ -92,7 +92,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","INVALID","27 - TPS 2","INVALID","41 - PPS 1","52 - TPS 1","5 Battery Sense","INVALID","INVALID","42 - PPS 2","INVALID","53 - MAP","55 Engine Temperature","49 CLT","72 IAT","32 Oil Pressure","34 Kickstand Position Sensor" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Nov 08 20:01:52 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Thu Nov 09 02:06:53 UTC 2023 pageSize = 23880 page = 1 @@ -2347,7 +2347,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23870, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1440 + ochBlockSize = 1444 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3001,136 +3001,137 @@ brakePedalState = scalar, S08, 1092, "", 1, 0 startStopState = scalar, S08, 1093, "", 1, 0 startStopPhysicalState = bits, U32, 1096, [0:0] startStopStateToggleCounter = scalar, U32, 1100, "", 1, 0 -egtValue1 = scalar, F32, 1104, "", 1, 0 -egtValue2 = scalar, F32, 1108, "", 1, 0 -desiredRpmLimit = scalar, S16, 1112, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1116, "", 1, 0 -sparkCounter = scalar, U32, 1120, "", 1, 0 -fuelingLoad = scalar, F32, 1124, "", 1, 0 -ignitionLoad = scalar, F32, 1128, "", 1, 0 -veTableYAxis = scalar, U16, 1132, "%", 0.01, 0 -; total TS size = 1136 -tpsFrom = scalar, F32, 1136 -tpsTo = scalar, F32, 1140 -deltaTps = scalar, F32, 1144 -extraFuel = scalar, F32, 1148, "", 1, 0 -valueFromTable = scalar, F32, 1152, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1156, [0:0] -isBelowDecelThreshold = bits, U32, 1156, [1:1] -isTimeToResetAccumulator = bits, U32, 1156, [2:2] -isFractionalEnrichment = bits, U32, 1156, [3:3] -belowEpsilon = bits, U32, 1156, [4:4] -tooShort = bits, U32, 1156, [5:5] -fractionalInjFuel = scalar, F32, 1160, "", 1, 0 -accumulatedValue = scalar, F32, 1164, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1168, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1172, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1176, "", 1, 0 -cycleCnt = scalar, S32, 1180, "", 1, 0 -; total TS size = 1184 -hwEventCounters1 = scalar, U32, 1184, "", 1, 0 -hwEventCounters2 = scalar, U32, 1188, "", 1, 0 -hwEventCounters3 = scalar, U32, 1192, "", 1, 0 -hwEventCounters4 = scalar, U32, 1196, "", 1, 0 -hwEventCounters5 = scalar, U32, 1200, "", 1, 0 -hwEventCounters6 = scalar, U32, 1204, "", 1, 0 -vvtCamCounter = scalar, U32, 1208, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1212, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1216, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1220, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1221, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1224, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1228, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1232, "", 1, 0 -mapCamPrevToothAngle = scalar, F32, 1236, "deg", 1, 0 -isDecodingMapCam = bits, U32, 1240, [0:0] -; total TS size = 1244 -crankSynchronizationCounter = scalar, U32, 1244, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1248, "", 1, 0 -vvtToothDurations0 = scalar, U32, 1252, "us", 1, 0 -vvtCurrentPosition = scalar, F32, 1256, "sync: Primary Cam Position", 1, 0 -vvtToothPosition1 = scalar, F32, 1260, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition2 = scalar, F32, 1264, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition3 = scalar, F32, 1268, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition4 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio = scalar, F32, 1276, "", 1, 0 -triggerStateIndex = scalar, U08, 1280, "", 1, 0 -camResyncCounter = scalar, U08, 1281, "", 1, 0 -vvtStateIndex = scalar, U08, 1282, "", 1, 0 -; total TS size = 1284 -m_hasSynchronizedPhase = bits, U32, 1284, [0:0] +startStopStateTempPhysicalCounter = scalar, U32, 1104, "", 1, 0 +egtValue1 = scalar, F32, 1108, "", 1, 0 +egtValue2 = scalar, F32, 1112, "", 1, 0 +desiredRpmLimit = scalar, S16, 1116, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 1120, "", 1, 0 +sparkCounter = scalar, U32, 1124, "", 1, 0 +fuelingLoad = scalar, F32, 1128, "", 1, 0 +ignitionLoad = scalar, F32, 1132, "", 1, 0 +veTableYAxis = scalar, U16, 1136, "%", 0.01, 0 +; total TS size = 1140 +tpsFrom = scalar, F32, 1140 +tpsTo = scalar, F32, 1144 +deltaTps = scalar, F32, 1148 +extraFuel = scalar, F32, 1152, "", 1, 0 +valueFromTable = scalar, F32, 1156, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1160, [0:0] +isBelowDecelThreshold = bits, U32, 1160, [1:1] +isTimeToResetAccumulator = bits, U32, 1160, [2:2] +isFractionalEnrichment = bits, U32, 1160, [3:3] +belowEpsilon = bits, U32, 1160, [4:4] +tooShort = bits, U32, 1160, [5:5] +fractionalInjFuel = scalar, F32, 1164, "", 1, 0 +accumulatedValue = scalar, F32, 1168, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1172, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1176, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1180, "", 1, 0 +cycleCnt = scalar, S32, 1184, "", 1, 0 +; total TS size = 1188 +hwEventCounters1 = scalar, U32, 1188, "", 1, 0 +hwEventCounters2 = scalar, U32, 1192, "", 1, 0 +hwEventCounters3 = scalar, U32, 1196, "", 1, 0 +hwEventCounters4 = scalar, U32, 1200, "", 1, 0 +hwEventCounters5 = scalar, U32, 1204, "", 1, 0 +hwEventCounters6 = scalar, U32, 1208, "", 1, 0 +vvtCamCounter = scalar, U32, 1212, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1216, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1220, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1224, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1225, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1228, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1232, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1236, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1240, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1244, [0:0] +; total TS size = 1248 +crankSynchronizationCounter = scalar, U32, 1248, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1252, "", 1, 0 +vvtToothDurations0 = scalar, U32, 1256, "us", 1, 0 +vvtCurrentPosition = scalar, F32, 1260, "sync: Primary Cam Position", 1, 0 +vvtToothPosition1 = scalar, F32, 1264, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition2 = scalar, F32, 1268, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition3 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition4 = scalar, F32, 1276, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio = scalar, F32, 1280, "", 1, 0 +triggerStateIndex = scalar, U08, 1284, "", 1, 0 +camResyncCounter = scalar, U08, 1285, "", 1, 0 +vvtStateIndex = scalar, U08, 1286, "", 1, 0 ; total TS size = 1288 -wallFuelCorrection = scalar, F32, 1288, "", 1, 0 -wallFuel = scalar, F32, 1292, "", 1, 0 -; total TS size = 1296 -idleState = bits, S32, 1296, [0:2], "not important" -currentIdlePosition = scalar, F32, 1300 -baseIdlePosition = scalar, F32, 1304 -idleClosedLoop = scalar, F32, 1308 -iacByTpsTaper = scalar, F32, 1312 -throttlePedalUpState = scalar, S32, 1316, "", 1, 0 -mightResetPid = bits, U32, 1320, [0:0] -shouldResetPid = bits, U32, 1320, [1:1] -wasResetPid = bits, U32, 1320, [2:2] -mustResetPid = bits, U32, 1320, [3:3] -isCranking = bits, U32, 1320, [4:4] -isIacTableForCoasting = bits, U32, 1320, [5:5] -notIdling = bits, U32, 1320, [6:6] -needReset = bits, U32, 1320, [7:7] -isInDeadZone = bits, U32, 1320, [8:8] -isBlipping = bits, U32, 1320, [9:9] -useClosedLoop = bits, U32, 1320, [10:10] -badTps = bits, U32, 1320, [11:11] -looksLikeRunning = bits, U32, 1320, [12:12] -looksLikeCoasting = bits, U32, 1320, [13:13] -looksLikeCrankToIdle = bits, U32, 1320, [14:14] -isIdleCoasting = bits, U32, 1320, [15:15] -isIdleClosedLoop = bits, U32, 1320, [16:16] -idleTarget = scalar, S32, 1324, "", 1, 0 -targetRpmByClt = scalar, S32, 1328, "", 1, 0 -targetRpmAc = scalar, S32, 1332, "", 1, 0 -iacByRpmTaper = scalar, F32, 1336 -luaAdd = scalar, F32, 1340 -; total TS size = 1344 -idlePosition = scalar, F32, 1344, "per", 1,0 -trim = scalar, F32, 1348, "", 1, 0 -luaAdjustment = scalar, F32, 1352, "per", 1,0 -m_wastegatePosition = scalar, F32, 1356, "per", 1,0 -etbFeedForward = scalar, F32, 1360 -etbIntegralError = scalar, F32, 1364, "", 1, 0 -etbCurrentTarget = scalar, F32, 1368, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1372, "%", 1, 0 -etbRevLimitActive = bits, U32, 1376, [0:0] -jamDetected = bits, U32, 1376, [1:1] -etbDutyRateOfChange = scalar, F32, 1380, "per", 1,0 -etbDutyAverage = scalar, F32, 1384, "per", 1,0 -etbTpsErrorCounter = scalar, U16, 1388, "count", 1,0 -etbPpsErrorCounter = scalar, U16, 1390, "count", 1,0 -etbErrorCode = scalar, S08, 1392, "", 1, 0 -jamTimer = scalar, U16, 1394, "sec", 0.01, 0 -; total TS size = 1396 -faultCode = scalar, U08, 1396, "", 1, 0 -heaterDuty = scalar, U08, 1397, "%", 1, 0 -pumpDuty = scalar, U08, 1398, "%", 1, 0 -tempC = scalar, U16, 1400, "C", 1, 0 -nernstVoltage = scalar, U16, 1402, "V", 0.001, 0 -esr = scalar, U16, 1404, "ohm", 1, 0 -; total TS size = 1408 -dcOutput0 = scalar, F32, 1408, "per", 1,0 -isEnabled0_int = scalar, U08, 1412, "per", 1,0 -isEnabled0 = bits, U32, 1416, [0:0] -; total TS size = 1420 -value0 = scalar, U16, 1420, "value", 1,0 -value1 = scalar, U16, 1422, "value", 1,0 -errorRate = scalar, F32, 1424, "ratio", 1,0 -; total TS size = 1428 -vvtTarget = scalar, U16, 1428, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1430, "%", 0.5, 0 +m_hasSynchronizedPhase = bits, U32, 1288, [0:0] +; total TS size = 1292 +wallFuelCorrection = scalar, F32, 1292, "", 1, 0 +wallFuel = scalar, F32, 1296, "", 1, 0 +; total TS size = 1300 +idleState = bits, S32, 1300, [0:2], "not important" +currentIdlePosition = scalar, F32, 1304 +baseIdlePosition = scalar, F32, 1308 +idleClosedLoop = scalar, F32, 1312 +iacByTpsTaper = scalar, F32, 1316 +throttlePedalUpState = scalar, S32, 1320, "", 1, 0 +mightResetPid = bits, U32, 1324, [0:0] +shouldResetPid = bits, U32, 1324, [1:1] +wasResetPid = bits, U32, 1324, [2:2] +mustResetPid = bits, U32, 1324, [3:3] +isCranking = bits, U32, 1324, [4:4] +isIacTableForCoasting = bits, U32, 1324, [5:5] +notIdling = bits, U32, 1324, [6:6] +needReset = bits, U32, 1324, [7:7] +isInDeadZone = bits, U32, 1324, [8:8] +isBlipping = bits, U32, 1324, [9:9] +useClosedLoop = bits, U32, 1324, [10:10] +badTps = bits, U32, 1324, [11:11] +looksLikeRunning = bits, U32, 1324, [12:12] +looksLikeCoasting = bits, U32, 1324, [13:13] +looksLikeCrankToIdle = bits, U32, 1324, [14:14] +isIdleCoasting = bits, U32, 1324, [15:15] +isIdleClosedLoop = bits, U32, 1324, [16:16] +idleTarget = scalar, S32, 1328, "", 1, 0 +targetRpmByClt = scalar, S32, 1332, "", 1, 0 +targetRpmAc = scalar, S32, 1336, "", 1, 0 +iacByRpmTaper = scalar, F32, 1340 +luaAdd = scalar, F32, 1344 +; total TS size = 1348 +idlePosition = scalar, F32, 1348, "per", 1,0 +trim = scalar, F32, 1352, "", 1, 0 +luaAdjustment = scalar, F32, 1356, "per", 1,0 +m_wastegatePosition = scalar, F32, 1360, "per", 1,0 +etbFeedForward = scalar, F32, 1364 +etbIntegralError = scalar, F32, 1368, "", 1, 0 +etbCurrentTarget = scalar, F32, 1372, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1376, "%", 1, 0 +etbRevLimitActive = bits, U32, 1380, [0:0] +jamDetected = bits, U32, 1380, [1:1] +etbDutyRateOfChange = scalar, F32, 1384, "per", 1,0 +etbDutyAverage = scalar, F32, 1388, "per", 1,0 +etbTpsErrorCounter = scalar, U16, 1392, "count", 1,0 +etbPpsErrorCounter = scalar, U16, 1394, "count", 1,0 +etbErrorCode = scalar, S08, 1396, "", 1, 0 +jamTimer = scalar, U16, 1398, "sec", 0.01, 0 +; total TS size = 1400 +faultCode = scalar, U08, 1400, "", 1, 0 +heaterDuty = scalar, U08, 1401, "%", 1, 0 +pumpDuty = scalar, U08, 1402, "%", 1, 0 +tempC = scalar, U16, 1404, "C", 1, 0 +nernstVoltage = scalar, U16, 1406, "V", 0.001, 0 +esr = scalar, U16, 1408, "ohm", 1, 0 +; total TS size = 1412 +dcOutput0 = scalar, F32, 1412, "per", 1,0 +isEnabled0_int = scalar, U08, 1416, "per", 1,0 +isEnabled0 = bits, U32, 1420, [0:0] +; total TS size = 1424 +value0 = scalar, U16, 1424, "value", 1,0 +value1 = scalar, U16, 1426, "value", 1,0 +errorRate = scalar, F32, 1428, "ratio", 1,0 ; total TS size = 1432 -lambdaCurrentlyGood = bits, U32, 1432, [0:0] -lambdaMonitorCut = bits, U32, 1432, [1:1] -lambdaTimeSinceGood = scalar, U16, 1436, "sec", 0.01, 0 -; total TS size = 1440 +vvtTarget = scalar, U16, 1432, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1434, "%", 0.5, 0 +; total TS size = 1436 +lambdaCurrentlyGood = bits, U32, 1436, [0:0] +lambdaMonitorCut = bits, U32, 1436, [1:1] +lambdaTimeSinceGood = scalar, U16, 1440, "sec", 0.01, 0 +; total TS size = 1444 time = { timeNow } @@ -5196,6 +5197,7 @@ entry = brakePedalState, "Brake switch", int, "%d" entry = startStopState, "startStopState", int, "%d" entry = startStopPhysicalState, "startStopPhysicalState", int, "%d" entry = startStopStateToggleCounter, "startStopStateToggleCounter", int, "%d" +entry = startStopStateTempPhysicalCounter, "startStopStateTempPhysicalCounter", int, "%d" entry = egtValue1, "egtValue1", float, "%.3f" entry = egtValue2, "egtValue2", float, "%.3f" entry = desiredRpmLimit, "User-defined RPM hard limit", int, "%d" @@ -6078,13 +6080,14 @@ dialog = engine_stateDialog, "engine_state" graphLine = brakePedalState graphLine = startStopState graphLine = startStopStateToggleCounter - graphLine = egtValue1 + graphLine = startStopStateTempPhysicalCounter liveGraph = engine_state_5_Graph, "Graph", South + graphLine = egtValue1 graphLine = egtValue2 graphLine = desiredRpmLimit graphLine = fuelInjectionCounter - graphLine = sparkCounter liveGraph = engine_state_6_Graph, "Graph", South + graphLine = sparkCounter graphLine = fuelingLoad graphLine = ignitionLoad graphLine = veTableYAxis @@ -6419,8 +6422,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" ; cam if ; two-stroke, or ; not crank trigger and ((vague trigger and cam choice) or not vague trigger) - field = "Cam Sensor (Primary channel)", triggerInputPins1, 1, {twoStroke == 1 || ( !(trigger_type == 2 || trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 21 || trigger_type == 26 || trigger_type == 27 || trigger_type == 33 || trigger_type == 38 || trigger_type == 39 || trigger_type == 44 || trigger_type == 45 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 58 || trigger_type == 61 || trigger_type == 62 || trigger_type == 68 || trigger_type == 70 || trigger_type == 71 || trigger_type == 72 || trigger_type == 74 || trigger_type == 75 || trigger_type == 76 || trigger_type == 77 || trigger_type == 79) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) ) ) } - field = "Crank Sensor (Primary channel)", triggerInputPins1, 1, { !(twoStroke == 1 || ( !(trigger_type == 2 || trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 21 || trigger_type == 26 || trigger_type == 27 || trigger_type == 33 || trigger_type == 38 || trigger_type == 39 || trigger_type == 44 || trigger_type == 45 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 58 || trigger_type == 61 || trigger_type == 62 || trigger_type == 68 || trigger_type == 70 || trigger_type == 71 || trigger_type == 72 || trigger_type == 74 || trigger_type == 75 || trigger_type == 76 || trigger_type == 77 || trigger_type == 79) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) ) )) } + field = "Cam Sensor (Primary channel)", triggerInputPins1, 1, {twoStroke == 1 || ( !(trigger_type == 2 || trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 21 || trigger_type == 26 || trigger_type == 27 || trigger_type == 33 || trigger_type == 38 || trigger_type == 39 || trigger_type == 44 || trigger_type == 45 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 58 || trigger_type == 61 || trigger_type == 62 || trigger_type == 68 || trigger_type == 70 || trigger_type == 71 || trigger_type == 72 || trigger_type == 74 || trigger_type == 75 || trigger_type == 76 || trigger_type == 77) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) ) ) } + field = "Crank Sensor (Primary channel)", triggerInputPins1, 1, { !(twoStroke == 1 || ( !(trigger_type == 2 || trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 21 || trigger_type == 26 || trigger_type == 27 || trigger_type == 33 || trigger_type == 38 || trigger_type == 39 || trigger_type == 44 || trigger_type == 45 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 58 || trigger_type == 61 || trigger_type == 62 || trigger_type == 68 || trigger_type == 70 || trigger_type == 71 || trigger_type == 72 || trigger_type == 74 || trigger_type == 75 || trigger_type == 76 || trigger_type == 77) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) ) )) } field = "Invert Primary", invertPrimaryTriggerSignal field = "Secondary channel", triggerInputPins2, { triggerInputPins2 != 0 || (triggerInputPins1 != 0 && (trigger_type == 1 || trigger_type == 3 || trigger_type == 15 || trigger_type == 16 || trigger_type == 19 || trigger_type == 25 || trigger_type == 28 || trigger_type == 31 || trigger_type == 35 || trigger_type == 36 || trigger_type == 37 || trigger_type == 40 || trigger_type == 49 || trigger_type == 50 || trigger_type == 53 || trigger_type == 54 || trigger_type == 63 || trigger_type == 64) ) } field = "Invert Secondary", invertSecondaryTriggerSignal, {triggerInputPins2 != 0 && (trigger_type == 1 || trigger_type == 3 || trigger_type == 15 || trigger_type == 16 || trigger_type == 19 || trigger_type == 25 || trigger_type == 28 || trigger_type == 31 || trigger_type == 35 || trigger_type == 36 || trigger_type == 37 || trigger_type == 40 || trigger_type == 49 || trigger_type == 50 || trigger_type == 53 || trigger_type == 54 || trigger_type == 63 || trigger_type == 64) } diff --git a/firmware/tunerstudio/generated/rusefi_hellen-112-17.ini b/firmware/tunerstudio/generated/rusefi_hellen-112-17.ini index 96c73883aa..e1ac4398e9 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen-112-17.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen-112-17.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.11.08.hellen-112-17.1343953697" + signature = "rusEFI master.2023.11.09.hellen-112-17.1128775287" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.11.08.hellen-112-17.1343953697" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.11.09.hellen-112-17.1128775287" ; 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 @@ -92,7 +92,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","220 TPS Throttle Position 2","114 Analog Input","INVALID","121 PPS1","203 TPS Throttle Position 1","INVALID","107 TODO","119 Analog Input","110 Analog Input","INVALID","219 MAP","109 Analog Input","215 CLT","227 IAT","111 Analog Input","112 Analog Input" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Nov 08 20:02:21 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Thu Nov 09 02:07:12 UTC 2023 pageSize = 23880 page = 1 @@ -2347,7 +2347,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23870, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1440 + ochBlockSize = 1444 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3001,136 +3001,137 @@ brakePedalState = scalar, S08, 1092, "", 1, 0 startStopState = scalar, S08, 1093, "", 1, 0 startStopPhysicalState = bits, U32, 1096, [0:0] startStopStateToggleCounter = scalar, U32, 1100, "", 1, 0 -egtValue1 = scalar, F32, 1104, "", 1, 0 -egtValue2 = scalar, F32, 1108, "", 1, 0 -desiredRpmLimit = scalar, S16, 1112, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1116, "", 1, 0 -sparkCounter = scalar, U32, 1120, "", 1, 0 -fuelingLoad = scalar, F32, 1124, "", 1, 0 -ignitionLoad = scalar, F32, 1128, "", 1, 0 -veTableYAxis = scalar, U16, 1132, "%", 0.01, 0 -; total TS size = 1136 -tpsFrom = scalar, F32, 1136 -tpsTo = scalar, F32, 1140 -deltaTps = scalar, F32, 1144 -extraFuel = scalar, F32, 1148, "", 1, 0 -valueFromTable = scalar, F32, 1152, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1156, [0:0] -isBelowDecelThreshold = bits, U32, 1156, [1:1] -isTimeToResetAccumulator = bits, U32, 1156, [2:2] -isFractionalEnrichment = bits, U32, 1156, [3:3] -belowEpsilon = bits, U32, 1156, [4:4] -tooShort = bits, U32, 1156, [5:5] -fractionalInjFuel = scalar, F32, 1160, "", 1, 0 -accumulatedValue = scalar, F32, 1164, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1168, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1172, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1176, "", 1, 0 -cycleCnt = scalar, S32, 1180, "", 1, 0 -; total TS size = 1184 -hwEventCounters1 = scalar, U32, 1184, "", 1, 0 -hwEventCounters2 = scalar, U32, 1188, "", 1, 0 -hwEventCounters3 = scalar, U32, 1192, "", 1, 0 -hwEventCounters4 = scalar, U32, 1196, "", 1, 0 -hwEventCounters5 = scalar, U32, 1200, "", 1, 0 -hwEventCounters6 = scalar, U32, 1204, "", 1, 0 -vvtCamCounter = scalar, U32, 1208, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1212, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1216, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1220, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1221, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1224, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1228, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1232, "", 1, 0 -mapCamPrevToothAngle = scalar, F32, 1236, "deg", 1, 0 -isDecodingMapCam = bits, U32, 1240, [0:0] -; total TS size = 1244 -crankSynchronizationCounter = scalar, U32, 1244, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1248, "", 1, 0 -vvtToothDurations0 = scalar, U32, 1252, "us", 1, 0 -vvtCurrentPosition = scalar, F32, 1256, "sync: Primary Cam Position", 1, 0 -vvtToothPosition1 = scalar, F32, 1260, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition2 = scalar, F32, 1264, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition3 = scalar, F32, 1268, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition4 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio = scalar, F32, 1276, "", 1, 0 -triggerStateIndex = scalar, U08, 1280, "", 1, 0 -camResyncCounter = scalar, U08, 1281, "", 1, 0 -vvtStateIndex = scalar, U08, 1282, "", 1, 0 -; total TS size = 1284 -m_hasSynchronizedPhase = bits, U32, 1284, [0:0] +startStopStateTempPhysicalCounter = scalar, U32, 1104, "", 1, 0 +egtValue1 = scalar, F32, 1108, "", 1, 0 +egtValue2 = scalar, F32, 1112, "", 1, 0 +desiredRpmLimit = scalar, S16, 1116, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 1120, "", 1, 0 +sparkCounter = scalar, U32, 1124, "", 1, 0 +fuelingLoad = scalar, F32, 1128, "", 1, 0 +ignitionLoad = scalar, F32, 1132, "", 1, 0 +veTableYAxis = scalar, U16, 1136, "%", 0.01, 0 +; total TS size = 1140 +tpsFrom = scalar, F32, 1140 +tpsTo = scalar, F32, 1144 +deltaTps = scalar, F32, 1148 +extraFuel = scalar, F32, 1152, "", 1, 0 +valueFromTable = scalar, F32, 1156, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1160, [0:0] +isBelowDecelThreshold = bits, U32, 1160, [1:1] +isTimeToResetAccumulator = bits, U32, 1160, [2:2] +isFractionalEnrichment = bits, U32, 1160, [3:3] +belowEpsilon = bits, U32, 1160, [4:4] +tooShort = bits, U32, 1160, [5:5] +fractionalInjFuel = scalar, F32, 1164, "", 1, 0 +accumulatedValue = scalar, F32, 1168, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1172, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1176, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1180, "", 1, 0 +cycleCnt = scalar, S32, 1184, "", 1, 0 +; total TS size = 1188 +hwEventCounters1 = scalar, U32, 1188, "", 1, 0 +hwEventCounters2 = scalar, U32, 1192, "", 1, 0 +hwEventCounters3 = scalar, U32, 1196, "", 1, 0 +hwEventCounters4 = scalar, U32, 1200, "", 1, 0 +hwEventCounters5 = scalar, U32, 1204, "", 1, 0 +hwEventCounters6 = scalar, U32, 1208, "", 1, 0 +vvtCamCounter = scalar, U32, 1212, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1216, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1220, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1224, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1225, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1228, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1232, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1236, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1240, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1244, [0:0] +; total TS size = 1248 +crankSynchronizationCounter = scalar, U32, 1248, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1252, "", 1, 0 +vvtToothDurations0 = scalar, U32, 1256, "us", 1, 0 +vvtCurrentPosition = scalar, F32, 1260, "sync: Primary Cam Position", 1, 0 +vvtToothPosition1 = scalar, F32, 1264, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition2 = scalar, F32, 1268, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition3 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition4 = scalar, F32, 1276, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio = scalar, F32, 1280, "", 1, 0 +triggerStateIndex = scalar, U08, 1284, "", 1, 0 +camResyncCounter = scalar, U08, 1285, "", 1, 0 +vvtStateIndex = scalar, U08, 1286, "", 1, 0 ; total TS size = 1288 -wallFuelCorrection = scalar, F32, 1288, "", 1, 0 -wallFuel = scalar, F32, 1292, "", 1, 0 -; total TS size = 1296 -idleState = bits, S32, 1296, [0:2], "not important" -currentIdlePosition = scalar, F32, 1300 -baseIdlePosition = scalar, F32, 1304 -idleClosedLoop = scalar, F32, 1308 -iacByTpsTaper = scalar, F32, 1312 -throttlePedalUpState = scalar, S32, 1316, "", 1, 0 -mightResetPid = bits, U32, 1320, [0:0] -shouldResetPid = bits, U32, 1320, [1:1] -wasResetPid = bits, U32, 1320, [2:2] -mustResetPid = bits, U32, 1320, [3:3] -isCranking = bits, U32, 1320, [4:4] -isIacTableForCoasting = bits, U32, 1320, [5:5] -notIdling = bits, U32, 1320, [6:6] -needReset = bits, U32, 1320, [7:7] -isInDeadZone = bits, U32, 1320, [8:8] -isBlipping = bits, U32, 1320, [9:9] -useClosedLoop = bits, U32, 1320, [10:10] -badTps = bits, U32, 1320, [11:11] -looksLikeRunning = bits, U32, 1320, [12:12] -looksLikeCoasting = bits, U32, 1320, [13:13] -looksLikeCrankToIdle = bits, U32, 1320, [14:14] -isIdleCoasting = bits, U32, 1320, [15:15] -isIdleClosedLoop = bits, U32, 1320, [16:16] -idleTarget = scalar, S32, 1324, "", 1, 0 -targetRpmByClt = scalar, S32, 1328, "", 1, 0 -targetRpmAc = scalar, S32, 1332, "", 1, 0 -iacByRpmTaper = scalar, F32, 1336 -luaAdd = scalar, F32, 1340 -; total TS size = 1344 -idlePosition = scalar, F32, 1344, "per", 1,0 -trim = scalar, F32, 1348, "", 1, 0 -luaAdjustment = scalar, F32, 1352, "per", 1,0 -m_wastegatePosition = scalar, F32, 1356, "per", 1,0 -etbFeedForward = scalar, F32, 1360 -etbIntegralError = scalar, F32, 1364, "", 1, 0 -etbCurrentTarget = scalar, F32, 1368, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1372, "%", 1, 0 -etbRevLimitActive = bits, U32, 1376, [0:0] -jamDetected = bits, U32, 1376, [1:1] -etbDutyRateOfChange = scalar, F32, 1380, "per", 1,0 -etbDutyAverage = scalar, F32, 1384, "per", 1,0 -etbTpsErrorCounter = scalar, U16, 1388, "count", 1,0 -etbPpsErrorCounter = scalar, U16, 1390, "count", 1,0 -etbErrorCode = scalar, S08, 1392, "", 1, 0 -jamTimer = scalar, U16, 1394, "sec", 0.01, 0 -; total TS size = 1396 -faultCode = scalar, U08, 1396, "", 1, 0 -heaterDuty = scalar, U08, 1397, "%", 1, 0 -pumpDuty = scalar, U08, 1398, "%", 1, 0 -tempC = scalar, U16, 1400, "C", 1, 0 -nernstVoltage = scalar, U16, 1402, "V", 0.001, 0 -esr = scalar, U16, 1404, "ohm", 1, 0 -; total TS size = 1408 -dcOutput0 = scalar, F32, 1408, "per", 1,0 -isEnabled0_int = scalar, U08, 1412, "per", 1,0 -isEnabled0 = bits, U32, 1416, [0:0] -; total TS size = 1420 -value0 = scalar, U16, 1420, "value", 1,0 -value1 = scalar, U16, 1422, "value", 1,0 -errorRate = scalar, F32, 1424, "ratio", 1,0 -; total TS size = 1428 -vvtTarget = scalar, U16, 1428, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1430, "%", 0.5, 0 +m_hasSynchronizedPhase = bits, U32, 1288, [0:0] +; total TS size = 1292 +wallFuelCorrection = scalar, F32, 1292, "", 1, 0 +wallFuel = scalar, F32, 1296, "", 1, 0 +; total TS size = 1300 +idleState = bits, S32, 1300, [0:2], "not important" +currentIdlePosition = scalar, F32, 1304 +baseIdlePosition = scalar, F32, 1308 +idleClosedLoop = scalar, F32, 1312 +iacByTpsTaper = scalar, F32, 1316 +throttlePedalUpState = scalar, S32, 1320, "", 1, 0 +mightResetPid = bits, U32, 1324, [0:0] +shouldResetPid = bits, U32, 1324, [1:1] +wasResetPid = bits, U32, 1324, [2:2] +mustResetPid = bits, U32, 1324, [3:3] +isCranking = bits, U32, 1324, [4:4] +isIacTableForCoasting = bits, U32, 1324, [5:5] +notIdling = bits, U32, 1324, [6:6] +needReset = bits, U32, 1324, [7:7] +isInDeadZone = bits, U32, 1324, [8:8] +isBlipping = bits, U32, 1324, [9:9] +useClosedLoop = bits, U32, 1324, [10:10] +badTps = bits, U32, 1324, [11:11] +looksLikeRunning = bits, U32, 1324, [12:12] +looksLikeCoasting = bits, U32, 1324, [13:13] +looksLikeCrankToIdle = bits, U32, 1324, [14:14] +isIdleCoasting = bits, U32, 1324, [15:15] +isIdleClosedLoop = bits, U32, 1324, [16:16] +idleTarget = scalar, S32, 1328, "", 1, 0 +targetRpmByClt = scalar, S32, 1332, "", 1, 0 +targetRpmAc = scalar, S32, 1336, "", 1, 0 +iacByRpmTaper = scalar, F32, 1340 +luaAdd = scalar, F32, 1344 +; total TS size = 1348 +idlePosition = scalar, F32, 1348, "per", 1,0 +trim = scalar, F32, 1352, "", 1, 0 +luaAdjustment = scalar, F32, 1356, "per", 1,0 +m_wastegatePosition = scalar, F32, 1360, "per", 1,0 +etbFeedForward = scalar, F32, 1364 +etbIntegralError = scalar, F32, 1368, "", 1, 0 +etbCurrentTarget = scalar, F32, 1372, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1376, "%", 1, 0 +etbRevLimitActive = bits, U32, 1380, [0:0] +jamDetected = bits, U32, 1380, [1:1] +etbDutyRateOfChange = scalar, F32, 1384, "per", 1,0 +etbDutyAverage = scalar, F32, 1388, "per", 1,0 +etbTpsErrorCounter = scalar, U16, 1392, "count", 1,0 +etbPpsErrorCounter = scalar, U16, 1394, "count", 1,0 +etbErrorCode = scalar, S08, 1396, "", 1, 0 +jamTimer = scalar, U16, 1398, "sec", 0.01, 0 +; total TS size = 1400 +faultCode = scalar, U08, 1400, "", 1, 0 +heaterDuty = scalar, U08, 1401, "%", 1, 0 +pumpDuty = scalar, U08, 1402, "%", 1, 0 +tempC = scalar, U16, 1404, "C", 1, 0 +nernstVoltage = scalar, U16, 1406, "V", 0.001, 0 +esr = scalar, U16, 1408, "ohm", 1, 0 +; total TS size = 1412 +dcOutput0 = scalar, F32, 1412, "per", 1,0 +isEnabled0_int = scalar, U08, 1416, "per", 1,0 +isEnabled0 = bits, U32, 1420, [0:0] +; total TS size = 1424 +value0 = scalar, U16, 1424, "value", 1,0 +value1 = scalar, U16, 1426, "value", 1,0 +errorRate = scalar, F32, 1428, "ratio", 1,0 ; total TS size = 1432 -lambdaCurrentlyGood = bits, U32, 1432, [0:0] -lambdaMonitorCut = bits, U32, 1432, [1:1] -lambdaTimeSinceGood = scalar, U16, 1436, "sec", 0.01, 0 -; total TS size = 1440 +vvtTarget = scalar, U16, 1432, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1434, "%", 0.5, 0 +; total TS size = 1436 +lambdaCurrentlyGood = bits, U32, 1436, [0:0] +lambdaMonitorCut = bits, U32, 1436, [1:1] +lambdaTimeSinceGood = scalar, U16, 1440, "sec", 0.01, 0 +; total TS size = 1444 time = { timeNow } @@ -5196,6 +5197,7 @@ entry = brakePedalState, "Brake switch", int, "%d" entry = startStopState, "startStopState", int, "%d" entry = startStopPhysicalState, "startStopPhysicalState", int, "%d" entry = startStopStateToggleCounter, "startStopStateToggleCounter", int, "%d" +entry = startStopStateTempPhysicalCounter, "startStopStateTempPhysicalCounter", int, "%d" entry = egtValue1, "egtValue1", float, "%.3f" entry = egtValue2, "egtValue2", float, "%.3f" entry = desiredRpmLimit, "User-defined RPM hard limit", int, "%d" @@ -6076,13 +6078,14 @@ dialog = engine_stateDialog, "engine_state" graphLine = brakePedalState graphLine = startStopState graphLine = startStopStateToggleCounter - graphLine = egtValue1 + graphLine = startStopStateTempPhysicalCounter liveGraph = engine_state_5_Graph, "Graph", South + graphLine = egtValue1 graphLine = egtValue2 graphLine = desiredRpmLimit graphLine = fuelInjectionCounter - graphLine = sparkCounter liveGraph = engine_state_6_Graph, "Graph", South + graphLine = sparkCounter graphLine = fuelingLoad graphLine = ignitionLoad graphLine = veTableYAxis @@ -6418,8 +6421,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" ; cam if ; two-stroke, or ; not crank trigger and ((vague trigger and cam choice) or not vague trigger) - field = "Cam Sensor (Primary channel)", triggerInputPins1, 1, {twoStroke == 1 || ( !(trigger_type == 2 || trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 21 || trigger_type == 26 || trigger_type == 27 || trigger_type == 33 || trigger_type == 38 || trigger_type == 39 || trigger_type == 44 || trigger_type == 45 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 58 || trigger_type == 61 || trigger_type == 62 || trigger_type == 68 || trigger_type == 70 || trigger_type == 71 || trigger_type == 72 || trigger_type == 74 || trigger_type == 75 || trigger_type == 76 || trigger_type == 77 || trigger_type == 79) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) ) ) } - field = "Crank Sensor (Primary channel)", triggerInputPins1, 1, { !(twoStroke == 1 || ( !(trigger_type == 2 || trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 21 || trigger_type == 26 || trigger_type == 27 || trigger_type == 33 || trigger_type == 38 || trigger_type == 39 || trigger_type == 44 || trigger_type == 45 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 58 || trigger_type == 61 || trigger_type == 62 || trigger_type == 68 || trigger_type == 70 || trigger_type == 71 || trigger_type == 72 || trigger_type == 74 || trigger_type == 75 || trigger_type == 76 || trigger_type == 77 || trigger_type == 79) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) ) )) } + field = "Cam Sensor (Primary channel)", triggerInputPins1, 1, {twoStroke == 1 || ( !(trigger_type == 2 || trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 21 || trigger_type == 26 || trigger_type == 27 || trigger_type == 33 || trigger_type == 38 || trigger_type == 39 || trigger_type == 44 || trigger_type == 45 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 58 || trigger_type == 61 || trigger_type == 62 || trigger_type == 68 || trigger_type == 70 || trigger_type == 71 || trigger_type == 72 || trigger_type == 74 || trigger_type == 75 || trigger_type == 76 || trigger_type == 77) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) ) ) } + field = "Crank Sensor (Primary channel)", triggerInputPins1, 1, { !(twoStroke == 1 || ( !(trigger_type == 2 || trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 21 || trigger_type == 26 || trigger_type == 27 || trigger_type == 33 || trigger_type == 38 || trigger_type == 39 || trigger_type == 44 || trigger_type == 45 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 58 || trigger_type == 61 || trigger_type == 62 || trigger_type == 68 || trigger_type == 70 || trigger_type == 71 || trigger_type == 72 || trigger_type == 74 || trigger_type == 75 || trigger_type == 76 || trigger_type == 77) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) ) )) } field = "Invert Primary", invertPrimaryTriggerSignal field = "Secondary channel", triggerInputPins2, { triggerInputPins2 != 0 || (triggerInputPins1 != 0 && (trigger_type == 1 || trigger_type == 3 || trigger_type == 15 || trigger_type == 16 || trigger_type == 19 || trigger_type == 25 || trigger_type == 28 || trigger_type == 31 || trigger_type == 35 || trigger_type == 36 || trigger_type == 37 || trigger_type == 40 || trigger_type == 49 || trigger_type == 50 || trigger_type == 53 || trigger_type == 54 || trigger_type == 63 || trigger_type == 64) ) } field = "Invert Secondary", invertSecondaryTriggerSignal, {triggerInputPins2 != 0 && (trigger_type == 1 || trigger_type == 3 || trigger_type == 15 || trigger_type == 16 || trigger_type == 19 || trigger_type == 25 || trigger_type == 28 || trigger_type == 31 || trigger_type == 35 || trigger_type == 36 || trigger_type == 37 || trigger_type == 40 || trigger_type == 49 || trigger_type == 50 || trigger_type == 53 || trigger_type == 54 || trigger_type == 63 || trigger_type == 64) } diff --git a/firmware/tunerstudio/generated/rusefi_hellen-112-mg1.ini b/firmware/tunerstudio/generated/rusefi_hellen-112-mg1.ini index 8b645a4517..16b156699c 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen-112-mg1.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen-112-mg1.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.11.08.hellen-112-mg1.3828826975" + signature = "rusEFI master.2023.11.09.hellen-112-mg1.4151043593" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.11.08.hellen-112-mg1.3828826975" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.11.09.hellen-112-mg1.4151043593" ; 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 @@ -92,7 +92,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.jar based on (unknown script) integration/rusefi_config.txt Wed Nov 08 20:02:24 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Thu Nov 09 02:07:15 UTC 2023 pageSize = 23880 page = 1 @@ -2347,7 +2347,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23870, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1440 + ochBlockSize = 1444 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3001,136 +3001,137 @@ brakePedalState = scalar, S08, 1092, "", 1, 0 startStopState = scalar, S08, 1093, "", 1, 0 startStopPhysicalState = bits, U32, 1096, [0:0] startStopStateToggleCounter = scalar, U32, 1100, "", 1, 0 -egtValue1 = scalar, F32, 1104, "", 1, 0 -egtValue2 = scalar, F32, 1108, "", 1, 0 -desiredRpmLimit = scalar, S16, 1112, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1116, "", 1, 0 -sparkCounter = scalar, U32, 1120, "", 1, 0 -fuelingLoad = scalar, F32, 1124, "", 1, 0 -ignitionLoad = scalar, F32, 1128, "", 1, 0 -veTableYAxis = scalar, U16, 1132, "%", 0.01, 0 -; total TS size = 1136 -tpsFrom = scalar, F32, 1136 -tpsTo = scalar, F32, 1140 -deltaTps = scalar, F32, 1144 -extraFuel = scalar, F32, 1148, "", 1, 0 -valueFromTable = scalar, F32, 1152, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1156, [0:0] -isBelowDecelThreshold = bits, U32, 1156, [1:1] -isTimeToResetAccumulator = bits, U32, 1156, [2:2] -isFractionalEnrichment = bits, U32, 1156, [3:3] -belowEpsilon = bits, U32, 1156, [4:4] -tooShort = bits, U32, 1156, [5:5] -fractionalInjFuel = scalar, F32, 1160, "", 1, 0 -accumulatedValue = scalar, F32, 1164, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1168, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1172, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1176, "", 1, 0 -cycleCnt = scalar, S32, 1180, "", 1, 0 -; total TS size = 1184 -hwEventCounters1 = scalar, U32, 1184, "", 1, 0 -hwEventCounters2 = scalar, U32, 1188, "", 1, 0 -hwEventCounters3 = scalar, U32, 1192, "", 1, 0 -hwEventCounters4 = scalar, U32, 1196, "", 1, 0 -hwEventCounters5 = scalar, U32, 1200, "", 1, 0 -hwEventCounters6 = scalar, U32, 1204, "", 1, 0 -vvtCamCounter = scalar, U32, 1208, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1212, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1216, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1220, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1221, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1224, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1228, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1232, "", 1, 0 -mapCamPrevToothAngle = scalar, F32, 1236, "deg", 1, 0 -isDecodingMapCam = bits, U32, 1240, [0:0] -; total TS size = 1244 -crankSynchronizationCounter = scalar, U32, 1244, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1248, "", 1, 0 -vvtToothDurations0 = scalar, U32, 1252, "us", 1, 0 -vvtCurrentPosition = scalar, F32, 1256, "sync: Primary Cam Position", 1, 0 -vvtToothPosition1 = scalar, F32, 1260, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition2 = scalar, F32, 1264, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition3 = scalar, F32, 1268, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition4 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio = scalar, F32, 1276, "", 1, 0 -triggerStateIndex = scalar, U08, 1280, "", 1, 0 -camResyncCounter = scalar, U08, 1281, "", 1, 0 -vvtStateIndex = scalar, U08, 1282, "", 1, 0 -; total TS size = 1284 -m_hasSynchronizedPhase = bits, U32, 1284, [0:0] +startStopStateTempPhysicalCounter = scalar, U32, 1104, "", 1, 0 +egtValue1 = scalar, F32, 1108, "", 1, 0 +egtValue2 = scalar, F32, 1112, "", 1, 0 +desiredRpmLimit = scalar, S16, 1116, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 1120, "", 1, 0 +sparkCounter = scalar, U32, 1124, "", 1, 0 +fuelingLoad = scalar, F32, 1128, "", 1, 0 +ignitionLoad = scalar, F32, 1132, "", 1, 0 +veTableYAxis = scalar, U16, 1136, "%", 0.01, 0 +; total TS size = 1140 +tpsFrom = scalar, F32, 1140 +tpsTo = scalar, F32, 1144 +deltaTps = scalar, F32, 1148 +extraFuel = scalar, F32, 1152, "", 1, 0 +valueFromTable = scalar, F32, 1156, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1160, [0:0] +isBelowDecelThreshold = bits, U32, 1160, [1:1] +isTimeToResetAccumulator = bits, U32, 1160, [2:2] +isFractionalEnrichment = bits, U32, 1160, [3:3] +belowEpsilon = bits, U32, 1160, [4:4] +tooShort = bits, U32, 1160, [5:5] +fractionalInjFuel = scalar, F32, 1164, "", 1, 0 +accumulatedValue = scalar, F32, 1168, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1172, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1176, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1180, "", 1, 0 +cycleCnt = scalar, S32, 1184, "", 1, 0 +; total TS size = 1188 +hwEventCounters1 = scalar, U32, 1188, "", 1, 0 +hwEventCounters2 = scalar, U32, 1192, "", 1, 0 +hwEventCounters3 = scalar, U32, 1196, "", 1, 0 +hwEventCounters4 = scalar, U32, 1200, "", 1, 0 +hwEventCounters5 = scalar, U32, 1204, "", 1, 0 +hwEventCounters6 = scalar, U32, 1208, "", 1, 0 +vvtCamCounter = scalar, U32, 1212, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1216, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1220, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1224, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1225, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1228, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1232, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1236, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1240, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1244, [0:0] +; total TS size = 1248 +crankSynchronizationCounter = scalar, U32, 1248, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1252, "", 1, 0 +vvtToothDurations0 = scalar, U32, 1256, "us", 1, 0 +vvtCurrentPosition = scalar, F32, 1260, "sync: Primary Cam Position", 1, 0 +vvtToothPosition1 = scalar, F32, 1264, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition2 = scalar, F32, 1268, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition3 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition4 = scalar, F32, 1276, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio = scalar, F32, 1280, "", 1, 0 +triggerStateIndex = scalar, U08, 1284, "", 1, 0 +camResyncCounter = scalar, U08, 1285, "", 1, 0 +vvtStateIndex = scalar, U08, 1286, "", 1, 0 ; total TS size = 1288 -wallFuelCorrection = scalar, F32, 1288, "", 1, 0 -wallFuel = scalar, F32, 1292, "", 1, 0 -; total TS size = 1296 -idleState = bits, S32, 1296, [0:2], "not important" -currentIdlePosition = scalar, F32, 1300 -baseIdlePosition = scalar, F32, 1304 -idleClosedLoop = scalar, F32, 1308 -iacByTpsTaper = scalar, F32, 1312 -throttlePedalUpState = scalar, S32, 1316, "", 1, 0 -mightResetPid = bits, U32, 1320, [0:0] -shouldResetPid = bits, U32, 1320, [1:1] -wasResetPid = bits, U32, 1320, [2:2] -mustResetPid = bits, U32, 1320, [3:3] -isCranking = bits, U32, 1320, [4:4] -isIacTableForCoasting = bits, U32, 1320, [5:5] -notIdling = bits, U32, 1320, [6:6] -needReset = bits, U32, 1320, [7:7] -isInDeadZone = bits, U32, 1320, [8:8] -isBlipping = bits, U32, 1320, [9:9] -useClosedLoop = bits, U32, 1320, [10:10] -badTps = bits, U32, 1320, [11:11] -looksLikeRunning = bits, U32, 1320, [12:12] -looksLikeCoasting = bits, U32, 1320, [13:13] -looksLikeCrankToIdle = bits, U32, 1320, [14:14] -isIdleCoasting = bits, U32, 1320, [15:15] -isIdleClosedLoop = bits, U32, 1320, [16:16] -idleTarget = scalar, S32, 1324, "", 1, 0 -targetRpmByClt = scalar, S32, 1328, "", 1, 0 -targetRpmAc = scalar, S32, 1332, "", 1, 0 -iacByRpmTaper = scalar, F32, 1336 -luaAdd = scalar, F32, 1340 -; total TS size = 1344 -idlePosition = scalar, F32, 1344, "per", 1,0 -trim = scalar, F32, 1348, "", 1, 0 -luaAdjustment = scalar, F32, 1352, "per", 1,0 -m_wastegatePosition = scalar, F32, 1356, "per", 1,0 -etbFeedForward = scalar, F32, 1360 -etbIntegralError = scalar, F32, 1364, "", 1, 0 -etbCurrentTarget = scalar, F32, 1368, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1372, "%", 1, 0 -etbRevLimitActive = bits, U32, 1376, [0:0] -jamDetected = bits, U32, 1376, [1:1] -etbDutyRateOfChange = scalar, F32, 1380, "per", 1,0 -etbDutyAverage = scalar, F32, 1384, "per", 1,0 -etbTpsErrorCounter = scalar, U16, 1388, "count", 1,0 -etbPpsErrorCounter = scalar, U16, 1390, "count", 1,0 -etbErrorCode = scalar, S08, 1392, "", 1, 0 -jamTimer = scalar, U16, 1394, "sec", 0.01, 0 -; total TS size = 1396 -faultCode = scalar, U08, 1396, "", 1, 0 -heaterDuty = scalar, U08, 1397, "%", 1, 0 -pumpDuty = scalar, U08, 1398, "%", 1, 0 -tempC = scalar, U16, 1400, "C", 1, 0 -nernstVoltage = scalar, U16, 1402, "V", 0.001, 0 -esr = scalar, U16, 1404, "ohm", 1, 0 -; total TS size = 1408 -dcOutput0 = scalar, F32, 1408, "per", 1,0 -isEnabled0_int = scalar, U08, 1412, "per", 1,0 -isEnabled0 = bits, U32, 1416, [0:0] -; total TS size = 1420 -value0 = scalar, U16, 1420, "value", 1,0 -value1 = scalar, U16, 1422, "value", 1,0 -errorRate = scalar, F32, 1424, "ratio", 1,0 -; total TS size = 1428 -vvtTarget = scalar, U16, 1428, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1430, "%", 0.5, 0 +m_hasSynchronizedPhase = bits, U32, 1288, [0:0] +; total TS size = 1292 +wallFuelCorrection = scalar, F32, 1292, "", 1, 0 +wallFuel = scalar, F32, 1296, "", 1, 0 +; total TS size = 1300 +idleState = bits, S32, 1300, [0:2], "not important" +currentIdlePosition = scalar, F32, 1304 +baseIdlePosition = scalar, F32, 1308 +idleClosedLoop = scalar, F32, 1312 +iacByTpsTaper = scalar, F32, 1316 +throttlePedalUpState = scalar, S32, 1320, "", 1, 0 +mightResetPid = bits, U32, 1324, [0:0] +shouldResetPid = bits, U32, 1324, [1:1] +wasResetPid = bits, U32, 1324, [2:2] +mustResetPid = bits, U32, 1324, [3:3] +isCranking = bits, U32, 1324, [4:4] +isIacTableForCoasting = bits, U32, 1324, [5:5] +notIdling = bits, U32, 1324, [6:6] +needReset = bits, U32, 1324, [7:7] +isInDeadZone = bits, U32, 1324, [8:8] +isBlipping = bits, U32, 1324, [9:9] +useClosedLoop = bits, U32, 1324, [10:10] +badTps = bits, U32, 1324, [11:11] +looksLikeRunning = bits, U32, 1324, [12:12] +looksLikeCoasting = bits, U32, 1324, [13:13] +looksLikeCrankToIdle = bits, U32, 1324, [14:14] +isIdleCoasting = bits, U32, 1324, [15:15] +isIdleClosedLoop = bits, U32, 1324, [16:16] +idleTarget = scalar, S32, 1328, "", 1, 0 +targetRpmByClt = scalar, S32, 1332, "", 1, 0 +targetRpmAc = scalar, S32, 1336, "", 1, 0 +iacByRpmTaper = scalar, F32, 1340 +luaAdd = scalar, F32, 1344 +; total TS size = 1348 +idlePosition = scalar, F32, 1348, "per", 1,0 +trim = scalar, F32, 1352, "", 1, 0 +luaAdjustment = scalar, F32, 1356, "per", 1,0 +m_wastegatePosition = scalar, F32, 1360, "per", 1,0 +etbFeedForward = scalar, F32, 1364 +etbIntegralError = scalar, F32, 1368, "", 1, 0 +etbCurrentTarget = scalar, F32, 1372, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1376, "%", 1, 0 +etbRevLimitActive = bits, U32, 1380, [0:0] +jamDetected = bits, U32, 1380, [1:1] +etbDutyRateOfChange = scalar, F32, 1384, "per", 1,0 +etbDutyAverage = scalar, F32, 1388, "per", 1,0 +etbTpsErrorCounter = scalar, U16, 1392, "count", 1,0 +etbPpsErrorCounter = scalar, U16, 1394, "count", 1,0 +etbErrorCode = scalar, S08, 1396, "", 1, 0 +jamTimer = scalar, U16, 1398, "sec", 0.01, 0 +; total TS size = 1400 +faultCode = scalar, U08, 1400, "", 1, 0 +heaterDuty = scalar, U08, 1401, "%", 1, 0 +pumpDuty = scalar, U08, 1402, "%", 1, 0 +tempC = scalar, U16, 1404, "C", 1, 0 +nernstVoltage = scalar, U16, 1406, "V", 0.001, 0 +esr = scalar, U16, 1408, "ohm", 1, 0 +; total TS size = 1412 +dcOutput0 = scalar, F32, 1412, "per", 1,0 +isEnabled0_int = scalar, U08, 1416, "per", 1,0 +isEnabled0 = bits, U32, 1420, [0:0] +; total TS size = 1424 +value0 = scalar, U16, 1424, "value", 1,0 +value1 = scalar, U16, 1426, "value", 1,0 +errorRate = scalar, F32, 1428, "ratio", 1,0 ; total TS size = 1432 -lambdaCurrentlyGood = bits, U32, 1432, [0:0] -lambdaMonitorCut = bits, U32, 1432, [1:1] -lambdaTimeSinceGood = scalar, U16, 1436, "sec", 0.01, 0 -; total TS size = 1440 +vvtTarget = scalar, U16, 1432, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1434, "%", 0.5, 0 +; total TS size = 1436 +lambdaCurrentlyGood = bits, U32, 1436, [0:0] +lambdaMonitorCut = bits, U32, 1436, [1:1] +lambdaTimeSinceGood = scalar, U16, 1440, "sec", 0.01, 0 +; total TS size = 1444 time = { timeNow } @@ -5196,6 +5197,7 @@ entry = brakePedalState, "Brake switch", int, "%d" entry = startStopState, "startStopState", int, "%d" entry = startStopPhysicalState, "startStopPhysicalState", int, "%d" entry = startStopStateToggleCounter, "startStopStateToggleCounter", int, "%d" +entry = startStopStateTempPhysicalCounter, "startStopStateTempPhysicalCounter", int, "%d" entry = egtValue1, "egtValue1", float, "%.3f" entry = egtValue2, "egtValue2", float, "%.3f" entry = desiredRpmLimit, "User-defined RPM hard limit", int, "%d" @@ -6076,13 +6078,14 @@ dialog = engine_stateDialog, "engine_state" graphLine = brakePedalState graphLine = startStopState graphLine = startStopStateToggleCounter - graphLine = egtValue1 + graphLine = startStopStateTempPhysicalCounter liveGraph = engine_state_5_Graph, "Graph", South + graphLine = egtValue1 graphLine = egtValue2 graphLine = desiredRpmLimit graphLine = fuelInjectionCounter - graphLine = sparkCounter liveGraph = engine_state_6_Graph, "Graph", South + graphLine = sparkCounter graphLine = fuelingLoad graphLine = ignitionLoad graphLine = veTableYAxis @@ -6418,8 +6421,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" ; cam if ; two-stroke, or ; not crank trigger and ((vague trigger and cam choice) or not vague trigger) - field = "Cam Sensor (Primary channel)", triggerInputPins1, 1, {twoStroke == 1 || ( !(trigger_type == 2 || trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 21 || trigger_type == 26 || trigger_type == 27 || trigger_type == 33 || trigger_type == 38 || trigger_type == 39 || trigger_type == 44 || trigger_type == 45 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 58 || trigger_type == 61 || trigger_type == 62 || trigger_type == 68 || trigger_type == 70 || trigger_type == 71 || trigger_type == 72 || trigger_type == 74 || trigger_type == 75 || trigger_type == 76 || trigger_type == 77 || trigger_type == 79) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) ) ) } - field = "Crank Sensor (Primary channel)", triggerInputPins1, 1, { !(twoStroke == 1 || ( !(trigger_type == 2 || trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 21 || trigger_type == 26 || trigger_type == 27 || trigger_type == 33 || trigger_type == 38 || trigger_type == 39 || trigger_type == 44 || trigger_type == 45 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 58 || trigger_type == 61 || trigger_type == 62 || trigger_type == 68 || trigger_type == 70 || trigger_type == 71 || trigger_type == 72 || trigger_type == 74 || trigger_type == 75 || trigger_type == 76 || trigger_type == 77 || trigger_type == 79) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) ) )) } + field = "Cam Sensor (Primary channel)", triggerInputPins1, 1, {twoStroke == 1 || ( !(trigger_type == 2 || trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 21 || trigger_type == 26 || trigger_type == 27 || trigger_type == 33 || trigger_type == 38 || trigger_type == 39 || trigger_type == 44 || trigger_type == 45 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 58 || trigger_type == 61 || trigger_type == 62 || trigger_type == 68 || trigger_type == 70 || trigger_type == 71 || trigger_type == 72 || trigger_type == 74 || trigger_type == 75 || trigger_type == 76 || trigger_type == 77) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) ) ) } + field = "Crank Sensor (Primary channel)", triggerInputPins1, 1, { !(twoStroke == 1 || ( !(trigger_type == 2 || trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 21 || trigger_type == 26 || trigger_type == 27 || trigger_type == 33 || trigger_type == 38 || trigger_type == 39 || trigger_type == 44 || trigger_type == 45 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 58 || trigger_type == 61 || trigger_type == 62 || trigger_type == 68 || trigger_type == 70 || trigger_type == 71 || trigger_type == 72 || trigger_type == 74 || trigger_type == 75 || trigger_type == 76 || trigger_type == 77) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) ) )) } field = "Invert Primary", invertPrimaryTriggerSignal field = "Secondary channel", triggerInputPins2, { triggerInputPins2 != 0 || (triggerInputPins1 != 0 && (trigger_type == 1 || trigger_type == 3 || trigger_type == 15 || trigger_type == 16 || trigger_type == 19 || trigger_type == 25 || trigger_type == 28 || trigger_type == 31 || trigger_type == 35 || trigger_type == 36 || trigger_type == 37 || trigger_type == 40 || trigger_type == 49 || trigger_type == 50 || trigger_type == 53 || trigger_type == 54 || trigger_type == 63 || trigger_type == 64) ) } field = "Invert Secondary", invertSecondaryTriggerSignal, {triggerInputPins2 != 0 && (trigger_type == 1 || trigger_type == 3 || trigger_type == 15 || trigger_type == 16 || trigger_type == 19 || trigger_type == 25 || trigger_type == 28 || trigger_type == 31 || trigger_type == 35 || trigger_type == 36 || trigger_type == 37 || trigger_type == 40 || trigger_type == 49 || trigger_type == 50 || trigger_type == 53 || trigger_type == 54 || trigger_type == 63 || trigger_type == 64) } diff --git a/firmware/tunerstudio/generated/rusefi_hellen-gm-e67.ini b/firmware/tunerstudio/generated/rusefi_hellen-gm-e67.ini index 2fa5930e59..6a33bd85d3 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen-gm-e67.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen-gm-e67.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.11.08.hellen-gm-e67.2256206077" + signature = "rusEFI master.2023.11.09.hellen-gm-e67.2502319531" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.11.08.hellen-gm-e67.2256206077" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.11.09.hellen-gm-e67.2502319531" ; 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 @@ -92,7 +92,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.jar based on (unknown script) integration/rusefi_config.txt Wed Nov 08 20:02:38 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Thu Nov 09 02:07:24 UTC 2023 pageSize = 23880 page = 1 @@ -2347,7 +2347,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23870, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1440 + ochBlockSize = 1444 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3001,136 +3001,137 @@ brakePedalState = scalar, S08, 1092, "", 1, 0 startStopState = scalar, S08, 1093, "", 1, 0 startStopPhysicalState = bits, U32, 1096, [0:0] startStopStateToggleCounter = scalar, U32, 1100, "", 1, 0 -egtValue1 = scalar, F32, 1104, "", 1, 0 -egtValue2 = scalar, F32, 1108, "", 1, 0 -desiredRpmLimit = scalar, S16, 1112, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1116, "", 1, 0 -sparkCounter = scalar, U32, 1120, "", 1, 0 -fuelingLoad = scalar, F32, 1124, "", 1, 0 -ignitionLoad = scalar, F32, 1128, "", 1, 0 -veTableYAxis = scalar, U16, 1132, "%", 0.01, 0 -; total TS size = 1136 -tpsFrom = scalar, F32, 1136 -tpsTo = scalar, F32, 1140 -deltaTps = scalar, F32, 1144 -extraFuel = scalar, F32, 1148, "", 1, 0 -valueFromTable = scalar, F32, 1152, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1156, [0:0] -isBelowDecelThreshold = bits, U32, 1156, [1:1] -isTimeToResetAccumulator = bits, U32, 1156, [2:2] -isFractionalEnrichment = bits, U32, 1156, [3:3] -belowEpsilon = bits, U32, 1156, [4:4] -tooShort = bits, U32, 1156, [5:5] -fractionalInjFuel = scalar, F32, 1160, "", 1, 0 -accumulatedValue = scalar, F32, 1164, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1168, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1172, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1176, "", 1, 0 -cycleCnt = scalar, S32, 1180, "", 1, 0 -; total TS size = 1184 -hwEventCounters1 = scalar, U32, 1184, "", 1, 0 -hwEventCounters2 = scalar, U32, 1188, "", 1, 0 -hwEventCounters3 = scalar, U32, 1192, "", 1, 0 -hwEventCounters4 = scalar, U32, 1196, "", 1, 0 -hwEventCounters5 = scalar, U32, 1200, "", 1, 0 -hwEventCounters6 = scalar, U32, 1204, "", 1, 0 -vvtCamCounter = scalar, U32, 1208, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1212, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1216, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1220, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1221, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1224, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1228, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1232, "", 1, 0 -mapCamPrevToothAngle = scalar, F32, 1236, "deg", 1, 0 -isDecodingMapCam = bits, U32, 1240, [0:0] -; total TS size = 1244 -crankSynchronizationCounter = scalar, U32, 1244, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1248, "", 1, 0 -vvtToothDurations0 = scalar, U32, 1252, "us", 1, 0 -vvtCurrentPosition = scalar, F32, 1256, "sync: Primary Cam Position", 1, 0 -vvtToothPosition1 = scalar, F32, 1260, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition2 = scalar, F32, 1264, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition3 = scalar, F32, 1268, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition4 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio = scalar, F32, 1276, "", 1, 0 -triggerStateIndex = scalar, U08, 1280, "", 1, 0 -camResyncCounter = scalar, U08, 1281, "", 1, 0 -vvtStateIndex = scalar, U08, 1282, "", 1, 0 -; total TS size = 1284 -m_hasSynchronizedPhase = bits, U32, 1284, [0:0] +startStopStateTempPhysicalCounter = scalar, U32, 1104, "", 1, 0 +egtValue1 = scalar, F32, 1108, "", 1, 0 +egtValue2 = scalar, F32, 1112, "", 1, 0 +desiredRpmLimit = scalar, S16, 1116, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 1120, "", 1, 0 +sparkCounter = scalar, U32, 1124, "", 1, 0 +fuelingLoad = scalar, F32, 1128, "", 1, 0 +ignitionLoad = scalar, F32, 1132, "", 1, 0 +veTableYAxis = scalar, U16, 1136, "%", 0.01, 0 +; total TS size = 1140 +tpsFrom = scalar, F32, 1140 +tpsTo = scalar, F32, 1144 +deltaTps = scalar, F32, 1148 +extraFuel = scalar, F32, 1152, "", 1, 0 +valueFromTable = scalar, F32, 1156, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1160, [0:0] +isBelowDecelThreshold = bits, U32, 1160, [1:1] +isTimeToResetAccumulator = bits, U32, 1160, [2:2] +isFractionalEnrichment = bits, U32, 1160, [3:3] +belowEpsilon = bits, U32, 1160, [4:4] +tooShort = bits, U32, 1160, [5:5] +fractionalInjFuel = scalar, F32, 1164, "", 1, 0 +accumulatedValue = scalar, F32, 1168, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1172, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1176, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1180, "", 1, 0 +cycleCnt = scalar, S32, 1184, "", 1, 0 +; total TS size = 1188 +hwEventCounters1 = scalar, U32, 1188, "", 1, 0 +hwEventCounters2 = scalar, U32, 1192, "", 1, 0 +hwEventCounters3 = scalar, U32, 1196, "", 1, 0 +hwEventCounters4 = scalar, U32, 1200, "", 1, 0 +hwEventCounters5 = scalar, U32, 1204, "", 1, 0 +hwEventCounters6 = scalar, U32, 1208, "", 1, 0 +vvtCamCounter = scalar, U32, 1212, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1216, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1220, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1224, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1225, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1228, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1232, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1236, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1240, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1244, [0:0] +; total TS size = 1248 +crankSynchronizationCounter = scalar, U32, 1248, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1252, "", 1, 0 +vvtToothDurations0 = scalar, U32, 1256, "us", 1, 0 +vvtCurrentPosition = scalar, F32, 1260, "sync: Primary Cam Position", 1, 0 +vvtToothPosition1 = scalar, F32, 1264, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition2 = scalar, F32, 1268, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition3 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition4 = scalar, F32, 1276, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio = scalar, F32, 1280, "", 1, 0 +triggerStateIndex = scalar, U08, 1284, "", 1, 0 +camResyncCounter = scalar, U08, 1285, "", 1, 0 +vvtStateIndex = scalar, U08, 1286, "", 1, 0 ; total TS size = 1288 -wallFuelCorrection = scalar, F32, 1288, "", 1, 0 -wallFuel = scalar, F32, 1292, "", 1, 0 -; total TS size = 1296 -idleState = bits, S32, 1296, [0:2], "not important" -currentIdlePosition = scalar, F32, 1300 -baseIdlePosition = scalar, F32, 1304 -idleClosedLoop = scalar, F32, 1308 -iacByTpsTaper = scalar, F32, 1312 -throttlePedalUpState = scalar, S32, 1316, "", 1, 0 -mightResetPid = bits, U32, 1320, [0:0] -shouldResetPid = bits, U32, 1320, [1:1] -wasResetPid = bits, U32, 1320, [2:2] -mustResetPid = bits, U32, 1320, [3:3] -isCranking = bits, U32, 1320, [4:4] -isIacTableForCoasting = bits, U32, 1320, [5:5] -notIdling = bits, U32, 1320, [6:6] -needReset = bits, U32, 1320, [7:7] -isInDeadZone = bits, U32, 1320, [8:8] -isBlipping = bits, U32, 1320, [9:9] -useClosedLoop = bits, U32, 1320, [10:10] -badTps = bits, U32, 1320, [11:11] -looksLikeRunning = bits, U32, 1320, [12:12] -looksLikeCoasting = bits, U32, 1320, [13:13] -looksLikeCrankToIdle = bits, U32, 1320, [14:14] -isIdleCoasting = bits, U32, 1320, [15:15] -isIdleClosedLoop = bits, U32, 1320, [16:16] -idleTarget = scalar, S32, 1324, "", 1, 0 -targetRpmByClt = scalar, S32, 1328, "", 1, 0 -targetRpmAc = scalar, S32, 1332, "", 1, 0 -iacByRpmTaper = scalar, F32, 1336 -luaAdd = scalar, F32, 1340 -; total TS size = 1344 -idlePosition = scalar, F32, 1344, "per", 1,0 -trim = scalar, F32, 1348, "", 1, 0 -luaAdjustment = scalar, F32, 1352, "per", 1,0 -m_wastegatePosition = scalar, F32, 1356, "per", 1,0 -etbFeedForward = scalar, F32, 1360 -etbIntegralError = scalar, F32, 1364, "", 1, 0 -etbCurrentTarget = scalar, F32, 1368, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1372, "%", 1, 0 -etbRevLimitActive = bits, U32, 1376, [0:0] -jamDetected = bits, U32, 1376, [1:1] -etbDutyRateOfChange = scalar, F32, 1380, "per", 1,0 -etbDutyAverage = scalar, F32, 1384, "per", 1,0 -etbTpsErrorCounter = scalar, U16, 1388, "count", 1,0 -etbPpsErrorCounter = scalar, U16, 1390, "count", 1,0 -etbErrorCode = scalar, S08, 1392, "", 1, 0 -jamTimer = scalar, U16, 1394, "sec", 0.01, 0 -; total TS size = 1396 -faultCode = scalar, U08, 1396, "", 1, 0 -heaterDuty = scalar, U08, 1397, "%", 1, 0 -pumpDuty = scalar, U08, 1398, "%", 1, 0 -tempC = scalar, U16, 1400, "C", 1, 0 -nernstVoltage = scalar, U16, 1402, "V", 0.001, 0 -esr = scalar, U16, 1404, "ohm", 1, 0 -; total TS size = 1408 -dcOutput0 = scalar, F32, 1408, "per", 1,0 -isEnabled0_int = scalar, U08, 1412, "per", 1,0 -isEnabled0 = bits, U32, 1416, [0:0] -; total TS size = 1420 -value0 = scalar, U16, 1420, "value", 1,0 -value1 = scalar, U16, 1422, "value", 1,0 -errorRate = scalar, F32, 1424, "ratio", 1,0 -; total TS size = 1428 -vvtTarget = scalar, U16, 1428, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1430, "%", 0.5, 0 +m_hasSynchronizedPhase = bits, U32, 1288, [0:0] +; total TS size = 1292 +wallFuelCorrection = scalar, F32, 1292, "", 1, 0 +wallFuel = scalar, F32, 1296, "", 1, 0 +; total TS size = 1300 +idleState = bits, S32, 1300, [0:2], "not important" +currentIdlePosition = scalar, F32, 1304 +baseIdlePosition = scalar, F32, 1308 +idleClosedLoop = scalar, F32, 1312 +iacByTpsTaper = scalar, F32, 1316 +throttlePedalUpState = scalar, S32, 1320, "", 1, 0 +mightResetPid = bits, U32, 1324, [0:0] +shouldResetPid = bits, U32, 1324, [1:1] +wasResetPid = bits, U32, 1324, [2:2] +mustResetPid = bits, U32, 1324, [3:3] +isCranking = bits, U32, 1324, [4:4] +isIacTableForCoasting = bits, U32, 1324, [5:5] +notIdling = bits, U32, 1324, [6:6] +needReset = bits, U32, 1324, [7:7] +isInDeadZone = bits, U32, 1324, [8:8] +isBlipping = bits, U32, 1324, [9:9] +useClosedLoop = bits, U32, 1324, [10:10] +badTps = bits, U32, 1324, [11:11] +looksLikeRunning = bits, U32, 1324, [12:12] +looksLikeCoasting = bits, U32, 1324, [13:13] +looksLikeCrankToIdle = bits, U32, 1324, [14:14] +isIdleCoasting = bits, U32, 1324, [15:15] +isIdleClosedLoop = bits, U32, 1324, [16:16] +idleTarget = scalar, S32, 1328, "", 1, 0 +targetRpmByClt = scalar, S32, 1332, "", 1, 0 +targetRpmAc = scalar, S32, 1336, "", 1, 0 +iacByRpmTaper = scalar, F32, 1340 +luaAdd = scalar, F32, 1344 +; total TS size = 1348 +idlePosition = scalar, F32, 1348, "per", 1,0 +trim = scalar, F32, 1352, "", 1, 0 +luaAdjustment = scalar, F32, 1356, "per", 1,0 +m_wastegatePosition = scalar, F32, 1360, "per", 1,0 +etbFeedForward = scalar, F32, 1364 +etbIntegralError = scalar, F32, 1368, "", 1, 0 +etbCurrentTarget = scalar, F32, 1372, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1376, "%", 1, 0 +etbRevLimitActive = bits, U32, 1380, [0:0] +jamDetected = bits, U32, 1380, [1:1] +etbDutyRateOfChange = scalar, F32, 1384, "per", 1,0 +etbDutyAverage = scalar, F32, 1388, "per", 1,0 +etbTpsErrorCounter = scalar, U16, 1392, "count", 1,0 +etbPpsErrorCounter = scalar, U16, 1394, "count", 1,0 +etbErrorCode = scalar, S08, 1396, "", 1, 0 +jamTimer = scalar, U16, 1398, "sec", 0.01, 0 +; total TS size = 1400 +faultCode = scalar, U08, 1400, "", 1, 0 +heaterDuty = scalar, U08, 1401, "%", 1, 0 +pumpDuty = scalar, U08, 1402, "%", 1, 0 +tempC = scalar, U16, 1404, "C", 1, 0 +nernstVoltage = scalar, U16, 1406, "V", 0.001, 0 +esr = scalar, U16, 1408, "ohm", 1, 0 +; total TS size = 1412 +dcOutput0 = scalar, F32, 1412, "per", 1,0 +isEnabled0_int = scalar, U08, 1416, "per", 1,0 +isEnabled0 = bits, U32, 1420, [0:0] +; total TS size = 1424 +value0 = scalar, U16, 1424, "value", 1,0 +value1 = scalar, U16, 1426, "value", 1,0 +errorRate = scalar, F32, 1428, "ratio", 1,0 ; total TS size = 1432 -lambdaCurrentlyGood = bits, U32, 1432, [0:0] -lambdaMonitorCut = bits, U32, 1432, [1:1] -lambdaTimeSinceGood = scalar, U16, 1436, "sec", 0.01, 0 -; total TS size = 1440 +vvtTarget = scalar, U16, 1432, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1434, "%", 0.5, 0 +; total TS size = 1436 +lambdaCurrentlyGood = bits, U32, 1436, [0:0] +lambdaMonitorCut = bits, U32, 1436, [1:1] +lambdaTimeSinceGood = scalar, U16, 1440, "sec", 0.01, 0 +; total TS size = 1444 time = { timeNow } @@ -5196,6 +5197,7 @@ entry = brakePedalState, "Brake switch", int, "%d" entry = startStopState, "startStopState", int, "%d" entry = startStopPhysicalState, "startStopPhysicalState", int, "%d" entry = startStopStateToggleCounter, "startStopStateToggleCounter", int, "%d" +entry = startStopStateTempPhysicalCounter, "startStopStateTempPhysicalCounter", int, "%d" entry = egtValue1, "egtValue1", float, "%.3f" entry = egtValue2, "egtValue2", float, "%.3f" entry = desiredRpmLimit, "User-defined RPM hard limit", int, "%d" @@ -6078,13 +6080,14 @@ dialog = engine_stateDialog, "engine_state" graphLine = brakePedalState graphLine = startStopState graphLine = startStopStateToggleCounter - graphLine = egtValue1 + graphLine = startStopStateTempPhysicalCounter liveGraph = engine_state_5_Graph, "Graph", South + graphLine = egtValue1 graphLine = egtValue2 graphLine = desiredRpmLimit graphLine = fuelInjectionCounter - graphLine = sparkCounter liveGraph = engine_state_6_Graph, "Graph", South + graphLine = sparkCounter graphLine = fuelingLoad graphLine = ignitionLoad graphLine = veTableYAxis @@ -6420,8 +6423,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" ; cam if ; two-stroke, or ; not crank trigger and ((vague trigger and cam choice) or not vague trigger) - field = "Cam Sensor (Primary channel)", triggerInputPins1, 1, {twoStroke == 1 || ( !(trigger_type == 2 || trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 21 || trigger_type == 26 || trigger_type == 27 || trigger_type == 33 || trigger_type == 38 || trigger_type == 39 || trigger_type == 44 || trigger_type == 45 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 58 || trigger_type == 61 || trigger_type == 62 || trigger_type == 68 || trigger_type == 70 || trigger_type == 71 || trigger_type == 72 || trigger_type == 74 || trigger_type == 75 || trigger_type == 76 || trigger_type == 77 || trigger_type == 79) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) ) ) } - field = "Crank Sensor (Primary channel)", triggerInputPins1, 1, { !(twoStroke == 1 || ( !(trigger_type == 2 || trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 21 || trigger_type == 26 || trigger_type == 27 || trigger_type == 33 || trigger_type == 38 || trigger_type == 39 || trigger_type == 44 || trigger_type == 45 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 58 || trigger_type == 61 || trigger_type == 62 || trigger_type == 68 || trigger_type == 70 || trigger_type == 71 || trigger_type == 72 || trigger_type == 74 || trigger_type == 75 || trigger_type == 76 || trigger_type == 77 || trigger_type == 79) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) ) )) } + field = "Cam Sensor (Primary channel)", triggerInputPins1, 1, {twoStroke == 1 || ( !(trigger_type == 2 || trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 21 || trigger_type == 26 || trigger_type == 27 || trigger_type == 33 || trigger_type == 38 || trigger_type == 39 || trigger_type == 44 || trigger_type == 45 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 58 || trigger_type == 61 || trigger_type == 62 || trigger_type == 68 || trigger_type == 70 || trigger_type == 71 || trigger_type == 72 || trigger_type == 74 || trigger_type == 75 || trigger_type == 76 || trigger_type == 77) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) ) ) } + field = "Crank Sensor (Primary channel)", triggerInputPins1, 1, { !(twoStroke == 1 || ( !(trigger_type == 2 || trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 21 || trigger_type == 26 || trigger_type == 27 || trigger_type == 33 || trigger_type == 38 || trigger_type == 39 || trigger_type == 44 || trigger_type == 45 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 58 || trigger_type == 61 || trigger_type == 62 || trigger_type == 68 || trigger_type == 70 || trigger_type == 71 || trigger_type == 72 || trigger_type == 74 || trigger_type == 75 || trigger_type == 76 || trigger_type == 77) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) ) )) } field = "Invert Primary", invertPrimaryTriggerSignal field = "Secondary channel", triggerInputPins2, { triggerInputPins2 != 0 || (triggerInputPins1 != 0 && (trigger_type == 1 || trigger_type == 3 || trigger_type == 15 || trigger_type == 16 || trigger_type == 19 || trigger_type == 25 || trigger_type == 28 || trigger_type == 31 || trigger_type == 35 || trigger_type == 36 || trigger_type == 37 || trigger_type == 40 || trigger_type == 49 || trigger_type == 50 || trigger_type == 53 || trigger_type == 54 || trigger_type == 63 || trigger_type == 64) ) } field = "Invert Secondary", invertSecondaryTriggerSignal, {triggerInputPins2 != 0 && (trigger_type == 1 || trigger_type == 3 || trigger_type == 15 || trigger_type == 16 || trigger_type == 19 || trigger_type == 25 || trigger_type == 28 || trigger_type == 31 || trigger_type == 35 || trigger_type == 36 || trigger_type == 37 || trigger_type == 40 || trigger_type == 49 || trigger_type == 50 || trigger_type == 53 || trigger_type == 54 || trigger_type == 63 || trigger_type == 64) } diff --git a/firmware/tunerstudio/generated/rusefi_hellen-honda-k.ini b/firmware/tunerstudio/generated/rusefi_hellen-honda-k.ini index 0842b9f328..3861e8d16f 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen-honda-k.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen-honda-k.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.11.08.hellen-honda-k.4016599086" + signature = "rusEFI master.2023.11.09.hellen-honda-k.4231320952" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.11.08.hellen-honda-k.4016599086" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.11.09.hellen-honda-k.4231320952" ; 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 @@ -92,7 +92,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","INVALID","INVALID","INVALID","INVALID","A15 TPS","E9 Ignition Key Voltage","INVALID","INVALID","INVALID","INVALID","A19 - MAP","INVALID","B8 - CLT","B17 IAT" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Nov 08 20:02:07 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Thu Nov 09 02:07:03 UTC 2023 pageSize = 24552 page = 1 @@ -2347,7 +2347,7 @@ lambdaMaxDeviationRpmBins = array, U16, 24542, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1440 + ochBlockSize = 1444 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3001,136 +3001,137 @@ brakePedalState = scalar, S08, 1092, "", 1, 0 startStopState = scalar, S08, 1093, "", 1, 0 startStopPhysicalState = bits, U32, 1096, [0:0] startStopStateToggleCounter = scalar, U32, 1100, "", 1, 0 -egtValue1 = scalar, F32, 1104, "", 1, 0 -egtValue2 = scalar, F32, 1108, "", 1, 0 -desiredRpmLimit = scalar, S16, 1112, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1116, "", 1, 0 -sparkCounter = scalar, U32, 1120, "", 1, 0 -fuelingLoad = scalar, F32, 1124, "", 1, 0 -ignitionLoad = scalar, F32, 1128, "", 1, 0 -veTableYAxis = scalar, U16, 1132, "%", 0.01, 0 -; total TS size = 1136 -tpsFrom = scalar, F32, 1136 -tpsTo = scalar, F32, 1140 -deltaTps = scalar, F32, 1144 -extraFuel = scalar, F32, 1148, "", 1, 0 -valueFromTable = scalar, F32, 1152, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1156, [0:0] -isBelowDecelThreshold = bits, U32, 1156, [1:1] -isTimeToResetAccumulator = bits, U32, 1156, [2:2] -isFractionalEnrichment = bits, U32, 1156, [3:3] -belowEpsilon = bits, U32, 1156, [4:4] -tooShort = bits, U32, 1156, [5:5] -fractionalInjFuel = scalar, F32, 1160, "", 1, 0 -accumulatedValue = scalar, F32, 1164, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1168, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1172, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1176, "", 1, 0 -cycleCnt = scalar, S32, 1180, "", 1, 0 -; total TS size = 1184 -hwEventCounters1 = scalar, U32, 1184, "", 1, 0 -hwEventCounters2 = scalar, U32, 1188, "", 1, 0 -hwEventCounters3 = scalar, U32, 1192, "", 1, 0 -hwEventCounters4 = scalar, U32, 1196, "", 1, 0 -hwEventCounters5 = scalar, U32, 1200, "", 1, 0 -hwEventCounters6 = scalar, U32, 1204, "", 1, 0 -vvtCamCounter = scalar, U32, 1208, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1212, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1216, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1220, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1221, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1224, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1228, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1232, "", 1, 0 -mapCamPrevToothAngle = scalar, F32, 1236, "deg", 1, 0 -isDecodingMapCam = bits, U32, 1240, [0:0] -; total TS size = 1244 -crankSynchronizationCounter = scalar, U32, 1244, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1248, "", 1, 0 -vvtToothDurations0 = scalar, U32, 1252, "us", 1, 0 -vvtCurrentPosition = scalar, F32, 1256, "sync: Primary Cam Position", 1, 0 -vvtToothPosition1 = scalar, F32, 1260, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition2 = scalar, F32, 1264, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition3 = scalar, F32, 1268, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition4 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio = scalar, F32, 1276, "", 1, 0 -triggerStateIndex = scalar, U08, 1280, "", 1, 0 -camResyncCounter = scalar, U08, 1281, "", 1, 0 -vvtStateIndex = scalar, U08, 1282, "", 1, 0 -; total TS size = 1284 -m_hasSynchronizedPhase = bits, U32, 1284, [0:0] +startStopStateTempPhysicalCounter = scalar, U32, 1104, "", 1, 0 +egtValue1 = scalar, F32, 1108, "", 1, 0 +egtValue2 = scalar, F32, 1112, "", 1, 0 +desiredRpmLimit = scalar, S16, 1116, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 1120, "", 1, 0 +sparkCounter = scalar, U32, 1124, "", 1, 0 +fuelingLoad = scalar, F32, 1128, "", 1, 0 +ignitionLoad = scalar, F32, 1132, "", 1, 0 +veTableYAxis = scalar, U16, 1136, "%", 0.01, 0 +; total TS size = 1140 +tpsFrom = scalar, F32, 1140 +tpsTo = scalar, F32, 1144 +deltaTps = scalar, F32, 1148 +extraFuel = scalar, F32, 1152, "", 1, 0 +valueFromTable = scalar, F32, 1156, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1160, [0:0] +isBelowDecelThreshold = bits, U32, 1160, [1:1] +isTimeToResetAccumulator = bits, U32, 1160, [2:2] +isFractionalEnrichment = bits, U32, 1160, [3:3] +belowEpsilon = bits, U32, 1160, [4:4] +tooShort = bits, U32, 1160, [5:5] +fractionalInjFuel = scalar, F32, 1164, "", 1, 0 +accumulatedValue = scalar, F32, 1168, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1172, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1176, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1180, "", 1, 0 +cycleCnt = scalar, S32, 1184, "", 1, 0 +; total TS size = 1188 +hwEventCounters1 = scalar, U32, 1188, "", 1, 0 +hwEventCounters2 = scalar, U32, 1192, "", 1, 0 +hwEventCounters3 = scalar, U32, 1196, "", 1, 0 +hwEventCounters4 = scalar, U32, 1200, "", 1, 0 +hwEventCounters5 = scalar, U32, 1204, "", 1, 0 +hwEventCounters6 = scalar, U32, 1208, "", 1, 0 +vvtCamCounter = scalar, U32, 1212, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1216, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1220, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1224, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1225, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1228, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1232, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1236, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1240, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1244, [0:0] +; total TS size = 1248 +crankSynchronizationCounter = scalar, U32, 1248, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1252, "", 1, 0 +vvtToothDurations0 = scalar, U32, 1256, "us", 1, 0 +vvtCurrentPosition = scalar, F32, 1260, "sync: Primary Cam Position", 1, 0 +vvtToothPosition1 = scalar, F32, 1264, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition2 = scalar, F32, 1268, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition3 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition4 = scalar, F32, 1276, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio = scalar, F32, 1280, "", 1, 0 +triggerStateIndex = scalar, U08, 1284, "", 1, 0 +camResyncCounter = scalar, U08, 1285, "", 1, 0 +vvtStateIndex = scalar, U08, 1286, "", 1, 0 ; total TS size = 1288 -wallFuelCorrection = scalar, F32, 1288, "", 1, 0 -wallFuel = scalar, F32, 1292, "", 1, 0 -; total TS size = 1296 -idleState = bits, S32, 1296, [0:2], "not important" -currentIdlePosition = scalar, F32, 1300 -baseIdlePosition = scalar, F32, 1304 -idleClosedLoop = scalar, F32, 1308 -iacByTpsTaper = scalar, F32, 1312 -throttlePedalUpState = scalar, S32, 1316, "", 1, 0 -mightResetPid = bits, U32, 1320, [0:0] -shouldResetPid = bits, U32, 1320, [1:1] -wasResetPid = bits, U32, 1320, [2:2] -mustResetPid = bits, U32, 1320, [3:3] -isCranking = bits, U32, 1320, [4:4] -isIacTableForCoasting = bits, U32, 1320, [5:5] -notIdling = bits, U32, 1320, [6:6] -needReset = bits, U32, 1320, [7:7] -isInDeadZone = bits, U32, 1320, [8:8] -isBlipping = bits, U32, 1320, [9:9] -useClosedLoop = bits, U32, 1320, [10:10] -badTps = bits, U32, 1320, [11:11] -looksLikeRunning = bits, U32, 1320, [12:12] -looksLikeCoasting = bits, U32, 1320, [13:13] -looksLikeCrankToIdle = bits, U32, 1320, [14:14] -isIdleCoasting = bits, U32, 1320, [15:15] -isIdleClosedLoop = bits, U32, 1320, [16:16] -idleTarget = scalar, S32, 1324, "", 1, 0 -targetRpmByClt = scalar, S32, 1328, "", 1, 0 -targetRpmAc = scalar, S32, 1332, "", 1, 0 -iacByRpmTaper = scalar, F32, 1336 -luaAdd = scalar, F32, 1340 -; total TS size = 1344 -idlePosition = scalar, F32, 1344, "per", 1,0 -trim = scalar, F32, 1348, "", 1, 0 -luaAdjustment = scalar, F32, 1352, "per", 1,0 -m_wastegatePosition = scalar, F32, 1356, "per", 1,0 -etbFeedForward = scalar, F32, 1360 -etbIntegralError = scalar, F32, 1364, "", 1, 0 -etbCurrentTarget = scalar, F32, 1368, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1372, "%", 1, 0 -etbRevLimitActive = bits, U32, 1376, [0:0] -jamDetected = bits, U32, 1376, [1:1] -etbDutyRateOfChange = scalar, F32, 1380, "per", 1,0 -etbDutyAverage = scalar, F32, 1384, "per", 1,0 -etbTpsErrorCounter = scalar, U16, 1388, "count", 1,0 -etbPpsErrorCounter = scalar, U16, 1390, "count", 1,0 -etbErrorCode = scalar, S08, 1392, "", 1, 0 -jamTimer = scalar, U16, 1394, "sec", 0.01, 0 -; total TS size = 1396 -faultCode = scalar, U08, 1396, "", 1, 0 -heaterDuty = scalar, U08, 1397, "%", 1, 0 -pumpDuty = scalar, U08, 1398, "%", 1, 0 -tempC = scalar, U16, 1400, "C", 1, 0 -nernstVoltage = scalar, U16, 1402, "V", 0.001, 0 -esr = scalar, U16, 1404, "ohm", 1, 0 -; total TS size = 1408 -dcOutput0 = scalar, F32, 1408, "per", 1,0 -isEnabled0_int = scalar, U08, 1412, "per", 1,0 -isEnabled0 = bits, U32, 1416, [0:0] -; total TS size = 1420 -value0 = scalar, U16, 1420, "value", 1,0 -value1 = scalar, U16, 1422, "value", 1,0 -errorRate = scalar, F32, 1424, "ratio", 1,0 -; total TS size = 1428 -vvtTarget = scalar, U16, 1428, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1430, "%", 0.5, 0 +m_hasSynchronizedPhase = bits, U32, 1288, [0:0] +; total TS size = 1292 +wallFuelCorrection = scalar, F32, 1292, "", 1, 0 +wallFuel = scalar, F32, 1296, "", 1, 0 +; total TS size = 1300 +idleState = bits, S32, 1300, [0:2], "not important" +currentIdlePosition = scalar, F32, 1304 +baseIdlePosition = scalar, F32, 1308 +idleClosedLoop = scalar, F32, 1312 +iacByTpsTaper = scalar, F32, 1316 +throttlePedalUpState = scalar, S32, 1320, "", 1, 0 +mightResetPid = bits, U32, 1324, [0:0] +shouldResetPid = bits, U32, 1324, [1:1] +wasResetPid = bits, U32, 1324, [2:2] +mustResetPid = bits, U32, 1324, [3:3] +isCranking = bits, U32, 1324, [4:4] +isIacTableForCoasting = bits, U32, 1324, [5:5] +notIdling = bits, U32, 1324, [6:6] +needReset = bits, U32, 1324, [7:7] +isInDeadZone = bits, U32, 1324, [8:8] +isBlipping = bits, U32, 1324, [9:9] +useClosedLoop = bits, U32, 1324, [10:10] +badTps = bits, U32, 1324, [11:11] +looksLikeRunning = bits, U32, 1324, [12:12] +looksLikeCoasting = bits, U32, 1324, [13:13] +looksLikeCrankToIdle = bits, U32, 1324, [14:14] +isIdleCoasting = bits, U32, 1324, [15:15] +isIdleClosedLoop = bits, U32, 1324, [16:16] +idleTarget = scalar, S32, 1328, "", 1, 0 +targetRpmByClt = scalar, S32, 1332, "", 1, 0 +targetRpmAc = scalar, S32, 1336, "", 1, 0 +iacByRpmTaper = scalar, F32, 1340 +luaAdd = scalar, F32, 1344 +; total TS size = 1348 +idlePosition = scalar, F32, 1348, "per", 1,0 +trim = scalar, F32, 1352, "", 1, 0 +luaAdjustment = scalar, F32, 1356, "per", 1,0 +m_wastegatePosition = scalar, F32, 1360, "per", 1,0 +etbFeedForward = scalar, F32, 1364 +etbIntegralError = scalar, F32, 1368, "", 1, 0 +etbCurrentTarget = scalar, F32, 1372, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1376, "%", 1, 0 +etbRevLimitActive = bits, U32, 1380, [0:0] +jamDetected = bits, U32, 1380, [1:1] +etbDutyRateOfChange = scalar, F32, 1384, "per", 1,0 +etbDutyAverage = scalar, F32, 1388, "per", 1,0 +etbTpsErrorCounter = scalar, U16, 1392, "count", 1,0 +etbPpsErrorCounter = scalar, U16, 1394, "count", 1,0 +etbErrorCode = scalar, S08, 1396, "", 1, 0 +jamTimer = scalar, U16, 1398, "sec", 0.01, 0 +; total TS size = 1400 +faultCode = scalar, U08, 1400, "", 1, 0 +heaterDuty = scalar, U08, 1401, "%", 1, 0 +pumpDuty = scalar, U08, 1402, "%", 1, 0 +tempC = scalar, U16, 1404, "C", 1, 0 +nernstVoltage = scalar, U16, 1406, "V", 0.001, 0 +esr = scalar, U16, 1408, "ohm", 1, 0 +; total TS size = 1412 +dcOutput0 = scalar, F32, 1412, "per", 1,0 +isEnabled0_int = scalar, U08, 1416, "per", 1,0 +isEnabled0 = bits, U32, 1420, [0:0] +; total TS size = 1424 +value0 = scalar, U16, 1424, "value", 1,0 +value1 = scalar, U16, 1426, "value", 1,0 +errorRate = scalar, F32, 1428, "ratio", 1,0 ; total TS size = 1432 -lambdaCurrentlyGood = bits, U32, 1432, [0:0] -lambdaMonitorCut = bits, U32, 1432, [1:1] -lambdaTimeSinceGood = scalar, U16, 1436, "sec", 0.01, 0 -; total TS size = 1440 +vvtTarget = scalar, U16, 1432, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1434, "%", 0.5, 0 +; total TS size = 1436 +lambdaCurrentlyGood = bits, U32, 1436, [0:0] +lambdaMonitorCut = bits, U32, 1436, [1:1] +lambdaTimeSinceGood = scalar, U16, 1440, "sec", 0.01, 0 +; total TS size = 1444 time = { timeNow } @@ -5196,6 +5197,7 @@ entry = brakePedalState, "Brake switch", int, "%d" entry = startStopState, "startStopState", int, "%d" entry = startStopPhysicalState, "startStopPhysicalState", int, "%d" entry = startStopStateToggleCounter, "startStopStateToggleCounter", int, "%d" +entry = startStopStateTempPhysicalCounter, "startStopStateTempPhysicalCounter", int, "%d" entry = egtValue1, "egtValue1", float, "%.3f" entry = egtValue2, "egtValue2", float, "%.3f" entry = desiredRpmLimit, "User-defined RPM hard limit", int, "%d" @@ -6076,13 +6078,14 @@ dialog = engine_stateDialog, "engine_state" graphLine = brakePedalState graphLine = startStopState graphLine = startStopStateToggleCounter - graphLine = egtValue1 + graphLine = startStopStateTempPhysicalCounter liveGraph = engine_state_5_Graph, "Graph", South + graphLine = egtValue1 graphLine = egtValue2 graphLine = desiredRpmLimit graphLine = fuelInjectionCounter - graphLine = sparkCounter liveGraph = engine_state_6_Graph, "Graph", South + graphLine = sparkCounter graphLine = fuelingLoad graphLine = ignitionLoad graphLine = veTableYAxis @@ -6417,8 +6420,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" ; cam if ; two-stroke, or ; not crank trigger and ((vague trigger and cam choice) or not vague trigger) - field = "Cam Sensor (Primary channel)", triggerInputPins1, 1, {twoStroke == 1 || ( !(trigger_type == 2 || trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 21 || trigger_type == 26 || trigger_type == 27 || trigger_type == 33 || trigger_type == 38 || trigger_type == 39 || trigger_type == 44 || trigger_type == 45 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 58 || trigger_type == 61 || trigger_type == 62 || trigger_type == 68 || trigger_type == 70 || trigger_type == 71 || trigger_type == 72 || trigger_type == 74 || trigger_type == 75 || trigger_type == 76 || trigger_type == 77 || trigger_type == 79) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) ) ) } - field = "Crank Sensor (Primary channel)", triggerInputPins1, 1, { !(twoStroke == 1 || ( !(trigger_type == 2 || trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 21 || trigger_type == 26 || trigger_type == 27 || trigger_type == 33 || trigger_type == 38 || trigger_type == 39 || trigger_type == 44 || trigger_type == 45 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 58 || trigger_type == 61 || trigger_type == 62 || trigger_type == 68 || trigger_type == 70 || trigger_type == 71 || trigger_type == 72 || trigger_type == 74 || trigger_type == 75 || trigger_type == 76 || trigger_type == 77 || trigger_type == 79) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) ) )) } + field = "Cam Sensor (Primary channel)", triggerInputPins1, 1, {twoStroke == 1 || ( !(trigger_type == 2 || trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 21 || trigger_type == 26 || trigger_type == 27 || trigger_type == 33 || trigger_type == 38 || trigger_type == 39 || trigger_type == 44 || trigger_type == 45 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 58 || trigger_type == 61 || trigger_type == 62 || trigger_type == 68 || trigger_type == 70 || trigger_type == 71 || trigger_type == 72 || trigger_type == 74 || trigger_type == 75 || trigger_type == 76 || trigger_type == 77) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) ) ) } + field = "Crank Sensor (Primary channel)", triggerInputPins1, 1, { !(twoStroke == 1 || ( !(trigger_type == 2 || trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 21 || trigger_type == 26 || trigger_type == 27 || trigger_type == 33 || trigger_type == 38 || trigger_type == 39 || trigger_type == 44 || trigger_type == 45 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 58 || trigger_type == 61 || trigger_type == 62 || trigger_type == 68 || trigger_type == 70 || trigger_type == 71 || trigger_type == 72 || trigger_type == 74 || trigger_type == 75 || trigger_type == 76 || trigger_type == 77) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) ) )) } field = "Invert Primary", invertPrimaryTriggerSignal field = "Secondary channel", triggerInputPins2, { triggerInputPins2 != 0 || (triggerInputPins1 != 0 && (trigger_type == 1 || trigger_type == 3 || trigger_type == 15 || trigger_type == 16 || trigger_type == 19 || trigger_type == 25 || trigger_type == 28 || trigger_type == 31 || trigger_type == 35 || trigger_type == 36 || trigger_type == 37 || trigger_type == 40 || trigger_type == 49 || trigger_type == 50 || trigger_type == 53 || trigger_type == 54 || trigger_type == 63 || trigger_type == 64) ) } field = "Invert Secondary", invertSecondaryTriggerSignal, {triggerInputPins2 != 0 && (trigger_type == 1 || trigger_type == 3 || trigger_type == 15 || trigger_type == 16 || trigger_type == 19 || trigger_type == 25 || trigger_type == 28 || trigger_type == 31 || trigger_type == 35 || trigger_type == 36 || trigger_type == 37 || trigger_type == 40 || trigger_type == 49 || trigger_type == 50 || trigger_type == 53 || trigger_type == 54 || trigger_type == 63 || trigger_type == 64) } diff --git a/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini b/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini index c89da82dd3..048e56560e 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.11.08.hellen-nb1.1498039066" + signature = "rusEFI master.2023.11.09.hellen-nb1.1243014732" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.11.08.hellen-nb1.1498039066" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.11.09.hellen-nb1.1243014732" ; 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 @@ -92,7 +92,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.jar based on (unknown script) integration/rusefi_config.txt Wed Nov 08 20:02:35 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Thu Nov 09 02:07:22 UTC 2023 pageSize = 23880 page = 1 @@ -2347,7 +2347,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23870, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1440 + ochBlockSize = 1444 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3001,136 +3001,137 @@ brakePedalState = scalar, S08, 1092, "", 1, 0 startStopState = scalar, S08, 1093, "", 1, 0 startStopPhysicalState = bits, U32, 1096, [0:0] startStopStateToggleCounter = scalar, U32, 1100, "", 1, 0 -egtValue1 = scalar, F32, 1104, "", 1, 0 -egtValue2 = scalar, F32, 1108, "", 1, 0 -desiredRpmLimit = scalar, S16, 1112, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1116, "", 1, 0 -sparkCounter = scalar, U32, 1120, "", 1, 0 -fuelingLoad = scalar, F32, 1124, "", 1, 0 -ignitionLoad = scalar, F32, 1128, "", 1, 0 -veTableYAxis = scalar, U16, 1132, "%", 0.01, 0 -; total TS size = 1136 -tpsFrom = scalar, F32, 1136 -tpsTo = scalar, F32, 1140 -deltaTps = scalar, F32, 1144 -extraFuel = scalar, F32, 1148, "", 1, 0 -valueFromTable = scalar, F32, 1152, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1156, [0:0] -isBelowDecelThreshold = bits, U32, 1156, [1:1] -isTimeToResetAccumulator = bits, U32, 1156, [2:2] -isFractionalEnrichment = bits, U32, 1156, [3:3] -belowEpsilon = bits, U32, 1156, [4:4] -tooShort = bits, U32, 1156, [5:5] -fractionalInjFuel = scalar, F32, 1160, "", 1, 0 -accumulatedValue = scalar, F32, 1164, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1168, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1172, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1176, "", 1, 0 -cycleCnt = scalar, S32, 1180, "", 1, 0 -; total TS size = 1184 -hwEventCounters1 = scalar, U32, 1184, "", 1, 0 -hwEventCounters2 = scalar, U32, 1188, "", 1, 0 -hwEventCounters3 = scalar, U32, 1192, "", 1, 0 -hwEventCounters4 = scalar, U32, 1196, "", 1, 0 -hwEventCounters5 = scalar, U32, 1200, "", 1, 0 -hwEventCounters6 = scalar, U32, 1204, "", 1, 0 -vvtCamCounter = scalar, U32, 1208, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1212, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1216, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1220, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1221, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1224, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1228, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1232, "", 1, 0 -mapCamPrevToothAngle = scalar, F32, 1236, "deg", 1, 0 -isDecodingMapCam = bits, U32, 1240, [0:0] -; total TS size = 1244 -crankSynchronizationCounter = scalar, U32, 1244, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1248, "", 1, 0 -vvtToothDurations0 = scalar, U32, 1252, "us", 1, 0 -vvtCurrentPosition = scalar, F32, 1256, "sync: Primary Cam Position", 1, 0 -vvtToothPosition1 = scalar, F32, 1260, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition2 = scalar, F32, 1264, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition3 = scalar, F32, 1268, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition4 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio = scalar, F32, 1276, "", 1, 0 -triggerStateIndex = scalar, U08, 1280, "", 1, 0 -camResyncCounter = scalar, U08, 1281, "", 1, 0 -vvtStateIndex = scalar, U08, 1282, "", 1, 0 -; total TS size = 1284 -m_hasSynchronizedPhase = bits, U32, 1284, [0:0] +startStopStateTempPhysicalCounter = scalar, U32, 1104, "", 1, 0 +egtValue1 = scalar, F32, 1108, "", 1, 0 +egtValue2 = scalar, F32, 1112, "", 1, 0 +desiredRpmLimit = scalar, S16, 1116, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 1120, "", 1, 0 +sparkCounter = scalar, U32, 1124, "", 1, 0 +fuelingLoad = scalar, F32, 1128, "", 1, 0 +ignitionLoad = scalar, F32, 1132, "", 1, 0 +veTableYAxis = scalar, U16, 1136, "%", 0.01, 0 +; total TS size = 1140 +tpsFrom = scalar, F32, 1140 +tpsTo = scalar, F32, 1144 +deltaTps = scalar, F32, 1148 +extraFuel = scalar, F32, 1152, "", 1, 0 +valueFromTable = scalar, F32, 1156, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1160, [0:0] +isBelowDecelThreshold = bits, U32, 1160, [1:1] +isTimeToResetAccumulator = bits, U32, 1160, [2:2] +isFractionalEnrichment = bits, U32, 1160, [3:3] +belowEpsilon = bits, U32, 1160, [4:4] +tooShort = bits, U32, 1160, [5:5] +fractionalInjFuel = scalar, F32, 1164, "", 1, 0 +accumulatedValue = scalar, F32, 1168, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1172, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1176, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1180, "", 1, 0 +cycleCnt = scalar, S32, 1184, "", 1, 0 +; total TS size = 1188 +hwEventCounters1 = scalar, U32, 1188, "", 1, 0 +hwEventCounters2 = scalar, U32, 1192, "", 1, 0 +hwEventCounters3 = scalar, U32, 1196, "", 1, 0 +hwEventCounters4 = scalar, U32, 1200, "", 1, 0 +hwEventCounters5 = scalar, U32, 1204, "", 1, 0 +hwEventCounters6 = scalar, U32, 1208, "", 1, 0 +vvtCamCounter = scalar, U32, 1212, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1216, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1220, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1224, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1225, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1228, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1232, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1236, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1240, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1244, [0:0] +; total TS size = 1248 +crankSynchronizationCounter = scalar, U32, 1248, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1252, "", 1, 0 +vvtToothDurations0 = scalar, U32, 1256, "us", 1, 0 +vvtCurrentPosition = scalar, F32, 1260, "sync: Primary Cam Position", 1, 0 +vvtToothPosition1 = scalar, F32, 1264, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition2 = scalar, F32, 1268, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition3 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition4 = scalar, F32, 1276, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio = scalar, F32, 1280, "", 1, 0 +triggerStateIndex = scalar, U08, 1284, "", 1, 0 +camResyncCounter = scalar, U08, 1285, "", 1, 0 +vvtStateIndex = scalar, U08, 1286, "", 1, 0 ; total TS size = 1288 -wallFuelCorrection = scalar, F32, 1288, "", 1, 0 -wallFuel = scalar, F32, 1292, "", 1, 0 -; total TS size = 1296 -idleState = bits, S32, 1296, [0:2], "not important" -currentIdlePosition = scalar, F32, 1300 -baseIdlePosition = scalar, F32, 1304 -idleClosedLoop = scalar, F32, 1308 -iacByTpsTaper = scalar, F32, 1312 -throttlePedalUpState = scalar, S32, 1316, "", 1, 0 -mightResetPid = bits, U32, 1320, [0:0] -shouldResetPid = bits, U32, 1320, [1:1] -wasResetPid = bits, U32, 1320, [2:2] -mustResetPid = bits, U32, 1320, [3:3] -isCranking = bits, U32, 1320, [4:4] -isIacTableForCoasting = bits, U32, 1320, [5:5] -notIdling = bits, U32, 1320, [6:6] -needReset = bits, U32, 1320, [7:7] -isInDeadZone = bits, U32, 1320, [8:8] -isBlipping = bits, U32, 1320, [9:9] -useClosedLoop = bits, U32, 1320, [10:10] -badTps = bits, U32, 1320, [11:11] -looksLikeRunning = bits, U32, 1320, [12:12] -looksLikeCoasting = bits, U32, 1320, [13:13] -looksLikeCrankToIdle = bits, U32, 1320, [14:14] -isIdleCoasting = bits, U32, 1320, [15:15] -isIdleClosedLoop = bits, U32, 1320, [16:16] -idleTarget = scalar, S32, 1324, "", 1, 0 -targetRpmByClt = scalar, S32, 1328, "", 1, 0 -targetRpmAc = scalar, S32, 1332, "", 1, 0 -iacByRpmTaper = scalar, F32, 1336 -luaAdd = scalar, F32, 1340 -; total TS size = 1344 -idlePosition = scalar, F32, 1344, "per", 1,0 -trim = scalar, F32, 1348, "", 1, 0 -luaAdjustment = scalar, F32, 1352, "per", 1,0 -m_wastegatePosition = scalar, F32, 1356, "per", 1,0 -etbFeedForward = scalar, F32, 1360 -etbIntegralError = scalar, F32, 1364, "", 1, 0 -etbCurrentTarget = scalar, F32, 1368, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1372, "%", 1, 0 -etbRevLimitActive = bits, U32, 1376, [0:0] -jamDetected = bits, U32, 1376, [1:1] -etbDutyRateOfChange = scalar, F32, 1380, "per", 1,0 -etbDutyAverage = scalar, F32, 1384, "per", 1,0 -etbTpsErrorCounter = scalar, U16, 1388, "count", 1,0 -etbPpsErrorCounter = scalar, U16, 1390, "count", 1,0 -etbErrorCode = scalar, S08, 1392, "", 1, 0 -jamTimer = scalar, U16, 1394, "sec", 0.01, 0 -; total TS size = 1396 -faultCode = scalar, U08, 1396, "", 1, 0 -heaterDuty = scalar, U08, 1397, "%", 1, 0 -pumpDuty = scalar, U08, 1398, "%", 1, 0 -tempC = scalar, U16, 1400, "C", 1, 0 -nernstVoltage = scalar, U16, 1402, "V", 0.001, 0 -esr = scalar, U16, 1404, "ohm", 1, 0 -; total TS size = 1408 -dcOutput0 = scalar, F32, 1408, "per", 1,0 -isEnabled0_int = scalar, U08, 1412, "per", 1,0 -isEnabled0 = bits, U32, 1416, [0:0] -; total TS size = 1420 -value0 = scalar, U16, 1420, "value", 1,0 -value1 = scalar, U16, 1422, "value", 1,0 -errorRate = scalar, F32, 1424, "ratio", 1,0 -; total TS size = 1428 -vvtTarget = scalar, U16, 1428, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1430, "%", 0.5, 0 +m_hasSynchronizedPhase = bits, U32, 1288, [0:0] +; total TS size = 1292 +wallFuelCorrection = scalar, F32, 1292, "", 1, 0 +wallFuel = scalar, F32, 1296, "", 1, 0 +; total TS size = 1300 +idleState = bits, S32, 1300, [0:2], "not important" +currentIdlePosition = scalar, F32, 1304 +baseIdlePosition = scalar, F32, 1308 +idleClosedLoop = scalar, F32, 1312 +iacByTpsTaper = scalar, F32, 1316 +throttlePedalUpState = scalar, S32, 1320, "", 1, 0 +mightResetPid = bits, U32, 1324, [0:0] +shouldResetPid = bits, U32, 1324, [1:1] +wasResetPid = bits, U32, 1324, [2:2] +mustResetPid = bits, U32, 1324, [3:3] +isCranking = bits, U32, 1324, [4:4] +isIacTableForCoasting = bits, U32, 1324, [5:5] +notIdling = bits, U32, 1324, [6:6] +needReset = bits, U32, 1324, [7:7] +isInDeadZone = bits, U32, 1324, [8:8] +isBlipping = bits, U32, 1324, [9:9] +useClosedLoop = bits, U32, 1324, [10:10] +badTps = bits, U32, 1324, [11:11] +looksLikeRunning = bits, U32, 1324, [12:12] +looksLikeCoasting = bits, U32, 1324, [13:13] +looksLikeCrankToIdle = bits, U32, 1324, [14:14] +isIdleCoasting = bits, U32, 1324, [15:15] +isIdleClosedLoop = bits, U32, 1324, [16:16] +idleTarget = scalar, S32, 1328, "", 1, 0 +targetRpmByClt = scalar, S32, 1332, "", 1, 0 +targetRpmAc = scalar, S32, 1336, "", 1, 0 +iacByRpmTaper = scalar, F32, 1340 +luaAdd = scalar, F32, 1344 +; total TS size = 1348 +idlePosition = scalar, F32, 1348, "per", 1,0 +trim = scalar, F32, 1352, "", 1, 0 +luaAdjustment = scalar, F32, 1356, "per", 1,0 +m_wastegatePosition = scalar, F32, 1360, "per", 1,0 +etbFeedForward = scalar, F32, 1364 +etbIntegralError = scalar, F32, 1368, "", 1, 0 +etbCurrentTarget = scalar, F32, 1372, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1376, "%", 1, 0 +etbRevLimitActive = bits, U32, 1380, [0:0] +jamDetected = bits, U32, 1380, [1:1] +etbDutyRateOfChange = scalar, F32, 1384, "per", 1,0 +etbDutyAverage = scalar, F32, 1388, "per", 1,0 +etbTpsErrorCounter = scalar, U16, 1392, "count", 1,0 +etbPpsErrorCounter = scalar, U16, 1394, "count", 1,0 +etbErrorCode = scalar, S08, 1396, "", 1, 0 +jamTimer = scalar, U16, 1398, "sec", 0.01, 0 +; total TS size = 1400 +faultCode = scalar, U08, 1400, "", 1, 0 +heaterDuty = scalar, U08, 1401, "%", 1, 0 +pumpDuty = scalar, U08, 1402, "%", 1, 0 +tempC = scalar, U16, 1404, "C", 1, 0 +nernstVoltage = scalar, U16, 1406, "V", 0.001, 0 +esr = scalar, U16, 1408, "ohm", 1, 0 +; total TS size = 1412 +dcOutput0 = scalar, F32, 1412, "per", 1,0 +isEnabled0_int = scalar, U08, 1416, "per", 1,0 +isEnabled0 = bits, U32, 1420, [0:0] +; total TS size = 1424 +value0 = scalar, U16, 1424, "value", 1,0 +value1 = scalar, U16, 1426, "value", 1,0 +errorRate = scalar, F32, 1428, "ratio", 1,0 ; total TS size = 1432 -lambdaCurrentlyGood = bits, U32, 1432, [0:0] -lambdaMonitorCut = bits, U32, 1432, [1:1] -lambdaTimeSinceGood = scalar, U16, 1436, "sec", 0.01, 0 -; total TS size = 1440 +vvtTarget = scalar, U16, 1432, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1434, "%", 0.5, 0 +; total TS size = 1436 +lambdaCurrentlyGood = bits, U32, 1436, [0:0] +lambdaMonitorCut = bits, U32, 1436, [1:1] +lambdaTimeSinceGood = scalar, U16, 1440, "sec", 0.01, 0 +; total TS size = 1444 time = { timeNow } @@ -5196,6 +5197,7 @@ entry = brakePedalState, "Brake switch", int, "%d" entry = startStopState, "startStopState", int, "%d" entry = startStopPhysicalState, "startStopPhysicalState", int, "%d" entry = startStopStateToggleCounter, "startStopStateToggleCounter", int, "%d" +entry = startStopStateTempPhysicalCounter, "startStopStateTempPhysicalCounter", int, "%d" entry = egtValue1, "egtValue1", float, "%.3f" entry = egtValue2, "egtValue2", float, "%.3f" entry = desiredRpmLimit, "User-defined RPM hard limit", int, "%d" @@ -6078,13 +6080,14 @@ dialog = engine_stateDialog, "engine_state" graphLine = brakePedalState graphLine = startStopState graphLine = startStopStateToggleCounter - graphLine = egtValue1 + graphLine = startStopStateTempPhysicalCounter liveGraph = engine_state_5_Graph, "Graph", South + graphLine = egtValue1 graphLine = egtValue2 graphLine = desiredRpmLimit graphLine = fuelInjectionCounter - graphLine = sparkCounter liveGraph = engine_state_6_Graph, "Graph", South + graphLine = sparkCounter graphLine = fuelingLoad graphLine = ignitionLoad graphLine = veTableYAxis @@ -6420,8 +6423,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" ; cam if ; two-stroke, or ; not crank trigger and ((vague trigger and cam choice) or not vague trigger) - field = "Cam Sensor (Primary channel)", triggerInputPins1, 1, {twoStroke == 1 || ( !(trigger_type == 2 || trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 21 || trigger_type == 26 || trigger_type == 27 || trigger_type == 33 || trigger_type == 38 || trigger_type == 39 || trigger_type == 44 || trigger_type == 45 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 58 || trigger_type == 61 || trigger_type == 62 || trigger_type == 68 || trigger_type == 70 || trigger_type == 71 || trigger_type == 72 || trigger_type == 74 || trigger_type == 75 || trigger_type == 76 || trigger_type == 77 || trigger_type == 79) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) ) ) } - field = "Crank Sensor (Primary channel)", triggerInputPins1, 1, { !(twoStroke == 1 || ( !(trigger_type == 2 || trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 21 || trigger_type == 26 || trigger_type == 27 || trigger_type == 33 || trigger_type == 38 || trigger_type == 39 || trigger_type == 44 || trigger_type == 45 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 58 || trigger_type == 61 || trigger_type == 62 || trigger_type == 68 || trigger_type == 70 || trigger_type == 71 || trigger_type == 72 || trigger_type == 74 || trigger_type == 75 || trigger_type == 76 || trigger_type == 77 || trigger_type == 79) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) ) )) } + field = "Cam Sensor (Primary channel)", triggerInputPins1, 1, {twoStroke == 1 || ( !(trigger_type == 2 || trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 21 || trigger_type == 26 || trigger_type == 27 || trigger_type == 33 || trigger_type == 38 || trigger_type == 39 || trigger_type == 44 || trigger_type == 45 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 58 || trigger_type == 61 || trigger_type == 62 || trigger_type == 68 || trigger_type == 70 || trigger_type == 71 || trigger_type == 72 || trigger_type == 74 || trigger_type == 75 || trigger_type == 76 || trigger_type == 77) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) ) ) } + field = "Crank Sensor (Primary channel)", triggerInputPins1, 1, { !(twoStroke == 1 || ( !(trigger_type == 2 || trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 21 || trigger_type == 26 || trigger_type == 27 || trigger_type == 33 || trigger_type == 38 || trigger_type == 39 || trigger_type == 44 || trigger_type == 45 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 58 || trigger_type == 61 || trigger_type == 62 || trigger_type == 68 || trigger_type == 70 || trigger_type == 71 || trigger_type == 72 || trigger_type == 74 || trigger_type == 75 || trigger_type == 76 || trigger_type == 77) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) ) )) } field = "Invert Primary", invertPrimaryTriggerSignal field = "Secondary channel", triggerInputPins2, { triggerInputPins2 != 0 || (triggerInputPins1 != 0 && (trigger_type == 1 || trigger_type == 3 || trigger_type == 15 || trigger_type == 16 || trigger_type == 19 || trigger_type == 25 || trigger_type == 28 || trigger_type == 31 || trigger_type == 35 || trigger_type == 36 || trigger_type == 37 || trigger_type == 40 || trigger_type == 49 || trigger_type == 50 || trigger_type == 53 || trigger_type == 54 || trigger_type == 63 || trigger_type == 64) ) } field = "Invert Secondary", invertSecondaryTriggerSignal, {triggerInputPins2 != 0 && (trigger_type == 1 || trigger_type == 3 || trigger_type == 15 || trigger_type == 16 || trigger_type == 19 || trigger_type == 25 || trigger_type == 28 || trigger_type == 31 || trigger_type == 35 || trigger_type == 36 || trigger_type == 37 || trigger_type == 40 || trigger_type == 49 || trigger_type == 50 || trigger_type == 53 || trigger_type == 54 || trigger_type == 63 || trigger_type == 64) } diff --git a/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini b/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini index 5ae8d7b592..45c02b01cb 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.11.08.hellen121nissan.2948507705" + signature = "rusEFI master.2023.11.09.hellen121nissan.3168931183" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.11.08.hellen121nissan.2948507705" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.11.09.hellen121nissan.3168931183" ; 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 @@ -92,7 +92,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.jar based on (unknown script) integration/rusefi_config.txt Wed Nov 08 20:02:03 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Thu Nov 09 02:07:00 UTC 2023 pageSize = 23880 page = 1 @@ -2347,7 +2347,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23870, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1440 + ochBlockSize = 1444 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3001,136 +3001,137 @@ brakePedalState = scalar, S08, 1092, "", 1, 0 startStopState = scalar, S08, 1093, "", 1, 0 startStopPhysicalState = bits, U32, 1096, [0:0] startStopStateToggleCounter = scalar, U32, 1100, "", 1, 0 -egtValue1 = scalar, F32, 1104, "", 1, 0 -egtValue2 = scalar, F32, 1108, "", 1, 0 -desiredRpmLimit = scalar, S16, 1112, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1116, "", 1, 0 -sparkCounter = scalar, U32, 1120, "", 1, 0 -fuelingLoad = scalar, F32, 1124, "", 1, 0 -ignitionLoad = scalar, F32, 1128, "", 1, 0 -veTableYAxis = scalar, U16, 1132, "%", 0.01, 0 -; total TS size = 1136 -tpsFrom = scalar, F32, 1136 -tpsTo = scalar, F32, 1140 -deltaTps = scalar, F32, 1144 -extraFuel = scalar, F32, 1148, "", 1, 0 -valueFromTable = scalar, F32, 1152, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1156, [0:0] -isBelowDecelThreshold = bits, U32, 1156, [1:1] -isTimeToResetAccumulator = bits, U32, 1156, [2:2] -isFractionalEnrichment = bits, U32, 1156, [3:3] -belowEpsilon = bits, U32, 1156, [4:4] -tooShort = bits, U32, 1156, [5:5] -fractionalInjFuel = scalar, F32, 1160, "", 1, 0 -accumulatedValue = scalar, F32, 1164, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1168, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1172, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1176, "", 1, 0 -cycleCnt = scalar, S32, 1180, "", 1, 0 -; total TS size = 1184 -hwEventCounters1 = scalar, U32, 1184, "", 1, 0 -hwEventCounters2 = scalar, U32, 1188, "", 1, 0 -hwEventCounters3 = scalar, U32, 1192, "", 1, 0 -hwEventCounters4 = scalar, U32, 1196, "", 1, 0 -hwEventCounters5 = scalar, U32, 1200, "", 1, 0 -hwEventCounters6 = scalar, U32, 1204, "", 1, 0 -vvtCamCounter = scalar, U32, 1208, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1212, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1216, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1220, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1221, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1224, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1228, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1232, "", 1, 0 -mapCamPrevToothAngle = scalar, F32, 1236, "deg", 1, 0 -isDecodingMapCam = bits, U32, 1240, [0:0] -; total TS size = 1244 -crankSynchronizationCounter = scalar, U32, 1244, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1248, "", 1, 0 -vvtToothDurations0 = scalar, U32, 1252, "us", 1, 0 -vvtCurrentPosition = scalar, F32, 1256, "sync: Primary Cam Position", 1, 0 -vvtToothPosition1 = scalar, F32, 1260, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition2 = scalar, F32, 1264, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition3 = scalar, F32, 1268, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition4 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio = scalar, F32, 1276, "", 1, 0 -triggerStateIndex = scalar, U08, 1280, "", 1, 0 -camResyncCounter = scalar, U08, 1281, "", 1, 0 -vvtStateIndex = scalar, U08, 1282, "", 1, 0 -; total TS size = 1284 -m_hasSynchronizedPhase = bits, U32, 1284, [0:0] +startStopStateTempPhysicalCounter = scalar, U32, 1104, "", 1, 0 +egtValue1 = scalar, F32, 1108, "", 1, 0 +egtValue2 = scalar, F32, 1112, "", 1, 0 +desiredRpmLimit = scalar, S16, 1116, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 1120, "", 1, 0 +sparkCounter = scalar, U32, 1124, "", 1, 0 +fuelingLoad = scalar, F32, 1128, "", 1, 0 +ignitionLoad = scalar, F32, 1132, "", 1, 0 +veTableYAxis = scalar, U16, 1136, "%", 0.01, 0 +; total TS size = 1140 +tpsFrom = scalar, F32, 1140 +tpsTo = scalar, F32, 1144 +deltaTps = scalar, F32, 1148 +extraFuel = scalar, F32, 1152, "", 1, 0 +valueFromTable = scalar, F32, 1156, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1160, [0:0] +isBelowDecelThreshold = bits, U32, 1160, [1:1] +isTimeToResetAccumulator = bits, U32, 1160, [2:2] +isFractionalEnrichment = bits, U32, 1160, [3:3] +belowEpsilon = bits, U32, 1160, [4:4] +tooShort = bits, U32, 1160, [5:5] +fractionalInjFuel = scalar, F32, 1164, "", 1, 0 +accumulatedValue = scalar, F32, 1168, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1172, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1176, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1180, "", 1, 0 +cycleCnt = scalar, S32, 1184, "", 1, 0 +; total TS size = 1188 +hwEventCounters1 = scalar, U32, 1188, "", 1, 0 +hwEventCounters2 = scalar, U32, 1192, "", 1, 0 +hwEventCounters3 = scalar, U32, 1196, "", 1, 0 +hwEventCounters4 = scalar, U32, 1200, "", 1, 0 +hwEventCounters5 = scalar, U32, 1204, "", 1, 0 +hwEventCounters6 = scalar, U32, 1208, "", 1, 0 +vvtCamCounter = scalar, U32, 1212, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1216, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1220, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1224, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1225, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1228, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1232, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1236, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1240, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1244, [0:0] +; total TS size = 1248 +crankSynchronizationCounter = scalar, U32, 1248, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1252, "", 1, 0 +vvtToothDurations0 = scalar, U32, 1256, "us", 1, 0 +vvtCurrentPosition = scalar, F32, 1260, "sync: Primary Cam Position", 1, 0 +vvtToothPosition1 = scalar, F32, 1264, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition2 = scalar, F32, 1268, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition3 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition4 = scalar, F32, 1276, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio = scalar, F32, 1280, "", 1, 0 +triggerStateIndex = scalar, U08, 1284, "", 1, 0 +camResyncCounter = scalar, U08, 1285, "", 1, 0 +vvtStateIndex = scalar, U08, 1286, "", 1, 0 ; total TS size = 1288 -wallFuelCorrection = scalar, F32, 1288, "", 1, 0 -wallFuel = scalar, F32, 1292, "", 1, 0 -; total TS size = 1296 -idleState = bits, S32, 1296, [0:2], "not important" -currentIdlePosition = scalar, F32, 1300 -baseIdlePosition = scalar, F32, 1304 -idleClosedLoop = scalar, F32, 1308 -iacByTpsTaper = scalar, F32, 1312 -throttlePedalUpState = scalar, S32, 1316, "", 1, 0 -mightResetPid = bits, U32, 1320, [0:0] -shouldResetPid = bits, U32, 1320, [1:1] -wasResetPid = bits, U32, 1320, [2:2] -mustResetPid = bits, U32, 1320, [3:3] -isCranking = bits, U32, 1320, [4:4] -isIacTableForCoasting = bits, U32, 1320, [5:5] -notIdling = bits, U32, 1320, [6:6] -needReset = bits, U32, 1320, [7:7] -isInDeadZone = bits, U32, 1320, [8:8] -isBlipping = bits, U32, 1320, [9:9] -useClosedLoop = bits, U32, 1320, [10:10] -badTps = bits, U32, 1320, [11:11] -looksLikeRunning = bits, U32, 1320, [12:12] -looksLikeCoasting = bits, U32, 1320, [13:13] -looksLikeCrankToIdle = bits, U32, 1320, [14:14] -isIdleCoasting = bits, U32, 1320, [15:15] -isIdleClosedLoop = bits, U32, 1320, [16:16] -idleTarget = scalar, S32, 1324, "", 1, 0 -targetRpmByClt = scalar, S32, 1328, "", 1, 0 -targetRpmAc = scalar, S32, 1332, "", 1, 0 -iacByRpmTaper = scalar, F32, 1336 -luaAdd = scalar, F32, 1340 -; total TS size = 1344 -idlePosition = scalar, F32, 1344, "per", 1,0 -trim = scalar, F32, 1348, "", 1, 0 -luaAdjustment = scalar, F32, 1352, "per", 1,0 -m_wastegatePosition = scalar, F32, 1356, "per", 1,0 -etbFeedForward = scalar, F32, 1360 -etbIntegralError = scalar, F32, 1364, "", 1, 0 -etbCurrentTarget = scalar, F32, 1368, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1372, "%", 1, 0 -etbRevLimitActive = bits, U32, 1376, [0:0] -jamDetected = bits, U32, 1376, [1:1] -etbDutyRateOfChange = scalar, F32, 1380, "per", 1,0 -etbDutyAverage = scalar, F32, 1384, "per", 1,0 -etbTpsErrorCounter = scalar, U16, 1388, "count", 1,0 -etbPpsErrorCounter = scalar, U16, 1390, "count", 1,0 -etbErrorCode = scalar, S08, 1392, "", 1, 0 -jamTimer = scalar, U16, 1394, "sec", 0.01, 0 -; total TS size = 1396 -faultCode = scalar, U08, 1396, "", 1, 0 -heaterDuty = scalar, U08, 1397, "%", 1, 0 -pumpDuty = scalar, U08, 1398, "%", 1, 0 -tempC = scalar, U16, 1400, "C", 1, 0 -nernstVoltage = scalar, U16, 1402, "V", 0.001, 0 -esr = scalar, U16, 1404, "ohm", 1, 0 -; total TS size = 1408 -dcOutput0 = scalar, F32, 1408, "per", 1,0 -isEnabled0_int = scalar, U08, 1412, "per", 1,0 -isEnabled0 = bits, U32, 1416, [0:0] -; total TS size = 1420 -value0 = scalar, U16, 1420, "value", 1,0 -value1 = scalar, U16, 1422, "value", 1,0 -errorRate = scalar, F32, 1424, "ratio", 1,0 -; total TS size = 1428 -vvtTarget = scalar, U16, 1428, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1430, "%", 0.5, 0 +m_hasSynchronizedPhase = bits, U32, 1288, [0:0] +; total TS size = 1292 +wallFuelCorrection = scalar, F32, 1292, "", 1, 0 +wallFuel = scalar, F32, 1296, "", 1, 0 +; total TS size = 1300 +idleState = bits, S32, 1300, [0:2], "not important" +currentIdlePosition = scalar, F32, 1304 +baseIdlePosition = scalar, F32, 1308 +idleClosedLoop = scalar, F32, 1312 +iacByTpsTaper = scalar, F32, 1316 +throttlePedalUpState = scalar, S32, 1320, "", 1, 0 +mightResetPid = bits, U32, 1324, [0:0] +shouldResetPid = bits, U32, 1324, [1:1] +wasResetPid = bits, U32, 1324, [2:2] +mustResetPid = bits, U32, 1324, [3:3] +isCranking = bits, U32, 1324, [4:4] +isIacTableForCoasting = bits, U32, 1324, [5:5] +notIdling = bits, U32, 1324, [6:6] +needReset = bits, U32, 1324, [7:7] +isInDeadZone = bits, U32, 1324, [8:8] +isBlipping = bits, U32, 1324, [9:9] +useClosedLoop = bits, U32, 1324, [10:10] +badTps = bits, U32, 1324, [11:11] +looksLikeRunning = bits, U32, 1324, [12:12] +looksLikeCoasting = bits, U32, 1324, [13:13] +looksLikeCrankToIdle = bits, U32, 1324, [14:14] +isIdleCoasting = bits, U32, 1324, [15:15] +isIdleClosedLoop = bits, U32, 1324, [16:16] +idleTarget = scalar, S32, 1328, "", 1, 0 +targetRpmByClt = scalar, S32, 1332, "", 1, 0 +targetRpmAc = scalar, S32, 1336, "", 1, 0 +iacByRpmTaper = scalar, F32, 1340 +luaAdd = scalar, F32, 1344 +; total TS size = 1348 +idlePosition = scalar, F32, 1348, "per", 1,0 +trim = scalar, F32, 1352, "", 1, 0 +luaAdjustment = scalar, F32, 1356, "per", 1,0 +m_wastegatePosition = scalar, F32, 1360, "per", 1,0 +etbFeedForward = scalar, F32, 1364 +etbIntegralError = scalar, F32, 1368, "", 1, 0 +etbCurrentTarget = scalar, F32, 1372, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1376, "%", 1, 0 +etbRevLimitActive = bits, U32, 1380, [0:0] +jamDetected = bits, U32, 1380, [1:1] +etbDutyRateOfChange = scalar, F32, 1384, "per", 1,0 +etbDutyAverage = scalar, F32, 1388, "per", 1,0 +etbTpsErrorCounter = scalar, U16, 1392, "count", 1,0 +etbPpsErrorCounter = scalar, U16, 1394, "count", 1,0 +etbErrorCode = scalar, S08, 1396, "", 1, 0 +jamTimer = scalar, U16, 1398, "sec", 0.01, 0 +; total TS size = 1400 +faultCode = scalar, U08, 1400, "", 1, 0 +heaterDuty = scalar, U08, 1401, "%", 1, 0 +pumpDuty = scalar, U08, 1402, "%", 1, 0 +tempC = scalar, U16, 1404, "C", 1, 0 +nernstVoltage = scalar, U16, 1406, "V", 0.001, 0 +esr = scalar, U16, 1408, "ohm", 1, 0 +; total TS size = 1412 +dcOutput0 = scalar, F32, 1412, "per", 1,0 +isEnabled0_int = scalar, U08, 1416, "per", 1,0 +isEnabled0 = bits, U32, 1420, [0:0] +; total TS size = 1424 +value0 = scalar, U16, 1424, "value", 1,0 +value1 = scalar, U16, 1426, "value", 1,0 +errorRate = scalar, F32, 1428, "ratio", 1,0 ; total TS size = 1432 -lambdaCurrentlyGood = bits, U32, 1432, [0:0] -lambdaMonitorCut = bits, U32, 1432, [1:1] -lambdaTimeSinceGood = scalar, U16, 1436, "sec", 0.01, 0 -; total TS size = 1440 +vvtTarget = scalar, U16, 1432, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1434, "%", 0.5, 0 +; total TS size = 1436 +lambdaCurrentlyGood = bits, U32, 1436, [0:0] +lambdaMonitorCut = bits, U32, 1436, [1:1] +lambdaTimeSinceGood = scalar, U16, 1440, "sec", 0.01, 0 +; total TS size = 1444 time = { timeNow } @@ -5196,6 +5197,7 @@ entry = brakePedalState, "Brake switch", int, "%d" entry = startStopState, "startStopState", int, "%d" entry = startStopPhysicalState, "startStopPhysicalState", int, "%d" entry = startStopStateToggleCounter, "startStopStateToggleCounter", int, "%d" +entry = startStopStateTempPhysicalCounter, "startStopStateTempPhysicalCounter", int, "%d" entry = egtValue1, "egtValue1", float, "%.3f" entry = egtValue2, "egtValue2", float, "%.3f" entry = desiredRpmLimit, "User-defined RPM hard limit", int, "%d" @@ -6076,13 +6078,14 @@ dialog = engine_stateDialog, "engine_state" graphLine = brakePedalState graphLine = startStopState graphLine = startStopStateToggleCounter - graphLine = egtValue1 + graphLine = startStopStateTempPhysicalCounter liveGraph = engine_state_5_Graph, "Graph", South + graphLine = egtValue1 graphLine = egtValue2 graphLine = desiredRpmLimit graphLine = fuelInjectionCounter - graphLine = sparkCounter liveGraph = engine_state_6_Graph, "Graph", South + graphLine = sparkCounter graphLine = fuelingLoad graphLine = ignitionLoad graphLine = veTableYAxis @@ -6417,8 +6420,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" ; cam if ; two-stroke, or ; not crank trigger and ((vague trigger and cam choice) or not vague trigger) - field = "Cam Sensor (Primary channel)", triggerInputPins1, 1, {twoStroke == 1 || ( !(trigger_type == 2 || trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 21 || trigger_type == 26 || trigger_type == 27 || trigger_type == 33 || trigger_type == 38 || trigger_type == 39 || trigger_type == 44 || trigger_type == 45 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 58 || trigger_type == 61 || trigger_type == 62 || trigger_type == 68 || trigger_type == 70 || trigger_type == 71 || trigger_type == 72 || trigger_type == 74 || trigger_type == 75 || trigger_type == 76 || trigger_type == 77 || trigger_type == 79) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) ) ) } - field = "Crank Sensor (Primary channel)", triggerInputPins1, 1, { !(twoStroke == 1 || ( !(trigger_type == 2 || trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 21 || trigger_type == 26 || trigger_type == 27 || trigger_type == 33 || trigger_type == 38 || trigger_type == 39 || trigger_type == 44 || trigger_type == 45 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 58 || trigger_type == 61 || trigger_type == 62 || trigger_type == 68 || trigger_type == 70 || trigger_type == 71 || trigger_type == 72 || trigger_type == 74 || trigger_type == 75 || trigger_type == 76 || trigger_type == 77 || trigger_type == 79) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) ) )) } + field = "Cam Sensor (Primary channel)", triggerInputPins1, 1, {twoStroke == 1 || ( !(trigger_type == 2 || trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 21 || trigger_type == 26 || trigger_type == 27 || trigger_type == 33 || trigger_type == 38 || trigger_type == 39 || trigger_type == 44 || trigger_type == 45 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 58 || trigger_type == 61 || trigger_type == 62 || trigger_type == 68 || trigger_type == 70 || trigger_type == 71 || trigger_type == 72 || trigger_type == 74 || trigger_type == 75 || trigger_type == 76 || trigger_type == 77) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) ) ) } + field = "Crank Sensor (Primary channel)", triggerInputPins1, 1, { !(twoStroke == 1 || ( !(trigger_type == 2 || trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 21 || trigger_type == 26 || trigger_type == 27 || trigger_type == 33 || trigger_type == 38 || trigger_type == 39 || trigger_type == 44 || trigger_type == 45 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 58 || trigger_type == 61 || trigger_type == 62 || trigger_type == 68 || trigger_type == 70 || trigger_type == 71 || trigger_type == 72 || trigger_type == 74 || trigger_type == 75 || trigger_type == 76 || trigger_type == 77) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) ) )) } field = "Invert Primary", invertPrimaryTriggerSignal field = "Secondary channel", triggerInputPins2, { triggerInputPins2 != 0 || (triggerInputPins1 != 0 && (trigger_type == 1 || trigger_type == 3 || trigger_type == 15 || trigger_type == 16 || trigger_type == 19 || trigger_type == 25 || trigger_type == 28 || trigger_type == 31 || trigger_type == 35 || trigger_type == 36 || trigger_type == 37 || trigger_type == 40 || trigger_type == 49 || trigger_type == 50 || trigger_type == 53 || trigger_type == 54 || trigger_type == 63 || trigger_type == 64) ) } field = "Invert Secondary", invertSecondaryTriggerSignal, {triggerInputPins2 != 0 && (trigger_type == 1 || trigger_type == 3 || trigger_type == 15 || trigger_type == 16 || trigger_type == 19 || trigger_type == 25 || trigger_type == 28 || trigger_type == 31 || trigger_type == 35 || trigger_type == 36 || trigger_type == 37 || trigger_type == 40 || trigger_type == 49 || trigger_type == 50 || trigger_type == 53 || trigger_type == 54 || trigger_type == 63 || trigger_type == 64) } diff --git a/firmware/tunerstudio/generated/rusefi_hellen121vag.ini b/firmware/tunerstudio/generated/rusefi_hellen121vag.ini index e18d0c6765..272f80095c 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen121vag.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen121vag.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.11.08.hellen121vag.2734051790" + signature = "rusEFI master.2023.11.09.hellen121vag.2980770968" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.11.08.hellen121vag.2734051790" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.11.09.hellen121vag.2980770968" ; 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 @@ -92,7 +92,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.jar based on (unknown script) integration/rusefi_config.txt Wed Nov 08 20:02:00 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Thu Nov 09 02:06:58 UTC 2023 pageSize = 23880 page = 1 @@ -2347,7 +2347,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23870, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1440 + ochBlockSize = 1444 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3001,136 +3001,137 @@ brakePedalState = scalar, S08, 1092, "", 1, 0 startStopState = scalar, S08, 1093, "", 1, 0 startStopPhysicalState = bits, U32, 1096, [0:0] startStopStateToggleCounter = scalar, U32, 1100, "", 1, 0 -egtValue1 = scalar, F32, 1104, "", 1, 0 -egtValue2 = scalar, F32, 1108, "", 1, 0 -desiredRpmLimit = scalar, S16, 1112, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1116, "", 1, 0 -sparkCounter = scalar, U32, 1120, "", 1, 0 -fuelingLoad = scalar, F32, 1124, "", 1, 0 -ignitionLoad = scalar, F32, 1128, "", 1, 0 -veTableYAxis = scalar, U16, 1132, "%", 0.01, 0 -; total TS size = 1136 -tpsFrom = scalar, F32, 1136 -tpsTo = scalar, F32, 1140 -deltaTps = scalar, F32, 1144 -extraFuel = scalar, F32, 1148, "", 1, 0 -valueFromTable = scalar, F32, 1152, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1156, [0:0] -isBelowDecelThreshold = bits, U32, 1156, [1:1] -isTimeToResetAccumulator = bits, U32, 1156, [2:2] -isFractionalEnrichment = bits, U32, 1156, [3:3] -belowEpsilon = bits, U32, 1156, [4:4] -tooShort = bits, U32, 1156, [5:5] -fractionalInjFuel = scalar, F32, 1160, "", 1, 0 -accumulatedValue = scalar, F32, 1164, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1168, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1172, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1176, "", 1, 0 -cycleCnt = scalar, S32, 1180, "", 1, 0 -; total TS size = 1184 -hwEventCounters1 = scalar, U32, 1184, "", 1, 0 -hwEventCounters2 = scalar, U32, 1188, "", 1, 0 -hwEventCounters3 = scalar, U32, 1192, "", 1, 0 -hwEventCounters4 = scalar, U32, 1196, "", 1, 0 -hwEventCounters5 = scalar, U32, 1200, "", 1, 0 -hwEventCounters6 = scalar, U32, 1204, "", 1, 0 -vvtCamCounter = scalar, U32, 1208, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1212, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1216, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1220, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1221, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1224, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1228, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1232, "", 1, 0 -mapCamPrevToothAngle = scalar, F32, 1236, "deg", 1, 0 -isDecodingMapCam = bits, U32, 1240, [0:0] -; total TS size = 1244 -crankSynchronizationCounter = scalar, U32, 1244, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1248, "", 1, 0 -vvtToothDurations0 = scalar, U32, 1252, "us", 1, 0 -vvtCurrentPosition = scalar, F32, 1256, "sync: Primary Cam Position", 1, 0 -vvtToothPosition1 = scalar, F32, 1260, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition2 = scalar, F32, 1264, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition3 = scalar, F32, 1268, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition4 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio = scalar, F32, 1276, "", 1, 0 -triggerStateIndex = scalar, U08, 1280, "", 1, 0 -camResyncCounter = scalar, U08, 1281, "", 1, 0 -vvtStateIndex = scalar, U08, 1282, "", 1, 0 -; total TS size = 1284 -m_hasSynchronizedPhase = bits, U32, 1284, [0:0] +startStopStateTempPhysicalCounter = scalar, U32, 1104, "", 1, 0 +egtValue1 = scalar, F32, 1108, "", 1, 0 +egtValue2 = scalar, F32, 1112, "", 1, 0 +desiredRpmLimit = scalar, S16, 1116, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 1120, "", 1, 0 +sparkCounter = scalar, U32, 1124, "", 1, 0 +fuelingLoad = scalar, F32, 1128, "", 1, 0 +ignitionLoad = scalar, F32, 1132, "", 1, 0 +veTableYAxis = scalar, U16, 1136, "%", 0.01, 0 +; total TS size = 1140 +tpsFrom = scalar, F32, 1140 +tpsTo = scalar, F32, 1144 +deltaTps = scalar, F32, 1148 +extraFuel = scalar, F32, 1152, "", 1, 0 +valueFromTable = scalar, F32, 1156, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1160, [0:0] +isBelowDecelThreshold = bits, U32, 1160, [1:1] +isTimeToResetAccumulator = bits, U32, 1160, [2:2] +isFractionalEnrichment = bits, U32, 1160, [3:3] +belowEpsilon = bits, U32, 1160, [4:4] +tooShort = bits, U32, 1160, [5:5] +fractionalInjFuel = scalar, F32, 1164, "", 1, 0 +accumulatedValue = scalar, F32, 1168, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1172, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1176, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1180, "", 1, 0 +cycleCnt = scalar, S32, 1184, "", 1, 0 +; total TS size = 1188 +hwEventCounters1 = scalar, U32, 1188, "", 1, 0 +hwEventCounters2 = scalar, U32, 1192, "", 1, 0 +hwEventCounters3 = scalar, U32, 1196, "", 1, 0 +hwEventCounters4 = scalar, U32, 1200, "", 1, 0 +hwEventCounters5 = scalar, U32, 1204, "", 1, 0 +hwEventCounters6 = scalar, U32, 1208, "", 1, 0 +vvtCamCounter = scalar, U32, 1212, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1216, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1220, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1224, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1225, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1228, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1232, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1236, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1240, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1244, [0:0] +; total TS size = 1248 +crankSynchronizationCounter = scalar, U32, 1248, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1252, "", 1, 0 +vvtToothDurations0 = scalar, U32, 1256, "us", 1, 0 +vvtCurrentPosition = scalar, F32, 1260, "sync: Primary Cam Position", 1, 0 +vvtToothPosition1 = scalar, F32, 1264, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition2 = scalar, F32, 1268, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition3 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition4 = scalar, F32, 1276, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio = scalar, F32, 1280, "", 1, 0 +triggerStateIndex = scalar, U08, 1284, "", 1, 0 +camResyncCounter = scalar, U08, 1285, "", 1, 0 +vvtStateIndex = scalar, U08, 1286, "", 1, 0 ; total TS size = 1288 -wallFuelCorrection = scalar, F32, 1288, "", 1, 0 -wallFuel = scalar, F32, 1292, "", 1, 0 -; total TS size = 1296 -idleState = bits, S32, 1296, [0:2], "not important" -currentIdlePosition = scalar, F32, 1300 -baseIdlePosition = scalar, F32, 1304 -idleClosedLoop = scalar, F32, 1308 -iacByTpsTaper = scalar, F32, 1312 -throttlePedalUpState = scalar, S32, 1316, "", 1, 0 -mightResetPid = bits, U32, 1320, [0:0] -shouldResetPid = bits, U32, 1320, [1:1] -wasResetPid = bits, U32, 1320, [2:2] -mustResetPid = bits, U32, 1320, [3:3] -isCranking = bits, U32, 1320, [4:4] -isIacTableForCoasting = bits, U32, 1320, [5:5] -notIdling = bits, U32, 1320, [6:6] -needReset = bits, U32, 1320, [7:7] -isInDeadZone = bits, U32, 1320, [8:8] -isBlipping = bits, U32, 1320, [9:9] -useClosedLoop = bits, U32, 1320, [10:10] -badTps = bits, U32, 1320, [11:11] -looksLikeRunning = bits, U32, 1320, [12:12] -looksLikeCoasting = bits, U32, 1320, [13:13] -looksLikeCrankToIdle = bits, U32, 1320, [14:14] -isIdleCoasting = bits, U32, 1320, [15:15] -isIdleClosedLoop = bits, U32, 1320, [16:16] -idleTarget = scalar, S32, 1324, "", 1, 0 -targetRpmByClt = scalar, S32, 1328, "", 1, 0 -targetRpmAc = scalar, S32, 1332, "", 1, 0 -iacByRpmTaper = scalar, F32, 1336 -luaAdd = scalar, F32, 1340 -; total TS size = 1344 -idlePosition = scalar, F32, 1344, "per", 1,0 -trim = scalar, F32, 1348, "", 1, 0 -luaAdjustment = scalar, F32, 1352, "per", 1,0 -m_wastegatePosition = scalar, F32, 1356, "per", 1,0 -etbFeedForward = scalar, F32, 1360 -etbIntegralError = scalar, F32, 1364, "", 1, 0 -etbCurrentTarget = scalar, F32, 1368, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1372, "%", 1, 0 -etbRevLimitActive = bits, U32, 1376, [0:0] -jamDetected = bits, U32, 1376, [1:1] -etbDutyRateOfChange = scalar, F32, 1380, "per", 1,0 -etbDutyAverage = scalar, F32, 1384, "per", 1,0 -etbTpsErrorCounter = scalar, U16, 1388, "count", 1,0 -etbPpsErrorCounter = scalar, U16, 1390, "count", 1,0 -etbErrorCode = scalar, S08, 1392, "", 1, 0 -jamTimer = scalar, U16, 1394, "sec", 0.01, 0 -; total TS size = 1396 -faultCode = scalar, U08, 1396, "", 1, 0 -heaterDuty = scalar, U08, 1397, "%", 1, 0 -pumpDuty = scalar, U08, 1398, "%", 1, 0 -tempC = scalar, U16, 1400, "C", 1, 0 -nernstVoltage = scalar, U16, 1402, "V", 0.001, 0 -esr = scalar, U16, 1404, "ohm", 1, 0 -; total TS size = 1408 -dcOutput0 = scalar, F32, 1408, "per", 1,0 -isEnabled0_int = scalar, U08, 1412, "per", 1,0 -isEnabled0 = bits, U32, 1416, [0:0] -; total TS size = 1420 -value0 = scalar, U16, 1420, "value", 1,0 -value1 = scalar, U16, 1422, "value", 1,0 -errorRate = scalar, F32, 1424, "ratio", 1,0 -; total TS size = 1428 -vvtTarget = scalar, U16, 1428, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1430, "%", 0.5, 0 +m_hasSynchronizedPhase = bits, U32, 1288, [0:0] +; total TS size = 1292 +wallFuelCorrection = scalar, F32, 1292, "", 1, 0 +wallFuel = scalar, F32, 1296, "", 1, 0 +; total TS size = 1300 +idleState = bits, S32, 1300, [0:2], "not important" +currentIdlePosition = scalar, F32, 1304 +baseIdlePosition = scalar, F32, 1308 +idleClosedLoop = scalar, F32, 1312 +iacByTpsTaper = scalar, F32, 1316 +throttlePedalUpState = scalar, S32, 1320, "", 1, 0 +mightResetPid = bits, U32, 1324, [0:0] +shouldResetPid = bits, U32, 1324, [1:1] +wasResetPid = bits, U32, 1324, [2:2] +mustResetPid = bits, U32, 1324, [3:3] +isCranking = bits, U32, 1324, [4:4] +isIacTableForCoasting = bits, U32, 1324, [5:5] +notIdling = bits, U32, 1324, [6:6] +needReset = bits, U32, 1324, [7:7] +isInDeadZone = bits, U32, 1324, [8:8] +isBlipping = bits, U32, 1324, [9:9] +useClosedLoop = bits, U32, 1324, [10:10] +badTps = bits, U32, 1324, [11:11] +looksLikeRunning = bits, U32, 1324, [12:12] +looksLikeCoasting = bits, U32, 1324, [13:13] +looksLikeCrankToIdle = bits, U32, 1324, [14:14] +isIdleCoasting = bits, U32, 1324, [15:15] +isIdleClosedLoop = bits, U32, 1324, [16:16] +idleTarget = scalar, S32, 1328, "", 1, 0 +targetRpmByClt = scalar, S32, 1332, "", 1, 0 +targetRpmAc = scalar, S32, 1336, "", 1, 0 +iacByRpmTaper = scalar, F32, 1340 +luaAdd = scalar, F32, 1344 +; total TS size = 1348 +idlePosition = scalar, F32, 1348, "per", 1,0 +trim = scalar, F32, 1352, "", 1, 0 +luaAdjustment = scalar, F32, 1356, "per", 1,0 +m_wastegatePosition = scalar, F32, 1360, "per", 1,0 +etbFeedForward = scalar, F32, 1364 +etbIntegralError = scalar, F32, 1368, "", 1, 0 +etbCurrentTarget = scalar, F32, 1372, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1376, "%", 1, 0 +etbRevLimitActive = bits, U32, 1380, [0:0] +jamDetected = bits, U32, 1380, [1:1] +etbDutyRateOfChange = scalar, F32, 1384, "per", 1,0 +etbDutyAverage = scalar, F32, 1388, "per", 1,0 +etbTpsErrorCounter = scalar, U16, 1392, "count", 1,0 +etbPpsErrorCounter = scalar, U16, 1394, "count", 1,0 +etbErrorCode = scalar, S08, 1396, "", 1, 0 +jamTimer = scalar, U16, 1398, "sec", 0.01, 0 +; total TS size = 1400 +faultCode = scalar, U08, 1400, "", 1, 0 +heaterDuty = scalar, U08, 1401, "%", 1, 0 +pumpDuty = scalar, U08, 1402, "%", 1, 0 +tempC = scalar, U16, 1404, "C", 1, 0 +nernstVoltage = scalar, U16, 1406, "V", 0.001, 0 +esr = scalar, U16, 1408, "ohm", 1, 0 +; total TS size = 1412 +dcOutput0 = scalar, F32, 1412, "per", 1,0 +isEnabled0_int = scalar, U08, 1416, "per", 1,0 +isEnabled0 = bits, U32, 1420, [0:0] +; total TS size = 1424 +value0 = scalar, U16, 1424, "value", 1,0 +value1 = scalar, U16, 1426, "value", 1,0 +errorRate = scalar, F32, 1428, "ratio", 1,0 ; total TS size = 1432 -lambdaCurrentlyGood = bits, U32, 1432, [0:0] -lambdaMonitorCut = bits, U32, 1432, [1:1] -lambdaTimeSinceGood = scalar, U16, 1436, "sec", 0.01, 0 -; total TS size = 1440 +vvtTarget = scalar, U16, 1432, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1434, "%", 0.5, 0 +; total TS size = 1436 +lambdaCurrentlyGood = bits, U32, 1436, [0:0] +lambdaMonitorCut = bits, U32, 1436, [1:1] +lambdaTimeSinceGood = scalar, U16, 1440, "sec", 0.01, 0 +; total TS size = 1444 time = { timeNow } @@ -5196,6 +5197,7 @@ entry = brakePedalState, "Brake switch", int, "%d" entry = startStopState, "startStopState", int, "%d" entry = startStopPhysicalState, "startStopPhysicalState", int, "%d" entry = startStopStateToggleCounter, "startStopStateToggleCounter", int, "%d" +entry = startStopStateTempPhysicalCounter, "startStopStateTempPhysicalCounter", int, "%d" entry = egtValue1, "egtValue1", float, "%.3f" entry = egtValue2, "egtValue2", float, "%.3f" entry = desiredRpmLimit, "User-defined RPM hard limit", int, "%d" @@ -6078,13 +6080,14 @@ dialog = engine_stateDialog, "engine_state" graphLine = brakePedalState graphLine = startStopState graphLine = startStopStateToggleCounter - graphLine = egtValue1 + graphLine = startStopStateTempPhysicalCounter liveGraph = engine_state_5_Graph, "Graph", South + graphLine = egtValue1 graphLine = egtValue2 graphLine = desiredRpmLimit graphLine = fuelInjectionCounter - graphLine = sparkCounter liveGraph = engine_state_6_Graph, "Graph", South + graphLine = sparkCounter graphLine = fuelingLoad graphLine = ignitionLoad graphLine = veTableYAxis @@ -6420,8 +6423,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" ; cam if ; two-stroke, or ; not crank trigger and ((vague trigger and cam choice) or not vague trigger) - field = "Cam Sensor (Primary channel)", triggerInputPins1, 1, {twoStroke == 1 || ( !(trigger_type == 2 || trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 21 || trigger_type == 26 || trigger_type == 27 || trigger_type == 33 || trigger_type == 38 || trigger_type == 39 || trigger_type == 44 || trigger_type == 45 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 58 || trigger_type == 61 || trigger_type == 62 || trigger_type == 68 || trigger_type == 70 || trigger_type == 71 || trigger_type == 72 || trigger_type == 74 || trigger_type == 75 || trigger_type == 76 || trigger_type == 77 || trigger_type == 79) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) ) ) } - field = "Crank Sensor (Primary channel)", triggerInputPins1, 1, { !(twoStroke == 1 || ( !(trigger_type == 2 || trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 21 || trigger_type == 26 || trigger_type == 27 || trigger_type == 33 || trigger_type == 38 || trigger_type == 39 || trigger_type == 44 || trigger_type == 45 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 58 || trigger_type == 61 || trigger_type == 62 || trigger_type == 68 || trigger_type == 70 || trigger_type == 71 || trigger_type == 72 || trigger_type == 74 || trigger_type == 75 || trigger_type == 76 || trigger_type == 77 || trigger_type == 79) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) ) )) } + field = "Cam Sensor (Primary channel)", triggerInputPins1, 1, {twoStroke == 1 || ( !(trigger_type == 2 || trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 21 || trigger_type == 26 || trigger_type == 27 || trigger_type == 33 || trigger_type == 38 || trigger_type == 39 || trigger_type == 44 || trigger_type == 45 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 58 || trigger_type == 61 || trigger_type == 62 || trigger_type == 68 || trigger_type == 70 || trigger_type == 71 || trigger_type == 72 || trigger_type == 74 || trigger_type == 75 || trigger_type == 76 || trigger_type == 77) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) ) ) } + field = "Crank Sensor (Primary channel)", triggerInputPins1, 1, { !(twoStroke == 1 || ( !(trigger_type == 2 || trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 21 || trigger_type == 26 || trigger_type == 27 || trigger_type == 33 || trigger_type == 38 || trigger_type == 39 || trigger_type == 44 || trigger_type == 45 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 58 || trigger_type == 61 || trigger_type == 62 || trigger_type == 68 || trigger_type == 70 || trigger_type == 71 || trigger_type == 72 || trigger_type == 74 || trigger_type == 75 || trigger_type == 76 || trigger_type == 77) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) ) )) } field = "Invert Primary", invertPrimaryTriggerSignal field = "Secondary channel", triggerInputPins2, { triggerInputPins2 != 0 || (triggerInputPins1 != 0 && (trigger_type == 1 || trigger_type == 3 || trigger_type == 15 || trigger_type == 16 || trigger_type == 19 || trigger_type == 25 || trigger_type == 28 || trigger_type == 31 || trigger_type == 35 || trigger_type == 36 || trigger_type == 37 || trigger_type == 40 || trigger_type == 49 || trigger_type == 50 || trigger_type == 53 || trigger_type == 54 || trigger_type == 63 || trigger_type == 64) ) } field = "Invert Secondary", invertSecondaryTriggerSignal, {triggerInputPins2 != 0 && (trigger_type == 1 || trigger_type == 3 || trigger_type == 15 || trigger_type == 16 || trigger_type == 19 || trigger_type == 25 || trigger_type == 28 || trigger_type == 31 || trigger_type == 35 || trigger_type == 36 || trigger_type == 37 || trigger_type == 40 || trigger_type == 49 || trigger_type == 50 || trigger_type == 53 || trigger_type == 54 || trigger_type == 63 || trigger_type == 64) } diff --git a/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini b/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini index 8364ecf3b5..5e103a004f 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.11.08.hellen128.4183476583" + signature = "rusEFI master.2023.11.09.hellen128.3926289457" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.11.08.hellen128.4183476583" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.11.09.hellen128.3926289457" ; 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 @@ -92,7 +92,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.jar based on (unknown script) integration/rusefi_config.txt Wed Nov 08 20:01:56 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Thu Nov 09 02:06:55 UTC 2023 pageSize = 23880 page = 1 @@ -2347,7 +2347,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23870, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1440 + ochBlockSize = 1444 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3001,136 +3001,137 @@ brakePedalState = scalar, S08, 1092, "", 1, 0 startStopState = scalar, S08, 1093, "", 1, 0 startStopPhysicalState = bits, U32, 1096, [0:0] startStopStateToggleCounter = scalar, U32, 1100, "", 1, 0 -egtValue1 = scalar, F32, 1104, "", 1, 0 -egtValue2 = scalar, F32, 1108, "", 1, 0 -desiredRpmLimit = scalar, S16, 1112, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1116, "", 1, 0 -sparkCounter = scalar, U32, 1120, "", 1, 0 -fuelingLoad = scalar, F32, 1124, "", 1, 0 -ignitionLoad = scalar, F32, 1128, "", 1, 0 -veTableYAxis = scalar, U16, 1132, "%", 0.01, 0 -; total TS size = 1136 -tpsFrom = scalar, F32, 1136 -tpsTo = scalar, F32, 1140 -deltaTps = scalar, F32, 1144 -extraFuel = scalar, F32, 1148, "", 1, 0 -valueFromTable = scalar, F32, 1152, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1156, [0:0] -isBelowDecelThreshold = bits, U32, 1156, [1:1] -isTimeToResetAccumulator = bits, U32, 1156, [2:2] -isFractionalEnrichment = bits, U32, 1156, [3:3] -belowEpsilon = bits, U32, 1156, [4:4] -tooShort = bits, U32, 1156, [5:5] -fractionalInjFuel = scalar, F32, 1160, "", 1, 0 -accumulatedValue = scalar, F32, 1164, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1168, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1172, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1176, "", 1, 0 -cycleCnt = scalar, S32, 1180, "", 1, 0 -; total TS size = 1184 -hwEventCounters1 = scalar, U32, 1184, "", 1, 0 -hwEventCounters2 = scalar, U32, 1188, "", 1, 0 -hwEventCounters3 = scalar, U32, 1192, "", 1, 0 -hwEventCounters4 = scalar, U32, 1196, "", 1, 0 -hwEventCounters5 = scalar, U32, 1200, "", 1, 0 -hwEventCounters6 = scalar, U32, 1204, "", 1, 0 -vvtCamCounter = scalar, U32, 1208, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1212, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1216, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1220, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1221, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1224, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1228, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1232, "", 1, 0 -mapCamPrevToothAngle = scalar, F32, 1236, "deg", 1, 0 -isDecodingMapCam = bits, U32, 1240, [0:0] -; total TS size = 1244 -crankSynchronizationCounter = scalar, U32, 1244, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1248, "", 1, 0 -vvtToothDurations0 = scalar, U32, 1252, "us", 1, 0 -vvtCurrentPosition = scalar, F32, 1256, "sync: Primary Cam Position", 1, 0 -vvtToothPosition1 = scalar, F32, 1260, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition2 = scalar, F32, 1264, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition3 = scalar, F32, 1268, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition4 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio = scalar, F32, 1276, "", 1, 0 -triggerStateIndex = scalar, U08, 1280, "", 1, 0 -camResyncCounter = scalar, U08, 1281, "", 1, 0 -vvtStateIndex = scalar, U08, 1282, "", 1, 0 -; total TS size = 1284 -m_hasSynchronizedPhase = bits, U32, 1284, [0:0] +startStopStateTempPhysicalCounter = scalar, U32, 1104, "", 1, 0 +egtValue1 = scalar, F32, 1108, "", 1, 0 +egtValue2 = scalar, F32, 1112, "", 1, 0 +desiredRpmLimit = scalar, S16, 1116, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 1120, "", 1, 0 +sparkCounter = scalar, U32, 1124, "", 1, 0 +fuelingLoad = scalar, F32, 1128, "", 1, 0 +ignitionLoad = scalar, F32, 1132, "", 1, 0 +veTableYAxis = scalar, U16, 1136, "%", 0.01, 0 +; total TS size = 1140 +tpsFrom = scalar, F32, 1140 +tpsTo = scalar, F32, 1144 +deltaTps = scalar, F32, 1148 +extraFuel = scalar, F32, 1152, "", 1, 0 +valueFromTable = scalar, F32, 1156, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1160, [0:0] +isBelowDecelThreshold = bits, U32, 1160, [1:1] +isTimeToResetAccumulator = bits, U32, 1160, [2:2] +isFractionalEnrichment = bits, U32, 1160, [3:3] +belowEpsilon = bits, U32, 1160, [4:4] +tooShort = bits, U32, 1160, [5:5] +fractionalInjFuel = scalar, F32, 1164, "", 1, 0 +accumulatedValue = scalar, F32, 1168, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1172, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1176, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1180, "", 1, 0 +cycleCnt = scalar, S32, 1184, "", 1, 0 +; total TS size = 1188 +hwEventCounters1 = scalar, U32, 1188, "", 1, 0 +hwEventCounters2 = scalar, U32, 1192, "", 1, 0 +hwEventCounters3 = scalar, U32, 1196, "", 1, 0 +hwEventCounters4 = scalar, U32, 1200, "", 1, 0 +hwEventCounters5 = scalar, U32, 1204, "", 1, 0 +hwEventCounters6 = scalar, U32, 1208, "", 1, 0 +vvtCamCounter = scalar, U32, 1212, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1216, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1220, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1224, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1225, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1228, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1232, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1236, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1240, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1244, [0:0] +; total TS size = 1248 +crankSynchronizationCounter = scalar, U32, 1248, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1252, "", 1, 0 +vvtToothDurations0 = scalar, U32, 1256, "us", 1, 0 +vvtCurrentPosition = scalar, F32, 1260, "sync: Primary Cam Position", 1, 0 +vvtToothPosition1 = scalar, F32, 1264, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition2 = scalar, F32, 1268, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition3 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition4 = scalar, F32, 1276, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio = scalar, F32, 1280, "", 1, 0 +triggerStateIndex = scalar, U08, 1284, "", 1, 0 +camResyncCounter = scalar, U08, 1285, "", 1, 0 +vvtStateIndex = scalar, U08, 1286, "", 1, 0 ; total TS size = 1288 -wallFuelCorrection = scalar, F32, 1288, "", 1, 0 -wallFuel = scalar, F32, 1292, "", 1, 0 -; total TS size = 1296 -idleState = bits, S32, 1296, [0:2], "not important" -currentIdlePosition = scalar, F32, 1300 -baseIdlePosition = scalar, F32, 1304 -idleClosedLoop = scalar, F32, 1308 -iacByTpsTaper = scalar, F32, 1312 -throttlePedalUpState = scalar, S32, 1316, "", 1, 0 -mightResetPid = bits, U32, 1320, [0:0] -shouldResetPid = bits, U32, 1320, [1:1] -wasResetPid = bits, U32, 1320, [2:2] -mustResetPid = bits, U32, 1320, [3:3] -isCranking = bits, U32, 1320, [4:4] -isIacTableForCoasting = bits, U32, 1320, [5:5] -notIdling = bits, U32, 1320, [6:6] -needReset = bits, U32, 1320, [7:7] -isInDeadZone = bits, U32, 1320, [8:8] -isBlipping = bits, U32, 1320, [9:9] -useClosedLoop = bits, U32, 1320, [10:10] -badTps = bits, U32, 1320, [11:11] -looksLikeRunning = bits, U32, 1320, [12:12] -looksLikeCoasting = bits, U32, 1320, [13:13] -looksLikeCrankToIdle = bits, U32, 1320, [14:14] -isIdleCoasting = bits, U32, 1320, [15:15] -isIdleClosedLoop = bits, U32, 1320, [16:16] -idleTarget = scalar, S32, 1324, "", 1, 0 -targetRpmByClt = scalar, S32, 1328, "", 1, 0 -targetRpmAc = scalar, S32, 1332, "", 1, 0 -iacByRpmTaper = scalar, F32, 1336 -luaAdd = scalar, F32, 1340 -; total TS size = 1344 -idlePosition = scalar, F32, 1344, "per", 1,0 -trim = scalar, F32, 1348, "", 1, 0 -luaAdjustment = scalar, F32, 1352, "per", 1,0 -m_wastegatePosition = scalar, F32, 1356, "per", 1,0 -etbFeedForward = scalar, F32, 1360 -etbIntegralError = scalar, F32, 1364, "", 1, 0 -etbCurrentTarget = scalar, F32, 1368, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1372, "%", 1, 0 -etbRevLimitActive = bits, U32, 1376, [0:0] -jamDetected = bits, U32, 1376, [1:1] -etbDutyRateOfChange = scalar, F32, 1380, "per", 1,0 -etbDutyAverage = scalar, F32, 1384, "per", 1,0 -etbTpsErrorCounter = scalar, U16, 1388, "count", 1,0 -etbPpsErrorCounter = scalar, U16, 1390, "count", 1,0 -etbErrorCode = scalar, S08, 1392, "", 1, 0 -jamTimer = scalar, U16, 1394, "sec", 0.01, 0 -; total TS size = 1396 -faultCode = scalar, U08, 1396, "", 1, 0 -heaterDuty = scalar, U08, 1397, "%", 1, 0 -pumpDuty = scalar, U08, 1398, "%", 1, 0 -tempC = scalar, U16, 1400, "C", 1, 0 -nernstVoltage = scalar, U16, 1402, "V", 0.001, 0 -esr = scalar, U16, 1404, "ohm", 1, 0 -; total TS size = 1408 -dcOutput0 = scalar, F32, 1408, "per", 1,0 -isEnabled0_int = scalar, U08, 1412, "per", 1,0 -isEnabled0 = bits, U32, 1416, [0:0] -; total TS size = 1420 -value0 = scalar, U16, 1420, "value", 1,0 -value1 = scalar, U16, 1422, "value", 1,0 -errorRate = scalar, F32, 1424, "ratio", 1,0 -; total TS size = 1428 -vvtTarget = scalar, U16, 1428, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1430, "%", 0.5, 0 +m_hasSynchronizedPhase = bits, U32, 1288, [0:0] +; total TS size = 1292 +wallFuelCorrection = scalar, F32, 1292, "", 1, 0 +wallFuel = scalar, F32, 1296, "", 1, 0 +; total TS size = 1300 +idleState = bits, S32, 1300, [0:2], "not important" +currentIdlePosition = scalar, F32, 1304 +baseIdlePosition = scalar, F32, 1308 +idleClosedLoop = scalar, F32, 1312 +iacByTpsTaper = scalar, F32, 1316 +throttlePedalUpState = scalar, S32, 1320, "", 1, 0 +mightResetPid = bits, U32, 1324, [0:0] +shouldResetPid = bits, U32, 1324, [1:1] +wasResetPid = bits, U32, 1324, [2:2] +mustResetPid = bits, U32, 1324, [3:3] +isCranking = bits, U32, 1324, [4:4] +isIacTableForCoasting = bits, U32, 1324, [5:5] +notIdling = bits, U32, 1324, [6:6] +needReset = bits, U32, 1324, [7:7] +isInDeadZone = bits, U32, 1324, [8:8] +isBlipping = bits, U32, 1324, [9:9] +useClosedLoop = bits, U32, 1324, [10:10] +badTps = bits, U32, 1324, [11:11] +looksLikeRunning = bits, U32, 1324, [12:12] +looksLikeCoasting = bits, U32, 1324, [13:13] +looksLikeCrankToIdle = bits, U32, 1324, [14:14] +isIdleCoasting = bits, U32, 1324, [15:15] +isIdleClosedLoop = bits, U32, 1324, [16:16] +idleTarget = scalar, S32, 1328, "", 1, 0 +targetRpmByClt = scalar, S32, 1332, "", 1, 0 +targetRpmAc = scalar, S32, 1336, "", 1, 0 +iacByRpmTaper = scalar, F32, 1340 +luaAdd = scalar, F32, 1344 +; total TS size = 1348 +idlePosition = scalar, F32, 1348, "per", 1,0 +trim = scalar, F32, 1352, "", 1, 0 +luaAdjustment = scalar, F32, 1356, "per", 1,0 +m_wastegatePosition = scalar, F32, 1360, "per", 1,0 +etbFeedForward = scalar, F32, 1364 +etbIntegralError = scalar, F32, 1368, "", 1, 0 +etbCurrentTarget = scalar, F32, 1372, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1376, "%", 1, 0 +etbRevLimitActive = bits, U32, 1380, [0:0] +jamDetected = bits, U32, 1380, [1:1] +etbDutyRateOfChange = scalar, F32, 1384, "per", 1,0 +etbDutyAverage = scalar, F32, 1388, "per", 1,0 +etbTpsErrorCounter = scalar, U16, 1392, "count", 1,0 +etbPpsErrorCounter = scalar, U16, 1394, "count", 1,0 +etbErrorCode = scalar, S08, 1396, "", 1, 0 +jamTimer = scalar, U16, 1398, "sec", 0.01, 0 +; total TS size = 1400 +faultCode = scalar, U08, 1400, "", 1, 0 +heaterDuty = scalar, U08, 1401, "%", 1, 0 +pumpDuty = scalar, U08, 1402, "%", 1, 0 +tempC = scalar, U16, 1404, "C", 1, 0 +nernstVoltage = scalar, U16, 1406, "V", 0.001, 0 +esr = scalar, U16, 1408, "ohm", 1, 0 +; total TS size = 1412 +dcOutput0 = scalar, F32, 1412, "per", 1,0 +isEnabled0_int = scalar, U08, 1416, "per", 1,0 +isEnabled0 = bits, U32, 1420, [0:0] +; total TS size = 1424 +value0 = scalar, U16, 1424, "value", 1,0 +value1 = scalar, U16, 1426, "value", 1,0 +errorRate = scalar, F32, 1428, "ratio", 1,0 ; total TS size = 1432 -lambdaCurrentlyGood = bits, U32, 1432, [0:0] -lambdaMonitorCut = bits, U32, 1432, [1:1] -lambdaTimeSinceGood = scalar, U16, 1436, "sec", 0.01, 0 -; total TS size = 1440 +vvtTarget = scalar, U16, 1432, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1434, "%", 0.5, 0 +; total TS size = 1436 +lambdaCurrentlyGood = bits, U32, 1436, [0:0] +lambdaMonitorCut = bits, U32, 1436, [1:1] +lambdaTimeSinceGood = scalar, U16, 1440, "sec", 0.01, 0 +; total TS size = 1444 time = { timeNow } @@ -5196,6 +5197,7 @@ entry = brakePedalState, "Brake switch", int, "%d" entry = startStopState, "startStopState", int, "%d" entry = startStopPhysicalState, "startStopPhysicalState", int, "%d" entry = startStopStateToggleCounter, "startStopStateToggleCounter", int, "%d" +entry = startStopStateTempPhysicalCounter, "startStopStateTempPhysicalCounter", int, "%d" entry = egtValue1, "egtValue1", float, "%.3f" entry = egtValue2, "egtValue2", float, "%.3f" entry = desiredRpmLimit, "User-defined RPM hard limit", int, "%d" @@ -6078,13 +6080,14 @@ dialog = engine_stateDialog, "engine_state" graphLine = brakePedalState graphLine = startStopState graphLine = startStopStateToggleCounter - graphLine = egtValue1 + graphLine = startStopStateTempPhysicalCounter liveGraph = engine_state_5_Graph, "Graph", South + graphLine = egtValue1 graphLine = egtValue2 graphLine = desiredRpmLimit graphLine = fuelInjectionCounter - graphLine = sparkCounter liveGraph = engine_state_6_Graph, "Graph", South + graphLine = sparkCounter graphLine = fuelingLoad graphLine = ignitionLoad graphLine = veTableYAxis @@ -6419,8 +6422,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" ; cam if ; two-stroke, or ; not crank trigger and ((vague trigger and cam choice) or not vague trigger) - field = "Cam Sensor (Primary channel)", triggerInputPins1, 1, {twoStroke == 1 || ( !(trigger_type == 2 || trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 21 || trigger_type == 26 || trigger_type == 27 || trigger_type == 33 || trigger_type == 38 || trigger_type == 39 || trigger_type == 44 || trigger_type == 45 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 58 || trigger_type == 61 || trigger_type == 62 || trigger_type == 68 || trigger_type == 70 || trigger_type == 71 || trigger_type == 72 || trigger_type == 74 || trigger_type == 75 || trigger_type == 76 || trigger_type == 77 || trigger_type == 79) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) ) ) } - field = "Crank Sensor (Primary channel)", triggerInputPins1, 1, { !(twoStroke == 1 || ( !(trigger_type == 2 || trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 21 || trigger_type == 26 || trigger_type == 27 || trigger_type == 33 || trigger_type == 38 || trigger_type == 39 || trigger_type == 44 || trigger_type == 45 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 58 || trigger_type == 61 || trigger_type == 62 || trigger_type == 68 || trigger_type == 70 || trigger_type == 71 || trigger_type == 72 || trigger_type == 74 || trigger_type == 75 || trigger_type == 76 || trigger_type == 77 || trigger_type == 79) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) ) )) } + field = "Cam Sensor (Primary channel)", triggerInputPins1, 1, {twoStroke == 1 || ( !(trigger_type == 2 || trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 21 || trigger_type == 26 || trigger_type == 27 || trigger_type == 33 || trigger_type == 38 || trigger_type == 39 || trigger_type == 44 || trigger_type == 45 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 58 || trigger_type == 61 || trigger_type == 62 || trigger_type == 68 || trigger_type == 70 || trigger_type == 71 || trigger_type == 72 || trigger_type == 74 || trigger_type == 75 || trigger_type == 76 || trigger_type == 77) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) ) ) } + field = "Crank Sensor (Primary channel)", triggerInputPins1, 1, { !(twoStroke == 1 || ( !(trigger_type == 2 || trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 21 || trigger_type == 26 || trigger_type == 27 || trigger_type == 33 || trigger_type == 38 || trigger_type == 39 || trigger_type == 44 || trigger_type == 45 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 58 || trigger_type == 61 || trigger_type == 62 || trigger_type == 68 || trigger_type == 70 || trigger_type == 71 || trigger_type == 72 || trigger_type == 74 || trigger_type == 75 || trigger_type == 76 || trigger_type == 77) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) ) )) } field = "Invert Primary", invertPrimaryTriggerSignal field = "Secondary channel", triggerInputPins2, { triggerInputPins2 != 0 || (triggerInputPins1 != 0 && (trigger_type == 1 || trigger_type == 3 || trigger_type == 15 || trigger_type == 16 || trigger_type == 19 || trigger_type == 25 || trigger_type == 28 || trigger_type == 31 || trigger_type == 35 || trigger_type == 36 || trigger_type == 37 || trigger_type == 40 || trigger_type == 49 || trigger_type == 50 || trigger_type == 53 || trigger_type == 54 || trigger_type == 63 || trigger_type == 64) ) } field = "Invert Secondary", invertSecondaryTriggerSignal, {triggerInputPins2 != 0 && (trigger_type == 1 || trigger_type == 3 || trigger_type == 15 || trigger_type == 16 || trigger_type == 19 || trigger_type == 25 || trigger_type == 28 || trigger_type == 31 || trigger_type == 35 || trigger_type == 36 || trigger_type == 37 || trigger_type == 40 || trigger_type == 49 || trigger_type == 50 || trigger_type == 53 || trigger_type == 54 || trigger_type == 63 || trigger_type == 64) } diff --git a/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini b/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini index 294f1812ab..2d067caf8f 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.11.08.hellen154hyundai.3888858295" + signature = "rusEFI master.2023.11.09.hellen154hyundai.4103594465" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.11.08.hellen154hyundai.3888858295" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.11.09.hellen154hyundai.4103594465" ; 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 @@ -92,7 +92,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.jar based on (unknown script) integration/rusefi_config.txt Wed Nov 08 20:02:10 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Thu Nov 09 02:07:05 UTC 2023 pageSize = 23880 page = 1 @@ -2347,7 +2347,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23870, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1440 + ochBlockSize = 1444 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3001,136 +3001,137 @@ brakePedalState = scalar, S08, 1092, "", 1, 0 startStopState = scalar, S08, 1093, "", 1, 0 startStopPhysicalState = bits, U32, 1096, [0:0] startStopStateToggleCounter = scalar, U32, 1100, "", 1, 0 -egtValue1 = scalar, F32, 1104, "", 1, 0 -egtValue2 = scalar, F32, 1108, "", 1, 0 -desiredRpmLimit = scalar, S16, 1112, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1116, "", 1, 0 -sparkCounter = scalar, U32, 1120, "", 1, 0 -fuelingLoad = scalar, F32, 1124, "", 1, 0 -ignitionLoad = scalar, F32, 1128, "", 1, 0 -veTableYAxis = scalar, U16, 1132, "%", 0.01, 0 -; total TS size = 1136 -tpsFrom = scalar, F32, 1136 -tpsTo = scalar, F32, 1140 -deltaTps = scalar, F32, 1144 -extraFuel = scalar, F32, 1148, "", 1, 0 -valueFromTable = scalar, F32, 1152, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1156, [0:0] -isBelowDecelThreshold = bits, U32, 1156, [1:1] -isTimeToResetAccumulator = bits, U32, 1156, [2:2] -isFractionalEnrichment = bits, U32, 1156, [3:3] -belowEpsilon = bits, U32, 1156, [4:4] -tooShort = bits, U32, 1156, [5:5] -fractionalInjFuel = scalar, F32, 1160, "", 1, 0 -accumulatedValue = scalar, F32, 1164, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1168, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1172, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1176, "", 1, 0 -cycleCnt = scalar, S32, 1180, "", 1, 0 -; total TS size = 1184 -hwEventCounters1 = scalar, U32, 1184, "", 1, 0 -hwEventCounters2 = scalar, U32, 1188, "", 1, 0 -hwEventCounters3 = scalar, U32, 1192, "", 1, 0 -hwEventCounters4 = scalar, U32, 1196, "", 1, 0 -hwEventCounters5 = scalar, U32, 1200, "", 1, 0 -hwEventCounters6 = scalar, U32, 1204, "", 1, 0 -vvtCamCounter = scalar, U32, 1208, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1212, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1216, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1220, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1221, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1224, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1228, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1232, "", 1, 0 -mapCamPrevToothAngle = scalar, F32, 1236, "deg", 1, 0 -isDecodingMapCam = bits, U32, 1240, [0:0] -; total TS size = 1244 -crankSynchronizationCounter = scalar, U32, 1244, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1248, "", 1, 0 -vvtToothDurations0 = scalar, U32, 1252, "us", 1, 0 -vvtCurrentPosition = scalar, F32, 1256, "sync: Primary Cam Position", 1, 0 -vvtToothPosition1 = scalar, F32, 1260, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition2 = scalar, F32, 1264, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition3 = scalar, F32, 1268, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition4 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio = scalar, F32, 1276, "", 1, 0 -triggerStateIndex = scalar, U08, 1280, "", 1, 0 -camResyncCounter = scalar, U08, 1281, "", 1, 0 -vvtStateIndex = scalar, U08, 1282, "", 1, 0 -; total TS size = 1284 -m_hasSynchronizedPhase = bits, U32, 1284, [0:0] +startStopStateTempPhysicalCounter = scalar, U32, 1104, "", 1, 0 +egtValue1 = scalar, F32, 1108, "", 1, 0 +egtValue2 = scalar, F32, 1112, "", 1, 0 +desiredRpmLimit = scalar, S16, 1116, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 1120, "", 1, 0 +sparkCounter = scalar, U32, 1124, "", 1, 0 +fuelingLoad = scalar, F32, 1128, "", 1, 0 +ignitionLoad = scalar, F32, 1132, "", 1, 0 +veTableYAxis = scalar, U16, 1136, "%", 0.01, 0 +; total TS size = 1140 +tpsFrom = scalar, F32, 1140 +tpsTo = scalar, F32, 1144 +deltaTps = scalar, F32, 1148 +extraFuel = scalar, F32, 1152, "", 1, 0 +valueFromTable = scalar, F32, 1156, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1160, [0:0] +isBelowDecelThreshold = bits, U32, 1160, [1:1] +isTimeToResetAccumulator = bits, U32, 1160, [2:2] +isFractionalEnrichment = bits, U32, 1160, [3:3] +belowEpsilon = bits, U32, 1160, [4:4] +tooShort = bits, U32, 1160, [5:5] +fractionalInjFuel = scalar, F32, 1164, "", 1, 0 +accumulatedValue = scalar, F32, 1168, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1172, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1176, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1180, "", 1, 0 +cycleCnt = scalar, S32, 1184, "", 1, 0 +; total TS size = 1188 +hwEventCounters1 = scalar, U32, 1188, "", 1, 0 +hwEventCounters2 = scalar, U32, 1192, "", 1, 0 +hwEventCounters3 = scalar, U32, 1196, "", 1, 0 +hwEventCounters4 = scalar, U32, 1200, "", 1, 0 +hwEventCounters5 = scalar, U32, 1204, "", 1, 0 +hwEventCounters6 = scalar, U32, 1208, "", 1, 0 +vvtCamCounter = scalar, U32, 1212, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1216, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1220, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1224, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1225, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1228, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1232, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1236, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1240, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1244, [0:0] +; total TS size = 1248 +crankSynchronizationCounter = scalar, U32, 1248, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1252, "", 1, 0 +vvtToothDurations0 = scalar, U32, 1256, "us", 1, 0 +vvtCurrentPosition = scalar, F32, 1260, "sync: Primary Cam Position", 1, 0 +vvtToothPosition1 = scalar, F32, 1264, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition2 = scalar, F32, 1268, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition3 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition4 = scalar, F32, 1276, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio = scalar, F32, 1280, "", 1, 0 +triggerStateIndex = scalar, U08, 1284, "", 1, 0 +camResyncCounter = scalar, U08, 1285, "", 1, 0 +vvtStateIndex = scalar, U08, 1286, "", 1, 0 ; total TS size = 1288 -wallFuelCorrection = scalar, F32, 1288, "", 1, 0 -wallFuel = scalar, F32, 1292, "", 1, 0 -; total TS size = 1296 -idleState = bits, S32, 1296, [0:2], "not important" -currentIdlePosition = scalar, F32, 1300 -baseIdlePosition = scalar, F32, 1304 -idleClosedLoop = scalar, F32, 1308 -iacByTpsTaper = scalar, F32, 1312 -throttlePedalUpState = scalar, S32, 1316, "", 1, 0 -mightResetPid = bits, U32, 1320, [0:0] -shouldResetPid = bits, U32, 1320, [1:1] -wasResetPid = bits, U32, 1320, [2:2] -mustResetPid = bits, U32, 1320, [3:3] -isCranking = bits, U32, 1320, [4:4] -isIacTableForCoasting = bits, U32, 1320, [5:5] -notIdling = bits, U32, 1320, [6:6] -needReset = bits, U32, 1320, [7:7] -isInDeadZone = bits, U32, 1320, [8:8] -isBlipping = bits, U32, 1320, [9:9] -useClosedLoop = bits, U32, 1320, [10:10] -badTps = bits, U32, 1320, [11:11] -looksLikeRunning = bits, U32, 1320, [12:12] -looksLikeCoasting = bits, U32, 1320, [13:13] -looksLikeCrankToIdle = bits, U32, 1320, [14:14] -isIdleCoasting = bits, U32, 1320, [15:15] -isIdleClosedLoop = bits, U32, 1320, [16:16] -idleTarget = scalar, S32, 1324, "", 1, 0 -targetRpmByClt = scalar, S32, 1328, "", 1, 0 -targetRpmAc = scalar, S32, 1332, "", 1, 0 -iacByRpmTaper = scalar, F32, 1336 -luaAdd = scalar, F32, 1340 -; total TS size = 1344 -idlePosition = scalar, F32, 1344, "per", 1,0 -trim = scalar, F32, 1348, "", 1, 0 -luaAdjustment = scalar, F32, 1352, "per", 1,0 -m_wastegatePosition = scalar, F32, 1356, "per", 1,0 -etbFeedForward = scalar, F32, 1360 -etbIntegralError = scalar, F32, 1364, "", 1, 0 -etbCurrentTarget = scalar, F32, 1368, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1372, "%", 1, 0 -etbRevLimitActive = bits, U32, 1376, [0:0] -jamDetected = bits, U32, 1376, [1:1] -etbDutyRateOfChange = scalar, F32, 1380, "per", 1,0 -etbDutyAverage = scalar, F32, 1384, "per", 1,0 -etbTpsErrorCounter = scalar, U16, 1388, "count", 1,0 -etbPpsErrorCounter = scalar, U16, 1390, "count", 1,0 -etbErrorCode = scalar, S08, 1392, "", 1, 0 -jamTimer = scalar, U16, 1394, "sec", 0.01, 0 -; total TS size = 1396 -faultCode = scalar, U08, 1396, "", 1, 0 -heaterDuty = scalar, U08, 1397, "%", 1, 0 -pumpDuty = scalar, U08, 1398, "%", 1, 0 -tempC = scalar, U16, 1400, "C", 1, 0 -nernstVoltage = scalar, U16, 1402, "V", 0.001, 0 -esr = scalar, U16, 1404, "ohm", 1, 0 -; total TS size = 1408 -dcOutput0 = scalar, F32, 1408, "per", 1,0 -isEnabled0_int = scalar, U08, 1412, "per", 1,0 -isEnabled0 = bits, U32, 1416, [0:0] -; total TS size = 1420 -value0 = scalar, U16, 1420, "value", 1,0 -value1 = scalar, U16, 1422, "value", 1,0 -errorRate = scalar, F32, 1424, "ratio", 1,0 -; total TS size = 1428 -vvtTarget = scalar, U16, 1428, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1430, "%", 0.5, 0 +m_hasSynchronizedPhase = bits, U32, 1288, [0:0] +; total TS size = 1292 +wallFuelCorrection = scalar, F32, 1292, "", 1, 0 +wallFuel = scalar, F32, 1296, "", 1, 0 +; total TS size = 1300 +idleState = bits, S32, 1300, [0:2], "not important" +currentIdlePosition = scalar, F32, 1304 +baseIdlePosition = scalar, F32, 1308 +idleClosedLoop = scalar, F32, 1312 +iacByTpsTaper = scalar, F32, 1316 +throttlePedalUpState = scalar, S32, 1320, "", 1, 0 +mightResetPid = bits, U32, 1324, [0:0] +shouldResetPid = bits, U32, 1324, [1:1] +wasResetPid = bits, U32, 1324, [2:2] +mustResetPid = bits, U32, 1324, [3:3] +isCranking = bits, U32, 1324, [4:4] +isIacTableForCoasting = bits, U32, 1324, [5:5] +notIdling = bits, U32, 1324, [6:6] +needReset = bits, U32, 1324, [7:7] +isInDeadZone = bits, U32, 1324, [8:8] +isBlipping = bits, U32, 1324, [9:9] +useClosedLoop = bits, U32, 1324, [10:10] +badTps = bits, U32, 1324, [11:11] +looksLikeRunning = bits, U32, 1324, [12:12] +looksLikeCoasting = bits, U32, 1324, [13:13] +looksLikeCrankToIdle = bits, U32, 1324, [14:14] +isIdleCoasting = bits, U32, 1324, [15:15] +isIdleClosedLoop = bits, U32, 1324, [16:16] +idleTarget = scalar, S32, 1328, "", 1, 0 +targetRpmByClt = scalar, S32, 1332, "", 1, 0 +targetRpmAc = scalar, S32, 1336, "", 1, 0 +iacByRpmTaper = scalar, F32, 1340 +luaAdd = scalar, F32, 1344 +; total TS size = 1348 +idlePosition = scalar, F32, 1348, "per", 1,0 +trim = scalar, F32, 1352, "", 1, 0 +luaAdjustment = scalar, F32, 1356, "per", 1,0 +m_wastegatePosition = scalar, F32, 1360, "per", 1,0 +etbFeedForward = scalar, F32, 1364 +etbIntegralError = scalar, F32, 1368, "", 1, 0 +etbCurrentTarget = scalar, F32, 1372, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1376, "%", 1, 0 +etbRevLimitActive = bits, U32, 1380, [0:0] +jamDetected = bits, U32, 1380, [1:1] +etbDutyRateOfChange = scalar, F32, 1384, "per", 1,0 +etbDutyAverage = scalar, F32, 1388, "per", 1,0 +etbTpsErrorCounter = scalar, U16, 1392, "count", 1,0 +etbPpsErrorCounter = scalar, U16, 1394, "count", 1,0 +etbErrorCode = scalar, S08, 1396, "", 1, 0 +jamTimer = scalar, U16, 1398, "sec", 0.01, 0 +; total TS size = 1400 +faultCode = scalar, U08, 1400, "", 1, 0 +heaterDuty = scalar, U08, 1401, "%", 1, 0 +pumpDuty = scalar, U08, 1402, "%", 1, 0 +tempC = scalar, U16, 1404, "C", 1, 0 +nernstVoltage = scalar, U16, 1406, "V", 0.001, 0 +esr = scalar, U16, 1408, "ohm", 1, 0 +; total TS size = 1412 +dcOutput0 = scalar, F32, 1412, "per", 1,0 +isEnabled0_int = scalar, U08, 1416, "per", 1,0 +isEnabled0 = bits, U32, 1420, [0:0] +; total TS size = 1424 +value0 = scalar, U16, 1424, "value", 1,0 +value1 = scalar, U16, 1426, "value", 1,0 +errorRate = scalar, F32, 1428, "ratio", 1,0 ; total TS size = 1432 -lambdaCurrentlyGood = bits, U32, 1432, [0:0] -lambdaMonitorCut = bits, U32, 1432, [1:1] -lambdaTimeSinceGood = scalar, U16, 1436, "sec", 0.01, 0 -; total TS size = 1440 +vvtTarget = scalar, U16, 1432, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1434, "%", 0.5, 0 +; total TS size = 1436 +lambdaCurrentlyGood = bits, U32, 1436, [0:0] +lambdaMonitorCut = bits, U32, 1436, [1:1] +lambdaTimeSinceGood = scalar, U16, 1440, "sec", 0.01, 0 +; total TS size = 1444 time = { timeNow } @@ -5196,6 +5197,7 @@ entry = brakePedalState, "Brake switch", int, "%d" entry = startStopState, "startStopState", int, "%d" entry = startStopPhysicalState, "startStopPhysicalState", int, "%d" entry = startStopStateToggleCounter, "startStopStateToggleCounter", int, "%d" +entry = startStopStateTempPhysicalCounter, "startStopStateTempPhysicalCounter", int, "%d" entry = egtValue1, "egtValue1", float, "%.3f" entry = egtValue2, "egtValue2", float, "%.3f" entry = desiredRpmLimit, "User-defined RPM hard limit", int, "%d" @@ -6076,13 +6078,14 @@ dialog = engine_stateDialog, "engine_state" graphLine = brakePedalState graphLine = startStopState graphLine = startStopStateToggleCounter - graphLine = egtValue1 + graphLine = startStopStateTempPhysicalCounter liveGraph = engine_state_5_Graph, "Graph", South + graphLine = egtValue1 graphLine = egtValue2 graphLine = desiredRpmLimit graphLine = fuelInjectionCounter - graphLine = sparkCounter liveGraph = engine_state_6_Graph, "Graph", South + graphLine = sparkCounter graphLine = fuelingLoad graphLine = ignitionLoad graphLine = veTableYAxis @@ -6417,8 +6420,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" ; cam if ; two-stroke, or ; not crank trigger and ((vague trigger and cam choice) or not vague trigger) - field = "Cam Sensor (Primary channel)", triggerInputPins1, 1, {twoStroke == 1 || ( !(trigger_type == 2 || trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 21 || trigger_type == 26 || trigger_type == 27 || trigger_type == 33 || trigger_type == 38 || trigger_type == 39 || trigger_type == 44 || trigger_type == 45 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 58 || trigger_type == 61 || trigger_type == 62 || trigger_type == 68 || trigger_type == 70 || trigger_type == 71 || trigger_type == 72 || trigger_type == 74 || trigger_type == 75 || trigger_type == 76 || trigger_type == 77 || trigger_type == 79) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) ) ) } - field = "Crank Sensor (Primary channel)", triggerInputPins1, 1, { !(twoStroke == 1 || ( !(trigger_type == 2 || trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 21 || trigger_type == 26 || trigger_type == 27 || trigger_type == 33 || trigger_type == 38 || trigger_type == 39 || trigger_type == 44 || trigger_type == 45 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 58 || trigger_type == 61 || trigger_type == 62 || trigger_type == 68 || trigger_type == 70 || trigger_type == 71 || trigger_type == 72 || trigger_type == 74 || trigger_type == 75 || trigger_type == 76 || trigger_type == 77 || trigger_type == 79) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) ) )) } + field = "Cam Sensor (Primary channel)", triggerInputPins1, 1, {twoStroke == 1 || ( !(trigger_type == 2 || trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 21 || trigger_type == 26 || trigger_type == 27 || trigger_type == 33 || trigger_type == 38 || trigger_type == 39 || trigger_type == 44 || trigger_type == 45 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 58 || trigger_type == 61 || trigger_type == 62 || trigger_type == 68 || trigger_type == 70 || trigger_type == 71 || trigger_type == 72 || trigger_type == 74 || trigger_type == 75 || trigger_type == 76 || trigger_type == 77) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) ) ) } + field = "Crank Sensor (Primary channel)", triggerInputPins1, 1, { !(twoStroke == 1 || ( !(trigger_type == 2 || trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 21 || trigger_type == 26 || trigger_type == 27 || trigger_type == 33 || trigger_type == 38 || trigger_type == 39 || trigger_type == 44 || trigger_type == 45 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 58 || trigger_type == 61 || trigger_type == 62 || trigger_type == 68 || trigger_type == 70 || trigger_type == 71 || trigger_type == 72 || trigger_type == 74 || trigger_type == 75 || trigger_type == 76 || trigger_type == 77) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) ) )) } field = "Invert Primary", invertPrimaryTriggerSignal field = "Secondary channel", triggerInputPins2, { triggerInputPins2 != 0 || (triggerInputPins1 != 0 && (trigger_type == 1 || trigger_type == 3 || trigger_type == 15 || trigger_type == 16 || trigger_type == 19 || trigger_type == 25 || trigger_type == 28 || trigger_type == 31 || trigger_type == 35 || trigger_type == 36 || trigger_type == 37 || trigger_type == 40 || trigger_type == 49 || trigger_type == 50 || trigger_type == 53 || trigger_type == 54 || trigger_type == 63 || trigger_type == 64) ) } field = "Invert Secondary", invertSecondaryTriggerSignal, {triggerInputPins2 != 0 && (trigger_type == 1 || trigger_type == 3 || trigger_type == 15 || trigger_type == 16 || trigger_type == 19 || trigger_type == 25 || trigger_type == 28 || trigger_type == 31 || trigger_type == 35 || trigger_type == 36 || trigger_type == 37 || trigger_type == 40 || trigger_type == 49 || trigger_type == 50 || trigger_type == 53 || trigger_type == 54 || trigger_type == 63 || trigger_type == 64) } diff --git a/firmware/tunerstudio/generated/rusefi_hellen72.ini b/firmware/tunerstudio/generated/rusefi_hellen72.ini index 9f75658aaa..e54e1c281f 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen72.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen72.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.11.08.hellen72.1523337248" + signature = "rusEFI master.2023.11.09.hellen72.1234234742" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.11.08.hellen72.1523337248" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.11.09.hellen72.1234234742" ; 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 @@ -92,7 +92,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.jar based on (unknown script) integration/rusefi_config.txt Wed Nov 08 20:02:28 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Thu Nov 09 02:07:17 UTC 2023 pageSize = 23880 page = 1 @@ -2347,7 +2347,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23870, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1440 + ochBlockSize = 1444 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3001,136 +3001,137 @@ brakePedalState = scalar, S08, 1092, "", 1, 0 startStopState = scalar, S08, 1093, "", 1, 0 startStopPhysicalState = bits, U32, 1096, [0:0] startStopStateToggleCounter = scalar, U32, 1100, "", 1, 0 -egtValue1 = scalar, F32, 1104, "", 1, 0 -egtValue2 = scalar, F32, 1108, "", 1, 0 -desiredRpmLimit = scalar, S16, 1112, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1116, "", 1, 0 -sparkCounter = scalar, U32, 1120, "", 1, 0 -fuelingLoad = scalar, F32, 1124, "", 1, 0 -ignitionLoad = scalar, F32, 1128, "", 1, 0 -veTableYAxis = scalar, U16, 1132, "%", 0.01, 0 -; total TS size = 1136 -tpsFrom = scalar, F32, 1136 -tpsTo = scalar, F32, 1140 -deltaTps = scalar, F32, 1144 -extraFuel = scalar, F32, 1148, "", 1, 0 -valueFromTable = scalar, F32, 1152, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1156, [0:0] -isBelowDecelThreshold = bits, U32, 1156, [1:1] -isTimeToResetAccumulator = bits, U32, 1156, [2:2] -isFractionalEnrichment = bits, U32, 1156, [3:3] -belowEpsilon = bits, U32, 1156, [4:4] -tooShort = bits, U32, 1156, [5:5] -fractionalInjFuel = scalar, F32, 1160, "", 1, 0 -accumulatedValue = scalar, F32, 1164, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1168, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1172, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1176, "", 1, 0 -cycleCnt = scalar, S32, 1180, "", 1, 0 -; total TS size = 1184 -hwEventCounters1 = scalar, U32, 1184, "", 1, 0 -hwEventCounters2 = scalar, U32, 1188, "", 1, 0 -hwEventCounters3 = scalar, U32, 1192, "", 1, 0 -hwEventCounters4 = scalar, U32, 1196, "", 1, 0 -hwEventCounters5 = scalar, U32, 1200, "", 1, 0 -hwEventCounters6 = scalar, U32, 1204, "", 1, 0 -vvtCamCounter = scalar, U32, 1208, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1212, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1216, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1220, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1221, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1224, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1228, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1232, "", 1, 0 -mapCamPrevToothAngle = scalar, F32, 1236, "deg", 1, 0 -isDecodingMapCam = bits, U32, 1240, [0:0] -; total TS size = 1244 -crankSynchronizationCounter = scalar, U32, 1244, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1248, "", 1, 0 -vvtToothDurations0 = scalar, U32, 1252, "us", 1, 0 -vvtCurrentPosition = scalar, F32, 1256, "sync: Primary Cam Position", 1, 0 -vvtToothPosition1 = scalar, F32, 1260, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition2 = scalar, F32, 1264, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition3 = scalar, F32, 1268, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition4 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio = scalar, F32, 1276, "", 1, 0 -triggerStateIndex = scalar, U08, 1280, "", 1, 0 -camResyncCounter = scalar, U08, 1281, "", 1, 0 -vvtStateIndex = scalar, U08, 1282, "", 1, 0 -; total TS size = 1284 -m_hasSynchronizedPhase = bits, U32, 1284, [0:0] +startStopStateTempPhysicalCounter = scalar, U32, 1104, "", 1, 0 +egtValue1 = scalar, F32, 1108, "", 1, 0 +egtValue2 = scalar, F32, 1112, "", 1, 0 +desiredRpmLimit = scalar, S16, 1116, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 1120, "", 1, 0 +sparkCounter = scalar, U32, 1124, "", 1, 0 +fuelingLoad = scalar, F32, 1128, "", 1, 0 +ignitionLoad = scalar, F32, 1132, "", 1, 0 +veTableYAxis = scalar, U16, 1136, "%", 0.01, 0 +; total TS size = 1140 +tpsFrom = scalar, F32, 1140 +tpsTo = scalar, F32, 1144 +deltaTps = scalar, F32, 1148 +extraFuel = scalar, F32, 1152, "", 1, 0 +valueFromTable = scalar, F32, 1156, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1160, [0:0] +isBelowDecelThreshold = bits, U32, 1160, [1:1] +isTimeToResetAccumulator = bits, U32, 1160, [2:2] +isFractionalEnrichment = bits, U32, 1160, [3:3] +belowEpsilon = bits, U32, 1160, [4:4] +tooShort = bits, U32, 1160, [5:5] +fractionalInjFuel = scalar, F32, 1164, "", 1, 0 +accumulatedValue = scalar, F32, 1168, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1172, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1176, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1180, "", 1, 0 +cycleCnt = scalar, S32, 1184, "", 1, 0 +; total TS size = 1188 +hwEventCounters1 = scalar, U32, 1188, "", 1, 0 +hwEventCounters2 = scalar, U32, 1192, "", 1, 0 +hwEventCounters3 = scalar, U32, 1196, "", 1, 0 +hwEventCounters4 = scalar, U32, 1200, "", 1, 0 +hwEventCounters5 = scalar, U32, 1204, "", 1, 0 +hwEventCounters6 = scalar, U32, 1208, "", 1, 0 +vvtCamCounter = scalar, U32, 1212, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1216, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1220, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1224, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1225, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1228, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1232, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1236, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1240, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1244, [0:0] +; total TS size = 1248 +crankSynchronizationCounter = scalar, U32, 1248, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1252, "", 1, 0 +vvtToothDurations0 = scalar, U32, 1256, "us", 1, 0 +vvtCurrentPosition = scalar, F32, 1260, "sync: Primary Cam Position", 1, 0 +vvtToothPosition1 = scalar, F32, 1264, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition2 = scalar, F32, 1268, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition3 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition4 = scalar, F32, 1276, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio = scalar, F32, 1280, "", 1, 0 +triggerStateIndex = scalar, U08, 1284, "", 1, 0 +camResyncCounter = scalar, U08, 1285, "", 1, 0 +vvtStateIndex = scalar, U08, 1286, "", 1, 0 ; total TS size = 1288 -wallFuelCorrection = scalar, F32, 1288, "", 1, 0 -wallFuel = scalar, F32, 1292, "", 1, 0 -; total TS size = 1296 -idleState = bits, S32, 1296, [0:2], "not important" -currentIdlePosition = scalar, F32, 1300 -baseIdlePosition = scalar, F32, 1304 -idleClosedLoop = scalar, F32, 1308 -iacByTpsTaper = scalar, F32, 1312 -throttlePedalUpState = scalar, S32, 1316, "", 1, 0 -mightResetPid = bits, U32, 1320, [0:0] -shouldResetPid = bits, U32, 1320, [1:1] -wasResetPid = bits, U32, 1320, [2:2] -mustResetPid = bits, U32, 1320, [3:3] -isCranking = bits, U32, 1320, [4:4] -isIacTableForCoasting = bits, U32, 1320, [5:5] -notIdling = bits, U32, 1320, [6:6] -needReset = bits, U32, 1320, [7:7] -isInDeadZone = bits, U32, 1320, [8:8] -isBlipping = bits, U32, 1320, [9:9] -useClosedLoop = bits, U32, 1320, [10:10] -badTps = bits, U32, 1320, [11:11] -looksLikeRunning = bits, U32, 1320, [12:12] -looksLikeCoasting = bits, U32, 1320, [13:13] -looksLikeCrankToIdle = bits, U32, 1320, [14:14] -isIdleCoasting = bits, U32, 1320, [15:15] -isIdleClosedLoop = bits, U32, 1320, [16:16] -idleTarget = scalar, S32, 1324, "", 1, 0 -targetRpmByClt = scalar, S32, 1328, "", 1, 0 -targetRpmAc = scalar, S32, 1332, "", 1, 0 -iacByRpmTaper = scalar, F32, 1336 -luaAdd = scalar, F32, 1340 -; total TS size = 1344 -idlePosition = scalar, F32, 1344, "per", 1,0 -trim = scalar, F32, 1348, "", 1, 0 -luaAdjustment = scalar, F32, 1352, "per", 1,0 -m_wastegatePosition = scalar, F32, 1356, "per", 1,0 -etbFeedForward = scalar, F32, 1360 -etbIntegralError = scalar, F32, 1364, "", 1, 0 -etbCurrentTarget = scalar, F32, 1368, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1372, "%", 1, 0 -etbRevLimitActive = bits, U32, 1376, [0:0] -jamDetected = bits, U32, 1376, [1:1] -etbDutyRateOfChange = scalar, F32, 1380, "per", 1,0 -etbDutyAverage = scalar, F32, 1384, "per", 1,0 -etbTpsErrorCounter = scalar, U16, 1388, "count", 1,0 -etbPpsErrorCounter = scalar, U16, 1390, "count", 1,0 -etbErrorCode = scalar, S08, 1392, "", 1, 0 -jamTimer = scalar, U16, 1394, "sec", 0.01, 0 -; total TS size = 1396 -faultCode = scalar, U08, 1396, "", 1, 0 -heaterDuty = scalar, U08, 1397, "%", 1, 0 -pumpDuty = scalar, U08, 1398, "%", 1, 0 -tempC = scalar, U16, 1400, "C", 1, 0 -nernstVoltage = scalar, U16, 1402, "V", 0.001, 0 -esr = scalar, U16, 1404, "ohm", 1, 0 -; total TS size = 1408 -dcOutput0 = scalar, F32, 1408, "per", 1,0 -isEnabled0_int = scalar, U08, 1412, "per", 1,0 -isEnabled0 = bits, U32, 1416, [0:0] -; total TS size = 1420 -value0 = scalar, U16, 1420, "value", 1,0 -value1 = scalar, U16, 1422, "value", 1,0 -errorRate = scalar, F32, 1424, "ratio", 1,0 -; total TS size = 1428 -vvtTarget = scalar, U16, 1428, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1430, "%", 0.5, 0 +m_hasSynchronizedPhase = bits, U32, 1288, [0:0] +; total TS size = 1292 +wallFuelCorrection = scalar, F32, 1292, "", 1, 0 +wallFuel = scalar, F32, 1296, "", 1, 0 +; total TS size = 1300 +idleState = bits, S32, 1300, [0:2], "not important" +currentIdlePosition = scalar, F32, 1304 +baseIdlePosition = scalar, F32, 1308 +idleClosedLoop = scalar, F32, 1312 +iacByTpsTaper = scalar, F32, 1316 +throttlePedalUpState = scalar, S32, 1320, "", 1, 0 +mightResetPid = bits, U32, 1324, [0:0] +shouldResetPid = bits, U32, 1324, [1:1] +wasResetPid = bits, U32, 1324, [2:2] +mustResetPid = bits, U32, 1324, [3:3] +isCranking = bits, U32, 1324, [4:4] +isIacTableForCoasting = bits, U32, 1324, [5:5] +notIdling = bits, U32, 1324, [6:6] +needReset = bits, U32, 1324, [7:7] +isInDeadZone = bits, U32, 1324, [8:8] +isBlipping = bits, U32, 1324, [9:9] +useClosedLoop = bits, U32, 1324, [10:10] +badTps = bits, U32, 1324, [11:11] +looksLikeRunning = bits, U32, 1324, [12:12] +looksLikeCoasting = bits, U32, 1324, [13:13] +looksLikeCrankToIdle = bits, U32, 1324, [14:14] +isIdleCoasting = bits, U32, 1324, [15:15] +isIdleClosedLoop = bits, U32, 1324, [16:16] +idleTarget = scalar, S32, 1328, "", 1, 0 +targetRpmByClt = scalar, S32, 1332, "", 1, 0 +targetRpmAc = scalar, S32, 1336, "", 1, 0 +iacByRpmTaper = scalar, F32, 1340 +luaAdd = scalar, F32, 1344 +; total TS size = 1348 +idlePosition = scalar, F32, 1348, "per", 1,0 +trim = scalar, F32, 1352, "", 1, 0 +luaAdjustment = scalar, F32, 1356, "per", 1,0 +m_wastegatePosition = scalar, F32, 1360, "per", 1,0 +etbFeedForward = scalar, F32, 1364 +etbIntegralError = scalar, F32, 1368, "", 1, 0 +etbCurrentTarget = scalar, F32, 1372, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1376, "%", 1, 0 +etbRevLimitActive = bits, U32, 1380, [0:0] +jamDetected = bits, U32, 1380, [1:1] +etbDutyRateOfChange = scalar, F32, 1384, "per", 1,0 +etbDutyAverage = scalar, F32, 1388, "per", 1,0 +etbTpsErrorCounter = scalar, U16, 1392, "count", 1,0 +etbPpsErrorCounter = scalar, U16, 1394, "count", 1,0 +etbErrorCode = scalar, S08, 1396, "", 1, 0 +jamTimer = scalar, U16, 1398, "sec", 0.01, 0 +; total TS size = 1400 +faultCode = scalar, U08, 1400, "", 1, 0 +heaterDuty = scalar, U08, 1401, "%", 1, 0 +pumpDuty = scalar, U08, 1402, "%", 1, 0 +tempC = scalar, U16, 1404, "C", 1, 0 +nernstVoltage = scalar, U16, 1406, "V", 0.001, 0 +esr = scalar, U16, 1408, "ohm", 1, 0 +; total TS size = 1412 +dcOutput0 = scalar, F32, 1412, "per", 1,0 +isEnabled0_int = scalar, U08, 1416, "per", 1,0 +isEnabled0 = bits, U32, 1420, [0:0] +; total TS size = 1424 +value0 = scalar, U16, 1424, "value", 1,0 +value1 = scalar, U16, 1426, "value", 1,0 +errorRate = scalar, F32, 1428, "ratio", 1,0 ; total TS size = 1432 -lambdaCurrentlyGood = bits, U32, 1432, [0:0] -lambdaMonitorCut = bits, U32, 1432, [1:1] -lambdaTimeSinceGood = scalar, U16, 1436, "sec", 0.01, 0 -; total TS size = 1440 +vvtTarget = scalar, U16, 1432, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1434, "%", 0.5, 0 +; total TS size = 1436 +lambdaCurrentlyGood = bits, U32, 1436, [0:0] +lambdaMonitorCut = bits, U32, 1436, [1:1] +lambdaTimeSinceGood = scalar, U16, 1440, "sec", 0.01, 0 +; total TS size = 1444 time = { timeNow } @@ -5196,6 +5197,7 @@ entry = brakePedalState, "Brake switch", int, "%d" entry = startStopState, "startStopState", int, "%d" entry = startStopPhysicalState, "startStopPhysicalState", int, "%d" entry = startStopStateToggleCounter, "startStopStateToggleCounter", int, "%d" +entry = startStopStateTempPhysicalCounter, "startStopStateTempPhysicalCounter", int, "%d" entry = egtValue1, "egtValue1", float, "%.3f" entry = egtValue2, "egtValue2", float, "%.3f" entry = desiredRpmLimit, "User-defined RPM hard limit", int, "%d" @@ -6078,13 +6080,14 @@ dialog = engine_stateDialog, "engine_state" graphLine = brakePedalState graphLine = startStopState graphLine = startStopStateToggleCounter - graphLine = egtValue1 + graphLine = startStopStateTempPhysicalCounter liveGraph = engine_state_5_Graph, "Graph", South + graphLine = egtValue1 graphLine = egtValue2 graphLine = desiredRpmLimit graphLine = fuelInjectionCounter - graphLine = sparkCounter liveGraph = engine_state_6_Graph, "Graph", South + graphLine = sparkCounter graphLine = fuelingLoad graphLine = ignitionLoad graphLine = veTableYAxis @@ -6420,8 +6423,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" ; cam if ; two-stroke, or ; not crank trigger and ((vague trigger and cam choice) or not vague trigger) - field = "Cam Sensor (Primary channel)", triggerInputPins1, 1, {twoStroke == 1 || ( !(trigger_type == 2 || trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 21 || trigger_type == 26 || trigger_type == 27 || trigger_type == 33 || trigger_type == 38 || trigger_type == 39 || trigger_type == 44 || trigger_type == 45 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 58 || trigger_type == 61 || trigger_type == 62 || trigger_type == 68 || trigger_type == 70 || trigger_type == 71 || trigger_type == 72 || trigger_type == 74 || trigger_type == 75 || trigger_type == 76 || trigger_type == 77 || trigger_type == 79) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) ) ) } - field = "Crank Sensor (Primary channel)", triggerInputPins1, 1, { !(twoStroke == 1 || ( !(trigger_type == 2 || trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 21 || trigger_type == 26 || trigger_type == 27 || trigger_type == 33 || trigger_type == 38 || trigger_type == 39 || trigger_type == 44 || trigger_type == 45 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 58 || trigger_type == 61 || trigger_type == 62 || trigger_type == 68 || trigger_type == 70 || trigger_type == 71 || trigger_type == 72 || trigger_type == 74 || trigger_type == 75 || trigger_type == 76 || trigger_type == 77 || trigger_type == 79) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) ) )) } + field = "Cam Sensor (Primary channel)", triggerInputPins1, 1, {twoStroke == 1 || ( !(trigger_type == 2 || trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 21 || trigger_type == 26 || trigger_type == 27 || trigger_type == 33 || trigger_type == 38 || trigger_type == 39 || trigger_type == 44 || trigger_type == 45 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 58 || trigger_type == 61 || trigger_type == 62 || trigger_type == 68 || trigger_type == 70 || trigger_type == 71 || trigger_type == 72 || trigger_type == 74 || trigger_type == 75 || trigger_type == 76 || trigger_type == 77) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) ) ) } + field = "Crank Sensor (Primary channel)", triggerInputPins1, 1, { !(twoStroke == 1 || ( !(trigger_type == 2 || trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 21 || trigger_type == 26 || trigger_type == 27 || trigger_type == 33 || trigger_type == 38 || trigger_type == 39 || trigger_type == 44 || trigger_type == 45 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 58 || trigger_type == 61 || trigger_type == 62 || trigger_type == 68 || trigger_type == 70 || trigger_type == 71 || trigger_type == 72 || trigger_type == 74 || trigger_type == 75 || trigger_type == 76 || trigger_type == 77) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) ) )) } field = "Invert Primary", invertPrimaryTriggerSignal field = "Secondary channel", triggerInputPins2, { triggerInputPins2 != 0 || (triggerInputPins1 != 0 && (trigger_type == 1 || trigger_type == 3 || trigger_type == 15 || trigger_type == 16 || trigger_type == 19 || trigger_type == 25 || trigger_type == 28 || trigger_type == 31 || trigger_type == 35 || trigger_type == 36 || trigger_type == 37 || trigger_type == 40 || trigger_type == 49 || trigger_type == 50 || trigger_type == 53 || trigger_type == 54 || trigger_type == 63 || trigger_type == 64) ) } field = "Invert Secondary", invertSecondaryTriggerSignal, {triggerInputPins2 != 0 && (trigger_type == 1 || trigger_type == 3 || trigger_type == 15 || trigger_type == 16 || trigger_type == 19 || trigger_type == 25 || trigger_type == 28 || trigger_type == 31 || trigger_type == 35 || trigger_type == 36 || trigger_type == 37 || trigger_type == 40 || trigger_type == 49 || trigger_type == 50 || trigger_type == 53 || trigger_type == 54 || trigger_type == 63 || trigger_type == 64) } diff --git a/firmware/tunerstudio/generated/rusefi_hellen81.ini b/firmware/tunerstudio/generated/rusefi_hellen81.ini index 53f5bc07a1..e998feab73 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen81.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen81.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.11.08.hellen81.3957046370" + signature = "rusEFI master.2023.11.09.hellen81.4169603380" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.11.08.hellen81.3957046370" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.11.09.hellen81.4169603380" ; 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 @@ -92,7 +92,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.jar based on (unknown script) integration/rusefi_config.txt Wed Nov 08 20:02:31 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Thu Nov 09 02:07:19 UTC 2023 pageSize = 23880 page = 1 @@ -2347,7 +2347,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23870, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1440 + ochBlockSize = 1444 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3001,136 +3001,137 @@ brakePedalState = scalar, S08, 1092, "", 1, 0 startStopState = scalar, S08, 1093, "", 1, 0 startStopPhysicalState = bits, U32, 1096, [0:0] startStopStateToggleCounter = scalar, U32, 1100, "", 1, 0 -egtValue1 = scalar, F32, 1104, "", 1, 0 -egtValue2 = scalar, F32, 1108, "", 1, 0 -desiredRpmLimit = scalar, S16, 1112, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1116, "", 1, 0 -sparkCounter = scalar, U32, 1120, "", 1, 0 -fuelingLoad = scalar, F32, 1124, "", 1, 0 -ignitionLoad = scalar, F32, 1128, "", 1, 0 -veTableYAxis = scalar, U16, 1132, "%", 0.01, 0 -; total TS size = 1136 -tpsFrom = scalar, F32, 1136 -tpsTo = scalar, F32, 1140 -deltaTps = scalar, F32, 1144 -extraFuel = scalar, F32, 1148, "", 1, 0 -valueFromTable = scalar, F32, 1152, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1156, [0:0] -isBelowDecelThreshold = bits, U32, 1156, [1:1] -isTimeToResetAccumulator = bits, U32, 1156, [2:2] -isFractionalEnrichment = bits, U32, 1156, [3:3] -belowEpsilon = bits, U32, 1156, [4:4] -tooShort = bits, U32, 1156, [5:5] -fractionalInjFuel = scalar, F32, 1160, "", 1, 0 -accumulatedValue = scalar, F32, 1164, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1168, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1172, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1176, "", 1, 0 -cycleCnt = scalar, S32, 1180, "", 1, 0 -; total TS size = 1184 -hwEventCounters1 = scalar, U32, 1184, "", 1, 0 -hwEventCounters2 = scalar, U32, 1188, "", 1, 0 -hwEventCounters3 = scalar, U32, 1192, "", 1, 0 -hwEventCounters4 = scalar, U32, 1196, "", 1, 0 -hwEventCounters5 = scalar, U32, 1200, "", 1, 0 -hwEventCounters6 = scalar, U32, 1204, "", 1, 0 -vvtCamCounter = scalar, U32, 1208, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1212, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1216, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1220, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1221, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1224, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1228, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1232, "", 1, 0 -mapCamPrevToothAngle = scalar, F32, 1236, "deg", 1, 0 -isDecodingMapCam = bits, U32, 1240, [0:0] -; total TS size = 1244 -crankSynchronizationCounter = scalar, U32, 1244, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1248, "", 1, 0 -vvtToothDurations0 = scalar, U32, 1252, "us", 1, 0 -vvtCurrentPosition = scalar, F32, 1256, "sync: Primary Cam Position", 1, 0 -vvtToothPosition1 = scalar, F32, 1260, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition2 = scalar, F32, 1264, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition3 = scalar, F32, 1268, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition4 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio = scalar, F32, 1276, "", 1, 0 -triggerStateIndex = scalar, U08, 1280, "", 1, 0 -camResyncCounter = scalar, U08, 1281, "", 1, 0 -vvtStateIndex = scalar, U08, 1282, "", 1, 0 -; total TS size = 1284 -m_hasSynchronizedPhase = bits, U32, 1284, [0:0] +startStopStateTempPhysicalCounter = scalar, U32, 1104, "", 1, 0 +egtValue1 = scalar, F32, 1108, "", 1, 0 +egtValue2 = scalar, F32, 1112, "", 1, 0 +desiredRpmLimit = scalar, S16, 1116, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 1120, "", 1, 0 +sparkCounter = scalar, U32, 1124, "", 1, 0 +fuelingLoad = scalar, F32, 1128, "", 1, 0 +ignitionLoad = scalar, F32, 1132, "", 1, 0 +veTableYAxis = scalar, U16, 1136, "%", 0.01, 0 +; total TS size = 1140 +tpsFrom = scalar, F32, 1140 +tpsTo = scalar, F32, 1144 +deltaTps = scalar, F32, 1148 +extraFuel = scalar, F32, 1152, "", 1, 0 +valueFromTable = scalar, F32, 1156, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1160, [0:0] +isBelowDecelThreshold = bits, U32, 1160, [1:1] +isTimeToResetAccumulator = bits, U32, 1160, [2:2] +isFractionalEnrichment = bits, U32, 1160, [3:3] +belowEpsilon = bits, U32, 1160, [4:4] +tooShort = bits, U32, 1160, [5:5] +fractionalInjFuel = scalar, F32, 1164, "", 1, 0 +accumulatedValue = scalar, F32, 1168, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1172, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1176, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1180, "", 1, 0 +cycleCnt = scalar, S32, 1184, "", 1, 0 +; total TS size = 1188 +hwEventCounters1 = scalar, U32, 1188, "", 1, 0 +hwEventCounters2 = scalar, U32, 1192, "", 1, 0 +hwEventCounters3 = scalar, U32, 1196, "", 1, 0 +hwEventCounters4 = scalar, U32, 1200, "", 1, 0 +hwEventCounters5 = scalar, U32, 1204, "", 1, 0 +hwEventCounters6 = scalar, U32, 1208, "", 1, 0 +vvtCamCounter = scalar, U32, 1212, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1216, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1220, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1224, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1225, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1228, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1232, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1236, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1240, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1244, [0:0] +; total TS size = 1248 +crankSynchronizationCounter = scalar, U32, 1248, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1252, "", 1, 0 +vvtToothDurations0 = scalar, U32, 1256, "us", 1, 0 +vvtCurrentPosition = scalar, F32, 1260, "sync: Primary Cam Position", 1, 0 +vvtToothPosition1 = scalar, F32, 1264, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition2 = scalar, F32, 1268, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition3 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition4 = scalar, F32, 1276, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio = scalar, F32, 1280, "", 1, 0 +triggerStateIndex = scalar, U08, 1284, "", 1, 0 +camResyncCounter = scalar, U08, 1285, "", 1, 0 +vvtStateIndex = scalar, U08, 1286, "", 1, 0 ; total TS size = 1288 -wallFuelCorrection = scalar, F32, 1288, "", 1, 0 -wallFuel = scalar, F32, 1292, "", 1, 0 -; total TS size = 1296 -idleState = bits, S32, 1296, [0:2], "not important" -currentIdlePosition = scalar, F32, 1300 -baseIdlePosition = scalar, F32, 1304 -idleClosedLoop = scalar, F32, 1308 -iacByTpsTaper = scalar, F32, 1312 -throttlePedalUpState = scalar, S32, 1316, "", 1, 0 -mightResetPid = bits, U32, 1320, [0:0] -shouldResetPid = bits, U32, 1320, [1:1] -wasResetPid = bits, U32, 1320, [2:2] -mustResetPid = bits, U32, 1320, [3:3] -isCranking = bits, U32, 1320, [4:4] -isIacTableForCoasting = bits, U32, 1320, [5:5] -notIdling = bits, U32, 1320, [6:6] -needReset = bits, U32, 1320, [7:7] -isInDeadZone = bits, U32, 1320, [8:8] -isBlipping = bits, U32, 1320, [9:9] -useClosedLoop = bits, U32, 1320, [10:10] -badTps = bits, U32, 1320, [11:11] -looksLikeRunning = bits, U32, 1320, [12:12] -looksLikeCoasting = bits, U32, 1320, [13:13] -looksLikeCrankToIdle = bits, U32, 1320, [14:14] -isIdleCoasting = bits, U32, 1320, [15:15] -isIdleClosedLoop = bits, U32, 1320, [16:16] -idleTarget = scalar, S32, 1324, "", 1, 0 -targetRpmByClt = scalar, S32, 1328, "", 1, 0 -targetRpmAc = scalar, S32, 1332, "", 1, 0 -iacByRpmTaper = scalar, F32, 1336 -luaAdd = scalar, F32, 1340 -; total TS size = 1344 -idlePosition = scalar, F32, 1344, "per", 1,0 -trim = scalar, F32, 1348, "", 1, 0 -luaAdjustment = scalar, F32, 1352, "per", 1,0 -m_wastegatePosition = scalar, F32, 1356, "per", 1,0 -etbFeedForward = scalar, F32, 1360 -etbIntegralError = scalar, F32, 1364, "", 1, 0 -etbCurrentTarget = scalar, F32, 1368, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1372, "%", 1, 0 -etbRevLimitActive = bits, U32, 1376, [0:0] -jamDetected = bits, U32, 1376, [1:1] -etbDutyRateOfChange = scalar, F32, 1380, "per", 1,0 -etbDutyAverage = scalar, F32, 1384, "per", 1,0 -etbTpsErrorCounter = scalar, U16, 1388, "count", 1,0 -etbPpsErrorCounter = scalar, U16, 1390, "count", 1,0 -etbErrorCode = scalar, S08, 1392, "", 1, 0 -jamTimer = scalar, U16, 1394, "sec", 0.01, 0 -; total TS size = 1396 -faultCode = scalar, U08, 1396, "", 1, 0 -heaterDuty = scalar, U08, 1397, "%", 1, 0 -pumpDuty = scalar, U08, 1398, "%", 1, 0 -tempC = scalar, U16, 1400, "C", 1, 0 -nernstVoltage = scalar, U16, 1402, "V", 0.001, 0 -esr = scalar, U16, 1404, "ohm", 1, 0 -; total TS size = 1408 -dcOutput0 = scalar, F32, 1408, "per", 1,0 -isEnabled0_int = scalar, U08, 1412, "per", 1,0 -isEnabled0 = bits, U32, 1416, [0:0] -; total TS size = 1420 -value0 = scalar, U16, 1420, "value", 1,0 -value1 = scalar, U16, 1422, "value", 1,0 -errorRate = scalar, F32, 1424, "ratio", 1,0 -; total TS size = 1428 -vvtTarget = scalar, U16, 1428, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1430, "%", 0.5, 0 +m_hasSynchronizedPhase = bits, U32, 1288, [0:0] +; total TS size = 1292 +wallFuelCorrection = scalar, F32, 1292, "", 1, 0 +wallFuel = scalar, F32, 1296, "", 1, 0 +; total TS size = 1300 +idleState = bits, S32, 1300, [0:2], "not important" +currentIdlePosition = scalar, F32, 1304 +baseIdlePosition = scalar, F32, 1308 +idleClosedLoop = scalar, F32, 1312 +iacByTpsTaper = scalar, F32, 1316 +throttlePedalUpState = scalar, S32, 1320, "", 1, 0 +mightResetPid = bits, U32, 1324, [0:0] +shouldResetPid = bits, U32, 1324, [1:1] +wasResetPid = bits, U32, 1324, [2:2] +mustResetPid = bits, U32, 1324, [3:3] +isCranking = bits, U32, 1324, [4:4] +isIacTableForCoasting = bits, U32, 1324, [5:5] +notIdling = bits, U32, 1324, [6:6] +needReset = bits, U32, 1324, [7:7] +isInDeadZone = bits, U32, 1324, [8:8] +isBlipping = bits, U32, 1324, [9:9] +useClosedLoop = bits, U32, 1324, [10:10] +badTps = bits, U32, 1324, [11:11] +looksLikeRunning = bits, U32, 1324, [12:12] +looksLikeCoasting = bits, U32, 1324, [13:13] +looksLikeCrankToIdle = bits, U32, 1324, [14:14] +isIdleCoasting = bits, U32, 1324, [15:15] +isIdleClosedLoop = bits, U32, 1324, [16:16] +idleTarget = scalar, S32, 1328, "", 1, 0 +targetRpmByClt = scalar, S32, 1332, "", 1, 0 +targetRpmAc = scalar, S32, 1336, "", 1, 0 +iacByRpmTaper = scalar, F32, 1340 +luaAdd = scalar, F32, 1344 +; total TS size = 1348 +idlePosition = scalar, F32, 1348, "per", 1,0 +trim = scalar, F32, 1352, "", 1, 0 +luaAdjustment = scalar, F32, 1356, "per", 1,0 +m_wastegatePosition = scalar, F32, 1360, "per", 1,0 +etbFeedForward = scalar, F32, 1364 +etbIntegralError = scalar, F32, 1368, "", 1, 0 +etbCurrentTarget = scalar, F32, 1372, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1376, "%", 1, 0 +etbRevLimitActive = bits, U32, 1380, [0:0] +jamDetected = bits, U32, 1380, [1:1] +etbDutyRateOfChange = scalar, F32, 1384, "per", 1,0 +etbDutyAverage = scalar, F32, 1388, "per", 1,0 +etbTpsErrorCounter = scalar, U16, 1392, "count", 1,0 +etbPpsErrorCounter = scalar, U16, 1394, "count", 1,0 +etbErrorCode = scalar, S08, 1396, "", 1, 0 +jamTimer = scalar, U16, 1398, "sec", 0.01, 0 +; total TS size = 1400 +faultCode = scalar, U08, 1400, "", 1, 0 +heaterDuty = scalar, U08, 1401, "%", 1, 0 +pumpDuty = scalar, U08, 1402, "%", 1, 0 +tempC = scalar, U16, 1404, "C", 1, 0 +nernstVoltage = scalar, U16, 1406, "V", 0.001, 0 +esr = scalar, U16, 1408, "ohm", 1, 0 +; total TS size = 1412 +dcOutput0 = scalar, F32, 1412, "per", 1,0 +isEnabled0_int = scalar, U08, 1416, "per", 1,0 +isEnabled0 = bits, U32, 1420, [0:0] +; total TS size = 1424 +value0 = scalar, U16, 1424, "value", 1,0 +value1 = scalar, U16, 1426, "value", 1,0 +errorRate = scalar, F32, 1428, "ratio", 1,0 ; total TS size = 1432 -lambdaCurrentlyGood = bits, U32, 1432, [0:0] -lambdaMonitorCut = bits, U32, 1432, [1:1] -lambdaTimeSinceGood = scalar, U16, 1436, "sec", 0.01, 0 -; total TS size = 1440 +vvtTarget = scalar, U16, 1432, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1434, "%", 0.5, 0 +; total TS size = 1436 +lambdaCurrentlyGood = bits, U32, 1436, [0:0] +lambdaMonitorCut = bits, U32, 1436, [1:1] +lambdaTimeSinceGood = scalar, U16, 1440, "sec", 0.01, 0 +; total TS size = 1444 time = { timeNow } @@ -5196,6 +5197,7 @@ entry = brakePedalState, "Brake switch", int, "%d" entry = startStopState, "startStopState", int, "%d" entry = startStopPhysicalState, "startStopPhysicalState", int, "%d" entry = startStopStateToggleCounter, "startStopStateToggleCounter", int, "%d" +entry = startStopStateTempPhysicalCounter, "startStopStateTempPhysicalCounter", int, "%d" entry = egtValue1, "egtValue1", float, "%.3f" entry = egtValue2, "egtValue2", float, "%.3f" entry = desiredRpmLimit, "User-defined RPM hard limit", int, "%d" @@ -6076,13 +6078,14 @@ dialog = engine_stateDialog, "engine_state" graphLine = brakePedalState graphLine = startStopState graphLine = startStopStateToggleCounter - graphLine = egtValue1 + graphLine = startStopStateTempPhysicalCounter liveGraph = engine_state_5_Graph, "Graph", South + graphLine = egtValue1 graphLine = egtValue2 graphLine = desiredRpmLimit graphLine = fuelInjectionCounter - graphLine = sparkCounter liveGraph = engine_state_6_Graph, "Graph", South + graphLine = sparkCounter graphLine = fuelingLoad graphLine = ignitionLoad graphLine = veTableYAxis @@ -6418,8 +6421,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" ; cam if ; two-stroke, or ; not crank trigger and ((vague trigger and cam choice) or not vague trigger) - field = "Cam Sensor (Primary channel)", triggerInputPins1, 1, {twoStroke == 1 || ( !(trigger_type == 2 || trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 21 || trigger_type == 26 || trigger_type == 27 || trigger_type == 33 || trigger_type == 38 || trigger_type == 39 || trigger_type == 44 || trigger_type == 45 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 58 || trigger_type == 61 || trigger_type == 62 || trigger_type == 68 || trigger_type == 70 || trigger_type == 71 || trigger_type == 72 || trigger_type == 74 || trigger_type == 75 || trigger_type == 76 || trigger_type == 77 || trigger_type == 79) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) ) ) } - field = "Crank Sensor (Primary channel)", triggerInputPins1, 1, { !(twoStroke == 1 || ( !(trigger_type == 2 || trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 21 || trigger_type == 26 || trigger_type == 27 || trigger_type == 33 || trigger_type == 38 || trigger_type == 39 || trigger_type == 44 || trigger_type == 45 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 58 || trigger_type == 61 || trigger_type == 62 || trigger_type == 68 || trigger_type == 70 || trigger_type == 71 || trigger_type == 72 || trigger_type == 74 || trigger_type == 75 || trigger_type == 76 || trigger_type == 77 || trigger_type == 79) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) ) )) } + field = "Cam Sensor (Primary channel)", triggerInputPins1, 1, {twoStroke == 1 || ( !(trigger_type == 2 || trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 21 || trigger_type == 26 || trigger_type == 27 || trigger_type == 33 || trigger_type == 38 || trigger_type == 39 || trigger_type == 44 || trigger_type == 45 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 58 || trigger_type == 61 || trigger_type == 62 || trigger_type == 68 || trigger_type == 70 || trigger_type == 71 || trigger_type == 72 || trigger_type == 74 || trigger_type == 75 || trigger_type == 76 || trigger_type == 77) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) ) ) } + field = "Crank Sensor (Primary channel)", triggerInputPins1, 1, { !(twoStroke == 1 || ( !(trigger_type == 2 || trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 21 || trigger_type == 26 || trigger_type == 27 || trigger_type == 33 || trigger_type == 38 || trigger_type == 39 || trigger_type == 44 || trigger_type == 45 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 58 || trigger_type == 61 || trigger_type == 62 || trigger_type == 68 || trigger_type == 70 || trigger_type == 71 || trigger_type == 72 || trigger_type == 74 || trigger_type == 75 || trigger_type == 76 || trigger_type == 77) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) ) )) } field = "Invert Primary", invertPrimaryTriggerSignal field = "Secondary channel", triggerInputPins2, { triggerInputPins2 != 0 || (triggerInputPins1 != 0 && (trigger_type == 1 || trigger_type == 3 || trigger_type == 15 || trigger_type == 16 || trigger_type == 19 || trigger_type == 25 || trigger_type == 28 || trigger_type == 31 || trigger_type == 35 || trigger_type == 36 || trigger_type == 37 || trigger_type == 40 || trigger_type == 49 || trigger_type == 50 || trigger_type == 53 || trigger_type == 54 || trigger_type == 63 || trigger_type == 64) ) } field = "Invert Secondary", invertSecondaryTriggerSignal, {triggerInputPins2 != 0 && (trigger_type == 1 || trigger_type == 3 || trigger_type == 15 || trigger_type == 16 || trigger_type == 19 || trigger_type == 25 || trigger_type == 28 || trigger_type == 31 || trigger_type == 35 || trigger_type == 36 || trigger_type == 37 || trigger_type == 40 || trigger_type == 49 || trigger_type == 50 || trigger_type == 53 || trigger_type == 54 || trigger_type == 63 || trigger_type == 64) } diff --git a/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini b/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini index 70ba561ca7..eac5d4c698 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.11.08.hellen88bmw.3635266505" + signature = "rusEFI master.2023.11.09.hellen88bmw.3421595295" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.11.08.hellen88bmw.3635266505" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.11.09.hellen88bmw.3421595295" ; 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 @@ -92,7 +92,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.jar based on (unknown script) integration/rusefi_config.txt Wed Nov 08 20:02:14 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Thu Nov 09 02:07:08 UTC 2023 pageSize = 23880 page = 1 @@ -2347,7 +2347,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23870, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1440 + ochBlockSize = 1444 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3001,136 +3001,137 @@ brakePedalState = scalar, S08, 1092, "", 1, 0 startStopState = scalar, S08, 1093, "", 1, 0 startStopPhysicalState = bits, U32, 1096, [0:0] startStopStateToggleCounter = scalar, U32, 1100, "", 1, 0 -egtValue1 = scalar, F32, 1104, "", 1, 0 -egtValue2 = scalar, F32, 1108, "", 1, 0 -desiredRpmLimit = scalar, S16, 1112, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1116, "", 1, 0 -sparkCounter = scalar, U32, 1120, "", 1, 0 -fuelingLoad = scalar, F32, 1124, "", 1, 0 -ignitionLoad = scalar, F32, 1128, "", 1, 0 -veTableYAxis = scalar, U16, 1132, "%", 0.01, 0 -; total TS size = 1136 -tpsFrom = scalar, F32, 1136 -tpsTo = scalar, F32, 1140 -deltaTps = scalar, F32, 1144 -extraFuel = scalar, F32, 1148, "", 1, 0 -valueFromTable = scalar, F32, 1152, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1156, [0:0] -isBelowDecelThreshold = bits, U32, 1156, [1:1] -isTimeToResetAccumulator = bits, U32, 1156, [2:2] -isFractionalEnrichment = bits, U32, 1156, [3:3] -belowEpsilon = bits, U32, 1156, [4:4] -tooShort = bits, U32, 1156, [5:5] -fractionalInjFuel = scalar, F32, 1160, "", 1, 0 -accumulatedValue = scalar, F32, 1164, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1168, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1172, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1176, "", 1, 0 -cycleCnt = scalar, S32, 1180, "", 1, 0 -; total TS size = 1184 -hwEventCounters1 = scalar, U32, 1184, "", 1, 0 -hwEventCounters2 = scalar, U32, 1188, "", 1, 0 -hwEventCounters3 = scalar, U32, 1192, "", 1, 0 -hwEventCounters4 = scalar, U32, 1196, "", 1, 0 -hwEventCounters5 = scalar, U32, 1200, "", 1, 0 -hwEventCounters6 = scalar, U32, 1204, "", 1, 0 -vvtCamCounter = scalar, U32, 1208, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1212, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1216, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1220, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1221, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1224, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1228, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1232, "", 1, 0 -mapCamPrevToothAngle = scalar, F32, 1236, "deg", 1, 0 -isDecodingMapCam = bits, U32, 1240, [0:0] -; total TS size = 1244 -crankSynchronizationCounter = scalar, U32, 1244, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1248, "", 1, 0 -vvtToothDurations0 = scalar, U32, 1252, "us", 1, 0 -vvtCurrentPosition = scalar, F32, 1256, "sync: Primary Cam Position", 1, 0 -vvtToothPosition1 = scalar, F32, 1260, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition2 = scalar, F32, 1264, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition3 = scalar, F32, 1268, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition4 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio = scalar, F32, 1276, "", 1, 0 -triggerStateIndex = scalar, U08, 1280, "", 1, 0 -camResyncCounter = scalar, U08, 1281, "", 1, 0 -vvtStateIndex = scalar, U08, 1282, "", 1, 0 -; total TS size = 1284 -m_hasSynchronizedPhase = bits, U32, 1284, [0:0] +startStopStateTempPhysicalCounter = scalar, U32, 1104, "", 1, 0 +egtValue1 = scalar, F32, 1108, "", 1, 0 +egtValue2 = scalar, F32, 1112, "", 1, 0 +desiredRpmLimit = scalar, S16, 1116, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 1120, "", 1, 0 +sparkCounter = scalar, U32, 1124, "", 1, 0 +fuelingLoad = scalar, F32, 1128, "", 1, 0 +ignitionLoad = scalar, F32, 1132, "", 1, 0 +veTableYAxis = scalar, U16, 1136, "%", 0.01, 0 +; total TS size = 1140 +tpsFrom = scalar, F32, 1140 +tpsTo = scalar, F32, 1144 +deltaTps = scalar, F32, 1148 +extraFuel = scalar, F32, 1152, "", 1, 0 +valueFromTable = scalar, F32, 1156, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1160, [0:0] +isBelowDecelThreshold = bits, U32, 1160, [1:1] +isTimeToResetAccumulator = bits, U32, 1160, [2:2] +isFractionalEnrichment = bits, U32, 1160, [3:3] +belowEpsilon = bits, U32, 1160, [4:4] +tooShort = bits, U32, 1160, [5:5] +fractionalInjFuel = scalar, F32, 1164, "", 1, 0 +accumulatedValue = scalar, F32, 1168, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1172, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1176, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1180, "", 1, 0 +cycleCnt = scalar, S32, 1184, "", 1, 0 +; total TS size = 1188 +hwEventCounters1 = scalar, U32, 1188, "", 1, 0 +hwEventCounters2 = scalar, U32, 1192, "", 1, 0 +hwEventCounters3 = scalar, U32, 1196, "", 1, 0 +hwEventCounters4 = scalar, U32, 1200, "", 1, 0 +hwEventCounters5 = scalar, U32, 1204, "", 1, 0 +hwEventCounters6 = scalar, U32, 1208, "", 1, 0 +vvtCamCounter = scalar, U32, 1212, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1216, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1220, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1224, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1225, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1228, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1232, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1236, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1240, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1244, [0:0] +; total TS size = 1248 +crankSynchronizationCounter = scalar, U32, 1248, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1252, "", 1, 0 +vvtToothDurations0 = scalar, U32, 1256, "us", 1, 0 +vvtCurrentPosition = scalar, F32, 1260, "sync: Primary Cam Position", 1, 0 +vvtToothPosition1 = scalar, F32, 1264, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition2 = scalar, F32, 1268, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition3 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition4 = scalar, F32, 1276, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio = scalar, F32, 1280, "", 1, 0 +triggerStateIndex = scalar, U08, 1284, "", 1, 0 +camResyncCounter = scalar, U08, 1285, "", 1, 0 +vvtStateIndex = scalar, U08, 1286, "", 1, 0 ; total TS size = 1288 -wallFuelCorrection = scalar, F32, 1288, "", 1, 0 -wallFuel = scalar, F32, 1292, "", 1, 0 -; total TS size = 1296 -idleState = bits, S32, 1296, [0:2], "not important" -currentIdlePosition = scalar, F32, 1300 -baseIdlePosition = scalar, F32, 1304 -idleClosedLoop = scalar, F32, 1308 -iacByTpsTaper = scalar, F32, 1312 -throttlePedalUpState = scalar, S32, 1316, "", 1, 0 -mightResetPid = bits, U32, 1320, [0:0] -shouldResetPid = bits, U32, 1320, [1:1] -wasResetPid = bits, U32, 1320, [2:2] -mustResetPid = bits, U32, 1320, [3:3] -isCranking = bits, U32, 1320, [4:4] -isIacTableForCoasting = bits, U32, 1320, [5:5] -notIdling = bits, U32, 1320, [6:6] -needReset = bits, U32, 1320, [7:7] -isInDeadZone = bits, U32, 1320, [8:8] -isBlipping = bits, U32, 1320, [9:9] -useClosedLoop = bits, U32, 1320, [10:10] -badTps = bits, U32, 1320, [11:11] -looksLikeRunning = bits, U32, 1320, [12:12] -looksLikeCoasting = bits, U32, 1320, [13:13] -looksLikeCrankToIdle = bits, U32, 1320, [14:14] -isIdleCoasting = bits, U32, 1320, [15:15] -isIdleClosedLoop = bits, U32, 1320, [16:16] -idleTarget = scalar, S32, 1324, "", 1, 0 -targetRpmByClt = scalar, S32, 1328, "", 1, 0 -targetRpmAc = scalar, S32, 1332, "", 1, 0 -iacByRpmTaper = scalar, F32, 1336 -luaAdd = scalar, F32, 1340 -; total TS size = 1344 -idlePosition = scalar, F32, 1344, "per", 1,0 -trim = scalar, F32, 1348, "", 1, 0 -luaAdjustment = scalar, F32, 1352, "per", 1,0 -m_wastegatePosition = scalar, F32, 1356, "per", 1,0 -etbFeedForward = scalar, F32, 1360 -etbIntegralError = scalar, F32, 1364, "", 1, 0 -etbCurrentTarget = scalar, F32, 1368, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1372, "%", 1, 0 -etbRevLimitActive = bits, U32, 1376, [0:0] -jamDetected = bits, U32, 1376, [1:1] -etbDutyRateOfChange = scalar, F32, 1380, "per", 1,0 -etbDutyAverage = scalar, F32, 1384, "per", 1,0 -etbTpsErrorCounter = scalar, U16, 1388, "count", 1,0 -etbPpsErrorCounter = scalar, U16, 1390, "count", 1,0 -etbErrorCode = scalar, S08, 1392, "", 1, 0 -jamTimer = scalar, U16, 1394, "sec", 0.01, 0 -; total TS size = 1396 -faultCode = scalar, U08, 1396, "", 1, 0 -heaterDuty = scalar, U08, 1397, "%", 1, 0 -pumpDuty = scalar, U08, 1398, "%", 1, 0 -tempC = scalar, U16, 1400, "C", 1, 0 -nernstVoltage = scalar, U16, 1402, "V", 0.001, 0 -esr = scalar, U16, 1404, "ohm", 1, 0 -; total TS size = 1408 -dcOutput0 = scalar, F32, 1408, "per", 1,0 -isEnabled0_int = scalar, U08, 1412, "per", 1,0 -isEnabled0 = bits, U32, 1416, [0:0] -; total TS size = 1420 -value0 = scalar, U16, 1420, "value", 1,0 -value1 = scalar, U16, 1422, "value", 1,0 -errorRate = scalar, F32, 1424, "ratio", 1,0 -; total TS size = 1428 -vvtTarget = scalar, U16, 1428, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1430, "%", 0.5, 0 +m_hasSynchronizedPhase = bits, U32, 1288, [0:0] +; total TS size = 1292 +wallFuelCorrection = scalar, F32, 1292, "", 1, 0 +wallFuel = scalar, F32, 1296, "", 1, 0 +; total TS size = 1300 +idleState = bits, S32, 1300, [0:2], "not important" +currentIdlePosition = scalar, F32, 1304 +baseIdlePosition = scalar, F32, 1308 +idleClosedLoop = scalar, F32, 1312 +iacByTpsTaper = scalar, F32, 1316 +throttlePedalUpState = scalar, S32, 1320, "", 1, 0 +mightResetPid = bits, U32, 1324, [0:0] +shouldResetPid = bits, U32, 1324, [1:1] +wasResetPid = bits, U32, 1324, [2:2] +mustResetPid = bits, U32, 1324, [3:3] +isCranking = bits, U32, 1324, [4:4] +isIacTableForCoasting = bits, U32, 1324, [5:5] +notIdling = bits, U32, 1324, [6:6] +needReset = bits, U32, 1324, [7:7] +isInDeadZone = bits, U32, 1324, [8:8] +isBlipping = bits, U32, 1324, [9:9] +useClosedLoop = bits, U32, 1324, [10:10] +badTps = bits, U32, 1324, [11:11] +looksLikeRunning = bits, U32, 1324, [12:12] +looksLikeCoasting = bits, U32, 1324, [13:13] +looksLikeCrankToIdle = bits, U32, 1324, [14:14] +isIdleCoasting = bits, U32, 1324, [15:15] +isIdleClosedLoop = bits, U32, 1324, [16:16] +idleTarget = scalar, S32, 1328, "", 1, 0 +targetRpmByClt = scalar, S32, 1332, "", 1, 0 +targetRpmAc = scalar, S32, 1336, "", 1, 0 +iacByRpmTaper = scalar, F32, 1340 +luaAdd = scalar, F32, 1344 +; total TS size = 1348 +idlePosition = scalar, F32, 1348, "per", 1,0 +trim = scalar, F32, 1352, "", 1, 0 +luaAdjustment = scalar, F32, 1356, "per", 1,0 +m_wastegatePosition = scalar, F32, 1360, "per", 1,0 +etbFeedForward = scalar, F32, 1364 +etbIntegralError = scalar, F32, 1368, "", 1, 0 +etbCurrentTarget = scalar, F32, 1372, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1376, "%", 1, 0 +etbRevLimitActive = bits, U32, 1380, [0:0] +jamDetected = bits, U32, 1380, [1:1] +etbDutyRateOfChange = scalar, F32, 1384, "per", 1,0 +etbDutyAverage = scalar, F32, 1388, "per", 1,0 +etbTpsErrorCounter = scalar, U16, 1392, "count", 1,0 +etbPpsErrorCounter = scalar, U16, 1394, "count", 1,0 +etbErrorCode = scalar, S08, 1396, "", 1, 0 +jamTimer = scalar, U16, 1398, "sec", 0.01, 0 +; total TS size = 1400 +faultCode = scalar, U08, 1400, "", 1, 0 +heaterDuty = scalar, U08, 1401, "%", 1, 0 +pumpDuty = scalar, U08, 1402, "%", 1, 0 +tempC = scalar, U16, 1404, "C", 1, 0 +nernstVoltage = scalar, U16, 1406, "V", 0.001, 0 +esr = scalar, U16, 1408, "ohm", 1, 0 +; total TS size = 1412 +dcOutput0 = scalar, F32, 1412, "per", 1,0 +isEnabled0_int = scalar, U08, 1416, "per", 1,0 +isEnabled0 = bits, U32, 1420, [0:0] +; total TS size = 1424 +value0 = scalar, U16, 1424, "value", 1,0 +value1 = scalar, U16, 1426, "value", 1,0 +errorRate = scalar, F32, 1428, "ratio", 1,0 ; total TS size = 1432 -lambdaCurrentlyGood = bits, U32, 1432, [0:0] -lambdaMonitorCut = bits, U32, 1432, [1:1] -lambdaTimeSinceGood = scalar, U16, 1436, "sec", 0.01, 0 -; total TS size = 1440 +vvtTarget = scalar, U16, 1432, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1434, "%", 0.5, 0 +; total TS size = 1436 +lambdaCurrentlyGood = bits, U32, 1436, [0:0] +lambdaMonitorCut = bits, U32, 1436, [1:1] +lambdaTimeSinceGood = scalar, U16, 1440, "sec", 0.01, 0 +; total TS size = 1444 time = { timeNow } @@ -5196,6 +5197,7 @@ entry = brakePedalState, "Brake switch", int, "%d" entry = startStopState, "startStopState", int, "%d" entry = startStopPhysicalState, "startStopPhysicalState", int, "%d" entry = startStopStateToggleCounter, "startStopStateToggleCounter", int, "%d" +entry = startStopStateTempPhysicalCounter, "startStopStateTempPhysicalCounter", int, "%d" entry = egtValue1, "egtValue1", float, "%.3f" entry = egtValue2, "egtValue2", float, "%.3f" entry = desiredRpmLimit, "User-defined RPM hard limit", int, "%d" @@ -6078,13 +6080,14 @@ dialog = engine_stateDialog, "engine_state" graphLine = brakePedalState graphLine = startStopState graphLine = startStopStateToggleCounter - graphLine = egtValue1 + graphLine = startStopStateTempPhysicalCounter liveGraph = engine_state_5_Graph, "Graph", South + graphLine = egtValue1 graphLine = egtValue2 graphLine = desiredRpmLimit graphLine = fuelInjectionCounter - graphLine = sparkCounter liveGraph = engine_state_6_Graph, "Graph", South + graphLine = sparkCounter graphLine = fuelingLoad graphLine = ignitionLoad graphLine = veTableYAxis @@ -6419,8 +6422,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" ; cam if ; two-stroke, or ; not crank trigger and ((vague trigger and cam choice) or not vague trigger) - field = "Cam Sensor (Primary channel)", triggerInputPins1, 1, {twoStroke == 1 || ( !(trigger_type == 2 || trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 21 || trigger_type == 26 || trigger_type == 27 || trigger_type == 33 || trigger_type == 38 || trigger_type == 39 || trigger_type == 44 || trigger_type == 45 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 58 || trigger_type == 61 || trigger_type == 62 || trigger_type == 68 || trigger_type == 70 || trigger_type == 71 || trigger_type == 72 || trigger_type == 74 || trigger_type == 75 || trigger_type == 76 || trigger_type == 77 || trigger_type == 79) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) ) ) } - field = "Crank Sensor (Primary channel)", triggerInputPins1, 1, { !(twoStroke == 1 || ( !(trigger_type == 2 || trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 21 || trigger_type == 26 || trigger_type == 27 || trigger_type == 33 || trigger_type == 38 || trigger_type == 39 || trigger_type == 44 || trigger_type == 45 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 58 || trigger_type == 61 || trigger_type == 62 || trigger_type == 68 || trigger_type == 70 || trigger_type == 71 || trigger_type == 72 || trigger_type == 74 || trigger_type == 75 || trigger_type == 76 || trigger_type == 77 || trigger_type == 79) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) ) )) } + field = "Cam Sensor (Primary channel)", triggerInputPins1, 1, {twoStroke == 1 || ( !(trigger_type == 2 || trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 21 || trigger_type == 26 || trigger_type == 27 || trigger_type == 33 || trigger_type == 38 || trigger_type == 39 || trigger_type == 44 || trigger_type == 45 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 58 || trigger_type == 61 || trigger_type == 62 || trigger_type == 68 || trigger_type == 70 || trigger_type == 71 || trigger_type == 72 || trigger_type == 74 || trigger_type == 75 || trigger_type == 76 || trigger_type == 77) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) ) ) } + field = "Crank Sensor (Primary channel)", triggerInputPins1, 1, { !(twoStroke == 1 || ( !(trigger_type == 2 || trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 21 || trigger_type == 26 || trigger_type == 27 || trigger_type == 33 || trigger_type == 38 || trigger_type == 39 || trigger_type == 44 || trigger_type == 45 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 58 || trigger_type == 61 || trigger_type == 62 || trigger_type == 68 || trigger_type == 70 || trigger_type == 71 || trigger_type == 72 || trigger_type == 74 || trigger_type == 75 || trigger_type == 76 || trigger_type == 77) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) ) )) } field = "Invert Primary", invertPrimaryTriggerSignal field = "Secondary channel", triggerInputPins2, { triggerInputPins2 != 0 || (triggerInputPins1 != 0 && (trigger_type == 1 || trigger_type == 3 || trigger_type == 15 || trigger_type == 16 || trigger_type == 19 || trigger_type == 25 || trigger_type == 28 || trigger_type == 31 || trigger_type == 35 || trigger_type == 36 || trigger_type == 37 || trigger_type == 40 || trigger_type == 49 || trigger_type == 50 || trigger_type == 53 || trigger_type == 54 || trigger_type == 63 || trigger_type == 64) ) } field = "Invert Secondary", invertSecondaryTriggerSignal, {triggerInputPins2 != 0 && (trigger_type == 1 || trigger_type == 3 || trigger_type == 15 || trigger_type == 16 || trigger_type == 19 || trigger_type == 25 || trigger_type == 28 || trigger_type == 31 || trigger_type == 35 || trigger_type == 36 || trigger_type == 37 || trigger_type == 40 || trigger_type == 49 || trigger_type == 50 || trigger_type == 53 || trigger_type == 54 || trigger_type == 63 || trigger_type == 64) } diff --git a/firmware/tunerstudio/generated/rusefi_hellenNA6.ini b/firmware/tunerstudio/generated/rusefi_hellenNA6.ini index 21ea3bb43d..06413495a5 100644 --- a/firmware/tunerstudio/generated/rusefi_hellenNA6.ini +++ b/firmware/tunerstudio/generated/rusefi_hellenNA6.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.11.08.hellenNA6.3716534825" + signature = "rusEFI master.2023.11.09.hellenNA6.3470358399" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.11.08.hellenNA6.3716534825" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.11.09.hellenNA6.3470358399" ; 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 @@ -92,7 +92,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.jar based on (unknown script) integration/rusefi_config.txt Wed Nov 08 20:02:42 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Thu Nov 09 02:07:27 UTC 2023 pageSize = 23880 page = 1 @@ -2347,7 +2347,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23870, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1440 + ochBlockSize = 1444 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3001,136 +3001,137 @@ brakePedalState = scalar, S08, 1092, "", 1, 0 startStopState = scalar, S08, 1093, "", 1, 0 startStopPhysicalState = bits, U32, 1096, [0:0] startStopStateToggleCounter = scalar, U32, 1100, "", 1, 0 -egtValue1 = scalar, F32, 1104, "", 1, 0 -egtValue2 = scalar, F32, 1108, "", 1, 0 -desiredRpmLimit = scalar, S16, 1112, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1116, "", 1, 0 -sparkCounter = scalar, U32, 1120, "", 1, 0 -fuelingLoad = scalar, F32, 1124, "", 1, 0 -ignitionLoad = scalar, F32, 1128, "", 1, 0 -veTableYAxis = scalar, U16, 1132, "%", 0.01, 0 -; total TS size = 1136 -tpsFrom = scalar, F32, 1136 -tpsTo = scalar, F32, 1140 -deltaTps = scalar, F32, 1144 -extraFuel = scalar, F32, 1148, "", 1, 0 -valueFromTable = scalar, F32, 1152, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1156, [0:0] -isBelowDecelThreshold = bits, U32, 1156, [1:1] -isTimeToResetAccumulator = bits, U32, 1156, [2:2] -isFractionalEnrichment = bits, U32, 1156, [3:3] -belowEpsilon = bits, U32, 1156, [4:4] -tooShort = bits, U32, 1156, [5:5] -fractionalInjFuel = scalar, F32, 1160, "", 1, 0 -accumulatedValue = scalar, F32, 1164, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1168, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1172, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1176, "", 1, 0 -cycleCnt = scalar, S32, 1180, "", 1, 0 -; total TS size = 1184 -hwEventCounters1 = scalar, U32, 1184, "", 1, 0 -hwEventCounters2 = scalar, U32, 1188, "", 1, 0 -hwEventCounters3 = scalar, U32, 1192, "", 1, 0 -hwEventCounters4 = scalar, U32, 1196, "", 1, 0 -hwEventCounters5 = scalar, U32, 1200, "", 1, 0 -hwEventCounters6 = scalar, U32, 1204, "", 1, 0 -vvtCamCounter = scalar, U32, 1208, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1212, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1216, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1220, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1221, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1224, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1228, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1232, "", 1, 0 -mapCamPrevToothAngle = scalar, F32, 1236, "deg", 1, 0 -isDecodingMapCam = bits, U32, 1240, [0:0] -; total TS size = 1244 -crankSynchronizationCounter = scalar, U32, 1244, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1248, "", 1, 0 -vvtToothDurations0 = scalar, U32, 1252, "us", 1, 0 -vvtCurrentPosition = scalar, F32, 1256, "sync: Primary Cam Position", 1, 0 -vvtToothPosition1 = scalar, F32, 1260, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition2 = scalar, F32, 1264, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition3 = scalar, F32, 1268, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition4 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio = scalar, F32, 1276, "", 1, 0 -triggerStateIndex = scalar, U08, 1280, "", 1, 0 -camResyncCounter = scalar, U08, 1281, "", 1, 0 -vvtStateIndex = scalar, U08, 1282, "", 1, 0 -; total TS size = 1284 -m_hasSynchronizedPhase = bits, U32, 1284, [0:0] +startStopStateTempPhysicalCounter = scalar, U32, 1104, "", 1, 0 +egtValue1 = scalar, F32, 1108, "", 1, 0 +egtValue2 = scalar, F32, 1112, "", 1, 0 +desiredRpmLimit = scalar, S16, 1116, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 1120, "", 1, 0 +sparkCounter = scalar, U32, 1124, "", 1, 0 +fuelingLoad = scalar, F32, 1128, "", 1, 0 +ignitionLoad = scalar, F32, 1132, "", 1, 0 +veTableYAxis = scalar, U16, 1136, "%", 0.01, 0 +; total TS size = 1140 +tpsFrom = scalar, F32, 1140 +tpsTo = scalar, F32, 1144 +deltaTps = scalar, F32, 1148 +extraFuel = scalar, F32, 1152, "", 1, 0 +valueFromTable = scalar, F32, 1156, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1160, [0:0] +isBelowDecelThreshold = bits, U32, 1160, [1:1] +isTimeToResetAccumulator = bits, U32, 1160, [2:2] +isFractionalEnrichment = bits, U32, 1160, [3:3] +belowEpsilon = bits, U32, 1160, [4:4] +tooShort = bits, U32, 1160, [5:5] +fractionalInjFuel = scalar, F32, 1164, "", 1, 0 +accumulatedValue = scalar, F32, 1168, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1172, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1176, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1180, "", 1, 0 +cycleCnt = scalar, S32, 1184, "", 1, 0 +; total TS size = 1188 +hwEventCounters1 = scalar, U32, 1188, "", 1, 0 +hwEventCounters2 = scalar, U32, 1192, "", 1, 0 +hwEventCounters3 = scalar, U32, 1196, "", 1, 0 +hwEventCounters4 = scalar, U32, 1200, "", 1, 0 +hwEventCounters5 = scalar, U32, 1204, "", 1, 0 +hwEventCounters6 = scalar, U32, 1208, "", 1, 0 +vvtCamCounter = scalar, U32, 1212, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1216, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1220, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1224, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1225, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1228, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1232, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1236, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1240, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1244, [0:0] +; total TS size = 1248 +crankSynchronizationCounter = scalar, U32, 1248, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1252, "", 1, 0 +vvtToothDurations0 = scalar, U32, 1256, "us", 1, 0 +vvtCurrentPosition = scalar, F32, 1260, "sync: Primary Cam Position", 1, 0 +vvtToothPosition1 = scalar, F32, 1264, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition2 = scalar, F32, 1268, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition3 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition4 = scalar, F32, 1276, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio = scalar, F32, 1280, "", 1, 0 +triggerStateIndex = scalar, U08, 1284, "", 1, 0 +camResyncCounter = scalar, U08, 1285, "", 1, 0 +vvtStateIndex = scalar, U08, 1286, "", 1, 0 ; total TS size = 1288 -wallFuelCorrection = scalar, F32, 1288, "", 1, 0 -wallFuel = scalar, F32, 1292, "", 1, 0 -; total TS size = 1296 -idleState = bits, S32, 1296, [0:2], "not important" -currentIdlePosition = scalar, F32, 1300 -baseIdlePosition = scalar, F32, 1304 -idleClosedLoop = scalar, F32, 1308 -iacByTpsTaper = scalar, F32, 1312 -throttlePedalUpState = scalar, S32, 1316, "", 1, 0 -mightResetPid = bits, U32, 1320, [0:0] -shouldResetPid = bits, U32, 1320, [1:1] -wasResetPid = bits, U32, 1320, [2:2] -mustResetPid = bits, U32, 1320, [3:3] -isCranking = bits, U32, 1320, [4:4] -isIacTableForCoasting = bits, U32, 1320, [5:5] -notIdling = bits, U32, 1320, [6:6] -needReset = bits, U32, 1320, [7:7] -isInDeadZone = bits, U32, 1320, [8:8] -isBlipping = bits, U32, 1320, [9:9] -useClosedLoop = bits, U32, 1320, [10:10] -badTps = bits, U32, 1320, [11:11] -looksLikeRunning = bits, U32, 1320, [12:12] -looksLikeCoasting = bits, U32, 1320, [13:13] -looksLikeCrankToIdle = bits, U32, 1320, [14:14] -isIdleCoasting = bits, U32, 1320, [15:15] -isIdleClosedLoop = bits, U32, 1320, [16:16] -idleTarget = scalar, S32, 1324, "", 1, 0 -targetRpmByClt = scalar, S32, 1328, "", 1, 0 -targetRpmAc = scalar, S32, 1332, "", 1, 0 -iacByRpmTaper = scalar, F32, 1336 -luaAdd = scalar, F32, 1340 -; total TS size = 1344 -idlePosition = scalar, F32, 1344, "per", 1,0 -trim = scalar, F32, 1348, "", 1, 0 -luaAdjustment = scalar, F32, 1352, "per", 1,0 -m_wastegatePosition = scalar, F32, 1356, "per", 1,0 -etbFeedForward = scalar, F32, 1360 -etbIntegralError = scalar, F32, 1364, "", 1, 0 -etbCurrentTarget = scalar, F32, 1368, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1372, "%", 1, 0 -etbRevLimitActive = bits, U32, 1376, [0:0] -jamDetected = bits, U32, 1376, [1:1] -etbDutyRateOfChange = scalar, F32, 1380, "per", 1,0 -etbDutyAverage = scalar, F32, 1384, "per", 1,0 -etbTpsErrorCounter = scalar, U16, 1388, "count", 1,0 -etbPpsErrorCounter = scalar, U16, 1390, "count", 1,0 -etbErrorCode = scalar, S08, 1392, "", 1, 0 -jamTimer = scalar, U16, 1394, "sec", 0.01, 0 -; total TS size = 1396 -faultCode = scalar, U08, 1396, "", 1, 0 -heaterDuty = scalar, U08, 1397, "%", 1, 0 -pumpDuty = scalar, U08, 1398, "%", 1, 0 -tempC = scalar, U16, 1400, "C", 1, 0 -nernstVoltage = scalar, U16, 1402, "V", 0.001, 0 -esr = scalar, U16, 1404, "ohm", 1, 0 -; total TS size = 1408 -dcOutput0 = scalar, F32, 1408, "per", 1,0 -isEnabled0_int = scalar, U08, 1412, "per", 1,0 -isEnabled0 = bits, U32, 1416, [0:0] -; total TS size = 1420 -value0 = scalar, U16, 1420, "value", 1,0 -value1 = scalar, U16, 1422, "value", 1,0 -errorRate = scalar, F32, 1424, "ratio", 1,0 -; total TS size = 1428 -vvtTarget = scalar, U16, 1428, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1430, "%", 0.5, 0 +m_hasSynchronizedPhase = bits, U32, 1288, [0:0] +; total TS size = 1292 +wallFuelCorrection = scalar, F32, 1292, "", 1, 0 +wallFuel = scalar, F32, 1296, "", 1, 0 +; total TS size = 1300 +idleState = bits, S32, 1300, [0:2], "not important" +currentIdlePosition = scalar, F32, 1304 +baseIdlePosition = scalar, F32, 1308 +idleClosedLoop = scalar, F32, 1312 +iacByTpsTaper = scalar, F32, 1316 +throttlePedalUpState = scalar, S32, 1320, "", 1, 0 +mightResetPid = bits, U32, 1324, [0:0] +shouldResetPid = bits, U32, 1324, [1:1] +wasResetPid = bits, U32, 1324, [2:2] +mustResetPid = bits, U32, 1324, [3:3] +isCranking = bits, U32, 1324, [4:4] +isIacTableForCoasting = bits, U32, 1324, [5:5] +notIdling = bits, U32, 1324, [6:6] +needReset = bits, U32, 1324, [7:7] +isInDeadZone = bits, U32, 1324, [8:8] +isBlipping = bits, U32, 1324, [9:9] +useClosedLoop = bits, U32, 1324, [10:10] +badTps = bits, U32, 1324, [11:11] +looksLikeRunning = bits, U32, 1324, [12:12] +looksLikeCoasting = bits, U32, 1324, [13:13] +looksLikeCrankToIdle = bits, U32, 1324, [14:14] +isIdleCoasting = bits, U32, 1324, [15:15] +isIdleClosedLoop = bits, U32, 1324, [16:16] +idleTarget = scalar, S32, 1328, "", 1, 0 +targetRpmByClt = scalar, S32, 1332, "", 1, 0 +targetRpmAc = scalar, S32, 1336, "", 1, 0 +iacByRpmTaper = scalar, F32, 1340 +luaAdd = scalar, F32, 1344 +; total TS size = 1348 +idlePosition = scalar, F32, 1348, "per", 1,0 +trim = scalar, F32, 1352, "", 1, 0 +luaAdjustment = scalar, F32, 1356, "per", 1,0 +m_wastegatePosition = scalar, F32, 1360, "per", 1,0 +etbFeedForward = scalar, F32, 1364 +etbIntegralError = scalar, F32, 1368, "", 1, 0 +etbCurrentTarget = scalar, F32, 1372, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1376, "%", 1, 0 +etbRevLimitActive = bits, U32, 1380, [0:0] +jamDetected = bits, U32, 1380, [1:1] +etbDutyRateOfChange = scalar, F32, 1384, "per", 1,0 +etbDutyAverage = scalar, F32, 1388, "per", 1,0 +etbTpsErrorCounter = scalar, U16, 1392, "count", 1,0 +etbPpsErrorCounter = scalar, U16, 1394, "count", 1,0 +etbErrorCode = scalar, S08, 1396, "", 1, 0 +jamTimer = scalar, U16, 1398, "sec", 0.01, 0 +; total TS size = 1400 +faultCode = scalar, U08, 1400, "", 1, 0 +heaterDuty = scalar, U08, 1401, "%", 1, 0 +pumpDuty = scalar, U08, 1402, "%", 1, 0 +tempC = scalar, U16, 1404, "C", 1, 0 +nernstVoltage = scalar, U16, 1406, "V", 0.001, 0 +esr = scalar, U16, 1408, "ohm", 1, 0 +; total TS size = 1412 +dcOutput0 = scalar, F32, 1412, "per", 1,0 +isEnabled0_int = scalar, U08, 1416, "per", 1,0 +isEnabled0 = bits, U32, 1420, [0:0] +; total TS size = 1424 +value0 = scalar, U16, 1424, "value", 1,0 +value1 = scalar, U16, 1426, "value", 1,0 +errorRate = scalar, F32, 1428, "ratio", 1,0 ; total TS size = 1432 -lambdaCurrentlyGood = bits, U32, 1432, [0:0] -lambdaMonitorCut = bits, U32, 1432, [1:1] -lambdaTimeSinceGood = scalar, U16, 1436, "sec", 0.01, 0 -; total TS size = 1440 +vvtTarget = scalar, U16, 1432, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1434, "%", 0.5, 0 +; total TS size = 1436 +lambdaCurrentlyGood = bits, U32, 1436, [0:0] +lambdaMonitorCut = bits, U32, 1436, [1:1] +lambdaTimeSinceGood = scalar, U16, 1440, "sec", 0.01, 0 +; total TS size = 1444 time = { timeNow } @@ -5196,6 +5197,7 @@ entry = brakePedalState, "Brake switch", int, "%d" entry = startStopState, "startStopState", int, "%d" entry = startStopPhysicalState, "startStopPhysicalState", int, "%d" entry = startStopStateToggleCounter, "startStopStateToggleCounter", int, "%d" +entry = startStopStateTempPhysicalCounter, "startStopStateTempPhysicalCounter", int, "%d" entry = egtValue1, "egtValue1", float, "%.3f" entry = egtValue2, "egtValue2", float, "%.3f" entry = desiredRpmLimit, "User-defined RPM hard limit", int, "%d" @@ -6078,13 +6080,14 @@ dialog = engine_stateDialog, "engine_state" graphLine = brakePedalState graphLine = startStopState graphLine = startStopStateToggleCounter - graphLine = egtValue1 + graphLine = startStopStateTempPhysicalCounter liveGraph = engine_state_5_Graph, "Graph", South + graphLine = egtValue1 graphLine = egtValue2 graphLine = desiredRpmLimit graphLine = fuelInjectionCounter - graphLine = sparkCounter liveGraph = engine_state_6_Graph, "Graph", South + graphLine = sparkCounter graphLine = fuelingLoad graphLine = ignitionLoad graphLine = veTableYAxis @@ -6420,8 +6423,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" ; cam if ; two-stroke, or ; not crank trigger and ((vague trigger and cam choice) or not vague trigger) - field = "Cam Sensor (Primary channel)", triggerInputPins1, 1, {twoStroke == 1 || ( !(trigger_type == 2 || trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 21 || trigger_type == 26 || trigger_type == 27 || trigger_type == 33 || trigger_type == 38 || trigger_type == 39 || trigger_type == 44 || trigger_type == 45 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 58 || trigger_type == 61 || trigger_type == 62 || trigger_type == 68 || trigger_type == 70 || trigger_type == 71 || trigger_type == 72 || trigger_type == 74 || trigger_type == 75 || trigger_type == 76 || trigger_type == 77 || trigger_type == 79) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) ) ) } - field = "Crank Sensor (Primary channel)", triggerInputPins1, 1, { !(twoStroke == 1 || ( !(trigger_type == 2 || trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 21 || trigger_type == 26 || trigger_type == 27 || trigger_type == 33 || trigger_type == 38 || trigger_type == 39 || trigger_type == 44 || trigger_type == 45 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 58 || trigger_type == 61 || trigger_type == 62 || trigger_type == 68 || trigger_type == 70 || trigger_type == 71 || trigger_type == 72 || trigger_type == 74 || trigger_type == 75 || trigger_type == 76 || trigger_type == 77 || trigger_type == 79) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) ) )) } + field = "Cam Sensor (Primary channel)", triggerInputPins1, 1, {twoStroke == 1 || ( !(trigger_type == 2 || trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 21 || trigger_type == 26 || trigger_type == 27 || trigger_type == 33 || trigger_type == 38 || trigger_type == 39 || trigger_type == 44 || trigger_type == 45 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 58 || trigger_type == 61 || trigger_type == 62 || trigger_type == 68 || trigger_type == 70 || trigger_type == 71 || trigger_type == 72 || trigger_type == 74 || trigger_type == 75 || trigger_type == 76 || trigger_type == 77) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) ) ) } + field = "Crank Sensor (Primary channel)", triggerInputPins1, 1, { !(twoStroke == 1 || ( !(trigger_type == 2 || trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 21 || trigger_type == 26 || trigger_type == 27 || trigger_type == 33 || trigger_type == 38 || trigger_type == 39 || trigger_type == 44 || trigger_type == 45 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 58 || trigger_type == 61 || trigger_type == 62 || trigger_type == 68 || trigger_type == 70 || trigger_type == 71 || trigger_type == 72 || trigger_type == 74 || trigger_type == 75 || trigger_type == 76 || trigger_type == 77) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) ) )) } field = "Invert Primary", invertPrimaryTriggerSignal field = "Secondary channel", triggerInputPins2, { triggerInputPins2 != 0 || (triggerInputPins1 != 0 && (trigger_type == 1 || trigger_type == 3 || trigger_type == 15 || trigger_type == 16 || trigger_type == 19 || trigger_type == 25 || trigger_type == 28 || trigger_type == 31 || trigger_type == 35 || trigger_type == 36 || trigger_type == 37 || trigger_type == 40 || trigger_type == 49 || trigger_type == 50 || trigger_type == 53 || trigger_type == 54 || trigger_type == 63 || trigger_type == 64) ) } field = "Invert Secondary", invertSecondaryTriggerSignal, {triggerInputPins2 != 0 && (trigger_type == 1 || trigger_type == 3 || trigger_type == 15 || trigger_type == 16 || trigger_type == 19 || trigger_type == 25 || trigger_type == 28 || trigger_type == 31 || trigger_type == 35 || trigger_type == 36 || trigger_type == 37 || trigger_type == 40 || trigger_type == 49 || trigger_type == 50 || trigger_type == 53 || trigger_type == 54 || trigger_type == 63 || trigger_type == 64) } diff --git a/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini b/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini index a20a915660..345c84fb3d 100644 --- a/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini +++ b/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.11.08.hellenNA8_96.3139748582" + signature = "rusEFI master.2023.11.09.hellenNA8_96.2826463152" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.11.08.hellenNA8_96.3139748582" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.11.09.hellenNA8_96.2826463152" ; 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 @@ -92,7 +92,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.jar based on (unknown script) integration/rusefi_config.txt Wed Nov 08 20:02:46 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Thu Nov 09 02:07:29 UTC 2023 pageSize = 23880 page = 1 @@ -2347,7 +2347,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23870, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1440 + ochBlockSize = 1444 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3001,136 +3001,137 @@ brakePedalState = scalar, S08, 1092, "", 1, 0 startStopState = scalar, S08, 1093, "", 1, 0 startStopPhysicalState = bits, U32, 1096, [0:0] startStopStateToggleCounter = scalar, U32, 1100, "", 1, 0 -egtValue1 = scalar, F32, 1104, "", 1, 0 -egtValue2 = scalar, F32, 1108, "", 1, 0 -desiredRpmLimit = scalar, S16, 1112, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1116, "", 1, 0 -sparkCounter = scalar, U32, 1120, "", 1, 0 -fuelingLoad = scalar, F32, 1124, "", 1, 0 -ignitionLoad = scalar, F32, 1128, "", 1, 0 -veTableYAxis = scalar, U16, 1132, "%", 0.01, 0 -; total TS size = 1136 -tpsFrom = scalar, F32, 1136 -tpsTo = scalar, F32, 1140 -deltaTps = scalar, F32, 1144 -extraFuel = scalar, F32, 1148, "", 1, 0 -valueFromTable = scalar, F32, 1152, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1156, [0:0] -isBelowDecelThreshold = bits, U32, 1156, [1:1] -isTimeToResetAccumulator = bits, U32, 1156, [2:2] -isFractionalEnrichment = bits, U32, 1156, [3:3] -belowEpsilon = bits, U32, 1156, [4:4] -tooShort = bits, U32, 1156, [5:5] -fractionalInjFuel = scalar, F32, 1160, "", 1, 0 -accumulatedValue = scalar, F32, 1164, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1168, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1172, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1176, "", 1, 0 -cycleCnt = scalar, S32, 1180, "", 1, 0 -; total TS size = 1184 -hwEventCounters1 = scalar, U32, 1184, "", 1, 0 -hwEventCounters2 = scalar, U32, 1188, "", 1, 0 -hwEventCounters3 = scalar, U32, 1192, "", 1, 0 -hwEventCounters4 = scalar, U32, 1196, "", 1, 0 -hwEventCounters5 = scalar, U32, 1200, "", 1, 0 -hwEventCounters6 = scalar, U32, 1204, "", 1, 0 -vvtCamCounter = scalar, U32, 1208, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1212, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1216, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1220, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1221, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1224, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1228, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1232, "", 1, 0 -mapCamPrevToothAngle = scalar, F32, 1236, "deg", 1, 0 -isDecodingMapCam = bits, U32, 1240, [0:0] -; total TS size = 1244 -crankSynchronizationCounter = scalar, U32, 1244, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1248, "", 1, 0 -vvtToothDurations0 = scalar, U32, 1252, "us", 1, 0 -vvtCurrentPosition = scalar, F32, 1256, "sync: Primary Cam Position", 1, 0 -vvtToothPosition1 = scalar, F32, 1260, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition2 = scalar, F32, 1264, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition3 = scalar, F32, 1268, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition4 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio = scalar, F32, 1276, "", 1, 0 -triggerStateIndex = scalar, U08, 1280, "", 1, 0 -camResyncCounter = scalar, U08, 1281, "", 1, 0 -vvtStateIndex = scalar, U08, 1282, "", 1, 0 -; total TS size = 1284 -m_hasSynchronizedPhase = bits, U32, 1284, [0:0] +startStopStateTempPhysicalCounter = scalar, U32, 1104, "", 1, 0 +egtValue1 = scalar, F32, 1108, "", 1, 0 +egtValue2 = scalar, F32, 1112, "", 1, 0 +desiredRpmLimit = scalar, S16, 1116, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 1120, "", 1, 0 +sparkCounter = scalar, U32, 1124, "", 1, 0 +fuelingLoad = scalar, F32, 1128, "", 1, 0 +ignitionLoad = scalar, F32, 1132, "", 1, 0 +veTableYAxis = scalar, U16, 1136, "%", 0.01, 0 +; total TS size = 1140 +tpsFrom = scalar, F32, 1140 +tpsTo = scalar, F32, 1144 +deltaTps = scalar, F32, 1148 +extraFuel = scalar, F32, 1152, "", 1, 0 +valueFromTable = scalar, F32, 1156, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1160, [0:0] +isBelowDecelThreshold = bits, U32, 1160, [1:1] +isTimeToResetAccumulator = bits, U32, 1160, [2:2] +isFractionalEnrichment = bits, U32, 1160, [3:3] +belowEpsilon = bits, U32, 1160, [4:4] +tooShort = bits, U32, 1160, [5:5] +fractionalInjFuel = scalar, F32, 1164, "", 1, 0 +accumulatedValue = scalar, F32, 1168, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1172, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1176, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1180, "", 1, 0 +cycleCnt = scalar, S32, 1184, "", 1, 0 +; total TS size = 1188 +hwEventCounters1 = scalar, U32, 1188, "", 1, 0 +hwEventCounters2 = scalar, U32, 1192, "", 1, 0 +hwEventCounters3 = scalar, U32, 1196, "", 1, 0 +hwEventCounters4 = scalar, U32, 1200, "", 1, 0 +hwEventCounters5 = scalar, U32, 1204, "", 1, 0 +hwEventCounters6 = scalar, U32, 1208, "", 1, 0 +vvtCamCounter = scalar, U32, 1212, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1216, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1220, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1224, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1225, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1228, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1232, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1236, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1240, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1244, [0:0] +; total TS size = 1248 +crankSynchronizationCounter = scalar, U32, 1248, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1252, "", 1, 0 +vvtToothDurations0 = scalar, U32, 1256, "us", 1, 0 +vvtCurrentPosition = scalar, F32, 1260, "sync: Primary Cam Position", 1, 0 +vvtToothPosition1 = scalar, F32, 1264, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition2 = scalar, F32, 1268, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition3 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition4 = scalar, F32, 1276, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio = scalar, F32, 1280, "", 1, 0 +triggerStateIndex = scalar, U08, 1284, "", 1, 0 +camResyncCounter = scalar, U08, 1285, "", 1, 0 +vvtStateIndex = scalar, U08, 1286, "", 1, 0 ; total TS size = 1288 -wallFuelCorrection = scalar, F32, 1288, "", 1, 0 -wallFuel = scalar, F32, 1292, "", 1, 0 -; total TS size = 1296 -idleState = bits, S32, 1296, [0:2], "not important" -currentIdlePosition = scalar, F32, 1300 -baseIdlePosition = scalar, F32, 1304 -idleClosedLoop = scalar, F32, 1308 -iacByTpsTaper = scalar, F32, 1312 -throttlePedalUpState = scalar, S32, 1316, "", 1, 0 -mightResetPid = bits, U32, 1320, [0:0] -shouldResetPid = bits, U32, 1320, [1:1] -wasResetPid = bits, U32, 1320, [2:2] -mustResetPid = bits, U32, 1320, [3:3] -isCranking = bits, U32, 1320, [4:4] -isIacTableForCoasting = bits, U32, 1320, [5:5] -notIdling = bits, U32, 1320, [6:6] -needReset = bits, U32, 1320, [7:7] -isInDeadZone = bits, U32, 1320, [8:8] -isBlipping = bits, U32, 1320, [9:9] -useClosedLoop = bits, U32, 1320, [10:10] -badTps = bits, U32, 1320, [11:11] -looksLikeRunning = bits, U32, 1320, [12:12] -looksLikeCoasting = bits, U32, 1320, [13:13] -looksLikeCrankToIdle = bits, U32, 1320, [14:14] -isIdleCoasting = bits, U32, 1320, [15:15] -isIdleClosedLoop = bits, U32, 1320, [16:16] -idleTarget = scalar, S32, 1324, "", 1, 0 -targetRpmByClt = scalar, S32, 1328, "", 1, 0 -targetRpmAc = scalar, S32, 1332, "", 1, 0 -iacByRpmTaper = scalar, F32, 1336 -luaAdd = scalar, F32, 1340 -; total TS size = 1344 -idlePosition = scalar, F32, 1344, "per", 1,0 -trim = scalar, F32, 1348, "", 1, 0 -luaAdjustment = scalar, F32, 1352, "per", 1,0 -m_wastegatePosition = scalar, F32, 1356, "per", 1,0 -etbFeedForward = scalar, F32, 1360 -etbIntegralError = scalar, F32, 1364, "", 1, 0 -etbCurrentTarget = scalar, F32, 1368, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1372, "%", 1, 0 -etbRevLimitActive = bits, U32, 1376, [0:0] -jamDetected = bits, U32, 1376, [1:1] -etbDutyRateOfChange = scalar, F32, 1380, "per", 1,0 -etbDutyAverage = scalar, F32, 1384, "per", 1,0 -etbTpsErrorCounter = scalar, U16, 1388, "count", 1,0 -etbPpsErrorCounter = scalar, U16, 1390, "count", 1,0 -etbErrorCode = scalar, S08, 1392, "", 1, 0 -jamTimer = scalar, U16, 1394, "sec", 0.01, 0 -; total TS size = 1396 -faultCode = scalar, U08, 1396, "", 1, 0 -heaterDuty = scalar, U08, 1397, "%", 1, 0 -pumpDuty = scalar, U08, 1398, "%", 1, 0 -tempC = scalar, U16, 1400, "C", 1, 0 -nernstVoltage = scalar, U16, 1402, "V", 0.001, 0 -esr = scalar, U16, 1404, "ohm", 1, 0 -; total TS size = 1408 -dcOutput0 = scalar, F32, 1408, "per", 1,0 -isEnabled0_int = scalar, U08, 1412, "per", 1,0 -isEnabled0 = bits, U32, 1416, [0:0] -; total TS size = 1420 -value0 = scalar, U16, 1420, "value", 1,0 -value1 = scalar, U16, 1422, "value", 1,0 -errorRate = scalar, F32, 1424, "ratio", 1,0 -; total TS size = 1428 -vvtTarget = scalar, U16, 1428, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1430, "%", 0.5, 0 +m_hasSynchronizedPhase = bits, U32, 1288, [0:0] +; total TS size = 1292 +wallFuelCorrection = scalar, F32, 1292, "", 1, 0 +wallFuel = scalar, F32, 1296, "", 1, 0 +; total TS size = 1300 +idleState = bits, S32, 1300, [0:2], "not important" +currentIdlePosition = scalar, F32, 1304 +baseIdlePosition = scalar, F32, 1308 +idleClosedLoop = scalar, F32, 1312 +iacByTpsTaper = scalar, F32, 1316 +throttlePedalUpState = scalar, S32, 1320, "", 1, 0 +mightResetPid = bits, U32, 1324, [0:0] +shouldResetPid = bits, U32, 1324, [1:1] +wasResetPid = bits, U32, 1324, [2:2] +mustResetPid = bits, U32, 1324, [3:3] +isCranking = bits, U32, 1324, [4:4] +isIacTableForCoasting = bits, U32, 1324, [5:5] +notIdling = bits, U32, 1324, [6:6] +needReset = bits, U32, 1324, [7:7] +isInDeadZone = bits, U32, 1324, [8:8] +isBlipping = bits, U32, 1324, [9:9] +useClosedLoop = bits, U32, 1324, [10:10] +badTps = bits, U32, 1324, [11:11] +looksLikeRunning = bits, U32, 1324, [12:12] +looksLikeCoasting = bits, U32, 1324, [13:13] +looksLikeCrankToIdle = bits, U32, 1324, [14:14] +isIdleCoasting = bits, U32, 1324, [15:15] +isIdleClosedLoop = bits, U32, 1324, [16:16] +idleTarget = scalar, S32, 1328, "", 1, 0 +targetRpmByClt = scalar, S32, 1332, "", 1, 0 +targetRpmAc = scalar, S32, 1336, "", 1, 0 +iacByRpmTaper = scalar, F32, 1340 +luaAdd = scalar, F32, 1344 +; total TS size = 1348 +idlePosition = scalar, F32, 1348, "per", 1,0 +trim = scalar, F32, 1352, "", 1, 0 +luaAdjustment = scalar, F32, 1356, "per", 1,0 +m_wastegatePosition = scalar, F32, 1360, "per", 1,0 +etbFeedForward = scalar, F32, 1364 +etbIntegralError = scalar, F32, 1368, "", 1, 0 +etbCurrentTarget = scalar, F32, 1372, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1376, "%", 1, 0 +etbRevLimitActive = bits, U32, 1380, [0:0] +jamDetected = bits, U32, 1380, [1:1] +etbDutyRateOfChange = scalar, F32, 1384, "per", 1,0 +etbDutyAverage = scalar, F32, 1388, "per", 1,0 +etbTpsErrorCounter = scalar, U16, 1392, "count", 1,0 +etbPpsErrorCounter = scalar, U16, 1394, "count", 1,0 +etbErrorCode = scalar, S08, 1396, "", 1, 0 +jamTimer = scalar, U16, 1398, "sec", 0.01, 0 +; total TS size = 1400 +faultCode = scalar, U08, 1400, "", 1, 0 +heaterDuty = scalar, U08, 1401, "%", 1, 0 +pumpDuty = scalar, U08, 1402, "%", 1, 0 +tempC = scalar, U16, 1404, "C", 1, 0 +nernstVoltage = scalar, U16, 1406, "V", 0.001, 0 +esr = scalar, U16, 1408, "ohm", 1, 0 +; total TS size = 1412 +dcOutput0 = scalar, F32, 1412, "per", 1,0 +isEnabled0_int = scalar, U08, 1416, "per", 1,0 +isEnabled0 = bits, U32, 1420, [0:0] +; total TS size = 1424 +value0 = scalar, U16, 1424, "value", 1,0 +value1 = scalar, U16, 1426, "value", 1,0 +errorRate = scalar, F32, 1428, "ratio", 1,0 ; total TS size = 1432 -lambdaCurrentlyGood = bits, U32, 1432, [0:0] -lambdaMonitorCut = bits, U32, 1432, [1:1] -lambdaTimeSinceGood = scalar, U16, 1436, "sec", 0.01, 0 -; total TS size = 1440 +vvtTarget = scalar, U16, 1432, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1434, "%", 0.5, 0 +; total TS size = 1436 +lambdaCurrentlyGood = bits, U32, 1436, [0:0] +lambdaMonitorCut = bits, U32, 1436, [1:1] +lambdaTimeSinceGood = scalar, U16, 1440, "sec", 0.01, 0 +; total TS size = 1444 time = { timeNow } @@ -5196,6 +5197,7 @@ entry = brakePedalState, "Brake switch", int, "%d" entry = startStopState, "startStopState", int, "%d" entry = startStopPhysicalState, "startStopPhysicalState", int, "%d" entry = startStopStateToggleCounter, "startStopStateToggleCounter", int, "%d" +entry = startStopStateTempPhysicalCounter, "startStopStateTempPhysicalCounter", int, "%d" entry = egtValue1, "egtValue1", float, "%.3f" entry = egtValue2, "egtValue2", float, "%.3f" entry = desiredRpmLimit, "User-defined RPM hard limit", int, "%d" @@ -6078,13 +6080,14 @@ dialog = engine_stateDialog, "engine_state" graphLine = brakePedalState graphLine = startStopState graphLine = startStopStateToggleCounter - graphLine = egtValue1 + graphLine = startStopStateTempPhysicalCounter liveGraph = engine_state_5_Graph, "Graph", South + graphLine = egtValue1 graphLine = egtValue2 graphLine = desiredRpmLimit graphLine = fuelInjectionCounter - graphLine = sparkCounter liveGraph = engine_state_6_Graph, "Graph", South + graphLine = sparkCounter graphLine = fuelingLoad graphLine = ignitionLoad graphLine = veTableYAxis @@ -6420,8 +6423,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" ; cam if ; two-stroke, or ; not crank trigger and ((vague trigger and cam choice) or not vague trigger) - field = "Cam Sensor (Primary channel)", triggerInputPins1, 1, {twoStroke == 1 || ( !(trigger_type == 2 || trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 21 || trigger_type == 26 || trigger_type == 27 || trigger_type == 33 || trigger_type == 38 || trigger_type == 39 || trigger_type == 44 || trigger_type == 45 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 58 || trigger_type == 61 || trigger_type == 62 || trigger_type == 68 || trigger_type == 70 || trigger_type == 71 || trigger_type == 72 || trigger_type == 74 || trigger_type == 75 || trigger_type == 76 || trigger_type == 77 || trigger_type == 79) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) ) ) } - field = "Crank Sensor (Primary channel)", triggerInputPins1, 1, { !(twoStroke == 1 || ( !(trigger_type == 2 || trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 21 || trigger_type == 26 || trigger_type == 27 || trigger_type == 33 || trigger_type == 38 || trigger_type == 39 || trigger_type == 44 || trigger_type == 45 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 58 || trigger_type == 61 || trigger_type == 62 || trigger_type == 68 || trigger_type == 70 || trigger_type == 71 || trigger_type == 72 || trigger_type == 74 || trigger_type == 75 || trigger_type == 76 || trigger_type == 77 || trigger_type == 79) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) ) )) } + field = "Cam Sensor (Primary channel)", triggerInputPins1, 1, {twoStroke == 1 || ( !(trigger_type == 2 || trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 21 || trigger_type == 26 || trigger_type == 27 || trigger_type == 33 || trigger_type == 38 || trigger_type == 39 || trigger_type == 44 || trigger_type == 45 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 58 || trigger_type == 61 || trigger_type == 62 || trigger_type == 68 || trigger_type == 70 || trigger_type == 71 || trigger_type == 72 || trigger_type == 74 || trigger_type == 75 || trigger_type == 76 || trigger_type == 77) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) ) ) } + field = "Crank Sensor (Primary channel)", triggerInputPins1, 1, { !(twoStroke == 1 || ( !(trigger_type == 2 || trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 21 || trigger_type == 26 || trigger_type == 27 || trigger_type == 33 || trigger_type == 38 || trigger_type == 39 || trigger_type == 44 || trigger_type == 45 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 58 || trigger_type == 61 || trigger_type == 62 || trigger_type == 68 || trigger_type == 70 || trigger_type == 71 || trigger_type == 72 || trigger_type == 74 || trigger_type == 75 || trigger_type == 76 || trigger_type == 77) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) ) )) } field = "Invert Primary", invertPrimaryTriggerSignal field = "Secondary channel", triggerInputPins2, { triggerInputPins2 != 0 || (triggerInputPins1 != 0 && (trigger_type == 1 || trigger_type == 3 || trigger_type == 15 || trigger_type == 16 || trigger_type == 19 || trigger_type == 25 || trigger_type == 28 || trigger_type == 31 || trigger_type == 35 || trigger_type == 36 || trigger_type == 37 || trigger_type == 40 || trigger_type == 49 || trigger_type == 50 || trigger_type == 53 || trigger_type == 54 || trigger_type == 63 || trigger_type == 64) ) } field = "Invert Secondary", invertSecondaryTriggerSignal, {triggerInputPins2 != 0 && (trigger_type == 1 || trigger_type == 3 || trigger_type == 15 || trigger_type == 16 || trigger_type == 19 || trigger_type == 25 || trigger_type == 28 || trigger_type == 31 || trigger_type == 35 || trigger_type == 36 || trigger_type == 37 || trigger_type == 40 || trigger_type == 49 || trigger_type == 50 || trigger_type == 53 || trigger_type == 54 || trigger_type == 63 || trigger_type == 64) } diff --git a/firmware/tunerstudio/generated/rusefi_kin.ini b/firmware/tunerstudio/generated/rusefi_kin.ini index 133ba31e30..ea13d21baa 100644 --- a/firmware/tunerstudio/generated/rusefi_kin.ini +++ b/firmware/tunerstudio/generated/rusefi_kin.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.11.08.kin.1952024995" + signature = "rusEFI master.2023.11.09.kin.1728392437" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.11.08.kin.1952024995" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.11.09.kin.1728392437" ; 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 @@ -92,7 +92,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.jar based on (unknown script) integration/rusefi_config.txt Wed Nov 08 20:01:24 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Thu Nov 09 02:06:33 UTC 2023 pageSize = 22504 page = 1 @@ -2347,7 +2347,7 @@ lambdaMaxDeviationRpmBins = array, U16, 22494, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1440 + ochBlockSize = 1444 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3001,136 +3001,137 @@ brakePedalState = scalar, S08, 1092, "", 1, 0 startStopState = scalar, S08, 1093, "", 1, 0 startStopPhysicalState = bits, U32, 1096, [0:0] startStopStateToggleCounter = scalar, U32, 1100, "", 1, 0 -egtValue1 = scalar, F32, 1104, "", 1, 0 -egtValue2 = scalar, F32, 1108, "", 1, 0 -desiredRpmLimit = scalar, S16, 1112, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1116, "", 1, 0 -sparkCounter = scalar, U32, 1120, "", 1, 0 -fuelingLoad = scalar, F32, 1124, "", 1, 0 -ignitionLoad = scalar, F32, 1128, "", 1, 0 -veTableYAxis = scalar, U16, 1132, "%", 0.01, 0 -; total TS size = 1136 -tpsFrom = scalar, F32, 1136 -tpsTo = scalar, F32, 1140 -deltaTps = scalar, F32, 1144 -extraFuel = scalar, F32, 1148, "", 1, 0 -valueFromTable = scalar, F32, 1152, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1156, [0:0] -isBelowDecelThreshold = bits, U32, 1156, [1:1] -isTimeToResetAccumulator = bits, U32, 1156, [2:2] -isFractionalEnrichment = bits, U32, 1156, [3:3] -belowEpsilon = bits, U32, 1156, [4:4] -tooShort = bits, U32, 1156, [5:5] -fractionalInjFuel = scalar, F32, 1160, "", 1, 0 -accumulatedValue = scalar, F32, 1164, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1168, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1172, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1176, "", 1, 0 -cycleCnt = scalar, S32, 1180, "", 1, 0 -; total TS size = 1184 -hwEventCounters1 = scalar, U32, 1184, "", 1, 0 -hwEventCounters2 = scalar, U32, 1188, "", 1, 0 -hwEventCounters3 = scalar, U32, 1192, "", 1, 0 -hwEventCounters4 = scalar, U32, 1196, "", 1, 0 -hwEventCounters5 = scalar, U32, 1200, "", 1, 0 -hwEventCounters6 = scalar, U32, 1204, "", 1, 0 -vvtCamCounter = scalar, U32, 1208, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1212, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1216, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1220, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1221, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1224, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1228, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1232, "", 1, 0 -mapCamPrevToothAngle = scalar, F32, 1236, "deg", 1, 0 -isDecodingMapCam = bits, U32, 1240, [0:0] -; total TS size = 1244 -crankSynchronizationCounter = scalar, U32, 1244, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1248, "", 1, 0 -vvtToothDurations0 = scalar, U32, 1252, "us", 1, 0 -vvtCurrentPosition = scalar, F32, 1256, "sync: Primary Cam Position", 1, 0 -vvtToothPosition1 = scalar, F32, 1260, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition2 = scalar, F32, 1264, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition3 = scalar, F32, 1268, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition4 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio = scalar, F32, 1276, "", 1, 0 -triggerStateIndex = scalar, U08, 1280, "", 1, 0 -camResyncCounter = scalar, U08, 1281, "", 1, 0 -vvtStateIndex = scalar, U08, 1282, "", 1, 0 -; total TS size = 1284 -m_hasSynchronizedPhase = bits, U32, 1284, [0:0] +startStopStateTempPhysicalCounter = scalar, U32, 1104, "", 1, 0 +egtValue1 = scalar, F32, 1108, "", 1, 0 +egtValue2 = scalar, F32, 1112, "", 1, 0 +desiredRpmLimit = scalar, S16, 1116, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 1120, "", 1, 0 +sparkCounter = scalar, U32, 1124, "", 1, 0 +fuelingLoad = scalar, F32, 1128, "", 1, 0 +ignitionLoad = scalar, F32, 1132, "", 1, 0 +veTableYAxis = scalar, U16, 1136, "%", 0.01, 0 +; total TS size = 1140 +tpsFrom = scalar, F32, 1140 +tpsTo = scalar, F32, 1144 +deltaTps = scalar, F32, 1148 +extraFuel = scalar, F32, 1152, "", 1, 0 +valueFromTable = scalar, F32, 1156, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1160, [0:0] +isBelowDecelThreshold = bits, U32, 1160, [1:1] +isTimeToResetAccumulator = bits, U32, 1160, [2:2] +isFractionalEnrichment = bits, U32, 1160, [3:3] +belowEpsilon = bits, U32, 1160, [4:4] +tooShort = bits, U32, 1160, [5:5] +fractionalInjFuel = scalar, F32, 1164, "", 1, 0 +accumulatedValue = scalar, F32, 1168, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1172, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1176, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1180, "", 1, 0 +cycleCnt = scalar, S32, 1184, "", 1, 0 +; total TS size = 1188 +hwEventCounters1 = scalar, U32, 1188, "", 1, 0 +hwEventCounters2 = scalar, U32, 1192, "", 1, 0 +hwEventCounters3 = scalar, U32, 1196, "", 1, 0 +hwEventCounters4 = scalar, U32, 1200, "", 1, 0 +hwEventCounters5 = scalar, U32, 1204, "", 1, 0 +hwEventCounters6 = scalar, U32, 1208, "", 1, 0 +vvtCamCounter = scalar, U32, 1212, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1216, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1220, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1224, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1225, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1228, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1232, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1236, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1240, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1244, [0:0] +; total TS size = 1248 +crankSynchronizationCounter = scalar, U32, 1248, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1252, "", 1, 0 +vvtToothDurations0 = scalar, U32, 1256, "us", 1, 0 +vvtCurrentPosition = scalar, F32, 1260, "sync: Primary Cam Position", 1, 0 +vvtToothPosition1 = scalar, F32, 1264, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition2 = scalar, F32, 1268, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition3 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition4 = scalar, F32, 1276, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio = scalar, F32, 1280, "", 1, 0 +triggerStateIndex = scalar, U08, 1284, "", 1, 0 +camResyncCounter = scalar, U08, 1285, "", 1, 0 +vvtStateIndex = scalar, U08, 1286, "", 1, 0 ; total TS size = 1288 -wallFuelCorrection = scalar, F32, 1288, "", 1, 0 -wallFuel = scalar, F32, 1292, "", 1, 0 -; total TS size = 1296 -idleState = bits, S32, 1296, [0:2], "not important" -currentIdlePosition = scalar, F32, 1300 -baseIdlePosition = scalar, F32, 1304 -idleClosedLoop = scalar, F32, 1308 -iacByTpsTaper = scalar, F32, 1312 -throttlePedalUpState = scalar, S32, 1316, "", 1, 0 -mightResetPid = bits, U32, 1320, [0:0] -shouldResetPid = bits, U32, 1320, [1:1] -wasResetPid = bits, U32, 1320, [2:2] -mustResetPid = bits, U32, 1320, [3:3] -isCranking = bits, U32, 1320, [4:4] -isIacTableForCoasting = bits, U32, 1320, [5:5] -notIdling = bits, U32, 1320, [6:6] -needReset = bits, U32, 1320, [7:7] -isInDeadZone = bits, U32, 1320, [8:8] -isBlipping = bits, U32, 1320, [9:9] -useClosedLoop = bits, U32, 1320, [10:10] -badTps = bits, U32, 1320, [11:11] -looksLikeRunning = bits, U32, 1320, [12:12] -looksLikeCoasting = bits, U32, 1320, [13:13] -looksLikeCrankToIdle = bits, U32, 1320, [14:14] -isIdleCoasting = bits, U32, 1320, [15:15] -isIdleClosedLoop = bits, U32, 1320, [16:16] -idleTarget = scalar, S32, 1324, "", 1, 0 -targetRpmByClt = scalar, S32, 1328, "", 1, 0 -targetRpmAc = scalar, S32, 1332, "", 1, 0 -iacByRpmTaper = scalar, F32, 1336 -luaAdd = scalar, F32, 1340 -; total TS size = 1344 -idlePosition = scalar, F32, 1344, "per", 1,0 -trim = scalar, F32, 1348, "", 1, 0 -luaAdjustment = scalar, F32, 1352, "per", 1,0 -m_wastegatePosition = scalar, F32, 1356, "per", 1,0 -etbFeedForward = scalar, F32, 1360 -etbIntegralError = scalar, F32, 1364, "", 1, 0 -etbCurrentTarget = scalar, F32, 1368, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1372, "%", 1, 0 -etbRevLimitActive = bits, U32, 1376, [0:0] -jamDetected = bits, U32, 1376, [1:1] -etbDutyRateOfChange = scalar, F32, 1380, "per", 1,0 -etbDutyAverage = scalar, F32, 1384, "per", 1,0 -etbTpsErrorCounter = scalar, U16, 1388, "count", 1,0 -etbPpsErrorCounter = scalar, U16, 1390, "count", 1,0 -etbErrorCode = scalar, S08, 1392, "", 1, 0 -jamTimer = scalar, U16, 1394, "sec", 0.01, 0 -; total TS size = 1396 -faultCode = scalar, U08, 1396, "", 1, 0 -heaterDuty = scalar, U08, 1397, "%", 1, 0 -pumpDuty = scalar, U08, 1398, "%", 1, 0 -tempC = scalar, U16, 1400, "C", 1, 0 -nernstVoltage = scalar, U16, 1402, "V", 0.001, 0 -esr = scalar, U16, 1404, "ohm", 1, 0 -; total TS size = 1408 -dcOutput0 = scalar, F32, 1408, "per", 1,0 -isEnabled0_int = scalar, U08, 1412, "per", 1,0 -isEnabled0 = bits, U32, 1416, [0:0] -; total TS size = 1420 -value0 = scalar, U16, 1420, "value", 1,0 -value1 = scalar, U16, 1422, "value", 1,0 -errorRate = scalar, F32, 1424, "ratio", 1,0 -; total TS size = 1428 -vvtTarget = scalar, U16, 1428, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1430, "%", 0.5, 0 +m_hasSynchronizedPhase = bits, U32, 1288, [0:0] +; total TS size = 1292 +wallFuelCorrection = scalar, F32, 1292, "", 1, 0 +wallFuel = scalar, F32, 1296, "", 1, 0 +; total TS size = 1300 +idleState = bits, S32, 1300, [0:2], "not important" +currentIdlePosition = scalar, F32, 1304 +baseIdlePosition = scalar, F32, 1308 +idleClosedLoop = scalar, F32, 1312 +iacByTpsTaper = scalar, F32, 1316 +throttlePedalUpState = scalar, S32, 1320, "", 1, 0 +mightResetPid = bits, U32, 1324, [0:0] +shouldResetPid = bits, U32, 1324, [1:1] +wasResetPid = bits, U32, 1324, [2:2] +mustResetPid = bits, U32, 1324, [3:3] +isCranking = bits, U32, 1324, [4:4] +isIacTableForCoasting = bits, U32, 1324, [5:5] +notIdling = bits, U32, 1324, [6:6] +needReset = bits, U32, 1324, [7:7] +isInDeadZone = bits, U32, 1324, [8:8] +isBlipping = bits, U32, 1324, [9:9] +useClosedLoop = bits, U32, 1324, [10:10] +badTps = bits, U32, 1324, [11:11] +looksLikeRunning = bits, U32, 1324, [12:12] +looksLikeCoasting = bits, U32, 1324, [13:13] +looksLikeCrankToIdle = bits, U32, 1324, [14:14] +isIdleCoasting = bits, U32, 1324, [15:15] +isIdleClosedLoop = bits, U32, 1324, [16:16] +idleTarget = scalar, S32, 1328, "", 1, 0 +targetRpmByClt = scalar, S32, 1332, "", 1, 0 +targetRpmAc = scalar, S32, 1336, "", 1, 0 +iacByRpmTaper = scalar, F32, 1340 +luaAdd = scalar, F32, 1344 +; total TS size = 1348 +idlePosition = scalar, F32, 1348, "per", 1,0 +trim = scalar, F32, 1352, "", 1, 0 +luaAdjustment = scalar, F32, 1356, "per", 1,0 +m_wastegatePosition = scalar, F32, 1360, "per", 1,0 +etbFeedForward = scalar, F32, 1364 +etbIntegralError = scalar, F32, 1368, "", 1, 0 +etbCurrentTarget = scalar, F32, 1372, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1376, "%", 1, 0 +etbRevLimitActive = bits, U32, 1380, [0:0] +jamDetected = bits, U32, 1380, [1:1] +etbDutyRateOfChange = scalar, F32, 1384, "per", 1,0 +etbDutyAverage = scalar, F32, 1388, "per", 1,0 +etbTpsErrorCounter = scalar, U16, 1392, "count", 1,0 +etbPpsErrorCounter = scalar, U16, 1394, "count", 1,0 +etbErrorCode = scalar, S08, 1396, "", 1, 0 +jamTimer = scalar, U16, 1398, "sec", 0.01, 0 +; total TS size = 1400 +faultCode = scalar, U08, 1400, "", 1, 0 +heaterDuty = scalar, U08, 1401, "%", 1, 0 +pumpDuty = scalar, U08, 1402, "%", 1, 0 +tempC = scalar, U16, 1404, "C", 1, 0 +nernstVoltage = scalar, U16, 1406, "V", 0.001, 0 +esr = scalar, U16, 1408, "ohm", 1, 0 +; total TS size = 1412 +dcOutput0 = scalar, F32, 1412, "per", 1,0 +isEnabled0_int = scalar, U08, 1416, "per", 1,0 +isEnabled0 = bits, U32, 1420, [0:0] +; total TS size = 1424 +value0 = scalar, U16, 1424, "value", 1,0 +value1 = scalar, U16, 1426, "value", 1,0 +errorRate = scalar, F32, 1428, "ratio", 1,0 ; total TS size = 1432 -lambdaCurrentlyGood = bits, U32, 1432, [0:0] -lambdaMonitorCut = bits, U32, 1432, [1:1] -lambdaTimeSinceGood = scalar, U16, 1436, "sec", 0.01, 0 -; total TS size = 1440 +vvtTarget = scalar, U16, 1432, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1434, "%", 0.5, 0 +; total TS size = 1436 +lambdaCurrentlyGood = bits, U32, 1436, [0:0] +lambdaMonitorCut = bits, U32, 1436, [1:1] +lambdaTimeSinceGood = scalar, U16, 1440, "sec", 0.01, 0 +; total TS size = 1444 time = { timeNow } @@ -5196,6 +5197,7 @@ entry = brakePedalState, "Brake switch", int, "%d" entry = startStopState, "startStopState", int, "%d" entry = startStopPhysicalState, "startStopPhysicalState", int, "%d" entry = startStopStateToggleCounter, "startStopStateToggleCounter", int, "%d" +entry = startStopStateTempPhysicalCounter, "startStopStateTempPhysicalCounter", int, "%d" entry = egtValue1, "egtValue1", float, "%.3f" entry = egtValue2, "egtValue2", float, "%.3f" entry = desiredRpmLimit, "User-defined RPM hard limit", int, "%d" @@ -6077,13 +6079,14 @@ dialog = engine_stateDialog, "engine_state" graphLine = brakePedalState graphLine = startStopState graphLine = startStopStateToggleCounter - graphLine = egtValue1 + graphLine = startStopStateTempPhysicalCounter liveGraph = engine_state_5_Graph, "Graph", South + graphLine = egtValue1 graphLine = egtValue2 graphLine = desiredRpmLimit graphLine = fuelInjectionCounter - graphLine = sparkCounter liveGraph = engine_state_6_Graph, "Graph", South + graphLine = sparkCounter graphLine = fuelingLoad graphLine = ignitionLoad graphLine = veTableYAxis @@ -6419,8 +6422,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" ; cam if ; two-stroke, or ; not crank trigger and ((vague trigger and cam choice) or not vague trigger) - field = "Cam Sensor (Primary channel)", triggerInputPins1, 1, {twoStroke == 1 || ( !(trigger_type == 2 || trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 21 || trigger_type == 26 || trigger_type == 27 || trigger_type == 33 || trigger_type == 38 || trigger_type == 39 || trigger_type == 44 || trigger_type == 45 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 58 || trigger_type == 61 || trigger_type == 62 || trigger_type == 68 || trigger_type == 70 || trigger_type == 71 || trigger_type == 72 || trigger_type == 74 || trigger_type == 75 || trigger_type == 76 || trigger_type == 77 || trigger_type == 79) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) ) ) } - field = "Crank Sensor (Primary channel)", triggerInputPins1, 1, { !(twoStroke == 1 || ( !(trigger_type == 2 || trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 21 || trigger_type == 26 || trigger_type == 27 || trigger_type == 33 || trigger_type == 38 || trigger_type == 39 || trigger_type == 44 || trigger_type == 45 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 58 || trigger_type == 61 || trigger_type == 62 || trigger_type == 68 || trigger_type == 70 || trigger_type == 71 || trigger_type == 72 || trigger_type == 74 || trigger_type == 75 || trigger_type == 76 || trigger_type == 77 || trigger_type == 79) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) ) )) } + field = "Cam Sensor (Primary channel)", triggerInputPins1, 1, {twoStroke == 1 || ( !(trigger_type == 2 || trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 21 || trigger_type == 26 || trigger_type == 27 || trigger_type == 33 || trigger_type == 38 || trigger_type == 39 || trigger_type == 44 || trigger_type == 45 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 58 || trigger_type == 61 || trigger_type == 62 || trigger_type == 68 || trigger_type == 70 || trigger_type == 71 || trigger_type == 72 || trigger_type == 74 || trigger_type == 75 || trigger_type == 76 || trigger_type == 77) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) ) ) } + field = "Crank Sensor (Primary channel)", triggerInputPins1, 1, { !(twoStroke == 1 || ( !(trigger_type == 2 || trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 21 || trigger_type == 26 || trigger_type == 27 || trigger_type == 33 || trigger_type == 38 || trigger_type == 39 || trigger_type == 44 || trigger_type == 45 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 58 || trigger_type == 61 || trigger_type == 62 || trigger_type == 68 || trigger_type == 70 || trigger_type == 71 || trigger_type == 72 || trigger_type == 74 || trigger_type == 75 || trigger_type == 76 || trigger_type == 77) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) ) )) } field = "Invert Primary", invertPrimaryTriggerSignal field = "Secondary channel", triggerInputPins2, { triggerInputPins2 != 0 || (triggerInputPins1 != 0 && (trigger_type == 1 || trigger_type == 3 || trigger_type == 15 || trigger_type == 16 || trigger_type == 19 || trigger_type == 25 || trigger_type == 28 || trigger_type == 31 || trigger_type == 35 || trigger_type == 36 || trigger_type == 37 || trigger_type == 40 || trigger_type == 49 || trigger_type == 50 || trigger_type == 53 || trigger_type == 54 || trigger_type == 63 || trigger_type == 64) ) } field = "Invert Secondary", invertSecondaryTriggerSignal, {triggerInputPins2 != 0 && (trigger_type == 1 || trigger_type == 3 || trigger_type == 15 || trigger_type == 16 || trigger_type == 19 || trigger_type == 25 || trigger_type == 28 || trigger_type == 31 || trigger_type == 35 || trigger_type == 36 || trigger_type == 37 || trigger_type == 40 || trigger_type == 49 || trigger_type == 50 || trigger_type == 53 || trigger_type == 54 || trigger_type == 63 || trigger_type == 64) } diff --git a/firmware/tunerstudio/generated/rusefi_m74_9.ini b/firmware/tunerstudio/generated/rusefi_m74_9.ini index 6cc190069d..d54d7b7b40 100644 --- a/firmware/tunerstudio/generated/rusefi_m74_9.ini +++ b/firmware/tunerstudio/generated/rusefi_m74_9.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.11.08.m74_9.1722355185" + signature = "rusEFI master.2023.11.09.m74_9.1979033767" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.11.08.m74_9.1722355185" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.11.09.m74_9.1979033767" ; 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 @@ -92,7 +92,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.jar based on (unknown script) integration/rusefi_config.txt Wed Nov 08 20:03:03 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Thu Nov 09 02:07:41 UTC 2023 pageSize = 23880 page = 1 @@ -2347,7 +2347,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23870, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1440 + ochBlockSize = 1444 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3001,136 +3001,137 @@ brakePedalState = scalar, S08, 1092, "", 1, 0 startStopState = scalar, S08, 1093, "", 1, 0 startStopPhysicalState = bits, U32, 1096, [0:0] startStopStateToggleCounter = scalar, U32, 1100, "", 1, 0 -egtValue1 = scalar, F32, 1104, "", 1, 0 -egtValue2 = scalar, F32, 1108, "", 1, 0 -desiredRpmLimit = scalar, S16, 1112, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1116, "", 1, 0 -sparkCounter = scalar, U32, 1120, "", 1, 0 -fuelingLoad = scalar, F32, 1124, "", 1, 0 -ignitionLoad = scalar, F32, 1128, "", 1, 0 -veTableYAxis = scalar, U16, 1132, "%", 0.01, 0 -; total TS size = 1136 -tpsFrom = scalar, F32, 1136 -tpsTo = scalar, F32, 1140 -deltaTps = scalar, F32, 1144 -extraFuel = scalar, F32, 1148, "", 1, 0 -valueFromTable = scalar, F32, 1152, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1156, [0:0] -isBelowDecelThreshold = bits, U32, 1156, [1:1] -isTimeToResetAccumulator = bits, U32, 1156, [2:2] -isFractionalEnrichment = bits, U32, 1156, [3:3] -belowEpsilon = bits, U32, 1156, [4:4] -tooShort = bits, U32, 1156, [5:5] -fractionalInjFuel = scalar, F32, 1160, "", 1, 0 -accumulatedValue = scalar, F32, 1164, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1168, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1172, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1176, "", 1, 0 -cycleCnt = scalar, S32, 1180, "", 1, 0 -; total TS size = 1184 -hwEventCounters1 = scalar, U32, 1184, "", 1, 0 -hwEventCounters2 = scalar, U32, 1188, "", 1, 0 -hwEventCounters3 = scalar, U32, 1192, "", 1, 0 -hwEventCounters4 = scalar, U32, 1196, "", 1, 0 -hwEventCounters5 = scalar, U32, 1200, "", 1, 0 -hwEventCounters6 = scalar, U32, 1204, "", 1, 0 -vvtCamCounter = scalar, U32, 1208, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1212, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1216, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1220, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1221, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1224, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1228, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1232, "", 1, 0 -mapCamPrevToothAngle = scalar, F32, 1236, "deg", 1, 0 -isDecodingMapCam = bits, U32, 1240, [0:0] -; total TS size = 1244 -crankSynchronizationCounter = scalar, U32, 1244, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1248, "", 1, 0 -vvtToothDurations0 = scalar, U32, 1252, "us", 1, 0 -vvtCurrentPosition = scalar, F32, 1256, "sync: Primary Cam Position", 1, 0 -vvtToothPosition1 = scalar, F32, 1260, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition2 = scalar, F32, 1264, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition3 = scalar, F32, 1268, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition4 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio = scalar, F32, 1276, "", 1, 0 -triggerStateIndex = scalar, U08, 1280, "", 1, 0 -camResyncCounter = scalar, U08, 1281, "", 1, 0 -vvtStateIndex = scalar, U08, 1282, "", 1, 0 -; total TS size = 1284 -m_hasSynchronizedPhase = bits, U32, 1284, [0:0] +startStopStateTempPhysicalCounter = scalar, U32, 1104, "", 1, 0 +egtValue1 = scalar, F32, 1108, "", 1, 0 +egtValue2 = scalar, F32, 1112, "", 1, 0 +desiredRpmLimit = scalar, S16, 1116, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 1120, "", 1, 0 +sparkCounter = scalar, U32, 1124, "", 1, 0 +fuelingLoad = scalar, F32, 1128, "", 1, 0 +ignitionLoad = scalar, F32, 1132, "", 1, 0 +veTableYAxis = scalar, U16, 1136, "%", 0.01, 0 +; total TS size = 1140 +tpsFrom = scalar, F32, 1140 +tpsTo = scalar, F32, 1144 +deltaTps = scalar, F32, 1148 +extraFuel = scalar, F32, 1152, "", 1, 0 +valueFromTable = scalar, F32, 1156, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1160, [0:0] +isBelowDecelThreshold = bits, U32, 1160, [1:1] +isTimeToResetAccumulator = bits, U32, 1160, [2:2] +isFractionalEnrichment = bits, U32, 1160, [3:3] +belowEpsilon = bits, U32, 1160, [4:4] +tooShort = bits, U32, 1160, [5:5] +fractionalInjFuel = scalar, F32, 1164, "", 1, 0 +accumulatedValue = scalar, F32, 1168, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1172, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1176, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1180, "", 1, 0 +cycleCnt = scalar, S32, 1184, "", 1, 0 +; total TS size = 1188 +hwEventCounters1 = scalar, U32, 1188, "", 1, 0 +hwEventCounters2 = scalar, U32, 1192, "", 1, 0 +hwEventCounters3 = scalar, U32, 1196, "", 1, 0 +hwEventCounters4 = scalar, U32, 1200, "", 1, 0 +hwEventCounters5 = scalar, U32, 1204, "", 1, 0 +hwEventCounters6 = scalar, U32, 1208, "", 1, 0 +vvtCamCounter = scalar, U32, 1212, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1216, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1220, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1224, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1225, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1228, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1232, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1236, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1240, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1244, [0:0] +; total TS size = 1248 +crankSynchronizationCounter = scalar, U32, 1248, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1252, "", 1, 0 +vvtToothDurations0 = scalar, U32, 1256, "us", 1, 0 +vvtCurrentPosition = scalar, F32, 1260, "sync: Primary Cam Position", 1, 0 +vvtToothPosition1 = scalar, F32, 1264, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition2 = scalar, F32, 1268, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition3 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition4 = scalar, F32, 1276, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio = scalar, F32, 1280, "", 1, 0 +triggerStateIndex = scalar, U08, 1284, "", 1, 0 +camResyncCounter = scalar, U08, 1285, "", 1, 0 +vvtStateIndex = scalar, U08, 1286, "", 1, 0 ; total TS size = 1288 -wallFuelCorrection = scalar, F32, 1288, "", 1, 0 -wallFuel = scalar, F32, 1292, "", 1, 0 -; total TS size = 1296 -idleState = bits, S32, 1296, [0:2], "not important" -currentIdlePosition = scalar, F32, 1300 -baseIdlePosition = scalar, F32, 1304 -idleClosedLoop = scalar, F32, 1308 -iacByTpsTaper = scalar, F32, 1312 -throttlePedalUpState = scalar, S32, 1316, "", 1, 0 -mightResetPid = bits, U32, 1320, [0:0] -shouldResetPid = bits, U32, 1320, [1:1] -wasResetPid = bits, U32, 1320, [2:2] -mustResetPid = bits, U32, 1320, [3:3] -isCranking = bits, U32, 1320, [4:4] -isIacTableForCoasting = bits, U32, 1320, [5:5] -notIdling = bits, U32, 1320, [6:6] -needReset = bits, U32, 1320, [7:7] -isInDeadZone = bits, U32, 1320, [8:8] -isBlipping = bits, U32, 1320, [9:9] -useClosedLoop = bits, U32, 1320, [10:10] -badTps = bits, U32, 1320, [11:11] -looksLikeRunning = bits, U32, 1320, [12:12] -looksLikeCoasting = bits, U32, 1320, [13:13] -looksLikeCrankToIdle = bits, U32, 1320, [14:14] -isIdleCoasting = bits, U32, 1320, [15:15] -isIdleClosedLoop = bits, U32, 1320, [16:16] -idleTarget = scalar, S32, 1324, "", 1, 0 -targetRpmByClt = scalar, S32, 1328, "", 1, 0 -targetRpmAc = scalar, S32, 1332, "", 1, 0 -iacByRpmTaper = scalar, F32, 1336 -luaAdd = scalar, F32, 1340 -; total TS size = 1344 -idlePosition = scalar, F32, 1344, "per", 1,0 -trim = scalar, F32, 1348, "", 1, 0 -luaAdjustment = scalar, F32, 1352, "per", 1,0 -m_wastegatePosition = scalar, F32, 1356, "per", 1,0 -etbFeedForward = scalar, F32, 1360 -etbIntegralError = scalar, F32, 1364, "", 1, 0 -etbCurrentTarget = scalar, F32, 1368, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1372, "%", 1, 0 -etbRevLimitActive = bits, U32, 1376, [0:0] -jamDetected = bits, U32, 1376, [1:1] -etbDutyRateOfChange = scalar, F32, 1380, "per", 1,0 -etbDutyAverage = scalar, F32, 1384, "per", 1,0 -etbTpsErrorCounter = scalar, U16, 1388, "count", 1,0 -etbPpsErrorCounter = scalar, U16, 1390, "count", 1,0 -etbErrorCode = scalar, S08, 1392, "", 1, 0 -jamTimer = scalar, U16, 1394, "sec", 0.01, 0 -; total TS size = 1396 -faultCode = scalar, U08, 1396, "", 1, 0 -heaterDuty = scalar, U08, 1397, "%", 1, 0 -pumpDuty = scalar, U08, 1398, "%", 1, 0 -tempC = scalar, U16, 1400, "C", 1, 0 -nernstVoltage = scalar, U16, 1402, "V", 0.001, 0 -esr = scalar, U16, 1404, "ohm", 1, 0 -; total TS size = 1408 -dcOutput0 = scalar, F32, 1408, "per", 1,0 -isEnabled0_int = scalar, U08, 1412, "per", 1,0 -isEnabled0 = bits, U32, 1416, [0:0] -; total TS size = 1420 -value0 = scalar, U16, 1420, "value", 1,0 -value1 = scalar, U16, 1422, "value", 1,0 -errorRate = scalar, F32, 1424, "ratio", 1,0 -; total TS size = 1428 -vvtTarget = scalar, U16, 1428, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1430, "%", 0.5, 0 +m_hasSynchronizedPhase = bits, U32, 1288, [0:0] +; total TS size = 1292 +wallFuelCorrection = scalar, F32, 1292, "", 1, 0 +wallFuel = scalar, F32, 1296, "", 1, 0 +; total TS size = 1300 +idleState = bits, S32, 1300, [0:2], "not important" +currentIdlePosition = scalar, F32, 1304 +baseIdlePosition = scalar, F32, 1308 +idleClosedLoop = scalar, F32, 1312 +iacByTpsTaper = scalar, F32, 1316 +throttlePedalUpState = scalar, S32, 1320, "", 1, 0 +mightResetPid = bits, U32, 1324, [0:0] +shouldResetPid = bits, U32, 1324, [1:1] +wasResetPid = bits, U32, 1324, [2:2] +mustResetPid = bits, U32, 1324, [3:3] +isCranking = bits, U32, 1324, [4:4] +isIacTableForCoasting = bits, U32, 1324, [5:5] +notIdling = bits, U32, 1324, [6:6] +needReset = bits, U32, 1324, [7:7] +isInDeadZone = bits, U32, 1324, [8:8] +isBlipping = bits, U32, 1324, [9:9] +useClosedLoop = bits, U32, 1324, [10:10] +badTps = bits, U32, 1324, [11:11] +looksLikeRunning = bits, U32, 1324, [12:12] +looksLikeCoasting = bits, U32, 1324, [13:13] +looksLikeCrankToIdle = bits, U32, 1324, [14:14] +isIdleCoasting = bits, U32, 1324, [15:15] +isIdleClosedLoop = bits, U32, 1324, [16:16] +idleTarget = scalar, S32, 1328, "", 1, 0 +targetRpmByClt = scalar, S32, 1332, "", 1, 0 +targetRpmAc = scalar, S32, 1336, "", 1, 0 +iacByRpmTaper = scalar, F32, 1340 +luaAdd = scalar, F32, 1344 +; total TS size = 1348 +idlePosition = scalar, F32, 1348, "per", 1,0 +trim = scalar, F32, 1352, "", 1, 0 +luaAdjustment = scalar, F32, 1356, "per", 1,0 +m_wastegatePosition = scalar, F32, 1360, "per", 1,0 +etbFeedForward = scalar, F32, 1364 +etbIntegralError = scalar, F32, 1368, "", 1, 0 +etbCurrentTarget = scalar, F32, 1372, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1376, "%", 1, 0 +etbRevLimitActive = bits, U32, 1380, [0:0] +jamDetected = bits, U32, 1380, [1:1] +etbDutyRateOfChange = scalar, F32, 1384, "per", 1,0 +etbDutyAverage = scalar, F32, 1388, "per", 1,0 +etbTpsErrorCounter = scalar, U16, 1392, "count", 1,0 +etbPpsErrorCounter = scalar, U16, 1394, "count", 1,0 +etbErrorCode = scalar, S08, 1396, "", 1, 0 +jamTimer = scalar, U16, 1398, "sec", 0.01, 0 +; total TS size = 1400 +faultCode = scalar, U08, 1400, "", 1, 0 +heaterDuty = scalar, U08, 1401, "%", 1, 0 +pumpDuty = scalar, U08, 1402, "%", 1, 0 +tempC = scalar, U16, 1404, "C", 1, 0 +nernstVoltage = scalar, U16, 1406, "V", 0.001, 0 +esr = scalar, U16, 1408, "ohm", 1, 0 +; total TS size = 1412 +dcOutput0 = scalar, F32, 1412, "per", 1,0 +isEnabled0_int = scalar, U08, 1416, "per", 1,0 +isEnabled0 = bits, U32, 1420, [0:0] +; total TS size = 1424 +value0 = scalar, U16, 1424, "value", 1,0 +value1 = scalar, U16, 1426, "value", 1,0 +errorRate = scalar, F32, 1428, "ratio", 1,0 ; total TS size = 1432 -lambdaCurrentlyGood = bits, U32, 1432, [0:0] -lambdaMonitorCut = bits, U32, 1432, [1:1] -lambdaTimeSinceGood = scalar, U16, 1436, "sec", 0.01, 0 -; total TS size = 1440 +vvtTarget = scalar, U16, 1432, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1434, "%", 0.5, 0 +; total TS size = 1436 +lambdaCurrentlyGood = bits, U32, 1436, [0:0] +lambdaMonitorCut = bits, U32, 1436, [1:1] +lambdaTimeSinceGood = scalar, U16, 1440, "sec", 0.01, 0 +; total TS size = 1444 time = { timeNow } @@ -5196,6 +5197,7 @@ entry = brakePedalState, "Brake switch", int, "%d" entry = startStopState, "startStopState", int, "%d" entry = startStopPhysicalState, "startStopPhysicalState", int, "%d" entry = startStopStateToggleCounter, "startStopStateToggleCounter", int, "%d" +entry = startStopStateTempPhysicalCounter, "startStopStateTempPhysicalCounter", int, "%d" entry = egtValue1, "egtValue1", float, "%.3f" entry = egtValue2, "egtValue2", float, "%.3f" entry = desiredRpmLimit, "User-defined RPM hard limit", int, "%d" @@ -6078,13 +6080,14 @@ dialog = engine_stateDialog, "engine_state" graphLine = brakePedalState graphLine = startStopState graphLine = startStopStateToggleCounter - graphLine = egtValue1 + graphLine = startStopStateTempPhysicalCounter liveGraph = engine_state_5_Graph, "Graph", South + graphLine = egtValue1 graphLine = egtValue2 graphLine = desiredRpmLimit graphLine = fuelInjectionCounter - graphLine = sparkCounter liveGraph = engine_state_6_Graph, "Graph", South + graphLine = sparkCounter graphLine = fuelingLoad graphLine = ignitionLoad graphLine = veTableYAxis @@ -6420,8 +6423,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" ; cam if ; two-stroke, or ; not crank trigger and ((vague trigger and cam choice) or not vague trigger) - field = "Cam Sensor (Primary channel)", triggerInputPins1, 1, {twoStroke == 1 || ( !(trigger_type == 2 || trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 21 || trigger_type == 26 || trigger_type == 27 || trigger_type == 33 || trigger_type == 38 || trigger_type == 39 || trigger_type == 44 || trigger_type == 45 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 58 || trigger_type == 61 || trigger_type == 62 || trigger_type == 68 || trigger_type == 70 || trigger_type == 71 || trigger_type == 72 || trigger_type == 74 || trigger_type == 75 || trigger_type == 76 || trigger_type == 77 || trigger_type == 79) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) ) ) } - field = "Crank Sensor (Primary channel)", triggerInputPins1, 1, { !(twoStroke == 1 || ( !(trigger_type == 2 || trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 21 || trigger_type == 26 || trigger_type == 27 || trigger_type == 33 || trigger_type == 38 || trigger_type == 39 || trigger_type == 44 || trigger_type == 45 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 58 || trigger_type == 61 || trigger_type == 62 || trigger_type == 68 || trigger_type == 70 || trigger_type == 71 || trigger_type == 72 || trigger_type == 74 || trigger_type == 75 || trigger_type == 76 || trigger_type == 77 || trigger_type == 79) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) ) )) } + field = "Cam Sensor (Primary channel)", triggerInputPins1, 1, {twoStroke == 1 || ( !(trigger_type == 2 || trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 21 || trigger_type == 26 || trigger_type == 27 || trigger_type == 33 || trigger_type == 38 || trigger_type == 39 || trigger_type == 44 || trigger_type == 45 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 58 || trigger_type == 61 || trigger_type == 62 || trigger_type == 68 || trigger_type == 70 || trigger_type == 71 || trigger_type == 72 || trigger_type == 74 || trigger_type == 75 || trigger_type == 76 || trigger_type == 77) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) ) ) } + field = "Crank Sensor (Primary channel)", triggerInputPins1, 1, { !(twoStroke == 1 || ( !(trigger_type == 2 || trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 21 || trigger_type == 26 || trigger_type == 27 || trigger_type == 33 || trigger_type == 38 || trigger_type == 39 || trigger_type == 44 || trigger_type == 45 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 58 || trigger_type == 61 || trigger_type == 62 || trigger_type == 68 || trigger_type == 70 || trigger_type == 71 || trigger_type == 72 || trigger_type == 74 || trigger_type == 75 || trigger_type == 76 || trigger_type == 77) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) ) )) } field = "Invert Primary", invertPrimaryTriggerSignal field = "Secondary channel", triggerInputPins2, { triggerInputPins2 != 0 || (triggerInputPins1 != 0 && (trigger_type == 1 || trigger_type == 3 || trigger_type == 15 || trigger_type == 16 || trigger_type == 19 || trigger_type == 25 || trigger_type == 28 || trigger_type == 31 || trigger_type == 35 || trigger_type == 36 || trigger_type == 37 || trigger_type == 40 || trigger_type == 49 || trigger_type == 50 || trigger_type == 53 || trigger_type == 54 || trigger_type == 63 || trigger_type == 64) ) } field = "Invert Secondary", invertSecondaryTriggerSignal, {triggerInputPins2 != 0 && (trigger_type == 1 || trigger_type == 3 || trigger_type == 15 || trigger_type == 16 || trigger_type == 19 || trigger_type == 25 || trigger_type == 28 || trigger_type == 31 || trigger_type == 35 || trigger_type == 36 || trigger_type == 37 || trigger_type == 40 || trigger_type == 49 || trigger_type == 50 || trigger_type == 53 || trigger_type == 54 || trigger_type == 63 || trigger_type == 64) } diff --git a/firmware/tunerstudio/generated/rusefi_mre_f4.ini b/firmware/tunerstudio/generated/rusefi_mre_f4.ini index 890cd63b36..2df205e3d3 100644 --- a/firmware/tunerstudio/generated/rusefi_mre_f4.ini +++ b/firmware/tunerstudio/generated/rusefi_mre_f4.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.11.08.mre_f4.367372173" + signature = "rusEFI master.2023.11.09.mre_f4.112788187" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.11.08.mre_f4.367372173" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.11.09.mre_f4.112788187" ; 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 @@ -92,7 +92,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.jar based on (unknown script) integration/rusefi_config.txt Wed Nov 08 20:02:56 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Thu Nov 09 02:07:36 UTC 2023 pageSize = 23880 page = 1 @@ -2347,7 +2347,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23870, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1440 + ochBlockSize = 1444 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3001,136 +3001,137 @@ brakePedalState = scalar, S08, 1092, "", 1, 0 startStopState = scalar, S08, 1093, "", 1, 0 startStopPhysicalState = bits, U32, 1096, [0:0] startStopStateToggleCounter = scalar, U32, 1100, "", 1, 0 -egtValue1 = scalar, F32, 1104, "", 1, 0 -egtValue2 = scalar, F32, 1108, "", 1, 0 -desiredRpmLimit = scalar, S16, 1112, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1116, "", 1, 0 -sparkCounter = scalar, U32, 1120, "", 1, 0 -fuelingLoad = scalar, F32, 1124, "", 1, 0 -ignitionLoad = scalar, F32, 1128, "", 1, 0 -veTableYAxis = scalar, U16, 1132, "%", 0.01, 0 -; total TS size = 1136 -tpsFrom = scalar, F32, 1136 -tpsTo = scalar, F32, 1140 -deltaTps = scalar, F32, 1144 -extraFuel = scalar, F32, 1148, "", 1, 0 -valueFromTable = scalar, F32, 1152, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1156, [0:0] -isBelowDecelThreshold = bits, U32, 1156, [1:1] -isTimeToResetAccumulator = bits, U32, 1156, [2:2] -isFractionalEnrichment = bits, U32, 1156, [3:3] -belowEpsilon = bits, U32, 1156, [4:4] -tooShort = bits, U32, 1156, [5:5] -fractionalInjFuel = scalar, F32, 1160, "", 1, 0 -accumulatedValue = scalar, F32, 1164, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1168, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1172, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1176, "", 1, 0 -cycleCnt = scalar, S32, 1180, "", 1, 0 -; total TS size = 1184 -hwEventCounters1 = scalar, U32, 1184, "", 1, 0 -hwEventCounters2 = scalar, U32, 1188, "", 1, 0 -hwEventCounters3 = scalar, U32, 1192, "", 1, 0 -hwEventCounters4 = scalar, U32, 1196, "", 1, 0 -hwEventCounters5 = scalar, U32, 1200, "", 1, 0 -hwEventCounters6 = scalar, U32, 1204, "", 1, 0 -vvtCamCounter = scalar, U32, 1208, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1212, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1216, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1220, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1221, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1224, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1228, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1232, "", 1, 0 -mapCamPrevToothAngle = scalar, F32, 1236, "deg", 1, 0 -isDecodingMapCam = bits, U32, 1240, [0:0] -; total TS size = 1244 -crankSynchronizationCounter = scalar, U32, 1244, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1248, "", 1, 0 -vvtToothDurations0 = scalar, U32, 1252, "us", 1, 0 -vvtCurrentPosition = scalar, F32, 1256, "sync: Primary Cam Position", 1, 0 -vvtToothPosition1 = scalar, F32, 1260, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition2 = scalar, F32, 1264, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition3 = scalar, F32, 1268, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition4 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio = scalar, F32, 1276, "", 1, 0 -triggerStateIndex = scalar, U08, 1280, "", 1, 0 -camResyncCounter = scalar, U08, 1281, "", 1, 0 -vvtStateIndex = scalar, U08, 1282, "", 1, 0 -; total TS size = 1284 -m_hasSynchronizedPhase = bits, U32, 1284, [0:0] +startStopStateTempPhysicalCounter = scalar, U32, 1104, "", 1, 0 +egtValue1 = scalar, F32, 1108, "", 1, 0 +egtValue2 = scalar, F32, 1112, "", 1, 0 +desiredRpmLimit = scalar, S16, 1116, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 1120, "", 1, 0 +sparkCounter = scalar, U32, 1124, "", 1, 0 +fuelingLoad = scalar, F32, 1128, "", 1, 0 +ignitionLoad = scalar, F32, 1132, "", 1, 0 +veTableYAxis = scalar, U16, 1136, "%", 0.01, 0 +; total TS size = 1140 +tpsFrom = scalar, F32, 1140 +tpsTo = scalar, F32, 1144 +deltaTps = scalar, F32, 1148 +extraFuel = scalar, F32, 1152, "", 1, 0 +valueFromTable = scalar, F32, 1156, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1160, [0:0] +isBelowDecelThreshold = bits, U32, 1160, [1:1] +isTimeToResetAccumulator = bits, U32, 1160, [2:2] +isFractionalEnrichment = bits, U32, 1160, [3:3] +belowEpsilon = bits, U32, 1160, [4:4] +tooShort = bits, U32, 1160, [5:5] +fractionalInjFuel = scalar, F32, 1164, "", 1, 0 +accumulatedValue = scalar, F32, 1168, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1172, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1176, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1180, "", 1, 0 +cycleCnt = scalar, S32, 1184, "", 1, 0 +; total TS size = 1188 +hwEventCounters1 = scalar, U32, 1188, "", 1, 0 +hwEventCounters2 = scalar, U32, 1192, "", 1, 0 +hwEventCounters3 = scalar, U32, 1196, "", 1, 0 +hwEventCounters4 = scalar, U32, 1200, "", 1, 0 +hwEventCounters5 = scalar, U32, 1204, "", 1, 0 +hwEventCounters6 = scalar, U32, 1208, "", 1, 0 +vvtCamCounter = scalar, U32, 1212, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1216, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1220, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1224, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1225, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1228, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1232, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1236, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1240, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1244, [0:0] +; total TS size = 1248 +crankSynchronizationCounter = scalar, U32, 1248, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1252, "", 1, 0 +vvtToothDurations0 = scalar, U32, 1256, "us", 1, 0 +vvtCurrentPosition = scalar, F32, 1260, "sync: Primary Cam Position", 1, 0 +vvtToothPosition1 = scalar, F32, 1264, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition2 = scalar, F32, 1268, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition3 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition4 = scalar, F32, 1276, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio = scalar, F32, 1280, "", 1, 0 +triggerStateIndex = scalar, U08, 1284, "", 1, 0 +camResyncCounter = scalar, U08, 1285, "", 1, 0 +vvtStateIndex = scalar, U08, 1286, "", 1, 0 ; total TS size = 1288 -wallFuelCorrection = scalar, F32, 1288, "", 1, 0 -wallFuel = scalar, F32, 1292, "", 1, 0 -; total TS size = 1296 -idleState = bits, S32, 1296, [0:2], "not important" -currentIdlePosition = scalar, F32, 1300 -baseIdlePosition = scalar, F32, 1304 -idleClosedLoop = scalar, F32, 1308 -iacByTpsTaper = scalar, F32, 1312 -throttlePedalUpState = scalar, S32, 1316, "", 1, 0 -mightResetPid = bits, U32, 1320, [0:0] -shouldResetPid = bits, U32, 1320, [1:1] -wasResetPid = bits, U32, 1320, [2:2] -mustResetPid = bits, U32, 1320, [3:3] -isCranking = bits, U32, 1320, [4:4] -isIacTableForCoasting = bits, U32, 1320, [5:5] -notIdling = bits, U32, 1320, [6:6] -needReset = bits, U32, 1320, [7:7] -isInDeadZone = bits, U32, 1320, [8:8] -isBlipping = bits, U32, 1320, [9:9] -useClosedLoop = bits, U32, 1320, [10:10] -badTps = bits, U32, 1320, [11:11] -looksLikeRunning = bits, U32, 1320, [12:12] -looksLikeCoasting = bits, U32, 1320, [13:13] -looksLikeCrankToIdle = bits, U32, 1320, [14:14] -isIdleCoasting = bits, U32, 1320, [15:15] -isIdleClosedLoop = bits, U32, 1320, [16:16] -idleTarget = scalar, S32, 1324, "", 1, 0 -targetRpmByClt = scalar, S32, 1328, "", 1, 0 -targetRpmAc = scalar, S32, 1332, "", 1, 0 -iacByRpmTaper = scalar, F32, 1336 -luaAdd = scalar, F32, 1340 -; total TS size = 1344 -idlePosition = scalar, F32, 1344, "per", 1,0 -trim = scalar, F32, 1348, "", 1, 0 -luaAdjustment = scalar, F32, 1352, "per", 1,0 -m_wastegatePosition = scalar, F32, 1356, "per", 1,0 -etbFeedForward = scalar, F32, 1360 -etbIntegralError = scalar, F32, 1364, "", 1, 0 -etbCurrentTarget = scalar, F32, 1368, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1372, "%", 1, 0 -etbRevLimitActive = bits, U32, 1376, [0:0] -jamDetected = bits, U32, 1376, [1:1] -etbDutyRateOfChange = scalar, F32, 1380, "per", 1,0 -etbDutyAverage = scalar, F32, 1384, "per", 1,0 -etbTpsErrorCounter = scalar, U16, 1388, "count", 1,0 -etbPpsErrorCounter = scalar, U16, 1390, "count", 1,0 -etbErrorCode = scalar, S08, 1392, "", 1, 0 -jamTimer = scalar, U16, 1394, "sec", 0.01, 0 -; total TS size = 1396 -faultCode = scalar, U08, 1396, "", 1, 0 -heaterDuty = scalar, U08, 1397, "%", 1, 0 -pumpDuty = scalar, U08, 1398, "%", 1, 0 -tempC = scalar, U16, 1400, "C", 1, 0 -nernstVoltage = scalar, U16, 1402, "V", 0.001, 0 -esr = scalar, U16, 1404, "ohm", 1, 0 -; total TS size = 1408 -dcOutput0 = scalar, F32, 1408, "per", 1,0 -isEnabled0_int = scalar, U08, 1412, "per", 1,0 -isEnabled0 = bits, U32, 1416, [0:0] -; total TS size = 1420 -value0 = scalar, U16, 1420, "value", 1,0 -value1 = scalar, U16, 1422, "value", 1,0 -errorRate = scalar, F32, 1424, "ratio", 1,0 -; total TS size = 1428 -vvtTarget = scalar, U16, 1428, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1430, "%", 0.5, 0 +m_hasSynchronizedPhase = bits, U32, 1288, [0:0] +; total TS size = 1292 +wallFuelCorrection = scalar, F32, 1292, "", 1, 0 +wallFuel = scalar, F32, 1296, "", 1, 0 +; total TS size = 1300 +idleState = bits, S32, 1300, [0:2], "not important" +currentIdlePosition = scalar, F32, 1304 +baseIdlePosition = scalar, F32, 1308 +idleClosedLoop = scalar, F32, 1312 +iacByTpsTaper = scalar, F32, 1316 +throttlePedalUpState = scalar, S32, 1320, "", 1, 0 +mightResetPid = bits, U32, 1324, [0:0] +shouldResetPid = bits, U32, 1324, [1:1] +wasResetPid = bits, U32, 1324, [2:2] +mustResetPid = bits, U32, 1324, [3:3] +isCranking = bits, U32, 1324, [4:4] +isIacTableForCoasting = bits, U32, 1324, [5:5] +notIdling = bits, U32, 1324, [6:6] +needReset = bits, U32, 1324, [7:7] +isInDeadZone = bits, U32, 1324, [8:8] +isBlipping = bits, U32, 1324, [9:9] +useClosedLoop = bits, U32, 1324, [10:10] +badTps = bits, U32, 1324, [11:11] +looksLikeRunning = bits, U32, 1324, [12:12] +looksLikeCoasting = bits, U32, 1324, [13:13] +looksLikeCrankToIdle = bits, U32, 1324, [14:14] +isIdleCoasting = bits, U32, 1324, [15:15] +isIdleClosedLoop = bits, U32, 1324, [16:16] +idleTarget = scalar, S32, 1328, "", 1, 0 +targetRpmByClt = scalar, S32, 1332, "", 1, 0 +targetRpmAc = scalar, S32, 1336, "", 1, 0 +iacByRpmTaper = scalar, F32, 1340 +luaAdd = scalar, F32, 1344 +; total TS size = 1348 +idlePosition = scalar, F32, 1348, "per", 1,0 +trim = scalar, F32, 1352, "", 1, 0 +luaAdjustment = scalar, F32, 1356, "per", 1,0 +m_wastegatePosition = scalar, F32, 1360, "per", 1,0 +etbFeedForward = scalar, F32, 1364 +etbIntegralError = scalar, F32, 1368, "", 1, 0 +etbCurrentTarget = scalar, F32, 1372, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1376, "%", 1, 0 +etbRevLimitActive = bits, U32, 1380, [0:0] +jamDetected = bits, U32, 1380, [1:1] +etbDutyRateOfChange = scalar, F32, 1384, "per", 1,0 +etbDutyAverage = scalar, F32, 1388, "per", 1,0 +etbTpsErrorCounter = scalar, U16, 1392, "count", 1,0 +etbPpsErrorCounter = scalar, U16, 1394, "count", 1,0 +etbErrorCode = scalar, S08, 1396, "", 1, 0 +jamTimer = scalar, U16, 1398, "sec", 0.01, 0 +; total TS size = 1400 +faultCode = scalar, U08, 1400, "", 1, 0 +heaterDuty = scalar, U08, 1401, "%", 1, 0 +pumpDuty = scalar, U08, 1402, "%", 1, 0 +tempC = scalar, U16, 1404, "C", 1, 0 +nernstVoltage = scalar, U16, 1406, "V", 0.001, 0 +esr = scalar, U16, 1408, "ohm", 1, 0 +; total TS size = 1412 +dcOutput0 = scalar, F32, 1412, "per", 1,0 +isEnabled0_int = scalar, U08, 1416, "per", 1,0 +isEnabled0 = bits, U32, 1420, [0:0] +; total TS size = 1424 +value0 = scalar, U16, 1424, "value", 1,0 +value1 = scalar, U16, 1426, "value", 1,0 +errorRate = scalar, F32, 1428, "ratio", 1,0 ; total TS size = 1432 -lambdaCurrentlyGood = bits, U32, 1432, [0:0] -lambdaMonitorCut = bits, U32, 1432, [1:1] -lambdaTimeSinceGood = scalar, U16, 1436, "sec", 0.01, 0 -; total TS size = 1440 +vvtTarget = scalar, U16, 1432, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1434, "%", 0.5, 0 +; total TS size = 1436 +lambdaCurrentlyGood = bits, U32, 1436, [0:0] +lambdaMonitorCut = bits, U32, 1436, [1:1] +lambdaTimeSinceGood = scalar, U16, 1440, "sec", 0.01, 0 +; total TS size = 1444 time = { timeNow } @@ -5197,6 +5198,7 @@ entry = brakePedalState, "Brake switch", int, "%d" entry = startStopState, "startStopState", int, "%d" entry = startStopPhysicalState, "startStopPhysicalState", int, "%d" entry = startStopStateToggleCounter, "startStopStateToggleCounter", int, "%d" +entry = startStopStateTempPhysicalCounter, "startStopStateTempPhysicalCounter", int, "%d" entry = egtValue1, "egtValue1", float, "%.3f" entry = egtValue2, "egtValue2", float, "%.3f" entry = desiredRpmLimit, "User-defined RPM hard limit", int, "%d" @@ -6080,13 +6082,14 @@ dialog = engine_stateDialog, "engine_state" graphLine = brakePedalState graphLine = startStopState graphLine = startStopStateToggleCounter - graphLine = egtValue1 + graphLine = startStopStateTempPhysicalCounter liveGraph = engine_state_5_Graph, "Graph", South + graphLine = egtValue1 graphLine = egtValue2 graphLine = desiredRpmLimit graphLine = fuelInjectionCounter - graphLine = sparkCounter liveGraph = engine_state_6_Graph, "Graph", South + graphLine = sparkCounter graphLine = fuelingLoad graphLine = ignitionLoad graphLine = veTableYAxis @@ -6422,8 +6425,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" ; cam if ; two-stroke, or ; not crank trigger and ((vague trigger and cam choice) or not vague trigger) - field = "Cam Sensor (Primary channel)", triggerInputPins1, 1, {twoStroke == 1 || ( !(trigger_type == 2 || trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 21 || trigger_type == 26 || trigger_type == 27 || trigger_type == 33 || trigger_type == 38 || trigger_type == 39 || trigger_type == 44 || trigger_type == 45 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 58 || trigger_type == 61 || trigger_type == 62 || trigger_type == 68 || trigger_type == 70 || trigger_type == 71 || trigger_type == 72 || trigger_type == 74 || trigger_type == 75 || trigger_type == 76 || trigger_type == 77 || trigger_type == 79) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) ) ) } - field = "Crank Sensor (Primary channel)", triggerInputPins1, 1, { !(twoStroke == 1 || ( !(trigger_type == 2 || trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 21 || trigger_type == 26 || trigger_type == 27 || trigger_type == 33 || trigger_type == 38 || trigger_type == 39 || trigger_type == 44 || trigger_type == 45 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 58 || trigger_type == 61 || trigger_type == 62 || trigger_type == 68 || trigger_type == 70 || trigger_type == 71 || trigger_type == 72 || trigger_type == 74 || trigger_type == 75 || trigger_type == 76 || trigger_type == 77 || trigger_type == 79) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) ) )) } + field = "Cam Sensor (Primary channel)", triggerInputPins1, 1, {twoStroke == 1 || ( !(trigger_type == 2 || trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 21 || trigger_type == 26 || trigger_type == 27 || trigger_type == 33 || trigger_type == 38 || trigger_type == 39 || trigger_type == 44 || trigger_type == 45 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 58 || trigger_type == 61 || trigger_type == 62 || trigger_type == 68 || trigger_type == 70 || trigger_type == 71 || trigger_type == 72 || trigger_type == 74 || trigger_type == 75 || trigger_type == 76 || trigger_type == 77) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) ) ) } + field = "Crank Sensor (Primary channel)", triggerInputPins1, 1, { !(twoStroke == 1 || ( !(trigger_type == 2 || trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 21 || trigger_type == 26 || trigger_type == 27 || trigger_type == 33 || trigger_type == 38 || trigger_type == 39 || trigger_type == 44 || trigger_type == 45 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 58 || trigger_type == 61 || trigger_type == 62 || trigger_type == 68 || trigger_type == 70 || trigger_type == 71 || trigger_type == 72 || trigger_type == 74 || trigger_type == 75 || trigger_type == 76 || trigger_type == 77) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) ) )) } field = "Invert Primary", invertPrimaryTriggerSignal field = "Secondary channel", triggerInputPins2, { triggerInputPins2 != 0 || (triggerInputPins1 != 0 && (trigger_type == 1 || trigger_type == 3 || trigger_type == 15 || trigger_type == 16 || trigger_type == 19 || trigger_type == 25 || trigger_type == 28 || trigger_type == 31 || trigger_type == 35 || trigger_type == 36 || trigger_type == 37 || trigger_type == 40 || trigger_type == 49 || trigger_type == 50 || trigger_type == 53 || trigger_type == 54 || trigger_type == 63 || trigger_type == 64) ) } field = "Invert Secondary", invertSecondaryTriggerSignal, {triggerInputPins2 != 0 && (trigger_type == 1 || trigger_type == 3 || trigger_type == 15 || trigger_type == 16 || trigger_type == 19 || trigger_type == 25 || trigger_type == 28 || trigger_type == 31 || trigger_type == 35 || trigger_type == 36 || trigger_type == 37 || trigger_type == 40 || trigger_type == 49 || trigger_type == 50 || trigger_type == 53 || trigger_type == 54 || trigger_type == 63 || trigger_type == 64) } diff --git a/firmware/tunerstudio/generated/rusefi_mre_f7.ini b/firmware/tunerstudio/generated/rusefi_mre_f7.ini index f0a6f2e11d..436867b184 100644 --- a/firmware/tunerstudio/generated/rusefi_mre_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_mre_f7.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.11.08.mre_f7.367372173" + signature = "rusEFI master.2023.11.09.mre_f7.112788187" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.11.08.mre_f7.367372173" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.11.09.mre_f7.112788187" ; 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 @@ -92,7 +92,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.jar based on (unknown script) integration/rusefi_config.txt Wed Nov 08 20:02:53 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Thu Nov 09 02:07:34 UTC 2023 pageSize = 23880 page = 1 @@ -2347,7 +2347,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23870, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1440 + ochBlockSize = 1444 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3001,136 +3001,137 @@ brakePedalState = scalar, S08, 1092, "", 1, 0 startStopState = scalar, S08, 1093, "", 1, 0 startStopPhysicalState = bits, U32, 1096, [0:0] startStopStateToggleCounter = scalar, U32, 1100, "", 1, 0 -egtValue1 = scalar, F32, 1104, "", 1, 0 -egtValue2 = scalar, F32, 1108, "", 1, 0 -desiredRpmLimit = scalar, S16, 1112, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1116, "", 1, 0 -sparkCounter = scalar, U32, 1120, "", 1, 0 -fuelingLoad = scalar, F32, 1124, "", 1, 0 -ignitionLoad = scalar, F32, 1128, "", 1, 0 -veTableYAxis = scalar, U16, 1132, "%", 0.01, 0 -; total TS size = 1136 -tpsFrom = scalar, F32, 1136 -tpsTo = scalar, F32, 1140 -deltaTps = scalar, F32, 1144 -extraFuel = scalar, F32, 1148, "", 1, 0 -valueFromTable = scalar, F32, 1152, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1156, [0:0] -isBelowDecelThreshold = bits, U32, 1156, [1:1] -isTimeToResetAccumulator = bits, U32, 1156, [2:2] -isFractionalEnrichment = bits, U32, 1156, [3:3] -belowEpsilon = bits, U32, 1156, [4:4] -tooShort = bits, U32, 1156, [5:5] -fractionalInjFuel = scalar, F32, 1160, "", 1, 0 -accumulatedValue = scalar, F32, 1164, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1168, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1172, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1176, "", 1, 0 -cycleCnt = scalar, S32, 1180, "", 1, 0 -; total TS size = 1184 -hwEventCounters1 = scalar, U32, 1184, "", 1, 0 -hwEventCounters2 = scalar, U32, 1188, "", 1, 0 -hwEventCounters3 = scalar, U32, 1192, "", 1, 0 -hwEventCounters4 = scalar, U32, 1196, "", 1, 0 -hwEventCounters5 = scalar, U32, 1200, "", 1, 0 -hwEventCounters6 = scalar, U32, 1204, "", 1, 0 -vvtCamCounter = scalar, U32, 1208, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1212, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1216, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1220, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1221, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1224, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1228, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1232, "", 1, 0 -mapCamPrevToothAngle = scalar, F32, 1236, "deg", 1, 0 -isDecodingMapCam = bits, U32, 1240, [0:0] -; total TS size = 1244 -crankSynchronizationCounter = scalar, U32, 1244, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1248, "", 1, 0 -vvtToothDurations0 = scalar, U32, 1252, "us", 1, 0 -vvtCurrentPosition = scalar, F32, 1256, "sync: Primary Cam Position", 1, 0 -vvtToothPosition1 = scalar, F32, 1260, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition2 = scalar, F32, 1264, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition3 = scalar, F32, 1268, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition4 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio = scalar, F32, 1276, "", 1, 0 -triggerStateIndex = scalar, U08, 1280, "", 1, 0 -camResyncCounter = scalar, U08, 1281, "", 1, 0 -vvtStateIndex = scalar, U08, 1282, "", 1, 0 -; total TS size = 1284 -m_hasSynchronizedPhase = bits, U32, 1284, [0:0] +startStopStateTempPhysicalCounter = scalar, U32, 1104, "", 1, 0 +egtValue1 = scalar, F32, 1108, "", 1, 0 +egtValue2 = scalar, F32, 1112, "", 1, 0 +desiredRpmLimit = scalar, S16, 1116, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 1120, "", 1, 0 +sparkCounter = scalar, U32, 1124, "", 1, 0 +fuelingLoad = scalar, F32, 1128, "", 1, 0 +ignitionLoad = scalar, F32, 1132, "", 1, 0 +veTableYAxis = scalar, U16, 1136, "%", 0.01, 0 +; total TS size = 1140 +tpsFrom = scalar, F32, 1140 +tpsTo = scalar, F32, 1144 +deltaTps = scalar, F32, 1148 +extraFuel = scalar, F32, 1152, "", 1, 0 +valueFromTable = scalar, F32, 1156, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1160, [0:0] +isBelowDecelThreshold = bits, U32, 1160, [1:1] +isTimeToResetAccumulator = bits, U32, 1160, [2:2] +isFractionalEnrichment = bits, U32, 1160, [3:3] +belowEpsilon = bits, U32, 1160, [4:4] +tooShort = bits, U32, 1160, [5:5] +fractionalInjFuel = scalar, F32, 1164, "", 1, 0 +accumulatedValue = scalar, F32, 1168, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1172, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1176, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1180, "", 1, 0 +cycleCnt = scalar, S32, 1184, "", 1, 0 +; total TS size = 1188 +hwEventCounters1 = scalar, U32, 1188, "", 1, 0 +hwEventCounters2 = scalar, U32, 1192, "", 1, 0 +hwEventCounters3 = scalar, U32, 1196, "", 1, 0 +hwEventCounters4 = scalar, U32, 1200, "", 1, 0 +hwEventCounters5 = scalar, U32, 1204, "", 1, 0 +hwEventCounters6 = scalar, U32, 1208, "", 1, 0 +vvtCamCounter = scalar, U32, 1212, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1216, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1220, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1224, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1225, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1228, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1232, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1236, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1240, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1244, [0:0] +; total TS size = 1248 +crankSynchronizationCounter = scalar, U32, 1248, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1252, "", 1, 0 +vvtToothDurations0 = scalar, U32, 1256, "us", 1, 0 +vvtCurrentPosition = scalar, F32, 1260, "sync: Primary Cam Position", 1, 0 +vvtToothPosition1 = scalar, F32, 1264, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition2 = scalar, F32, 1268, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition3 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition4 = scalar, F32, 1276, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio = scalar, F32, 1280, "", 1, 0 +triggerStateIndex = scalar, U08, 1284, "", 1, 0 +camResyncCounter = scalar, U08, 1285, "", 1, 0 +vvtStateIndex = scalar, U08, 1286, "", 1, 0 ; total TS size = 1288 -wallFuelCorrection = scalar, F32, 1288, "", 1, 0 -wallFuel = scalar, F32, 1292, "", 1, 0 -; total TS size = 1296 -idleState = bits, S32, 1296, [0:2], "not important" -currentIdlePosition = scalar, F32, 1300 -baseIdlePosition = scalar, F32, 1304 -idleClosedLoop = scalar, F32, 1308 -iacByTpsTaper = scalar, F32, 1312 -throttlePedalUpState = scalar, S32, 1316, "", 1, 0 -mightResetPid = bits, U32, 1320, [0:0] -shouldResetPid = bits, U32, 1320, [1:1] -wasResetPid = bits, U32, 1320, [2:2] -mustResetPid = bits, U32, 1320, [3:3] -isCranking = bits, U32, 1320, [4:4] -isIacTableForCoasting = bits, U32, 1320, [5:5] -notIdling = bits, U32, 1320, [6:6] -needReset = bits, U32, 1320, [7:7] -isInDeadZone = bits, U32, 1320, [8:8] -isBlipping = bits, U32, 1320, [9:9] -useClosedLoop = bits, U32, 1320, [10:10] -badTps = bits, U32, 1320, [11:11] -looksLikeRunning = bits, U32, 1320, [12:12] -looksLikeCoasting = bits, U32, 1320, [13:13] -looksLikeCrankToIdle = bits, U32, 1320, [14:14] -isIdleCoasting = bits, U32, 1320, [15:15] -isIdleClosedLoop = bits, U32, 1320, [16:16] -idleTarget = scalar, S32, 1324, "", 1, 0 -targetRpmByClt = scalar, S32, 1328, "", 1, 0 -targetRpmAc = scalar, S32, 1332, "", 1, 0 -iacByRpmTaper = scalar, F32, 1336 -luaAdd = scalar, F32, 1340 -; total TS size = 1344 -idlePosition = scalar, F32, 1344, "per", 1,0 -trim = scalar, F32, 1348, "", 1, 0 -luaAdjustment = scalar, F32, 1352, "per", 1,0 -m_wastegatePosition = scalar, F32, 1356, "per", 1,0 -etbFeedForward = scalar, F32, 1360 -etbIntegralError = scalar, F32, 1364, "", 1, 0 -etbCurrentTarget = scalar, F32, 1368, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1372, "%", 1, 0 -etbRevLimitActive = bits, U32, 1376, [0:0] -jamDetected = bits, U32, 1376, [1:1] -etbDutyRateOfChange = scalar, F32, 1380, "per", 1,0 -etbDutyAverage = scalar, F32, 1384, "per", 1,0 -etbTpsErrorCounter = scalar, U16, 1388, "count", 1,0 -etbPpsErrorCounter = scalar, U16, 1390, "count", 1,0 -etbErrorCode = scalar, S08, 1392, "", 1, 0 -jamTimer = scalar, U16, 1394, "sec", 0.01, 0 -; total TS size = 1396 -faultCode = scalar, U08, 1396, "", 1, 0 -heaterDuty = scalar, U08, 1397, "%", 1, 0 -pumpDuty = scalar, U08, 1398, "%", 1, 0 -tempC = scalar, U16, 1400, "C", 1, 0 -nernstVoltage = scalar, U16, 1402, "V", 0.001, 0 -esr = scalar, U16, 1404, "ohm", 1, 0 -; total TS size = 1408 -dcOutput0 = scalar, F32, 1408, "per", 1,0 -isEnabled0_int = scalar, U08, 1412, "per", 1,0 -isEnabled0 = bits, U32, 1416, [0:0] -; total TS size = 1420 -value0 = scalar, U16, 1420, "value", 1,0 -value1 = scalar, U16, 1422, "value", 1,0 -errorRate = scalar, F32, 1424, "ratio", 1,0 -; total TS size = 1428 -vvtTarget = scalar, U16, 1428, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1430, "%", 0.5, 0 +m_hasSynchronizedPhase = bits, U32, 1288, [0:0] +; total TS size = 1292 +wallFuelCorrection = scalar, F32, 1292, "", 1, 0 +wallFuel = scalar, F32, 1296, "", 1, 0 +; total TS size = 1300 +idleState = bits, S32, 1300, [0:2], "not important" +currentIdlePosition = scalar, F32, 1304 +baseIdlePosition = scalar, F32, 1308 +idleClosedLoop = scalar, F32, 1312 +iacByTpsTaper = scalar, F32, 1316 +throttlePedalUpState = scalar, S32, 1320, "", 1, 0 +mightResetPid = bits, U32, 1324, [0:0] +shouldResetPid = bits, U32, 1324, [1:1] +wasResetPid = bits, U32, 1324, [2:2] +mustResetPid = bits, U32, 1324, [3:3] +isCranking = bits, U32, 1324, [4:4] +isIacTableForCoasting = bits, U32, 1324, [5:5] +notIdling = bits, U32, 1324, [6:6] +needReset = bits, U32, 1324, [7:7] +isInDeadZone = bits, U32, 1324, [8:8] +isBlipping = bits, U32, 1324, [9:9] +useClosedLoop = bits, U32, 1324, [10:10] +badTps = bits, U32, 1324, [11:11] +looksLikeRunning = bits, U32, 1324, [12:12] +looksLikeCoasting = bits, U32, 1324, [13:13] +looksLikeCrankToIdle = bits, U32, 1324, [14:14] +isIdleCoasting = bits, U32, 1324, [15:15] +isIdleClosedLoop = bits, U32, 1324, [16:16] +idleTarget = scalar, S32, 1328, "", 1, 0 +targetRpmByClt = scalar, S32, 1332, "", 1, 0 +targetRpmAc = scalar, S32, 1336, "", 1, 0 +iacByRpmTaper = scalar, F32, 1340 +luaAdd = scalar, F32, 1344 +; total TS size = 1348 +idlePosition = scalar, F32, 1348, "per", 1,0 +trim = scalar, F32, 1352, "", 1, 0 +luaAdjustment = scalar, F32, 1356, "per", 1,0 +m_wastegatePosition = scalar, F32, 1360, "per", 1,0 +etbFeedForward = scalar, F32, 1364 +etbIntegralError = scalar, F32, 1368, "", 1, 0 +etbCurrentTarget = scalar, F32, 1372, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1376, "%", 1, 0 +etbRevLimitActive = bits, U32, 1380, [0:0] +jamDetected = bits, U32, 1380, [1:1] +etbDutyRateOfChange = scalar, F32, 1384, "per", 1,0 +etbDutyAverage = scalar, F32, 1388, "per", 1,0 +etbTpsErrorCounter = scalar, U16, 1392, "count", 1,0 +etbPpsErrorCounter = scalar, U16, 1394, "count", 1,0 +etbErrorCode = scalar, S08, 1396, "", 1, 0 +jamTimer = scalar, U16, 1398, "sec", 0.01, 0 +; total TS size = 1400 +faultCode = scalar, U08, 1400, "", 1, 0 +heaterDuty = scalar, U08, 1401, "%", 1, 0 +pumpDuty = scalar, U08, 1402, "%", 1, 0 +tempC = scalar, U16, 1404, "C", 1, 0 +nernstVoltage = scalar, U16, 1406, "V", 0.001, 0 +esr = scalar, U16, 1408, "ohm", 1, 0 +; total TS size = 1412 +dcOutput0 = scalar, F32, 1412, "per", 1,0 +isEnabled0_int = scalar, U08, 1416, "per", 1,0 +isEnabled0 = bits, U32, 1420, [0:0] +; total TS size = 1424 +value0 = scalar, U16, 1424, "value", 1,0 +value1 = scalar, U16, 1426, "value", 1,0 +errorRate = scalar, F32, 1428, "ratio", 1,0 ; total TS size = 1432 -lambdaCurrentlyGood = bits, U32, 1432, [0:0] -lambdaMonitorCut = bits, U32, 1432, [1:1] -lambdaTimeSinceGood = scalar, U16, 1436, "sec", 0.01, 0 -; total TS size = 1440 +vvtTarget = scalar, U16, 1432, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1434, "%", 0.5, 0 +; total TS size = 1436 +lambdaCurrentlyGood = bits, U32, 1436, [0:0] +lambdaMonitorCut = bits, U32, 1436, [1:1] +lambdaTimeSinceGood = scalar, U16, 1440, "sec", 0.01, 0 +; total TS size = 1444 time = { timeNow } @@ -5197,6 +5198,7 @@ entry = brakePedalState, "Brake switch", int, "%d" entry = startStopState, "startStopState", int, "%d" entry = startStopPhysicalState, "startStopPhysicalState", int, "%d" entry = startStopStateToggleCounter, "startStopStateToggleCounter", int, "%d" +entry = startStopStateTempPhysicalCounter, "startStopStateTempPhysicalCounter", int, "%d" entry = egtValue1, "egtValue1", float, "%.3f" entry = egtValue2, "egtValue2", float, "%.3f" entry = desiredRpmLimit, "User-defined RPM hard limit", int, "%d" @@ -6080,13 +6082,14 @@ dialog = engine_stateDialog, "engine_state" graphLine = brakePedalState graphLine = startStopState graphLine = startStopStateToggleCounter - graphLine = egtValue1 + graphLine = startStopStateTempPhysicalCounter liveGraph = engine_state_5_Graph, "Graph", South + graphLine = egtValue1 graphLine = egtValue2 graphLine = desiredRpmLimit graphLine = fuelInjectionCounter - graphLine = sparkCounter liveGraph = engine_state_6_Graph, "Graph", South + graphLine = sparkCounter graphLine = fuelingLoad graphLine = ignitionLoad graphLine = veTableYAxis @@ -6422,8 +6425,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" ; cam if ; two-stroke, or ; not crank trigger and ((vague trigger and cam choice) or not vague trigger) - field = "Cam Sensor (Primary channel)", triggerInputPins1, 1, {twoStroke == 1 || ( !(trigger_type == 2 || trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 21 || trigger_type == 26 || trigger_type == 27 || trigger_type == 33 || trigger_type == 38 || trigger_type == 39 || trigger_type == 44 || trigger_type == 45 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 58 || trigger_type == 61 || trigger_type == 62 || trigger_type == 68 || trigger_type == 70 || trigger_type == 71 || trigger_type == 72 || trigger_type == 74 || trigger_type == 75 || trigger_type == 76 || trigger_type == 77 || trigger_type == 79) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) ) ) } - field = "Crank Sensor (Primary channel)", triggerInputPins1, 1, { !(twoStroke == 1 || ( !(trigger_type == 2 || trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 21 || trigger_type == 26 || trigger_type == 27 || trigger_type == 33 || trigger_type == 38 || trigger_type == 39 || trigger_type == 44 || trigger_type == 45 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 58 || trigger_type == 61 || trigger_type == 62 || trigger_type == 68 || trigger_type == 70 || trigger_type == 71 || trigger_type == 72 || trigger_type == 74 || trigger_type == 75 || trigger_type == 76 || trigger_type == 77 || trigger_type == 79) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) ) )) } + field = "Cam Sensor (Primary channel)", triggerInputPins1, 1, {twoStroke == 1 || ( !(trigger_type == 2 || trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 21 || trigger_type == 26 || trigger_type == 27 || trigger_type == 33 || trigger_type == 38 || trigger_type == 39 || trigger_type == 44 || trigger_type == 45 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 58 || trigger_type == 61 || trigger_type == 62 || trigger_type == 68 || trigger_type == 70 || trigger_type == 71 || trigger_type == 72 || trigger_type == 74 || trigger_type == 75 || trigger_type == 76 || trigger_type == 77) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) ) ) } + field = "Crank Sensor (Primary channel)", triggerInputPins1, 1, { !(twoStroke == 1 || ( !(trigger_type == 2 || trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 21 || trigger_type == 26 || trigger_type == 27 || trigger_type == 33 || trigger_type == 38 || trigger_type == 39 || trigger_type == 44 || trigger_type == 45 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 58 || trigger_type == 61 || trigger_type == 62 || trigger_type == 68 || trigger_type == 70 || trigger_type == 71 || trigger_type == 72 || trigger_type == 74 || trigger_type == 75 || trigger_type == 76 || trigger_type == 77) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) ) )) } field = "Invert Primary", invertPrimaryTriggerSignal field = "Secondary channel", triggerInputPins2, { triggerInputPins2 != 0 || (triggerInputPins1 != 0 && (trigger_type == 1 || trigger_type == 3 || trigger_type == 15 || trigger_type == 16 || trigger_type == 19 || trigger_type == 25 || trigger_type == 28 || trigger_type == 31 || trigger_type == 35 || trigger_type == 36 || trigger_type == 37 || trigger_type == 40 || trigger_type == 49 || trigger_type == 50 || trigger_type == 53 || trigger_type == 54 || trigger_type == 63 || trigger_type == 64) ) } field = "Invert Secondary", invertSecondaryTriggerSignal, {triggerInputPins2 != 0 && (trigger_type == 1 || trigger_type == 3 || trigger_type == 15 || trigger_type == 16 || trigger_type == 19 || trigger_type == 25 || trigger_type == 28 || trigger_type == 31 || trigger_type == 35 || trigger_type == 36 || trigger_type == 37 || trigger_type == 40 || trigger_type == 49 || trigger_type == 50 || trigger_type == 53 || trigger_type == 54 || trigger_type == 63 || trigger_type == 64) } diff --git a/firmware/tunerstudio/generated/rusefi_nucleo_f429.ini b/firmware/tunerstudio/generated/rusefi_nucleo_f429.ini index e26452541b..1bfa02aab5 100644 --- a/firmware/tunerstudio/generated/rusefi_nucleo_f429.ini +++ b/firmware/tunerstudio/generated/rusefi_nucleo_f429.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.11.08.nucleo_f429.914902541" + signature = "rusEFI master.2023.11.09.nucleo_f429.634710875" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.11.08.nucleo_f429.914902541" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.11.09.nucleo_f429.634710875" ; 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 @@ -92,7 +92,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.jar based on (unknown script) integration/rusefi_config.txt Wed Nov 08 20:03:38 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Thu Nov 09 02:08:06 UTC 2023 pageSize = 23880 page = 1 @@ -2347,7 +2347,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23870, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1440 + ochBlockSize = 1444 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3001,136 +3001,137 @@ brakePedalState = scalar, S08, 1092, "", 1, 0 startStopState = scalar, S08, 1093, "", 1, 0 startStopPhysicalState = bits, U32, 1096, [0:0] startStopStateToggleCounter = scalar, U32, 1100, "", 1, 0 -egtValue1 = scalar, F32, 1104, "", 1, 0 -egtValue2 = scalar, F32, 1108, "", 1, 0 -desiredRpmLimit = scalar, S16, 1112, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1116, "", 1, 0 -sparkCounter = scalar, U32, 1120, "", 1, 0 -fuelingLoad = scalar, F32, 1124, "", 1, 0 -ignitionLoad = scalar, F32, 1128, "", 1, 0 -veTableYAxis = scalar, U16, 1132, "%", 0.01, 0 -; total TS size = 1136 -tpsFrom = scalar, F32, 1136 -tpsTo = scalar, F32, 1140 -deltaTps = scalar, F32, 1144 -extraFuel = scalar, F32, 1148, "", 1, 0 -valueFromTable = scalar, F32, 1152, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1156, [0:0] -isBelowDecelThreshold = bits, U32, 1156, [1:1] -isTimeToResetAccumulator = bits, U32, 1156, [2:2] -isFractionalEnrichment = bits, U32, 1156, [3:3] -belowEpsilon = bits, U32, 1156, [4:4] -tooShort = bits, U32, 1156, [5:5] -fractionalInjFuel = scalar, F32, 1160, "", 1, 0 -accumulatedValue = scalar, F32, 1164, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1168, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1172, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1176, "", 1, 0 -cycleCnt = scalar, S32, 1180, "", 1, 0 -; total TS size = 1184 -hwEventCounters1 = scalar, U32, 1184, "", 1, 0 -hwEventCounters2 = scalar, U32, 1188, "", 1, 0 -hwEventCounters3 = scalar, U32, 1192, "", 1, 0 -hwEventCounters4 = scalar, U32, 1196, "", 1, 0 -hwEventCounters5 = scalar, U32, 1200, "", 1, 0 -hwEventCounters6 = scalar, U32, 1204, "", 1, 0 -vvtCamCounter = scalar, U32, 1208, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1212, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1216, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1220, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1221, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1224, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1228, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1232, "", 1, 0 -mapCamPrevToothAngle = scalar, F32, 1236, "deg", 1, 0 -isDecodingMapCam = bits, U32, 1240, [0:0] -; total TS size = 1244 -crankSynchronizationCounter = scalar, U32, 1244, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1248, "", 1, 0 -vvtToothDurations0 = scalar, U32, 1252, "us", 1, 0 -vvtCurrentPosition = scalar, F32, 1256, "sync: Primary Cam Position", 1, 0 -vvtToothPosition1 = scalar, F32, 1260, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition2 = scalar, F32, 1264, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition3 = scalar, F32, 1268, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition4 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio = scalar, F32, 1276, "", 1, 0 -triggerStateIndex = scalar, U08, 1280, "", 1, 0 -camResyncCounter = scalar, U08, 1281, "", 1, 0 -vvtStateIndex = scalar, U08, 1282, "", 1, 0 -; total TS size = 1284 -m_hasSynchronizedPhase = bits, U32, 1284, [0:0] +startStopStateTempPhysicalCounter = scalar, U32, 1104, "", 1, 0 +egtValue1 = scalar, F32, 1108, "", 1, 0 +egtValue2 = scalar, F32, 1112, "", 1, 0 +desiredRpmLimit = scalar, S16, 1116, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 1120, "", 1, 0 +sparkCounter = scalar, U32, 1124, "", 1, 0 +fuelingLoad = scalar, F32, 1128, "", 1, 0 +ignitionLoad = scalar, F32, 1132, "", 1, 0 +veTableYAxis = scalar, U16, 1136, "%", 0.01, 0 +; total TS size = 1140 +tpsFrom = scalar, F32, 1140 +tpsTo = scalar, F32, 1144 +deltaTps = scalar, F32, 1148 +extraFuel = scalar, F32, 1152, "", 1, 0 +valueFromTable = scalar, F32, 1156, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1160, [0:0] +isBelowDecelThreshold = bits, U32, 1160, [1:1] +isTimeToResetAccumulator = bits, U32, 1160, [2:2] +isFractionalEnrichment = bits, U32, 1160, [3:3] +belowEpsilon = bits, U32, 1160, [4:4] +tooShort = bits, U32, 1160, [5:5] +fractionalInjFuel = scalar, F32, 1164, "", 1, 0 +accumulatedValue = scalar, F32, 1168, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1172, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1176, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1180, "", 1, 0 +cycleCnt = scalar, S32, 1184, "", 1, 0 +; total TS size = 1188 +hwEventCounters1 = scalar, U32, 1188, "", 1, 0 +hwEventCounters2 = scalar, U32, 1192, "", 1, 0 +hwEventCounters3 = scalar, U32, 1196, "", 1, 0 +hwEventCounters4 = scalar, U32, 1200, "", 1, 0 +hwEventCounters5 = scalar, U32, 1204, "", 1, 0 +hwEventCounters6 = scalar, U32, 1208, "", 1, 0 +vvtCamCounter = scalar, U32, 1212, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1216, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1220, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1224, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1225, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1228, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1232, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1236, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1240, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1244, [0:0] +; total TS size = 1248 +crankSynchronizationCounter = scalar, U32, 1248, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1252, "", 1, 0 +vvtToothDurations0 = scalar, U32, 1256, "us", 1, 0 +vvtCurrentPosition = scalar, F32, 1260, "sync: Primary Cam Position", 1, 0 +vvtToothPosition1 = scalar, F32, 1264, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition2 = scalar, F32, 1268, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition3 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition4 = scalar, F32, 1276, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio = scalar, F32, 1280, "", 1, 0 +triggerStateIndex = scalar, U08, 1284, "", 1, 0 +camResyncCounter = scalar, U08, 1285, "", 1, 0 +vvtStateIndex = scalar, U08, 1286, "", 1, 0 ; total TS size = 1288 -wallFuelCorrection = scalar, F32, 1288, "", 1, 0 -wallFuel = scalar, F32, 1292, "", 1, 0 -; total TS size = 1296 -idleState = bits, S32, 1296, [0:2], "not important" -currentIdlePosition = scalar, F32, 1300 -baseIdlePosition = scalar, F32, 1304 -idleClosedLoop = scalar, F32, 1308 -iacByTpsTaper = scalar, F32, 1312 -throttlePedalUpState = scalar, S32, 1316, "", 1, 0 -mightResetPid = bits, U32, 1320, [0:0] -shouldResetPid = bits, U32, 1320, [1:1] -wasResetPid = bits, U32, 1320, [2:2] -mustResetPid = bits, U32, 1320, [3:3] -isCranking = bits, U32, 1320, [4:4] -isIacTableForCoasting = bits, U32, 1320, [5:5] -notIdling = bits, U32, 1320, [6:6] -needReset = bits, U32, 1320, [7:7] -isInDeadZone = bits, U32, 1320, [8:8] -isBlipping = bits, U32, 1320, [9:9] -useClosedLoop = bits, U32, 1320, [10:10] -badTps = bits, U32, 1320, [11:11] -looksLikeRunning = bits, U32, 1320, [12:12] -looksLikeCoasting = bits, U32, 1320, [13:13] -looksLikeCrankToIdle = bits, U32, 1320, [14:14] -isIdleCoasting = bits, U32, 1320, [15:15] -isIdleClosedLoop = bits, U32, 1320, [16:16] -idleTarget = scalar, S32, 1324, "", 1, 0 -targetRpmByClt = scalar, S32, 1328, "", 1, 0 -targetRpmAc = scalar, S32, 1332, "", 1, 0 -iacByRpmTaper = scalar, F32, 1336 -luaAdd = scalar, F32, 1340 -; total TS size = 1344 -idlePosition = scalar, F32, 1344, "per", 1,0 -trim = scalar, F32, 1348, "", 1, 0 -luaAdjustment = scalar, F32, 1352, "per", 1,0 -m_wastegatePosition = scalar, F32, 1356, "per", 1,0 -etbFeedForward = scalar, F32, 1360 -etbIntegralError = scalar, F32, 1364, "", 1, 0 -etbCurrentTarget = scalar, F32, 1368, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1372, "%", 1, 0 -etbRevLimitActive = bits, U32, 1376, [0:0] -jamDetected = bits, U32, 1376, [1:1] -etbDutyRateOfChange = scalar, F32, 1380, "per", 1,0 -etbDutyAverage = scalar, F32, 1384, "per", 1,0 -etbTpsErrorCounter = scalar, U16, 1388, "count", 1,0 -etbPpsErrorCounter = scalar, U16, 1390, "count", 1,0 -etbErrorCode = scalar, S08, 1392, "", 1, 0 -jamTimer = scalar, U16, 1394, "sec", 0.01, 0 -; total TS size = 1396 -faultCode = scalar, U08, 1396, "", 1, 0 -heaterDuty = scalar, U08, 1397, "%", 1, 0 -pumpDuty = scalar, U08, 1398, "%", 1, 0 -tempC = scalar, U16, 1400, "C", 1, 0 -nernstVoltage = scalar, U16, 1402, "V", 0.001, 0 -esr = scalar, U16, 1404, "ohm", 1, 0 -; total TS size = 1408 -dcOutput0 = scalar, F32, 1408, "per", 1,0 -isEnabled0_int = scalar, U08, 1412, "per", 1,0 -isEnabled0 = bits, U32, 1416, [0:0] -; total TS size = 1420 -value0 = scalar, U16, 1420, "value", 1,0 -value1 = scalar, U16, 1422, "value", 1,0 -errorRate = scalar, F32, 1424, "ratio", 1,0 -; total TS size = 1428 -vvtTarget = scalar, U16, 1428, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1430, "%", 0.5, 0 +m_hasSynchronizedPhase = bits, U32, 1288, [0:0] +; total TS size = 1292 +wallFuelCorrection = scalar, F32, 1292, "", 1, 0 +wallFuel = scalar, F32, 1296, "", 1, 0 +; total TS size = 1300 +idleState = bits, S32, 1300, [0:2], "not important" +currentIdlePosition = scalar, F32, 1304 +baseIdlePosition = scalar, F32, 1308 +idleClosedLoop = scalar, F32, 1312 +iacByTpsTaper = scalar, F32, 1316 +throttlePedalUpState = scalar, S32, 1320, "", 1, 0 +mightResetPid = bits, U32, 1324, [0:0] +shouldResetPid = bits, U32, 1324, [1:1] +wasResetPid = bits, U32, 1324, [2:2] +mustResetPid = bits, U32, 1324, [3:3] +isCranking = bits, U32, 1324, [4:4] +isIacTableForCoasting = bits, U32, 1324, [5:5] +notIdling = bits, U32, 1324, [6:6] +needReset = bits, U32, 1324, [7:7] +isInDeadZone = bits, U32, 1324, [8:8] +isBlipping = bits, U32, 1324, [9:9] +useClosedLoop = bits, U32, 1324, [10:10] +badTps = bits, U32, 1324, [11:11] +looksLikeRunning = bits, U32, 1324, [12:12] +looksLikeCoasting = bits, U32, 1324, [13:13] +looksLikeCrankToIdle = bits, U32, 1324, [14:14] +isIdleCoasting = bits, U32, 1324, [15:15] +isIdleClosedLoop = bits, U32, 1324, [16:16] +idleTarget = scalar, S32, 1328, "", 1, 0 +targetRpmByClt = scalar, S32, 1332, "", 1, 0 +targetRpmAc = scalar, S32, 1336, "", 1, 0 +iacByRpmTaper = scalar, F32, 1340 +luaAdd = scalar, F32, 1344 +; total TS size = 1348 +idlePosition = scalar, F32, 1348, "per", 1,0 +trim = scalar, F32, 1352, "", 1, 0 +luaAdjustment = scalar, F32, 1356, "per", 1,0 +m_wastegatePosition = scalar, F32, 1360, "per", 1,0 +etbFeedForward = scalar, F32, 1364 +etbIntegralError = scalar, F32, 1368, "", 1, 0 +etbCurrentTarget = scalar, F32, 1372, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1376, "%", 1, 0 +etbRevLimitActive = bits, U32, 1380, [0:0] +jamDetected = bits, U32, 1380, [1:1] +etbDutyRateOfChange = scalar, F32, 1384, "per", 1,0 +etbDutyAverage = scalar, F32, 1388, "per", 1,0 +etbTpsErrorCounter = scalar, U16, 1392, "count", 1,0 +etbPpsErrorCounter = scalar, U16, 1394, "count", 1,0 +etbErrorCode = scalar, S08, 1396, "", 1, 0 +jamTimer = scalar, U16, 1398, "sec", 0.01, 0 +; total TS size = 1400 +faultCode = scalar, U08, 1400, "", 1, 0 +heaterDuty = scalar, U08, 1401, "%", 1, 0 +pumpDuty = scalar, U08, 1402, "%", 1, 0 +tempC = scalar, U16, 1404, "C", 1, 0 +nernstVoltage = scalar, U16, 1406, "V", 0.001, 0 +esr = scalar, U16, 1408, "ohm", 1, 0 +; total TS size = 1412 +dcOutput0 = scalar, F32, 1412, "per", 1,0 +isEnabled0_int = scalar, U08, 1416, "per", 1,0 +isEnabled0 = bits, U32, 1420, [0:0] +; total TS size = 1424 +value0 = scalar, U16, 1424, "value", 1,0 +value1 = scalar, U16, 1426, "value", 1,0 +errorRate = scalar, F32, 1428, "ratio", 1,0 ; total TS size = 1432 -lambdaCurrentlyGood = bits, U32, 1432, [0:0] -lambdaMonitorCut = bits, U32, 1432, [1:1] -lambdaTimeSinceGood = scalar, U16, 1436, "sec", 0.01, 0 -; total TS size = 1440 +vvtTarget = scalar, U16, 1432, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1434, "%", 0.5, 0 +; total TS size = 1436 +lambdaCurrentlyGood = bits, U32, 1436, [0:0] +lambdaMonitorCut = bits, U32, 1436, [1:1] +lambdaTimeSinceGood = scalar, U16, 1440, "sec", 0.01, 0 +; total TS size = 1444 time = { timeNow } @@ -5196,6 +5197,7 @@ entry = brakePedalState, "Brake switch", int, "%d" entry = startStopState, "startStopState", int, "%d" entry = startStopPhysicalState, "startStopPhysicalState", int, "%d" entry = startStopStateToggleCounter, "startStopStateToggleCounter", int, "%d" +entry = startStopStateTempPhysicalCounter, "startStopStateTempPhysicalCounter", int, "%d" entry = egtValue1, "egtValue1", float, "%.3f" entry = egtValue2, "egtValue2", float, "%.3f" entry = desiredRpmLimit, "User-defined RPM hard limit", int, "%d" @@ -6077,13 +6079,14 @@ dialog = engine_stateDialog, "engine_state" graphLine = brakePedalState graphLine = startStopState graphLine = startStopStateToggleCounter - graphLine = egtValue1 + graphLine = startStopStateTempPhysicalCounter liveGraph = engine_state_5_Graph, "Graph", South + graphLine = egtValue1 graphLine = egtValue2 graphLine = desiredRpmLimit graphLine = fuelInjectionCounter - graphLine = sparkCounter liveGraph = engine_state_6_Graph, "Graph", South + graphLine = sparkCounter graphLine = fuelingLoad graphLine = ignitionLoad graphLine = veTableYAxis @@ -6419,8 +6422,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" ; cam if ; two-stroke, or ; not crank trigger and ((vague trigger and cam choice) or not vague trigger) - field = "Cam Sensor (Primary channel)", triggerInputPins1, 1, {twoStroke == 1 || ( !(trigger_type == 2 || trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 21 || trigger_type == 26 || trigger_type == 27 || trigger_type == 33 || trigger_type == 38 || trigger_type == 39 || trigger_type == 44 || trigger_type == 45 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 58 || trigger_type == 61 || trigger_type == 62 || trigger_type == 68 || trigger_type == 70 || trigger_type == 71 || trigger_type == 72 || trigger_type == 74 || trigger_type == 75 || trigger_type == 76 || trigger_type == 77 || trigger_type == 79) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) ) ) } - field = "Crank Sensor (Primary channel)", triggerInputPins1, 1, { !(twoStroke == 1 || ( !(trigger_type == 2 || trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 21 || trigger_type == 26 || trigger_type == 27 || trigger_type == 33 || trigger_type == 38 || trigger_type == 39 || trigger_type == 44 || trigger_type == 45 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 58 || trigger_type == 61 || trigger_type == 62 || trigger_type == 68 || trigger_type == 70 || trigger_type == 71 || trigger_type == 72 || trigger_type == 74 || trigger_type == 75 || trigger_type == 76 || trigger_type == 77 || trigger_type == 79) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) ) )) } + field = "Cam Sensor (Primary channel)", triggerInputPins1, 1, {twoStroke == 1 || ( !(trigger_type == 2 || trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 21 || trigger_type == 26 || trigger_type == 27 || trigger_type == 33 || trigger_type == 38 || trigger_type == 39 || trigger_type == 44 || trigger_type == 45 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 58 || trigger_type == 61 || trigger_type == 62 || trigger_type == 68 || trigger_type == 70 || trigger_type == 71 || trigger_type == 72 || trigger_type == 74 || trigger_type == 75 || trigger_type == 76 || trigger_type == 77) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) ) ) } + field = "Crank Sensor (Primary channel)", triggerInputPins1, 1, { !(twoStroke == 1 || ( !(trigger_type == 2 || trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 21 || trigger_type == 26 || trigger_type == 27 || trigger_type == 33 || trigger_type == 38 || trigger_type == 39 || trigger_type == 44 || trigger_type == 45 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 58 || trigger_type == 61 || trigger_type == 62 || trigger_type == 68 || trigger_type == 70 || trigger_type == 71 || trigger_type == 72 || trigger_type == 74 || trigger_type == 75 || trigger_type == 76 || trigger_type == 77) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) ) )) } field = "Invert Primary", invertPrimaryTriggerSignal field = "Secondary channel", triggerInputPins2, { triggerInputPins2 != 0 || (triggerInputPins1 != 0 && (trigger_type == 1 || trigger_type == 3 || trigger_type == 15 || trigger_type == 16 || trigger_type == 19 || trigger_type == 25 || trigger_type == 28 || trigger_type == 31 || trigger_type == 35 || trigger_type == 36 || trigger_type == 37 || trigger_type == 40 || trigger_type == 49 || trigger_type == 50 || trigger_type == 53 || trigger_type == 54 || trigger_type == 63 || trigger_type == 64) ) } field = "Invert Secondary", invertSecondaryTriggerSignal, {triggerInputPins2 != 0 && (trigger_type == 1 || trigger_type == 3 || trigger_type == 15 || trigger_type == 16 || trigger_type == 19 || trigger_type == 25 || trigger_type == 28 || trigger_type == 31 || trigger_type == 35 || trigger_type == 36 || trigger_type == 37 || trigger_type == 40 || trigger_type == 49 || trigger_type == 50 || trigger_type == 53 || trigger_type == 54 || trigger_type == 63 || trigger_type == 64) } diff --git a/firmware/tunerstudio/generated/rusefi_nucleo_f767.ini b/firmware/tunerstudio/generated/rusefi_nucleo_f767.ini index 3ce0152d78..0f188e5f48 100644 --- a/firmware/tunerstudio/generated/rusefi_nucleo_f767.ini +++ b/firmware/tunerstudio/generated/rusefi_nucleo_f767.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.11.08.nucleo_f767.914902541" + signature = "rusEFI master.2023.11.09.nucleo_f767.634710875" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.11.08.nucleo_f767.914902541" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.11.09.nucleo_f767.634710875" ; 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 @@ -92,7 +92,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.jar based on (unknown script) integration/rusefi_config.txt Wed Nov 08 20:03:41 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Thu Nov 09 02:08:08 UTC 2023 pageSize = 23880 page = 1 @@ -2347,7 +2347,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23870, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1440 + ochBlockSize = 1444 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3001,136 +3001,137 @@ brakePedalState = scalar, S08, 1092, "", 1, 0 startStopState = scalar, S08, 1093, "", 1, 0 startStopPhysicalState = bits, U32, 1096, [0:0] startStopStateToggleCounter = scalar, U32, 1100, "", 1, 0 -egtValue1 = scalar, F32, 1104, "", 1, 0 -egtValue2 = scalar, F32, 1108, "", 1, 0 -desiredRpmLimit = scalar, S16, 1112, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1116, "", 1, 0 -sparkCounter = scalar, U32, 1120, "", 1, 0 -fuelingLoad = scalar, F32, 1124, "", 1, 0 -ignitionLoad = scalar, F32, 1128, "", 1, 0 -veTableYAxis = scalar, U16, 1132, "%", 0.01, 0 -; total TS size = 1136 -tpsFrom = scalar, F32, 1136 -tpsTo = scalar, F32, 1140 -deltaTps = scalar, F32, 1144 -extraFuel = scalar, F32, 1148, "", 1, 0 -valueFromTable = scalar, F32, 1152, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1156, [0:0] -isBelowDecelThreshold = bits, U32, 1156, [1:1] -isTimeToResetAccumulator = bits, U32, 1156, [2:2] -isFractionalEnrichment = bits, U32, 1156, [3:3] -belowEpsilon = bits, U32, 1156, [4:4] -tooShort = bits, U32, 1156, [5:5] -fractionalInjFuel = scalar, F32, 1160, "", 1, 0 -accumulatedValue = scalar, F32, 1164, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1168, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1172, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1176, "", 1, 0 -cycleCnt = scalar, S32, 1180, "", 1, 0 -; total TS size = 1184 -hwEventCounters1 = scalar, U32, 1184, "", 1, 0 -hwEventCounters2 = scalar, U32, 1188, "", 1, 0 -hwEventCounters3 = scalar, U32, 1192, "", 1, 0 -hwEventCounters4 = scalar, U32, 1196, "", 1, 0 -hwEventCounters5 = scalar, U32, 1200, "", 1, 0 -hwEventCounters6 = scalar, U32, 1204, "", 1, 0 -vvtCamCounter = scalar, U32, 1208, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1212, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1216, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1220, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1221, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1224, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1228, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1232, "", 1, 0 -mapCamPrevToothAngle = scalar, F32, 1236, "deg", 1, 0 -isDecodingMapCam = bits, U32, 1240, [0:0] -; total TS size = 1244 -crankSynchronizationCounter = scalar, U32, 1244, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1248, "", 1, 0 -vvtToothDurations0 = scalar, U32, 1252, "us", 1, 0 -vvtCurrentPosition = scalar, F32, 1256, "sync: Primary Cam Position", 1, 0 -vvtToothPosition1 = scalar, F32, 1260, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition2 = scalar, F32, 1264, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition3 = scalar, F32, 1268, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition4 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio = scalar, F32, 1276, "", 1, 0 -triggerStateIndex = scalar, U08, 1280, "", 1, 0 -camResyncCounter = scalar, U08, 1281, "", 1, 0 -vvtStateIndex = scalar, U08, 1282, "", 1, 0 -; total TS size = 1284 -m_hasSynchronizedPhase = bits, U32, 1284, [0:0] +startStopStateTempPhysicalCounter = scalar, U32, 1104, "", 1, 0 +egtValue1 = scalar, F32, 1108, "", 1, 0 +egtValue2 = scalar, F32, 1112, "", 1, 0 +desiredRpmLimit = scalar, S16, 1116, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 1120, "", 1, 0 +sparkCounter = scalar, U32, 1124, "", 1, 0 +fuelingLoad = scalar, F32, 1128, "", 1, 0 +ignitionLoad = scalar, F32, 1132, "", 1, 0 +veTableYAxis = scalar, U16, 1136, "%", 0.01, 0 +; total TS size = 1140 +tpsFrom = scalar, F32, 1140 +tpsTo = scalar, F32, 1144 +deltaTps = scalar, F32, 1148 +extraFuel = scalar, F32, 1152, "", 1, 0 +valueFromTable = scalar, F32, 1156, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1160, [0:0] +isBelowDecelThreshold = bits, U32, 1160, [1:1] +isTimeToResetAccumulator = bits, U32, 1160, [2:2] +isFractionalEnrichment = bits, U32, 1160, [3:3] +belowEpsilon = bits, U32, 1160, [4:4] +tooShort = bits, U32, 1160, [5:5] +fractionalInjFuel = scalar, F32, 1164, "", 1, 0 +accumulatedValue = scalar, F32, 1168, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1172, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1176, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1180, "", 1, 0 +cycleCnt = scalar, S32, 1184, "", 1, 0 +; total TS size = 1188 +hwEventCounters1 = scalar, U32, 1188, "", 1, 0 +hwEventCounters2 = scalar, U32, 1192, "", 1, 0 +hwEventCounters3 = scalar, U32, 1196, "", 1, 0 +hwEventCounters4 = scalar, U32, 1200, "", 1, 0 +hwEventCounters5 = scalar, U32, 1204, "", 1, 0 +hwEventCounters6 = scalar, U32, 1208, "", 1, 0 +vvtCamCounter = scalar, U32, 1212, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1216, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1220, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1224, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1225, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1228, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1232, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1236, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1240, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1244, [0:0] +; total TS size = 1248 +crankSynchronizationCounter = scalar, U32, 1248, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1252, "", 1, 0 +vvtToothDurations0 = scalar, U32, 1256, "us", 1, 0 +vvtCurrentPosition = scalar, F32, 1260, "sync: Primary Cam Position", 1, 0 +vvtToothPosition1 = scalar, F32, 1264, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition2 = scalar, F32, 1268, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition3 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition4 = scalar, F32, 1276, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio = scalar, F32, 1280, "", 1, 0 +triggerStateIndex = scalar, U08, 1284, "", 1, 0 +camResyncCounter = scalar, U08, 1285, "", 1, 0 +vvtStateIndex = scalar, U08, 1286, "", 1, 0 ; total TS size = 1288 -wallFuelCorrection = scalar, F32, 1288, "", 1, 0 -wallFuel = scalar, F32, 1292, "", 1, 0 -; total TS size = 1296 -idleState = bits, S32, 1296, [0:2], "not important" -currentIdlePosition = scalar, F32, 1300 -baseIdlePosition = scalar, F32, 1304 -idleClosedLoop = scalar, F32, 1308 -iacByTpsTaper = scalar, F32, 1312 -throttlePedalUpState = scalar, S32, 1316, "", 1, 0 -mightResetPid = bits, U32, 1320, [0:0] -shouldResetPid = bits, U32, 1320, [1:1] -wasResetPid = bits, U32, 1320, [2:2] -mustResetPid = bits, U32, 1320, [3:3] -isCranking = bits, U32, 1320, [4:4] -isIacTableForCoasting = bits, U32, 1320, [5:5] -notIdling = bits, U32, 1320, [6:6] -needReset = bits, U32, 1320, [7:7] -isInDeadZone = bits, U32, 1320, [8:8] -isBlipping = bits, U32, 1320, [9:9] -useClosedLoop = bits, U32, 1320, [10:10] -badTps = bits, U32, 1320, [11:11] -looksLikeRunning = bits, U32, 1320, [12:12] -looksLikeCoasting = bits, U32, 1320, [13:13] -looksLikeCrankToIdle = bits, U32, 1320, [14:14] -isIdleCoasting = bits, U32, 1320, [15:15] -isIdleClosedLoop = bits, U32, 1320, [16:16] -idleTarget = scalar, S32, 1324, "", 1, 0 -targetRpmByClt = scalar, S32, 1328, "", 1, 0 -targetRpmAc = scalar, S32, 1332, "", 1, 0 -iacByRpmTaper = scalar, F32, 1336 -luaAdd = scalar, F32, 1340 -; total TS size = 1344 -idlePosition = scalar, F32, 1344, "per", 1,0 -trim = scalar, F32, 1348, "", 1, 0 -luaAdjustment = scalar, F32, 1352, "per", 1,0 -m_wastegatePosition = scalar, F32, 1356, "per", 1,0 -etbFeedForward = scalar, F32, 1360 -etbIntegralError = scalar, F32, 1364, "", 1, 0 -etbCurrentTarget = scalar, F32, 1368, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1372, "%", 1, 0 -etbRevLimitActive = bits, U32, 1376, [0:0] -jamDetected = bits, U32, 1376, [1:1] -etbDutyRateOfChange = scalar, F32, 1380, "per", 1,0 -etbDutyAverage = scalar, F32, 1384, "per", 1,0 -etbTpsErrorCounter = scalar, U16, 1388, "count", 1,0 -etbPpsErrorCounter = scalar, U16, 1390, "count", 1,0 -etbErrorCode = scalar, S08, 1392, "", 1, 0 -jamTimer = scalar, U16, 1394, "sec", 0.01, 0 -; total TS size = 1396 -faultCode = scalar, U08, 1396, "", 1, 0 -heaterDuty = scalar, U08, 1397, "%", 1, 0 -pumpDuty = scalar, U08, 1398, "%", 1, 0 -tempC = scalar, U16, 1400, "C", 1, 0 -nernstVoltage = scalar, U16, 1402, "V", 0.001, 0 -esr = scalar, U16, 1404, "ohm", 1, 0 -; total TS size = 1408 -dcOutput0 = scalar, F32, 1408, "per", 1,0 -isEnabled0_int = scalar, U08, 1412, "per", 1,0 -isEnabled0 = bits, U32, 1416, [0:0] -; total TS size = 1420 -value0 = scalar, U16, 1420, "value", 1,0 -value1 = scalar, U16, 1422, "value", 1,0 -errorRate = scalar, F32, 1424, "ratio", 1,0 -; total TS size = 1428 -vvtTarget = scalar, U16, 1428, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1430, "%", 0.5, 0 +m_hasSynchronizedPhase = bits, U32, 1288, [0:0] +; total TS size = 1292 +wallFuelCorrection = scalar, F32, 1292, "", 1, 0 +wallFuel = scalar, F32, 1296, "", 1, 0 +; total TS size = 1300 +idleState = bits, S32, 1300, [0:2], "not important" +currentIdlePosition = scalar, F32, 1304 +baseIdlePosition = scalar, F32, 1308 +idleClosedLoop = scalar, F32, 1312 +iacByTpsTaper = scalar, F32, 1316 +throttlePedalUpState = scalar, S32, 1320, "", 1, 0 +mightResetPid = bits, U32, 1324, [0:0] +shouldResetPid = bits, U32, 1324, [1:1] +wasResetPid = bits, U32, 1324, [2:2] +mustResetPid = bits, U32, 1324, [3:3] +isCranking = bits, U32, 1324, [4:4] +isIacTableForCoasting = bits, U32, 1324, [5:5] +notIdling = bits, U32, 1324, [6:6] +needReset = bits, U32, 1324, [7:7] +isInDeadZone = bits, U32, 1324, [8:8] +isBlipping = bits, U32, 1324, [9:9] +useClosedLoop = bits, U32, 1324, [10:10] +badTps = bits, U32, 1324, [11:11] +looksLikeRunning = bits, U32, 1324, [12:12] +looksLikeCoasting = bits, U32, 1324, [13:13] +looksLikeCrankToIdle = bits, U32, 1324, [14:14] +isIdleCoasting = bits, U32, 1324, [15:15] +isIdleClosedLoop = bits, U32, 1324, [16:16] +idleTarget = scalar, S32, 1328, "", 1, 0 +targetRpmByClt = scalar, S32, 1332, "", 1, 0 +targetRpmAc = scalar, S32, 1336, "", 1, 0 +iacByRpmTaper = scalar, F32, 1340 +luaAdd = scalar, F32, 1344 +; total TS size = 1348 +idlePosition = scalar, F32, 1348, "per", 1,0 +trim = scalar, F32, 1352, "", 1, 0 +luaAdjustment = scalar, F32, 1356, "per", 1,0 +m_wastegatePosition = scalar, F32, 1360, "per", 1,0 +etbFeedForward = scalar, F32, 1364 +etbIntegralError = scalar, F32, 1368, "", 1, 0 +etbCurrentTarget = scalar, F32, 1372, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1376, "%", 1, 0 +etbRevLimitActive = bits, U32, 1380, [0:0] +jamDetected = bits, U32, 1380, [1:1] +etbDutyRateOfChange = scalar, F32, 1384, "per", 1,0 +etbDutyAverage = scalar, F32, 1388, "per", 1,0 +etbTpsErrorCounter = scalar, U16, 1392, "count", 1,0 +etbPpsErrorCounter = scalar, U16, 1394, "count", 1,0 +etbErrorCode = scalar, S08, 1396, "", 1, 0 +jamTimer = scalar, U16, 1398, "sec", 0.01, 0 +; total TS size = 1400 +faultCode = scalar, U08, 1400, "", 1, 0 +heaterDuty = scalar, U08, 1401, "%", 1, 0 +pumpDuty = scalar, U08, 1402, "%", 1, 0 +tempC = scalar, U16, 1404, "C", 1, 0 +nernstVoltage = scalar, U16, 1406, "V", 0.001, 0 +esr = scalar, U16, 1408, "ohm", 1, 0 +; total TS size = 1412 +dcOutput0 = scalar, F32, 1412, "per", 1,0 +isEnabled0_int = scalar, U08, 1416, "per", 1,0 +isEnabled0 = bits, U32, 1420, [0:0] +; total TS size = 1424 +value0 = scalar, U16, 1424, "value", 1,0 +value1 = scalar, U16, 1426, "value", 1,0 +errorRate = scalar, F32, 1428, "ratio", 1,0 ; total TS size = 1432 -lambdaCurrentlyGood = bits, U32, 1432, [0:0] -lambdaMonitorCut = bits, U32, 1432, [1:1] -lambdaTimeSinceGood = scalar, U16, 1436, "sec", 0.01, 0 -; total TS size = 1440 +vvtTarget = scalar, U16, 1432, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1434, "%", 0.5, 0 +; total TS size = 1436 +lambdaCurrentlyGood = bits, U32, 1436, [0:0] +lambdaMonitorCut = bits, U32, 1436, [1:1] +lambdaTimeSinceGood = scalar, U16, 1440, "sec", 0.01, 0 +; total TS size = 1444 time = { timeNow } @@ -5196,6 +5197,7 @@ entry = brakePedalState, "Brake switch", int, "%d" entry = startStopState, "startStopState", int, "%d" entry = startStopPhysicalState, "startStopPhysicalState", int, "%d" entry = startStopStateToggleCounter, "startStopStateToggleCounter", int, "%d" +entry = startStopStateTempPhysicalCounter, "startStopStateTempPhysicalCounter", int, "%d" entry = egtValue1, "egtValue1", float, "%.3f" entry = egtValue2, "egtValue2", float, "%.3f" entry = desiredRpmLimit, "User-defined RPM hard limit", int, "%d" @@ -6077,13 +6079,14 @@ dialog = engine_stateDialog, "engine_state" graphLine = brakePedalState graphLine = startStopState graphLine = startStopStateToggleCounter - graphLine = egtValue1 + graphLine = startStopStateTempPhysicalCounter liveGraph = engine_state_5_Graph, "Graph", South + graphLine = egtValue1 graphLine = egtValue2 graphLine = desiredRpmLimit graphLine = fuelInjectionCounter - graphLine = sparkCounter liveGraph = engine_state_6_Graph, "Graph", South + graphLine = sparkCounter graphLine = fuelingLoad graphLine = ignitionLoad graphLine = veTableYAxis @@ -6419,8 +6422,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" ; cam if ; two-stroke, or ; not crank trigger and ((vague trigger and cam choice) or not vague trigger) - field = "Cam Sensor (Primary channel)", triggerInputPins1, 1, {twoStroke == 1 || ( !(trigger_type == 2 || trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 21 || trigger_type == 26 || trigger_type == 27 || trigger_type == 33 || trigger_type == 38 || trigger_type == 39 || trigger_type == 44 || trigger_type == 45 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 58 || trigger_type == 61 || trigger_type == 62 || trigger_type == 68 || trigger_type == 70 || trigger_type == 71 || trigger_type == 72 || trigger_type == 74 || trigger_type == 75 || trigger_type == 76 || trigger_type == 77 || trigger_type == 79) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) ) ) } - field = "Crank Sensor (Primary channel)", triggerInputPins1, 1, { !(twoStroke == 1 || ( !(trigger_type == 2 || trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 21 || trigger_type == 26 || trigger_type == 27 || trigger_type == 33 || trigger_type == 38 || trigger_type == 39 || trigger_type == 44 || trigger_type == 45 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 58 || trigger_type == 61 || trigger_type == 62 || trigger_type == 68 || trigger_type == 70 || trigger_type == 71 || trigger_type == 72 || trigger_type == 74 || trigger_type == 75 || trigger_type == 76 || trigger_type == 77 || trigger_type == 79) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) ) )) } + field = "Cam Sensor (Primary channel)", triggerInputPins1, 1, {twoStroke == 1 || ( !(trigger_type == 2 || trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 21 || trigger_type == 26 || trigger_type == 27 || trigger_type == 33 || trigger_type == 38 || trigger_type == 39 || trigger_type == 44 || trigger_type == 45 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 58 || trigger_type == 61 || trigger_type == 62 || trigger_type == 68 || trigger_type == 70 || trigger_type == 71 || trigger_type == 72 || trigger_type == 74 || trigger_type == 75 || trigger_type == 76 || trigger_type == 77) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) ) ) } + field = "Crank Sensor (Primary channel)", triggerInputPins1, 1, { !(twoStroke == 1 || ( !(trigger_type == 2 || trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 21 || trigger_type == 26 || trigger_type == 27 || trigger_type == 33 || trigger_type == 38 || trigger_type == 39 || trigger_type == 44 || trigger_type == 45 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 58 || trigger_type == 61 || trigger_type == 62 || trigger_type == 68 || trigger_type == 70 || trigger_type == 71 || trigger_type == 72 || trigger_type == 74 || trigger_type == 75 || trigger_type == 76 || trigger_type == 77) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) ) )) } field = "Invert Primary", invertPrimaryTriggerSignal field = "Secondary channel", triggerInputPins2, { triggerInputPins2 != 0 || (triggerInputPins1 != 0 && (trigger_type == 1 || trigger_type == 3 || trigger_type == 15 || trigger_type == 16 || trigger_type == 19 || trigger_type == 25 || trigger_type == 28 || trigger_type == 31 || trigger_type == 35 || trigger_type == 36 || trigger_type == 37 || trigger_type == 40 || trigger_type == 49 || trigger_type == 50 || trigger_type == 53 || trigger_type == 54 || trigger_type == 63 || trigger_type == 64) ) } field = "Invert Secondary", invertSecondaryTriggerSignal, {triggerInputPins2 != 0 && (trigger_type == 1 || trigger_type == 3 || trigger_type == 15 || trigger_type == 16 || trigger_type == 19 || trigger_type == 25 || trigger_type == 28 || trigger_type == 31 || trigger_type == 35 || trigger_type == 36 || trigger_type == 37 || trigger_type == 40 || trigger_type == 49 || trigger_type == 50 || trigger_type == 53 || trigger_type == 54 || trigger_type == 63 || trigger_type == 64) } diff --git a/firmware/tunerstudio/generated/rusefi_nucleo_h743.ini b/firmware/tunerstudio/generated/rusefi_nucleo_h743.ini index c879c6edb0..18b97d90d4 100644 --- a/firmware/tunerstudio/generated/rusefi_nucleo_h743.ini +++ b/firmware/tunerstudio/generated/rusefi_nucleo_h743.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.11.08.nucleo_h743.914902541" + signature = "rusEFI master.2023.11.09.nucleo_h743.634710875" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.11.08.nucleo_h743.914902541" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.11.09.nucleo_h743.634710875" ; 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 @@ -92,7 +92,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.jar based on (unknown script) integration/rusefi_config.txt Wed Nov 08 20:03:45 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Thu Nov 09 02:08:10 UTC 2023 pageSize = 23880 page = 1 @@ -2347,7 +2347,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23870, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1440 + ochBlockSize = 1444 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3001,136 +3001,137 @@ brakePedalState = scalar, S08, 1092, "", 1, 0 startStopState = scalar, S08, 1093, "", 1, 0 startStopPhysicalState = bits, U32, 1096, [0:0] startStopStateToggleCounter = scalar, U32, 1100, "", 1, 0 -egtValue1 = scalar, F32, 1104, "", 1, 0 -egtValue2 = scalar, F32, 1108, "", 1, 0 -desiredRpmLimit = scalar, S16, 1112, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1116, "", 1, 0 -sparkCounter = scalar, U32, 1120, "", 1, 0 -fuelingLoad = scalar, F32, 1124, "", 1, 0 -ignitionLoad = scalar, F32, 1128, "", 1, 0 -veTableYAxis = scalar, U16, 1132, "%", 0.01, 0 -; total TS size = 1136 -tpsFrom = scalar, F32, 1136 -tpsTo = scalar, F32, 1140 -deltaTps = scalar, F32, 1144 -extraFuel = scalar, F32, 1148, "", 1, 0 -valueFromTable = scalar, F32, 1152, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1156, [0:0] -isBelowDecelThreshold = bits, U32, 1156, [1:1] -isTimeToResetAccumulator = bits, U32, 1156, [2:2] -isFractionalEnrichment = bits, U32, 1156, [3:3] -belowEpsilon = bits, U32, 1156, [4:4] -tooShort = bits, U32, 1156, [5:5] -fractionalInjFuel = scalar, F32, 1160, "", 1, 0 -accumulatedValue = scalar, F32, 1164, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1168, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1172, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1176, "", 1, 0 -cycleCnt = scalar, S32, 1180, "", 1, 0 -; total TS size = 1184 -hwEventCounters1 = scalar, U32, 1184, "", 1, 0 -hwEventCounters2 = scalar, U32, 1188, "", 1, 0 -hwEventCounters3 = scalar, U32, 1192, "", 1, 0 -hwEventCounters4 = scalar, U32, 1196, "", 1, 0 -hwEventCounters5 = scalar, U32, 1200, "", 1, 0 -hwEventCounters6 = scalar, U32, 1204, "", 1, 0 -vvtCamCounter = scalar, U32, 1208, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1212, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1216, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1220, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1221, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1224, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1228, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1232, "", 1, 0 -mapCamPrevToothAngle = scalar, F32, 1236, "deg", 1, 0 -isDecodingMapCam = bits, U32, 1240, [0:0] -; total TS size = 1244 -crankSynchronizationCounter = scalar, U32, 1244, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1248, "", 1, 0 -vvtToothDurations0 = scalar, U32, 1252, "us", 1, 0 -vvtCurrentPosition = scalar, F32, 1256, "sync: Primary Cam Position", 1, 0 -vvtToothPosition1 = scalar, F32, 1260, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition2 = scalar, F32, 1264, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition3 = scalar, F32, 1268, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition4 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio = scalar, F32, 1276, "", 1, 0 -triggerStateIndex = scalar, U08, 1280, "", 1, 0 -camResyncCounter = scalar, U08, 1281, "", 1, 0 -vvtStateIndex = scalar, U08, 1282, "", 1, 0 -; total TS size = 1284 -m_hasSynchronizedPhase = bits, U32, 1284, [0:0] +startStopStateTempPhysicalCounter = scalar, U32, 1104, "", 1, 0 +egtValue1 = scalar, F32, 1108, "", 1, 0 +egtValue2 = scalar, F32, 1112, "", 1, 0 +desiredRpmLimit = scalar, S16, 1116, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 1120, "", 1, 0 +sparkCounter = scalar, U32, 1124, "", 1, 0 +fuelingLoad = scalar, F32, 1128, "", 1, 0 +ignitionLoad = scalar, F32, 1132, "", 1, 0 +veTableYAxis = scalar, U16, 1136, "%", 0.01, 0 +; total TS size = 1140 +tpsFrom = scalar, F32, 1140 +tpsTo = scalar, F32, 1144 +deltaTps = scalar, F32, 1148 +extraFuel = scalar, F32, 1152, "", 1, 0 +valueFromTable = scalar, F32, 1156, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1160, [0:0] +isBelowDecelThreshold = bits, U32, 1160, [1:1] +isTimeToResetAccumulator = bits, U32, 1160, [2:2] +isFractionalEnrichment = bits, U32, 1160, [3:3] +belowEpsilon = bits, U32, 1160, [4:4] +tooShort = bits, U32, 1160, [5:5] +fractionalInjFuel = scalar, F32, 1164, "", 1, 0 +accumulatedValue = scalar, F32, 1168, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1172, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1176, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1180, "", 1, 0 +cycleCnt = scalar, S32, 1184, "", 1, 0 +; total TS size = 1188 +hwEventCounters1 = scalar, U32, 1188, "", 1, 0 +hwEventCounters2 = scalar, U32, 1192, "", 1, 0 +hwEventCounters3 = scalar, U32, 1196, "", 1, 0 +hwEventCounters4 = scalar, U32, 1200, "", 1, 0 +hwEventCounters5 = scalar, U32, 1204, "", 1, 0 +hwEventCounters6 = scalar, U32, 1208, "", 1, 0 +vvtCamCounter = scalar, U32, 1212, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1216, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1220, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1224, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1225, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1228, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1232, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1236, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1240, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1244, [0:0] +; total TS size = 1248 +crankSynchronizationCounter = scalar, U32, 1248, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1252, "", 1, 0 +vvtToothDurations0 = scalar, U32, 1256, "us", 1, 0 +vvtCurrentPosition = scalar, F32, 1260, "sync: Primary Cam Position", 1, 0 +vvtToothPosition1 = scalar, F32, 1264, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition2 = scalar, F32, 1268, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition3 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition4 = scalar, F32, 1276, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio = scalar, F32, 1280, "", 1, 0 +triggerStateIndex = scalar, U08, 1284, "", 1, 0 +camResyncCounter = scalar, U08, 1285, "", 1, 0 +vvtStateIndex = scalar, U08, 1286, "", 1, 0 ; total TS size = 1288 -wallFuelCorrection = scalar, F32, 1288, "", 1, 0 -wallFuel = scalar, F32, 1292, "", 1, 0 -; total TS size = 1296 -idleState = bits, S32, 1296, [0:2], "not important" -currentIdlePosition = scalar, F32, 1300 -baseIdlePosition = scalar, F32, 1304 -idleClosedLoop = scalar, F32, 1308 -iacByTpsTaper = scalar, F32, 1312 -throttlePedalUpState = scalar, S32, 1316, "", 1, 0 -mightResetPid = bits, U32, 1320, [0:0] -shouldResetPid = bits, U32, 1320, [1:1] -wasResetPid = bits, U32, 1320, [2:2] -mustResetPid = bits, U32, 1320, [3:3] -isCranking = bits, U32, 1320, [4:4] -isIacTableForCoasting = bits, U32, 1320, [5:5] -notIdling = bits, U32, 1320, [6:6] -needReset = bits, U32, 1320, [7:7] -isInDeadZone = bits, U32, 1320, [8:8] -isBlipping = bits, U32, 1320, [9:9] -useClosedLoop = bits, U32, 1320, [10:10] -badTps = bits, U32, 1320, [11:11] -looksLikeRunning = bits, U32, 1320, [12:12] -looksLikeCoasting = bits, U32, 1320, [13:13] -looksLikeCrankToIdle = bits, U32, 1320, [14:14] -isIdleCoasting = bits, U32, 1320, [15:15] -isIdleClosedLoop = bits, U32, 1320, [16:16] -idleTarget = scalar, S32, 1324, "", 1, 0 -targetRpmByClt = scalar, S32, 1328, "", 1, 0 -targetRpmAc = scalar, S32, 1332, "", 1, 0 -iacByRpmTaper = scalar, F32, 1336 -luaAdd = scalar, F32, 1340 -; total TS size = 1344 -idlePosition = scalar, F32, 1344, "per", 1,0 -trim = scalar, F32, 1348, "", 1, 0 -luaAdjustment = scalar, F32, 1352, "per", 1,0 -m_wastegatePosition = scalar, F32, 1356, "per", 1,0 -etbFeedForward = scalar, F32, 1360 -etbIntegralError = scalar, F32, 1364, "", 1, 0 -etbCurrentTarget = scalar, F32, 1368, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1372, "%", 1, 0 -etbRevLimitActive = bits, U32, 1376, [0:0] -jamDetected = bits, U32, 1376, [1:1] -etbDutyRateOfChange = scalar, F32, 1380, "per", 1,0 -etbDutyAverage = scalar, F32, 1384, "per", 1,0 -etbTpsErrorCounter = scalar, U16, 1388, "count", 1,0 -etbPpsErrorCounter = scalar, U16, 1390, "count", 1,0 -etbErrorCode = scalar, S08, 1392, "", 1, 0 -jamTimer = scalar, U16, 1394, "sec", 0.01, 0 -; total TS size = 1396 -faultCode = scalar, U08, 1396, "", 1, 0 -heaterDuty = scalar, U08, 1397, "%", 1, 0 -pumpDuty = scalar, U08, 1398, "%", 1, 0 -tempC = scalar, U16, 1400, "C", 1, 0 -nernstVoltage = scalar, U16, 1402, "V", 0.001, 0 -esr = scalar, U16, 1404, "ohm", 1, 0 -; total TS size = 1408 -dcOutput0 = scalar, F32, 1408, "per", 1,0 -isEnabled0_int = scalar, U08, 1412, "per", 1,0 -isEnabled0 = bits, U32, 1416, [0:0] -; total TS size = 1420 -value0 = scalar, U16, 1420, "value", 1,0 -value1 = scalar, U16, 1422, "value", 1,0 -errorRate = scalar, F32, 1424, "ratio", 1,0 -; total TS size = 1428 -vvtTarget = scalar, U16, 1428, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1430, "%", 0.5, 0 +m_hasSynchronizedPhase = bits, U32, 1288, [0:0] +; total TS size = 1292 +wallFuelCorrection = scalar, F32, 1292, "", 1, 0 +wallFuel = scalar, F32, 1296, "", 1, 0 +; total TS size = 1300 +idleState = bits, S32, 1300, [0:2], "not important" +currentIdlePosition = scalar, F32, 1304 +baseIdlePosition = scalar, F32, 1308 +idleClosedLoop = scalar, F32, 1312 +iacByTpsTaper = scalar, F32, 1316 +throttlePedalUpState = scalar, S32, 1320, "", 1, 0 +mightResetPid = bits, U32, 1324, [0:0] +shouldResetPid = bits, U32, 1324, [1:1] +wasResetPid = bits, U32, 1324, [2:2] +mustResetPid = bits, U32, 1324, [3:3] +isCranking = bits, U32, 1324, [4:4] +isIacTableForCoasting = bits, U32, 1324, [5:5] +notIdling = bits, U32, 1324, [6:6] +needReset = bits, U32, 1324, [7:7] +isInDeadZone = bits, U32, 1324, [8:8] +isBlipping = bits, U32, 1324, [9:9] +useClosedLoop = bits, U32, 1324, [10:10] +badTps = bits, U32, 1324, [11:11] +looksLikeRunning = bits, U32, 1324, [12:12] +looksLikeCoasting = bits, U32, 1324, [13:13] +looksLikeCrankToIdle = bits, U32, 1324, [14:14] +isIdleCoasting = bits, U32, 1324, [15:15] +isIdleClosedLoop = bits, U32, 1324, [16:16] +idleTarget = scalar, S32, 1328, "", 1, 0 +targetRpmByClt = scalar, S32, 1332, "", 1, 0 +targetRpmAc = scalar, S32, 1336, "", 1, 0 +iacByRpmTaper = scalar, F32, 1340 +luaAdd = scalar, F32, 1344 +; total TS size = 1348 +idlePosition = scalar, F32, 1348, "per", 1,0 +trim = scalar, F32, 1352, "", 1, 0 +luaAdjustment = scalar, F32, 1356, "per", 1,0 +m_wastegatePosition = scalar, F32, 1360, "per", 1,0 +etbFeedForward = scalar, F32, 1364 +etbIntegralError = scalar, F32, 1368, "", 1, 0 +etbCurrentTarget = scalar, F32, 1372, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1376, "%", 1, 0 +etbRevLimitActive = bits, U32, 1380, [0:0] +jamDetected = bits, U32, 1380, [1:1] +etbDutyRateOfChange = scalar, F32, 1384, "per", 1,0 +etbDutyAverage = scalar, F32, 1388, "per", 1,0 +etbTpsErrorCounter = scalar, U16, 1392, "count", 1,0 +etbPpsErrorCounter = scalar, U16, 1394, "count", 1,0 +etbErrorCode = scalar, S08, 1396, "", 1, 0 +jamTimer = scalar, U16, 1398, "sec", 0.01, 0 +; total TS size = 1400 +faultCode = scalar, U08, 1400, "", 1, 0 +heaterDuty = scalar, U08, 1401, "%", 1, 0 +pumpDuty = scalar, U08, 1402, "%", 1, 0 +tempC = scalar, U16, 1404, "C", 1, 0 +nernstVoltage = scalar, U16, 1406, "V", 0.001, 0 +esr = scalar, U16, 1408, "ohm", 1, 0 +; total TS size = 1412 +dcOutput0 = scalar, F32, 1412, "per", 1,0 +isEnabled0_int = scalar, U08, 1416, "per", 1,0 +isEnabled0 = bits, U32, 1420, [0:0] +; total TS size = 1424 +value0 = scalar, U16, 1424, "value", 1,0 +value1 = scalar, U16, 1426, "value", 1,0 +errorRate = scalar, F32, 1428, "ratio", 1,0 ; total TS size = 1432 -lambdaCurrentlyGood = bits, U32, 1432, [0:0] -lambdaMonitorCut = bits, U32, 1432, [1:1] -lambdaTimeSinceGood = scalar, U16, 1436, "sec", 0.01, 0 -; total TS size = 1440 +vvtTarget = scalar, U16, 1432, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1434, "%", 0.5, 0 +; total TS size = 1436 +lambdaCurrentlyGood = bits, U32, 1436, [0:0] +lambdaMonitorCut = bits, U32, 1436, [1:1] +lambdaTimeSinceGood = scalar, U16, 1440, "sec", 0.01, 0 +; total TS size = 1444 time = { timeNow } @@ -5196,6 +5197,7 @@ entry = brakePedalState, "Brake switch", int, "%d" entry = startStopState, "startStopState", int, "%d" entry = startStopPhysicalState, "startStopPhysicalState", int, "%d" entry = startStopStateToggleCounter, "startStopStateToggleCounter", int, "%d" +entry = startStopStateTempPhysicalCounter, "startStopStateTempPhysicalCounter", int, "%d" entry = egtValue1, "egtValue1", float, "%.3f" entry = egtValue2, "egtValue2", float, "%.3f" entry = desiredRpmLimit, "User-defined RPM hard limit", int, "%d" @@ -6077,13 +6079,14 @@ dialog = engine_stateDialog, "engine_state" graphLine = brakePedalState graphLine = startStopState graphLine = startStopStateToggleCounter - graphLine = egtValue1 + graphLine = startStopStateTempPhysicalCounter liveGraph = engine_state_5_Graph, "Graph", South + graphLine = egtValue1 graphLine = egtValue2 graphLine = desiredRpmLimit graphLine = fuelInjectionCounter - graphLine = sparkCounter liveGraph = engine_state_6_Graph, "Graph", South + graphLine = sparkCounter graphLine = fuelingLoad graphLine = ignitionLoad graphLine = veTableYAxis @@ -6419,8 +6422,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" ; cam if ; two-stroke, or ; not crank trigger and ((vague trigger and cam choice) or not vague trigger) - field = "Cam Sensor (Primary channel)", triggerInputPins1, 1, {twoStroke == 1 || ( !(trigger_type == 2 || trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 21 || trigger_type == 26 || trigger_type == 27 || trigger_type == 33 || trigger_type == 38 || trigger_type == 39 || trigger_type == 44 || trigger_type == 45 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 58 || trigger_type == 61 || trigger_type == 62 || trigger_type == 68 || trigger_type == 70 || trigger_type == 71 || trigger_type == 72 || trigger_type == 74 || trigger_type == 75 || trigger_type == 76 || trigger_type == 77 || trigger_type == 79) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) ) ) } - field = "Crank Sensor (Primary channel)", triggerInputPins1, 1, { !(twoStroke == 1 || ( !(trigger_type == 2 || trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 21 || trigger_type == 26 || trigger_type == 27 || trigger_type == 33 || trigger_type == 38 || trigger_type == 39 || trigger_type == 44 || trigger_type == 45 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 58 || trigger_type == 61 || trigger_type == 62 || trigger_type == 68 || trigger_type == 70 || trigger_type == 71 || trigger_type == 72 || trigger_type == 74 || trigger_type == 75 || trigger_type == 76 || trigger_type == 77 || trigger_type == 79) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) ) )) } + field = "Cam Sensor (Primary channel)", triggerInputPins1, 1, {twoStroke == 1 || ( !(trigger_type == 2 || trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 21 || trigger_type == 26 || trigger_type == 27 || trigger_type == 33 || trigger_type == 38 || trigger_type == 39 || trigger_type == 44 || trigger_type == 45 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 58 || trigger_type == 61 || trigger_type == 62 || trigger_type == 68 || trigger_type == 70 || trigger_type == 71 || trigger_type == 72 || trigger_type == 74 || trigger_type == 75 || trigger_type == 76 || trigger_type == 77) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) ) ) } + field = "Crank Sensor (Primary channel)", triggerInputPins1, 1, { !(twoStroke == 1 || ( !(trigger_type == 2 || trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 21 || trigger_type == 26 || trigger_type == 27 || trigger_type == 33 || trigger_type == 38 || trigger_type == 39 || trigger_type == 44 || trigger_type == 45 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 58 || trigger_type == 61 || trigger_type == 62 || trigger_type == 68 || trigger_type == 70 || trigger_type == 71 || trigger_type == 72 || trigger_type == 74 || trigger_type == 75 || trigger_type == 76 || trigger_type == 77) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) ) )) } field = "Invert Primary", invertPrimaryTriggerSignal field = "Secondary channel", triggerInputPins2, { triggerInputPins2 != 0 || (triggerInputPins1 != 0 && (trigger_type == 1 || trigger_type == 3 || trigger_type == 15 || trigger_type == 16 || trigger_type == 19 || trigger_type == 25 || trigger_type == 28 || trigger_type == 31 || trigger_type == 35 || trigger_type == 36 || trigger_type == 37 || trigger_type == 40 || trigger_type == 49 || trigger_type == 50 || trigger_type == 53 || trigger_type == 54 || trigger_type == 63 || trigger_type == 64) ) } field = "Invert Secondary", invertSecondaryTriggerSignal, {triggerInputPins2 != 0 && (trigger_type == 1 || trigger_type == 3 || trigger_type == 15 || trigger_type == 16 || trigger_type == 19 || trigger_type == 25 || trigger_type == 28 || trigger_type == 31 || trigger_type == 35 || trigger_type == 36 || trigger_type == 37 || trigger_type == 40 || trigger_type == 49 || trigger_type == 50 || trigger_type == 53 || trigger_type == 54 || trigger_type == 63 || trigger_type == 64) } diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_405.ini b/firmware/tunerstudio/generated/rusefi_prometheus_405.ini index 0bd7dc1c6f..b0ca9b713c 100644 --- a/firmware/tunerstudio/generated/rusefi_prometheus_405.ini +++ b/firmware/tunerstudio/generated/rusefi_prometheus_405.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.11.08.prometheus_405.102531997" + signature = "rusEFI master.2023.11.09.prometheus_405.356525771" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.11.08.prometheus_405.102531997" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.11.09.prometheus_405.356525771" ; 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 @@ -92,7 +92,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.jar based on (unknown script) integration/rusefi_config.txt Wed Nov 08 20:03:20 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Thu Nov 09 02:07:53 UTC 2023 pageSize = 23880 page = 1 @@ -2347,7 +2347,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23870, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1440 + ochBlockSize = 1444 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3001,136 +3001,137 @@ brakePedalState = scalar, S08, 1092, "", 1, 0 startStopState = scalar, S08, 1093, "", 1, 0 startStopPhysicalState = bits, U32, 1096, [0:0] startStopStateToggleCounter = scalar, U32, 1100, "", 1, 0 -egtValue1 = scalar, F32, 1104, "", 1, 0 -egtValue2 = scalar, F32, 1108, "", 1, 0 -desiredRpmLimit = scalar, S16, 1112, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1116, "", 1, 0 -sparkCounter = scalar, U32, 1120, "", 1, 0 -fuelingLoad = scalar, F32, 1124, "", 1, 0 -ignitionLoad = scalar, F32, 1128, "", 1, 0 -veTableYAxis = scalar, U16, 1132, "%", 0.01, 0 -; total TS size = 1136 -tpsFrom = scalar, F32, 1136 -tpsTo = scalar, F32, 1140 -deltaTps = scalar, F32, 1144 -extraFuel = scalar, F32, 1148, "", 1, 0 -valueFromTable = scalar, F32, 1152, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1156, [0:0] -isBelowDecelThreshold = bits, U32, 1156, [1:1] -isTimeToResetAccumulator = bits, U32, 1156, [2:2] -isFractionalEnrichment = bits, U32, 1156, [3:3] -belowEpsilon = bits, U32, 1156, [4:4] -tooShort = bits, U32, 1156, [5:5] -fractionalInjFuel = scalar, F32, 1160, "", 1, 0 -accumulatedValue = scalar, F32, 1164, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1168, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1172, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1176, "", 1, 0 -cycleCnt = scalar, S32, 1180, "", 1, 0 -; total TS size = 1184 -hwEventCounters1 = scalar, U32, 1184, "", 1, 0 -hwEventCounters2 = scalar, U32, 1188, "", 1, 0 -hwEventCounters3 = scalar, U32, 1192, "", 1, 0 -hwEventCounters4 = scalar, U32, 1196, "", 1, 0 -hwEventCounters5 = scalar, U32, 1200, "", 1, 0 -hwEventCounters6 = scalar, U32, 1204, "", 1, 0 -vvtCamCounter = scalar, U32, 1208, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1212, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1216, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1220, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1221, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1224, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1228, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1232, "", 1, 0 -mapCamPrevToothAngle = scalar, F32, 1236, "deg", 1, 0 -isDecodingMapCam = bits, U32, 1240, [0:0] -; total TS size = 1244 -crankSynchronizationCounter = scalar, U32, 1244, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1248, "", 1, 0 -vvtToothDurations0 = scalar, U32, 1252, "us", 1, 0 -vvtCurrentPosition = scalar, F32, 1256, "sync: Primary Cam Position", 1, 0 -vvtToothPosition1 = scalar, F32, 1260, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition2 = scalar, F32, 1264, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition3 = scalar, F32, 1268, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition4 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio = scalar, F32, 1276, "", 1, 0 -triggerStateIndex = scalar, U08, 1280, "", 1, 0 -camResyncCounter = scalar, U08, 1281, "", 1, 0 -vvtStateIndex = scalar, U08, 1282, "", 1, 0 -; total TS size = 1284 -m_hasSynchronizedPhase = bits, U32, 1284, [0:0] +startStopStateTempPhysicalCounter = scalar, U32, 1104, "", 1, 0 +egtValue1 = scalar, F32, 1108, "", 1, 0 +egtValue2 = scalar, F32, 1112, "", 1, 0 +desiredRpmLimit = scalar, S16, 1116, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 1120, "", 1, 0 +sparkCounter = scalar, U32, 1124, "", 1, 0 +fuelingLoad = scalar, F32, 1128, "", 1, 0 +ignitionLoad = scalar, F32, 1132, "", 1, 0 +veTableYAxis = scalar, U16, 1136, "%", 0.01, 0 +; total TS size = 1140 +tpsFrom = scalar, F32, 1140 +tpsTo = scalar, F32, 1144 +deltaTps = scalar, F32, 1148 +extraFuel = scalar, F32, 1152, "", 1, 0 +valueFromTable = scalar, F32, 1156, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1160, [0:0] +isBelowDecelThreshold = bits, U32, 1160, [1:1] +isTimeToResetAccumulator = bits, U32, 1160, [2:2] +isFractionalEnrichment = bits, U32, 1160, [3:3] +belowEpsilon = bits, U32, 1160, [4:4] +tooShort = bits, U32, 1160, [5:5] +fractionalInjFuel = scalar, F32, 1164, "", 1, 0 +accumulatedValue = scalar, F32, 1168, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1172, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1176, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1180, "", 1, 0 +cycleCnt = scalar, S32, 1184, "", 1, 0 +; total TS size = 1188 +hwEventCounters1 = scalar, U32, 1188, "", 1, 0 +hwEventCounters2 = scalar, U32, 1192, "", 1, 0 +hwEventCounters3 = scalar, U32, 1196, "", 1, 0 +hwEventCounters4 = scalar, U32, 1200, "", 1, 0 +hwEventCounters5 = scalar, U32, 1204, "", 1, 0 +hwEventCounters6 = scalar, U32, 1208, "", 1, 0 +vvtCamCounter = scalar, U32, 1212, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1216, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1220, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1224, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1225, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1228, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1232, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1236, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1240, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1244, [0:0] +; total TS size = 1248 +crankSynchronizationCounter = scalar, U32, 1248, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1252, "", 1, 0 +vvtToothDurations0 = scalar, U32, 1256, "us", 1, 0 +vvtCurrentPosition = scalar, F32, 1260, "sync: Primary Cam Position", 1, 0 +vvtToothPosition1 = scalar, F32, 1264, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition2 = scalar, F32, 1268, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition3 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition4 = scalar, F32, 1276, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio = scalar, F32, 1280, "", 1, 0 +triggerStateIndex = scalar, U08, 1284, "", 1, 0 +camResyncCounter = scalar, U08, 1285, "", 1, 0 +vvtStateIndex = scalar, U08, 1286, "", 1, 0 ; total TS size = 1288 -wallFuelCorrection = scalar, F32, 1288, "", 1, 0 -wallFuel = scalar, F32, 1292, "", 1, 0 -; total TS size = 1296 -idleState = bits, S32, 1296, [0:2], "not important" -currentIdlePosition = scalar, F32, 1300 -baseIdlePosition = scalar, F32, 1304 -idleClosedLoop = scalar, F32, 1308 -iacByTpsTaper = scalar, F32, 1312 -throttlePedalUpState = scalar, S32, 1316, "", 1, 0 -mightResetPid = bits, U32, 1320, [0:0] -shouldResetPid = bits, U32, 1320, [1:1] -wasResetPid = bits, U32, 1320, [2:2] -mustResetPid = bits, U32, 1320, [3:3] -isCranking = bits, U32, 1320, [4:4] -isIacTableForCoasting = bits, U32, 1320, [5:5] -notIdling = bits, U32, 1320, [6:6] -needReset = bits, U32, 1320, [7:7] -isInDeadZone = bits, U32, 1320, [8:8] -isBlipping = bits, U32, 1320, [9:9] -useClosedLoop = bits, U32, 1320, [10:10] -badTps = bits, U32, 1320, [11:11] -looksLikeRunning = bits, U32, 1320, [12:12] -looksLikeCoasting = bits, U32, 1320, [13:13] -looksLikeCrankToIdle = bits, U32, 1320, [14:14] -isIdleCoasting = bits, U32, 1320, [15:15] -isIdleClosedLoop = bits, U32, 1320, [16:16] -idleTarget = scalar, S32, 1324, "", 1, 0 -targetRpmByClt = scalar, S32, 1328, "", 1, 0 -targetRpmAc = scalar, S32, 1332, "", 1, 0 -iacByRpmTaper = scalar, F32, 1336 -luaAdd = scalar, F32, 1340 -; total TS size = 1344 -idlePosition = scalar, F32, 1344, "per", 1,0 -trim = scalar, F32, 1348, "", 1, 0 -luaAdjustment = scalar, F32, 1352, "per", 1,0 -m_wastegatePosition = scalar, F32, 1356, "per", 1,0 -etbFeedForward = scalar, F32, 1360 -etbIntegralError = scalar, F32, 1364, "", 1, 0 -etbCurrentTarget = scalar, F32, 1368, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1372, "%", 1, 0 -etbRevLimitActive = bits, U32, 1376, [0:0] -jamDetected = bits, U32, 1376, [1:1] -etbDutyRateOfChange = scalar, F32, 1380, "per", 1,0 -etbDutyAverage = scalar, F32, 1384, "per", 1,0 -etbTpsErrorCounter = scalar, U16, 1388, "count", 1,0 -etbPpsErrorCounter = scalar, U16, 1390, "count", 1,0 -etbErrorCode = scalar, S08, 1392, "", 1, 0 -jamTimer = scalar, U16, 1394, "sec", 0.01, 0 -; total TS size = 1396 -faultCode = scalar, U08, 1396, "", 1, 0 -heaterDuty = scalar, U08, 1397, "%", 1, 0 -pumpDuty = scalar, U08, 1398, "%", 1, 0 -tempC = scalar, U16, 1400, "C", 1, 0 -nernstVoltage = scalar, U16, 1402, "V", 0.001, 0 -esr = scalar, U16, 1404, "ohm", 1, 0 -; total TS size = 1408 -dcOutput0 = scalar, F32, 1408, "per", 1,0 -isEnabled0_int = scalar, U08, 1412, "per", 1,0 -isEnabled0 = bits, U32, 1416, [0:0] -; total TS size = 1420 -value0 = scalar, U16, 1420, "value", 1,0 -value1 = scalar, U16, 1422, "value", 1,0 -errorRate = scalar, F32, 1424, "ratio", 1,0 -; total TS size = 1428 -vvtTarget = scalar, U16, 1428, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1430, "%", 0.5, 0 +m_hasSynchronizedPhase = bits, U32, 1288, [0:0] +; total TS size = 1292 +wallFuelCorrection = scalar, F32, 1292, "", 1, 0 +wallFuel = scalar, F32, 1296, "", 1, 0 +; total TS size = 1300 +idleState = bits, S32, 1300, [0:2], "not important" +currentIdlePosition = scalar, F32, 1304 +baseIdlePosition = scalar, F32, 1308 +idleClosedLoop = scalar, F32, 1312 +iacByTpsTaper = scalar, F32, 1316 +throttlePedalUpState = scalar, S32, 1320, "", 1, 0 +mightResetPid = bits, U32, 1324, [0:0] +shouldResetPid = bits, U32, 1324, [1:1] +wasResetPid = bits, U32, 1324, [2:2] +mustResetPid = bits, U32, 1324, [3:3] +isCranking = bits, U32, 1324, [4:4] +isIacTableForCoasting = bits, U32, 1324, [5:5] +notIdling = bits, U32, 1324, [6:6] +needReset = bits, U32, 1324, [7:7] +isInDeadZone = bits, U32, 1324, [8:8] +isBlipping = bits, U32, 1324, [9:9] +useClosedLoop = bits, U32, 1324, [10:10] +badTps = bits, U32, 1324, [11:11] +looksLikeRunning = bits, U32, 1324, [12:12] +looksLikeCoasting = bits, U32, 1324, [13:13] +looksLikeCrankToIdle = bits, U32, 1324, [14:14] +isIdleCoasting = bits, U32, 1324, [15:15] +isIdleClosedLoop = bits, U32, 1324, [16:16] +idleTarget = scalar, S32, 1328, "", 1, 0 +targetRpmByClt = scalar, S32, 1332, "", 1, 0 +targetRpmAc = scalar, S32, 1336, "", 1, 0 +iacByRpmTaper = scalar, F32, 1340 +luaAdd = scalar, F32, 1344 +; total TS size = 1348 +idlePosition = scalar, F32, 1348, "per", 1,0 +trim = scalar, F32, 1352, "", 1, 0 +luaAdjustment = scalar, F32, 1356, "per", 1,0 +m_wastegatePosition = scalar, F32, 1360, "per", 1,0 +etbFeedForward = scalar, F32, 1364 +etbIntegralError = scalar, F32, 1368, "", 1, 0 +etbCurrentTarget = scalar, F32, 1372, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1376, "%", 1, 0 +etbRevLimitActive = bits, U32, 1380, [0:0] +jamDetected = bits, U32, 1380, [1:1] +etbDutyRateOfChange = scalar, F32, 1384, "per", 1,0 +etbDutyAverage = scalar, F32, 1388, "per", 1,0 +etbTpsErrorCounter = scalar, U16, 1392, "count", 1,0 +etbPpsErrorCounter = scalar, U16, 1394, "count", 1,0 +etbErrorCode = scalar, S08, 1396, "", 1, 0 +jamTimer = scalar, U16, 1398, "sec", 0.01, 0 +; total TS size = 1400 +faultCode = scalar, U08, 1400, "", 1, 0 +heaterDuty = scalar, U08, 1401, "%", 1, 0 +pumpDuty = scalar, U08, 1402, "%", 1, 0 +tempC = scalar, U16, 1404, "C", 1, 0 +nernstVoltage = scalar, U16, 1406, "V", 0.001, 0 +esr = scalar, U16, 1408, "ohm", 1, 0 +; total TS size = 1412 +dcOutput0 = scalar, F32, 1412, "per", 1,0 +isEnabled0_int = scalar, U08, 1416, "per", 1,0 +isEnabled0 = bits, U32, 1420, [0:0] +; total TS size = 1424 +value0 = scalar, U16, 1424, "value", 1,0 +value1 = scalar, U16, 1426, "value", 1,0 +errorRate = scalar, F32, 1428, "ratio", 1,0 ; total TS size = 1432 -lambdaCurrentlyGood = bits, U32, 1432, [0:0] -lambdaMonitorCut = bits, U32, 1432, [1:1] -lambdaTimeSinceGood = scalar, U16, 1436, "sec", 0.01, 0 -; total TS size = 1440 +vvtTarget = scalar, U16, 1432, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1434, "%", 0.5, 0 +; total TS size = 1436 +lambdaCurrentlyGood = bits, U32, 1436, [0:0] +lambdaMonitorCut = bits, U32, 1436, [1:1] +lambdaTimeSinceGood = scalar, U16, 1440, "sec", 0.01, 0 +; total TS size = 1444 time = { timeNow } @@ -5196,6 +5197,7 @@ entry = brakePedalState, "Brake switch", int, "%d" entry = startStopState, "startStopState", int, "%d" entry = startStopPhysicalState, "startStopPhysicalState", int, "%d" entry = startStopStateToggleCounter, "startStopStateToggleCounter", int, "%d" +entry = startStopStateTempPhysicalCounter, "startStopStateTempPhysicalCounter", int, "%d" entry = egtValue1, "egtValue1", float, "%.3f" entry = egtValue2, "egtValue2", float, "%.3f" entry = desiredRpmLimit, "User-defined RPM hard limit", int, "%d" @@ -6072,13 +6074,14 @@ dialog = engine_stateDialog, "engine_state" graphLine = brakePedalState graphLine = startStopState graphLine = startStopStateToggleCounter - graphLine = egtValue1 + graphLine = startStopStateTempPhysicalCounter liveGraph = engine_state_5_Graph, "Graph", South + graphLine = egtValue1 graphLine = egtValue2 graphLine = desiredRpmLimit graphLine = fuelInjectionCounter - graphLine = sparkCounter liveGraph = engine_state_6_Graph, "Graph", South + graphLine = sparkCounter graphLine = fuelingLoad graphLine = ignitionLoad graphLine = veTableYAxis @@ -6414,8 +6417,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" ; cam if ; two-stroke, or ; not crank trigger and ((vague trigger and cam choice) or not vague trigger) - field = "Cam Sensor (Primary channel)", triggerInputPins1, 1, {twoStroke == 1 || ( !(trigger_type == 2 || trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 21 || trigger_type == 26 || trigger_type == 27 || trigger_type == 33 || trigger_type == 38 || trigger_type == 39 || trigger_type == 44 || trigger_type == 45 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 58 || trigger_type == 61 || trigger_type == 62 || trigger_type == 68 || trigger_type == 70 || trigger_type == 71 || trigger_type == 72 || trigger_type == 74 || trigger_type == 75 || trigger_type == 76 || trigger_type == 77 || trigger_type == 79) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) ) ) } - field = "Crank Sensor (Primary channel)", triggerInputPins1, 1, { !(twoStroke == 1 || ( !(trigger_type == 2 || trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 21 || trigger_type == 26 || trigger_type == 27 || trigger_type == 33 || trigger_type == 38 || trigger_type == 39 || trigger_type == 44 || trigger_type == 45 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 58 || trigger_type == 61 || trigger_type == 62 || trigger_type == 68 || trigger_type == 70 || trigger_type == 71 || trigger_type == 72 || trigger_type == 74 || trigger_type == 75 || trigger_type == 76 || trigger_type == 77 || trigger_type == 79) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) ) )) } + field = "Cam Sensor (Primary channel)", triggerInputPins1, 1, {twoStroke == 1 || ( !(trigger_type == 2 || trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 21 || trigger_type == 26 || trigger_type == 27 || trigger_type == 33 || trigger_type == 38 || trigger_type == 39 || trigger_type == 44 || trigger_type == 45 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 58 || trigger_type == 61 || trigger_type == 62 || trigger_type == 68 || trigger_type == 70 || trigger_type == 71 || trigger_type == 72 || trigger_type == 74 || trigger_type == 75 || trigger_type == 76 || trigger_type == 77) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) ) ) } + field = "Crank Sensor (Primary channel)", triggerInputPins1, 1, { !(twoStroke == 1 || ( !(trigger_type == 2 || trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 21 || trigger_type == 26 || trigger_type == 27 || trigger_type == 33 || trigger_type == 38 || trigger_type == 39 || trigger_type == 44 || trigger_type == 45 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 58 || trigger_type == 61 || trigger_type == 62 || trigger_type == 68 || trigger_type == 70 || trigger_type == 71 || trigger_type == 72 || trigger_type == 74 || trigger_type == 75 || trigger_type == 76 || trigger_type == 77) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) ) )) } field = "Invert Primary", invertPrimaryTriggerSignal field = "Secondary channel", triggerInputPins2, { triggerInputPins2 != 0 || (triggerInputPins1 != 0 && (trigger_type == 1 || trigger_type == 3 || trigger_type == 15 || trigger_type == 16 || trigger_type == 19 || trigger_type == 25 || trigger_type == 28 || trigger_type == 31 || trigger_type == 35 || trigger_type == 36 || trigger_type == 37 || trigger_type == 40 || trigger_type == 49 || trigger_type == 50 || trigger_type == 53 || trigger_type == 54 || trigger_type == 63 || trigger_type == 64) ) } field = "Invert Secondary", invertSecondaryTriggerSignal, {triggerInputPins2 != 0 && (trigger_type == 1 || trigger_type == 3 || trigger_type == 15 || trigger_type == 16 || trigger_type == 19 || trigger_type == 25 || trigger_type == 28 || trigger_type == 31 || trigger_type == 35 || trigger_type == 36 || trigger_type == 37 || trigger_type == 40 || trigger_type == 49 || trigger_type == 50 || trigger_type == 53 || trigger_type == 54 || trigger_type == 63 || trigger_type == 64) } diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_469.ini b/firmware/tunerstudio/generated/rusefi_prometheus_469.ini index 3638076127..747d06096e 100644 --- a/firmware/tunerstudio/generated/rusefi_prometheus_469.ini +++ b/firmware/tunerstudio/generated/rusefi_prometheus_469.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.11.08.prometheus_469.102531997" + signature = "rusEFI master.2023.11.09.prometheus_469.356525771" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.11.08.prometheus_469.102531997" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.11.09.prometheus_469.356525771" ; 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 @@ -92,7 +92,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.jar based on (unknown script) integration/rusefi_config.txt Wed Nov 08 20:03:17 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Thu Nov 09 02:07:51 UTC 2023 pageSize = 23880 page = 1 @@ -2347,7 +2347,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23870, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1440 + ochBlockSize = 1444 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3001,136 +3001,137 @@ brakePedalState = scalar, S08, 1092, "", 1, 0 startStopState = scalar, S08, 1093, "", 1, 0 startStopPhysicalState = bits, U32, 1096, [0:0] startStopStateToggleCounter = scalar, U32, 1100, "", 1, 0 -egtValue1 = scalar, F32, 1104, "", 1, 0 -egtValue2 = scalar, F32, 1108, "", 1, 0 -desiredRpmLimit = scalar, S16, 1112, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1116, "", 1, 0 -sparkCounter = scalar, U32, 1120, "", 1, 0 -fuelingLoad = scalar, F32, 1124, "", 1, 0 -ignitionLoad = scalar, F32, 1128, "", 1, 0 -veTableYAxis = scalar, U16, 1132, "%", 0.01, 0 -; total TS size = 1136 -tpsFrom = scalar, F32, 1136 -tpsTo = scalar, F32, 1140 -deltaTps = scalar, F32, 1144 -extraFuel = scalar, F32, 1148, "", 1, 0 -valueFromTable = scalar, F32, 1152, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1156, [0:0] -isBelowDecelThreshold = bits, U32, 1156, [1:1] -isTimeToResetAccumulator = bits, U32, 1156, [2:2] -isFractionalEnrichment = bits, U32, 1156, [3:3] -belowEpsilon = bits, U32, 1156, [4:4] -tooShort = bits, U32, 1156, [5:5] -fractionalInjFuel = scalar, F32, 1160, "", 1, 0 -accumulatedValue = scalar, F32, 1164, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1168, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1172, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1176, "", 1, 0 -cycleCnt = scalar, S32, 1180, "", 1, 0 -; total TS size = 1184 -hwEventCounters1 = scalar, U32, 1184, "", 1, 0 -hwEventCounters2 = scalar, U32, 1188, "", 1, 0 -hwEventCounters3 = scalar, U32, 1192, "", 1, 0 -hwEventCounters4 = scalar, U32, 1196, "", 1, 0 -hwEventCounters5 = scalar, U32, 1200, "", 1, 0 -hwEventCounters6 = scalar, U32, 1204, "", 1, 0 -vvtCamCounter = scalar, U32, 1208, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1212, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1216, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1220, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1221, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1224, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1228, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1232, "", 1, 0 -mapCamPrevToothAngle = scalar, F32, 1236, "deg", 1, 0 -isDecodingMapCam = bits, U32, 1240, [0:0] -; total TS size = 1244 -crankSynchronizationCounter = scalar, U32, 1244, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1248, "", 1, 0 -vvtToothDurations0 = scalar, U32, 1252, "us", 1, 0 -vvtCurrentPosition = scalar, F32, 1256, "sync: Primary Cam Position", 1, 0 -vvtToothPosition1 = scalar, F32, 1260, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition2 = scalar, F32, 1264, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition3 = scalar, F32, 1268, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition4 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio = scalar, F32, 1276, "", 1, 0 -triggerStateIndex = scalar, U08, 1280, "", 1, 0 -camResyncCounter = scalar, U08, 1281, "", 1, 0 -vvtStateIndex = scalar, U08, 1282, "", 1, 0 -; total TS size = 1284 -m_hasSynchronizedPhase = bits, U32, 1284, [0:0] +startStopStateTempPhysicalCounter = scalar, U32, 1104, "", 1, 0 +egtValue1 = scalar, F32, 1108, "", 1, 0 +egtValue2 = scalar, F32, 1112, "", 1, 0 +desiredRpmLimit = scalar, S16, 1116, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 1120, "", 1, 0 +sparkCounter = scalar, U32, 1124, "", 1, 0 +fuelingLoad = scalar, F32, 1128, "", 1, 0 +ignitionLoad = scalar, F32, 1132, "", 1, 0 +veTableYAxis = scalar, U16, 1136, "%", 0.01, 0 +; total TS size = 1140 +tpsFrom = scalar, F32, 1140 +tpsTo = scalar, F32, 1144 +deltaTps = scalar, F32, 1148 +extraFuel = scalar, F32, 1152, "", 1, 0 +valueFromTable = scalar, F32, 1156, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1160, [0:0] +isBelowDecelThreshold = bits, U32, 1160, [1:1] +isTimeToResetAccumulator = bits, U32, 1160, [2:2] +isFractionalEnrichment = bits, U32, 1160, [3:3] +belowEpsilon = bits, U32, 1160, [4:4] +tooShort = bits, U32, 1160, [5:5] +fractionalInjFuel = scalar, F32, 1164, "", 1, 0 +accumulatedValue = scalar, F32, 1168, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1172, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1176, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1180, "", 1, 0 +cycleCnt = scalar, S32, 1184, "", 1, 0 +; total TS size = 1188 +hwEventCounters1 = scalar, U32, 1188, "", 1, 0 +hwEventCounters2 = scalar, U32, 1192, "", 1, 0 +hwEventCounters3 = scalar, U32, 1196, "", 1, 0 +hwEventCounters4 = scalar, U32, 1200, "", 1, 0 +hwEventCounters5 = scalar, U32, 1204, "", 1, 0 +hwEventCounters6 = scalar, U32, 1208, "", 1, 0 +vvtCamCounter = scalar, U32, 1212, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1216, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1220, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1224, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1225, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1228, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1232, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1236, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1240, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1244, [0:0] +; total TS size = 1248 +crankSynchronizationCounter = scalar, U32, 1248, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1252, "", 1, 0 +vvtToothDurations0 = scalar, U32, 1256, "us", 1, 0 +vvtCurrentPosition = scalar, F32, 1260, "sync: Primary Cam Position", 1, 0 +vvtToothPosition1 = scalar, F32, 1264, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition2 = scalar, F32, 1268, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition3 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition4 = scalar, F32, 1276, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio = scalar, F32, 1280, "", 1, 0 +triggerStateIndex = scalar, U08, 1284, "", 1, 0 +camResyncCounter = scalar, U08, 1285, "", 1, 0 +vvtStateIndex = scalar, U08, 1286, "", 1, 0 ; total TS size = 1288 -wallFuelCorrection = scalar, F32, 1288, "", 1, 0 -wallFuel = scalar, F32, 1292, "", 1, 0 -; total TS size = 1296 -idleState = bits, S32, 1296, [0:2], "not important" -currentIdlePosition = scalar, F32, 1300 -baseIdlePosition = scalar, F32, 1304 -idleClosedLoop = scalar, F32, 1308 -iacByTpsTaper = scalar, F32, 1312 -throttlePedalUpState = scalar, S32, 1316, "", 1, 0 -mightResetPid = bits, U32, 1320, [0:0] -shouldResetPid = bits, U32, 1320, [1:1] -wasResetPid = bits, U32, 1320, [2:2] -mustResetPid = bits, U32, 1320, [3:3] -isCranking = bits, U32, 1320, [4:4] -isIacTableForCoasting = bits, U32, 1320, [5:5] -notIdling = bits, U32, 1320, [6:6] -needReset = bits, U32, 1320, [7:7] -isInDeadZone = bits, U32, 1320, [8:8] -isBlipping = bits, U32, 1320, [9:9] -useClosedLoop = bits, U32, 1320, [10:10] -badTps = bits, U32, 1320, [11:11] -looksLikeRunning = bits, U32, 1320, [12:12] -looksLikeCoasting = bits, U32, 1320, [13:13] -looksLikeCrankToIdle = bits, U32, 1320, [14:14] -isIdleCoasting = bits, U32, 1320, [15:15] -isIdleClosedLoop = bits, U32, 1320, [16:16] -idleTarget = scalar, S32, 1324, "", 1, 0 -targetRpmByClt = scalar, S32, 1328, "", 1, 0 -targetRpmAc = scalar, S32, 1332, "", 1, 0 -iacByRpmTaper = scalar, F32, 1336 -luaAdd = scalar, F32, 1340 -; total TS size = 1344 -idlePosition = scalar, F32, 1344, "per", 1,0 -trim = scalar, F32, 1348, "", 1, 0 -luaAdjustment = scalar, F32, 1352, "per", 1,0 -m_wastegatePosition = scalar, F32, 1356, "per", 1,0 -etbFeedForward = scalar, F32, 1360 -etbIntegralError = scalar, F32, 1364, "", 1, 0 -etbCurrentTarget = scalar, F32, 1368, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1372, "%", 1, 0 -etbRevLimitActive = bits, U32, 1376, [0:0] -jamDetected = bits, U32, 1376, [1:1] -etbDutyRateOfChange = scalar, F32, 1380, "per", 1,0 -etbDutyAverage = scalar, F32, 1384, "per", 1,0 -etbTpsErrorCounter = scalar, U16, 1388, "count", 1,0 -etbPpsErrorCounter = scalar, U16, 1390, "count", 1,0 -etbErrorCode = scalar, S08, 1392, "", 1, 0 -jamTimer = scalar, U16, 1394, "sec", 0.01, 0 -; total TS size = 1396 -faultCode = scalar, U08, 1396, "", 1, 0 -heaterDuty = scalar, U08, 1397, "%", 1, 0 -pumpDuty = scalar, U08, 1398, "%", 1, 0 -tempC = scalar, U16, 1400, "C", 1, 0 -nernstVoltage = scalar, U16, 1402, "V", 0.001, 0 -esr = scalar, U16, 1404, "ohm", 1, 0 -; total TS size = 1408 -dcOutput0 = scalar, F32, 1408, "per", 1,0 -isEnabled0_int = scalar, U08, 1412, "per", 1,0 -isEnabled0 = bits, U32, 1416, [0:0] -; total TS size = 1420 -value0 = scalar, U16, 1420, "value", 1,0 -value1 = scalar, U16, 1422, "value", 1,0 -errorRate = scalar, F32, 1424, "ratio", 1,0 -; total TS size = 1428 -vvtTarget = scalar, U16, 1428, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1430, "%", 0.5, 0 +m_hasSynchronizedPhase = bits, U32, 1288, [0:0] +; total TS size = 1292 +wallFuelCorrection = scalar, F32, 1292, "", 1, 0 +wallFuel = scalar, F32, 1296, "", 1, 0 +; total TS size = 1300 +idleState = bits, S32, 1300, [0:2], "not important" +currentIdlePosition = scalar, F32, 1304 +baseIdlePosition = scalar, F32, 1308 +idleClosedLoop = scalar, F32, 1312 +iacByTpsTaper = scalar, F32, 1316 +throttlePedalUpState = scalar, S32, 1320, "", 1, 0 +mightResetPid = bits, U32, 1324, [0:0] +shouldResetPid = bits, U32, 1324, [1:1] +wasResetPid = bits, U32, 1324, [2:2] +mustResetPid = bits, U32, 1324, [3:3] +isCranking = bits, U32, 1324, [4:4] +isIacTableForCoasting = bits, U32, 1324, [5:5] +notIdling = bits, U32, 1324, [6:6] +needReset = bits, U32, 1324, [7:7] +isInDeadZone = bits, U32, 1324, [8:8] +isBlipping = bits, U32, 1324, [9:9] +useClosedLoop = bits, U32, 1324, [10:10] +badTps = bits, U32, 1324, [11:11] +looksLikeRunning = bits, U32, 1324, [12:12] +looksLikeCoasting = bits, U32, 1324, [13:13] +looksLikeCrankToIdle = bits, U32, 1324, [14:14] +isIdleCoasting = bits, U32, 1324, [15:15] +isIdleClosedLoop = bits, U32, 1324, [16:16] +idleTarget = scalar, S32, 1328, "", 1, 0 +targetRpmByClt = scalar, S32, 1332, "", 1, 0 +targetRpmAc = scalar, S32, 1336, "", 1, 0 +iacByRpmTaper = scalar, F32, 1340 +luaAdd = scalar, F32, 1344 +; total TS size = 1348 +idlePosition = scalar, F32, 1348, "per", 1,0 +trim = scalar, F32, 1352, "", 1, 0 +luaAdjustment = scalar, F32, 1356, "per", 1,0 +m_wastegatePosition = scalar, F32, 1360, "per", 1,0 +etbFeedForward = scalar, F32, 1364 +etbIntegralError = scalar, F32, 1368, "", 1, 0 +etbCurrentTarget = scalar, F32, 1372, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1376, "%", 1, 0 +etbRevLimitActive = bits, U32, 1380, [0:0] +jamDetected = bits, U32, 1380, [1:1] +etbDutyRateOfChange = scalar, F32, 1384, "per", 1,0 +etbDutyAverage = scalar, F32, 1388, "per", 1,0 +etbTpsErrorCounter = scalar, U16, 1392, "count", 1,0 +etbPpsErrorCounter = scalar, U16, 1394, "count", 1,0 +etbErrorCode = scalar, S08, 1396, "", 1, 0 +jamTimer = scalar, U16, 1398, "sec", 0.01, 0 +; total TS size = 1400 +faultCode = scalar, U08, 1400, "", 1, 0 +heaterDuty = scalar, U08, 1401, "%", 1, 0 +pumpDuty = scalar, U08, 1402, "%", 1, 0 +tempC = scalar, U16, 1404, "C", 1, 0 +nernstVoltage = scalar, U16, 1406, "V", 0.001, 0 +esr = scalar, U16, 1408, "ohm", 1, 0 +; total TS size = 1412 +dcOutput0 = scalar, F32, 1412, "per", 1,0 +isEnabled0_int = scalar, U08, 1416, "per", 1,0 +isEnabled0 = bits, U32, 1420, [0:0] +; total TS size = 1424 +value0 = scalar, U16, 1424, "value", 1,0 +value1 = scalar, U16, 1426, "value", 1,0 +errorRate = scalar, F32, 1428, "ratio", 1,0 ; total TS size = 1432 -lambdaCurrentlyGood = bits, U32, 1432, [0:0] -lambdaMonitorCut = bits, U32, 1432, [1:1] -lambdaTimeSinceGood = scalar, U16, 1436, "sec", 0.01, 0 -; total TS size = 1440 +vvtTarget = scalar, U16, 1432, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1434, "%", 0.5, 0 +; total TS size = 1436 +lambdaCurrentlyGood = bits, U32, 1436, [0:0] +lambdaMonitorCut = bits, U32, 1436, [1:1] +lambdaTimeSinceGood = scalar, U16, 1440, "sec", 0.01, 0 +; total TS size = 1444 time = { timeNow } @@ -5196,6 +5197,7 @@ entry = brakePedalState, "Brake switch", int, "%d" entry = startStopState, "startStopState", int, "%d" entry = startStopPhysicalState, "startStopPhysicalState", int, "%d" entry = startStopStateToggleCounter, "startStopStateToggleCounter", int, "%d" +entry = startStopStateTempPhysicalCounter, "startStopStateTempPhysicalCounter", int, "%d" entry = egtValue1, "egtValue1", float, "%.3f" entry = egtValue2, "egtValue2", float, "%.3f" entry = desiredRpmLimit, "User-defined RPM hard limit", int, "%d" @@ -6072,13 +6074,14 @@ dialog = engine_stateDialog, "engine_state" graphLine = brakePedalState graphLine = startStopState graphLine = startStopStateToggleCounter - graphLine = egtValue1 + graphLine = startStopStateTempPhysicalCounter liveGraph = engine_state_5_Graph, "Graph", South + graphLine = egtValue1 graphLine = egtValue2 graphLine = desiredRpmLimit graphLine = fuelInjectionCounter - graphLine = sparkCounter liveGraph = engine_state_6_Graph, "Graph", South + graphLine = sparkCounter graphLine = fuelingLoad graphLine = ignitionLoad graphLine = veTableYAxis @@ -6414,8 +6417,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" ; cam if ; two-stroke, or ; not crank trigger and ((vague trigger and cam choice) or not vague trigger) - field = "Cam Sensor (Primary channel)", triggerInputPins1, 1, {twoStroke == 1 || ( !(trigger_type == 2 || trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 21 || trigger_type == 26 || trigger_type == 27 || trigger_type == 33 || trigger_type == 38 || trigger_type == 39 || trigger_type == 44 || trigger_type == 45 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 58 || trigger_type == 61 || trigger_type == 62 || trigger_type == 68 || trigger_type == 70 || trigger_type == 71 || trigger_type == 72 || trigger_type == 74 || trigger_type == 75 || trigger_type == 76 || trigger_type == 77 || trigger_type == 79) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) ) ) } - field = "Crank Sensor (Primary channel)", triggerInputPins1, 1, { !(twoStroke == 1 || ( !(trigger_type == 2 || trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 21 || trigger_type == 26 || trigger_type == 27 || trigger_type == 33 || trigger_type == 38 || trigger_type == 39 || trigger_type == 44 || trigger_type == 45 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 58 || trigger_type == 61 || trigger_type == 62 || trigger_type == 68 || trigger_type == 70 || trigger_type == 71 || trigger_type == 72 || trigger_type == 74 || trigger_type == 75 || trigger_type == 76 || trigger_type == 77 || trigger_type == 79) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) ) )) } + field = "Cam Sensor (Primary channel)", triggerInputPins1, 1, {twoStroke == 1 || ( !(trigger_type == 2 || trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 21 || trigger_type == 26 || trigger_type == 27 || trigger_type == 33 || trigger_type == 38 || trigger_type == 39 || trigger_type == 44 || trigger_type == 45 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 58 || trigger_type == 61 || trigger_type == 62 || trigger_type == 68 || trigger_type == 70 || trigger_type == 71 || trigger_type == 72 || trigger_type == 74 || trigger_type == 75 || trigger_type == 76 || trigger_type == 77) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) ) ) } + field = "Crank Sensor (Primary channel)", triggerInputPins1, 1, { !(twoStroke == 1 || ( !(trigger_type == 2 || trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 21 || trigger_type == 26 || trigger_type == 27 || trigger_type == 33 || trigger_type == 38 || trigger_type == 39 || trigger_type == 44 || trigger_type == 45 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 58 || trigger_type == 61 || trigger_type == 62 || trigger_type == 68 || trigger_type == 70 || trigger_type == 71 || trigger_type == 72 || trigger_type == 74 || trigger_type == 75 || trigger_type == 76 || trigger_type == 77) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) ) )) } field = "Invert Primary", invertPrimaryTriggerSignal field = "Secondary channel", triggerInputPins2, { triggerInputPins2 != 0 || (triggerInputPins1 != 0 && (trigger_type == 1 || trigger_type == 3 || trigger_type == 15 || trigger_type == 16 || trigger_type == 19 || trigger_type == 25 || trigger_type == 28 || trigger_type == 31 || trigger_type == 35 || trigger_type == 36 || trigger_type == 37 || trigger_type == 40 || trigger_type == 49 || trigger_type == 50 || trigger_type == 53 || trigger_type == 54 || trigger_type == 63 || trigger_type == 64) ) } field = "Invert Secondary", invertSecondaryTriggerSignal, {triggerInputPins2 != 0 && (trigger_type == 1 || trigger_type == 3 || trigger_type == 15 || trigger_type == 16 || trigger_type == 19 || trigger_type == 25 || trigger_type == 28 || trigger_type == 31 || trigger_type == 35 || trigger_type == 36 || trigger_type == 37 || trigger_type == 40 || trigger_type == 49 || trigger_type == 50 || trigger_type == 53 || trigger_type == 54 || trigger_type == 63 || trigger_type == 64) } diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f4.ini b/firmware/tunerstudio/generated/rusefi_proteus_f4.ini index e9eec4f20e..88b7466160 100644 --- a/firmware/tunerstudio/generated/rusefi_proteus_f4.ini +++ b/firmware/tunerstudio/generated/rusefi_proteus_f4.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.11.08.proteus_f4.916172919" + signature = "rusEFI master.2023.11.09.proteus_f4.633804065" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.11.08.proteus_f4.916172919" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.11.09.proteus_f4.633804065" ; 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 @@ -92,7 +92,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.jar based on (unknown script) integration/rusefi_config.txt Wed Nov 08 20:03:27 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Thu Nov 09 02:07:58 UTC 2023 pageSize = 27880 page = 1 @@ -2347,7 +2347,7 @@ lambdaMaxDeviationRpmBins = array, U16, 27870, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1440 + ochBlockSize = 1444 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3001,136 +3001,137 @@ brakePedalState = scalar, S08, 1092, "", 1, 0 startStopState = scalar, S08, 1093, "", 1, 0 startStopPhysicalState = bits, U32, 1096, [0:0] startStopStateToggleCounter = scalar, U32, 1100, "", 1, 0 -egtValue1 = scalar, F32, 1104, "", 1, 0 -egtValue2 = scalar, F32, 1108, "", 1, 0 -desiredRpmLimit = scalar, S16, 1112, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1116, "", 1, 0 -sparkCounter = scalar, U32, 1120, "", 1, 0 -fuelingLoad = scalar, F32, 1124, "", 1, 0 -ignitionLoad = scalar, F32, 1128, "", 1, 0 -veTableYAxis = scalar, U16, 1132, "%", 0.01, 0 -; total TS size = 1136 -tpsFrom = scalar, F32, 1136 -tpsTo = scalar, F32, 1140 -deltaTps = scalar, F32, 1144 -extraFuel = scalar, F32, 1148, "", 1, 0 -valueFromTable = scalar, F32, 1152, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1156, [0:0] -isBelowDecelThreshold = bits, U32, 1156, [1:1] -isTimeToResetAccumulator = bits, U32, 1156, [2:2] -isFractionalEnrichment = bits, U32, 1156, [3:3] -belowEpsilon = bits, U32, 1156, [4:4] -tooShort = bits, U32, 1156, [5:5] -fractionalInjFuel = scalar, F32, 1160, "", 1, 0 -accumulatedValue = scalar, F32, 1164, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1168, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1172, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1176, "", 1, 0 -cycleCnt = scalar, S32, 1180, "", 1, 0 -; total TS size = 1184 -hwEventCounters1 = scalar, U32, 1184, "", 1, 0 -hwEventCounters2 = scalar, U32, 1188, "", 1, 0 -hwEventCounters3 = scalar, U32, 1192, "", 1, 0 -hwEventCounters4 = scalar, U32, 1196, "", 1, 0 -hwEventCounters5 = scalar, U32, 1200, "", 1, 0 -hwEventCounters6 = scalar, U32, 1204, "", 1, 0 -vvtCamCounter = scalar, U32, 1208, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1212, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1216, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1220, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1221, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1224, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1228, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1232, "", 1, 0 -mapCamPrevToothAngle = scalar, F32, 1236, "deg", 1, 0 -isDecodingMapCam = bits, U32, 1240, [0:0] -; total TS size = 1244 -crankSynchronizationCounter = scalar, U32, 1244, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1248, "", 1, 0 -vvtToothDurations0 = scalar, U32, 1252, "us", 1, 0 -vvtCurrentPosition = scalar, F32, 1256, "sync: Primary Cam Position", 1, 0 -vvtToothPosition1 = scalar, F32, 1260, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition2 = scalar, F32, 1264, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition3 = scalar, F32, 1268, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition4 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio = scalar, F32, 1276, "", 1, 0 -triggerStateIndex = scalar, U08, 1280, "", 1, 0 -camResyncCounter = scalar, U08, 1281, "", 1, 0 -vvtStateIndex = scalar, U08, 1282, "", 1, 0 -; total TS size = 1284 -m_hasSynchronizedPhase = bits, U32, 1284, [0:0] +startStopStateTempPhysicalCounter = scalar, U32, 1104, "", 1, 0 +egtValue1 = scalar, F32, 1108, "", 1, 0 +egtValue2 = scalar, F32, 1112, "", 1, 0 +desiredRpmLimit = scalar, S16, 1116, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 1120, "", 1, 0 +sparkCounter = scalar, U32, 1124, "", 1, 0 +fuelingLoad = scalar, F32, 1128, "", 1, 0 +ignitionLoad = scalar, F32, 1132, "", 1, 0 +veTableYAxis = scalar, U16, 1136, "%", 0.01, 0 +; total TS size = 1140 +tpsFrom = scalar, F32, 1140 +tpsTo = scalar, F32, 1144 +deltaTps = scalar, F32, 1148 +extraFuel = scalar, F32, 1152, "", 1, 0 +valueFromTable = scalar, F32, 1156, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1160, [0:0] +isBelowDecelThreshold = bits, U32, 1160, [1:1] +isTimeToResetAccumulator = bits, U32, 1160, [2:2] +isFractionalEnrichment = bits, U32, 1160, [3:3] +belowEpsilon = bits, U32, 1160, [4:4] +tooShort = bits, U32, 1160, [5:5] +fractionalInjFuel = scalar, F32, 1164, "", 1, 0 +accumulatedValue = scalar, F32, 1168, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1172, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1176, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1180, "", 1, 0 +cycleCnt = scalar, S32, 1184, "", 1, 0 +; total TS size = 1188 +hwEventCounters1 = scalar, U32, 1188, "", 1, 0 +hwEventCounters2 = scalar, U32, 1192, "", 1, 0 +hwEventCounters3 = scalar, U32, 1196, "", 1, 0 +hwEventCounters4 = scalar, U32, 1200, "", 1, 0 +hwEventCounters5 = scalar, U32, 1204, "", 1, 0 +hwEventCounters6 = scalar, U32, 1208, "", 1, 0 +vvtCamCounter = scalar, U32, 1212, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1216, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1220, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1224, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1225, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1228, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1232, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1236, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1240, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1244, [0:0] +; total TS size = 1248 +crankSynchronizationCounter = scalar, U32, 1248, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1252, "", 1, 0 +vvtToothDurations0 = scalar, U32, 1256, "us", 1, 0 +vvtCurrentPosition = scalar, F32, 1260, "sync: Primary Cam Position", 1, 0 +vvtToothPosition1 = scalar, F32, 1264, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition2 = scalar, F32, 1268, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition3 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition4 = scalar, F32, 1276, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio = scalar, F32, 1280, "", 1, 0 +triggerStateIndex = scalar, U08, 1284, "", 1, 0 +camResyncCounter = scalar, U08, 1285, "", 1, 0 +vvtStateIndex = scalar, U08, 1286, "", 1, 0 ; total TS size = 1288 -wallFuelCorrection = scalar, F32, 1288, "", 1, 0 -wallFuel = scalar, F32, 1292, "", 1, 0 -; total TS size = 1296 -idleState = bits, S32, 1296, [0:2], "not important" -currentIdlePosition = scalar, F32, 1300 -baseIdlePosition = scalar, F32, 1304 -idleClosedLoop = scalar, F32, 1308 -iacByTpsTaper = scalar, F32, 1312 -throttlePedalUpState = scalar, S32, 1316, "", 1, 0 -mightResetPid = bits, U32, 1320, [0:0] -shouldResetPid = bits, U32, 1320, [1:1] -wasResetPid = bits, U32, 1320, [2:2] -mustResetPid = bits, U32, 1320, [3:3] -isCranking = bits, U32, 1320, [4:4] -isIacTableForCoasting = bits, U32, 1320, [5:5] -notIdling = bits, U32, 1320, [6:6] -needReset = bits, U32, 1320, [7:7] -isInDeadZone = bits, U32, 1320, [8:8] -isBlipping = bits, U32, 1320, [9:9] -useClosedLoop = bits, U32, 1320, [10:10] -badTps = bits, U32, 1320, [11:11] -looksLikeRunning = bits, U32, 1320, [12:12] -looksLikeCoasting = bits, U32, 1320, [13:13] -looksLikeCrankToIdle = bits, U32, 1320, [14:14] -isIdleCoasting = bits, U32, 1320, [15:15] -isIdleClosedLoop = bits, U32, 1320, [16:16] -idleTarget = scalar, S32, 1324, "", 1, 0 -targetRpmByClt = scalar, S32, 1328, "", 1, 0 -targetRpmAc = scalar, S32, 1332, "", 1, 0 -iacByRpmTaper = scalar, F32, 1336 -luaAdd = scalar, F32, 1340 -; total TS size = 1344 -idlePosition = scalar, F32, 1344, "per", 1,0 -trim = scalar, F32, 1348, "", 1, 0 -luaAdjustment = scalar, F32, 1352, "per", 1,0 -m_wastegatePosition = scalar, F32, 1356, "per", 1,0 -etbFeedForward = scalar, F32, 1360 -etbIntegralError = scalar, F32, 1364, "", 1, 0 -etbCurrentTarget = scalar, F32, 1368, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1372, "%", 1, 0 -etbRevLimitActive = bits, U32, 1376, [0:0] -jamDetected = bits, U32, 1376, [1:1] -etbDutyRateOfChange = scalar, F32, 1380, "per", 1,0 -etbDutyAverage = scalar, F32, 1384, "per", 1,0 -etbTpsErrorCounter = scalar, U16, 1388, "count", 1,0 -etbPpsErrorCounter = scalar, U16, 1390, "count", 1,0 -etbErrorCode = scalar, S08, 1392, "", 1, 0 -jamTimer = scalar, U16, 1394, "sec", 0.01, 0 -; total TS size = 1396 -faultCode = scalar, U08, 1396, "", 1, 0 -heaterDuty = scalar, U08, 1397, "%", 1, 0 -pumpDuty = scalar, U08, 1398, "%", 1, 0 -tempC = scalar, U16, 1400, "C", 1, 0 -nernstVoltage = scalar, U16, 1402, "V", 0.001, 0 -esr = scalar, U16, 1404, "ohm", 1, 0 -; total TS size = 1408 -dcOutput0 = scalar, F32, 1408, "per", 1,0 -isEnabled0_int = scalar, U08, 1412, "per", 1,0 -isEnabled0 = bits, U32, 1416, [0:0] -; total TS size = 1420 -value0 = scalar, U16, 1420, "value", 1,0 -value1 = scalar, U16, 1422, "value", 1,0 -errorRate = scalar, F32, 1424, "ratio", 1,0 -; total TS size = 1428 -vvtTarget = scalar, U16, 1428, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1430, "%", 0.5, 0 +m_hasSynchronizedPhase = bits, U32, 1288, [0:0] +; total TS size = 1292 +wallFuelCorrection = scalar, F32, 1292, "", 1, 0 +wallFuel = scalar, F32, 1296, "", 1, 0 +; total TS size = 1300 +idleState = bits, S32, 1300, [0:2], "not important" +currentIdlePosition = scalar, F32, 1304 +baseIdlePosition = scalar, F32, 1308 +idleClosedLoop = scalar, F32, 1312 +iacByTpsTaper = scalar, F32, 1316 +throttlePedalUpState = scalar, S32, 1320, "", 1, 0 +mightResetPid = bits, U32, 1324, [0:0] +shouldResetPid = bits, U32, 1324, [1:1] +wasResetPid = bits, U32, 1324, [2:2] +mustResetPid = bits, U32, 1324, [3:3] +isCranking = bits, U32, 1324, [4:4] +isIacTableForCoasting = bits, U32, 1324, [5:5] +notIdling = bits, U32, 1324, [6:6] +needReset = bits, U32, 1324, [7:7] +isInDeadZone = bits, U32, 1324, [8:8] +isBlipping = bits, U32, 1324, [9:9] +useClosedLoop = bits, U32, 1324, [10:10] +badTps = bits, U32, 1324, [11:11] +looksLikeRunning = bits, U32, 1324, [12:12] +looksLikeCoasting = bits, U32, 1324, [13:13] +looksLikeCrankToIdle = bits, U32, 1324, [14:14] +isIdleCoasting = bits, U32, 1324, [15:15] +isIdleClosedLoop = bits, U32, 1324, [16:16] +idleTarget = scalar, S32, 1328, "", 1, 0 +targetRpmByClt = scalar, S32, 1332, "", 1, 0 +targetRpmAc = scalar, S32, 1336, "", 1, 0 +iacByRpmTaper = scalar, F32, 1340 +luaAdd = scalar, F32, 1344 +; total TS size = 1348 +idlePosition = scalar, F32, 1348, "per", 1,0 +trim = scalar, F32, 1352, "", 1, 0 +luaAdjustment = scalar, F32, 1356, "per", 1,0 +m_wastegatePosition = scalar, F32, 1360, "per", 1,0 +etbFeedForward = scalar, F32, 1364 +etbIntegralError = scalar, F32, 1368, "", 1, 0 +etbCurrentTarget = scalar, F32, 1372, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1376, "%", 1, 0 +etbRevLimitActive = bits, U32, 1380, [0:0] +jamDetected = bits, U32, 1380, [1:1] +etbDutyRateOfChange = scalar, F32, 1384, "per", 1,0 +etbDutyAverage = scalar, F32, 1388, "per", 1,0 +etbTpsErrorCounter = scalar, U16, 1392, "count", 1,0 +etbPpsErrorCounter = scalar, U16, 1394, "count", 1,0 +etbErrorCode = scalar, S08, 1396, "", 1, 0 +jamTimer = scalar, U16, 1398, "sec", 0.01, 0 +; total TS size = 1400 +faultCode = scalar, U08, 1400, "", 1, 0 +heaterDuty = scalar, U08, 1401, "%", 1, 0 +pumpDuty = scalar, U08, 1402, "%", 1, 0 +tempC = scalar, U16, 1404, "C", 1, 0 +nernstVoltage = scalar, U16, 1406, "V", 0.001, 0 +esr = scalar, U16, 1408, "ohm", 1, 0 +; total TS size = 1412 +dcOutput0 = scalar, F32, 1412, "per", 1,0 +isEnabled0_int = scalar, U08, 1416, "per", 1,0 +isEnabled0 = bits, U32, 1420, [0:0] +; total TS size = 1424 +value0 = scalar, U16, 1424, "value", 1,0 +value1 = scalar, U16, 1426, "value", 1,0 +errorRate = scalar, F32, 1428, "ratio", 1,0 ; total TS size = 1432 -lambdaCurrentlyGood = bits, U32, 1432, [0:0] -lambdaMonitorCut = bits, U32, 1432, [1:1] -lambdaTimeSinceGood = scalar, U16, 1436, "sec", 0.01, 0 -; total TS size = 1440 +vvtTarget = scalar, U16, 1432, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1434, "%", 0.5, 0 +; total TS size = 1436 +lambdaCurrentlyGood = bits, U32, 1436, [0:0] +lambdaMonitorCut = bits, U32, 1436, [1:1] +lambdaTimeSinceGood = scalar, U16, 1440, "sec", 0.01, 0 +; total TS size = 1444 time = { timeNow } @@ -5196,6 +5197,7 @@ entry = brakePedalState, "Brake switch", int, "%d" entry = startStopState, "startStopState", int, "%d" entry = startStopPhysicalState, "startStopPhysicalState", int, "%d" entry = startStopStateToggleCounter, "startStopStateToggleCounter", int, "%d" +entry = startStopStateTempPhysicalCounter, "startStopStateTempPhysicalCounter", int, "%d" entry = egtValue1, "egtValue1", float, "%.3f" entry = egtValue2, "egtValue2", float, "%.3f" entry = desiredRpmLimit, "User-defined RPM hard limit", int, "%d" @@ -6087,13 +6089,14 @@ dialog = engine_stateDialog, "engine_state" graphLine = brakePedalState graphLine = startStopState graphLine = startStopStateToggleCounter - graphLine = egtValue1 + graphLine = startStopStateTempPhysicalCounter liveGraph = engine_state_5_Graph, "Graph", South + graphLine = egtValue1 graphLine = egtValue2 graphLine = desiredRpmLimit graphLine = fuelInjectionCounter - graphLine = sparkCounter liveGraph = engine_state_6_Graph, "Graph", South + graphLine = sparkCounter graphLine = fuelingLoad graphLine = ignitionLoad graphLine = veTableYAxis @@ -6429,8 +6432,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" ; cam if ; two-stroke, or ; not crank trigger and ((vague trigger and cam choice) or not vague trigger) - field = "Cam Sensor (Primary channel)", triggerInputPins1, 1, {twoStroke == 1 || ( !(trigger_type == 2 || trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 21 || trigger_type == 26 || trigger_type == 27 || trigger_type == 33 || trigger_type == 38 || trigger_type == 39 || trigger_type == 44 || trigger_type == 45 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 58 || trigger_type == 61 || trigger_type == 62 || trigger_type == 68 || trigger_type == 70 || trigger_type == 71 || trigger_type == 72 || trigger_type == 74 || trigger_type == 75 || trigger_type == 76 || trigger_type == 77 || trigger_type == 79) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) ) ) } - field = "Crank Sensor (Primary channel)", triggerInputPins1, 1, { !(twoStroke == 1 || ( !(trigger_type == 2 || trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 21 || trigger_type == 26 || trigger_type == 27 || trigger_type == 33 || trigger_type == 38 || trigger_type == 39 || trigger_type == 44 || trigger_type == 45 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 58 || trigger_type == 61 || trigger_type == 62 || trigger_type == 68 || trigger_type == 70 || trigger_type == 71 || trigger_type == 72 || trigger_type == 74 || trigger_type == 75 || trigger_type == 76 || trigger_type == 77 || trigger_type == 79) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) ) )) } + field = "Cam Sensor (Primary channel)", triggerInputPins1, 1, {twoStroke == 1 || ( !(trigger_type == 2 || trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 21 || trigger_type == 26 || trigger_type == 27 || trigger_type == 33 || trigger_type == 38 || trigger_type == 39 || trigger_type == 44 || trigger_type == 45 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 58 || trigger_type == 61 || trigger_type == 62 || trigger_type == 68 || trigger_type == 70 || trigger_type == 71 || trigger_type == 72 || trigger_type == 74 || trigger_type == 75 || trigger_type == 76 || trigger_type == 77) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) ) ) } + field = "Crank Sensor (Primary channel)", triggerInputPins1, 1, { !(twoStroke == 1 || ( !(trigger_type == 2 || trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 21 || trigger_type == 26 || trigger_type == 27 || trigger_type == 33 || trigger_type == 38 || trigger_type == 39 || trigger_type == 44 || trigger_type == 45 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 58 || trigger_type == 61 || trigger_type == 62 || trigger_type == 68 || trigger_type == 70 || trigger_type == 71 || trigger_type == 72 || trigger_type == 74 || trigger_type == 75 || trigger_type == 76 || trigger_type == 77) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) ) )) } field = "Invert Primary", invertPrimaryTriggerSignal field = "Secondary channel", triggerInputPins2, { triggerInputPins2 != 0 || (triggerInputPins1 != 0 && (trigger_type == 1 || trigger_type == 3 || trigger_type == 15 || trigger_type == 16 || trigger_type == 19 || trigger_type == 25 || trigger_type == 28 || trigger_type == 31 || trigger_type == 35 || trigger_type == 36 || trigger_type == 37 || trigger_type == 40 || trigger_type == 49 || trigger_type == 50 || trigger_type == 53 || trigger_type == 54 || trigger_type == 63 || trigger_type == 64) ) } field = "Invert Secondary", invertSecondaryTriggerSignal, {triggerInputPins2 != 0 && (trigger_type == 1 || trigger_type == 3 || trigger_type == 15 || trigger_type == 16 || trigger_type == 19 || trigger_type == 25 || trigger_type == 28 || trigger_type == 31 || trigger_type == 35 || trigger_type == 36 || trigger_type == 37 || trigger_type == 40 || trigger_type == 49 || trigger_type == 50 || trigger_type == 53 || trigger_type == 54 || trigger_type == 63 || trigger_type == 64) } diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f7.ini b/firmware/tunerstudio/generated/rusefi_proteus_f7.ini index 7a3e92d501..6fb9fb7cc9 100644 --- a/firmware/tunerstudio/generated/rusefi_proteus_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_proteus_f7.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.11.08.proteus_f7.916172919" + signature = "rusEFI master.2023.11.09.proteus_f7.633804065" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.11.08.proteus_f7.916172919" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.11.09.proteus_f7.633804065" ; 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 @@ -92,7 +92,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.jar based on (unknown script) integration/rusefi_config.txt Wed Nov 08 20:03:24 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Thu Nov 09 02:07:55 UTC 2023 pageSize = 27880 page = 1 @@ -2347,7 +2347,7 @@ lambdaMaxDeviationRpmBins = array, U16, 27870, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1440 + ochBlockSize = 1444 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3001,136 +3001,137 @@ brakePedalState = scalar, S08, 1092, "", 1, 0 startStopState = scalar, S08, 1093, "", 1, 0 startStopPhysicalState = bits, U32, 1096, [0:0] startStopStateToggleCounter = scalar, U32, 1100, "", 1, 0 -egtValue1 = scalar, F32, 1104, "", 1, 0 -egtValue2 = scalar, F32, 1108, "", 1, 0 -desiredRpmLimit = scalar, S16, 1112, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1116, "", 1, 0 -sparkCounter = scalar, U32, 1120, "", 1, 0 -fuelingLoad = scalar, F32, 1124, "", 1, 0 -ignitionLoad = scalar, F32, 1128, "", 1, 0 -veTableYAxis = scalar, U16, 1132, "%", 0.01, 0 -; total TS size = 1136 -tpsFrom = scalar, F32, 1136 -tpsTo = scalar, F32, 1140 -deltaTps = scalar, F32, 1144 -extraFuel = scalar, F32, 1148, "", 1, 0 -valueFromTable = scalar, F32, 1152, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1156, [0:0] -isBelowDecelThreshold = bits, U32, 1156, [1:1] -isTimeToResetAccumulator = bits, U32, 1156, [2:2] -isFractionalEnrichment = bits, U32, 1156, [3:3] -belowEpsilon = bits, U32, 1156, [4:4] -tooShort = bits, U32, 1156, [5:5] -fractionalInjFuel = scalar, F32, 1160, "", 1, 0 -accumulatedValue = scalar, F32, 1164, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1168, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1172, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1176, "", 1, 0 -cycleCnt = scalar, S32, 1180, "", 1, 0 -; total TS size = 1184 -hwEventCounters1 = scalar, U32, 1184, "", 1, 0 -hwEventCounters2 = scalar, U32, 1188, "", 1, 0 -hwEventCounters3 = scalar, U32, 1192, "", 1, 0 -hwEventCounters4 = scalar, U32, 1196, "", 1, 0 -hwEventCounters5 = scalar, U32, 1200, "", 1, 0 -hwEventCounters6 = scalar, U32, 1204, "", 1, 0 -vvtCamCounter = scalar, U32, 1208, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1212, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1216, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1220, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1221, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1224, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1228, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1232, "", 1, 0 -mapCamPrevToothAngle = scalar, F32, 1236, "deg", 1, 0 -isDecodingMapCam = bits, U32, 1240, [0:0] -; total TS size = 1244 -crankSynchronizationCounter = scalar, U32, 1244, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1248, "", 1, 0 -vvtToothDurations0 = scalar, U32, 1252, "us", 1, 0 -vvtCurrentPosition = scalar, F32, 1256, "sync: Primary Cam Position", 1, 0 -vvtToothPosition1 = scalar, F32, 1260, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition2 = scalar, F32, 1264, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition3 = scalar, F32, 1268, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition4 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio = scalar, F32, 1276, "", 1, 0 -triggerStateIndex = scalar, U08, 1280, "", 1, 0 -camResyncCounter = scalar, U08, 1281, "", 1, 0 -vvtStateIndex = scalar, U08, 1282, "", 1, 0 -; total TS size = 1284 -m_hasSynchronizedPhase = bits, U32, 1284, [0:0] +startStopStateTempPhysicalCounter = scalar, U32, 1104, "", 1, 0 +egtValue1 = scalar, F32, 1108, "", 1, 0 +egtValue2 = scalar, F32, 1112, "", 1, 0 +desiredRpmLimit = scalar, S16, 1116, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 1120, "", 1, 0 +sparkCounter = scalar, U32, 1124, "", 1, 0 +fuelingLoad = scalar, F32, 1128, "", 1, 0 +ignitionLoad = scalar, F32, 1132, "", 1, 0 +veTableYAxis = scalar, U16, 1136, "%", 0.01, 0 +; total TS size = 1140 +tpsFrom = scalar, F32, 1140 +tpsTo = scalar, F32, 1144 +deltaTps = scalar, F32, 1148 +extraFuel = scalar, F32, 1152, "", 1, 0 +valueFromTable = scalar, F32, 1156, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1160, [0:0] +isBelowDecelThreshold = bits, U32, 1160, [1:1] +isTimeToResetAccumulator = bits, U32, 1160, [2:2] +isFractionalEnrichment = bits, U32, 1160, [3:3] +belowEpsilon = bits, U32, 1160, [4:4] +tooShort = bits, U32, 1160, [5:5] +fractionalInjFuel = scalar, F32, 1164, "", 1, 0 +accumulatedValue = scalar, F32, 1168, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1172, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1176, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1180, "", 1, 0 +cycleCnt = scalar, S32, 1184, "", 1, 0 +; total TS size = 1188 +hwEventCounters1 = scalar, U32, 1188, "", 1, 0 +hwEventCounters2 = scalar, U32, 1192, "", 1, 0 +hwEventCounters3 = scalar, U32, 1196, "", 1, 0 +hwEventCounters4 = scalar, U32, 1200, "", 1, 0 +hwEventCounters5 = scalar, U32, 1204, "", 1, 0 +hwEventCounters6 = scalar, U32, 1208, "", 1, 0 +vvtCamCounter = scalar, U32, 1212, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1216, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1220, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1224, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1225, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1228, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1232, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1236, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1240, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1244, [0:0] +; total TS size = 1248 +crankSynchronizationCounter = scalar, U32, 1248, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1252, "", 1, 0 +vvtToothDurations0 = scalar, U32, 1256, "us", 1, 0 +vvtCurrentPosition = scalar, F32, 1260, "sync: Primary Cam Position", 1, 0 +vvtToothPosition1 = scalar, F32, 1264, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition2 = scalar, F32, 1268, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition3 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition4 = scalar, F32, 1276, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio = scalar, F32, 1280, "", 1, 0 +triggerStateIndex = scalar, U08, 1284, "", 1, 0 +camResyncCounter = scalar, U08, 1285, "", 1, 0 +vvtStateIndex = scalar, U08, 1286, "", 1, 0 ; total TS size = 1288 -wallFuelCorrection = scalar, F32, 1288, "", 1, 0 -wallFuel = scalar, F32, 1292, "", 1, 0 -; total TS size = 1296 -idleState = bits, S32, 1296, [0:2], "not important" -currentIdlePosition = scalar, F32, 1300 -baseIdlePosition = scalar, F32, 1304 -idleClosedLoop = scalar, F32, 1308 -iacByTpsTaper = scalar, F32, 1312 -throttlePedalUpState = scalar, S32, 1316, "", 1, 0 -mightResetPid = bits, U32, 1320, [0:0] -shouldResetPid = bits, U32, 1320, [1:1] -wasResetPid = bits, U32, 1320, [2:2] -mustResetPid = bits, U32, 1320, [3:3] -isCranking = bits, U32, 1320, [4:4] -isIacTableForCoasting = bits, U32, 1320, [5:5] -notIdling = bits, U32, 1320, [6:6] -needReset = bits, U32, 1320, [7:7] -isInDeadZone = bits, U32, 1320, [8:8] -isBlipping = bits, U32, 1320, [9:9] -useClosedLoop = bits, U32, 1320, [10:10] -badTps = bits, U32, 1320, [11:11] -looksLikeRunning = bits, U32, 1320, [12:12] -looksLikeCoasting = bits, U32, 1320, [13:13] -looksLikeCrankToIdle = bits, U32, 1320, [14:14] -isIdleCoasting = bits, U32, 1320, [15:15] -isIdleClosedLoop = bits, U32, 1320, [16:16] -idleTarget = scalar, S32, 1324, "", 1, 0 -targetRpmByClt = scalar, S32, 1328, "", 1, 0 -targetRpmAc = scalar, S32, 1332, "", 1, 0 -iacByRpmTaper = scalar, F32, 1336 -luaAdd = scalar, F32, 1340 -; total TS size = 1344 -idlePosition = scalar, F32, 1344, "per", 1,0 -trim = scalar, F32, 1348, "", 1, 0 -luaAdjustment = scalar, F32, 1352, "per", 1,0 -m_wastegatePosition = scalar, F32, 1356, "per", 1,0 -etbFeedForward = scalar, F32, 1360 -etbIntegralError = scalar, F32, 1364, "", 1, 0 -etbCurrentTarget = scalar, F32, 1368, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1372, "%", 1, 0 -etbRevLimitActive = bits, U32, 1376, [0:0] -jamDetected = bits, U32, 1376, [1:1] -etbDutyRateOfChange = scalar, F32, 1380, "per", 1,0 -etbDutyAverage = scalar, F32, 1384, "per", 1,0 -etbTpsErrorCounter = scalar, U16, 1388, "count", 1,0 -etbPpsErrorCounter = scalar, U16, 1390, "count", 1,0 -etbErrorCode = scalar, S08, 1392, "", 1, 0 -jamTimer = scalar, U16, 1394, "sec", 0.01, 0 -; total TS size = 1396 -faultCode = scalar, U08, 1396, "", 1, 0 -heaterDuty = scalar, U08, 1397, "%", 1, 0 -pumpDuty = scalar, U08, 1398, "%", 1, 0 -tempC = scalar, U16, 1400, "C", 1, 0 -nernstVoltage = scalar, U16, 1402, "V", 0.001, 0 -esr = scalar, U16, 1404, "ohm", 1, 0 -; total TS size = 1408 -dcOutput0 = scalar, F32, 1408, "per", 1,0 -isEnabled0_int = scalar, U08, 1412, "per", 1,0 -isEnabled0 = bits, U32, 1416, [0:0] -; total TS size = 1420 -value0 = scalar, U16, 1420, "value", 1,0 -value1 = scalar, U16, 1422, "value", 1,0 -errorRate = scalar, F32, 1424, "ratio", 1,0 -; total TS size = 1428 -vvtTarget = scalar, U16, 1428, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1430, "%", 0.5, 0 +m_hasSynchronizedPhase = bits, U32, 1288, [0:0] +; total TS size = 1292 +wallFuelCorrection = scalar, F32, 1292, "", 1, 0 +wallFuel = scalar, F32, 1296, "", 1, 0 +; total TS size = 1300 +idleState = bits, S32, 1300, [0:2], "not important" +currentIdlePosition = scalar, F32, 1304 +baseIdlePosition = scalar, F32, 1308 +idleClosedLoop = scalar, F32, 1312 +iacByTpsTaper = scalar, F32, 1316 +throttlePedalUpState = scalar, S32, 1320, "", 1, 0 +mightResetPid = bits, U32, 1324, [0:0] +shouldResetPid = bits, U32, 1324, [1:1] +wasResetPid = bits, U32, 1324, [2:2] +mustResetPid = bits, U32, 1324, [3:3] +isCranking = bits, U32, 1324, [4:4] +isIacTableForCoasting = bits, U32, 1324, [5:5] +notIdling = bits, U32, 1324, [6:6] +needReset = bits, U32, 1324, [7:7] +isInDeadZone = bits, U32, 1324, [8:8] +isBlipping = bits, U32, 1324, [9:9] +useClosedLoop = bits, U32, 1324, [10:10] +badTps = bits, U32, 1324, [11:11] +looksLikeRunning = bits, U32, 1324, [12:12] +looksLikeCoasting = bits, U32, 1324, [13:13] +looksLikeCrankToIdle = bits, U32, 1324, [14:14] +isIdleCoasting = bits, U32, 1324, [15:15] +isIdleClosedLoop = bits, U32, 1324, [16:16] +idleTarget = scalar, S32, 1328, "", 1, 0 +targetRpmByClt = scalar, S32, 1332, "", 1, 0 +targetRpmAc = scalar, S32, 1336, "", 1, 0 +iacByRpmTaper = scalar, F32, 1340 +luaAdd = scalar, F32, 1344 +; total TS size = 1348 +idlePosition = scalar, F32, 1348, "per", 1,0 +trim = scalar, F32, 1352, "", 1, 0 +luaAdjustment = scalar, F32, 1356, "per", 1,0 +m_wastegatePosition = scalar, F32, 1360, "per", 1,0 +etbFeedForward = scalar, F32, 1364 +etbIntegralError = scalar, F32, 1368, "", 1, 0 +etbCurrentTarget = scalar, F32, 1372, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1376, "%", 1, 0 +etbRevLimitActive = bits, U32, 1380, [0:0] +jamDetected = bits, U32, 1380, [1:1] +etbDutyRateOfChange = scalar, F32, 1384, "per", 1,0 +etbDutyAverage = scalar, F32, 1388, "per", 1,0 +etbTpsErrorCounter = scalar, U16, 1392, "count", 1,0 +etbPpsErrorCounter = scalar, U16, 1394, "count", 1,0 +etbErrorCode = scalar, S08, 1396, "", 1, 0 +jamTimer = scalar, U16, 1398, "sec", 0.01, 0 +; total TS size = 1400 +faultCode = scalar, U08, 1400, "", 1, 0 +heaterDuty = scalar, U08, 1401, "%", 1, 0 +pumpDuty = scalar, U08, 1402, "%", 1, 0 +tempC = scalar, U16, 1404, "C", 1, 0 +nernstVoltage = scalar, U16, 1406, "V", 0.001, 0 +esr = scalar, U16, 1408, "ohm", 1, 0 +; total TS size = 1412 +dcOutput0 = scalar, F32, 1412, "per", 1,0 +isEnabled0_int = scalar, U08, 1416, "per", 1,0 +isEnabled0 = bits, U32, 1420, [0:0] +; total TS size = 1424 +value0 = scalar, U16, 1424, "value", 1,0 +value1 = scalar, U16, 1426, "value", 1,0 +errorRate = scalar, F32, 1428, "ratio", 1,0 ; total TS size = 1432 -lambdaCurrentlyGood = bits, U32, 1432, [0:0] -lambdaMonitorCut = bits, U32, 1432, [1:1] -lambdaTimeSinceGood = scalar, U16, 1436, "sec", 0.01, 0 -; total TS size = 1440 +vvtTarget = scalar, U16, 1432, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1434, "%", 0.5, 0 +; total TS size = 1436 +lambdaCurrentlyGood = bits, U32, 1436, [0:0] +lambdaMonitorCut = bits, U32, 1436, [1:1] +lambdaTimeSinceGood = scalar, U16, 1440, "sec", 0.01, 0 +; total TS size = 1444 time = { timeNow } @@ -5196,6 +5197,7 @@ entry = brakePedalState, "Brake switch", int, "%d" entry = startStopState, "startStopState", int, "%d" entry = startStopPhysicalState, "startStopPhysicalState", int, "%d" entry = startStopStateToggleCounter, "startStopStateToggleCounter", int, "%d" +entry = startStopStateTempPhysicalCounter, "startStopStateTempPhysicalCounter", int, "%d" entry = egtValue1, "egtValue1", float, "%.3f" entry = egtValue2, "egtValue2", float, "%.3f" entry = desiredRpmLimit, "User-defined RPM hard limit", int, "%d" @@ -6087,13 +6089,14 @@ dialog = engine_stateDialog, "engine_state" graphLine = brakePedalState graphLine = startStopState graphLine = startStopStateToggleCounter - graphLine = egtValue1 + graphLine = startStopStateTempPhysicalCounter liveGraph = engine_state_5_Graph, "Graph", South + graphLine = egtValue1 graphLine = egtValue2 graphLine = desiredRpmLimit graphLine = fuelInjectionCounter - graphLine = sparkCounter liveGraph = engine_state_6_Graph, "Graph", South + graphLine = sparkCounter graphLine = fuelingLoad graphLine = ignitionLoad graphLine = veTableYAxis @@ -6429,8 +6432,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" ; cam if ; two-stroke, or ; not crank trigger and ((vague trigger and cam choice) or not vague trigger) - field = "Cam Sensor (Primary channel)", triggerInputPins1, 1, {twoStroke == 1 || ( !(trigger_type == 2 || trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 21 || trigger_type == 26 || trigger_type == 27 || trigger_type == 33 || trigger_type == 38 || trigger_type == 39 || trigger_type == 44 || trigger_type == 45 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 58 || trigger_type == 61 || trigger_type == 62 || trigger_type == 68 || trigger_type == 70 || trigger_type == 71 || trigger_type == 72 || trigger_type == 74 || trigger_type == 75 || trigger_type == 76 || trigger_type == 77 || trigger_type == 79) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) ) ) } - field = "Crank Sensor (Primary channel)", triggerInputPins1, 1, { !(twoStroke == 1 || ( !(trigger_type == 2 || trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 21 || trigger_type == 26 || trigger_type == 27 || trigger_type == 33 || trigger_type == 38 || trigger_type == 39 || trigger_type == 44 || trigger_type == 45 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 58 || trigger_type == 61 || trigger_type == 62 || trigger_type == 68 || trigger_type == 70 || trigger_type == 71 || trigger_type == 72 || trigger_type == 74 || trigger_type == 75 || trigger_type == 76 || trigger_type == 77 || trigger_type == 79) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) ) )) } + field = "Cam Sensor (Primary channel)", triggerInputPins1, 1, {twoStroke == 1 || ( !(trigger_type == 2 || trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 21 || trigger_type == 26 || trigger_type == 27 || trigger_type == 33 || trigger_type == 38 || trigger_type == 39 || trigger_type == 44 || trigger_type == 45 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 58 || trigger_type == 61 || trigger_type == 62 || trigger_type == 68 || trigger_type == 70 || trigger_type == 71 || trigger_type == 72 || trigger_type == 74 || trigger_type == 75 || trigger_type == 76 || trigger_type == 77) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) ) ) } + field = "Crank Sensor (Primary channel)", triggerInputPins1, 1, { !(twoStroke == 1 || ( !(trigger_type == 2 || trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 21 || trigger_type == 26 || trigger_type == 27 || trigger_type == 33 || trigger_type == 38 || trigger_type == 39 || trigger_type == 44 || trigger_type == 45 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 58 || trigger_type == 61 || trigger_type == 62 || trigger_type == 68 || trigger_type == 70 || trigger_type == 71 || trigger_type == 72 || trigger_type == 74 || trigger_type == 75 || trigger_type == 76 || trigger_type == 77) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) ) )) } field = "Invert Primary", invertPrimaryTriggerSignal field = "Secondary channel", triggerInputPins2, { triggerInputPins2 != 0 || (triggerInputPins1 != 0 && (trigger_type == 1 || trigger_type == 3 || trigger_type == 15 || trigger_type == 16 || trigger_type == 19 || trigger_type == 25 || trigger_type == 28 || trigger_type == 31 || trigger_type == 35 || trigger_type == 36 || trigger_type == 37 || trigger_type == 40 || trigger_type == 49 || trigger_type == 50 || trigger_type == 53 || trigger_type == 54 || trigger_type == 63 || trigger_type == 64) ) } field = "Invert Secondary", invertSecondaryTriggerSignal, {triggerInputPins2 != 0 && (trigger_type == 1 || trigger_type == 3 || trigger_type == 15 || trigger_type == 16 || trigger_type == 19 || trigger_type == 25 || trigger_type == 28 || trigger_type == 31 || trigger_type == 35 || trigger_type == 36 || trigger_type == 37 || trigger_type == 40 || trigger_type == 49 || trigger_type == 50 || trigger_type == 53 || trigger_type == 54 || trigger_type == 63 || trigger_type == 64) } diff --git a/firmware/tunerstudio/generated/rusefi_proteus_h7.ini b/firmware/tunerstudio/generated/rusefi_proteus_h7.ini index 767712eb5c..4caec5b838 100644 --- a/firmware/tunerstudio/generated/rusefi_proteus_h7.ini +++ b/firmware/tunerstudio/generated/rusefi_proteus_h7.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.11.08.proteus_h7.916172919" + signature = "rusEFI master.2023.11.09.proteus_h7.633804065" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.11.08.proteus_h7.916172919" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.11.09.proteus_h7.633804065" ; 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 @@ -92,7 +92,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.jar based on (unknown script) integration/rusefi_config.txt Wed Nov 08 20:03:31 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Thu Nov 09 02:08:01 UTC 2023 pageSize = 27880 page = 1 @@ -2347,7 +2347,7 @@ lambdaMaxDeviationRpmBins = array, U16, 27870, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1440 + ochBlockSize = 1444 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3001,136 +3001,137 @@ brakePedalState = scalar, S08, 1092, "", 1, 0 startStopState = scalar, S08, 1093, "", 1, 0 startStopPhysicalState = bits, U32, 1096, [0:0] startStopStateToggleCounter = scalar, U32, 1100, "", 1, 0 -egtValue1 = scalar, F32, 1104, "", 1, 0 -egtValue2 = scalar, F32, 1108, "", 1, 0 -desiredRpmLimit = scalar, S16, 1112, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1116, "", 1, 0 -sparkCounter = scalar, U32, 1120, "", 1, 0 -fuelingLoad = scalar, F32, 1124, "", 1, 0 -ignitionLoad = scalar, F32, 1128, "", 1, 0 -veTableYAxis = scalar, U16, 1132, "%", 0.01, 0 -; total TS size = 1136 -tpsFrom = scalar, F32, 1136 -tpsTo = scalar, F32, 1140 -deltaTps = scalar, F32, 1144 -extraFuel = scalar, F32, 1148, "", 1, 0 -valueFromTable = scalar, F32, 1152, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1156, [0:0] -isBelowDecelThreshold = bits, U32, 1156, [1:1] -isTimeToResetAccumulator = bits, U32, 1156, [2:2] -isFractionalEnrichment = bits, U32, 1156, [3:3] -belowEpsilon = bits, U32, 1156, [4:4] -tooShort = bits, U32, 1156, [5:5] -fractionalInjFuel = scalar, F32, 1160, "", 1, 0 -accumulatedValue = scalar, F32, 1164, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1168, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1172, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1176, "", 1, 0 -cycleCnt = scalar, S32, 1180, "", 1, 0 -; total TS size = 1184 -hwEventCounters1 = scalar, U32, 1184, "", 1, 0 -hwEventCounters2 = scalar, U32, 1188, "", 1, 0 -hwEventCounters3 = scalar, U32, 1192, "", 1, 0 -hwEventCounters4 = scalar, U32, 1196, "", 1, 0 -hwEventCounters5 = scalar, U32, 1200, "", 1, 0 -hwEventCounters6 = scalar, U32, 1204, "", 1, 0 -vvtCamCounter = scalar, U32, 1208, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1212, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1216, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1220, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1221, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1224, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1228, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1232, "", 1, 0 -mapCamPrevToothAngle = scalar, F32, 1236, "deg", 1, 0 -isDecodingMapCam = bits, U32, 1240, [0:0] -; total TS size = 1244 -crankSynchronizationCounter = scalar, U32, 1244, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1248, "", 1, 0 -vvtToothDurations0 = scalar, U32, 1252, "us", 1, 0 -vvtCurrentPosition = scalar, F32, 1256, "sync: Primary Cam Position", 1, 0 -vvtToothPosition1 = scalar, F32, 1260, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition2 = scalar, F32, 1264, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition3 = scalar, F32, 1268, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition4 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio = scalar, F32, 1276, "", 1, 0 -triggerStateIndex = scalar, U08, 1280, "", 1, 0 -camResyncCounter = scalar, U08, 1281, "", 1, 0 -vvtStateIndex = scalar, U08, 1282, "", 1, 0 -; total TS size = 1284 -m_hasSynchronizedPhase = bits, U32, 1284, [0:0] +startStopStateTempPhysicalCounter = scalar, U32, 1104, "", 1, 0 +egtValue1 = scalar, F32, 1108, "", 1, 0 +egtValue2 = scalar, F32, 1112, "", 1, 0 +desiredRpmLimit = scalar, S16, 1116, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 1120, "", 1, 0 +sparkCounter = scalar, U32, 1124, "", 1, 0 +fuelingLoad = scalar, F32, 1128, "", 1, 0 +ignitionLoad = scalar, F32, 1132, "", 1, 0 +veTableYAxis = scalar, U16, 1136, "%", 0.01, 0 +; total TS size = 1140 +tpsFrom = scalar, F32, 1140 +tpsTo = scalar, F32, 1144 +deltaTps = scalar, F32, 1148 +extraFuel = scalar, F32, 1152, "", 1, 0 +valueFromTable = scalar, F32, 1156, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1160, [0:0] +isBelowDecelThreshold = bits, U32, 1160, [1:1] +isTimeToResetAccumulator = bits, U32, 1160, [2:2] +isFractionalEnrichment = bits, U32, 1160, [3:3] +belowEpsilon = bits, U32, 1160, [4:4] +tooShort = bits, U32, 1160, [5:5] +fractionalInjFuel = scalar, F32, 1164, "", 1, 0 +accumulatedValue = scalar, F32, 1168, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1172, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1176, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1180, "", 1, 0 +cycleCnt = scalar, S32, 1184, "", 1, 0 +; total TS size = 1188 +hwEventCounters1 = scalar, U32, 1188, "", 1, 0 +hwEventCounters2 = scalar, U32, 1192, "", 1, 0 +hwEventCounters3 = scalar, U32, 1196, "", 1, 0 +hwEventCounters4 = scalar, U32, 1200, "", 1, 0 +hwEventCounters5 = scalar, U32, 1204, "", 1, 0 +hwEventCounters6 = scalar, U32, 1208, "", 1, 0 +vvtCamCounter = scalar, U32, 1212, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1216, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1220, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1224, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1225, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1228, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1232, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1236, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1240, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1244, [0:0] +; total TS size = 1248 +crankSynchronizationCounter = scalar, U32, 1248, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1252, "", 1, 0 +vvtToothDurations0 = scalar, U32, 1256, "us", 1, 0 +vvtCurrentPosition = scalar, F32, 1260, "sync: Primary Cam Position", 1, 0 +vvtToothPosition1 = scalar, F32, 1264, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition2 = scalar, F32, 1268, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition3 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition4 = scalar, F32, 1276, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio = scalar, F32, 1280, "", 1, 0 +triggerStateIndex = scalar, U08, 1284, "", 1, 0 +camResyncCounter = scalar, U08, 1285, "", 1, 0 +vvtStateIndex = scalar, U08, 1286, "", 1, 0 ; total TS size = 1288 -wallFuelCorrection = scalar, F32, 1288, "", 1, 0 -wallFuel = scalar, F32, 1292, "", 1, 0 -; total TS size = 1296 -idleState = bits, S32, 1296, [0:2], "not important" -currentIdlePosition = scalar, F32, 1300 -baseIdlePosition = scalar, F32, 1304 -idleClosedLoop = scalar, F32, 1308 -iacByTpsTaper = scalar, F32, 1312 -throttlePedalUpState = scalar, S32, 1316, "", 1, 0 -mightResetPid = bits, U32, 1320, [0:0] -shouldResetPid = bits, U32, 1320, [1:1] -wasResetPid = bits, U32, 1320, [2:2] -mustResetPid = bits, U32, 1320, [3:3] -isCranking = bits, U32, 1320, [4:4] -isIacTableForCoasting = bits, U32, 1320, [5:5] -notIdling = bits, U32, 1320, [6:6] -needReset = bits, U32, 1320, [7:7] -isInDeadZone = bits, U32, 1320, [8:8] -isBlipping = bits, U32, 1320, [9:9] -useClosedLoop = bits, U32, 1320, [10:10] -badTps = bits, U32, 1320, [11:11] -looksLikeRunning = bits, U32, 1320, [12:12] -looksLikeCoasting = bits, U32, 1320, [13:13] -looksLikeCrankToIdle = bits, U32, 1320, [14:14] -isIdleCoasting = bits, U32, 1320, [15:15] -isIdleClosedLoop = bits, U32, 1320, [16:16] -idleTarget = scalar, S32, 1324, "", 1, 0 -targetRpmByClt = scalar, S32, 1328, "", 1, 0 -targetRpmAc = scalar, S32, 1332, "", 1, 0 -iacByRpmTaper = scalar, F32, 1336 -luaAdd = scalar, F32, 1340 -; total TS size = 1344 -idlePosition = scalar, F32, 1344, "per", 1,0 -trim = scalar, F32, 1348, "", 1, 0 -luaAdjustment = scalar, F32, 1352, "per", 1,0 -m_wastegatePosition = scalar, F32, 1356, "per", 1,0 -etbFeedForward = scalar, F32, 1360 -etbIntegralError = scalar, F32, 1364, "", 1, 0 -etbCurrentTarget = scalar, F32, 1368, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1372, "%", 1, 0 -etbRevLimitActive = bits, U32, 1376, [0:0] -jamDetected = bits, U32, 1376, [1:1] -etbDutyRateOfChange = scalar, F32, 1380, "per", 1,0 -etbDutyAverage = scalar, F32, 1384, "per", 1,0 -etbTpsErrorCounter = scalar, U16, 1388, "count", 1,0 -etbPpsErrorCounter = scalar, U16, 1390, "count", 1,0 -etbErrorCode = scalar, S08, 1392, "", 1, 0 -jamTimer = scalar, U16, 1394, "sec", 0.01, 0 -; total TS size = 1396 -faultCode = scalar, U08, 1396, "", 1, 0 -heaterDuty = scalar, U08, 1397, "%", 1, 0 -pumpDuty = scalar, U08, 1398, "%", 1, 0 -tempC = scalar, U16, 1400, "C", 1, 0 -nernstVoltage = scalar, U16, 1402, "V", 0.001, 0 -esr = scalar, U16, 1404, "ohm", 1, 0 -; total TS size = 1408 -dcOutput0 = scalar, F32, 1408, "per", 1,0 -isEnabled0_int = scalar, U08, 1412, "per", 1,0 -isEnabled0 = bits, U32, 1416, [0:0] -; total TS size = 1420 -value0 = scalar, U16, 1420, "value", 1,0 -value1 = scalar, U16, 1422, "value", 1,0 -errorRate = scalar, F32, 1424, "ratio", 1,0 -; total TS size = 1428 -vvtTarget = scalar, U16, 1428, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1430, "%", 0.5, 0 +m_hasSynchronizedPhase = bits, U32, 1288, [0:0] +; total TS size = 1292 +wallFuelCorrection = scalar, F32, 1292, "", 1, 0 +wallFuel = scalar, F32, 1296, "", 1, 0 +; total TS size = 1300 +idleState = bits, S32, 1300, [0:2], "not important" +currentIdlePosition = scalar, F32, 1304 +baseIdlePosition = scalar, F32, 1308 +idleClosedLoop = scalar, F32, 1312 +iacByTpsTaper = scalar, F32, 1316 +throttlePedalUpState = scalar, S32, 1320, "", 1, 0 +mightResetPid = bits, U32, 1324, [0:0] +shouldResetPid = bits, U32, 1324, [1:1] +wasResetPid = bits, U32, 1324, [2:2] +mustResetPid = bits, U32, 1324, [3:3] +isCranking = bits, U32, 1324, [4:4] +isIacTableForCoasting = bits, U32, 1324, [5:5] +notIdling = bits, U32, 1324, [6:6] +needReset = bits, U32, 1324, [7:7] +isInDeadZone = bits, U32, 1324, [8:8] +isBlipping = bits, U32, 1324, [9:9] +useClosedLoop = bits, U32, 1324, [10:10] +badTps = bits, U32, 1324, [11:11] +looksLikeRunning = bits, U32, 1324, [12:12] +looksLikeCoasting = bits, U32, 1324, [13:13] +looksLikeCrankToIdle = bits, U32, 1324, [14:14] +isIdleCoasting = bits, U32, 1324, [15:15] +isIdleClosedLoop = bits, U32, 1324, [16:16] +idleTarget = scalar, S32, 1328, "", 1, 0 +targetRpmByClt = scalar, S32, 1332, "", 1, 0 +targetRpmAc = scalar, S32, 1336, "", 1, 0 +iacByRpmTaper = scalar, F32, 1340 +luaAdd = scalar, F32, 1344 +; total TS size = 1348 +idlePosition = scalar, F32, 1348, "per", 1,0 +trim = scalar, F32, 1352, "", 1, 0 +luaAdjustment = scalar, F32, 1356, "per", 1,0 +m_wastegatePosition = scalar, F32, 1360, "per", 1,0 +etbFeedForward = scalar, F32, 1364 +etbIntegralError = scalar, F32, 1368, "", 1, 0 +etbCurrentTarget = scalar, F32, 1372, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1376, "%", 1, 0 +etbRevLimitActive = bits, U32, 1380, [0:0] +jamDetected = bits, U32, 1380, [1:1] +etbDutyRateOfChange = scalar, F32, 1384, "per", 1,0 +etbDutyAverage = scalar, F32, 1388, "per", 1,0 +etbTpsErrorCounter = scalar, U16, 1392, "count", 1,0 +etbPpsErrorCounter = scalar, U16, 1394, "count", 1,0 +etbErrorCode = scalar, S08, 1396, "", 1, 0 +jamTimer = scalar, U16, 1398, "sec", 0.01, 0 +; total TS size = 1400 +faultCode = scalar, U08, 1400, "", 1, 0 +heaterDuty = scalar, U08, 1401, "%", 1, 0 +pumpDuty = scalar, U08, 1402, "%", 1, 0 +tempC = scalar, U16, 1404, "C", 1, 0 +nernstVoltage = scalar, U16, 1406, "V", 0.001, 0 +esr = scalar, U16, 1408, "ohm", 1, 0 +; total TS size = 1412 +dcOutput0 = scalar, F32, 1412, "per", 1,0 +isEnabled0_int = scalar, U08, 1416, "per", 1,0 +isEnabled0 = bits, U32, 1420, [0:0] +; total TS size = 1424 +value0 = scalar, U16, 1424, "value", 1,0 +value1 = scalar, U16, 1426, "value", 1,0 +errorRate = scalar, F32, 1428, "ratio", 1,0 ; total TS size = 1432 -lambdaCurrentlyGood = bits, U32, 1432, [0:0] -lambdaMonitorCut = bits, U32, 1432, [1:1] -lambdaTimeSinceGood = scalar, U16, 1436, "sec", 0.01, 0 -; total TS size = 1440 +vvtTarget = scalar, U16, 1432, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1434, "%", 0.5, 0 +; total TS size = 1436 +lambdaCurrentlyGood = bits, U32, 1436, [0:0] +lambdaMonitorCut = bits, U32, 1436, [1:1] +lambdaTimeSinceGood = scalar, U16, 1440, "sec", 0.01, 0 +; total TS size = 1444 time = { timeNow } @@ -5196,6 +5197,7 @@ entry = brakePedalState, "Brake switch", int, "%d" entry = startStopState, "startStopState", int, "%d" entry = startStopPhysicalState, "startStopPhysicalState", int, "%d" entry = startStopStateToggleCounter, "startStopStateToggleCounter", int, "%d" +entry = startStopStateTempPhysicalCounter, "startStopStateTempPhysicalCounter", int, "%d" entry = egtValue1, "egtValue1", float, "%.3f" entry = egtValue2, "egtValue2", float, "%.3f" entry = desiredRpmLimit, "User-defined RPM hard limit", int, "%d" @@ -6087,13 +6089,14 @@ dialog = engine_stateDialog, "engine_state" graphLine = brakePedalState graphLine = startStopState graphLine = startStopStateToggleCounter - graphLine = egtValue1 + graphLine = startStopStateTempPhysicalCounter liveGraph = engine_state_5_Graph, "Graph", South + graphLine = egtValue1 graphLine = egtValue2 graphLine = desiredRpmLimit graphLine = fuelInjectionCounter - graphLine = sparkCounter liveGraph = engine_state_6_Graph, "Graph", South + graphLine = sparkCounter graphLine = fuelingLoad graphLine = ignitionLoad graphLine = veTableYAxis @@ -6429,8 +6432,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" ; cam if ; two-stroke, or ; not crank trigger and ((vague trigger and cam choice) or not vague trigger) - field = "Cam Sensor (Primary channel)", triggerInputPins1, 1, {twoStroke == 1 || ( !(trigger_type == 2 || trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 21 || trigger_type == 26 || trigger_type == 27 || trigger_type == 33 || trigger_type == 38 || trigger_type == 39 || trigger_type == 44 || trigger_type == 45 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 58 || trigger_type == 61 || trigger_type == 62 || trigger_type == 68 || trigger_type == 70 || trigger_type == 71 || trigger_type == 72 || trigger_type == 74 || trigger_type == 75 || trigger_type == 76 || trigger_type == 77 || trigger_type == 79) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) ) ) } - field = "Crank Sensor (Primary channel)", triggerInputPins1, 1, { !(twoStroke == 1 || ( !(trigger_type == 2 || trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 21 || trigger_type == 26 || trigger_type == 27 || trigger_type == 33 || trigger_type == 38 || trigger_type == 39 || trigger_type == 44 || trigger_type == 45 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 58 || trigger_type == 61 || trigger_type == 62 || trigger_type == 68 || trigger_type == 70 || trigger_type == 71 || trigger_type == 72 || trigger_type == 74 || trigger_type == 75 || trigger_type == 76 || trigger_type == 77 || trigger_type == 79) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) ) )) } + field = "Cam Sensor (Primary channel)", triggerInputPins1, 1, {twoStroke == 1 || ( !(trigger_type == 2 || trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 21 || trigger_type == 26 || trigger_type == 27 || trigger_type == 33 || trigger_type == 38 || trigger_type == 39 || trigger_type == 44 || trigger_type == 45 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 58 || trigger_type == 61 || trigger_type == 62 || trigger_type == 68 || trigger_type == 70 || trigger_type == 71 || trigger_type == 72 || trigger_type == 74 || trigger_type == 75 || trigger_type == 76 || trigger_type == 77) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) ) ) } + field = "Crank Sensor (Primary channel)", triggerInputPins1, 1, { !(twoStroke == 1 || ( !(trigger_type == 2 || trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 21 || trigger_type == 26 || trigger_type == 27 || trigger_type == 33 || trigger_type == 38 || trigger_type == 39 || trigger_type == 44 || trigger_type == 45 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 58 || trigger_type == 61 || trigger_type == 62 || trigger_type == 68 || trigger_type == 70 || trigger_type == 71 || trigger_type == 72 || trigger_type == 74 || trigger_type == 75 || trigger_type == 76 || trigger_type == 77) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) ) )) } field = "Invert Primary", invertPrimaryTriggerSignal field = "Secondary channel", triggerInputPins2, { triggerInputPins2 != 0 || (triggerInputPins1 != 0 && (trigger_type == 1 || trigger_type == 3 || trigger_type == 15 || trigger_type == 16 || trigger_type == 19 || trigger_type == 25 || trigger_type == 28 || trigger_type == 31 || trigger_type == 35 || trigger_type == 36 || trigger_type == 37 || trigger_type == 40 || trigger_type == 49 || trigger_type == 50 || trigger_type == 53 || trigger_type == 54 || trigger_type == 63 || trigger_type == 64) ) } field = "Invert Secondary", invertSecondaryTriggerSignal, {triggerInputPins2 != 0 && (trigger_type == 1 || trigger_type == 3 || trigger_type == 15 || trigger_type == 16 || trigger_type == 19 || trigger_type == 25 || trigger_type == 28 || trigger_type == 31 || trigger_type == 35 || trigger_type == 36 || trigger_type == 37 || trigger_type == 40 || trigger_type == 49 || trigger_type == 50 || trigger_type == 53 || trigger_type == 54 || trigger_type == 63 || trigger_type == 64) } diff --git a/firmware/tunerstudio/generated/rusefi_s105.ini b/firmware/tunerstudio/generated/rusefi_s105.ini index a4558e48f8..725adffe3f 100644 --- a/firmware/tunerstudio/generated/rusefi_s105.ini +++ b/firmware/tunerstudio/generated/rusefi_s105.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.11.08.s105.1503899243" + signature = "rusEFI master.2023.11.09.s105.1258228541" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.11.08.s105.1503899243" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.11.09.s105.1258228541" ; 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 @@ -92,7 +92,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.jar based on (unknown script) integration/rusefi_config.txt Wed Nov 08 20:03:07 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Thu Nov 09 02:07:44 UTC 2023 pageSize = 23880 page = 1 @@ -2347,7 +2347,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23870, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1440 + ochBlockSize = 1444 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3001,136 +3001,137 @@ brakePedalState = scalar, S08, 1092, "", 1, 0 startStopState = scalar, S08, 1093, "", 1, 0 startStopPhysicalState = bits, U32, 1096, [0:0] startStopStateToggleCounter = scalar, U32, 1100, "", 1, 0 -egtValue1 = scalar, F32, 1104, "", 1, 0 -egtValue2 = scalar, F32, 1108, "", 1, 0 -desiredRpmLimit = scalar, S16, 1112, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1116, "", 1, 0 -sparkCounter = scalar, U32, 1120, "", 1, 0 -fuelingLoad = scalar, F32, 1124, "", 1, 0 -ignitionLoad = scalar, F32, 1128, "", 1, 0 -veTableYAxis = scalar, U16, 1132, "%", 0.01, 0 -; total TS size = 1136 -tpsFrom = scalar, F32, 1136 -tpsTo = scalar, F32, 1140 -deltaTps = scalar, F32, 1144 -extraFuel = scalar, F32, 1148, "", 1, 0 -valueFromTable = scalar, F32, 1152, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1156, [0:0] -isBelowDecelThreshold = bits, U32, 1156, [1:1] -isTimeToResetAccumulator = bits, U32, 1156, [2:2] -isFractionalEnrichment = bits, U32, 1156, [3:3] -belowEpsilon = bits, U32, 1156, [4:4] -tooShort = bits, U32, 1156, [5:5] -fractionalInjFuel = scalar, F32, 1160, "", 1, 0 -accumulatedValue = scalar, F32, 1164, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1168, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1172, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1176, "", 1, 0 -cycleCnt = scalar, S32, 1180, "", 1, 0 -; total TS size = 1184 -hwEventCounters1 = scalar, U32, 1184, "", 1, 0 -hwEventCounters2 = scalar, U32, 1188, "", 1, 0 -hwEventCounters3 = scalar, U32, 1192, "", 1, 0 -hwEventCounters4 = scalar, U32, 1196, "", 1, 0 -hwEventCounters5 = scalar, U32, 1200, "", 1, 0 -hwEventCounters6 = scalar, U32, 1204, "", 1, 0 -vvtCamCounter = scalar, U32, 1208, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1212, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1216, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1220, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1221, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1224, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1228, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1232, "", 1, 0 -mapCamPrevToothAngle = scalar, F32, 1236, "deg", 1, 0 -isDecodingMapCam = bits, U32, 1240, [0:0] -; total TS size = 1244 -crankSynchronizationCounter = scalar, U32, 1244, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1248, "", 1, 0 -vvtToothDurations0 = scalar, U32, 1252, "us", 1, 0 -vvtCurrentPosition = scalar, F32, 1256, "sync: Primary Cam Position", 1, 0 -vvtToothPosition1 = scalar, F32, 1260, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition2 = scalar, F32, 1264, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition3 = scalar, F32, 1268, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition4 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio = scalar, F32, 1276, "", 1, 0 -triggerStateIndex = scalar, U08, 1280, "", 1, 0 -camResyncCounter = scalar, U08, 1281, "", 1, 0 -vvtStateIndex = scalar, U08, 1282, "", 1, 0 -; total TS size = 1284 -m_hasSynchronizedPhase = bits, U32, 1284, [0:0] +startStopStateTempPhysicalCounter = scalar, U32, 1104, "", 1, 0 +egtValue1 = scalar, F32, 1108, "", 1, 0 +egtValue2 = scalar, F32, 1112, "", 1, 0 +desiredRpmLimit = scalar, S16, 1116, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 1120, "", 1, 0 +sparkCounter = scalar, U32, 1124, "", 1, 0 +fuelingLoad = scalar, F32, 1128, "", 1, 0 +ignitionLoad = scalar, F32, 1132, "", 1, 0 +veTableYAxis = scalar, U16, 1136, "%", 0.01, 0 +; total TS size = 1140 +tpsFrom = scalar, F32, 1140 +tpsTo = scalar, F32, 1144 +deltaTps = scalar, F32, 1148 +extraFuel = scalar, F32, 1152, "", 1, 0 +valueFromTable = scalar, F32, 1156, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1160, [0:0] +isBelowDecelThreshold = bits, U32, 1160, [1:1] +isTimeToResetAccumulator = bits, U32, 1160, [2:2] +isFractionalEnrichment = bits, U32, 1160, [3:3] +belowEpsilon = bits, U32, 1160, [4:4] +tooShort = bits, U32, 1160, [5:5] +fractionalInjFuel = scalar, F32, 1164, "", 1, 0 +accumulatedValue = scalar, F32, 1168, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1172, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1176, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1180, "", 1, 0 +cycleCnt = scalar, S32, 1184, "", 1, 0 +; total TS size = 1188 +hwEventCounters1 = scalar, U32, 1188, "", 1, 0 +hwEventCounters2 = scalar, U32, 1192, "", 1, 0 +hwEventCounters3 = scalar, U32, 1196, "", 1, 0 +hwEventCounters4 = scalar, U32, 1200, "", 1, 0 +hwEventCounters5 = scalar, U32, 1204, "", 1, 0 +hwEventCounters6 = scalar, U32, 1208, "", 1, 0 +vvtCamCounter = scalar, U32, 1212, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1216, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1220, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1224, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1225, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1228, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1232, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1236, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1240, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1244, [0:0] +; total TS size = 1248 +crankSynchronizationCounter = scalar, U32, 1248, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1252, "", 1, 0 +vvtToothDurations0 = scalar, U32, 1256, "us", 1, 0 +vvtCurrentPosition = scalar, F32, 1260, "sync: Primary Cam Position", 1, 0 +vvtToothPosition1 = scalar, F32, 1264, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition2 = scalar, F32, 1268, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition3 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition4 = scalar, F32, 1276, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio = scalar, F32, 1280, "", 1, 0 +triggerStateIndex = scalar, U08, 1284, "", 1, 0 +camResyncCounter = scalar, U08, 1285, "", 1, 0 +vvtStateIndex = scalar, U08, 1286, "", 1, 0 ; total TS size = 1288 -wallFuelCorrection = scalar, F32, 1288, "", 1, 0 -wallFuel = scalar, F32, 1292, "", 1, 0 -; total TS size = 1296 -idleState = bits, S32, 1296, [0:2], "not important" -currentIdlePosition = scalar, F32, 1300 -baseIdlePosition = scalar, F32, 1304 -idleClosedLoop = scalar, F32, 1308 -iacByTpsTaper = scalar, F32, 1312 -throttlePedalUpState = scalar, S32, 1316, "", 1, 0 -mightResetPid = bits, U32, 1320, [0:0] -shouldResetPid = bits, U32, 1320, [1:1] -wasResetPid = bits, U32, 1320, [2:2] -mustResetPid = bits, U32, 1320, [3:3] -isCranking = bits, U32, 1320, [4:4] -isIacTableForCoasting = bits, U32, 1320, [5:5] -notIdling = bits, U32, 1320, [6:6] -needReset = bits, U32, 1320, [7:7] -isInDeadZone = bits, U32, 1320, [8:8] -isBlipping = bits, U32, 1320, [9:9] -useClosedLoop = bits, U32, 1320, [10:10] -badTps = bits, U32, 1320, [11:11] -looksLikeRunning = bits, U32, 1320, [12:12] -looksLikeCoasting = bits, U32, 1320, [13:13] -looksLikeCrankToIdle = bits, U32, 1320, [14:14] -isIdleCoasting = bits, U32, 1320, [15:15] -isIdleClosedLoop = bits, U32, 1320, [16:16] -idleTarget = scalar, S32, 1324, "", 1, 0 -targetRpmByClt = scalar, S32, 1328, "", 1, 0 -targetRpmAc = scalar, S32, 1332, "", 1, 0 -iacByRpmTaper = scalar, F32, 1336 -luaAdd = scalar, F32, 1340 -; total TS size = 1344 -idlePosition = scalar, F32, 1344, "per", 1,0 -trim = scalar, F32, 1348, "", 1, 0 -luaAdjustment = scalar, F32, 1352, "per", 1,0 -m_wastegatePosition = scalar, F32, 1356, "per", 1,0 -etbFeedForward = scalar, F32, 1360 -etbIntegralError = scalar, F32, 1364, "", 1, 0 -etbCurrentTarget = scalar, F32, 1368, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1372, "%", 1, 0 -etbRevLimitActive = bits, U32, 1376, [0:0] -jamDetected = bits, U32, 1376, [1:1] -etbDutyRateOfChange = scalar, F32, 1380, "per", 1,0 -etbDutyAverage = scalar, F32, 1384, "per", 1,0 -etbTpsErrorCounter = scalar, U16, 1388, "count", 1,0 -etbPpsErrorCounter = scalar, U16, 1390, "count", 1,0 -etbErrorCode = scalar, S08, 1392, "", 1, 0 -jamTimer = scalar, U16, 1394, "sec", 0.01, 0 -; total TS size = 1396 -faultCode = scalar, U08, 1396, "", 1, 0 -heaterDuty = scalar, U08, 1397, "%", 1, 0 -pumpDuty = scalar, U08, 1398, "%", 1, 0 -tempC = scalar, U16, 1400, "C", 1, 0 -nernstVoltage = scalar, U16, 1402, "V", 0.001, 0 -esr = scalar, U16, 1404, "ohm", 1, 0 -; total TS size = 1408 -dcOutput0 = scalar, F32, 1408, "per", 1,0 -isEnabled0_int = scalar, U08, 1412, "per", 1,0 -isEnabled0 = bits, U32, 1416, [0:0] -; total TS size = 1420 -value0 = scalar, U16, 1420, "value", 1,0 -value1 = scalar, U16, 1422, "value", 1,0 -errorRate = scalar, F32, 1424, "ratio", 1,0 -; total TS size = 1428 -vvtTarget = scalar, U16, 1428, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1430, "%", 0.5, 0 +m_hasSynchronizedPhase = bits, U32, 1288, [0:0] +; total TS size = 1292 +wallFuelCorrection = scalar, F32, 1292, "", 1, 0 +wallFuel = scalar, F32, 1296, "", 1, 0 +; total TS size = 1300 +idleState = bits, S32, 1300, [0:2], "not important" +currentIdlePosition = scalar, F32, 1304 +baseIdlePosition = scalar, F32, 1308 +idleClosedLoop = scalar, F32, 1312 +iacByTpsTaper = scalar, F32, 1316 +throttlePedalUpState = scalar, S32, 1320, "", 1, 0 +mightResetPid = bits, U32, 1324, [0:0] +shouldResetPid = bits, U32, 1324, [1:1] +wasResetPid = bits, U32, 1324, [2:2] +mustResetPid = bits, U32, 1324, [3:3] +isCranking = bits, U32, 1324, [4:4] +isIacTableForCoasting = bits, U32, 1324, [5:5] +notIdling = bits, U32, 1324, [6:6] +needReset = bits, U32, 1324, [7:7] +isInDeadZone = bits, U32, 1324, [8:8] +isBlipping = bits, U32, 1324, [9:9] +useClosedLoop = bits, U32, 1324, [10:10] +badTps = bits, U32, 1324, [11:11] +looksLikeRunning = bits, U32, 1324, [12:12] +looksLikeCoasting = bits, U32, 1324, [13:13] +looksLikeCrankToIdle = bits, U32, 1324, [14:14] +isIdleCoasting = bits, U32, 1324, [15:15] +isIdleClosedLoop = bits, U32, 1324, [16:16] +idleTarget = scalar, S32, 1328, "", 1, 0 +targetRpmByClt = scalar, S32, 1332, "", 1, 0 +targetRpmAc = scalar, S32, 1336, "", 1, 0 +iacByRpmTaper = scalar, F32, 1340 +luaAdd = scalar, F32, 1344 +; total TS size = 1348 +idlePosition = scalar, F32, 1348, "per", 1,0 +trim = scalar, F32, 1352, "", 1, 0 +luaAdjustment = scalar, F32, 1356, "per", 1,0 +m_wastegatePosition = scalar, F32, 1360, "per", 1,0 +etbFeedForward = scalar, F32, 1364 +etbIntegralError = scalar, F32, 1368, "", 1, 0 +etbCurrentTarget = scalar, F32, 1372, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1376, "%", 1, 0 +etbRevLimitActive = bits, U32, 1380, [0:0] +jamDetected = bits, U32, 1380, [1:1] +etbDutyRateOfChange = scalar, F32, 1384, "per", 1,0 +etbDutyAverage = scalar, F32, 1388, "per", 1,0 +etbTpsErrorCounter = scalar, U16, 1392, "count", 1,0 +etbPpsErrorCounter = scalar, U16, 1394, "count", 1,0 +etbErrorCode = scalar, S08, 1396, "", 1, 0 +jamTimer = scalar, U16, 1398, "sec", 0.01, 0 +; total TS size = 1400 +faultCode = scalar, U08, 1400, "", 1, 0 +heaterDuty = scalar, U08, 1401, "%", 1, 0 +pumpDuty = scalar, U08, 1402, "%", 1, 0 +tempC = scalar, U16, 1404, "C", 1, 0 +nernstVoltage = scalar, U16, 1406, "V", 0.001, 0 +esr = scalar, U16, 1408, "ohm", 1, 0 +; total TS size = 1412 +dcOutput0 = scalar, F32, 1412, "per", 1,0 +isEnabled0_int = scalar, U08, 1416, "per", 1,0 +isEnabled0 = bits, U32, 1420, [0:0] +; total TS size = 1424 +value0 = scalar, U16, 1424, "value", 1,0 +value1 = scalar, U16, 1426, "value", 1,0 +errorRate = scalar, F32, 1428, "ratio", 1,0 ; total TS size = 1432 -lambdaCurrentlyGood = bits, U32, 1432, [0:0] -lambdaMonitorCut = bits, U32, 1432, [1:1] -lambdaTimeSinceGood = scalar, U16, 1436, "sec", 0.01, 0 -; total TS size = 1440 +vvtTarget = scalar, U16, 1432, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1434, "%", 0.5, 0 +; total TS size = 1436 +lambdaCurrentlyGood = bits, U32, 1436, [0:0] +lambdaMonitorCut = bits, U32, 1436, [1:1] +lambdaTimeSinceGood = scalar, U16, 1440, "sec", 0.01, 0 +; total TS size = 1444 time = { timeNow } @@ -5196,6 +5197,7 @@ entry = brakePedalState, "Brake switch", int, "%d" entry = startStopState, "startStopState", int, "%d" entry = startStopPhysicalState, "startStopPhysicalState", int, "%d" entry = startStopStateToggleCounter, "startStopStateToggleCounter", int, "%d" +entry = startStopStateTempPhysicalCounter, "startStopStateTempPhysicalCounter", int, "%d" entry = egtValue1, "egtValue1", float, "%.3f" entry = egtValue2, "egtValue2", float, "%.3f" entry = desiredRpmLimit, "User-defined RPM hard limit", int, "%d" @@ -6078,13 +6080,14 @@ dialog = engine_stateDialog, "engine_state" graphLine = brakePedalState graphLine = startStopState graphLine = startStopStateToggleCounter - graphLine = egtValue1 + graphLine = startStopStateTempPhysicalCounter liveGraph = engine_state_5_Graph, "Graph", South + graphLine = egtValue1 graphLine = egtValue2 graphLine = desiredRpmLimit graphLine = fuelInjectionCounter - graphLine = sparkCounter liveGraph = engine_state_6_Graph, "Graph", South + graphLine = sparkCounter graphLine = fuelingLoad graphLine = ignitionLoad graphLine = veTableYAxis @@ -6420,8 +6423,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" ; cam if ; two-stroke, or ; not crank trigger and ((vague trigger and cam choice) or not vague trigger) - field = "Cam Sensor (Primary channel)", triggerInputPins1, 1, {twoStroke == 1 || ( !(trigger_type == 2 || trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 21 || trigger_type == 26 || trigger_type == 27 || trigger_type == 33 || trigger_type == 38 || trigger_type == 39 || trigger_type == 44 || trigger_type == 45 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 58 || trigger_type == 61 || trigger_type == 62 || trigger_type == 68 || trigger_type == 70 || trigger_type == 71 || trigger_type == 72 || trigger_type == 74 || trigger_type == 75 || trigger_type == 76 || trigger_type == 77 || trigger_type == 79) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) ) ) } - field = "Crank Sensor (Primary channel)", triggerInputPins1, 1, { !(twoStroke == 1 || ( !(trigger_type == 2 || trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 21 || trigger_type == 26 || trigger_type == 27 || trigger_type == 33 || trigger_type == 38 || trigger_type == 39 || trigger_type == 44 || trigger_type == 45 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 58 || trigger_type == 61 || trigger_type == 62 || trigger_type == 68 || trigger_type == 70 || trigger_type == 71 || trigger_type == 72 || trigger_type == 74 || trigger_type == 75 || trigger_type == 76 || trigger_type == 77 || trigger_type == 79) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) ) )) } + field = "Cam Sensor (Primary channel)", triggerInputPins1, 1, {twoStroke == 1 || ( !(trigger_type == 2 || trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 21 || trigger_type == 26 || trigger_type == 27 || trigger_type == 33 || trigger_type == 38 || trigger_type == 39 || trigger_type == 44 || trigger_type == 45 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 58 || trigger_type == 61 || trigger_type == 62 || trigger_type == 68 || trigger_type == 70 || trigger_type == 71 || trigger_type == 72 || trigger_type == 74 || trigger_type == 75 || trigger_type == 76 || trigger_type == 77) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) ) ) } + field = "Crank Sensor (Primary channel)", triggerInputPins1, 1, { !(twoStroke == 1 || ( !(trigger_type == 2 || trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 21 || trigger_type == 26 || trigger_type == 27 || trigger_type == 33 || trigger_type == 38 || trigger_type == 39 || trigger_type == 44 || trigger_type == 45 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 58 || trigger_type == 61 || trigger_type == 62 || trigger_type == 68 || trigger_type == 70 || trigger_type == 71 || trigger_type == 72 || trigger_type == 74 || trigger_type == 75 || trigger_type == 76 || trigger_type == 77) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) ) )) } field = "Invert Primary", invertPrimaryTriggerSignal field = "Secondary channel", triggerInputPins2, { triggerInputPins2 != 0 || (triggerInputPins1 != 0 && (trigger_type == 1 || trigger_type == 3 || trigger_type == 15 || trigger_type == 16 || trigger_type == 19 || trigger_type == 25 || trigger_type == 28 || trigger_type == 31 || trigger_type == 35 || trigger_type == 36 || trigger_type == 37 || trigger_type == 40 || trigger_type == 49 || trigger_type == 50 || trigger_type == 53 || trigger_type == 54 || trigger_type == 63 || trigger_type == 64) ) } field = "Invert Secondary", invertSecondaryTriggerSignal, {triggerInputPins2 != 0 && (trigger_type == 1 || trigger_type == 3 || trigger_type == 15 || trigger_type == 16 || trigger_type == 19 || trigger_type == 25 || trigger_type == 28 || trigger_type == 31 || trigger_type == 35 || trigger_type == 36 || trigger_type == 37 || trigger_type == 40 || trigger_type == 49 || trigger_type == 50 || trigger_type == 53 || trigger_type == 54 || trigger_type == 63 || trigger_type == 64) } diff --git a/firmware/tunerstudio/generated/rusefi_small-can-board.ini b/firmware/tunerstudio/generated/rusefi_small-can-board.ini index 6c023fa729..23dbb61999 100644 --- a/firmware/tunerstudio/generated/rusefi_small-can-board.ini +++ b/firmware/tunerstudio/generated/rusefi_small-can-board.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.11.08.small-can-board.991457793" + signature = "rusEFI master.2023.11.09.small-can-board.675600215" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.11.08.small-can-board.991457793" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.11.09.small-can-board.675600215" ; 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 @@ -92,7 +92,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","INVALID","INVALID","INVALID","A2 Battery Sense","INVALID","INVALID","C2 - Analog/Digital Input","C4 - Analog/Digital Input" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Nov 08 20:02:49 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Thu Nov 09 02:07:32 UTC 2023 pageSize = 23880 page = 1 @@ -2347,7 +2347,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23870, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1440 + ochBlockSize = 1444 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3001,136 +3001,137 @@ brakePedalState = scalar, S08, 1092, "", 1, 0 startStopState = scalar, S08, 1093, "", 1, 0 startStopPhysicalState = bits, U32, 1096, [0:0] startStopStateToggleCounter = scalar, U32, 1100, "", 1, 0 -egtValue1 = scalar, F32, 1104, "", 1, 0 -egtValue2 = scalar, F32, 1108, "", 1, 0 -desiredRpmLimit = scalar, S16, 1112, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1116, "", 1, 0 -sparkCounter = scalar, U32, 1120, "", 1, 0 -fuelingLoad = scalar, F32, 1124, "", 1, 0 -ignitionLoad = scalar, F32, 1128, "", 1, 0 -veTableYAxis = scalar, U16, 1132, "%", 0.01, 0 -; total TS size = 1136 -tpsFrom = scalar, F32, 1136 -tpsTo = scalar, F32, 1140 -deltaTps = scalar, F32, 1144 -extraFuel = scalar, F32, 1148, "", 1, 0 -valueFromTable = scalar, F32, 1152, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1156, [0:0] -isBelowDecelThreshold = bits, U32, 1156, [1:1] -isTimeToResetAccumulator = bits, U32, 1156, [2:2] -isFractionalEnrichment = bits, U32, 1156, [3:3] -belowEpsilon = bits, U32, 1156, [4:4] -tooShort = bits, U32, 1156, [5:5] -fractionalInjFuel = scalar, F32, 1160, "", 1, 0 -accumulatedValue = scalar, F32, 1164, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1168, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1172, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1176, "", 1, 0 -cycleCnt = scalar, S32, 1180, "", 1, 0 -; total TS size = 1184 -hwEventCounters1 = scalar, U32, 1184, "", 1, 0 -hwEventCounters2 = scalar, U32, 1188, "", 1, 0 -hwEventCounters3 = scalar, U32, 1192, "", 1, 0 -hwEventCounters4 = scalar, U32, 1196, "", 1, 0 -hwEventCounters5 = scalar, U32, 1200, "", 1, 0 -hwEventCounters6 = scalar, U32, 1204, "", 1, 0 -vvtCamCounter = scalar, U32, 1208, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1212, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1216, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1220, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1221, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1224, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1228, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1232, "", 1, 0 -mapCamPrevToothAngle = scalar, F32, 1236, "deg", 1, 0 -isDecodingMapCam = bits, U32, 1240, [0:0] -; total TS size = 1244 -crankSynchronizationCounter = scalar, U32, 1244, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1248, "", 1, 0 -vvtToothDurations0 = scalar, U32, 1252, "us", 1, 0 -vvtCurrentPosition = scalar, F32, 1256, "sync: Primary Cam Position", 1, 0 -vvtToothPosition1 = scalar, F32, 1260, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition2 = scalar, F32, 1264, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition3 = scalar, F32, 1268, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition4 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio = scalar, F32, 1276, "", 1, 0 -triggerStateIndex = scalar, U08, 1280, "", 1, 0 -camResyncCounter = scalar, U08, 1281, "", 1, 0 -vvtStateIndex = scalar, U08, 1282, "", 1, 0 -; total TS size = 1284 -m_hasSynchronizedPhase = bits, U32, 1284, [0:0] +startStopStateTempPhysicalCounter = scalar, U32, 1104, "", 1, 0 +egtValue1 = scalar, F32, 1108, "", 1, 0 +egtValue2 = scalar, F32, 1112, "", 1, 0 +desiredRpmLimit = scalar, S16, 1116, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 1120, "", 1, 0 +sparkCounter = scalar, U32, 1124, "", 1, 0 +fuelingLoad = scalar, F32, 1128, "", 1, 0 +ignitionLoad = scalar, F32, 1132, "", 1, 0 +veTableYAxis = scalar, U16, 1136, "%", 0.01, 0 +; total TS size = 1140 +tpsFrom = scalar, F32, 1140 +tpsTo = scalar, F32, 1144 +deltaTps = scalar, F32, 1148 +extraFuel = scalar, F32, 1152, "", 1, 0 +valueFromTable = scalar, F32, 1156, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1160, [0:0] +isBelowDecelThreshold = bits, U32, 1160, [1:1] +isTimeToResetAccumulator = bits, U32, 1160, [2:2] +isFractionalEnrichment = bits, U32, 1160, [3:3] +belowEpsilon = bits, U32, 1160, [4:4] +tooShort = bits, U32, 1160, [5:5] +fractionalInjFuel = scalar, F32, 1164, "", 1, 0 +accumulatedValue = scalar, F32, 1168, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1172, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1176, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1180, "", 1, 0 +cycleCnt = scalar, S32, 1184, "", 1, 0 +; total TS size = 1188 +hwEventCounters1 = scalar, U32, 1188, "", 1, 0 +hwEventCounters2 = scalar, U32, 1192, "", 1, 0 +hwEventCounters3 = scalar, U32, 1196, "", 1, 0 +hwEventCounters4 = scalar, U32, 1200, "", 1, 0 +hwEventCounters5 = scalar, U32, 1204, "", 1, 0 +hwEventCounters6 = scalar, U32, 1208, "", 1, 0 +vvtCamCounter = scalar, U32, 1212, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1216, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1220, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1224, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1225, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1228, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1232, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1236, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1240, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1244, [0:0] +; total TS size = 1248 +crankSynchronizationCounter = scalar, U32, 1248, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1252, "", 1, 0 +vvtToothDurations0 = scalar, U32, 1256, "us", 1, 0 +vvtCurrentPosition = scalar, F32, 1260, "sync: Primary Cam Position", 1, 0 +vvtToothPosition1 = scalar, F32, 1264, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition2 = scalar, F32, 1268, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition3 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition4 = scalar, F32, 1276, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio = scalar, F32, 1280, "", 1, 0 +triggerStateIndex = scalar, U08, 1284, "", 1, 0 +camResyncCounter = scalar, U08, 1285, "", 1, 0 +vvtStateIndex = scalar, U08, 1286, "", 1, 0 ; total TS size = 1288 -wallFuelCorrection = scalar, F32, 1288, "", 1, 0 -wallFuel = scalar, F32, 1292, "", 1, 0 -; total TS size = 1296 -idleState = bits, S32, 1296, [0:2], "not important" -currentIdlePosition = scalar, F32, 1300 -baseIdlePosition = scalar, F32, 1304 -idleClosedLoop = scalar, F32, 1308 -iacByTpsTaper = scalar, F32, 1312 -throttlePedalUpState = scalar, S32, 1316, "", 1, 0 -mightResetPid = bits, U32, 1320, [0:0] -shouldResetPid = bits, U32, 1320, [1:1] -wasResetPid = bits, U32, 1320, [2:2] -mustResetPid = bits, U32, 1320, [3:3] -isCranking = bits, U32, 1320, [4:4] -isIacTableForCoasting = bits, U32, 1320, [5:5] -notIdling = bits, U32, 1320, [6:6] -needReset = bits, U32, 1320, [7:7] -isInDeadZone = bits, U32, 1320, [8:8] -isBlipping = bits, U32, 1320, [9:9] -useClosedLoop = bits, U32, 1320, [10:10] -badTps = bits, U32, 1320, [11:11] -looksLikeRunning = bits, U32, 1320, [12:12] -looksLikeCoasting = bits, U32, 1320, [13:13] -looksLikeCrankToIdle = bits, U32, 1320, [14:14] -isIdleCoasting = bits, U32, 1320, [15:15] -isIdleClosedLoop = bits, U32, 1320, [16:16] -idleTarget = scalar, S32, 1324, "", 1, 0 -targetRpmByClt = scalar, S32, 1328, "", 1, 0 -targetRpmAc = scalar, S32, 1332, "", 1, 0 -iacByRpmTaper = scalar, F32, 1336 -luaAdd = scalar, F32, 1340 -; total TS size = 1344 -idlePosition = scalar, F32, 1344, "per", 1,0 -trim = scalar, F32, 1348, "", 1, 0 -luaAdjustment = scalar, F32, 1352, "per", 1,0 -m_wastegatePosition = scalar, F32, 1356, "per", 1,0 -etbFeedForward = scalar, F32, 1360 -etbIntegralError = scalar, F32, 1364, "", 1, 0 -etbCurrentTarget = scalar, F32, 1368, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1372, "%", 1, 0 -etbRevLimitActive = bits, U32, 1376, [0:0] -jamDetected = bits, U32, 1376, [1:1] -etbDutyRateOfChange = scalar, F32, 1380, "per", 1,0 -etbDutyAverage = scalar, F32, 1384, "per", 1,0 -etbTpsErrorCounter = scalar, U16, 1388, "count", 1,0 -etbPpsErrorCounter = scalar, U16, 1390, "count", 1,0 -etbErrorCode = scalar, S08, 1392, "", 1, 0 -jamTimer = scalar, U16, 1394, "sec", 0.01, 0 -; total TS size = 1396 -faultCode = scalar, U08, 1396, "", 1, 0 -heaterDuty = scalar, U08, 1397, "%", 1, 0 -pumpDuty = scalar, U08, 1398, "%", 1, 0 -tempC = scalar, U16, 1400, "C", 1, 0 -nernstVoltage = scalar, U16, 1402, "V", 0.001, 0 -esr = scalar, U16, 1404, "ohm", 1, 0 -; total TS size = 1408 -dcOutput0 = scalar, F32, 1408, "per", 1,0 -isEnabled0_int = scalar, U08, 1412, "per", 1,0 -isEnabled0 = bits, U32, 1416, [0:0] -; total TS size = 1420 -value0 = scalar, U16, 1420, "value", 1,0 -value1 = scalar, U16, 1422, "value", 1,0 -errorRate = scalar, F32, 1424, "ratio", 1,0 -; total TS size = 1428 -vvtTarget = scalar, U16, 1428, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1430, "%", 0.5, 0 +m_hasSynchronizedPhase = bits, U32, 1288, [0:0] +; total TS size = 1292 +wallFuelCorrection = scalar, F32, 1292, "", 1, 0 +wallFuel = scalar, F32, 1296, "", 1, 0 +; total TS size = 1300 +idleState = bits, S32, 1300, [0:2], "not important" +currentIdlePosition = scalar, F32, 1304 +baseIdlePosition = scalar, F32, 1308 +idleClosedLoop = scalar, F32, 1312 +iacByTpsTaper = scalar, F32, 1316 +throttlePedalUpState = scalar, S32, 1320, "", 1, 0 +mightResetPid = bits, U32, 1324, [0:0] +shouldResetPid = bits, U32, 1324, [1:1] +wasResetPid = bits, U32, 1324, [2:2] +mustResetPid = bits, U32, 1324, [3:3] +isCranking = bits, U32, 1324, [4:4] +isIacTableForCoasting = bits, U32, 1324, [5:5] +notIdling = bits, U32, 1324, [6:6] +needReset = bits, U32, 1324, [7:7] +isInDeadZone = bits, U32, 1324, [8:8] +isBlipping = bits, U32, 1324, [9:9] +useClosedLoop = bits, U32, 1324, [10:10] +badTps = bits, U32, 1324, [11:11] +looksLikeRunning = bits, U32, 1324, [12:12] +looksLikeCoasting = bits, U32, 1324, [13:13] +looksLikeCrankToIdle = bits, U32, 1324, [14:14] +isIdleCoasting = bits, U32, 1324, [15:15] +isIdleClosedLoop = bits, U32, 1324, [16:16] +idleTarget = scalar, S32, 1328, "", 1, 0 +targetRpmByClt = scalar, S32, 1332, "", 1, 0 +targetRpmAc = scalar, S32, 1336, "", 1, 0 +iacByRpmTaper = scalar, F32, 1340 +luaAdd = scalar, F32, 1344 +; total TS size = 1348 +idlePosition = scalar, F32, 1348, "per", 1,0 +trim = scalar, F32, 1352, "", 1, 0 +luaAdjustment = scalar, F32, 1356, "per", 1,0 +m_wastegatePosition = scalar, F32, 1360, "per", 1,0 +etbFeedForward = scalar, F32, 1364 +etbIntegralError = scalar, F32, 1368, "", 1, 0 +etbCurrentTarget = scalar, F32, 1372, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1376, "%", 1, 0 +etbRevLimitActive = bits, U32, 1380, [0:0] +jamDetected = bits, U32, 1380, [1:1] +etbDutyRateOfChange = scalar, F32, 1384, "per", 1,0 +etbDutyAverage = scalar, F32, 1388, "per", 1,0 +etbTpsErrorCounter = scalar, U16, 1392, "count", 1,0 +etbPpsErrorCounter = scalar, U16, 1394, "count", 1,0 +etbErrorCode = scalar, S08, 1396, "", 1, 0 +jamTimer = scalar, U16, 1398, "sec", 0.01, 0 +; total TS size = 1400 +faultCode = scalar, U08, 1400, "", 1, 0 +heaterDuty = scalar, U08, 1401, "%", 1, 0 +pumpDuty = scalar, U08, 1402, "%", 1, 0 +tempC = scalar, U16, 1404, "C", 1, 0 +nernstVoltage = scalar, U16, 1406, "V", 0.001, 0 +esr = scalar, U16, 1408, "ohm", 1, 0 +; total TS size = 1412 +dcOutput0 = scalar, F32, 1412, "per", 1,0 +isEnabled0_int = scalar, U08, 1416, "per", 1,0 +isEnabled0 = bits, U32, 1420, [0:0] +; total TS size = 1424 +value0 = scalar, U16, 1424, "value", 1,0 +value1 = scalar, U16, 1426, "value", 1,0 +errorRate = scalar, F32, 1428, "ratio", 1,0 ; total TS size = 1432 -lambdaCurrentlyGood = bits, U32, 1432, [0:0] -lambdaMonitorCut = bits, U32, 1432, [1:1] -lambdaTimeSinceGood = scalar, U16, 1436, "sec", 0.01, 0 -; total TS size = 1440 +vvtTarget = scalar, U16, 1432, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1434, "%", 0.5, 0 +; total TS size = 1436 +lambdaCurrentlyGood = bits, U32, 1436, [0:0] +lambdaMonitorCut = bits, U32, 1436, [1:1] +lambdaTimeSinceGood = scalar, U16, 1440, "sec", 0.01, 0 +; total TS size = 1444 time = { timeNow } @@ -5196,6 +5197,7 @@ entry = brakePedalState, "Brake switch", int, "%d" entry = startStopState, "startStopState", int, "%d" entry = startStopPhysicalState, "startStopPhysicalState", int, "%d" entry = startStopStateToggleCounter, "startStopStateToggleCounter", int, "%d" +entry = startStopStateTempPhysicalCounter, "startStopStateTempPhysicalCounter", int, "%d" entry = egtValue1, "egtValue1", float, "%.3f" entry = egtValue2, "egtValue2", float, "%.3f" entry = desiredRpmLimit, "User-defined RPM hard limit", int, "%d" @@ -6077,13 +6079,14 @@ dialog = engine_stateDialog, "engine_state" graphLine = brakePedalState graphLine = startStopState graphLine = startStopStateToggleCounter - graphLine = egtValue1 + graphLine = startStopStateTempPhysicalCounter liveGraph = engine_state_5_Graph, "Graph", South + graphLine = egtValue1 graphLine = egtValue2 graphLine = desiredRpmLimit graphLine = fuelInjectionCounter - graphLine = sparkCounter liveGraph = engine_state_6_Graph, "Graph", South + graphLine = sparkCounter graphLine = fuelingLoad graphLine = ignitionLoad graphLine = veTableYAxis @@ -6419,8 +6422,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" ; cam if ; two-stroke, or ; not crank trigger and ((vague trigger and cam choice) or not vague trigger) - field = "Cam Sensor (Primary channel)", triggerInputPins1, 1, {twoStroke == 1 || ( !(trigger_type == 2 || trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 21 || trigger_type == 26 || trigger_type == 27 || trigger_type == 33 || trigger_type == 38 || trigger_type == 39 || trigger_type == 44 || trigger_type == 45 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 58 || trigger_type == 61 || trigger_type == 62 || trigger_type == 68 || trigger_type == 70 || trigger_type == 71 || trigger_type == 72 || trigger_type == 74 || trigger_type == 75 || trigger_type == 76 || trigger_type == 77 || trigger_type == 79) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) ) ) } - field = "Crank Sensor (Primary channel)", triggerInputPins1, 1, { !(twoStroke == 1 || ( !(trigger_type == 2 || trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 21 || trigger_type == 26 || trigger_type == 27 || trigger_type == 33 || trigger_type == 38 || trigger_type == 39 || trigger_type == 44 || trigger_type == 45 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 58 || trigger_type == 61 || trigger_type == 62 || trigger_type == 68 || trigger_type == 70 || trigger_type == 71 || trigger_type == 72 || trigger_type == 74 || trigger_type == 75 || trigger_type == 76 || trigger_type == 77 || trigger_type == 79) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) ) )) } + field = "Cam Sensor (Primary channel)", triggerInputPins1, 1, {twoStroke == 1 || ( !(trigger_type == 2 || trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 21 || trigger_type == 26 || trigger_type == 27 || trigger_type == 33 || trigger_type == 38 || trigger_type == 39 || trigger_type == 44 || trigger_type == 45 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 58 || trigger_type == 61 || trigger_type == 62 || trigger_type == 68 || trigger_type == 70 || trigger_type == 71 || trigger_type == 72 || trigger_type == 74 || trigger_type == 75 || trigger_type == 76 || trigger_type == 77) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) ) ) } + field = "Crank Sensor (Primary channel)", triggerInputPins1, 1, { !(twoStroke == 1 || ( !(trigger_type == 2 || trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 21 || trigger_type == 26 || trigger_type == 27 || trigger_type == 33 || trigger_type == 38 || trigger_type == 39 || trigger_type == 44 || trigger_type == 45 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 58 || trigger_type == 61 || trigger_type == 62 || trigger_type == 68 || trigger_type == 70 || trigger_type == 71 || trigger_type == 72 || trigger_type == 74 || trigger_type == 75 || trigger_type == 76 || trigger_type == 77) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) ) )) } field = "Invert Primary", invertPrimaryTriggerSignal field = "Secondary channel", triggerInputPins2, { triggerInputPins2 != 0 || (triggerInputPins1 != 0 && (trigger_type == 1 || trigger_type == 3 || trigger_type == 15 || trigger_type == 16 || trigger_type == 19 || trigger_type == 25 || trigger_type == 28 || trigger_type == 31 || trigger_type == 35 || trigger_type == 36 || trigger_type == 37 || trigger_type == 40 || trigger_type == 49 || trigger_type == 50 || trigger_type == 53 || trigger_type == 54 || trigger_type == 63 || trigger_type == 64) ) } field = "Invert Secondary", invertSecondaryTriggerSignal, {triggerInputPins2 != 0 && (trigger_type == 1 || trigger_type == 3 || trigger_type == 15 || trigger_type == 16 || trigger_type == 19 || trigger_type == 25 || trigger_type == 28 || trigger_type == 31 || trigger_type == 35 || trigger_type == 36 || trigger_type == 37 || trigger_type == 40 || trigger_type == 49 || trigger_type == 50 || trigger_type == 53 || trigger_type == 54 || trigger_type == 63 || trigger_type == 64) } diff --git a/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini b/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini index 7547cdd75d..e79a7da0e8 100644 --- a/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.11.08.subaru_eg33_f7.822446362" + signature = "rusEFI master.2023.11.09.subaru_eg33_f7.576269388" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.11.08.subaru_eg33_f7.822446362" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.11.09.subaru_eg33_f7.576269388" ; 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 @@ -92,7 +92,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.jar based on (unknown script) integration/rusefi_config.txt Wed Nov 08 20:01:27 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Thu Nov 09 02:06:35 UTC 2023 pageSize = 23880 page = 1 @@ -2347,7 +2347,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23870, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1440 + ochBlockSize = 1444 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3001,136 +3001,137 @@ brakePedalState = scalar, S08, 1092, "", 1, 0 startStopState = scalar, S08, 1093, "", 1, 0 startStopPhysicalState = bits, U32, 1096, [0:0] startStopStateToggleCounter = scalar, U32, 1100, "", 1, 0 -egtValue1 = scalar, F32, 1104, "", 1, 0 -egtValue2 = scalar, F32, 1108, "", 1, 0 -desiredRpmLimit = scalar, S16, 1112, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1116, "", 1, 0 -sparkCounter = scalar, U32, 1120, "", 1, 0 -fuelingLoad = scalar, F32, 1124, "", 1, 0 -ignitionLoad = scalar, F32, 1128, "", 1, 0 -veTableYAxis = scalar, U16, 1132, "%", 0.01, 0 -; total TS size = 1136 -tpsFrom = scalar, F32, 1136 -tpsTo = scalar, F32, 1140 -deltaTps = scalar, F32, 1144 -extraFuel = scalar, F32, 1148, "", 1, 0 -valueFromTable = scalar, F32, 1152, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1156, [0:0] -isBelowDecelThreshold = bits, U32, 1156, [1:1] -isTimeToResetAccumulator = bits, U32, 1156, [2:2] -isFractionalEnrichment = bits, U32, 1156, [3:3] -belowEpsilon = bits, U32, 1156, [4:4] -tooShort = bits, U32, 1156, [5:5] -fractionalInjFuel = scalar, F32, 1160, "", 1, 0 -accumulatedValue = scalar, F32, 1164, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1168, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1172, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1176, "", 1, 0 -cycleCnt = scalar, S32, 1180, "", 1, 0 -; total TS size = 1184 -hwEventCounters1 = scalar, U32, 1184, "", 1, 0 -hwEventCounters2 = scalar, U32, 1188, "", 1, 0 -hwEventCounters3 = scalar, U32, 1192, "", 1, 0 -hwEventCounters4 = scalar, U32, 1196, "", 1, 0 -hwEventCounters5 = scalar, U32, 1200, "", 1, 0 -hwEventCounters6 = scalar, U32, 1204, "", 1, 0 -vvtCamCounter = scalar, U32, 1208, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1212, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1216, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1220, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1221, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1224, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1228, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1232, "", 1, 0 -mapCamPrevToothAngle = scalar, F32, 1236, "deg", 1, 0 -isDecodingMapCam = bits, U32, 1240, [0:0] -; total TS size = 1244 -crankSynchronizationCounter = scalar, U32, 1244, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1248, "", 1, 0 -vvtToothDurations0 = scalar, U32, 1252, "us", 1, 0 -vvtCurrentPosition = scalar, F32, 1256, "sync: Primary Cam Position", 1, 0 -vvtToothPosition1 = scalar, F32, 1260, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition2 = scalar, F32, 1264, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition3 = scalar, F32, 1268, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition4 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio = scalar, F32, 1276, "", 1, 0 -triggerStateIndex = scalar, U08, 1280, "", 1, 0 -camResyncCounter = scalar, U08, 1281, "", 1, 0 -vvtStateIndex = scalar, U08, 1282, "", 1, 0 -; total TS size = 1284 -m_hasSynchronizedPhase = bits, U32, 1284, [0:0] +startStopStateTempPhysicalCounter = scalar, U32, 1104, "", 1, 0 +egtValue1 = scalar, F32, 1108, "", 1, 0 +egtValue2 = scalar, F32, 1112, "", 1, 0 +desiredRpmLimit = scalar, S16, 1116, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 1120, "", 1, 0 +sparkCounter = scalar, U32, 1124, "", 1, 0 +fuelingLoad = scalar, F32, 1128, "", 1, 0 +ignitionLoad = scalar, F32, 1132, "", 1, 0 +veTableYAxis = scalar, U16, 1136, "%", 0.01, 0 +; total TS size = 1140 +tpsFrom = scalar, F32, 1140 +tpsTo = scalar, F32, 1144 +deltaTps = scalar, F32, 1148 +extraFuel = scalar, F32, 1152, "", 1, 0 +valueFromTable = scalar, F32, 1156, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1160, [0:0] +isBelowDecelThreshold = bits, U32, 1160, [1:1] +isTimeToResetAccumulator = bits, U32, 1160, [2:2] +isFractionalEnrichment = bits, U32, 1160, [3:3] +belowEpsilon = bits, U32, 1160, [4:4] +tooShort = bits, U32, 1160, [5:5] +fractionalInjFuel = scalar, F32, 1164, "", 1, 0 +accumulatedValue = scalar, F32, 1168, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1172, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1176, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1180, "", 1, 0 +cycleCnt = scalar, S32, 1184, "", 1, 0 +; total TS size = 1188 +hwEventCounters1 = scalar, U32, 1188, "", 1, 0 +hwEventCounters2 = scalar, U32, 1192, "", 1, 0 +hwEventCounters3 = scalar, U32, 1196, "", 1, 0 +hwEventCounters4 = scalar, U32, 1200, "", 1, 0 +hwEventCounters5 = scalar, U32, 1204, "", 1, 0 +hwEventCounters6 = scalar, U32, 1208, "", 1, 0 +vvtCamCounter = scalar, U32, 1212, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1216, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1220, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1224, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1225, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1228, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1232, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1236, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1240, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1244, [0:0] +; total TS size = 1248 +crankSynchronizationCounter = scalar, U32, 1248, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1252, "", 1, 0 +vvtToothDurations0 = scalar, U32, 1256, "us", 1, 0 +vvtCurrentPosition = scalar, F32, 1260, "sync: Primary Cam Position", 1, 0 +vvtToothPosition1 = scalar, F32, 1264, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition2 = scalar, F32, 1268, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition3 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition4 = scalar, F32, 1276, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio = scalar, F32, 1280, "", 1, 0 +triggerStateIndex = scalar, U08, 1284, "", 1, 0 +camResyncCounter = scalar, U08, 1285, "", 1, 0 +vvtStateIndex = scalar, U08, 1286, "", 1, 0 ; total TS size = 1288 -wallFuelCorrection = scalar, F32, 1288, "", 1, 0 -wallFuel = scalar, F32, 1292, "", 1, 0 -; total TS size = 1296 -idleState = bits, S32, 1296, [0:2], "not important" -currentIdlePosition = scalar, F32, 1300 -baseIdlePosition = scalar, F32, 1304 -idleClosedLoop = scalar, F32, 1308 -iacByTpsTaper = scalar, F32, 1312 -throttlePedalUpState = scalar, S32, 1316, "", 1, 0 -mightResetPid = bits, U32, 1320, [0:0] -shouldResetPid = bits, U32, 1320, [1:1] -wasResetPid = bits, U32, 1320, [2:2] -mustResetPid = bits, U32, 1320, [3:3] -isCranking = bits, U32, 1320, [4:4] -isIacTableForCoasting = bits, U32, 1320, [5:5] -notIdling = bits, U32, 1320, [6:6] -needReset = bits, U32, 1320, [7:7] -isInDeadZone = bits, U32, 1320, [8:8] -isBlipping = bits, U32, 1320, [9:9] -useClosedLoop = bits, U32, 1320, [10:10] -badTps = bits, U32, 1320, [11:11] -looksLikeRunning = bits, U32, 1320, [12:12] -looksLikeCoasting = bits, U32, 1320, [13:13] -looksLikeCrankToIdle = bits, U32, 1320, [14:14] -isIdleCoasting = bits, U32, 1320, [15:15] -isIdleClosedLoop = bits, U32, 1320, [16:16] -idleTarget = scalar, S32, 1324, "", 1, 0 -targetRpmByClt = scalar, S32, 1328, "", 1, 0 -targetRpmAc = scalar, S32, 1332, "", 1, 0 -iacByRpmTaper = scalar, F32, 1336 -luaAdd = scalar, F32, 1340 -; total TS size = 1344 -idlePosition = scalar, F32, 1344, "per", 1,0 -trim = scalar, F32, 1348, "", 1, 0 -luaAdjustment = scalar, F32, 1352, "per", 1,0 -m_wastegatePosition = scalar, F32, 1356, "per", 1,0 -etbFeedForward = scalar, F32, 1360 -etbIntegralError = scalar, F32, 1364, "", 1, 0 -etbCurrentTarget = scalar, F32, 1368, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1372, "%", 1, 0 -etbRevLimitActive = bits, U32, 1376, [0:0] -jamDetected = bits, U32, 1376, [1:1] -etbDutyRateOfChange = scalar, F32, 1380, "per", 1,0 -etbDutyAverage = scalar, F32, 1384, "per", 1,0 -etbTpsErrorCounter = scalar, U16, 1388, "count", 1,0 -etbPpsErrorCounter = scalar, U16, 1390, "count", 1,0 -etbErrorCode = scalar, S08, 1392, "", 1, 0 -jamTimer = scalar, U16, 1394, "sec", 0.01, 0 -; total TS size = 1396 -faultCode = scalar, U08, 1396, "", 1, 0 -heaterDuty = scalar, U08, 1397, "%", 1, 0 -pumpDuty = scalar, U08, 1398, "%", 1, 0 -tempC = scalar, U16, 1400, "C", 1, 0 -nernstVoltage = scalar, U16, 1402, "V", 0.001, 0 -esr = scalar, U16, 1404, "ohm", 1, 0 -; total TS size = 1408 -dcOutput0 = scalar, F32, 1408, "per", 1,0 -isEnabled0_int = scalar, U08, 1412, "per", 1,0 -isEnabled0 = bits, U32, 1416, [0:0] -; total TS size = 1420 -value0 = scalar, U16, 1420, "value", 1,0 -value1 = scalar, U16, 1422, "value", 1,0 -errorRate = scalar, F32, 1424, "ratio", 1,0 -; total TS size = 1428 -vvtTarget = scalar, U16, 1428, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1430, "%", 0.5, 0 +m_hasSynchronizedPhase = bits, U32, 1288, [0:0] +; total TS size = 1292 +wallFuelCorrection = scalar, F32, 1292, "", 1, 0 +wallFuel = scalar, F32, 1296, "", 1, 0 +; total TS size = 1300 +idleState = bits, S32, 1300, [0:2], "not important" +currentIdlePosition = scalar, F32, 1304 +baseIdlePosition = scalar, F32, 1308 +idleClosedLoop = scalar, F32, 1312 +iacByTpsTaper = scalar, F32, 1316 +throttlePedalUpState = scalar, S32, 1320, "", 1, 0 +mightResetPid = bits, U32, 1324, [0:0] +shouldResetPid = bits, U32, 1324, [1:1] +wasResetPid = bits, U32, 1324, [2:2] +mustResetPid = bits, U32, 1324, [3:3] +isCranking = bits, U32, 1324, [4:4] +isIacTableForCoasting = bits, U32, 1324, [5:5] +notIdling = bits, U32, 1324, [6:6] +needReset = bits, U32, 1324, [7:7] +isInDeadZone = bits, U32, 1324, [8:8] +isBlipping = bits, U32, 1324, [9:9] +useClosedLoop = bits, U32, 1324, [10:10] +badTps = bits, U32, 1324, [11:11] +looksLikeRunning = bits, U32, 1324, [12:12] +looksLikeCoasting = bits, U32, 1324, [13:13] +looksLikeCrankToIdle = bits, U32, 1324, [14:14] +isIdleCoasting = bits, U32, 1324, [15:15] +isIdleClosedLoop = bits, U32, 1324, [16:16] +idleTarget = scalar, S32, 1328, "", 1, 0 +targetRpmByClt = scalar, S32, 1332, "", 1, 0 +targetRpmAc = scalar, S32, 1336, "", 1, 0 +iacByRpmTaper = scalar, F32, 1340 +luaAdd = scalar, F32, 1344 +; total TS size = 1348 +idlePosition = scalar, F32, 1348, "per", 1,0 +trim = scalar, F32, 1352, "", 1, 0 +luaAdjustment = scalar, F32, 1356, "per", 1,0 +m_wastegatePosition = scalar, F32, 1360, "per", 1,0 +etbFeedForward = scalar, F32, 1364 +etbIntegralError = scalar, F32, 1368, "", 1, 0 +etbCurrentTarget = scalar, F32, 1372, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1376, "%", 1, 0 +etbRevLimitActive = bits, U32, 1380, [0:0] +jamDetected = bits, U32, 1380, [1:1] +etbDutyRateOfChange = scalar, F32, 1384, "per", 1,0 +etbDutyAverage = scalar, F32, 1388, "per", 1,0 +etbTpsErrorCounter = scalar, U16, 1392, "count", 1,0 +etbPpsErrorCounter = scalar, U16, 1394, "count", 1,0 +etbErrorCode = scalar, S08, 1396, "", 1, 0 +jamTimer = scalar, U16, 1398, "sec", 0.01, 0 +; total TS size = 1400 +faultCode = scalar, U08, 1400, "", 1, 0 +heaterDuty = scalar, U08, 1401, "%", 1, 0 +pumpDuty = scalar, U08, 1402, "%", 1, 0 +tempC = scalar, U16, 1404, "C", 1, 0 +nernstVoltage = scalar, U16, 1406, "V", 0.001, 0 +esr = scalar, U16, 1408, "ohm", 1, 0 +; total TS size = 1412 +dcOutput0 = scalar, F32, 1412, "per", 1,0 +isEnabled0_int = scalar, U08, 1416, "per", 1,0 +isEnabled0 = bits, U32, 1420, [0:0] +; total TS size = 1424 +value0 = scalar, U16, 1424, "value", 1,0 +value1 = scalar, U16, 1426, "value", 1,0 +errorRate = scalar, F32, 1428, "ratio", 1,0 ; total TS size = 1432 -lambdaCurrentlyGood = bits, U32, 1432, [0:0] -lambdaMonitorCut = bits, U32, 1432, [1:1] -lambdaTimeSinceGood = scalar, U16, 1436, "sec", 0.01, 0 -; total TS size = 1440 +vvtTarget = scalar, U16, 1432, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1434, "%", 0.5, 0 +; total TS size = 1436 +lambdaCurrentlyGood = bits, U32, 1436, [0:0] +lambdaMonitorCut = bits, U32, 1436, [1:1] +lambdaTimeSinceGood = scalar, U16, 1440, "sec", 0.01, 0 +; total TS size = 1444 time = { timeNow } @@ -5196,6 +5197,7 @@ entry = brakePedalState, "Brake switch", int, "%d" entry = startStopState, "startStopState", int, "%d" entry = startStopPhysicalState, "startStopPhysicalState", int, "%d" entry = startStopStateToggleCounter, "startStopStateToggleCounter", int, "%d" +entry = startStopStateTempPhysicalCounter, "startStopStateTempPhysicalCounter", int, "%d" entry = egtValue1, "egtValue1", float, "%.3f" entry = egtValue2, "egtValue2", float, "%.3f" entry = desiredRpmLimit, "User-defined RPM hard limit", int, "%d" @@ -6077,13 +6079,14 @@ dialog = engine_stateDialog, "engine_state" graphLine = brakePedalState graphLine = startStopState graphLine = startStopStateToggleCounter - graphLine = egtValue1 + graphLine = startStopStateTempPhysicalCounter liveGraph = engine_state_5_Graph, "Graph", South + graphLine = egtValue1 graphLine = egtValue2 graphLine = desiredRpmLimit graphLine = fuelInjectionCounter - graphLine = sparkCounter liveGraph = engine_state_6_Graph, "Graph", South + graphLine = sparkCounter graphLine = fuelingLoad graphLine = ignitionLoad graphLine = veTableYAxis @@ -6419,8 +6422,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" ; cam if ; two-stroke, or ; not crank trigger and ((vague trigger and cam choice) or not vague trigger) - field = "Cam Sensor (Primary channel)", triggerInputPins1, 1, {twoStroke == 1 || ( !(trigger_type == 2 || trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 21 || trigger_type == 26 || trigger_type == 27 || trigger_type == 33 || trigger_type == 38 || trigger_type == 39 || trigger_type == 44 || trigger_type == 45 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 58 || trigger_type == 61 || trigger_type == 62 || trigger_type == 68 || trigger_type == 70 || trigger_type == 71 || trigger_type == 72 || trigger_type == 74 || trigger_type == 75 || trigger_type == 76 || trigger_type == 77 || trigger_type == 79) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) ) ) } - field = "Crank Sensor (Primary channel)", triggerInputPins1, 1, { !(twoStroke == 1 || ( !(trigger_type == 2 || trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 21 || trigger_type == 26 || trigger_type == 27 || trigger_type == 33 || trigger_type == 38 || trigger_type == 39 || trigger_type == 44 || trigger_type == 45 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 58 || trigger_type == 61 || trigger_type == 62 || trigger_type == 68 || trigger_type == 70 || trigger_type == 71 || trigger_type == 72 || trigger_type == 74 || trigger_type == 75 || trigger_type == 76 || trigger_type == 77 || trigger_type == 79) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) ) )) } + field = "Cam Sensor (Primary channel)", triggerInputPins1, 1, {twoStroke == 1 || ( !(trigger_type == 2 || trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 21 || trigger_type == 26 || trigger_type == 27 || trigger_type == 33 || trigger_type == 38 || trigger_type == 39 || trigger_type == 44 || trigger_type == 45 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 58 || trigger_type == 61 || trigger_type == 62 || trigger_type == 68 || trigger_type == 70 || trigger_type == 71 || trigger_type == 72 || trigger_type == 74 || trigger_type == 75 || trigger_type == 76 || trigger_type == 77) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) ) ) } + field = "Crank Sensor (Primary channel)", triggerInputPins1, 1, { !(twoStroke == 1 || ( !(trigger_type == 2 || trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 21 || trigger_type == 26 || trigger_type == 27 || trigger_type == 33 || trigger_type == 38 || trigger_type == 39 || trigger_type == 44 || trigger_type == 45 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 58 || trigger_type == 61 || trigger_type == 62 || trigger_type == 68 || trigger_type == 70 || trigger_type == 71 || trigger_type == 72 || trigger_type == 74 || trigger_type == 75 || trigger_type == 76 || trigger_type == 77) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) ) )) } field = "Invert Primary", invertPrimaryTriggerSignal field = "Secondary channel", triggerInputPins2, { triggerInputPins2 != 0 || (triggerInputPins1 != 0 && (trigger_type == 1 || trigger_type == 3 || trigger_type == 15 || trigger_type == 16 || trigger_type == 19 || trigger_type == 25 || trigger_type == 28 || trigger_type == 31 || trigger_type == 35 || trigger_type == 36 || trigger_type == 37 || trigger_type == 40 || trigger_type == 49 || trigger_type == 50 || trigger_type == 53 || trigger_type == 54 || trigger_type == 63 || trigger_type == 64) ) } field = "Invert Secondary", invertSecondaryTriggerSignal, {triggerInputPins2 != 0 && (trigger_type == 1 || trigger_type == 3 || trigger_type == 15 || trigger_type == 16 || trigger_type == 19 || trigger_type == 25 || trigger_type == 28 || trigger_type == 31 || trigger_type == 35 || trigger_type == 36 || trigger_type == 37 || trigger_type == 40 || trigger_type == 49 || trigger_type == 50 || trigger_type == 53 || trigger_type == 54 || trigger_type == 63 || trigger_type == 64) } diff --git a/firmware/tunerstudio/generated/rusefi_t-b-g.ini b/firmware/tunerstudio/generated/rusefi_t-b-g.ini index af95be5e2c..4f55e8f338 100644 --- a/firmware/tunerstudio/generated/rusefi_t-b-g.ini +++ b/firmware/tunerstudio/generated/rusefi_t-b-g.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.11.08.t-b-g.914902541" + signature = "rusEFI master.2023.11.09.t-b-g.634710875" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.11.08.t-b-g.914902541" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.11.09.t-b-g.634710875" ; 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 @@ -92,7 +92,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.jar based on (unknown script) integration/rusefi_config.txt Wed Nov 08 20:03:10 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Thu Nov 09 02:07:46 UTC 2023 pageSize = 23880 page = 1 @@ -2347,7 +2347,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23870, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1440 + ochBlockSize = 1444 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3001,136 +3001,137 @@ brakePedalState = scalar, S08, 1092, "", 1, 0 startStopState = scalar, S08, 1093, "", 1, 0 startStopPhysicalState = bits, U32, 1096, [0:0] startStopStateToggleCounter = scalar, U32, 1100, "", 1, 0 -egtValue1 = scalar, F32, 1104, "", 1, 0 -egtValue2 = scalar, F32, 1108, "", 1, 0 -desiredRpmLimit = scalar, S16, 1112, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1116, "", 1, 0 -sparkCounter = scalar, U32, 1120, "", 1, 0 -fuelingLoad = scalar, F32, 1124, "", 1, 0 -ignitionLoad = scalar, F32, 1128, "", 1, 0 -veTableYAxis = scalar, U16, 1132, "%", 0.01, 0 -; total TS size = 1136 -tpsFrom = scalar, F32, 1136 -tpsTo = scalar, F32, 1140 -deltaTps = scalar, F32, 1144 -extraFuel = scalar, F32, 1148, "", 1, 0 -valueFromTable = scalar, F32, 1152, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1156, [0:0] -isBelowDecelThreshold = bits, U32, 1156, [1:1] -isTimeToResetAccumulator = bits, U32, 1156, [2:2] -isFractionalEnrichment = bits, U32, 1156, [3:3] -belowEpsilon = bits, U32, 1156, [4:4] -tooShort = bits, U32, 1156, [5:5] -fractionalInjFuel = scalar, F32, 1160, "", 1, 0 -accumulatedValue = scalar, F32, 1164, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1168, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1172, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1176, "", 1, 0 -cycleCnt = scalar, S32, 1180, "", 1, 0 -; total TS size = 1184 -hwEventCounters1 = scalar, U32, 1184, "", 1, 0 -hwEventCounters2 = scalar, U32, 1188, "", 1, 0 -hwEventCounters3 = scalar, U32, 1192, "", 1, 0 -hwEventCounters4 = scalar, U32, 1196, "", 1, 0 -hwEventCounters5 = scalar, U32, 1200, "", 1, 0 -hwEventCounters6 = scalar, U32, 1204, "", 1, 0 -vvtCamCounter = scalar, U32, 1208, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1212, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1216, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1220, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1221, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1224, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1228, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1232, "", 1, 0 -mapCamPrevToothAngle = scalar, F32, 1236, "deg", 1, 0 -isDecodingMapCam = bits, U32, 1240, [0:0] -; total TS size = 1244 -crankSynchronizationCounter = scalar, U32, 1244, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1248, "", 1, 0 -vvtToothDurations0 = scalar, U32, 1252, "us", 1, 0 -vvtCurrentPosition = scalar, F32, 1256, "sync: Primary Cam Position", 1, 0 -vvtToothPosition1 = scalar, F32, 1260, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition2 = scalar, F32, 1264, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition3 = scalar, F32, 1268, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition4 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio = scalar, F32, 1276, "", 1, 0 -triggerStateIndex = scalar, U08, 1280, "", 1, 0 -camResyncCounter = scalar, U08, 1281, "", 1, 0 -vvtStateIndex = scalar, U08, 1282, "", 1, 0 -; total TS size = 1284 -m_hasSynchronizedPhase = bits, U32, 1284, [0:0] +startStopStateTempPhysicalCounter = scalar, U32, 1104, "", 1, 0 +egtValue1 = scalar, F32, 1108, "", 1, 0 +egtValue2 = scalar, F32, 1112, "", 1, 0 +desiredRpmLimit = scalar, S16, 1116, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 1120, "", 1, 0 +sparkCounter = scalar, U32, 1124, "", 1, 0 +fuelingLoad = scalar, F32, 1128, "", 1, 0 +ignitionLoad = scalar, F32, 1132, "", 1, 0 +veTableYAxis = scalar, U16, 1136, "%", 0.01, 0 +; total TS size = 1140 +tpsFrom = scalar, F32, 1140 +tpsTo = scalar, F32, 1144 +deltaTps = scalar, F32, 1148 +extraFuel = scalar, F32, 1152, "", 1, 0 +valueFromTable = scalar, F32, 1156, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1160, [0:0] +isBelowDecelThreshold = bits, U32, 1160, [1:1] +isTimeToResetAccumulator = bits, U32, 1160, [2:2] +isFractionalEnrichment = bits, U32, 1160, [3:3] +belowEpsilon = bits, U32, 1160, [4:4] +tooShort = bits, U32, 1160, [5:5] +fractionalInjFuel = scalar, F32, 1164, "", 1, 0 +accumulatedValue = scalar, F32, 1168, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1172, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1176, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1180, "", 1, 0 +cycleCnt = scalar, S32, 1184, "", 1, 0 +; total TS size = 1188 +hwEventCounters1 = scalar, U32, 1188, "", 1, 0 +hwEventCounters2 = scalar, U32, 1192, "", 1, 0 +hwEventCounters3 = scalar, U32, 1196, "", 1, 0 +hwEventCounters4 = scalar, U32, 1200, "", 1, 0 +hwEventCounters5 = scalar, U32, 1204, "", 1, 0 +hwEventCounters6 = scalar, U32, 1208, "", 1, 0 +vvtCamCounter = scalar, U32, 1212, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1216, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1220, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1224, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1225, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1228, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1232, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1236, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1240, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1244, [0:0] +; total TS size = 1248 +crankSynchronizationCounter = scalar, U32, 1248, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1252, "", 1, 0 +vvtToothDurations0 = scalar, U32, 1256, "us", 1, 0 +vvtCurrentPosition = scalar, F32, 1260, "sync: Primary Cam Position", 1, 0 +vvtToothPosition1 = scalar, F32, 1264, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition2 = scalar, F32, 1268, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition3 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition4 = scalar, F32, 1276, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio = scalar, F32, 1280, "", 1, 0 +triggerStateIndex = scalar, U08, 1284, "", 1, 0 +camResyncCounter = scalar, U08, 1285, "", 1, 0 +vvtStateIndex = scalar, U08, 1286, "", 1, 0 ; total TS size = 1288 -wallFuelCorrection = scalar, F32, 1288, "", 1, 0 -wallFuel = scalar, F32, 1292, "", 1, 0 -; total TS size = 1296 -idleState = bits, S32, 1296, [0:2], "not important" -currentIdlePosition = scalar, F32, 1300 -baseIdlePosition = scalar, F32, 1304 -idleClosedLoop = scalar, F32, 1308 -iacByTpsTaper = scalar, F32, 1312 -throttlePedalUpState = scalar, S32, 1316, "", 1, 0 -mightResetPid = bits, U32, 1320, [0:0] -shouldResetPid = bits, U32, 1320, [1:1] -wasResetPid = bits, U32, 1320, [2:2] -mustResetPid = bits, U32, 1320, [3:3] -isCranking = bits, U32, 1320, [4:4] -isIacTableForCoasting = bits, U32, 1320, [5:5] -notIdling = bits, U32, 1320, [6:6] -needReset = bits, U32, 1320, [7:7] -isInDeadZone = bits, U32, 1320, [8:8] -isBlipping = bits, U32, 1320, [9:9] -useClosedLoop = bits, U32, 1320, [10:10] -badTps = bits, U32, 1320, [11:11] -looksLikeRunning = bits, U32, 1320, [12:12] -looksLikeCoasting = bits, U32, 1320, [13:13] -looksLikeCrankToIdle = bits, U32, 1320, [14:14] -isIdleCoasting = bits, U32, 1320, [15:15] -isIdleClosedLoop = bits, U32, 1320, [16:16] -idleTarget = scalar, S32, 1324, "", 1, 0 -targetRpmByClt = scalar, S32, 1328, "", 1, 0 -targetRpmAc = scalar, S32, 1332, "", 1, 0 -iacByRpmTaper = scalar, F32, 1336 -luaAdd = scalar, F32, 1340 -; total TS size = 1344 -idlePosition = scalar, F32, 1344, "per", 1,0 -trim = scalar, F32, 1348, "", 1, 0 -luaAdjustment = scalar, F32, 1352, "per", 1,0 -m_wastegatePosition = scalar, F32, 1356, "per", 1,0 -etbFeedForward = scalar, F32, 1360 -etbIntegralError = scalar, F32, 1364, "", 1, 0 -etbCurrentTarget = scalar, F32, 1368, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1372, "%", 1, 0 -etbRevLimitActive = bits, U32, 1376, [0:0] -jamDetected = bits, U32, 1376, [1:1] -etbDutyRateOfChange = scalar, F32, 1380, "per", 1,0 -etbDutyAverage = scalar, F32, 1384, "per", 1,0 -etbTpsErrorCounter = scalar, U16, 1388, "count", 1,0 -etbPpsErrorCounter = scalar, U16, 1390, "count", 1,0 -etbErrorCode = scalar, S08, 1392, "", 1, 0 -jamTimer = scalar, U16, 1394, "sec", 0.01, 0 -; total TS size = 1396 -faultCode = scalar, U08, 1396, "", 1, 0 -heaterDuty = scalar, U08, 1397, "%", 1, 0 -pumpDuty = scalar, U08, 1398, "%", 1, 0 -tempC = scalar, U16, 1400, "C", 1, 0 -nernstVoltage = scalar, U16, 1402, "V", 0.001, 0 -esr = scalar, U16, 1404, "ohm", 1, 0 -; total TS size = 1408 -dcOutput0 = scalar, F32, 1408, "per", 1,0 -isEnabled0_int = scalar, U08, 1412, "per", 1,0 -isEnabled0 = bits, U32, 1416, [0:0] -; total TS size = 1420 -value0 = scalar, U16, 1420, "value", 1,0 -value1 = scalar, U16, 1422, "value", 1,0 -errorRate = scalar, F32, 1424, "ratio", 1,0 -; total TS size = 1428 -vvtTarget = scalar, U16, 1428, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1430, "%", 0.5, 0 +m_hasSynchronizedPhase = bits, U32, 1288, [0:0] +; total TS size = 1292 +wallFuelCorrection = scalar, F32, 1292, "", 1, 0 +wallFuel = scalar, F32, 1296, "", 1, 0 +; total TS size = 1300 +idleState = bits, S32, 1300, [0:2], "not important" +currentIdlePosition = scalar, F32, 1304 +baseIdlePosition = scalar, F32, 1308 +idleClosedLoop = scalar, F32, 1312 +iacByTpsTaper = scalar, F32, 1316 +throttlePedalUpState = scalar, S32, 1320, "", 1, 0 +mightResetPid = bits, U32, 1324, [0:0] +shouldResetPid = bits, U32, 1324, [1:1] +wasResetPid = bits, U32, 1324, [2:2] +mustResetPid = bits, U32, 1324, [3:3] +isCranking = bits, U32, 1324, [4:4] +isIacTableForCoasting = bits, U32, 1324, [5:5] +notIdling = bits, U32, 1324, [6:6] +needReset = bits, U32, 1324, [7:7] +isInDeadZone = bits, U32, 1324, [8:8] +isBlipping = bits, U32, 1324, [9:9] +useClosedLoop = bits, U32, 1324, [10:10] +badTps = bits, U32, 1324, [11:11] +looksLikeRunning = bits, U32, 1324, [12:12] +looksLikeCoasting = bits, U32, 1324, [13:13] +looksLikeCrankToIdle = bits, U32, 1324, [14:14] +isIdleCoasting = bits, U32, 1324, [15:15] +isIdleClosedLoop = bits, U32, 1324, [16:16] +idleTarget = scalar, S32, 1328, "", 1, 0 +targetRpmByClt = scalar, S32, 1332, "", 1, 0 +targetRpmAc = scalar, S32, 1336, "", 1, 0 +iacByRpmTaper = scalar, F32, 1340 +luaAdd = scalar, F32, 1344 +; total TS size = 1348 +idlePosition = scalar, F32, 1348, "per", 1,0 +trim = scalar, F32, 1352, "", 1, 0 +luaAdjustment = scalar, F32, 1356, "per", 1,0 +m_wastegatePosition = scalar, F32, 1360, "per", 1,0 +etbFeedForward = scalar, F32, 1364 +etbIntegralError = scalar, F32, 1368, "", 1, 0 +etbCurrentTarget = scalar, F32, 1372, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1376, "%", 1, 0 +etbRevLimitActive = bits, U32, 1380, [0:0] +jamDetected = bits, U32, 1380, [1:1] +etbDutyRateOfChange = scalar, F32, 1384, "per", 1,0 +etbDutyAverage = scalar, F32, 1388, "per", 1,0 +etbTpsErrorCounter = scalar, U16, 1392, "count", 1,0 +etbPpsErrorCounter = scalar, U16, 1394, "count", 1,0 +etbErrorCode = scalar, S08, 1396, "", 1, 0 +jamTimer = scalar, U16, 1398, "sec", 0.01, 0 +; total TS size = 1400 +faultCode = scalar, U08, 1400, "", 1, 0 +heaterDuty = scalar, U08, 1401, "%", 1, 0 +pumpDuty = scalar, U08, 1402, "%", 1, 0 +tempC = scalar, U16, 1404, "C", 1, 0 +nernstVoltage = scalar, U16, 1406, "V", 0.001, 0 +esr = scalar, U16, 1408, "ohm", 1, 0 +; total TS size = 1412 +dcOutput0 = scalar, F32, 1412, "per", 1,0 +isEnabled0_int = scalar, U08, 1416, "per", 1,0 +isEnabled0 = bits, U32, 1420, [0:0] +; total TS size = 1424 +value0 = scalar, U16, 1424, "value", 1,0 +value1 = scalar, U16, 1426, "value", 1,0 +errorRate = scalar, F32, 1428, "ratio", 1,0 ; total TS size = 1432 -lambdaCurrentlyGood = bits, U32, 1432, [0:0] -lambdaMonitorCut = bits, U32, 1432, [1:1] -lambdaTimeSinceGood = scalar, U16, 1436, "sec", 0.01, 0 -; total TS size = 1440 +vvtTarget = scalar, U16, 1432, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1434, "%", 0.5, 0 +; total TS size = 1436 +lambdaCurrentlyGood = bits, U32, 1436, [0:0] +lambdaMonitorCut = bits, U32, 1436, [1:1] +lambdaTimeSinceGood = scalar, U16, 1440, "sec", 0.01, 0 +; total TS size = 1444 time = { timeNow } @@ -5196,6 +5197,7 @@ entry = brakePedalState, "Brake switch", int, "%d" entry = startStopState, "startStopState", int, "%d" entry = startStopPhysicalState, "startStopPhysicalState", int, "%d" entry = startStopStateToggleCounter, "startStopStateToggleCounter", int, "%d" +entry = startStopStateTempPhysicalCounter, "startStopStateTempPhysicalCounter", int, "%d" entry = egtValue1, "egtValue1", float, "%.3f" entry = egtValue2, "egtValue2", float, "%.3f" entry = desiredRpmLimit, "User-defined RPM hard limit", int, "%d" @@ -6077,13 +6079,14 @@ dialog = engine_stateDialog, "engine_state" graphLine = brakePedalState graphLine = startStopState graphLine = startStopStateToggleCounter - graphLine = egtValue1 + graphLine = startStopStateTempPhysicalCounter liveGraph = engine_state_5_Graph, "Graph", South + graphLine = egtValue1 graphLine = egtValue2 graphLine = desiredRpmLimit graphLine = fuelInjectionCounter - graphLine = sparkCounter liveGraph = engine_state_6_Graph, "Graph", South + graphLine = sparkCounter graphLine = fuelingLoad graphLine = ignitionLoad graphLine = veTableYAxis @@ -6419,8 +6422,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" ; cam if ; two-stroke, or ; not crank trigger and ((vague trigger and cam choice) or not vague trigger) - field = "Cam Sensor (Primary channel)", triggerInputPins1, 1, {twoStroke == 1 || ( !(trigger_type == 2 || trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 21 || trigger_type == 26 || trigger_type == 27 || trigger_type == 33 || trigger_type == 38 || trigger_type == 39 || trigger_type == 44 || trigger_type == 45 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 58 || trigger_type == 61 || trigger_type == 62 || trigger_type == 68 || trigger_type == 70 || trigger_type == 71 || trigger_type == 72 || trigger_type == 74 || trigger_type == 75 || trigger_type == 76 || trigger_type == 77 || trigger_type == 79) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) ) ) } - field = "Crank Sensor (Primary channel)", triggerInputPins1, 1, { !(twoStroke == 1 || ( !(trigger_type == 2 || trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 21 || trigger_type == 26 || trigger_type == 27 || trigger_type == 33 || trigger_type == 38 || trigger_type == 39 || trigger_type == 44 || trigger_type == 45 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 58 || trigger_type == 61 || trigger_type == 62 || trigger_type == 68 || trigger_type == 70 || trigger_type == 71 || trigger_type == 72 || trigger_type == 74 || trigger_type == 75 || trigger_type == 76 || trigger_type == 77 || trigger_type == 79) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) ) )) } + field = "Cam Sensor (Primary channel)", triggerInputPins1, 1, {twoStroke == 1 || ( !(trigger_type == 2 || trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 21 || trigger_type == 26 || trigger_type == 27 || trigger_type == 33 || trigger_type == 38 || trigger_type == 39 || trigger_type == 44 || trigger_type == 45 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 58 || trigger_type == 61 || trigger_type == 62 || trigger_type == 68 || trigger_type == 70 || trigger_type == 71 || trigger_type == 72 || trigger_type == 74 || trigger_type == 75 || trigger_type == 76 || trigger_type == 77) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) ) ) } + field = "Crank Sensor (Primary channel)", triggerInputPins1, 1, { !(twoStroke == 1 || ( !(trigger_type == 2 || trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 21 || trigger_type == 26 || trigger_type == 27 || trigger_type == 33 || trigger_type == 38 || trigger_type == 39 || trigger_type == 44 || trigger_type == 45 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 58 || trigger_type == 61 || trigger_type == 62 || trigger_type == 68 || trigger_type == 70 || trigger_type == 71 || trigger_type == 72 || trigger_type == 74 || trigger_type == 75 || trigger_type == 76 || trigger_type == 77) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) ) )) } field = "Invert Primary", invertPrimaryTriggerSignal field = "Secondary channel", triggerInputPins2, { triggerInputPins2 != 0 || (triggerInputPins1 != 0 && (trigger_type == 1 || trigger_type == 3 || trigger_type == 15 || trigger_type == 16 || trigger_type == 19 || trigger_type == 25 || trigger_type == 28 || trigger_type == 31 || trigger_type == 35 || trigger_type == 36 || trigger_type == 37 || trigger_type == 40 || trigger_type == 49 || trigger_type == 50 || trigger_type == 53 || trigger_type == 54 || trigger_type == 63 || trigger_type == 64) ) } field = "Invert Secondary", invertSecondaryTriggerSignal, {triggerInputPins2 != 0 && (trigger_type == 1 || trigger_type == 3 || trigger_type == 15 || trigger_type == 16 || trigger_type == 19 || trigger_type == 25 || trigger_type == 28 || trigger_type == 31 || trigger_type == 35 || trigger_type == 36 || trigger_type == 37 || trigger_type == 40 || trigger_type == 49 || trigger_type == 50 || trigger_type == 53 || trigger_type == 54 || trigger_type == 63 || trigger_type == 64) } diff --git a/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini b/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini index 99516d1583..c3492c1d95 100644 --- a/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini +++ b/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.11.08.tdg-pdm8.3156632111" + signature = "rusEFI master.2023.11.09.tdg-pdm8.2944059257" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.11.08.tdg-pdm8.3156632111" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.11.09.tdg-pdm8.2944059257" ; 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 @@ -92,7 +92,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.jar based on (unknown script) integration/rusefi_config.txt Wed Nov 08 20:03:51 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Thu Nov 09 02:08:15 UTC 2023 pageSize = 23880 page = 1 @@ -2347,7 +2347,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23870, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1440 + ochBlockSize = 1444 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3001,136 +3001,137 @@ brakePedalState = scalar, S08, 1092, "", 1, 0 startStopState = scalar, S08, 1093, "", 1, 0 startStopPhysicalState = bits, U32, 1096, [0:0] startStopStateToggleCounter = scalar, U32, 1100, "", 1, 0 -egtValue1 = scalar, F32, 1104, "", 1, 0 -egtValue2 = scalar, F32, 1108, "", 1, 0 -desiredRpmLimit = scalar, S16, 1112, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1116, "", 1, 0 -sparkCounter = scalar, U32, 1120, "", 1, 0 -fuelingLoad = scalar, F32, 1124, "", 1, 0 -ignitionLoad = scalar, F32, 1128, "", 1, 0 -veTableYAxis = scalar, U16, 1132, "%", 0.01, 0 -; total TS size = 1136 -tpsFrom = scalar, F32, 1136 -tpsTo = scalar, F32, 1140 -deltaTps = scalar, F32, 1144 -extraFuel = scalar, F32, 1148, "", 1, 0 -valueFromTable = scalar, F32, 1152, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1156, [0:0] -isBelowDecelThreshold = bits, U32, 1156, [1:1] -isTimeToResetAccumulator = bits, U32, 1156, [2:2] -isFractionalEnrichment = bits, U32, 1156, [3:3] -belowEpsilon = bits, U32, 1156, [4:4] -tooShort = bits, U32, 1156, [5:5] -fractionalInjFuel = scalar, F32, 1160, "", 1, 0 -accumulatedValue = scalar, F32, 1164, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1168, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1172, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1176, "", 1, 0 -cycleCnt = scalar, S32, 1180, "", 1, 0 -; total TS size = 1184 -hwEventCounters1 = scalar, U32, 1184, "", 1, 0 -hwEventCounters2 = scalar, U32, 1188, "", 1, 0 -hwEventCounters3 = scalar, U32, 1192, "", 1, 0 -hwEventCounters4 = scalar, U32, 1196, "", 1, 0 -hwEventCounters5 = scalar, U32, 1200, "", 1, 0 -hwEventCounters6 = scalar, U32, 1204, "", 1, 0 -vvtCamCounter = scalar, U32, 1208, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1212, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1216, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1220, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1221, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1224, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1228, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1232, "", 1, 0 -mapCamPrevToothAngle = scalar, F32, 1236, "deg", 1, 0 -isDecodingMapCam = bits, U32, 1240, [0:0] -; total TS size = 1244 -crankSynchronizationCounter = scalar, U32, 1244, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1248, "", 1, 0 -vvtToothDurations0 = scalar, U32, 1252, "us", 1, 0 -vvtCurrentPosition = scalar, F32, 1256, "sync: Primary Cam Position", 1, 0 -vvtToothPosition1 = scalar, F32, 1260, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition2 = scalar, F32, 1264, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition3 = scalar, F32, 1268, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition4 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio = scalar, F32, 1276, "", 1, 0 -triggerStateIndex = scalar, U08, 1280, "", 1, 0 -camResyncCounter = scalar, U08, 1281, "", 1, 0 -vvtStateIndex = scalar, U08, 1282, "", 1, 0 -; total TS size = 1284 -m_hasSynchronizedPhase = bits, U32, 1284, [0:0] +startStopStateTempPhysicalCounter = scalar, U32, 1104, "", 1, 0 +egtValue1 = scalar, F32, 1108, "", 1, 0 +egtValue2 = scalar, F32, 1112, "", 1, 0 +desiredRpmLimit = scalar, S16, 1116, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 1120, "", 1, 0 +sparkCounter = scalar, U32, 1124, "", 1, 0 +fuelingLoad = scalar, F32, 1128, "", 1, 0 +ignitionLoad = scalar, F32, 1132, "", 1, 0 +veTableYAxis = scalar, U16, 1136, "%", 0.01, 0 +; total TS size = 1140 +tpsFrom = scalar, F32, 1140 +tpsTo = scalar, F32, 1144 +deltaTps = scalar, F32, 1148 +extraFuel = scalar, F32, 1152, "", 1, 0 +valueFromTable = scalar, F32, 1156, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1160, [0:0] +isBelowDecelThreshold = bits, U32, 1160, [1:1] +isTimeToResetAccumulator = bits, U32, 1160, [2:2] +isFractionalEnrichment = bits, U32, 1160, [3:3] +belowEpsilon = bits, U32, 1160, [4:4] +tooShort = bits, U32, 1160, [5:5] +fractionalInjFuel = scalar, F32, 1164, "", 1, 0 +accumulatedValue = scalar, F32, 1168, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1172, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1176, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1180, "", 1, 0 +cycleCnt = scalar, S32, 1184, "", 1, 0 +; total TS size = 1188 +hwEventCounters1 = scalar, U32, 1188, "", 1, 0 +hwEventCounters2 = scalar, U32, 1192, "", 1, 0 +hwEventCounters3 = scalar, U32, 1196, "", 1, 0 +hwEventCounters4 = scalar, U32, 1200, "", 1, 0 +hwEventCounters5 = scalar, U32, 1204, "", 1, 0 +hwEventCounters6 = scalar, U32, 1208, "", 1, 0 +vvtCamCounter = scalar, U32, 1212, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1216, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1220, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1224, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1225, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1228, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1232, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1236, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1240, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1244, [0:0] +; total TS size = 1248 +crankSynchronizationCounter = scalar, U32, 1248, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1252, "", 1, 0 +vvtToothDurations0 = scalar, U32, 1256, "us", 1, 0 +vvtCurrentPosition = scalar, F32, 1260, "sync: Primary Cam Position", 1, 0 +vvtToothPosition1 = scalar, F32, 1264, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition2 = scalar, F32, 1268, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition3 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition4 = scalar, F32, 1276, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio = scalar, F32, 1280, "", 1, 0 +triggerStateIndex = scalar, U08, 1284, "", 1, 0 +camResyncCounter = scalar, U08, 1285, "", 1, 0 +vvtStateIndex = scalar, U08, 1286, "", 1, 0 ; total TS size = 1288 -wallFuelCorrection = scalar, F32, 1288, "", 1, 0 -wallFuel = scalar, F32, 1292, "", 1, 0 -; total TS size = 1296 -idleState = bits, S32, 1296, [0:2], "not important" -currentIdlePosition = scalar, F32, 1300 -baseIdlePosition = scalar, F32, 1304 -idleClosedLoop = scalar, F32, 1308 -iacByTpsTaper = scalar, F32, 1312 -throttlePedalUpState = scalar, S32, 1316, "", 1, 0 -mightResetPid = bits, U32, 1320, [0:0] -shouldResetPid = bits, U32, 1320, [1:1] -wasResetPid = bits, U32, 1320, [2:2] -mustResetPid = bits, U32, 1320, [3:3] -isCranking = bits, U32, 1320, [4:4] -isIacTableForCoasting = bits, U32, 1320, [5:5] -notIdling = bits, U32, 1320, [6:6] -needReset = bits, U32, 1320, [7:7] -isInDeadZone = bits, U32, 1320, [8:8] -isBlipping = bits, U32, 1320, [9:9] -useClosedLoop = bits, U32, 1320, [10:10] -badTps = bits, U32, 1320, [11:11] -looksLikeRunning = bits, U32, 1320, [12:12] -looksLikeCoasting = bits, U32, 1320, [13:13] -looksLikeCrankToIdle = bits, U32, 1320, [14:14] -isIdleCoasting = bits, U32, 1320, [15:15] -isIdleClosedLoop = bits, U32, 1320, [16:16] -idleTarget = scalar, S32, 1324, "", 1, 0 -targetRpmByClt = scalar, S32, 1328, "", 1, 0 -targetRpmAc = scalar, S32, 1332, "", 1, 0 -iacByRpmTaper = scalar, F32, 1336 -luaAdd = scalar, F32, 1340 -; total TS size = 1344 -idlePosition = scalar, F32, 1344, "per", 1,0 -trim = scalar, F32, 1348, "", 1, 0 -luaAdjustment = scalar, F32, 1352, "per", 1,0 -m_wastegatePosition = scalar, F32, 1356, "per", 1,0 -etbFeedForward = scalar, F32, 1360 -etbIntegralError = scalar, F32, 1364, "", 1, 0 -etbCurrentTarget = scalar, F32, 1368, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1372, "%", 1, 0 -etbRevLimitActive = bits, U32, 1376, [0:0] -jamDetected = bits, U32, 1376, [1:1] -etbDutyRateOfChange = scalar, F32, 1380, "per", 1,0 -etbDutyAverage = scalar, F32, 1384, "per", 1,0 -etbTpsErrorCounter = scalar, U16, 1388, "count", 1,0 -etbPpsErrorCounter = scalar, U16, 1390, "count", 1,0 -etbErrorCode = scalar, S08, 1392, "", 1, 0 -jamTimer = scalar, U16, 1394, "sec", 0.01, 0 -; total TS size = 1396 -faultCode = scalar, U08, 1396, "", 1, 0 -heaterDuty = scalar, U08, 1397, "%", 1, 0 -pumpDuty = scalar, U08, 1398, "%", 1, 0 -tempC = scalar, U16, 1400, "C", 1, 0 -nernstVoltage = scalar, U16, 1402, "V", 0.001, 0 -esr = scalar, U16, 1404, "ohm", 1, 0 -; total TS size = 1408 -dcOutput0 = scalar, F32, 1408, "per", 1,0 -isEnabled0_int = scalar, U08, 1412, "per", 1,0 -isEnabled0 = bits, U32, 1416, [0:0] -; total TS size = 1420 -value0 = scalar, U16, 1420, "value", 1,0 -value1 = scalar, U16, 1422, "value", 1,0 -errorRate = scalar, F32, 1424, "ratio", 1,0 -; total TS size = 1428 -vvtTarget = scalar, U16, 1428, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1430, "%", 0.5, 0 +m_hasSynchronizedPhase = bits, U32, 1288, [0:0] +; total TS size = 1292 +wallFuelCorrection = scalar, F32, 1292, "", 1, 0 +wallFuel = scalar, F32, 1296, "", 1, 0 +; total TS size = 1300 +idleState = bits, S32, 1300, [0:2], "not important" +currentIdlePosition = scalar, F32, 1304 +baseIdlePosition = scalar, F32, 1308 +idleClosedLoop = scalar, F32, 1312 +iacByTpsTaper = scalar, F32, 1316 +throttlePedalUpState = scalar, S32, 1320, "", 1, 0 +mightResetPid = bits, U32, 1324, [0:0] +shouldResetPid = bits, U32, 1324, [1:1] +wasResetPid = bits, U32, 1324, [2:2] +mustResetPid = bits, U32, 1324, [3:3] +isCranking = bits, U32, 1324, [4:4] +isIacTableForCoasting = bits, U32, 1324, [5:5] +notIdling = bits, U32, 1324, [6:6] +needReset = bits, U32, 1324, [7:7] +isInDeadZone = bits, U32, 1324, [8:8] +isBlipping = bits, U32, 1324, [9:9] +useClosedLoop = bits, U32, 1324, [10:10] +badTps = bits, U32, 1324, [11:11] +looksLikeRunning = bits, U32, 1324, [12:12] +looksLikeCoasting = bits, U32, 1324, [13:13] +looksLikeCrankToIdle = bits, U32, 1324, [14:14] +isIdleCoasting = bits, U32, 1324, [15:15] +isIdleClosedLoop = bits, U32, 1324, [16:16] +idleTarget = scalar, S32, 1328, "", 1, 0 +targetRpmByClt = scalar, S32, 1332, "", 1, 0 +targetRpmAc = scalar, S32, 1336, "", 1, 0 +iacByRpmTaper = scalar, F32, 1340 +luaAdd = scalar, F32, 1344 +; total TS size = 1348 +idlePosition = scalar, F32, 1348, "per", 1,0 +trim = scalar, F32, 1352, "", 1, 0 +luaAdjustment = scalar, F32, 1356, "per", 1,0 +m_wastegatePosition = scalar, F32, 1360, "per", 1,0 +etbFeedForward = scalar, F32, 1364 +etbIntegralError = scalar, F32, 1368, "", 1, 0 +etbCurrentTarget = scalar, F32, 1372, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1376, "%", 1, 0 +etbRevLimitActive = bits, U32, 1380, [0:0] +jamDetected = bits, U32, 1380, [1:1] +etbDutyRateOfChange = scalar, F32, 1384, "per", 1,0 +etbDutyAverage = scalar, F32, 1388, "per", 1,0 +etbTpsErrorCounter = scalar, U16, 1392, "count", 1,0 +etbPpsErrorCounter = scalar, U16, 1394, "count", 1,0 +etbErrorCode = scalar, S08, 1396, "", 1, 0 +jamTimer = scalar, U16, 1398, "sec", 0.01, 0 +; total TS size = 1400 +faultCode = scalar, U08, 1400, "", 1, 0 +heaterDuty = scalar, U08, 1401, "%", 1, 0 +pumpDuty = scalar, U08, 1402, "%", 1, 0 +tempC = scalar, U16, 1404, "C", 1, 0 +nernstVoltage = scalar, U16, 1406, "V", 0.001, 0 +esr = scalar, U16, 1408, "ohm", 1, 0 +; total TS size = 1412 +dcOutput0 = scalar, F32, 1412, "per", 1,0 +isEnabled0_int = scalar, U08, 1416, "per", 1,0 +isEnabled0 = bits, U32, 1420, [0:0] +; total TS size = 1424 +value0 = scalar, U16, 1424, "value", 1,0 +value1 = scalar, U16, 1426, "value", 1,0 +errorRate = scalar, F32, 1428, "ratio", 1,0 ; total TS size = 1432 -lambdaCurrentlyGood = bits, U32, 1432, [0:0] -lambdaMonitorCut = bits, U32, 1432, [1:1] -lambdaTimeSinceGood = scalar, U16, 1436, "sec", 0.01, 0 -; total TS size = 1440 +vvtTarget = scalar, U16, 1432, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1434, "%", 0.5, 0 +; total TS size = 1436 +lambdaCurrentlyGood = bits, U32, 1436, [0:0] +lambdaMonitorCut = bits, U32, 1436, [1:1] +lambdaTimeSinceGood = scalar, U16, 1440, "sec", 0.01, 0 +; total TS size = 1444 time = { timeNow } @@ -5196,6 +5197,7 @@ entry = brakePedalState, "Brake switch", int, "%d" entry = startStopState, "startStopState", int, "%d" entry = startStopPhysicalState, "startStopPhysicalState", int, "%d" entry = startStopStateToggleCounter, "startStopStateToggleCounter", int, "%d" +entry = startStopStateTempPhysicalCounter, "startStopStateTempPhysicalCounter", int, "%d" entry = egtValue1, "egtValue1", float, "%.3f" entry = egtValue2, "egtValue2", float, "%.3f" entry = desiredRpmLimit, "User-defined RPM hard limit", int, "%d" @@ -6077,13 +6079,14 @@ dialog = engine_stateDialog, "engine_state" graphLine = brakePedalState graphLine = startStopState graphLine = startStopStateToggleCounter - graphLine = egtValue1 + graphLine = startStopStateTempPhysicalCounter liveGraph = engine_state_5_Graph, "Graph", South + graphLine = egtValue1 graphLine = egtValue2 graphLine = desiredRpmLimit graphLine = fuelInjectionCounter - graphLine = sparkCounter liveGraph = engine_state_6_Graph, "Graph", South + graphLine = sparkCounter graphLine = fuelingLoad graphLine = ignitionLoad graphLine = veTableYAxis @@ -6419,8 +6422,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" ; cam if ; two-stroke, or ; not crank trigger and ((vague trigger and cam choice) or not vague trigger) - field = "Cam Sensor (Primary channel)", triggerInputPins1, 1, {twoStroke == 1 || ( !(trigger_type == 2 || trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 21 || trigger_type == 26 || trigger_type == 27 || trigger_type == 33 || trigger_type == 38 || trigger_type == 39 || trigger_type == 44 || trigger_type == 45 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 58 || trigger_type == 61 || trigger_type == 62 || trigger_type == 68 || trigger_type == 70 || trigger_type == 71 || trigger_type == 72 || trigger_type == 74 || trigger_type == 75 || trigger_type == 76 || trigger_type == 77 || trigger_type == 79) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) ) ) } - field = "Crank Sensor (Primary channel)", triggerInputPins1, 1, { !(twoStroke == 1 || ( !(trigger_type == 2 || trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 21 || trigger_type == 26 || trigger_type == 27 || trigger_type == 33 || trigger_type == 38 || trigger_type == 39 || trigger_type == 44 || trigger_type == 45 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 58 || trigger_type == 61 || trigger_type == 62 || trigger_type == 68 || trigger_type == 70 || trigger_type == 71 || trigger_type == 72 || trigger_type == 74 || trigger_type == 75 || trigger_type == 76 || trigger_type == 77 || trigger_type == 79) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) ) )) } + field = "Cam Sensor (Primary channel)", triggerInputPins1, 1, {twoStroke == 1 || ( !(trigger_type == 2 || trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 21 || trigger_type == 26 || trigger_type == 27 || trigger_type == 33 || trigger_type == 38 || trigger_type == 39 || trigger_type == 44 || trigger_type == 45 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 58 || trigger_type == 61 || trigger_type == 62 || trigger_type == 68 || trigger_type == 70 || trigger_type == 71 || trigger_type == 72 || trigger_type == 74 || trigger_type == 75 || trigger_type == 76 || trigger_type == 77) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) ) ) } + field = "Crank Sensor (Primary channel)", triggerInputPins1, 1, { !(twoStroke == 1 || ( !(trigger_type == 2 || trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 21 || trigger_type == 26 || trigger_type == 27 || trigger_type == 33 || trigger_type == 38 || trigger_type == 39 || trigger_type == 44 || trigger_type == 45 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 58 || trigger_type == 61 || trigger_type == 62 || trigger_type == 68 || trigger_type == 70 || trigger_type == 71 || trigger_type == 72 || trigger_type == 74 || trigger_type == 75 || trigger_type == 76 || trigger_type == 77) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) ) )) } field = "Invert Primary", invertPrimaryTriggerSignal field = "Secondary channel", triggerInputPins2, { triggerInputPins2 != 0 || (triggerInputPins1 != 0 && (trigger_type == 1 || trigger_type == 3 || trigger_type == 15 || trigger_type == 16 || trigger_type == 19 || trigger_type == 25 || trigger_type == 28 || trigger_type == 31 || trigger_type == 35 || trigger_type == 36 || trigger_type == 37 || trigger_type == 40 || trigger_type == 49 || trigger_type == 50 || trigger_type == 53 || trigger_type == 54 || trigger_type == 63 || trigger_type == 64) ) } field = "Invert Secondary", invertSecondaryTriggerSignal, {triggerInputPins2 != 0 && (trigger_type == 1 || trigger_type == 3 || trigger_type == 15 || trigger_type == 16 || trigger_type == 19 || trigger_type == 25 || trigger_type == 28 || trigger_type == 31 || trigger_type == 35 || trigger_type == 36 || trigger_type == 37 || trigger_type == 40 || trigger_type == 49 || trigger_type == 50 || trigger_type == 53 || trigger_type == 54 || trigger_type == 63 || trigger_type == 64) } diff --git a/firmware/tunerstudio/generated/rusefi_uaefi.ini b/firmware/tunerstudio/generated/rusefi_uaefi.ini index f6f334c788..a5f9402e47 100644 --- a/firmware/tunerstudio/generated/rusefi_uaefi.ini +++ b/firmware/tunerstudio/generated/rusefi_uaefi.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.11.08.uaefi.2564102526" + signature = "rusEFI master.2023.11.09.uaefi.2341059624" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.11.08.uaefi.2564102526" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.11.09.uaefi.2341059624" ; 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 @@ -92,7 +92,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","215 CLT","227 IAT" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Nov 08 20:02:17 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Thu Nov 09 02:07:10 UTC 2023 pageSize = 23880 page = 1 @@ -2347,7 +2347,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23870, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1440 + ochBlockSize = 1444 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3001,136 +3001,137 @@ brakePedalState = scalar, S08, 1092, "", 1, 0 startStopState = scalar, S08, 1093, "", 1, 0 startStopPhysicalState = bits, U32, 1096, [0:0] startStopStateToggleCounter = scalar, U32, 1100, "", 1, 0 -egtValue1 = scalar, F32, 1104, "", 1, 0 -egtValue2 = scalar, F32, 1108, "", 1, 0 -desiredRpmLimit = scalar, S16, 1112, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1116, "", 1, 0 -sparkCounter = scalar, U32, 1120, "", 1, 0 -fuelingLoad = scalar, F32, 1124, "", 1, 0 -ignitionLoad = scalar, F32, 1128, "", 1, 0 -veTableYAxis = scalar, U16, 1132, "%", 0.01, 0 -; total TS size = 1136 -tpsFrom = scalar, F32, 1136 -tpsTo = scalar, F32, 1140 -deltaTps = scalar, F32, 1144 -extraFuel = scalar, F32, 1148, "", 1, 0 -valueFromTable = scalar, F32, 1152, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1156, [0:0] -isBelowDecelThreshold = bits, U32, 1156, [1:1] -isTimeToResetAccumulator = bits, U32, 1156, [2:2] -isFractionalEnrichment = bits, U32, 1156, [3:3] -belowEpsilon = bits, U32, 1156, [4:4] -tooShort = bits, U32, 1156, [5:5] -fractionalInjFuel = scalar, F32, 1160, "", 1, 0 -accumulatedValue = scalar, F32, 1164, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1168, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1172, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1176, "", 1, 0 -cycleCnt = scalar, S32, 1180, "", 1, 0 -; total TS size = 1184 -hwEventCounters1 = scalar, U32, 1184, "", 1, 0 -hwEventCounters2 = scalar, U32, 1188, "", 1, 0 -hwEventCounters3 = scalar, U32, 1192, "", 1, 0 -hwEventCounters4 = scalar, U32, 1196, "", 1, 0 -hwEventCounters5 = scalar, U32, 1200, "", 1, 0 -hwEventCounters6 = scalar, U32, 1204, "", 1, 0 -vvtCamCounter = scalar, U32, 1208, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1212, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1216, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1220, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1221, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1224, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1228, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1232, "", 1, 0 -mapCamPrevToothAngle = scalar, F32, 1236, "deg", 1, 0 -isDecodingMapCam = bits, U32, 1240, [0:0] -; total TS size = 1244 -crankSynchronizationCounter = scalar, U32, 1244, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1248, "", 1, 0 -vvtToothDurations0 = scalar, U32, 1252, "us", 1, 0 -vvtCurrentPosition = scalar, F32, 1256, "sync: Primary Cam Position", 1, 0 -vvtToothPosition1 = scalar, F32, 1260, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition2 = scalar, F32, 1264, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition3 = scalar, F32, 1268, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition4 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio = scalar, F32, 1276, "", 1, 0 -triggerStateIndex = scalar, U08, 1280, "", 1, 0 -camResyncCounter = scalar, U08, 1281, "", 1, 0 -vvtStateIndex = scalar, U08, 1282, "", 1, 0 -; total TS size = 1284 -m_hasSynchronizedPhase = bits, U32, 1284, [0:0] +startStopStateTempPhysicalCounter = scalar, U32, 1104, "", 1, 0 +egtValue1 = scalar, F32, 1108, "", 1, 0 +egtValue2 = scalar, F32, 1112, "", 1, 0 +desiredRpmLimit = scalar, S16, 1116, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 1120, "", 1, 0 +sparkCounter = scalar, U32, 1124, "", 1, 0 +fuelingLoad = scalar, F32, 1128, "", 1, 0 +ignitionLoad = scalar, F32, 1132, "", 1, 0 +veTableYAxis = scalar, U16, 1136, "%", 0.01, 0 +; total TS size = 1140 +tpsFrom = scalar, F32, 1140 +tpsTo = scalar, F32, 1144 +deltaTps = scalar, F32, 1148 +extraFuel = scalar, F32, 1152, "", 1, 0 +valueFromTable = scalar, F32, 1156, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1160, [0:0] +isBelowDecelThreshold = bits, U32, 1160, [1:1] +isTimeToResetAccumulator = bits, U32, 1160, [2:2] +isFractionalEnrichment = bits, U32, 1160, [3:3] +belowEpsilon = bits, U32, 1160, [4:4] +tooShort = bits, U32, 1160, [5:5] +fractionalInjFuel = scalar, F32, 1164, "", 1, 0 +accumulatedValue = scalar, F32, 1168, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1172, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1176, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1180, "", 1, 0 +cycleCnt = scalar, S32, 1184, "", 1, 0 +; total TS size = 1188 +hwEventCounters1 = scalar, U32, 1188, "", 1, 0 +hwEventCounters2 = scalar, U32, 1192, "", 1, 0 +hwEventCounters3 = scalar, U32, 1196, "", 1, 0 +hwEventCounters4 = scalar, U32, 1200, "", 1, 0 +hwEventCounters5 = scalar, U32, 1204, "", 1, 0 +hwEventCounters6 = scalar, U32, 1208, "", 1, 0 +vvtCamCounter = scalar, U32, 1212, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1216, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1220, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1224, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1225, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1228, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1232, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1236, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1240, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1244, [0:0] +; total TS size = 1248 +crankSynchronizationCounter = scalar, U32, 1248, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1252, "", 1, 0 +vvtToothDurations0 = scalar, U32, 1256, "us", 1, 0 +vvtCurrentPosition = scalar, F32, 1260, "sync: Primary Cam Position", 1, 0 +vvtToothPosition1 = scalar, F32, 1264, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition2 = scalar, F32, 1268, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition3 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition4 = scalar, F32, 1276, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio = scalar, F32, 1280, "", 1, 0 +triggerStateIndex = scalar, U08, 1284, "", 1, 0 +camResyncCounter = scalar, U08, 1285, "", 1, 0 +vvtStateIndex = scalar, U08, 1286, "", 1, 0 ; total TS size = 1288 -wallFuelCorrection = scalar, F32, 1288, "", 1, 0 -wallFuel = scalar, F32, 1292, "", 1, 0 -; total TS size = 1296 -idleState = bits, S32, 1296, [0:2], "not important" -currentIdlePosition = scalar, F32, 1300 -baseIdlePosition = scalar, F32, 1304 -idleClosedLoop = scalar, F32, 1308 -iacByTpsTaper = scalar, F32, 1312 -throttlePedalUpState = scalar, S32, 1316, "", 1, 0 -mightResetPid = bits, U32, 1320, [0:0] -shouldResetPid = bits, U32, 1320, [1:1] -wasResetPid = bits, U32, 1320, [2:2] -mustResetPid = bits, U32, 1320, [3:3] -isCranking = bits, U32, 1320, [4:4] -isIacTableForCoasting = bits, U32, 1320, [5:5] -notIdling = bits, U32, 1320, [6:6] -needReset = bits, U32, 1320, [7:7] -isInDeadZone = bits, U32, 1320, [8:8] -isBlipping = bits, U32, 1320, [9:9] -useClosedLoop = bits, U32, 1320, [10:10] -badTps = bits, U32, 1320, [11:11] -looksLikeRunning = bits, U32, 1320, [12:12] -looksLikeCoasting = bits, U32, 1320, [13:13] -looksLikeCrankToIdle = bits, U32, 1320, [14:14] -isIdleCoasting = bits, U32, 1320, [15:15] -isIdleClosedLoop = bits, U32, 1320, [16:16] -idleTarget = scalar, S32, 1324, "", 1, 0 -targetRpmByClt = scalar, S32, 1328, "", 1, 0 -targetRpmAc = scalar, S32, 1332, "", 1, 0 -iacByRpmTaper = scalar, F32, 1336 -luaAdd = scalar, F32, 1340 -; total TS size = 1344 -idlePosition = scalar, F32, 1344, "per", 1,0 -trim = scalar, F32, 1348, "", 1, 0 -luaAdjustment = scalar, F32, 1352, "per", 1,0 -m_wastegatePosition = scalar, F32, 1356, "per", 1,0 -etbFeedForward = scalar, F32, 1360 -etbIntegralError = scalar, F32, 1364, "", 1, 0 -etbCurrentTarget = scalar, F32, 1368, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1372, "%", 1, 0 -etbRevLimitActive = bits, U32, 1376, [0:0] -jamDetected = bits, U32, 1376, [1:1] -etbDutyRateOfChange = scalar, F32, 1380, "per", 1,0 -etbDutyAverage = scalar, F32, 1384, "per", 1,0 -etbTpsErrorCounter = scalar, U16, 1388, "count", 1,0 -etbPpsErrorCounter = scalar, U16, 1390, "count", 1,0 -etbErrorCode = scalar, S08, 1392, "", 1, 0 -jamTimer = scalar, U16, 1394, "sec", 0.01, 0 -; total TS size = 1396 -faultCode = scalar, U08, 1396, "", 1, 0 -heaterDuty = scalar, U08, 1397, "%", 1, 0 -pumpDuty = scalar, U08, 1398, "%", 1, 0 -tempC = scalar, U16, 1400, "C", 1, 0 -nernstVoltage = scalar, U16, 1402, "V", 0.001, 0 -esr = scalar, U16, 1404, "ohm", 1, 0 -; total TS size = 1408 -dcOutput0 = scalar, F32, 1408, "per", 1,0 -isEnabled0_int = scalar, U08, 1412, "per", 1,0 -isEnabled0 = bits, U32, 1416, [0:0] -; total TS size = 1420 -value0 = scalar, U16, 1420, "value", 1,0 -value1 = scalar, U16, 1422, "value", 1,0 -errorRate = scalar, F32, 1424, "ratio", 1,0 -; total TS size = 1428 -vvtTarget = scalar, U16, 1428, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1430, "%", 0.5, 0 +m_hasSynchronizedPhase = bits, U32, 1288, [0:0] +; total TS size = 1292 +wallFuelCorrection = scalar, F32, 1292, "", 1, 0 +wallFuel = scalar, F32, 1296, "", 1, 0 +; total TS size = 1300 +idleState = bits, S32, 1300, [0:2], "not important" +currentIdlePosition = scalar, F32, 1304 +baseIdlePosition = scalar, F32, 1308 +idleClosedLoop = scalar, F32, 1312 +iacByTpsTaper = scalar, F32, 1316 +throttlePedalUpState = scalar, S32, 1320, "", 1, 0 +mightResetPid = bits, U32, 1324, [0:0] +shouldResetPid = bits, U32, 1324, [1:1] +wasResetPid = bits, U32, 1324, [2:2] +mustResetPid = bits, U32, 1324, [3:3] +isCranking = bits, U32, 1324, [4:4] +isIacTableForCoasting = bits, U32, 1324, [5:5] +notIdling = bits, U32, 1324, [6:6] +needReset = bits, U32, 1324, [7:7] +isInDeadZone = bits, U32, 1324, [8:8] +isBlipping = bits, U32, 1324, [9:9] +useClosedLoop = bits, U32, 1324, [10:10] +badTps = bits, U32, 1324, [11:11] +looksLikeRunning = bits, U32, 1324, [12:12] +looksLikeCoasting = bits, U32, 1324, [13:13] +looksLikeCrankToIdle = bits, U32, 1324, [14:14] +isIdleCoasting = bits, U32, 1324, [15:15] +isIdleClosedLoop = bits, U32, 1324, [16:16] +idleTarget = scalar, S32, 1328, "", 1, 0 +targetRpmByClt = scalar, S32, 1332, "", 1, 0 +targetRpmAc = scalar, S32, 1336, "", 1, 0 +iacByRpmTaper = scalar, F32, 1340 +luaAdd = scalar, F32, 1344 +; total TS size = 1348 +idlePosition = scalar, F32, 1348, "per", 1,0 +trim = scalar, F32, 1352, "", 1, 0 +luaAdjustment = scalar, F32, 1356, "per", 1,0 +m_wastegatePosition = scalar, F32, 1360, "per", 1,0 +etbFeedForward = scalar, F32, 1364 +etbIntegralError = scalar, F32, 1368, "", 1, 0 +etbCurrentTarget = scalar, F32, 1372, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1376, "%", 1, 0 +etbRevLimitActive = bits, U32, 1380, [0:0] +jamDetected = bits, U32, 1380, [1:1] +etbDutyRateOfChange = scalar, F32, 1384, "per", 1,0 +etbDutyAverage = scalar, F32, 1388, "per", 1,0 +etbTpsErrorCounter = scalar, U16, 1392, "count", 1,0 +etbPpsErrorCounter = scalar, U16, 1394, "count", 1,0 +etbErrorCode = scalar, S08, 1396, "", 1, 0 +jamTimer = scalar, U16, 1398, "sec", 0.01, 0 +; total TS size = 1400 +faultCode = scalar, U08, 1400, "", 1, 0 +heaterDuty = scalar, U08, 1401, "%", 1, 0 +pumpDuty = scalar, U08, 1402, "%", 1, 0 +tempC = scalar, U16, 1404, "C", 1, 0 +nernstVoltage = scalar, U16, 1406, "V", 0.001, 0 +esr = scalar, U16, 1408, "ohm", 1, 0 +; total TS size = 1412 +dcOutput0 = scalar, F32, 1412, "per", 1,0 +isEnabled0_int = scalar, U08, 1416, "per", 1,0 +isEnabled0 = bits, U32, 1420, [0:0] +; total TS size = 1424 +value0 = scalar, U16, 1424, "value", 1,0 +value1 = scalar, U16, 1426, "value", 1,0 +errorRate = scalar, F32, 1428, "ratio", 1,0 ; total TS size = 1432 -lambdaCurrentlyGood = bits, U32, 1432, [0:0] -lambdaMonitorCut = bits, U32, 1432, [1:1] -lambdaTimeSinceGood = scalar, U16, 1436, "sec", 0.01, 0 -; total TS size = 1440 +vvtTarget = scalar, U16, 1432, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1434, "%", 0.5, 0 +; total TS size = 1436 +lambdaCurrentlyGood = bits, U32, 1436, [0:0] +lambdaMonitorCut = bits, U32, 1436, [1:1] +lambdaTimeSinceGood = scalar, U16, 1440, "sec", 0.01, 0 +; total TS size = 1444 time = { timeNow } @@ -5196,6 +5197,7 @@ entry = brakePedalState, "Brake switch", int, "%d" entry = startStopState, "startStopState", int, "%d" entry = startStopPhysicalState, "startStopPhysicalState", int, "%d" entry = startStopStateToggleCounter, "startStopStateToggleCounter", int, "%d" +entry = startStopStateTempPhysicalCounter, "startStopStateTempPhysicalCounter", int, "%d" entry = egtValue1, "egtValue1", float, "%.3f" entry = egtValue2, "egtValue2", float, "%.3f" entry = desiredRpmLimit, "User-defined RPM hard limit", int, "%d" @@ -6076,13 +6078,14 @@ dialog = engine_stateDialog, "engine_state" graphLine = brakePedalState graphLine = startStopState graphLine = startStopStateToggleCounter - graphLine = egtValue1 + graphLine = startStopStateTempPhysicalCounter liveGraph = engine_state_5_Graph, "Graph", South + graphLine = egtValue1 graphLine = egtValue2 graphLine = desiredRpmLimit graphLine = fuelInjectionCounter - graphLine = sparkCounter liveGraph = engine_state_6_Graph, "Graph", South + graphLine = sparkCounter graphLine = fuelingLoad graphLine = ignitionLoad graphLine = veTableYAxis @@ -6418,8 +6421,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" ; cam if ; two-stroke, or ; not crank trigger and ((vague trigger and cam choice) or not vague trigger) - field = "Cam Sensor (Primary channel)", triggerInputPins1, 1, {twoStroke == 1 || ( !(trigger_type == 2 || trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 21 || trigger_type == 26 || trigger_type == 27 || trigger_type == 33 || trigger_type == 38 || trigger_type == 39 || trigger_type == 44 || trigger_type == 45 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 58 || trigger_type == 61 || trigger_type == 62 || trigger_type == 68 || trigger_type == 70 || trigger_type == 71 || trigger_type == 72 || trigger_type == 74 || trigger_type == 75 || trigger_type == 76 || trigger_type == 77 || trigger_type == 79) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) ) ) } - field = "Crank Sensor (Primary channel)", triggerInputPins1, 1, { !(twoStroke == 1 || ( !(trigger_type == 2 || trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 21 || trigger_type == 26 || trigger_type == 27 || trigger_type == 33 || trigger_type == 38 || trigger_type == 39 || trigger_type == 44 || trigger_type == 45 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 58 || trigger_type == 61 || trigger_type == 62 || trigger_type == 68 || trigger_type == 70 || trigger_type == 71 || trigger_type == 72 || trigger_type == 74 || trigger_type == 75 || trigger_type == 76 || trigger_type == 77 || trigger_type == 79) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) ) )) } + field = "Cam Sensor (Primary channel)", triggerInputPins1, 1, {twoStroke == 1 || ( !(trigger_type == 2 || trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 21 || trigger_type == 26 || trigger_type == 27 || trigger_type == 33 || trigger_type == 38 || trigger_type == 39 || trigger_type == 44 || trigger_type == 45 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 58 || trigger_type == 61 || trigger_type == 62 || trigger_type == 68 || trigger_type == 70 || trigger_type == 71 || trigger_type == 72 || trigger_type == 74 || trigger_type == 75 || trigger_type == 76 || trigger_type == 77) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) ) ) } + field = "Crank Sensor (Primary channel)", triggerInputPins1, 1, { !(twoStroke == 1 || ( !(trigger_type == 2 || trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 21 || trigger_type == 26 || trigger_type == 27 || trigger_type == 33 || trigger_type == 38 || trigger_type == 39 || trigger_type == 44 || trigger_type == 45 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 58 || trigger_type == 61 || trigger_type == 62 || trigger_type == 68 || trigger_type == 70 || trigger_type == 71 || trigger_type == 72 || trigger_type == 74 || trigger_type == 75 || trigger_type == 76 || trigger_type == 77) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) ) )) } field = "Invert Primary", invertPrimaryTriggerSignal field = "Secondary channel", triggerInputPins2, { triggerInputPins2 != 0 || (triggerInputPins1 != 0 && (trigger_type == 1 || trigger_type == 3 || trigger_type == 15 || trigger_type == 16 || trigger_type == 19 || trigger_type == 25 || trigger_type == 28 || trigger_type == 31 || trigger_type == 35 || trigger_type == 36 || trigger_type == 37 || trigger_type == 40 || trigger_type == 49 || trigger_type == 50 || trigger_type == 53 || trigger_type == 54 || trigger_type == 63 || trigger_type == 64) ) } field = "Invert Secondary", invertSecondaryTriggerSignal, {triggerInputPins2 != 0 && (trigger_type == 1 || trigger_type == 3 || trigger_type == 15 || trigger_type == 16 || trigger_type == 19 || trigger_type == 25 || trigger_type == 28 || trigger_type == 31 || trigger_type == 35 || trigger_type == 36 || trigger_type == 37 || trigger_type == 40 || trigger_type == 49 || trigger_type == 50 || trigger_type == 53 || trigger_type == 54 || trigger_type == 63 || trigger_type == 64) } 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 a1812de687..4a3b762f57 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 Wed Nov 01 16:52:27 UTC 2023 +// this file was generated automatically by rusEFI tool config_definition_base.jar based on (unknown script) controllers/actuators/dc_motors.txt Thu Nov 09 02:06:25 UTC 2023 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -171,10 +171,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(1408); - public static final Field ISENABLED0_INT = Field.create("ISENABLED0_INT", 4, FieldType.INT8).setScale(1.0).setBaseOffset(1408); - public static final Field ALIGNMENTFILL_AT_5 = Field.create("ALIGNMENTFILL_AT_5", 5, FieldType.INT8).setScale(1.0).setBaseOffset(1408); - public static final Field ISENABLED0 = Field.create("ISENABLED0", 8, FieldType.BIT, 0).setBaseOffset(1408); + public static final Field DCOUTPUT0 = Field.create("DCOUTPUT0", 0, FieldType.FLOAT).setBaseOffset(1412); + public static final Field ISENABLED0_INT = Field.create("ISENABLED0_INT", 4, FieldType.INT8).setScale(1.0).setBaseOffset(1412); + public static final Field ALIGNMENTFILL_AT_5 = Field.create("ALIGNMENTFILL_AT_5", 5, FieldType.INT8).setScale(1.0).setBaseOffset(1412); + public static final Field ISENABLED0 = Field.create("ISENABLED0", 8, FieldType.BIT, 0).setBaseOffset(1412); 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 f105ec2a01..7e31d2e5ee 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 Wed Nov 01 16:52:27 UTC 2023 +// this file was generated automatically by rusEFI tool config_definition_base.jar based on (unknown script) controllers/actuators/electronic_throttle.txt Thu Nov 09 02:06:25 UTC 2023 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -171,23 +171,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(1344); - public static final Field TRIM = Field.create("TRIM", 4, FieldType.FLOAT).setBaseOffset(1344); - public static final Field LUAADJUSTMENT = Field.create("LUAADJUSTMENT", 8, FieldType.FLOAT).setBaseOffset(1344); - public static final Field M_WASTEGATEPOSITION = Field.create("M_WASTEGATEPOSITION", 12, FieldType.FLOAT).setBaseOffset(1344); - public static final Field ETBFEEDFORWARD = Field.create("ETBFEEDFORWARD", 16, FieldType.FLOAT).setBaseOffset(1344); - public static final Field ETBINTEGRALERROR = Field.create("ETBINTEGRALERROR", 20, FieldType.FLOAT).setBaseOffset(1344); - public static final Field ETBCURRENTTARGET = Field.create("ETBCURRENTTARGET", 24, FieldType.FLOAT).setBaseOffset(1344); - public static final Field ETBCURRENTADJUSTEDTARGET = Field.create("ETBCURRENTADJUSTEDTARGET", 28, FieldType.FLOAT).setBaseOffset(1344); - public static final Field ETBREVLIMITACTIVE = Field.create("ETBREVLIMITACTIVE", 32, FieldType.BIT, 0).setBaseOffset(1344); - public static final Field JAMDETECTED = Field.create("JAMDETECTED", 32, FieldType.BIT, 1).setBaseOffset(1344); - public static final Field ETBDUTYRATEOFCHANGE = Field.create("ETBDUTYRATEOFCHANGE", 36, FieldType.FLOAT).setBaseOffset(1344); - public static final Field ETBDUTYAVERAGE = Field.create("ETBDUTYAVERAGE", 40, FieldType.FLOAT).setBaseOffset(1344); - public static final Field ETBTPSERRORCOUNTER = Field.create("ETBTPSERRORCOUNTER", 44, FieldType.INT16).setScale(1.0).setBaseOffset(1344); - public static final Field ETBPPSERRORCOUNTER = Field.create("ETBPPSERRORCOUNTER", 46, FieldType.INT16).setScale(1.0).setBaseOffset(1344); - public static final Field ETBERRORCODE = Field.create("ETBERRORCODE", 48, FieldType.INT8).setScale(1.0).setBaseOffset(1344); - public static final Field ALIGNMENTFILL_AT_49 = Field.create("ALIGNMENTFILL_AT_49", 49, FieldType.INT8).setScale(1.0).setBaseOffset(1344); - public static final Field JAMTIMER = Field.create("JAMTIMER", 50, FieldType.INT16).setScale(0.01).setBaseOffset(1344); + public static final Field IDLEPOSITION = Field.create("IDLEPOSITION", 0, FieldType.FLOAT).setBaseOffset(1348); + public static final Field TRIM = Field.create("TRIM", 4, FieldType.FLOAT).setBaseOffset(1348); + public static final Field LUAADJUSTMENT = Field.create("LUAADJUSTMENT", 8, FieldType.FLOAT).setBaseOffset(1348); + public static final Field M_WASTEGATEPOSITION = Field.create("M_WASTEGATEPOSITION", 12, FieldType.FLOAT).setBaseOffset(1348); + public static final Field ETBFEEDFORWARD = Field.create("ETBFEEDFORWARD", 16, FieldType.FLOAT).setBaseOffset(1348); + public static final Field ETBINTEGRALERROR = Field.create("ETBINTEGRALERROR", 20, FieldType.FLOAT).setBaseOffset(1348); + public static final Field ETBCURRENTTARGET = Field.create("ETBCURRENTTARGET", 24, FieldType.FLOAT).setBaseOffset(1348); + public static final Field ETBCURRENTADJUSTEDTARGET = Field.create("ETBCURRENTADJUSTEDTARGET", 28, FieldType.FLOAT).setBaseOffset(1348); + public static final Field ETBREVLIMITACTIVE = Field.create("ETBREVLIMITACTIVE", 32, FieldType.BIT, 0).setBaseOffset(1348); + public static final Field JAMDETECTED = Field.create("JAMDETECTED", 32, FieldType.BIT, 1).setBaseOffset(1348); + public static final Field ETBDUTYRATEOFCHANGE = Field.create("ETBDUTYRATEOFCHANGE", 36, FieldType.FLOAT).setBaseOffset(1348); + public static final Field ETBDUTYAVERAGE = Field.create("ETBDUTYAVERAGE", 40, FieldType.FLOAT).setBaseOffset(1348); + public static final Field ETBTPSERRORCOUNTER = Field.create("ETBTPSERRORCOUNTER", 44, FieldType.INT16).setScale(1.0).setBaseOffset(1348); + public static final Field ETBPPSERRORCOUNTER = Field.create("ETBPPSERRORCOUNTER", 46, FieldType.INT16).setScale(1.0).setBaseOffset(1348); + public static final Field ETBERRORCODE = Field.create("ETBERRORCODE", 48, FieldType.INT8).setScale(1.0).setBaseOffset(1348); + public static final Field ALIGNMENTFILL_AT_49 = Field.create("ALIGNMENTFILL_AT_49", 49, FieldType.INT8).setScale(1.0).setBaseOffset(1348); + public static final Field JAMTIMER = Field.create("JAMTIMER", 50, FieldType.INT16).setScale(0.01).setBaseOffset(1348); 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 1b4888539a..4bdcd09456 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.jar based on (unknown script) controllers/algo/engine_state.txt Wed Nov 01 16:52:27 UTC 2023 +// this file was generated automatically by rusEFI tool config_definition_base.jar based on (unknown script) controllers/algo/engine_state.txt Thu Nov 09 02:06:25 UTC 2023 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -195,16 +195,17 @@ public class EngineState { public static final Field ALIGNMENTFILL_AT_46 = Field.create("ALIGNMENTFILL_AT_46", 46, FieldType.INT8).setScale(1.0).setBaseOffset(1048); public static final Field STARTSTOPPHYSICALSTATE = Field.create("STARTSTOPPHYSICALSTATE", 48, FieldType.BIT, 0).setBaseOffset(1048); public static final Field STARTSTOPSTATETOGGLECOUNTER = Field.create("STARTSTOPSTATETOGGLECOUNTER", 52, FieldType.INT).setScale(1.0).setBaseOffset(1048); - public static final Field EGTVALUE1 = Field.create("EGTVALUE1", 56, FieldType.FLOAT).setBaseOffset(1048); - public static final Field EGTVALUE2 = Field.create("EGTVALUE2", 60, FieldType.FLOAT).setBaseOffset(1048); - public static final Field DESIREDRPMLIMIT = Field.create("DESIREDRPMLIMIT", 64, FieldType.INT16).setScale(1.0).setBaseOffset(1048); - public static final Field ALIGNMENTFILL_AT_66 = Field.create("ALIGNMENTFILL_AT_66", 66, FieldType.INT8).setScale(1.0).setBaseOffset(1048); - public static final Field FUELINJECTIONCOUNTER = Field.create("FUELINJECTIONCOUNTER", 68, FieldType.INT).setScale(1.0).setBaseOffset(1048); - public static final Field SPARKCOUNTER = Field.create("SPARKCOUNTER", 72, FieldType.INT).setScale(1.0).setBaseOffset(1048); - public static final Field FUELINGLOAD = Field.create("FUELINGLOAD", 76, FieldType.FLOAT).setBaseOffset(1048); - public static final Field IGNITIONLOAD = Field.create("IGNITIONLOAD", 80, FieldType.FLOAT).setBaseOffset(1048); - public static final Field VETABLEYAXIS = Field.create("VETABLEYAXIS", 84, FieldType.INT16).setScale(0.01).setBaseOffset(1048); - public static final Field ALIGNMENTFILL_AT_86 = Field.create("ALIGNMENTFILL_AT_86", 86, FieldType.INT8).setScale(1.0).setBaseOffset(1048); + public static final Field STARTSTOPSTATETEMPPHYSICALCOUNTER = Field.create("STARTSTOPSTATETEMPPHYSICALCOUNTER", 56, FieldType.INT).setScale(1.0).setBaseOffset(1048); + public static final Field EGTVALUE1 = Field.create("EGTVALUE1", 60, FieldType.FLOAT).setBaseOffset(1048); + public static final Field EGTVALUE2 = Field.create("EGTVALUE2", 64, FieldType.FLOAT).setBaseOffset(1048); + public static final Field DESIREDRPMLIMIT = Field.create("DESIREDRPMLIMIT", 68, FieldType.INT16).setScale(1.0).setBaseOffset(1048); + public static final Field ALIGNMENTFILL_AT_70 = Field.create("ALIGNMENTFILL_AT_70", 70, FieldType.INT8).setScale(1.0).setBaseOffset(1048); + public static final Field FUELINJECTIONCOUNTER = Field.create("FUELINJECTIONCOUNTER", 72, FieldType.INT).setScale(1.0).setBaseOffset(1048); + public static final Field SPARKCOUNTER = Field.create("SPARKCOUNTER", 76, FieldType.INT).setScale(1.0).setBaseOffset(1048); + public static final Field FUELINGLOAD = Field.create("FUELINGLOAD", 80, FieldType.FLOAT).setBaseOffset(1048); + public static final Field IGNITIONLOAD = Field.create("IGNITIONLOAD", 84, FieldType.FLOAT).setBaseOffset(1048); + public static final Field VETABLEYAXIS = Field.create("VETABLEYAXIS", 88, FieldType.INT16).setScale(0.01).setBaseOffset(1048); + public static final Field ALIGNMENTFILL_AT_90 = Field.create("ALIGNMENTFILL_AT_90", 90, FieldType.INT8).setScale(1.0).setBaseOffset(1048); public static final Field[] VALUES = { LUA_FUELADD, LUA_FUELMULT, @@ -230,15 +231,16 @@ public class EngineState { ALIGNMENTFILL_AT_46, STARTSTOPPHYSICALSTATE, STARTSTOPSTATETOGGLECOUNTER, + STARTSTOPSTATETEMPPHYSICALCOUNTER, EGTVALUE1, EGTVALUE2, DESIREDRPMLIMIT, - ALIGNMENTFILL_AT_66, + ALIGNMENTFILL_AT_70, FUELINJECTIONCOUNTER, SPARKCOUNTER, FUELINGLOAD, IGNITIONLOAD, VETABLEYAXIS, - ALIGNMENTFILL_AT_86, + ALIGNMENTFILL_AT_90, }; } 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 e908575105..ceeb123205 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.jar based on (unknown script) integration/rusefi_config.txt Wed Nov 08 20:21:37 UTC 2023 +// this file was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Thu Nov 09 02:08:24 UTC 2023 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -1269,11 +1269,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.2023.11.08.f407-discovery.2509298742"; + public static final String TS_SIGNATURE = "rusEFI master.2023.11.09.f407-discovery.2261547360"; 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 = 1440; + public static final int TS_TOTAL_OUTPUT_SIZE = 1444; 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; 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 deadc90a5e..d2d0101877 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 Wed Nov 01 16:52:27 UTC 2023 +// this file was generated automatically by rusEFI tool config_definition_base.jar based on (unknown script) controllers/actuators/idle_state.txt Thu Nov 09 02:06:25 UTC 2023 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -171,34 +171,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(1296); - public static final Field CURRENTIDLEPOSITION = Field.create("CURRENTIDLEPOSITION", 4, FieldType.FLOAT).setBaseOffset(1296); - public static final Field BASEIDLEPOSITION = Field.create("BASEIDLEPOSITION", 8, FieldType.FLOAT).setBaseOffset(1296); - public static final Field IDLECLOSEDLOOP = Field.create("IDLECLOSEDLOOP", 12, FieldType.FLOAT).setBaseOffset(1296); - public static final Field IACBYTPSTAPER = Field.create("IACBYTPSTAPER", 16, FieldType.FLOAT).setBaseOffset(1296); - public static final Field THROTTLEPEDALUPSTATE = Field.create("THROTTLEPEDALUPSTATE", 20, FieldType.INT).setScale(1.0).setBaseOffset(1296); - public static final Field MIGHTRESETPID = Field.create("MIGHTRESETPID", 24, FieldType.BIT, 0).setBaseOffset(1296); - public static final Field SHOULDRESETPID = Field.create("SHOULDRESETPID", 24, FieldType.BIT, 1).setBaseOffset(1296); - public static final Field WASRESETPID = Field.create("WASRESETPID", 24, FieldType.BIT, 2).setBaseOffset(1296); - public static final Field MUSTRESETPID = Field.create("MUSTRESETPID", 24, FieldType.BIT, 3).setBaseOffset(1296); - public static final Field ISCRANKING = Field.create("ISCRANKING", 24, FieldType.BIT, 4).setBaseOffset(1296); - public static final Field ISIACTABLEFORCOASTING = Field.create("ISIACTABLEFORCOASTING", 24, FieldType.BIT, 5).setBaseOffset(1296); - public static final Field NOTIDLING = Field.create("NOTIDLING", 24, FieldType.BIT, 6).setBaseOffset(1296); - public static final Field NEEDRESET = Field.create("NEEDRESET", 24, FieldType.BIT, 7).setBaseOffset(1296); - public static final Field ISINDEADZONE = Field.create("ISINDEADZONE", 24, FieldType.BIT, 8).setBaseOffset(1296); - public static final Field ISBLIPPING = Field.create("ISBLIPPING", 24, FieldType.BIT, 9).setBaseOffset(1296); - public static final Field USECLOSEDLOOP = Field.create("USECLOSEDLOOP", 24, FieldType.BIT, 10).setBaseOffset(1296); - public static final Field BADTPS = Field.create("BADTPS", 24, FieldType.BIT, 11).setBaseOffset(1296); - public static final Field LOOKSLIKERUNNING = Field.create("LOOKSLIKERUNNING", 24, FieldType.BIT, 12).setBaseOffset(1296); - public static final Field LOOKSLIKECOASTING = Field.create("LOOKSLIKECOASTING", 24, FieldType.BIT, 13).setBaseOffset(1296); - public static final Field LOOKSLIKECRANKTOIDLE = Field.create("LOOKSLIKECRANKTOIDLE", 24, FieldType.BIT, 14).setBaseOffset(1296); - public static final Field ISIDLECOASTING = Field.create("ISIDLECOASTING", 24, FieldType.BIT, 15).setBaseOffset(1296); - public static final Field ISIDLECLOSEDLOOP = Field.create("ISIDLECLOSEDLOOP", 24, FieldType.BIT, 16).setBaseOffset(1296); - public static final Field IDLETARGET = Field.create("IDLETARGET", 28, FieldType.INT).setScale(1.0).setBaseOffset(1296); - public static final Field TARGETRPMBYCLT = Field.create("TARGETRPMBYCLT", 32, FieldType.INT).setScale(1.0).setBaseOffset(1296); - public static final Field TARGETRPMAC = Field.create("TARGETRPMAC", 36, FieldType.INT).setScale(1.0).setBaseOffset(1296); - public static final Field IACBYRPMTAPER = Field.create("IACBYRPMTAPER", 40, FieldType.FLOAT).setBaseOffset(1296); - public static final Field LUAADD = Field.create("LUAADD", 44, FieldType.FLOAT).setBaseOffset(1296); + public static final Field IDLESTATE = Field.create("IDLESTATE", 0, FieldType.INT).setScale(1.0).setBaseOffset(1300); + public static final Field CURRENTIDLEPOSITION = Field.create("CURRENTIDLEPOSITION", 4, FieldType.FLOAT).setBaseOffset(1300); + public static final Field BASEIDLEPOSITION = Field.create("BASEIDLEPOSITION", 8, FieldType.FLOAT).setBaseOffset(1300); + public static final Field IDLECLOSEDLOOP = Field.create("IDLECLOSEDLOOP", 12, FieldType.FLOAT).setBaseOffset(1300); + public static final Field IACBYTPSTAPER = Field.create("IACBYTPSTAPER", 16, FieldType.FLOAT).setBaseOffset(1300); + public static final Field THROTTLEPEDALUPSTATE = Field.create("THROTTLEPEDALUPSTATE", 20, FieldType.INT).setScale(1.0).setBaseOffset(1300); + public static final Field MIGHTRESETPID = Field.create("MIGHTRESETPID", 24, FieldType.BIT, 0).setBaseOffset(1300); + public static final Field SHOULDRESETPID = Field.create("SHOULDRESETPID", 24, FieldType.BIT, 1).setBaseOffset(1300); + public static final Field WASRESETPID = Field.create("WASRESETPID", 24, FieldType.BIT, 2).setBaseOffset(1300); + public static final Field MUSTRESETPID = Field.create("MUSTRESETPID", 24, FieldType.BIT, 3).setBaseOffset(1300); + public static final Field ISCRANKING = Field.create("ISCRANKING", 24, FieldType.BIT, 4).setBaseOffset(1300); + public static final Field ISIACTABLEFORCOASTING = Field.create("ISIACTABLEFORCOASTING", 24, FieldType.BIT, 5).setBaseOffset(1300); + public static final Field NOTIDLING = Field.create("NOTIDLING", 24, FieldType.BIT, 6).setBaseOffset(1300); + public static final Field NEEDRESET = Field.create("NEEDRESET", 24, FieldType.BIT, 7).setBaseOffset(1300); + public static final Field ISINDEADZONE = Field.create("ISINDEADZONE", 24, FieldType.BIT, 8).setBaseOffset(1300); + public static final Field ISBLIPPING = Field.create("ISBLIPPING", 24, FieldType.BIT, 9).setBaseOffset(1300); + public static final Field USECLOSEDLOOP = Field.create("USECLOSEDLOOP", 24, FieldType.BIT, 10).setBaseOffset(1300); + public static final Field BADTPS = Field.create("BADTPS", 24, FieldType.BIT, 11).setBaseOffset(1300); + public static final Field LOOKSLIKERUNNING = Field.create("LOOKSLIKERUNNING", 24, FieldType.BIT, 12).setBaseOffset(1300); + public static final Field LOOKSLIKECOASTING = Field.create("LOOKSLIKECOASTING", 24, FieldType.BIT, 13).setBaseOffset(1300); + public static final Field LOOKSLIKECRANKTOIDLE = Field.create("LOOKSLIKECRANKTOIDLE", 24, FieldType.BIT, 14).setBaseOffset(1300); + public static final Field ISIDLECOASTING = Field.create("ISIDLECOASTING", 24, FieldType.BIT, 15).setBaseOffset(1300); + public static final Field ISIDLECLOSEDLOOP = Field.create("ISIDLECLOSEDLOOP", 24, FieldType.BIT, 16).setBaseOffset(1300); + public static final Field IDLETARGET = Field.create("IDLETARGET", 28, FieldType.INT).setScale(1.0).setBaseOffset(1300); + public static final Field TARGETRPMBYCLT = Field.create("TARGETRPMBYCLT", 32, FieldType.INT).setScale(1.0).setBaseOffset(1300); + public static final Field TARGETRPMAC = Field.create("TARGETRPMAC", 36, FieldType.INT).setScale(1.0).setBaseOffset(1300); + public static final Field IACBYRPMTAPER = Field.create("IACBYRPMTAPER", 40, FieldType.FLOAT).setBaseOffset(1300); + public static final Field LUAADD = Field.create("LUAADD", 44, FieldType.FLOAT).setBaseOffset(1300); 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 1806dee158..1b619defab 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 Fri Oct 06 17:24:05 UTC 2023 +// this file was generated automatically by rusEFI tool config_definition_base.jar based on (unknown script) controllers/math/lambda_monitor.txt Thu Nov 09 02:06:25 UTC 2023 // 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(1432); - public static final Field LAMBDAMONITORCUT = Field.create("LAMBDAMONITORCUT", 0, FieldType.BIT, 1).setBaseOffset(1432); - public static final Field LAMBDATIMESINCEGOOD = Field.create("LAMBDATIMESINCEGOOD", 4, FieldType.INT16).setScale(0.01).setBaseOffset(1432); - public static final Field ALIGNMENTFILL_AT_6 = Field.create("ALIGNMENTFILL_AT_6", 6, FieldType.INT8).setScale(1.0).setBaseOffset(1432); + public static final Field LAMBDACURRENTLYGOOD = Field.create("LAMBDACURRENTLYGOOD", 0, FieldType.BIT, 0).setBaseOffset(1436); + public static final Field LAMBDAMONITORCUT = Field.create("LAMBDAMONITORCUT", 0, FieldType.BIT, 1).setBaseOffset(1436); + public static final Field LAMBDATIMESINCEGOOD = Field.create("LAMBDATIMESINCEGOOD", 4, FieldType.INT16).setScale(0.01).setBaseOffset(1436); + public static final Field ALIGNMENTFILL_AT_6 = Field.create("ALIGNMENTFILL_AT_6", 6, FieldType.INT8).setScale(1.0).setBaseOffset(1436); 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 4f0bc2f80d..adc2563a20 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 Wed Nov 01 16:52:27 UTC 2023 +// this file was generated automatically by rusEFI tool config_definition_base.jar based on (unknown script) controllers/sensors/sent_state.txt Thu Nov 09 02:06:25 UTC 2023 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -171,9 +171,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(1420); - public static final Field VALUE1 = Field.create("VALUE1", 2, FieldType.INT16).setScale(1.0).setBaseOffset(1420); - public static final Field ERRORRATE = Field.create("ERRORRATE", 4, FieldType.FLOAT).setBaseOffset(1420); + public static final Field VALUE0 = Field.create("VALUE0", 0, FieldType.INT16).setScale(1.0).setBaseOffset(1424); + public static final Field VALUE1 = Field.create("VALUE1", 2, FieldType.INT16).setScale(1.0).setBaseOffset(1424); + public static final Field ERRORRATE = Field.create("ERRORRATE", 4, FieldType.FLOAT).setBaseOffset(1424); 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 664b651ba0..517a264d33 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 Wed Nov 01 16:52:27 UTC 2023 +// this file was generated automatically by rusEFI tool config_definition_base.jar based on (unknown script) controllers/algo/tps_accel_state.txt Thu Nov 09 02:06:25 UTC 2023 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -171,23 +171,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(1136); - public static final Field TPSTO = Field.create("TPSTO", 4, FieldType.FLOAT).setBaseOffset(1136); - public static final Field DELTATPS = Field.create("DELTATPS", 8, FieldType.FLOAT).setBaseOffset(1136); - public static final Field EXTRAFUEL = Field.create("EXTRAFUEL", 12, FieldType.FLOAT).setBaseOffset(1136); - public static final Field VALUEFROMTABLE = Field.create("VALUEFROMTABLE", 16, FieldType.FLOAT).setBaseOffset(1136); - public static final Field ISABOVEACCELTHRESHOLD = Field.create("ISABOVEACCELTHRESHOLD", 20, FieldType.BIT, 0).setBaseOffset(1136); - public static final Field ISBELOWDECELTHRESHOLD = Field.create("ISBELOWDECELTHRESHOLD", 20, FieldType.BIT, 1).setBaseOffset(1136); - public static final Field ISTIMETORESETACCUMULATOR = Field.create("ISTIMETORESETACCUMULATOR", 20, FieldType.BIT, 2).setBaseOffset(1136); - public static final Field ISFRACTIONALENRICHMENT = Field.create("ISFRACTIONALENRICHMENT", 20, FieldType.BIT, 3).setBaseOffset(1136); - public static final Field BELOWEPSILON = Field.create("BELOWEPSILON", 20, FieldType.BIT, 4).setBaseOffset(1136); - public static final Field TOOSHORT = Field.create("TOOSHORT", 20, FieldType.BIT, 5).setBaseOffset(1136); - public static final Field FRACTIONALINJFUEL = Field.create("FRACTIONALINJFUEL", 24, FieldType.FLOAT).setBaseOffset(1136); - public static final Field ACCUMULATEDVALUE = Field.create("ACCUMULATEDVALUE", 28, FieldType.FLOAT).setBaseOffset(1136); - public static final Field MAXEXTRAPERCYCLE = Field.create("MAXEXTRAPERCYCLE", 32, FieldType.FLOAT).setBaseOffset(1136); - public static final Field MAXEXTRAPERPERIOD = Field.create("MAXEXTRAPERPERIOD", 36, FieldType.FLOAT).setBaseOffset(1136); - public static final Field MAXINJECTEDPERPERIOD = Field.create("MAXINJECTEDPERPERIOD", 40, FieldType.FLOAT).setBaseOffset(1136); - public static final Field CYCLECNT = Field.create("CYCLECNT", 44, FieldType.INT).setScale(1.0).setBaseOffset(1136); + public static final Field TPSFROM = Field.create("TPSFROM", 0, FieldType.FLOAT).setBaseOffset(1140); + public static final Field TPSTO = Field.create("TPSTO", 4, FieldType.FLOAT).setBaseOffset(1140); + public static final Field DELTATPS = Field.create("DELTATPS", 8, FieldType.FLOAT).setBaseOffset(1140); + public static final Field EXTRAFUEL = Field.create("EXTRAFUEL", 12, FieldType.FLOAT).setBaseOffset(1140); + public static final Field VALUEFROMTABLE = Field.create("VALUEFROMTABLE", 16, FieldType.FLOAT).setBaseOffset(1140); + public static final Field ISABOVEACCELTHRESHOLD = Field.create("ISABOVEACCELTHRESHOLD", 20, FieldType.BIT, 0).setBaseOffset(1140); + public static final Field ISBELOWDECELTHRESHOLD = Field.create("ISBELOWDECELTHRESHOLD", 20, FieldType.BIT, 1).setBaseOffset(1140); + public static final Field ISTIMETORESETACCUMULATOR = Field.create("ISTIMETORESETACCUMULATOR", 20, FieldType.BIT, 2).setBaseOffset(1140); + public static final Field ISFRACTIONALENRICHMENT = Field.create("ISFRACTIONALENRICHMENT", 20, FieldType.BIT, 3).setBaseOffset(1140); + public static final Field BELOWEPSILON = Field.create("BELOWEPSILON", 20, FieldType.BIT, 4).setBaseOffset(1140); + public static final Field TOOSHORT = Field.create("TOOSHORT", 20, FieldType.BIT, 5).setBaseOffset(1140); + public static final Field FRACTIONALINJFUEL = Field.create("FRACTIONALINJFUEL", 24, FieldType.FLOAT).setBaseOffset(1140); + public static final Field ACCUMULATEDVALUE = Field.create("ACCUMULATEDVALUE", 28, FieldType.FLOAT).setBaseOffset(1140); + public static final Field MAXEXTRAPERCYCLE = Field.create("MAXEXTRAPERCYCLE", 32, FieldType.FLOAT).setBaseOffset(1140); + public static final Field MAXEXTRAPERPERIOD = Field.create("MAXEXTRAPERPERIOD", 36, FieldType.FLOAT).setBaseOffset(1140); + public static final Field MAXINJECTEDPERPERIOD = Field.create("MAXINJECTEDPERPERIOD", 40, FieldType.FLOAT).setBaseOffset(1140); + public static final Field CYCLECNT = Field.create("CYCLECNT", 44, FieldType.INT).setScale(1.0).setBaseOffset(1140); 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 376fff8515..e7e7b5900b 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 Tue Sep 26 01:20:38 UTC 2023 +// this file was generated automatically by rusEFI tool config_definition_base.jar based on (unknown script) controllers/trigger/trigger_central.txt Thu Nov 09 02:06:25 UTC 2023 // 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(1184); - public static final Field HWEVENTCOUNTERS2 = Field.create("HWEVENTCOUNTERS2", 4, FieldType.INT).setScale(1.0).setBaseOffset(1184); - public static final Field HWEVENTCOUNTERS3 = Field.create("HWEVENTCOUNTERS3", 8, FieldType.INT).setScale(1.0).setBaseOffset(1184); - public static final Field HWEVENTCOUNTERS4 = Field.create("HWEVENTCOUNTERS4", 12, FieldType.INT).setScale(1.0).setBaseOffset(1184); - public static final Field HWEVENTCOUNTERS5 = Field.create("HWEVENTCOUNTERS5", 16, FieldType.INT).setScale(1.0).setBaseOffset(1184); - public static final Field HWEVENTCOUNTERS6 = Field.create("HWEVENTCOUNTERS6", 20, FieldType.INT).setScale(1.0).setBaseOffset(1184); - public static final Field VVTCAMCOUNTER = Field.create("VVTCAMCOUNTER", 24, FieldType.INT).setScale(1.0).setBaseOffset(1184); - public static final Field MAPVVT_MAP_AT_SPECIAL_POINT = Field.create("MAPVVT_MAP_AT_SPECIAL_POINT", 28, FieldType.FLOAT).setBaseOffset(1184); - public static final Field MAPVVT_MAP_AT_DIFF = Field.create("MAPVVT_MAP_AT_DIFF", 32, FieldType.FLOAT).setBaseOffset(1184); - public static final Field MAPVVT_MAP_AT_CYCLE_COUNT = Field.create("MAPVVT_MAP_AT_CYCLE_COUNT", 36, FieldType.INT8).setScale(1.0).setBaseOffset(1184); - public static final Field MAPVVT_MAP_PEAK = Field.create("MAPVVT_MAP_PEAK", 37, FieldType.INT8).setScale(1.0).setBaseOffset(1184); - public static final Field ALIGNMENTFILL_AT_38 = Field.create("ALIGNMENTFILL_AT_38", 38, FieldType.INT8).setScale(1.0).setBaseOffset(1184); - public static final Field CURRENTENGINEDECODEDPHASE = Field.create("CURRENTENGINEDECODEDPHASE", 40, FieldType.FLOAT).setBaseOffset(1184); - public static final Field TRIGGERTOOTHANGLEERROR = Field.create("TRIGGERTOOTHANGLEERROR", 44, FieldType.FLOAT).setBaseOffset(1184); - public static final Field TRIGGERIGNOREDTOOTHCOUNT = Field.create("TRIGGERIGNOREDTOOTHCOUNT", 48, FieldType.INT8).setScale(1.0).setBaseOffset(1184); - public static final Field ALIGNMENTFILL_AT_49 = Field.create("ALIGNMENTFILL_AT_49", 49, FieldType.INT8).setScale(1.0).setBaseOffset(1184); - public static final Field MAPCAMPREVTOOTHANGLE = Field.create("MAPCAMPREVTOOTHANGLE", 52, FieldType.FLOAT).setBaseOffset(1184); - public static final Field ISDECODINGMAPCAM = Field.create("ISDECODINGMAPCAM", 56, FieldType.BIT, 0).setBaseOffset(1184); + public static final Field HWEVENTCOUNTERS1 = Field.create("HWEVENTCOUNTERS1", 0, FieldType.INT).setScale(1.0).setBaseOffset(1188); + public static final Field HWEVENTCOUNTERS2 = Field.create("HWEVENTCOUNTERS2", 4, FieldType.INT).setScale(1.0).setBaseOffset(1188); + public static final Field HWEVENTCOUNTERS3 = Field.create("HWEVENTCOUNTERS3", 8, FieldType.INT).setScale(1.0).setBaseOffset(1188); + public static final Field HWEVENTCOUNTERS4 = Field.create("HWEVENTCOUNTERS4", 12, FieldType.INT).setScale(1.0).setBaseOffset(1188); + public static final Field HWEVENTCOUNTERS5 = Field.create("HWEVENTCOUNTERS5", 16, FieldType.INT).setScale(1.0).setBaseOffset(1188); + public static final Field HWEVENTCOUNTERS6 = Field.create("HWEVENTCOUNTERS6", 20, FieldType.INT).setScale(1.0).setBaseOffset(1188); + public static final Field VVTCAMCOUNTER = Field.create("VVTCAMCOUNTER", 24, FieldType.INT).setScale(1.0).setBaseOffset(1188); + public static final Field MAPVVT_MAP_AT_SPECIAL_POINT = Field.create("MAPVVT_MAP_AT_SPECIAL_POINT", 28, FieldType.FLOAT).setBaseOffset(1188); + public static final Field MAPVVT_MAP_AT_DIFF = Field.create("MAPVVT_MAP_AT_DIFF", 32, FieldType.FLOAT).setBaseOffset(1188); + public static final Field MAPVVT_MAP_AT_CYCLE_COUNT = Field.create("MAPVVT_MAP_AT_CYCLE_COUNT", 36, FieldType.INT8).setScale(1.0).setBaseOffset(1188); + public static final Field MAPVVT_MAP_PEAK = Field.create("MAPVVT_MAP_PEAK", 37, FieldType.INT8).setScale(1.0).setBaseOffset(1188); + public static final Field ALIGNMENTFILL_AT_38 = Field.create("ALIGNMENTFILL_AT_38", 38, FieldType.INT8).setScale(1.0).setBaseOffset(1188); + public static final Field CURRENTENGINEDECODEDPHASE = Field.create("CURRENTENGINEDECODEDPHASE", 40, FieldType.FLOAT).setBaseOffset(1188); + public static final Field TRIGGERTOOTHANGLEERROR = Field.create("TRIGGERTOOTHANGLEERROR", 44, FieldType.FLOAT).setBaseOffset(1188); + public static final Field TRIGGERIGNOREDTOOTHCOUNT = Field.create("TRIGGERIGNOREDTOOTHCOUNT", 48, FieldType.INT8).setScale(1.0).setBaseOffset(1188); + public static final Field ALIGNMENTFILL_AT_49 = Field.create("ALIGNMENTFILL_AT_49", 49, FieldType.INT8).setScale(1.0).setBaseOffset(1188); + public static final Field MAPCAMPREVTOOTHANGLE = Field.create("MAPCAMPREVTOOTHANGLE", 52, FieldType.FLOAT).setBaseOffset(1188); + public static final Field ISDECODINGMAPCAM = Field.create("ISDECODINGMAPCAM", 56, FieldType.BIT, 0).setBaseOffset(1188); 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 8e0085fdeb..f38ad9201d 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 Wed Nov 01 16:52:27 UTC 2023 +// this file was generated automatically by rusEFI tool config_definition_base.jar based on (unknown script) controllers/trigger/trigger_state.txt Thu Nov 09 02:06:25 UTC 2023 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -171,19 +171,19 @@ 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(1244); - public static final Field VVTSYNCGAPRATIO = Field.create("VVTSYNCGAPRATIO", 4, FieldType.FLOAT).setBaseOffset(1244); - public static final Field VVTTOOTHDURATIONS0 = Field.create("VVTTOOTHDURATIONS0", 8, FieldType.INT).setScale(1.0).setBaseOffset(1244); - public static final Field VVTCURRENTPOSITION = Field.create("VVTCURRENTPOSITION", 12, FieldType.FLOAT).setBaseOffset(1244); - public static final Field VVTTOOTHPOSITION1 = Field.create("VVTTOOTHPOSITION1", 16, FieldType.FLOAT).setBaseOffset(1244); - public static final Field VVTTOOTHPOSITION2 = Field.create("VVTTOOTHPOSITION2", 20, FieldType.FLOAT).setBaseOffset(1244); - public static final Field VVTTOOTHPOSITION3 = Field.create("VVTTOOTHPOSITION3", 24, FieldType.FLOAT).setBaseOffset(1244); - public static final Field VVTTOOTHPOSITION4 = Field.create("VVTTOOTHPOSITION4", 28, FieldType.FLOAT).setBaseOffset(1244); - public static final Field TRIGGERSYNCGAPRATIO = Field.create("TRIGGERSYNCGAPRATIO", 32, FieldType.FLOAT).setBaseOffset(1244); - public static final Field TRIGGERSTATEINDEX = Field.create("TRIGGERSTATEINDEX", 36, FieldType.INT8).setScale(1.0).setBaseOffset(1244); - public static final Field CAMRESYNCCOUNTER = Field.create("CAMRESYNCCOUNTER", 37, FieldType.INT8).setScale(1.0).setBaseOffset(1244); - public static final Field VVTSTATEINDEX = Field.create("VVTSTATEINDEX", 38, FieldType.INT8).setScale(1.0).setBaseOffset(1244); - public static final Field ALIGNMENTFILL_AT_39 = Field.create("ALIGNMENTFILL_AT_39", 39, FieldType.INT8).setScale(1.0).setBaseOffset(1244); + public static final Field CRANKSYNCHRONIZATIONCOUNTER = Field.create("CRANKSYNCHRONIZATIONCOUNTER", 0, FieldType.INT).setScale(1.0).setBaseOffset(1248); + public static final Field VVTSYNCGAPRATIO = Field.create("VVTSYNCGAPRATIO", 4, FieldType.FLOAT).setBaseOffset(1248); + public static final Field VVTTOOTHDURATIONS0 = Field.create("VVTTOOTHDURATIONS0", 8, FieldType.INT).setScale(1.0).setBaseOffset(1248); + public static final Field VVTCURRENTPOSITION = Field.create("VVTCURRENTPOSITION", 12, FieldType.FLOAT).setBaseOffset(1248); + public static final Field VVTTOOTHPOSITION1 = Field.create("VVTTOOTHPOSITION1", 16, FieldType.FLOAT).setBaseOffset(1248); + public static final Field VVTTOOTHPOSITION2 = Field.create("VVTTOOTHPOSITION2", 20, FieldType.FLOAT).setBaseOffset(1248); + public static final Field VVTTOOTHPOSITION3 = Field.create("VVTTOOTHPOSITION3", 24, FieldType.FLOAT).setBaseOffset(1248); + public static final Field VVTTOOTHPOSITION4 = Field.create("VVTTOOTHPOSITION4", 28, FieldType.FLOAT).setBaseOffset(1248); + public static final Field TRIGGERSYNCGAPRATIO = Field.create("TRIGGERSYNCGAPRATIO", 32, FieldType.FLOAT).setBaseOffset(1248); + public static final Field TRIGGERSTATEINDEX = Field.create("TRIGGERSTATEINDEX", 36, FieldType.INT8).setScale(1.0).setBaseOffset(1248); + public static final Field CAMRESYNCCOUNTER = Field.create("CAMRESYNCCOUNTER", 37, FieldType.INT8).setScale(1.0).setBaseOffset(1248); + public static final Field VVTSTATEINDEX = Field.create("VVTSTATEINDEX", 38, FieldType.INT8).setScale(1.0).setBaseOffset(1248); + public static final Field ALIGNMENTFILL_AT_39 = Field.create("ALIGNMENTFILL_AT_39", 39, FieldType.INT8).setScale(1.0).setBaseOffset(1248); 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 fb74c3d057..1180829cf4 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 Wed Nov 01 16:52:27 UTC 2023 +// this file was generated automatically by rusEFI tool config_definition_base.jar based on (unknown script) controllers/trigger/trigger_state_primary.txt Thu Nov 09 02:06:25 UTC 2023 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -171,7 +171,7 @@ 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 M_HASSYNCHRONIZEDPHASE = Field.create("M_HASSYNCHRONIZEDPHASE", 0, FieldType.BIT, 0).setBaseOffset(1284); + public static final Field M_HASSYNCHRONIZEDPHASE = Field.create("M_HASSYNCHRONIZEDPHASE", 0, FieldType.BIT, 0).setBaseOffset(1288); public static final Field[] VALUES = { M_HASSYNCHRONIZEDPHASE, }; 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 91fe0a0fff..c7cb5c325c 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 Fri Oct 06 17:24:05 UTC 2023 +// this file was generated automatically by rusEFI tool config_definition_base.jar based on (unknown script) controllers/actuators/vvt.txt Thu Nov 09 02:06:25 UTC 2023 // 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(1428); - public static final Field VVTOUTPUT = Field.create("VVTOUTPUT", 2, FieldType.INT8).setScale(0.5).setBaseOffset(1428); - public static final Field ALIGNMENTFILL_AT_3 = Field.create("ALIGNMENTFILL_AT_3", 3, FieldType.INT8).setScale(1.0).setBaseOffset(1428); + public static final Field VVTTARGET = Field.create("VVTTARGET", 0, FieldType.INT16).setScale(0.1).setBaseOffset(1432); + public static final Field VVTOUTPUT = Field.create("VVTOUTPUT", 2, FieldType.INT8).setScale(0.5).setBaseOffset(1432); + public static final Field ALIGNMENTFILL_AT_3 = Field.create("ALIGNMENTFILL_AT_3", 3, FieldType.INT8).setScale(1.0).setBaseOffset(1432); 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 af695c366e..31879d9e0f 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 Fri Oct 06 17:24:05 UTC 2023 +// this file was generated automatically by rusEFI tool config_definition_base.jar based on (unknown script) controllers/algo/wall_fuel_state.txt Thu Nov 09 02:06:25 UTC 2023 // 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(1288); - public static final Field WALLFUEL = Field.create("WALLFUEL", 4, FieldType.FLOAT).setBaseOffset(1288); + public static final Field WALLFUELCORRECTION = Field.create("WALLFUELCORRECTION", 0, FieldType.FLOAT).setBaseOffset(1292); + public static final Field WALLFUEL = Field.create("WALLFUEL", 4, FieldType.FLOAT).setBaseOffset(1292); 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 f95d9f9612..58bcbdc3a5 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 Fri Oct 06 17:24:05 UTC 2023 +// this file was generated automatically by rusEFI tool config_definition_base.jar based on (unknown script) controllers/sensors//wideband_state.txt Thu Nov 09 02:06:25 UTC 2023 // 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(1396); - public static final Field HEATERDUTY = Field.create("HEATERDUTY", 1, FieldType.INT8).setScale(1.0).setBaseOffset(1396); - public static final Field PUMPDUTY = Field.create("PUMPDUTY", 2, FieldType.INT8).setScale(1.0).setBaseOffset(1396); - public static final Field ALIGNMENTFILL_AT_3 = Field.create("ALIGNMENTFILL_AT_3", 3, FieldType.INT8).setScale(1.0).setBaseOffset(1396); - public static final Field TEMPC = Field.create("TEMPC", 4, FieldType.INT16).setScale(1.0).setBaseOffset(1396); - public static final Field NERNSTVOLTAGE = Field.create("NERNSTVOLTAGE", 6, FieldType.INT16).setScale(0.001).setBaseOffset(1396); - public static final Field ESR = Field.create("ESR", 8, FieldType.INT16).setScale(1.0).setBaseOffset(1396); - public static final Field ALIGNMENTFILL_AT_10 = Field.create("ALIGNMENTFILL_AT_10", 10, FieldType.INT8).setScale(1.0).setBaseOffset(1396); + public static final Field FAULTCODE = Field.create("FAULTCODE", 0, FieldType.INT8).setScale(1.0).setBaseOffset(1400); + public static final Field HEATERDUTY = Field.create("HEATERDUTY", 1, FieldType.INT8).setScale(1.0).setBaseOffset(1400); + public static final Field PUMPDUTY = Field.create("PUMPDUTY", 2, FieldType.INT8).setScale(1.0).setBaseOffset(1400); + public static final Field ALIGNMENTFILL_AT_3 = Field.create("ALIGNMENTFILL_AT_3", 3, FieldType.INT8).setScale(1.0).setBaseOffset(1400); + public static final Field TEMPC = Field.create("TEMPC", 4, FieldType.INT16).setScale(1.0).setBaseOffset(1400); + public static final Field NERNSTVOLTAGE = Field.create("NERNSTVOLTAGE", 6, FieldType.INT16).setScale(0.001).setBaseOffset(1400); + public static final Field ESR = Field.create("ESR", 8, FieldType.INT16).setScale(1.0).setBaseOffset(1400); + public static final Field ALIGNMENTFILL_AT_10 = Field.create("ALIGNMENTFILL_AT_10", 10, FieldType.INT8).setScale(1.0).setBaseOffset(1400); public static final Field[] VALUES = { FAULTCODE, HEATERDUTY,