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 454465576c..63c54ea542 100644 --- a/firmware/config/boards/cypress/config/controllers/algo/rusefi_generated.h +++ b/firmware/config/boards/cypress/config/controllers/algo/rusefi_generated.h @@ -1934,7 +1934,7 @@ #define show_Frankenso_presets true #define show_test_presets true #define showHumanReadableWarning_offset 960 -#define SIGNATURE_HASH 1913309982 +#define SIGNATURE_HASH 2188533610 #define silentTriggerError_offset 1360 #define skippedWheelOnCam_offset 1360 #define slowAdcAlpha_offset 1600 @@ -2490,12 +2490,12 @@ #define ts_show_vbatt true #define ts_show_vr_threshold_2 true #define ts_show_vr_threshold_all true -#define TS_SIGNATURE "rusEFI 2022.08.25.cypress.1913309982" +#define TS_SIGNATURE "rusEFI 2022.08.25.cypress.2188533610" #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 1224 +#define TS_TOTAL_OUTPUT_SIZE 1232 #define TsCalMode_EtbKd 5 #define TsCalMode_EtbKi 4 #define TsCalMode_EtbKp 3 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 99395b92b1..4d165d064d 100644 --- a/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h +++ b/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h @@ -1934,7 +1934,7 @@ #define show_Frankenso_presets true #define show_test_presets true #define showHumanReadableWarning_offset 960 -#define SIGNATURE_HASH 450718162 +#define SIGNATURE_HASH 3936746918 #define silentTriggerError_offset 1360 #define skippedWheelOnCam_offset 1360 #define slowAdcAlpha_offset 1600 @@ -2490,12 +2490,12 @@ #define ts_show_vbatt true #define ts_show_vr_threshold_2 true #define ts_show_vr_threshold_all true -#define TS_SIGNATURE "rusEFI 2022.08.25.kin.450718162" +#define TS_SIGNATURE "rusEFI 2022.08.25.kin.3936746918" #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 1224 +#define TS_TOTAL_OUTPUT_SIZE 1232 #define TsCalMode_EtbKd 5 #define TsCalMode_EtbKi 4 #define TsCalMode_EtbKp 3 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 dd2ce883c9..574fcd766f 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 @@ -1900,7 +1900,7 @@ #define show_Proteus_presets false #define show_test_presets false #define showHumanReadableWarning_offset 960 -#define SIGNATURE_HASH 1010269350 +#define SIGNATURE_HASH 3427789010 #define silentTriggerError_offset 1360 #define skippedWheelOnCam_offset 1360 #define slowAdcAlpha_offset 1600 @@ -2457,12 +2457,12 @@ #define ts_show_vbatt true #define ts_show_vr_threshold_2 true #define ts_show_vr_threshold_all true -#define TS_SIGNATURE "rusEFI 2022.08.25.subaru_eg33_f7.1010269350" +#define TS_SIGNATURE "rusEFI 2022.08.25.subaru_eg33_f7.3427789010" #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 1224 +#define TS_TOTAL_OUTPUT_SIZE 1232 #define TsCalMode_EtbKd 5 #define TsCalMode_EtbKi 4 #define TsCalMode_EtbKp 3 diff --git a/firmware/console/binary/generated/data_logs.ini b/firmware/console/binary/generated/data_logs.ini index f82aa87531..218cd16f83 100644 --- a/firmware/console/binary/generated/data_logs.ini +++ b/firmware/console/binary/generated/data_logs.ini @@ -374,6 +374,8 @@ entry = brakePedalState, "brake: down", int, "%d" entry = egt1, "egt1", float, "%.3f" entry = egt2, "egt2", float, "%.3f" entry = desiredRpmLimit, "User-defined RPM hard limit", int, "%d" +entry = fuelInjectionCounter, "fuelInjectionCounter", int, "%d" +entry = sparkCounter, "sparkCounter", int, "%d" entry = tpsFrom, "tpsFrom", float, "%.3f" entry = tpsTo, "tpsTo", float, "%.3f" entry = deltaTps, "deltaTps", float, "%.3f" diff --git a/firmware/console/binary/generated/fancy_content.ini b/firmware/console/binary/generated/fancy_content.ini index 91c444ab27..d09da95ff0 100644 --- a/firmware/console/binary/generated/fancy_content.ini +++ b/firmware/console/binary/generated/fancy_content.ini @@ -165,6 +165,8 @@ dialog = engine_stateDialog, "engine_state" graphLine = egt2 liveGraph = engine_state_10_Graph, "Graph", South graphLine = desiredRpmLimit + graphLine = fuelInjectionCounter + graphLine = sparkCounter indicatorPanel = tps_accel_stateIndicatorPanel, 2 indicator = {isAboveAccelThreshold}, "isAboveAccelThreshold No", "isAboveAccelThreshold Yes" diff --git a/firmware/console/binary/generated/output_channels.ini b/firmware/console/binary/generated/output_channels.ini index b5a708ef61..48955b2a48 100644 --- a/firmware/console/binary/generated/output_channels.ini +++ b/firmware/console/binary/generated/output_channels.ini @@ -905,167 +905,169 @@ unusedBit_22_31 = bits, U32, 992, [31:31] egt1 = scalar, F32, 996, "", 1, 0 egt2 = scalar, F32, 1000, "", 1, 0 desiredRpmLimit = scalar, S16, 1004, "rpm", 1, 0 -; total TS size = 1008 -tpsFrom = scalar, F32, 1008 -tpsTo = scalar, F32, 1012 -deltaTps = scalar, F32, 1016 -extraFuel = scalar, F32, 1020, "", 1, 0 -valueFromTable = scalar, F32, 1024, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1028, [0:0] -isBelowDecelThreshold = bits, U32, 1028, [1:1] -isTimeToResetAccumulator = bits, U32, 1028, [2:2] -isFractionalEnrichment = bits, U32, 1028, [3:3] -belowEpsilon = bits, U32, 1028, [4:4] -tooShort = bits, U32, 1028, [5:5] -unusedBit_11_6 = bits, U32, 1028, [6:6] -unusedBit_11_7 = bits, U32, 1028, [7:7] -unusedBit_11_8 = bits, U32, 1028, [8:8] -unusedBit_11_9 = bits, U32, 1028, [9:9] -unusedBit_11_10 = bits, U32, 1028, [10:10] -unusedBit_11_11 = bits, U32, 1028, [11:11] -unusedBit_11_12 = bits, U32, 1028, [12:12] -unusedBit_11_13 = bits, U32, 1028, [13:13] -unusedBit_11_14 = bits, U32, 1028, [14:14] -unusedBit_11_15 = bits, U32, 1028, [15:15] -unusedBit_11_16 = bits, U32, 1028, [16:16] -unusedBit_11_17 = bits, U32, 1028, [17:17] -unusedBit_11_18 = bits, U32, 1028, [18:18] -unusedBit_11_19 = bits, U32, 1028, [19:19] -unusedBit_11_20 = bits, U32, 1028, [20:20] -unusedBit_11_21 = bits, U32, 1028, [21:21] -unusedBit_11_22 = bits, U32, 1028, [22:22] -unusedBit_11_23 = bits, U32, 1028, [23:23] -unusedBit_11_24 = bits, U32, 1028, [24:24] -unusedBit_11_25 = bits, U32, 1028, [25:25] -unusedBit_11_26 = bits, U32, 1028, [26:26] -unusedBit_11_27 = bits, U32, 1028, [27:27] -unusedBit_11_28 = bits, U32, 1028, [28:28] -unusedBit_11_29 = bits, U32, 1028, [29:29] -unusedBit_11_30 = bits, U32, 1028, [30:30] -unusedBit_11_31 = bits, U32, 1028, [31:31] -fractionalInjFuel = scalar, F32, 1032, "", 1, 0 -accumulatedValue = scalar, F32, 1036, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1040, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1044, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1048, "", 1, 0 -cycleCnt = scalar, S32, 1052, "", 1, 0 -; total TS size = 1056 -hwEventCounters1 = scalar, S32, 1056, "", 1, 0 -hwEventCounters2 = scalar, S32, 1060, "", 1, 0 -hwEventCounters3 = scalar, S32, 1064, "", 1, 0 -hwEventCounters4 = scalar, S32, 1068, "", 1, 0 -hwEventCounters5 = scalar, S32, 1072, "", 1, 0 -hwEventCounters6 = scalar, S32, 1076, "", 1, 0 -vvtCamCounter = scalar, S32, 1080, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1084, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1088, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1092, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1093, "", 1, 0 -; total TS size = 1096 -totalRevolutionCounter = scalar, U32, 1096, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1100, "", 1, 0 -vvtCurrentPosition = scalar, F32, 1104, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1108, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 1112, "", 1, 0 -triggerStateIndex = scalar, U08, 1116, "", 1, 0 -vvtCounter = scalar, U08, 1117, "", 1, 0 -camResyncCounter = scalar, U08, 1118, "", 1, 0 -vvtStateIndex = scalar, U08, 1119, "", 1, 0 -; total TS size = 1120 -m_hasSynchronizedPhase = bits, U32, 1120, [0:0] -unusedBit_1_1 = bits, U32, 1120, [1:1] -unusedBit_1_2 = bits, U32, 1120, [2:2] -unusedBit_1_3 = bits, U32, 1120, [3:3] -unusedBit_1_4 = bits, U32, 1120, [4:4] -unusedBit_1_5 = bits, U32, 1120, [5:5] -unusedBit_1_6 = bits, U32, 1120, [6:6] -unusedBit_1_7 = bits, U32, 1120, [7:7] -unusedBit_1_8 = bits, U32, 1120, [8:8] -unusedBit_1_9 = bits, U32, 1120, [9:9] -unusedBit_1_10 = bits, U32, 1120, [10:10] -unusedBit_1_11 = bits, U32, 1120, [11:11] -unusedBit_1_12 = bits, U32, 1120, [12:12] -unusedBit_1_13 = bits, U32, 1120, [13:13] -unusedBit_1_14 = bits, U32, 1120, [14:14] -unusedBit_1_15 = bits, U32, 1120, [15:15] -unusedBit_1_16 = bits, U32, 1120, [16:16] -unusedBit_1_17 = bits, U32, 1120, [17:17] -unusedBit_1_18 = bits, U32, 1120, [18:18] -unusedBit_1_19 = bits, U32, 1120, [19:19] -unusedBit_1_20 = bits, U32, 1120, [20:20] -unusedBit_1_21 = bits, U32, 1120, [21:21] -unusedBit_1_22 = bits, U32, 1120, [22:22] -unusedBit_1_23 = bits, U32, 1120, [23:23] -unusedBit_1_24 = bits, U32, 1120, [24:24] -unusedBit_1_25 = bits, U32, 1120, [25:25] -unusedBit_1_26 = bits, U32, 1120, [26:26] -unusedBit_1_27 = bits, U32, 1120, [27:27] -unusedBit_1_28 = bits, U32, 1120, [28:28] -unusedBit_1_29 = bits, U32, 1120, [29:29] -unusedBit_1_30 = bits, U32, 1120, [30:30] -unusedBit_1_31 = bits, U32, 1120, [31:31] -; total TS size = 1124 -wallFuelCorrection = scalar, F32, 1124, "", 1, 0 -wallFuel = scalar, F32, 1128, "", 1, 0 +fuelInjectionCounter = scalar, S32, 1008, "", 1, 0 +sparkCounter = scalar, S32, 1012, "", 1, 0 +; total TS size = 1016 +tpsFrom = scalar, F32, 1016 +tpsTo = scalar, F32, 1020 +deltaTps = scalar, F32, 1024 +extraFuel = scalar, F32, 1028, "", 1, 0 +valueFromTable = scalar, F32, 1032, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1036, [0:0] +isBelowDecelThreshold = bits, U32, 1036, [1:1] +isTimeToResetAccumulator = bits, U32, 1036, [2:2] +isFractionalEnrichment = bits, U32, 1036, [3:3] +belowEpsilon = bits, U32, 1036, [4:4] +tooShort = bits, U32, 1036, [5:5] +unusedBit_11_6 = bits, U32, 1036, [6:6] +unusedBit_11_7 = bits, U32, 1036, [7:7] +unusedBit_11_8 = bits, U32, 1036, [8:8] +unusedBit_11_9 = bits, U32, 1036, [9:9] +unusedBit_11_10 = bits, U32, 1036, [10:10] +unusedBit_11_11 = bits, U32, 1036, [11:11] +unusedBit_11_12 = bits, U32, 1036, [12:12] +unusedBit_11_13 = bits, U32, 1036, [13:13] +unusedBit_11_14 = bits, U32, 1036, [14:14] +unusedBit_11_15 = bits, U32, 1036, [15:15] +unusedBit_11_16 = bits, U32, 1036, [16:16] +unusedBit_11_17 = bits, U32, 1036, [17:17] +unusedBit_11_18 = bits, U32, 1036, [18:18] +unusedBit_11_19 = bits, U32, 1036, [19:19] +unusedBit_11_20 = bits, U32, 1036, [20:20] +unusedBit_11_21 = bits, U32, 1036, [21:21] +unusedBit_11_22 = bits, U32, 1036, [22:22] +unusedBit_11_23 = bits, U32, 1036, [23:23] +unusedBit_11_24 = bits, U32, 1036, [24:24] +unusedBit_11_25 = bits, U32, 1036, [25:25] +unusedBit_11_26 = bits, U32, 1036, [26:26] +unusedBit_11_27 = bits, U32, 1036, [27:27] +unusedBit_11_28 = bits, U32, 1036, [28:28] +unusedBit_11_29 = bits, U32, 1036, [29:29] +unusedBit_11_30 = bits, U32, 1036, [30:30] +unusedBit_11_31 = bits, U32, 1036, [31:31] +fractionalInjFuel = scalar, F32, 1040, "", 1, 0 +accumulatedValue = scalar, F32, 1044, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1048, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1052, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1056, "", 1, 0 +cycleCnt = scalar, S32, 1060, "", 1, 0 +; total TS size = 1064 +hwEventCounters1 = scalar, S32, 1064, "", 1, 0 +hwEventCounters2 = scalar, S32, 1068, "", 1, 0 +hwEventCounters3 = scalar, S32, 1072, "", 1, 0 +hwEventCounters4 = scalar, S32, 1076, "", 1, 0 +hwEventCounters5 = scalar, S32, 1080, "", 1, 0 +hwEventCounters6 = scalar, S32, 1084, "", 1, 0 +vvtCamCounter = scalar, S32, 1088, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1092, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1096, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1100, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1101, "", 1, 0 +; total TS size = 1104 +totalRevolutionCounter = scalar, U32, 1104, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1108, "", 1, 0 +vvtCurrentPosition = scalar, F32, 1112, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1116, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 1120, "", 1, 0 +triggerStateIndex = scalar, U08, 1124, "", 1, 0 +vvtCounter = scalar, U08, 1125, "", 1, 0 +camResyncCounter = scalar, U08, 1126, "", 1, 0 +vvtStateIndex = scalar, U08, 1127, "", 1, 0 +; total TS size = 1128 +m_hasSynchronizedPhase = bits, U32, 1128, [0:0] +unusedBit_1_1 = bits, U32, 1128, [1:1] +unusedBit_1_2 = bits, U32, 1128, [2:2] +unusedBit_1_3 = bits, U32, 1128, [3:3] +unusedBit_1_4 = bits, U32, 1128, [4:4] +unusedBit_1_5 = bits, U32, 1128, [5:5] +unusedBit_1_6 = bits, U32, 1128, [6:6] +unusedBit_1_7 = bits, U32, 1128, [7:7] +unusedBit_1_8 = bits, U32, 1128, [8:8] +unusedBit_1_9 = bits, U32, 1128, [9:9] +unusedBit_1_10 = bits, U32, 1128, [10:10] +unusedBit_1_11 = bits, U32, 1128, [11:11] +unusedBit_1_12 = bits, U32, 1128, [12:12] +unusedBit_1_13 = bits, U32, 1128, [13:13] +unusedBit_1_14 = bits, U32, 1128, [14:14] +unusedBit_1_15 = bits, U32, 1128, [15:15] +unusedBit_1_16 = bits, U32, 1128, [16:16] +unusedBit_1_17 = bits, U32, 1128, [17:17] +unusedBit_1_18 = bits, U32, 1128, [18:18] +unusedBit_1_19 = bits, U32, 1128, [19:19] +unusedBit_1_20 = bits, U32, 1128, [20:20] +unusedBit_1_21 = bits, U32, 1128, [21:21] +unusedBit_1_22 = bits, U32, 1128, [22:22] +unusedBit_1_23 = bits, U32, 1128, [23:23] +unusedBit_1_24 = bits, U32, 1128, [24:24] +unusedBit_1_25 = bits, U32, 1128, [25:25] +unusedBit_1_26 = bits, U32, 1128, [26:26] +unusedBit_1_27 = bits, U32, 1128, [27:27] +unusedBit_1_28 = bits, U32, 1128, [28:28] +unusedBit_1_29 = bits, U32, 1128, [29:29] +unusedBit_1_30 = bits, U32, 1128, [30:30] +unusedBit_1_31 = bits, U32, 1128, [31:31] ; total TS size = 1132 -idleState = bits, S32, 1132, [0:2], "not important" -currentIdlePosition = scalar, F32, 1136 -baseIdlePosition = scalar, F32, 1140 -iacByTpsTaper = scalar, F32, 1144 -throttlePedalUpState = scalar, S32, 1148, "", 1, 0 -mightResetPid = bits, U32, 1152, [0:0] -shouldResetPid = bits, U32, 1152, [1:1] -wasResetPid = bits, U32, 1152, [2:2] -mustResetPid = bits, U32, 1152, [3:3] -isCoasting = bits, U32, 1152, [4:4] -useIacTableForCoasting = bits, U32, 1152, [5:5] -notIdling = bits, U32, 1152, [6:6] -needReset = bits, U32, 1152, [7:7] -isInDeadZone = bits, U32, 1152, [8:8] -isBlipping = bits, U32, 1152, [9:9] -useClosedLoop = bits, U32, 1152, [10:10] -badTps = bits, U32, 1152, [11:11] -looksLikeRunning = bits, U32, 1152, [12:12] -looksLikeCoasting = bits, U32, 1152, [13:13] -looksLikeCrankToIdle = bits, U32, 1152, [14:14] -useInstantRpmForIdle = bits, U32, 1152, [15:15] -isVerboseIAC = bits, U32, 1152, [16:16] -unusedBit_22_17 = bits, U32, 1152, [17:17] -unusedBit_22_18 = bits, U32, 1152, [18:18] -unusedBit_22_19 = bits, U32, 1152, [19:19] -unusedBit_22_20 = bits, U32, 1152, [20:20] -unusedBit_22_21 = bits, U32, 1152, [21:21] -unusedBit_22_22 = bits, U32, 1152, [22:22] -unusedBit_22_23 = bits, U32, 1152, [23:23] -unusedBit_22_24 = bits, U32, 1152, [24:24] -unusedBit_22_25 = bits, U32, 1152, [25:25] -unusedBit_22_26 = bits, U32, 1152, [26:26] -unusedBit_22_27 = bits, U32, 1152, [27:27] -unusedBit_22_28 = bits, U32, 1152, [28:28] -unusedBit_22_29 = bits, U32, 1152, [29:29] -unusedBit_22_30 = bits, U32, 1152, [30:30] -unusedBit_22_31 = bits, U32, 1152, [31:31] -targetRpmByClt = scalar, S32, 1156, "", 1, 0 -targetRpmAcBump = scalar, S32, 1160, "", 1, 0 -iacByRpmTaper = scalar, F32, 1164 -luaAdd = scalar, F32, 1168 -; total TS size = 1172 -baseDwell = scalar, F32, 1172, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 1176, "", 1, 0 -luaTimingAdd = scalar, F32, 1180, "", 1, 0 -luaTimingMult = scalar, F32, 1184, "", 1, 0 -; total TS size = 1188 -idlePosition = scalar, F32, 1188, "", 1, 0 -trim = scalar, F32, 1192, "", 1, 0 -luaAdjustment = scalar, F32, 1196, "", 1, 0 -etbFeedForward = scalar, F32, 1200 -etbIntegralError = scalar, F32, 1204, "", 1, 0 -etbCurrentTarget = scalar, F32, 1208, "%", 1, 0 -; total TS size = 1212 -faultCode = scalar, U08, 1212, "", 1, 0 -heaterDuty = scalar, U08, 1213, "%", 1, 0 -pumpDuty = scalar, U08, 1214, "%", 1, 0 -tempC = scalar, U16, 1216, "C", 1, 0 -nernstVoltage = scalar, U16, 1218, "V", 0.001, 0 -esr = scalar, U16, 1220, "", 1, 0 -; total TS size = 1224 +wallFuelCorrection = scalar, F32, 1132, "", 1, 0 +wallFuel = scalar, F32, 1136, "", 1, 0 +; total TS size = 1140 +idleState = bits, S32, 1140, [0:2], "not important" +currentIdlePosition = scalar, F32, 1144 +baseIdlePosition = scalar, F32, 1148 +iacByTpsTaper = scalar, F32, 1152 +throttlePedalUpState = scalar, S32, 1156, "", 1, 0 +mightResetPid = bits, U32, 1160, [0:0] +shouldResetPid = bits, U32, 1160, [1:1] +wasResetPid = bits, U32, 1160, [2:2] +mustResetPid = bits, U32, 1160, [3:3] +isCoasting = bits, U32, 1160, [4:4] +useIacTableForCoasting = bits, U32, 1160, [5:5] +notIdling = bits, U32, 1160, [6:6] +needReset = bits, U32, 1160, [7:7] +isInDeadZone = bits, U32, 1160, [8:8] +isBlipping = bits, U32, 1160, [9:9] +useClosedLoop = bits, U32, 1160, [10:10] +badTps = bits, U32, 1160, [11:11] +looksLikeRunning = bits, U32, 1160, [12:12] +looksLikeCoasting = bits, U32, 1160, [13:13] +looksLikeCrankToIdle = bits, U32, 1160, [14:14] +useInstantRpmForIdle = bits, U32, 1160, [15:15] +isVerboseIAC = bits, U32, 1160, [16:16] +unusedBit_22_17 = bits, U32, 1160, [17:17] +unusedBit_22_18 = bits, U32, 1160, [18:18] +unusedBit_22_19 = bits, U32, 1160, [19:19] +unusedBit_22_20 = bits, U32, 1160, [20:20] +unusedBit_22_21 = bits, U32, 1160, [21:21] +unusedBit_22_22 = bits, U32, 1160, [22:22] +unusedBit_22_23 = bits, U32, 1160, [23:23] +unusedBit_22_24 = bits, U32, 1160, [24:24] +unusedBit_22_25 = bits, U32, 1160, [25:25] +unusedBit_22_26 = bits, U32, 1160, [26:26] +unusedBit_22_27 = bits, U32, 1160, [27:27] +unusedBit_22_28 = bits, U32, 1160, [28:28] +unusedBit_22_29 = bits, U32, 1160, [29:29] +unusedBit_22_30 = bits, U32, 1160, [30:30] +unusedBit_22_31 = bits, U32, 1160, [31:31] +targetRpmByClt = scalar, S32, 1164, "", 1, 0 +targetRpmAcBump = scalar, S32, 1168, "", 1, 0 +iacByRpmTaper = scalar, F32, 1172 +luaAdd = scalar, F32, 1176 +; total TS size = 1180 +baseDwell = scalar, F32, 1180, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 1184, "", 1, 0 +luaTimingAdd = scalar, F32, 1188, "", 1, 0 +luaTimingMult = scalar, F32, 1192, "", 1, 0 +; total TS size = 1196 +idlePosition = scalar, F32, 1196, "", 1, 0 +trim = scalar, F32, 1200, "", 1, 0 +luaAdjustment = scalar, F32, 1204, "", 1, 0 +etbFeedForward = scalar, F32, 1208 +etbIntegralError = scalar, F32, 1212, "", 1, 0 +etbCurrentTarget = scalar, F32, 1216, "%", 1, 0 +; total TS size = 1220 +faultCode = scalar, U08, 1220, "", 1, 0 +heaterDuty = scalar, U08, 1221, "%", 1, 0 +pumpDuty = scalar, U08, 1222, "%", 1, 0 +tempC = scalar, U16, 1224, "C", 1, 0 +nernstVoltage = scalar, U16, 1226, "V", 0.001, 0 +esr = scalar, U16, 1228, "", 1, 0 +; total TS size = 1232 diff --git a/firmware/console/binary/generated/sensors.java b/firmware/console/binary/generated/sensors.java index 75c42fa1ed..a3fafb2b0c 100644 --- a/firmware/console/binary/generated/sensors.java +++ b/firmware/console/binary/generated/sensors.java @@ -428,64 +428,66 @@ egt1("egt1", SensorCategory.SENSOR_INPUTS, FieldType.INT, 996, 1.0, -1.0, -1.0, egt2("egt2", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1000, 1.0, -1.0, -1.0, ""), desiredRpmLimit("User-defined RPM hard limit", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1004, 1.0, 0.0, 30000.0, "rpm"), alignmentFill_at_150("need 4 byte alignment", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1006, 1.0, -20.0, 100.0, "units"), -tpsFrom("tpsFrom", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1008, 1.0, -1.0, -1.0, ""), -tpsTo("tpsTo", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1012, 1.0, -1.0, -1.0, ""), -deltaTps("deltaTps", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1016, 1.0, -1.0, -1.0, ""), -extraFuel("extraFuel", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1020, 1.0, -1.0, -1.0, ""), -valueFromTable("valueFromTable", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1024, 1.0, -1.0, -1.0, ""), -fractionalInjFuel("fractionalInjFuel", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1032, 1.0, -1.0, -1.0, ""), -accumulatedValue("accumulatedValue", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1036, 1.0, -1.0, -1.0, ""), -maxExtraPerCycle("maxExtraPerCycle", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1040, 1.0, -1.0, -1.0, ""), -maxExtraPerPeriod("maxExtraPerPeriod", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1044, 1.0, -1.0, -1.0, ""), -maxInjectedPerPeriod("maxInjectedPerPeriod", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1048, 1.0, -1.0, -1.0, ""), -cycleCnt("cycleCnt", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1052, 1.0, -1.0, -1.0, ""), -hwEventCounters1("Hardware events since boot 1", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1056, 1.0, -1.0, -1.0, ""), -hwEventCounters2("Hardware events since boot 2", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1060, 1.0, -1.0, -1.0, ""), -hwEventCounters3("Hardware events since boot 3", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1064, 1.0, -1.0, -1.0, ""), -hwEventCounters4("Hardware events since boot 4", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1068, 1.0, -1.0, -1.0, ""), -hwEventCounters5("Hardware events since boot 5", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1072, 1.0, -1.0, -1.0, ""), -hwEventCounters6("Hardware events since boot 6", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1076, 1.0, -1.0, -1.0, ""), -vvtCamCounter("vvtCamCounter", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1080, 1.0, -1.0, -1.0, ""), -mapVvt_MAP_AT_SPECIAL_POINT("mapVvt_MAP_AT_SPECIAL_POINT", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1084, 1.0, -10000.0, 10000.0, ""), -mapVvt_MAP_AT_DIFF("mapVvt_MAP_AT_DIFF", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1088, 1.0, -10000.0, 10000.0, ""), -mapVvt_MAP_AT_CYCLE_COUNT("mapVvt_MAP_AT_CYCLE_COUNT", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1092, 1.0, -10000.0, 10000.0, ""), -mapVvt_map_peak("mapVvt_map_peak", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1093, 1.0, -10000.0, 10000.0, ""), -alignmentFill_at_38("need 4 byte alignment", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1094, 1.0, -20.0, 100.0, "units"), -totalRevolutionCounter("Crank revolution counter", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1096, 1.0, -1.0, -1.0, ""), -vvtSyncGapRatio("vvtSyncGapRatio", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1100, 1.0, -10000.0, 10000.0, ""), -vvtCurrentPosition("vvtCurrentPosition", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1104, 1.0, -10000.0, 10000.0, ""), -triggerSyncGapRatio("Trigger Sync Latest Ratio", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1108, 1.0, -10000.0, 10000.0, ""), -triggerActualSyncGapRatio("trigger: unused field?", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1112, 1.0, -1.0, -1.0, ""), -triggerStateIndex("triggerStateIndex", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1116, 1.0, -1.0, -1.0, ""), -vvtCounter("vvtCounter", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1117, 1.0, -1.0, -1.0, ""), -camResyncCounter("camResyncCounter", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1118, 1.0, -1.0, -1.0, ""), -vvtStateIndex("vvtStateIndex", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1119, 1.0, -1.0, -1.0, ""), -wallFuelCorrection("fuel injection time correction to account for wall wetting effect for current cycle", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1124, 1.0, -1.0, -1.0, ""), -wallFuel("Amount of fuel on the wall, in ms of injector open time for each injector.", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1128, 1.0, -1.0, -1.0, ""), -idleState("idleState", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1132, 1.0, -1.0, -1.0, ""), -currentIdlePosition("idle: current position\nthat's current position with CLT and IAT corrections", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1136, 1.0, -1.0, -1.0, ""), -baseIdlePosition("idle: base value\ncurrent position without adjustments (iacByTpsTaper, afterCrankingIACtaperDuration)", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1140, 1.0, -1.0, -1.0, ""), -iacByTpsTaper("idle: iacByTpsTaper portion of idle", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1144, 1.0, -1.0, -1.0, ""), -throttlePedalUpState("true in IDLE throttle pedal state, false if driver is touching the pedal\ntodo: better name for this field?", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1148, 1.0, -1.0, -1.0, ""), -targetRpmByClt("idle: target by CLT", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1156, 1.0, -1.0, -1.0, ""), -targetRpmAcBump("idle: A/C bump", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1160, 1.0, -1.0, -1.0, ""), -iacByRpmTaper("idle: iacByRpmTaper portion of idle", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1164, 1.0, -1.0, -1.0, ""), -luaAdd("idle: Lua Adder", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1168, 1.0, -1.0, -1.0, ""), -baseDwell("baseDwell", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1172, 1.0, -1.0, -1.0, ""), -dwellVoltageCorrection("dwellVoltageCorrection", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1176, 1.0, -1.0, -1.0, ""), -luaTimingAdd("luaTimingAdd", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1180, 1.0, -1.0, -1.0, ""), -luaTimingMult("luaTimingMult", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1184, 1.0, -1.0, -1.0, ""), -idlePosition("idlePosition", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1188, 1.0, -1.0, -1.0, ""), -trim("trim", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1192, 1.0, -1.0, -1.0, ""), -luaAdjustment("luaAdjustment", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1196, 1.0, -1.0, -1.0, ""), -etbFeedForward("etbFeedForward", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1200, 1.0, -1.0, -1.0, ""), -etbIntegralError("etbIntegralError", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1204, 1.0, -10000.0, 10000.0, ""), -etbCurrentTarget("etbCurrentTarget", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1208, 1.0, -10000.0, 10000.0, "%"), -faultCode("faultCode", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1212, 1.0, -1.0, -1.0, ""), -heaterDuty("heaterDuty", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1213, 1.0, 0.0, 100.0, "%"), -pumpDuty("pumpDuty", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1214, 1.0, 0.0, 100.0, "%"), -alignmentFill_at_3("need 4 byte alignment", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1215, 1.0, -20.0, 100.0, "units"), -tempC("tempC", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1216, 1.0, 500.0, 1000.0, "C"), -nernstVoltage("nernstVoltage", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1218, 0.001, 0.0, 1.0, "V"), -esr("esr", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1220, 1.0, -1.0, -1.0, ""), -alignmentFill_at_10("need 4 byte alignment", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1222, 1.0, -20.0, 100.0, "units"), +fuelInjectionCounter("fuelInjectionCounter", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1008, 1.0, -1.0, -1.0, ""), +sparkCounter("sparkCounter", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1012, 1.0, -1.0, -1.0, ""), +tpsFrom("tpsFrom", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1016, 1.0, -1.0, -1.0, ""), +tpsTo("tpsTo", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1020, 1.0, -1.0, -1.0, ""), +deltaTps("deltaTps", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1024, 1.0, -1.0, -1.0, ""), +extraFuel("extraFuel", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1028, 1.0, -1.0, -1.0, ""), +valueFromTable("valueFromTable", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1032, 1.0, -1.0, -1.0, ""), +fractionalInjFuel("fractionalInjFuel", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1040, 1.0, -1.0, -1.0, ""), +accumulatedValue("accumulatedValue", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1044, 1.0, -1.0, -1.0, ""), +maxExtraPerCycle("maxExtraPerCycle", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1048, 1.0, -1.0, -1.0, ""), +maxExtraPerPeriod("maxExtraPerPeriod", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1052, 1.0, -1.0, -1.0, ""), +maxInjectedPerPeriod("maxInjectedPerPeriod", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1056, 1.0, -1.0, -1.0, ""), +cycleCnt("cycleCnt", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1060, 1.0, -1.0, -1.0, ""), +hwEventCounters1("Hardware events since boot 1", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1064, 1.0, -1.0, -1.0, ""), +hwEventCounters2("Hardware events since boot 2", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1068, 1.0, -1.0, -1.0, ""), +hwEventCounters3("Hardware events since boot 3", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1072, 1.0, -1.0, -1.0, ""), +hwEventCounters4("Hardware events since boot 4", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1076, 1.0, -1.0, -1.0, ""), +hwEventCounters5("Hardware events since boot 5", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1080, 1.0, -1.0, -1.0, ""), +hwEventCounters6("Hardware events since boot 6", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1084, 1.0, -1.0, -1.0, ""), +vvtCamCounter("vvtCamCounter", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1088, 1.0, -1.0, -1.0, ""), +mapVvt_MAP_AT_SPECIAL_POINT("mapVvt_MAP_AT_SPECIAL_POINT", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1092, 1.0, -10000.0, 10000.0, ""), +mapVvt_MAP_AT_DIFF("mapVvt_MAP_AT_DIFF", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1096, 1.0, -10000.0, 10000.0, ""), +mapVvt_MAP_AT_CYCLE_COUNT("mapVvt_MAP_AT_CYCLE_COUNT", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1100, 1.0, -10000.0, 10000.0, ""), +mapVvt_map_peak("mapVvt_map_peak", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1101, 1.0, -10000.0, 10000.0, ""), +alignmentFill_at_38("need 4 byte alignment", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1102, 1.0, -20.0, 100.0, "units"), +totalRevolutionCounter("Crank revolution counter", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1104, 1.0, -1.0, -1.0, ""), +vvtSyncGapRatio("vvtSyncGapRatio", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1108, 1.0, -10000.0, 10000.0, ""), +vvtCurrentPosition("vvtCurrentPosition", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1112, 1.0, -10000.0, 10000.0, ""), +triggerSyncGapRatio("Trigger Sync Latest Ratio", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1116, 1.0, -10000.0, 10000.0, ""), +triggerActualSyncGapRatio("trigger: unused field?", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1120, 1.0, -1.0, -1.0, ""), +triggerStateIndex("triggerStateIndex", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1124, 1.0, -1.0, -1.0, ""), +vvtCounter("vvtCounter", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1125, 1.0, -1.0, -1.0, ""), +camResyncCounter("camResyncCounter", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1126, 1.0, -1.0, -1.0, ""), +vvtStateIndex("vvtStateIndex", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1127, 1.0, -1.0, -1.0, ""), +wallFuelCorrection("fuel injection time correction to account for wall wetting effect for current cycle", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1132, 1.0, -1.0, -1.0, ""), +wallFuel("Amount of fuel on the wall, in ms of injector open time for each injector.", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1136, 1.0, -1.0, -1.0, ""), +idleState("idleState", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1140, 1.0, -1.0, -1.0, ""), +currentIdlePosition("idle: current position\nthat's current position with CLT and IAT corrections", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1144, 1.0, -1.0, -1.0, ""), +baseIdlePosition("idle: base value\ncurrent position without adjustments (iacByTpsTaper, afterCrankingIACtaperDuration)", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1148, 1.0, -1.0, -1.0, ""), +iacByTpsTaper("idle: iacByTpsTaper portion of idle", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1152, 1.0, -1.0, -1.0, ""), +throttlePedalUpState("true in IDLE throttle pedal state, false if driver is touching the pedal\ntodo: better name for this field?", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1156, 1.0, -1.0, -1.0, ""), +targetRpmByClt("idle: target by CLT", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1164, 1.0, -1.0, -1.0, ""), +targetRpmAcBump("idle: A/C bump", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1168, 1.0, -1.0, -1.0, ""), +iacByRpmTaper("idle: iacByRpmTaper portion of idle", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1172, 1.0, -1.0, -1.0, ""), +luaAdd("idle: Lua Adder", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1176, 1.0, -1.0, -1.0, ""), +baseDwell("baseDwell", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1180, 1.0, -1.0, -1.0, ""), +dwellVoltageCorrection("dwellVoltageCorrection", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1184, 1.0, -1.0, -1.0, ""), +luaTimingAdd("luaTimingAdd", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1188, 1.0, -1.0, -1.0, ""), +luaTimingMult("luaTimingMult", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1192, 1.0, -1.0, -1.0, ""), +idlePosition("idlePosition", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1196, 1.0, -1.0, -1.0, ""), +trim("trim", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1200, 1.0, -1.0, -1.0, ""), +luaAdjustment("luaAdjustment", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1204, 1.0, -1.0, -1.0, ""), +etbFeedForward("etbFeedForward", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1208, 1.0, -1.0, -1.0, ""), +etbIntegralError("etbIntegralError", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1212, 1.0, -10000.0, 10000.0, ""), +etbCurrentTarget("etbCurrentTarget", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1216, 1.0, -10000.0, 10000.0, "%"), +faultCode("faultCode", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1220, 1.0, -1.0, -1.0, ""), +heaterDuty("heaterDuty", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1221, 1.0, 0.0, 100.0, "%"), +pumpDuty("pumpDuty", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1222, 1.0, 0.0, 100.0, "%"), +alignmentFill_at_3("need 4 byte alignment", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1223, 1.0, -20.0, 100.0, "units"), +tempC("tempC", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1224, 1.0, 500.0, 1000.0, "C"), +nernstVoltage("nernstVoltage", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1226, 0.001, 0.0, 1.0, "V"), +esr("esr", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1228, 1.0, -1.0, -1.0, ""), +alignmentFill_at_10("need 4 byte alignment", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1230, 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 e626c38d05..8285be0934 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 / UsagesReader.java -#define TS_TOTAL_OUTPUT_SIZE 1224 \ No newline at end of file +#define TS_TOTAL_OUTPUT_SIZE 1232 \ No newline at end of file diff --git a/firmware/controllers/algo/engine_state_generated.h b/firmware/controllers/algo/engine_state_generated.h index b64807a497..b7289ba429 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 ConfigDefinition.jar based on (unknown script) controllers/algo/engine_state.txt Wed Aug 24 22:14:46 UTC 2022 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/algo/engine_state.txt Thu Aug 25 22:49:55 UTC 2022 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -512,8 +512,16 @@ struct engine_state_s { * offset 150 */ uint8_t alignmentFill_at_150[2]; + /** + * offset 152 + */ + int fuelInjectionCounter = (int)0; + /** + * offset 156 + */ + int sparkCounter = (int)0; }; -static_assert(sizeof(engine_state_s) == 152); +static_assert(sizeof(engine_state_s) == 160); // end -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/algo/engine_state.txt Wed Aug 24 22:14:46 UTC 2022 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/algo/engine_state.txt Thu Aug 25 22:49:55 UTC 2022 diff --git a/firmware/controllers/generated/rusefi_generated.h b/firmware/controllers/generated/rusefi_generated.h index 4d980eae96..81c79a821f 100644 --- a/firmware/controllers/generated/rusefi_generated.h +++ b/firmware/controllers/generated/rusefi_generated.h @@ -1934,7 +1934,7 @@ #define show_Frankenso_presets true #define show_test_presets true #define showHumanReadableWarning_offset 960 -#define SIGNATURE_HASH 1913309982 +#define SIGNATURE_HASH 2188533610 #define silentTriggerError_offset 1360 #define skippedWheelOnCam_offset 1360 #define slowAdcAlpha_offset 1600 @@ -2490,12 +2490,12 @@ #define ts_show_vbatt true #define ts_show_vr_threshold_2 true #define ts_show_vr_threshold_all true -#define TS_SIGNATURE "rusEFI 2022.08.25.all.1913309982" +#define TS_SIGNATURE "rusEFI 2022.08.25.all.2188533610" #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 1224 +#define TS_TOTAL_OUTPUT_SIZE 1232 #define TsCalMode_EtbKd 5 #define TsCalMode_EtbKi 4 #define TsCalMode_EtbKp 3 diff --git a/firmware/controllers/generated/signature_48way.h b/firmware/controllers/generated/signature_48way.h index 89246a3420..f553502c82 100644 --- a/firmware/controllers/generated/signature_48way.h +++ b/firmware/controllers/generated/signature_48way.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 1697497937 -#define TS_SIGNATURE "rusEFI 2022.08.25.48way.1697497937" +#define SIGNATURE_HASH 2505398053 +#define TS_SIGNATURE "rusEFI 2022.08.25.48way.2505398053" diff --git a/firmware/controllers/generated/signature_all.h b/firmware/controllers/generated/signature_all.h index d6b220b968..5e77ddb31d 100644 --- a/firmware/controllers/generated/signature_all.h +++ b/firmware/controllers/generated/signature_all.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 1913309982 -#define TS_SIGNATURE "rusEFI 2022.08.25.all.1913309982" +#define SIGNATURE_HASH 2188533610 +#define TS_SIGNATURE "rusEFI 2022.08.25.all.2188533610" diff --git a/firmware/controllers/generated/signature_alphax-2chan.h b/firmware/controllers/generated/signature_alphax-2chan.h index 5a13ebb1d9..83816bdeea 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 ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 1075336818 -#define TS_SIGNATURE "rusEFI 2022.08.25.alphax-2chan.1075336818" +#define SIGNATURE_HASH 2959131142 +#define TS_SIGNATURE "rusEFI 2022.08.25.alphax-2chan.2959131142" diff --git a/firmware/controllers/generated/signature_alphax-4chan.h b/firmware/controllers/generated/signature_alphax-4chan.h index 2d45b31b19..dda9441266 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 ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 4178970769 -#define TS_SIGNATURE "rusEFI 2022.08.25.alphax-4chan.4178970769" +#define SIGNATURE_HASH 158244069 +#define TS_SIGNATURE "rusEFI 2022.08.25.alphax-4chan.158244069" diff --git a/firmware/controllers/generated/signature_atlas.h b/firmware/controllers/generated/signature_atlas.h index def5bd61ee..83317a74a5 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 ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 1858092601 -#define TS_SIGNATURE "rusEFI 2022.08.25.atlas.1858092601" +#define SIGNATURE_HASH 2662902349 +#define TS_SIGNATURE "rusEFI 2022.08.25.atlas.2662902349" diff --git a/firmware/controllers/generated/signature_core8.h b/firmware/controllers/generated/signature_core8.h index 03250fbd43..d11fcbde98 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 ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 2229705447 -#define TS_SIGNATURE "rusEFI 2022.08.25.core8.2229705447" +#define SIGNATURE_HASH 1956515475 +#define TS_SIGNATURE "rusEFI 2022.08.25.core8.1956515475" diff --git a/firmware/controllers/generated/signature_cypress.h b/firmware/controllers/generated/signature_cypress.h index 73a5817ffd..6640ed5310 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 ConfigDefinition.jar based on hellen_cypress_gen_config.bat null // -#define SIGNATURE_HASH 1913309982 -#define TS_SIGNATURE "rusEFI 2022.08.25.cypress.1913309982" +#define SIGNATURE_HASH 2188533610 +#define TS_SIGNATURE "rusEFI 2022.08.25.cypress.2188533610" diff --git a/firmware/controllers/generated/signature_f407-discovery.h b/firmware/controllers/generated/signature_f407-discovery.h index a07c7b555e..30a7aadb1b 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 ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 1913309982 -#define TS_SIGNATURE "rusEFI 2022.08.25.f407-discovery.1913309982" +#define SIGNATURE_HASH 2188533610 +#define TS_SIGNATURE "rusEFI 2022.08.25.f407-discovery.2188533610" diff --git a/firmware/controllers/generated/signature_f429-discovery.h b/firmware/controllers/generated/signature_f429-discovery.h index 3ce2b8c470..5f95ccf65d 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 ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 1913309982 -#define TS_SIGNATURE "rusEFI 2022.08.25.f429-discovery.1913309982" +#define SIGNATURE_HASH 2188533610 +#define TS_SIGNATURE "rusEFI 2022.08.25.f429-discovery.2188533610" diff --git a/firmware/controllers/generated/signature_frankenso_na6.h b/firmware/controllers/generated/signature_frankenso_na6.h index 00f4d78bb9..143022b7c7 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 ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 812005338 -#define TS_SIGNATURE "rusEFI 2022.08.25.frankenso_na6.812005338" +#define SIGNATURE_HASH 3223233454 +#define TS_SIGNATURE "rusEFI 2022.08.25.frankenso_na6.3223233454" diff --git a/firmware/controllers/generated/signature_harley81.h b/firmware/controllers/generated/signature_harley81.h index 784855675a..a3f1d438a5 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 ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 2197278257 -#define TS_SIGNATURE "rusEFI 2022.08.25.harley81.2197278257" +#define SIGNATURE_HASH 1921997381 +#define TS_SIGNATURE "rusEFI 2022.08.25.harley81.1921997381" diff --git a/firmware/controllers/generated/signature_hellen-gm-e67.h b/firmware/controllers/generated/signature_hellen-gm-e67.h index 79d8f52ef7..37c1ae823e 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 ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 3329052328 -#define TS_SIGNATURE "rusEFI 2022.08.25.hellen-gm-e67.3329052328" +#define SIGNATURE_HASH 907401948 +#define TS_SIGNATURE "rusEFI 2022.08.25.hellen-gm-e67.907401948" diff --git a/firmware/controllers/generated/signature_hellen-nb1.h b/firmware/controllers/generated/signature_hellen-nb1.h index c890a5e9be..f2ced13a76 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 ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 2877422290 -#define TS_SIGNATURE "rusEFI 2022.08.25.hellen-nb1.2877422290" +#define SIGNATURE_HASH 1543073446 +#define TS_SIGNATURE "rusEFI 2022.08.25.hellen-nb1.1543073446" diff --git a/firmware/controllers/generated/signature_hellen121nissan.h b/firmware/controllers/generated/signature_hellen121nissan.h index 09c5e89c13..e36617aa96 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 ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 4208227316 -#define TS_SIGNATURE "rusEFI 2022.08.25.hellen121nissan.4208227316" +#define SIGNATURE_HASH 179103616 +#define TS_SIGNATURE "rusEFI 2022.08.25.hellen121nissan.179103616" diff --git a/firmware/controllers/generated/signature_hellen121vag.h b/firmware/controllers/generated/signature_hellen121vag.h index 647265e818..aa0019c674 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 ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 36374628 -#define TS_SIGNATURE "rusEFI 2022.08.25.hellen121vag.36374628" +#define SIGNATURE_HASH 4065565712 +#define TS_SIGNATURE "rusEFI 2022.08.25.hellen121vag.4065565712" diff --git a/firmware/controllers/generated/signature_hellen128.h b/firmware/controllers/generated/signature_hellen128.h index 90fe262589..e3f4b3378a 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 ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 2364864032 -#define TS_SIGNATURE "rusEFI 2022.08.25.hellen128.2364864032" +#define SIGNATURE_HASH 2089574996 +#define TS_SIGNATURE "rusEFI 2022.08.25.hellen128.2089574996" diff --git a/firmware/controllers/generated/signature_hellen154hyundai.h b/firmware/controllers/generated/signature_hellen154hyundai.h index ccf540a572..d8da696a6d 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 ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 3930438042 -#define TS_SIGNATURE "rusEFI 2022.08.25.hellen154hyundai.3930438042" +#define SIGNATURE_HASH 440217070 +#define TS_SIGNATURE "rusEFI 2022.08.25.hellen154hyundai.440217070" diff --git a/firmware/controllers/generated/signature_hellen72.h b/firmware/controllers/generated/signature_hellen72.h index 1eba2954c1..13570127c2 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 ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 2151014938 -#define TS_SIGNATURE "rusEFI 2022.08.25.hellen72.2151014938" +#define SIGNATURE_HASH 1884124782 +#define TS_SIGNATURE "rusEFI 2022.08.25.hellen72.1884124782" diff --git a/firmware/controllers/generated/signature_hellen81.h b/firmware/controllers/generated/signature_hellen81.h index 99672296dc..2a0ffd5c1a 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 ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 1354699540 -#define TS_SIGNATURE "rusEFI 2022.08.25.hellen81.1354699540" +#define SIGNATURE_HASH 2697430880 +#define TS_SIGNATURE "rusEFI 2022.08.25.hellen81.2697430880" diff --git a/firmware/controllers/generated/signature_hellen88bmw.h b/firmware/controllers/generated/signature_hellen88bmw.h index bcfbc44d42..c8f5c67805 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 ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 1744820434 -#define TS_SIGNATURE "rusEFI 2022.08.25.hellen88bmw.1744820434" +#define SIGNATURE_HASH 2542226598 +#define TS_SIGNATURE "rusEFI 2022.08.25.hellen88bmw.2542226598" diff --git a/firmware/controllers/generated/signature_hellenNA6.h b/firmware/controllers/generated/signature_hellenNA6.h index e792f38544..3223cca9f8 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 ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 4035000958 -#define TS_SIGNATURE "rusEFI 2022.08.25.hellenNA6.4035000958" +#define SIGNATURE_HASH 16363018 +#define TS_SIGNATURE "rusEFI 2022.08.25.hellenNA6.16363018" diff --git a/firmware/controllers/generated/signature_hellenNA8_96.h b/firmware/controllers/generated/signature_hellenNA8_96.h index 7c6bb97681..468f610169 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 ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 3523443446 -#define TS_SIGNATURE "rusEFI 2022.08.25.hellenNA8_96.3523443446" +#define SIGNATURE_HASH 578547330 +#define TS_SIGNATURE "rusEFI 2022.08.25.hellenNA8_96.578547330" diff --git a/firmware/controllers/generated/signature_kin.h b/firmware/controllers/generated/signature_kin.h index 2f39b1e995..0f84eb6058 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 ConfigDefinition.jar based on kinetis_gen_config.bat null // -#define SIGNATURE_HASH 450718162 -#define TS_SIGNATURE "rusEFI 2022.08.25.kin.450718162" +#define SIGNATURE_HASH 3936746918 +#define TS_SIGNATURE "rusEFI 2022.08.25.kin.3936746918" diff --git a/firmware/controllers/generated/signature_mre_f4.h b/firmware/controllers/generated/signature_mre_f4.h index 0c9b2a9dc0..b5493a4db4 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 ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 3185330152 -#define TS_SIGNATURE "rusEFI 2022.08.25.mre_f4.3185330152" +#define SIGNATURE_HASH 1302647708 +#define TS_SIGNATURE "rusEFI 2022.08.25.mre_f4.1302647708" diff --git a/firmware/controllers/generated/signature_mre_f7.h b/firmware/controllers/generated/signature_mre_f7.h index 549a69aeb7..7d58e69e23 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 ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 3185330152 -#define TS_SIGNATURE "rusEFI 2022.08.25.mre_f7.3185330152" +#define SIGNATURE_HASH 1302647708 +#define TS_SIGNATURE "rusEFI 2022.08.25.mre_f7.1302647708" diff --git a/firmware/controllers/generated/signature_prometheus_405.h b/firmware/controllers/generated/signature_prometheus_405.h index c2fa842f67..071495c52e 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 ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 585110264 -#define TS_SIGNATURE "rusEFI 2022.08.25.prometheus_405.585110264" +#define SIGNATURE_HASH 3533211276 +#define TS_SIGNATURE "rusEFI 2022.08.25.prometheus_405.3533211276" diff --git a/firmware/controllers/generated/signature_prometheus_469.h b/firmware/controllers/generated/signature_prometheus_469.h index 3e44403bd6..5e168ed8db 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 ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 585110264 -#define TS_SIGNATURE "rusEFI 2022.08.25.prometheus_469.585110264" +#define SIGNATURE_HASH 3533211276 +#define TS_SIGNATURE "rusEFI 2022.08.25.prometheus_469.3533211276" diff --git a/firmware/controllers/generated/signature_proteus_f4.h b/firmware/controllers/generated/signature_proteus_f4.h index 8b01bb2a97..8c1e90d853 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 ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 3620146280 -#define TS_SIGNATURE "rusEFI 2022.08.25.proteus_f4.3620146280" +#define SIGNATURE_HASH 666867740 +#define TS_SIGNATURE "rusEFI 2022.08.25.proteus_f4.666867740" diff --git a/firmware/controllers/generated/signature_proteus_f7.h b/firmware/controllers/generated/signature_proteus_f7.h index b9f18962b6..39281d9671 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 ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 3620146280 -#define TS_SIGNATURE "rusEFI 2022.08.25.proteus_f7.3620146280" +#define SIGNATURE_HASH 666867740 +#define TS_SIGNATURE "rusEFI 2022.08.25.proteus_f7.666867740" diff --git a/firmware/controllers/generated/signature_proteus_h7.h b/firmware/controllers/generated/signature_proteus_h7.h index 883c3007ed..f2ed797ad8 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 ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 3620146280 -#define TS_SIGNATURE "rusEFI 2022.08.25.proteus_h7.3620146280" +#define SIGNATURE_HASH 666867740 +#define TS_SIGNATURE "rusEFI 2022.08.25.proteus_h7.666867740" diff --git a/firmware/controllers/generated/signature_subaru_eg33_f7.h b/firmware/controllers/generated/signature_subaru_eg33_f7.h index c541d945c1..756ff7c0b1 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 ConfigDefinition.jar based on config/boards/subaru_eg33/config/gen_subaru_config.sh null // -#define SIGNATURE_HASH 1010269350 -#define TS_SIGNATURE "rusEFI 2022.08.25.subaru_eg33_f7.1010269350" +#define SIGNATURE_HASH 3427789010 +#define TS_SIGNATURE "rusEFI 2022.08.25.subaru_eg33_f7.3427789010" diff --git a/firmware/controllers/generated/signature_tdg-pdm8.h b/firmware/controllers/generated/signature_tdg-pdm8.h index 389f71b0e1..9170eb2adf 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 ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 3624011082 -#define TS_SIGNATURE "rusEFI 2022.08.25.tdg-pdm8.3624011082" +#define SIGNATURE_HASH 679121214 +#define TS_SIGNATURE "rusEFI 2022.08.25.tdg-pdm8.679121214" diff --git a/firmware/tunerstudio/generated/rusefi.ini b/firmware/tunerstudio/generated/rusefi.ini index b6a351dec4..c58d71d56a 100644 --- a/firmware/tunerstudio/generated/rusefi.ini +++ b/firmware/tunerstudio/generated/rusefi.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.08.25.all.1913309982" + signature = "rusEFI 2022.08.25.all.2188533610" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.08.25.all.1913309982" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.08.25.all.2188533610" ; 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 @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Aug 25 14:52:15 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Aug 25 22:50:58 UTC 2022 pageSize = 21300 page = 1 @@ -2109,7 +2109,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1224 + ochBlockSize = 1232 ; ; see TunerStudioOutputChannels struct @@ -3022,170 +3022,172 @@ unusedBit_22_31 = bits, U32, 992, [31:31] egt1 = scalar, F32, 996, "", 1, 0 egt2 = scalar, F32, 1000, "", 1, 0 desiredRpmLimit = scalar, S16, 1004, "rpm", 1, 0 -; total TS size = 1008 -tpsFrom = scalar, F32, 1008 -tpsTo = scalar, F32, 1012 -deltaTps = scalar, F32, 1016 -extraFuel = scalar, F32, 1020, "", 1, 0 -valueFromTable = scalar, F32, 1024, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1028, [0:0] -isBelowDecelThreshold = bits, U32, 1028, [1:1] -isTimeToResetAccumulator = bits, U32, 1028, [2:2] -isFractionalEnrichment = bits, U32, 1028, [3:3] -belowEpsilon = bits, U32, 1028, [4:4] -tooShort = bits, U32, 1028, [5:5] -unusedBit_11_6 = bits, U32, 1028, [6:6] -unusedBit_11_7 = bits, U32, 1028, [7:7] -unusedBit_11_8 = bits, U32, 1028, [8:8] -unusedBit_11_9 = bits, U32, 1028, [9:9] -unusedBit_11_10 = bits, U32, 1028, [10:10] -unusedBit_11_11 = bits, U32, 1028, [11:11] -unusedBit_11_12 = bits, U32, 1028, [12:12] -unusedBit_11_13 = bits, U32, 1028, [13:13] -unusedBit_11_14 = bits, U32, 1028, [14:14] -unusedBit_11_15 = bits, U32, 1028, [15:15] -unusedBit_11_16 = bits, U32, 1028, [16:16] -unusedBit_11_17 = bits, U32, 1028, [17:17] -unusedBit_11_18 = bits, U32, 1028, [18:18] -unusedBit_11_19 = bits, U32, 1028, [19:19] -unusedBit_11_20 = bits, U32, 1028, [20:20] -unusedBit_11_21 = bits, U32, 1028, [21:21] -unusedBit_11_22 = bits, U32, 1028, [22:22] -unusedBit_11_23 = bits, U32, 1028, [23:23] -unusedBit_11_24 = bits, U32, 1028, [24:24] -unusedBit_11_25 = bits, U32, 1028, [25:25] -unusedBit_11_26 = bits, U32, 1028, [26:26] -unusedBit_11_27 = bits, U32, 1028, [27:27] -unusedBit_11_28 = bits, U32, 1028, [28:28] -unusedBit_11_29 = bits, U32, 1028, [29:29] -unusedBit_11_30 = bits, U32, 1028, [30:30] -unusedBit_11_31 = bits, U32, 1028, [31:31] -fractionalInjFuel = scalar, F32, 1032, "", 1, 0 -accumulatedValue = scalar, F32, 1036, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1040, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1044, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1048, "", 1, 0 -cycleCnt = scalar, S32, 1052, "", 1, 0 -; total TS size = 1056 -hwEventCounters1 = scalar, S32, 1056, "", 1, 0 -hwEventCounters2 = scalar, S32, 1060, "", 1, 0 -hwEventCounters3 = scalar, S32, 1064, "", 1, 0 -hwEventCounters4 = scalar, S32, 1068, "", 1, 0 -hwEventCounters5 = scalar, S32, 1072, "", 1, 0 -hwEventCounters6 = scalar, S32, 1076, "", 1, 0 -vvtCamCounter = scalar, S32, 1080, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1084, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1088, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1092, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1093, "", 1, 0 -; total TS size = 1096 -totalRevolutionCounter = scalar, U32, 1096, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1100, "", 1, 0 -vvtCurrentPosition = scalar, F32, 1104, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1108, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 1112, "", 1, 0 -triggerStateIndex = scalar, U08, 1116, "", 1, 0 -vvtCounter = scalar, U08, 1117, "", 1, 0 -camResyncCounter = scalar, U08, 1118, "", 1, 0 -vvtStateIndex = scalar, U08, 1119, "", 1, 0 -; total TS size = 1120 -m_hasSynchronizedPhase = bits, U32, 1120, [0:0] -unusedBit_1_1 = bits, U32, 1120, [1:1] -unusedBit_1_2 = bits, U32, 1120, [2:2] -unusedBit_1_3 = bits, U32, 1120, [3:3] -unusedBit_1_4 = bits, U32, 1120, [4:4] -unusedBit_1_5 = bits, U32, 1120, [5:5] -unusedBit_1_6 = bits, U32, 1120, [6:6] -unusedBit_1_7 = bits, U32, 1120, [7:7] -unusedBit_1_8 = bits, U32, 1120, [8:8] -unusedBit_1_9 = bits, U32, 1120, [9:9] -unusedBit_1_10 = bits, U32, 1120, [10:10] -unusedBit_1_11 = bits, U32, 1120, [11:11] -unusedBit_1_12 = bits, U32, 1120, [12:12] -unusedBit_1_13 = bits, U32, 1120, [13:13] -unusedBit_1_14 = bits, U32, 1120, [14:14] -unusedBit_1_15 = bits, U32, 1120, [15:15] -unusedBit_1_16 = bits, U32, 1120, [16:16] -unusedBit_1_17 = bits, U32, 1120, [17:17] -unusedBit_1_18 = bits, U32, 1120, [18:18] -unusedBit_1_19 = bits, U32, 1120, [19:19] -unusedBit_1_20 = bits, U32, 1120, [20:20] -unusedBit_1_21 = bits, U32, 1120, [21:21] -unusedBit_1_22 = bits, U32, 1120, [22:22] -unusedBit_1_23 = bits, U32, 1120, [23:23] -unusedBit_1_24 = bits, U32, 1120, [24:24] -unusedBit_1_25 = bits, U32, 1120, [25:25] -unusedBit_1_26 = bits, U32, 1120, [26:26] -unusedBit_1_27 = bits, U32, 1120, [27:27] -unusedBit_1_28 = bits, U32, 1120, [28:28] -unusedBit_1_29 = bits, U32, 1120, [29:29] -unusedBit_1_30 = bits, U32, 1120, [30:30] -unusedBit_1_31 = bits, U32, 1120, [31:31] -; total TS size = 1124 -wallFuelCorrection = scalar, F32, 1124, "", 1, 0 -wallFuel = scalar, F32, 1128, "", 1, 0 +fuelInjectionCounter = scalar, S32, 1008, "", 1, 0 +sparkCounter = scalar, S32, 1012, "", 1, 0 +; total TS size = 1016 +tpsFrom = scalar, F32, 1016 +tpsTo = scalar, F32, 1020 +deltaTps = scalar, F32, 1024 +extraFuel = scalar, F32, 1028, "", 1, 0 +valueFromTable = scalar, F32, 1032, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1036, [0:0] +isBelowDecelThreshold = bits, U32, 1036, [1:1] +isTimeToResetAccumulator = bits, U32, 1036, [2:2] +isFractionalEnrichment = bits, U32, 1036, [3:3] +belowEpsilon = bits, U32, 1036, [4:4] +tooShort = bits, U32, 1036, [5:5] +unusedBit_11_6 = bits, U32, 1036, [6:6] +unusedBit_11_7 = bits, U32, 1036, [7:7] +unusedBit_11_8 = bits, U32, 1036, [8:8] +unusedBit_11_9 = bits, U32, 1036, [9:9] +unusedBit_11_10 = bits, U32, 1036, [10:10] +unusedBit_11_11 = bits, U32, 1036, [11:11] +unusedBit_11_12 = bits, U32, 1036, [12:12] +unusedBit_11_13 = bits, U32, 1036, [13:13] +unusedBit_11_14 = bits, U32, 1036, [14:14] +unusedBit_11_15 = bits, U32, 1036, [15:15] +unusedBit_11_16 = bits, U32, 1036, [16:16] +unusedBit_11_17 = bits, U32, 1036, [17:17] +unusedBit_11_18 = bits, U32, 1036, [18:18] +unusedBit_11_19 = bits, U32, 1036, [19:19] +unusedBit_11_20 = bits, U32, 1036, [20:20] +unusedBit_11_21 = bits, U32, 1036, [21:21] +unusedBit_11_22 = bits, U32, 1036, [22:22] +unusedBit_11_23 = bits, U32, 1036, [23:23] +unusedBit_11_24 = bits, U32, 1036, [24:24] +unusedBit_11_25 = bits, U32, 1036, [25:25] +unusedBit_11_26 = bits, U32, 1036, [26:26] +unusedBit_11_27 = bits, U32, 1036, [27:27] +unusedBit_11_28 = bits, U32, 1036, [28:28] +unusedBit_11_29 = bits, U32, 1036, [29:29] +unusedBit_11_30 = bits, U32, 1036, [30:30] +unusedBit_11_31 = bits, U32, 1036, [31:31] +fractionalInjFuel = scalar, F32, 1040, "", 1, 0 +accumulatedValue = scalar, F32, 1044, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1048, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1052, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1056, "", 1, 0 +cycleCnt = scalar, S32, 1060, "", 1, 0 +; total TS size = 1064 +hwEventCounters1 = scalar, S32, 1064, "", 1, 0 +hwEventCounters2 = scalar, S32, 1068, "", 1, 0 +hwEventCounters3 = scalar, S32, 1072, "", 1, 0 +hwEventCounters4 = scalar, S32, 1076, "", 1, 0 +hwEventCounters5 = scalar, S32, 1080, "", 1, 0 +hwEventCounters6 = scalar, S32, 1084, "", 1, 0 +vvtCamCounter = scalar, S32, 1088, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1092, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1096, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1100, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1101, "", 1, 0 +; total TS size = 1104 +totalRevolutionCounter = scalar, U32, 1104, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1108, "", 1, 0 +vvtCurrentPosition = scalar, F32, 1112, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1116, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 1120, "", 1, 0 +triggerStateIndex = scalar, U08, 1124, "", 1, 0 +vvtCounter = scalar, U08, 1125, "", 1, 0 +camResyncCounter = scalar, U08, 1126, "", 1, 0 +vvtStateIndex = scalar, U08, 1127, "", 1, 0 +; total TS size = 1128 +m_hasSynchronizedPhase = bits, U32, 1128, [0:0] +unusedBit_1_1 = bits, U32, 1128, [1:1] +unusedBit_1_2 = bits, U32, 1128, [2:2] +unusedBit_1_3 = bits, U32, 1128, [3:3] +unusedBit_1_4 = bits, U32, 1128, [4:4] +unusedBit_1_5 = bits, U32, 1128, [5:5] +unusedBit_1_6 = bits, U32, 1128, [6:6] +unusedBit_1_7 = bits, U32, 1128, [7:7] +unusedBit_1_8 = bits, U32, 1128, [8:8] +unusedBit_1_9 = bits, U32, 1128, [9:9] +unusedBit_1_10 = bits, U32, 1128, [10:10] +unusedBit_1_11 = bits, U32, 1128, [11:11] +unusedBit_1_12 = bits, U32, 1128, [12:12] +unusedBit_1_13 = bits, U32, 1128, [13:13] +unusedBit_1_14 = bits, U32, 1128, [14:14] +unusedBit_1_15 = bits, U32, 1128, [15:15] +unusedBit_1_16 = bits, U32, 1128, [16:16] +unusedBit_1_17 = bits, U32, 1128, [17:17] +unusedBit_1_18 = bits, U32, 1128, [18:18] +unusedBit_1_19 = bits, U32, 1128, [19:19] +unusedBit_1_20 = bits, U32, 1128, [20:20] +unusedBit_1_21 = bits, U32, 1128, [21:21] +unusedBit_1_22 = bits, U32, 1128, [22:22] +unusedBit_1_23 = bits, U32, 1128, [23:23] +unusedBit_1_24 = bits, U32, 1128, [24:24] +unusedBit_1_25 = bits, U32, 1128, [25:25] +unusedBit_1_26 = bits, U32, 1128, [26:26] +unusedBit_1_27 = bits, U32, 1128, [27:27] +unusedBit_1_28 = bits, U32, 1128, [28:28] +unusedBit_1_29 = bits, U32, 1128, [29:29] +unusedBit_1_30 = bits, U32, 1128, [30:30] +unusedBit_1_31 = bits, U32, 1128, [31:31] ; total TS size = 1132 -idleState = bits, S32, 1132, [0:2], "not important" -currentIdlePosition = scalar, F32, 1136 -baseIdlePosition = scalar, F32, 1140 -iacByTpsTaper = scalar, F32, 1144 -throttlePedalUpState = scalar, S32, 1148, "", 1, 0 -mightResetPid = bits, U32, 1152, [0:0] -shouldResetPid = bits, U32, 1152, [1:1] -wasResetPid = bits, U32, 1152, [2:2] -mustResetPid = bits, U32, 1152, [3:3] -isCoasting = bits, U32, 1152, [4:4] -useIacTableForCoasting = bits, U32, 1152, [5:5] -notIdling = bits, U32, 1152, [6:6] -needReset = bits, U32, 1152, [7:7] -isInDeadZone = bits, U32, 1152, [8:8] -isBlipping = bits, U32, 1152, [9:9] -useClosedLoop = bits, U32, 1152, [10:10] -badTps = bits, U32, 1152, [11:11] -looksLikeRunning = bits, U32, 1152, [12:12] -looksLikeCoasting = bits, U32, 1152, [13:13] -looksLikeCrankToIdle = bits, U32, 1152, [14:14] -useInstantRpmForIdle = bits, U32, 1152, [15:15] -isVerboseIAC = bits, U32, 1152, [16:16] -unusedBit_22_17 = bits, U32, 1152, [17:17] -unusedBit_22_18 = bits, U32, 1152, [18:18] -unusedBit_22_19 = bits, U32, 1152, [19:19] -unusedBit_22_20 = bits, U32, 1152, [20:20] -unusedBit_22_21 = bits, U32, 1152, [21:21] -unusedBit_22_22 = bits, U32, 1152, [22:22] -unusedBit_22_23 = bits, U32, 1152, [23:23] -unusedBit_22_24 = bits, U32, 1152, [24:24] -unusedBit_22_25 = bits, U32, 1152, [25:25] -unusedBit_22_26 = bits, U32, 1152, [26:26] -unusedBit_22_27 = bits, U32, 1152, [27:27] -unusedBit_22_28 = bits, U32, 1152, [28:28] -unusedBit_22_29 = bits, U32, 1152, [29:29] -unusedBit_22_30 = bits, U32, 1152, [30:30] -unusedBit_22_31 = bits, U32, 1152, [31:31] -targetRpmByClt = scalar, S32, 1156, "", 1, 0 -targetRpmAcBump = scalar, S32, 1160, "", 1, 0 -iacByRpmTaper = scalar, F32, 1164 -luaAdd = scalar, F32, 1168 -; total TS size = 1172 -baseDwell = scalar, F32, 1172, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 1176, "", 1, 0 -luaTimingAdd = scalar, F32, 1180, "", 1, 0 -luaTimingMult = scalar, F32, 1184, "", 1, 0 -; total TS size = 1188 -idlePosition = scalar, F32, 1188, "", 1, 0 -trim = scalar, F32, 1192, "", 1, 0 -luaAdjustment = scalar, F32, 1196, "", 1, 0 -etbFeedForward = scalar, F32, 1200 -etbIntegralError = scalar, F32, 1204, "", 1, 0 -etbCurrentTarget = scalar, F32, 1208, "%", 1, 0 -; total TS size = 1212 -faultCode = scalar, U08, 1212, "", 1, 0 -heaterDuty = scalar, U08, 1213, "%", 1, 0 -pumpDuty = scalar, U08, 1214, "%", 1, 0 -tempC = scalar, U16, 1216, "C", 1, 0 -nernstVoltage = scalar, U16, 1218, "V", 0.001, 0 -esr = scalar, U16, 1220, "", 1, 0 -; total TS size = 1224 +wallFuelCorrection = scalar, F32, 1132, "", 1, 0 +wallFuel = scalar, F32, 1136, "", 1, 0 +; total TS size = 1140 +idleState = bits, S32, 1140, [0:2], "not important" +currentIdlePosition = scalar, F32, 1144 +baseIdlePosition = scalar, F32, 1148 +iacByTpsTaper = scalar, F32, 1152 +throttlePedalUpState = scalar, S32, 1156, "", 1, 0 +mightResetPid = bits, U32, 1160, [0:0] +shouldResetPid = bits, U32, 1160, [1:1] +wasResetPid = bits, U32, 1160, [2:2] +mustResetPid = bits, U32, 1160, [3:3] +isCoasting = bits, U32, 1160, [4:4] +useIacTableForCoasting = bits, U32, 1160, [5:5] +notIdling = bits, U32, 1160, [6:6] +needReset = bits, U32, 1160, [7:7] +isInDeadZone = bits, U32, 1160, [8:8] +isBlipping = bits, U32, 1160, [9:9] +useClosedLoop = bits, U32, 1160, [10:10] +badTps = bits, U32, 1160, [11:11] +looksLikeRunning = bits, U32, 1160, [12:12] +looksLikeCoasting = bits, U32, 1160, [13:13] +looksLikeCrankToIdle = bits, U32, 1160, [14:14] +useInstantRpmForIdle = bits, U32, 1160, [15:15] +isVerboseIAC = bits, U32, 1160, [16:16] +unusedBit_22_17 = bits, U32, 1160, [17:17] +unusedBit_22_18 = bits, U32, 1160, [18:18] +unusedBit_22_19 = bits, U32, 1160, [19:19] +unusedBit_22_20 = bits, U32, 1160, [20:20] +unusedBit_22_21 = bits, U32, 1160, [21:21] +unusedBit_22_22 = bits, U32, 1160, [22:22] +unusedBit_22_23 = bits, U32, 1160, [23:23] +unusedBit_22_24 = bits, U32, 1160, [24:24] +unusedBit_22_25 = bits, U32, 1160, [25:25] +unusedBit_22_26 = bits, U32, 1160, [26:26] +unusedBit_22_27 = bits, U32, 1160, [27:27] +unusedBit_22_28 = bits, U32, 1160, [28:28] +unusedBit_22_29 = bits, U32, 1160, [29:29] +unusedBit_22_30 = bits, U32, 1160, [30:30] +unusedBit_22_31 = bits, U32, 1160, [31:31] +targetRpmByClt = scalar, S32, 1164, "", 1, 0 +targetRpmAcBump = scalar, S32, 1168, "", 1, 0 +iacByRpmTaper = scalar, F32, 1172 +luaAdd = scalar, F32, 1176 +; total TS size = 1180 +baseDwell = scalar, F32, 1180, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 1184, "", 1, 0 +luaTimingAdd = scalar, F32, 1188, "", 1, 0 +luaTimingMult = scalar, F32, 1192, "", 1, 0 +; total TS size = 1196 +idlePosition = scalar, F32, 1196, "", 1, 0 +trim = scalar, F32, 1200, "", 1, 0 +luaAdjustment = scalar, F32, 1204, "", 1, 0 +etbFeedForward = scalar, F32, 1208 +etbIntegralError = scalar, F32, 1212, "", 1, 0 +etbCurrentTarget = scalar, F32, 1216, "%", 1, 0 +; total TS size = 1220 +faultCode = scalar, U08, 1220, "", 1, 0 +heaterDuty = scalar, U08, 1221, "%", 1, 0 +pumpDuty = scalar, U08, 1222, "%", 1, 0 +tempC = scalar, U16, 1224, "C", 1, 0 +nernstVoltage = scalar, U16, 1226, "V", 0.001, 0 +esr = scalar, U16, 1228, "", 1, 0 +; total TS size = 1232 time = { timeNow } @@ -4757,6 +4759,8 @@ entry = brakePedalState, "brake: down", int, "%d" entry = egt1, "egt1", float, "%.3f" entry = egt2, "egt2", float, "%.3f" entry = desiredRpmLimit, "User-defined RPM hard limit", int, "%d" +entry = fuelInjectionCounter, "fuelInjectionCounter", int, "%d" +entry = sparkCounter, "sparkCounter", int, "%d" entry = tpsFrom, "tpsFrom", float, "%.3f" entry = tpsTo, "tpsTo", float, "%.3f" entry = deltaTps, "deltaTps", float, "%.3f" @@ -5502,6 +5506,8 @@ dialog = engine_stateDialog, "engine_state" graphLine = egt2 liveGraph = engine_state_10_Graph, "Graph", South graphLine = desiredRpmLimit + graphLine = fuelInjectionCounter + graphLine = sparkCounter indicatorPanel = tps_accel_stateIndicatorPanel, 2 indicator = {isAboveAccelThreshold}, "isAboveAccelThreshold No", "isAboveAccelThreshold Yes" diff --git a/firmware/tunerstudio/generated/rusefi_48way.ini b/firmware/tunerstudio/generated/rusefi_48way.ini index c6282a2eed..51d2d3ce4c 100644 --- a/firmware/tunerstudio/generated/rusefi_48way.ini +++ b/firmware/tunerstudio/generated/rusefi_48way.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.08.25.48way.1697497937" + signature = "rusEFI 2022.08.25.48way.2505398053" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.08.25.48way.1697497937" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.08.25.48way.2505398053" ; 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 @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Aug 25 14:51:52 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Aug 25 22:50:37 UTC 2022 pageSize = 21300 page = 1 @@ -2109,7 +2109,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1224 + ochBlockSize = 1232 ; ; see TunerStudioOutputChannels struct @@ -3022,170 +3022,172 @@ unusedBit_22_31 = bits, U32, 992, [31:31] egt1 = scalar, F32, 996, "", 1, 0 egt2 = scalar, F32, 1000, "", 1, 0 desiredRpmLimit = scalar, S16, 1004, "rpm", 1, 0 -; total TS size = 1008 -tpsFrom = scalar, F32, 1008 -tpsTo = scalar, F32, 1012 -deltaTps = scalar, F32, 1016 -extraFuel = scalar, F32, 1020, "", 1, 0 -valueFromTable = scalar, F32, 1024, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1028, [0:0] -isBelowDecelThreshold = bits, U32, 1028, [1:1] -isTimeToResetAccumulator = bits, U32, 1028, [2:2] -isFractionalEnrichment = bits, U32, 1028, [3:3] -belowEpsilon = bits, U32, 1028, [4:4] -tooShort = bits, U32, 1028, [5:5] -unusedBit_11_6 = bits, U32, 1028, [6:6] -unusedBit_11_7 = bits, U32, 1028, [7:7] -unusedBit_11_8 = bits, U32, 1028, [8:8] -unusedBit_11_9 = bits, U32, 1028, [9:9] -unusedBit_11_10 = bits, U32, 1028, [10:10] -unusedBit_11_11 = bits, U32, 1028, [11:11] -unusedBit_11_12 = bits, U32, 1028, [12:12] -unusedBit_11_13 = bits, U32, 1028, [13:13] -unusedBit_11_14 = bits, U32, 1028, [14:14] -unusedBit_11_15 = bits, U32, 1028, [15:15] -unusedBit_11_16 = bits, U32, 1028, [16:16] -unusedBit_11_17 = bits, U32, 1028, [17:17] -unusedBit_11_18 = bits, U32, 1028, [18:18] -unusedBit_11_19 = bits, U32, 1028, [19:19] -unusedBit_11_20 = bits, U32, 1028, [20:20] -unusedBit_11_21 = bits, U32, 1028, [21:21] -unusedBit_11_22 = bits, U32, 1028, [22:22] -unusedBit_11_23 = bits, U32, 1028, [23:23] -unusedBit_11_24 = bits, U32, 1028, [24:24] -unusedBit_11_25 = bits, U32, 1028, [25:25] -unusedBit_11_26 = bits, U32, 1028, [26:26] -unusedBit_11_27 = bits, U32, 1028, [27:27] -unusedBit_11_28 = bits, U32, 1028, [28:28] -unusedBit_11_29 = bits, U32, 1028, [29:29] -unusedBit_11_30 = bits, U32, 1028, [30:30] -unusedBit_11_31 = bits, U32, 1028, [31:31] -fractionalInjFuel = scalar, F32, 1032, "", 1, 0 -accumulatedValue = scalar, F32, 1036, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1040, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1044, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1048, "", 1, 0 -cycleCnt = scalar, S32, 1052, "", 1, 0 -; total TS size = 1056 -hwEventCounters1 = scalar, S32, 1056, "", 1, 0 -hwEventCounters2 = scalar, S32, 1060, "", 1, 0 -hwEventCounters3 = scalar, S32, 1064, "", 1, 0 -hwEventCounters4 = scalar, S32, 1068, "", 1, 0 -hwEventCounters5 = scalar, S32, 1072, "", 1, 0 -hwEventCounters6 = scalar, S32, 1076, "", 1, 0 -vvtCamCounter = scalar, S32, 1080, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1084, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1088, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1092, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1093, "", 1, 0 -; total TS size = 1096 -totalRevolutionCounter = scalar, U32, 1096, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1100, "", 1, 0 -vvtCurrentPosition = scalar, F32, 1104, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1108, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 1112, "", 1, 0 -triggerStateIndex = scalar, U08, 1116, "", 1, 0 -vvtCounter = scalar, U08, 1117, "", 1, 0 -camResyncCounter = scalar, U08, 1118, "", 1, 0 -vvtStateIndex = scalar, U08, 1119, "", 1, 0 -; total TS size = 1120 -m_hasSynchronizedPhase = bits, U32, 1120, [0:0] -unusedBit_1_1 = bits, U32, 1120, [1:1] -unusedBit_1_2 = bits, U32, 1120, [2:2] -unusedBit_1_3 = bits, U32, 1120, [3:3] -unusedBit_1_4 = bits, U32, 1120, [4:4] -unusedBit_1_5 = bits, U32, 1120, [5:5] -unusedBit_1_6 = bits, U32, 1120, [6:6] -unusedBit_1_7 = bits, U32, 1120, [7:7] -unusedBit_1_8 = bits, U32, 1120, [8:8] -unusedBit_1_9 = bits, U32, 1120, [9:9] -unusedBit_1_10 = bits, U32, 1120, [10:10] -unusedBit_1_11 = bits, U32, 1120, [11:11] -unusedBit_1_12 = bits, U32, 1120, [12:12] -unusedBit_1_13 = bits, U32, 1120, [13:13] -unusedBit_1_14 = bits, U32, 1120, [14:14] -unusedBit_1_15 = bits, U32, 1120, [15:15] -unusedBit_1_16 = bits, U32, 1120, [16:16] -unusedBit_1_17 = bits, U32, 1120, [17:17] -unusedBit_1_18 = bits, U32, 1120, [18:18] -unusedBit_1_19 = bits, U32, 1120, [19:19] -unusedBit_1_20 = bits, U32, 1120, [20:20] -unusedBit_1_21 = bits, U32, 1120, [21:21] -unusedBit_1_22 = bits, U32, 1120, [22:22] -unusedBit_1_23 = bits, U32, 1120, [23:23] -unusedBit_1_24 = bits, U32, 1120, [24:24] -unusedBit_1_25 = bits, U32, 1120, [25:25] -unusedBit_1_26 = bits, U32, 1120, [26:26] -unusedBit_1_27 = bits, U32, 1120, [27:27] -unusedBit_1_28 = bits, U32, 1120, [28:28] -unusedBit_1_29 = bits, U32, 1120, [29:29] -unusedBit_1_30 = bits, U32, 1120, [30:30] -unusedBit_1_31 = bits, U32, 1120, [31:31] -; total TS size = 1124 -wallFuelCorrection = scalar, F32, 1124, "", 1, 0 -wallFuel = scalar, F32, 1128, "", 1, 0 +fuelInjectionCounter = scalar, S32, 1008, "", 1, 0 +sparkCounter = scalar, S32, 1012, "", 1, 0 +; total TS size = 1016 +tpsFrom = scalar, F32, 1016 +tpsTo = scalar, F32, 1020 +deltaTps = scalar, F32, 1024 +extraFuel = scalar, F32, 1028, "", 1, 0 +valueFromTable = scalar, F32, 1032, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1036, [0:0] +isBelowDecelThreshold = bits, U32, 1036, [1:1] +isTimeToResetAccumulator = bits, U32, 1036, [2:2] +isFractionalEnrichment = bits, U32, 1036, [3:3] +belowEpsilon = bits, U32, 1036, [4:4] +tooShort = bits, U32, 1036, [5:5] +unusedBit_11_6 = bits, U32, 1036, [6:6] +unusedBit_11_7 = bits, U32, 1036, [7:7] +unusedBit_11_8 = bits, U32, 1036, [8:8] +unusedBit_11_9 = bits, U32, 1036, [9:9] +unusedBit_11_10 = bits, U32, 1036, [10:10] +unusedBit_11_11 = bits, U32, 1036, [11:11] +unusedBit_11_12 = bits, U32, 1036, [12:12] +unusedBit_11_13 = bits, U32, 1036, [13:13] +unusedBit_11_14 = bits, U32, 1036, [14:14] +unusedBit_11_15 = bits, U32, 1036, [15:15] +unusedBit_11_16 = bits, U32, 1036, [16:16] +unusedBit_11_17 = bits, U32, 1036, [17:17] +unusedBit_11_18 = bits, U32, 1036, [18:18] +unusedBit_11_19 = bits, U32, 1036, [19:19] +unusedBit_11_20 = bits, U32, 1036, [20:20] +unusedBit_11_21 = bits, U32, 1036, [21:21] +unusedBit_11_22 = bits, U32, 1036, [22:22] +unusedBit_11_23 = bits, U32, 1036, [23:23] +unusedBit_11_24 = bits, U32, 1036, [24:24] +unusedBit_11_25 = bits, U32, 1036, [25:25] +unusedBit_11_26 = bits, U32, 1036, [26:26] +unusedBit_11_27 = bits, U32, 1036, [27:27] +unusedBit_11_28 = bits, U32, 1036, [28:28] +unusedBit_11_29 = bits, U32, 1036, [29:29] +unusedBit_11_30 = bits, U32, 1036, [30:30] +unusedBit_11_31 = bits, U32, 1036, [31:31] +fractionalInjFuel = scalar, F32, 1040, "", 1, 0 +accumulatedValue = scalar, F32, 1044, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1048, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1052, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1056, "", 1, 0 +cycleCnt = scalar, S32, 1060, "", 1, 0 +; total TS size = 1064 +hwEventCounters1 = scalar, S32, 1064, "", 1, 0 +hwEventCounters2 = scalar, S32, 1068, "", 1, 0 +hwEventCounters3 = scalar, S32, 1072, "", 1, 0 +hwEventCounters4 = scalar, S32, 1076, "", 1, 0 +hwEventCounters5 = scalar, S32, 1080, "", 1, 0 +hwEventCounters6 = scalar, S32, 1084, "", 1, 0 +vvtCamCounter = scalar, S32, 1088, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1092, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1096, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1100, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1101, "", 1, 0 +; total TS size = 1104 +totalRevolutionCounter = scalar, U32, 1104, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1108, "", 1, 0 +vvtCurrentPosition = scalar, F32, 1112, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1116, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 1120, "", 1, 0 +triggerStateIndex = scalar, U08, 1124, "", 1, 0 +vvtCounter = scalar, U08, 1125, "", 1, 0 +camResyncCounter = scalar, U08, 1126, "", 1, 0 +vvtStateIndex = scalar, U08, 1127, "", 1, 0 +; total TS size = 1128 +m_hasSynchronizedPhase = bits, U32, 1128, [0:0] +unusedBit_1_1 = bits, U32, 1128, [1:1] +unusedBit_1_2 = bits, U32, 1128, [2:2] +unusedBit_1_3 = bits, U32, 1128, [3:3] +unusedBit_1_4 = bits, U32, 1128, [4:4] +unusedBit_1_5 = bits, U32, 1128, [5:5] +unusedBit_1_6 = bits, U32, 1128, [6:6] +unusedBit_1_7 = bits, U32, 1128, [7:7] +unusedBit_1_8 = bits, U32, 1128, [8:8] +unusedBit_1_9 = bits, U32, 1128, [9:9] +unusedBit_1_10 = bits, U32, 1128, [10:10] +unusedBit_1_11 = bits, U32, 1128, [11:11] +unusedBit_1_12 = bits, U32, 1128, [12:12] +unusedBit_1_13 = bits, U32, 1128, [13:13] +unusedBit_1_14 = bits, U32, 1128, [14:14] +unusedBit_1_15 = bits, U32, 1128, [15:15] +unusedBit_1_16 = bits, U32, 1128, [16:16] +unusedBit_1_17 = bits, U32, 1128, [17:17] +unusedBit_1_18 = bits, U32, 1128, [18:18] +unusedBit_1_19 = bits, U32, 1128, [19:19] +unusedBit_1_20 = bits, U32, 1128, [20:20] +unusedBit_1_21 = bits, U32, 1128, [21:21] +unusedBit_1_22 = bits, U32, 1128, [22:22] +unusedBit_1_23 = bits, U32, 1128, [23:23] +unusedBit_1_24 = bits, U32, 1128, [24:24] +unusedBit_1_25 = bits, U32, 1128, [25:25] +unusedBit_1_26 = bits, U32, 1128, [26:26] +unusedBit_1_27 = bits, U32, 1128, [27:27] +unusedBit_1_28 = bits, U32, 1128, [28:28] +unusedBit_1_29 = bits, U32, 1128, [29:29] +unusedBit_1_30 = bits, U32, 1128, [30:30] +unusedBit_1_31 = bits, U32, 1128, [31:31] ; total TS size = 1132 -idleState = bits, S32, 1132, [0:2], "not important" -currentIdlePosition = scalar, F32, 1136 -baseIdlePosition = scalar, F32, 1140 -iacByTpsTaper = scalar, F32, 1144 -throttlePedalUpState = scalar, S32, 1148, "", 1, 0 -mightResetPid = bits, U32, 1152, [0:0] -shouldResetPid = bits, U32, 1152, [1:1] -wasResetPid = bits, U32, 1152, [2:2] -mustResetPid = bits, U32, 1152, [3:3] -isCoasting = bits, U32, 1152, [4:4] -useIacTableForCoasting = bits, U32, 1152, [5:5] -notIdling = bits, U32, 1152, [6:6] -needReset = bits, U32, 1152, [7:7] -isInDeadZone = bits, U32, 1152, [8:8] -isBlipping = bits, U32, 1152, [9:9] -useClosedLoop = bits, U32, 1152, [10:10] -badTps = bits, U32, 1152, [11:11] -looksLikeRunning = bits, U32, 1152, [12:12] -looksLikeCoasting = bits, U32, 1152, [13:13] -looksLikeCrankToIdle = bits, U32, 1152, [14:14] -useInstantRpmForIdle = bits, U32, 1152, [15:15] -isVerboseIAC = bits, U32, 1152, [16:16] -unusedBit_22_17 = bits, U32, 1152, [17:17] -unusedBit_22_18 = bits, U32, 1152, [18:18] -unusedBit_22_19 = bits, U32, 1152, [19:19] -unusedBit_22_20 = bits, U32, 1152, [20:20] -unusedBit_22_21 = bits, U32, 1152, [21:21] -unusedBit_22_22 = bits, U32, 1152, [22:22] -unusedBit_22_23 = bits, U32, 1152, [23:23] -unusedBit_22_24 = bits, U32, 1152, [24:24] -unusedBit_22_25 = bits, U32, 1152, [25:25] -unusedBit_22_26 = bits, U32, 1152, [26:26] -unusedBit_22_27 = bits, U32, 1152, [27:27] -unusedBit_22_28 = bits, U32, 1152, [28:28] -unusedBit_22_29 = bits, U32, 1152, [29:29] -unusedBit_22_30 = bits, U32, 1152, [30:30] -unusedBit_22_31 = bits, U32, 1152, [31:31] -targetRpmByClt = scalar, S32, 1156, "", 1, 0 -targetRpmAcBump = scalar, S32, 1160, "", 1, 0 -iacByRpmTaper = scalar, F32, 1164 -luaAdd = scalar, F32, 1168 -; total TS size = 1172 -baseDwell = scalar, F32, 1172, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 1176, "", 1, 0 -luaTimingAdd = scalar, F32, 1180, "", 1, 0 -luaTimingMult = scalar, F32, 1184, "", 1, 0 -; total TS size = 1188 -idlePosition = scalar, F32, 1188, "", 1, 0 -trim = scalar, F32, 1192, "", 1, 0 -luaAdjustment = scalar, F32, 1196, "", 1, 0 -etbFeedForward = scalar, F32, 1200 -etbIntegralError = scalar, F32, 1204, "", 1, 0 -etbCurrentTarget = scalar, F32, 1208, "%", 1, 0 -; total TS size = 1212 -faultCode = scalar, U08, 1212, "", 1, 0 -heaterDuty = scalar, U08, 1213, "%", 1, 0 -pumpDuty = scalar, U08, 1214, "%", 1, 0 -tempC = scalar, U16, 1216, "C", 1, 0 -nernstVoltage = scalar, U16, 1218, "V", 0.001, 0 -esr = scalar, U16, 1220, "", 1, 0 -; total TS size = 1224 +wallFuelCorrection = scalar, F32, 1132, "", 1, 0 +wallFuel = scalar, F32, 1136, "", 1, 0 +; total TS size = 1140 +idleState = bits, S32, 1140, [0:2], "not important" +currentIdlePosition = scalar, F32, 1144 +baseIdlePosition = scalar, F32, 1148 +iacByTpsTaper = scalar, F32, 1152 +throttlePedalUpState = scalar, S32, 1156, "", 1, 0 +mightResetPid = bits, U32, 1160, [0:0] +shouldResetPid = bits, U32, 1160, [1:1] +wasResetPid = bits, U32, 1160, [2:2] +mustResetPid = bits, U32, 1160, [3:3] +isCoasting = bits, U32, 1160, [4:4] +useIacTableForCoasting = bits, U32, 1160, [5:5] +notIdling = bits, U32, 1160, [6:6] +needReset = bits, U32, 1160, [7:7] +isInDeadZone = bits, U32, 1160, [8:8] +isBlipping = bits, U32, 1160, [9:9] +useClosedLoop = bits, U32, 1160, [10:10] +badTps = bits, U32, 1160, [11:11] +looksLikeRunning = bits, U32, 1160, [12:12] +looksLikeCoasting = bits, U32, 1160, [13:13] +looksLikeCrankToIdle = bits, U32, 1160, [14:14] +useInstantRpmForIdle = bits, U32, 1160, [15:15] +isVerboseIAC = bits, U32, 1160, [16:16] +unusedBit_22_17 = bits, U32, 1160, [17:17] +unusedBit_22_18 = bits, U32, 1160, [18:18] +unusedBit_22_19 = bits, U32, 1160, [19:19] +unusedBit_22_20 = bits, U32, 1160, [20:20] +unusedBit_22_21 = bits, U32, 1160, [21:21] +unusedBit_22_22 = bits, U32, 1160, [22:22] +unusedBit_22_23 = bits, U32, 1160, [23:23] +unusedBit_22_24 = bits, U32, 1160, [24:24] +unusedBit_22_25 = bits, U32, 1160, [25:25] +unusedBit_22_26 = bits, U32, 1160, [26:26] +unusedBit_22_27 = bits, U32, 1160, [27:27] +unusedBit_22_28 = bits, U32, 1160, [28:28] +unusedBit_22_29 = bits, U32, 1160, [29:29] +unusedBit_22_30 = bits, U32, 1160, [30:30] +unusedBit_22_31 = bits, U32, 1160, [31:31] +targetRpmByClt = scalar, S32, 1164, "", 1, 0 +targetRpmAcBump = scalar, S32, 1168, "", 1, 0 +iacByRpmTaper = scalar, F32, 1172 +luaAdd = scalar, F32, 1176 +; total TS size = 1180 +baseDwell = scalar, F32, 1180, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 1184, "", 1, 0 +luaTimingAdd = scalar, F32, 1188, "", 1, 0 +luaTimingMult = scalar, F32, 1192, "", 1, 0 +; total TS size = 1196 +idlePosition = scalar, F32, 1196, "", 1, 0 +trim = scalar, F32, 1200, "", 1, 0 +luaAdjustment = scalar, F32, 1204, "", 1, 0 +etbFeedForward = scalar, F32, 1208 +etbIntegralError = scalar, F32, 1212, "", 1, 0 +etbCurrentTarget = scalar, F32, 1216, "%", 1, 0 +; total TS size = 1220 +faultCode = scalar, U08, 1220, "", 1, 0 +heaterDuty = scalar, U08, 1221, "%", 1, 0 +pumpDuty = scalar, U08, 1222, "%", 1, 0 +tempC = scalar, U16, 1224, "C", 1, 0 +nernstVoltage = scalar, U16, 1226, "V", 0.001, 0 +esr = scalar, U16, 1228, "", 1, 0 +; total TS size = 1232 time = { timeNow } @@ -4757,6 +4759,8 @@ entry = brakePedalState, "brake: down", int, "%d" entry = egt1, "egt1", float, "%.3f" entry = egt2, "egt2", float, "%.3f" entry = desiredRpmLimit, "User-defined RPM hard limit", int, "%d" +entry = fuelInjectionCounter, "fuelInjectionCounter", int, "%d" +entry = sparkCounter, "sparkCounter", int, "%d" entry = tpsFrom, "tpsFrom", float, "%.3f" entry = tpsTo, "tpsTo", float, "%.3f" entry = deltaTps, "deltaTps", float, "%.3f" @@ -5499,6 +5503,8 @@ dialog = engine_stateDialog, "engine_state" graphLine = egt2 liveGraph = engine_state_10_Graph, "Graph", South graphLine = desiredRpmLimit + graphLine = fuelInjectionCounter + graphLine = sparkCounter indicatorPanel = tps_accel_stateIndicatorPanel, 2 indicator = {isAboveAccelThreshold}, "isAboveAccelThreshold No", "isAboveAccelThreshold Yes" diff --git a/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini b/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini index 73a5c75a9d..f97c11b7ce 100644 --- a/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini +++ b/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.08.25.alphax-2chan.1075336818" + signature = "rusEFI 2022.08.25.alphax-2chan.2959131142" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.08.25.alphax-2chan.1075336818" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.08.25.alphax-2chan.2959131142" ; 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 @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Aug 25 14:51:15 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Aug 25 22:50:02 UTC 2022 pageSize = 21300 page = 1 @@ -2109,7 +2109,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1224 + ochBlockSize = 1232 ; ; see TunerStudioOutputChannels struct @@ -3022,170 +3022,172 @@ unusedBit_22_31 = bits, U32, 992, [31:31] egt1 = scalar, F32, 996, "", 1, 0 egt2 = scalar, F32, 1000, "", 1, 0 desiredRpmLimit = scalar, S16, 1004, "rpm", 1, 0 -; total TS size = 1008 -tpsFrom = scalar, F32, 1008 -tpsTo = scalar, F32, 1012 -deltaTps = scalar, F32, 1016 -extraFuel = scalar, F32, 1020, "", 1, 0 -valueFromTable = scalar, F32, 1024, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1028, [0:0] -isBelowDecelThreshold = bits, U32, 1028, [1:1] -isTimeToResetAccumulator = bits, U32, 1028, [2:2] -isFractionalEnrichment = bits, U32, 1028, [3:3] -belowEpsilon = bits, U32, 1028, [4:4] -tooShort = bits, U32, 1028, [5:5] -unusedBit_11_6 = bits, U32, 1028, [6:6] -unusedBit_11_7 = bits, U32, 1028, [7:7] -unusedBit_11_8 = bits, U32, 1028, [8:8] -unusedBit_11_9 = bits, U32, 1028, [9:9] -unusedBit_11_10 = bits, U32, 1028, [10:10] -unusedBit_11_11 = bits, U32, 1028, [11:11] -unusedBit_11_12 = bits, U32, 1028, [12:12] -unusedBit_11_13 = bits, U32, 1028, [13:13] -unusedBit_11_14 = bits, U32, 1028, [14:14] -unusedBit_11_15 = bits, U32, 1028, [15:15] -unusedBit_11_16 = bits, U32, 1028, [16:16] -unusedBit_11_17 = bits, U32, 1028, [17:17] -unusedBit_11_18 = bits, U32, 1028, [18:18] -unusedBit_11_19 = bits, U32, 1028, [19:19] -unusedBit_11_20 = bits, U32, 1028, [20:20] -unusedBit_11_21 = bits, U32, 1028, [21:21] -unusedBit_11_22 = bits, U32, 1028, [22:22] -unusedBit_11_23 = bits, U32, 1028, [23:23] -unusedBit_11_24 = bits, U32, 1028, [24:24] -unusedBit_11_25 = bits, U32, 1028, [25:25] -unusedBit_11_26 = bits, U32, 1028, [26:26] -unusedBit_11_27 = bits, U32, 1028, [27:27] -unusedBit_11_28 = bits, U32, 1028, [28:28] -unusedBit_11_29 = bits, U32, 1028, [29:29] -unusedBit_11_30 = bits, U32, 1028, [30:30] -unusedBit_11_31 = bits, U32, 1028, [31:31] -fractionalInjFuel = scalar, F32, 1032, "", 1, 0 -accumulatedValue = scalar, F32, 1036, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1040, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1044, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1048, "", 1, 0 -cycleCnt = scalar, S32, 1052, "", 1, 0 -; total TS size = 1056 -hwEventCounters1 = scalar, S32, 1056, "", 1, 0 -hwEventCounters2 = scalar, S32, 1060, "", 1, 0 -hwEventCounters3 = scalar, S32, 1064, "", 1, 0 -hwEventCounters4 = scalar, S32, 1068, "", 1, 0 -hwEventCounters5 = scalar, S32, 1072, "", 1, 0 -hwEventCounters6 = scalar, S32, 1076, "", 1, 0 -vvtCamCounter = scalar, S32, 1080, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1084, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1088, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1092, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1093, "", 1, 0 -; total TS size = 1096 -totalRevolutionCounter = scalar, U32, 1096, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1100, "", 1, 0 -vvtCurrentPosition = scalar, F32, 1104, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1108, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 1112, "", 1, 0 -triggerStateIndex = scalar, U08, 1116, "", 1, 0 -vvtCounter = scalar, U08, 1117, "", 1, 0 -camResyncCounter = scalar, U08, 1118, "", 1, 0 -vvtStateIndex = scalar, U08, 1119, "", 1, 0 -; total TS size = 1120 -m_hasSynchronizedPhase = bits, U32, 1120, [0:0] -unusedBit_1_1 = bits, U32, 1120, [1:1] -unusedBit_1_2 = bits, U32, 1120, [2:2] -unusedBit_1_3 = bits, U32, 1120, [3:3] -unusedBit_1_4 = bits, U32, 1120, [4:4] -unusedBit_1_5 = bits, U32, 1120, [5:5] -unusedBit_1_6 = bits, U32, 1120, [6:6] -unusedBit_1_7 = bits, U32, 1120, [7:7] -unusedBit_1_8 = bits, U32, 1120, [8:8] -unusedBit_1_9 = bits, U32, 1120, [9:9] -unusedBit_1_10 = bits, U32, 1120, [10:10] -unusedBit_1_11 = bits, U32, 1120, [11:11] -unusedBit_1_12 = bits, U32, 1120, [12:12] -unusedBit_1_13 = bits, U32, 1120, [13:13] -unusedBit_1_14 = bits, U32, 1120, [14:14] -unusedBit_1_15 = bits, U32, 1120, [15:15] -unusedBit_1_16 = bits, U32, 1120, [16:16] -unusedBit_1_17 = bits, U32, 1120, [17:17] -unusedBit_1_18 = bits, U32, 1120, [18:18] -unusedBit_1_19 = bits, U32, 1120, [19:19] -unusedBit_1_20 = bits, U32, 1120, [20:20] -unusedBit_1_21 = bits, U32, 1120, [21:21] -unusedBit_1_22 = bits, U32, 1120, [22:22] -unusedBit_1_23 = bits, U32, 1120, [23:23] -unusedBit_1_24 = bits, U32, 1120, [24:24] -unusedBit_1_25 = bits, U32, 1120, [25:25] -unusedBit_1_26 = bits, U32, 1120, [26:26] -unusedBit_1_27 = bits, U32, 1120, [27:27] -unusedBit_1_28 = bits, U32, 1120, [28:28] -unusedBit_1_29 = bits, U32, 1120, [29:29] -unusedBit_1_30 = bits, U32, 1120, [30:30] -unusedBit_1_31 = bits, U32, 1120, [31:31] -; total TS size = 1124 -wallFuelCorrection = scalar, F32, 1124, "", 1, 0 -wallFuel = scalar, F32, 1128, "", 1, 0 +fuelInjectionCounter = scalar, S32, 1008, "", 1, 0 +sparkCounter = scalar, S32, 1012, "", 1, 0 +; total TS size = 1016 +tpsFrom = scalar, F32, 1016 +tpsTo = scalar, F32, 1020 +deltaTps = scalar, F32, 1024 +extraFuel = scalar, F32, 1028, "", 1, 0 +valueFromTable = scalar, F32, 1032, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1036, [0:0] +isBelowDecelThreshold = bits, U32, 1036, [1:1] +isTimeToResetAccumulator = bits, U32, 1036, [2:2] +isFractionalEnrichment = bits, U32, 1036, [3:3] +belowEpsilon = bits, U32, 1036, [4:4] +tooShort = bits, U32, 1036, [5:5] +unusedBit_11_6 = bits, U32, 1036, [6:6] +unusedBit_11_7 = bits, U32, 1036, [7:7] +unusedBit_11_8 = bits, U32, 1036, [8:8] +unusedBit_11_9 = bits, U32, 1036, [9:9] +unusedBit_11_10 = bits, U32, 1036, [10:10] +unusedBit_11_11 = bits, U32, 1036, [11:11] +unusedBit_11_12 = bits, U32, 1036, [12:12] +unusedBit_11_13 = bits, U32, 1036, [13:13] +unusedBit_11_14 = bits, U32, 1036, [14:14] +unusedBit_11_15 = bits, U32, 1036, [15:15] +unusedBit_11_16 = bits, U32, 1036, [16:16] +unusedBit_11_17 = bits, U32, 1036, [17:17] +unusedBit_11_18 = bits, U32, 1036, [18:18] +unusedBit_11_19 = bits, U32, 1036, [19:19] +unusedBit_11_20 = bits, U32, 1036, [20:20] +unusedBit_11_21 = bits, U32, 1036, [21:21] +unusedBit_11_22 = bits, U32, 1036, [22:22] +unusedBit_11_23 = bits, U32, 1036, [23:23] +unusedBit_11_24 = bits, U32, 1036, [24:24] +unusedBit_11_25 = bits, U32, 1036, [25:25] +unusedBit_11_26 = bits, U32, 1036, [26:26] +unusedBit_11_27 = bits, U32, 1036, [27:27] +unusedBit_11_28 = bits, U32, 1036, [28:28] +unusedBit_11_29 = bits, U32, 1036, [29:29] +unusedBit_11_30 = bits, U32, 1036, [30:30] +unusedBit_11_31 = bits, U32, 1036, [31:31] +fractionalInjFuel = scalar, F32, 1040, "", 1, 0 +accumulatedValue = scalar, F32, 1044, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1048, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1052, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1056, "", 1, 0 +cycleCnt = scalar, S32, 1060, "", 1, 0 +; total TS size = 1064 +hwEventCounters1 = scalar, S32, 1064, "", 1, 0 +hwEventCounters2 = scalar, S32, 1068, "", 1, 0 +hwEventCounters3 = scalar, S32, 1072, "", 1, 0 +hwEventCounters4 = scalar, S32, 1076, "", 1, 0 +hwEventCounters5 = scalar, S32, 1080, "", 1, 0 +hwEventCounters6 = scalar, S32, 1084, "", 1, 0 +vvtCamCounter = scalar, S32, 1088, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1092, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1096, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1100, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1101, "", 1, 0 +; total TS size = 1104 +totalRevolutionCounter = scalar, U32, 1104, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1108, "", 1, 0 +vvtCurrentPosition = scalar, F32, 1112, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1116, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 1120, "", 1, 0 +triggerStateIndex = scalar, U08, 1124, "", 1, 0 +vvtCounter = scalar, U08, 1125, "", 1, 0 +camResyncCounter = scalar, U08, 1126, "", 1, 0 +vvtStateIndex = scalar, U08, 1127, "", 1, 0 +; total TS size = 1128 +m_hasSynchronizedPhase = bits, U32, 1128, [0:0] +unusedBit_1_1 = bits, U32, 1128, [1:1] +unusedBit_1_2 = bits, U32, 1128, [2:2] +unusedBit_1_3 = bits, U32, 1128, [3:3] +unusedBit_1_4 = bits, U32, 1128, [4:4] +unusedBit_1_5 = bits, U32, 1128, [5:5] +unusedBit_1_6 = bits, U32, 1128, [6:6] +unusedBit_1_7 = bits, U32, 1128, [7:7] +unusedBit_1_8 = bits, U32, 1128, [8:8] +unusedBit_1_9 = bits, U32, 1128, [9:9] +unusedBit_1_10 = bits, U32, 1128, [10:10] +unusedBit_1_11 = bits, U32, 1128, [11:11] +unusedBit_1_12 = bits, U32, 1128, [12:12] +unusedBit_1_13 = bits, U32, 1128, [13:13] +unusedBit_1_14 = bits, U32, 1128, [14:14] +unusedBit_1_15 = bits, U32, 1128, [15:15] +unusedBit_1_16 = bits, U32, 1128, [16:16] +unusedBit_1_17 = bits, U32, 1128, [17:17] +unusedBit_1_18 = bits, U32, 1128, [18:18] +unusedBit_1_19 = bits, U32, 1128, [19:19] +unusedBit_1_20 = bits, U32, 1128, [20:20] +unusedBit_1_21 = bits, U32, 1128, [21:21] +unusedBit_1_22 = bits, U32, 1128, [22:22] +unusedBit_1_23 = bits, U32, 1128, [23:23] +unusedBit_1_24 = bits, U32, 1128, [24:24] +unusedBit_1_25 = bits, U32, 1128, [25:25] +unusedBit_1_26 = bits, U32, 1128, [26:26] +unusedBit_1_27 = bits, U32, 1128, [27:27] +unusedBit_1_28 = bits, U32, 1128, [28:28] +unusedBit_1_29 = bits, U32, 1128, [29:29] +unusedBit_1_30 = bits, U32, 1128, [30:30] +unusedBit_1_31 = bits, U32, 1128, [31:31] ; total TS size = 1132 -idleState = bits, S32, 1132, [0:2], "not important" -currentIdlePosition = scalar, F32, 1136 -baseIdlePosition = scalar, F32, 1140 -iacByTpsTaper = scalar, F32, 1144 -throttlePedalUpState = scalar, S32, 1148, "", 1, 0 -mightResetPid = bits, U32, 1152, [0:0] -shouldResetPid = bits, U32, 1152, [1:1] -wasResetPid = bits, U32, 1152, [2:2] -mustResetPid = bits, U32, 1152, [3:3] -isCoasting = bits, U32, 1152, [4:4] -useIacTableForCoasting = bits, U32, 1152, [5:5] -notIdling = bits, U32, 1152, [6:6] -needReset = bits, U32, 1152, [7:7] -isInDeadZone = bits, U32, 1152, [8:8] -isBlipping = bits, U32, 1152, [9:9] -useClosedLoop = bits, U32, 1152, [10:10] -badTps = bits, U32, 1152, [11:11] -looksLikeRunning = bits, U32, 1152, [12:12] -looksLikeCoasting = bits, U32, 1152, [13:13] -looksLikeCrankToIdle = bits, U32, 1152, [14:14] -useInstantRpmForIdle = bits, U32, 1152, [15:15] -isVerboseIAC = bits, U32, 1152, [16:16] -unusedBit_22_17 = bits, U32, 1152, [17:17] -unusedBit_22_18 = bits, U32, 1152, [18:18] -unusedBit_22_19 = bits, U32, 1152, [19:19] -unusedBit_22_20 = bits, U32, 1152, [20:20] -unusedBit_22_21 = bits, U32, 1152, [21:21] -unusedBit_22_22 = bits, U32, 1152, [22:22] -unusedBit_22_23 = bits, U32, 1152, [23:23] -unusedBit_22_24 = bits, U32, 1152, [24:24] -unusedBit_22_25 = bits, U32, 1152, [25:25] -unusedBit_22_26 = bits, U32, 1152, [26:26] -unusedBit_22_27 = bits, U32, 1152, [27:27] -unusedBit_22_28 = bits, U32, 1152, [28:28] -unusedBit_22_29 = bits, U32, 1152, [29:29] -unusedBit_22_30 = bits, U32, 1152, [30:30] -unusedBit_22_31 = bits, U32, 1152, [31:31] -targetRpmByClt = scalar, S32, 1156, "", 1, 0 -targetRpmAcBump = scalar, S32, 1160, "", 1, 0 -iacByRpmTaper = scalar, F32, 1164 -luaAdd = scalar, F32, 1168 -; total TS size = 1172 -baseDwell = scalar, F32, 1172, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 1176, "", 1, 0 -luaTimingAdd = scalar, F32, 1180, "", 1, 0 -luaTimingMult = scalar, F32, 1184, "", 1, 0 -; total TS size = 1188 -idlePosition = scalar, F32, 1188, "", 1, 0 -trim = scalar, F32, 1192, "", 1, 0 -luaAdjustment = scalar, F32, 1196, "", 1, 0 -etbFeedForward = scalar, F32, 1200 -etbIntegralError = scalar, F32, 1204, "", 1, 0 -etbCurrentTarget = scalar, F32, 1208, "%", 1, 0 -; total TS size = 1212 -faultCode = scalar, U08, 1212, "", 1, 0 -heaterDuty = scalar, U08, 1213, "%", 1, 0 -pumpDuty = scalar, U08, 1214, "%", 1, 0 -tempC = scalar, U16, 1216, "C", 1, 0 -nernstVoltage = scalar, U16, 1218, "V", 0.001, 0 -esr = scalar, U16, 1220, "", 1, 0 -; total TS size = 1224 +wallFuelCorrection = scalar, F32, 1132, "", 1, 0 +wallFuel = scalar, F32, 1136, "", 1, 0 +; total TS size = 1140 +idleState = bits, S32, 1140, [0:2], "not important" +currentIdlePosition = scalar, F32, 1144 +baseIdlePosition = scalar, F32, 1148 +iacByTpsTaper = scalar, F32, 1152 +throttlePedalUpState = scalar, S32, 1156, "", 1, 0 +mightResetPid = bits, U32, 1160, [0:0] +shouldResetPid = bits, U32, 1160, [1:1] +wasResetPid = bits, U32, 1160, [2:2] +mustResetPid = bits, U32, 1160, [3:3] +isCoasting = bits, U32, 1160, [4:4] +useIacTableForCoasting = bits, U32, 1160, [5:5] +notIdling = bits, U32, 1160, [6:6] +needReset = bits, U32, 1160, [7:7] +isInDeadZone = bits, U32, 1160, [8:8] +isBlipping = bits, U32, 1160, [9:9] +useClosedLoop = bits, U32, 1160, [10:10] +badTps = bits, U32, 1160, [11:11] +looksLikeRunning = bits, U32, 1160, [12:12] +looksLikeCoasting = bits, U32, 1160, [13:13] +looksLikeCrankToIdle = bits, U32, 1160, [14:14] +useInstantRpmForIdle = bits, U32, 1160, [15:15] +isVerboseIAC = bits, U32, 1160, [16:16] +unusedBit_22_17 = bits, U32, 1160, [17:17] +unusedBit_22_18 = bits, U32, 1160, [18:18] +unusedBit_22_19 = bits, U32, 1160, [19:19] +unusedBit_22_20 = bits, U32, 1160, [20:20] +unusedBit_22_21 = bits, U32, 1160, [21:21] +unusedBit_22_22 = bits, U32, 1160, [22:22] +unusedBit_22_23 = bits, U32, 1160, [23:23] +unusedBit_22_24 = bits, U32, 1160, [24:24] +unusedBit_22_25 = bits, U32, 1160, [25:25] +unusedBit_22_26 = bits, U32, 1160, [26:26] +unusedBit_22_27 = bits, U32, 1160, [27:27] +unusedBit_22_28 = bits, U32, 1160, [28:28] +unusedBit_22_29 = bits, U32, 1160, [29:29] +unusedBit_22_30 = bits, U32, 1160, [30:30] +unusedBit_22_31 = bits, U32, 1160, [31:31] +targetRpmByClt = scalar, S32, 1164, "", 1, 0 +targetRpmAcBump = scalar, S32, 1168, "", 1, 0 +iacByRpmTaper = scalar, F32, 1172 +luaAdd = scalar, F32, 1176 +; total TS size = 1180 +baseDwell = scalar, F32, 1180, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 1184, "", 1, 0 +luaTimingAdd = scalar, F32, 1188, "", 1, 0 +luaTimingMult = scalar, F32, 1192, "", 1, 0 +; total TS size = 1196 +idlePosition = scalar, F32, 1196, "", 1, 0 +trim = scalar, F32, 1200, "", 1, 0 +luaAdjustment = scalar, F32, 1204, "", 1, 0 +etbFeedForward = scalar, F32, 1208 +etbIntegralError = scalar, F32, 1212, "", 1, 0 +etbCurrentTarget = scalar, F32, 1216, "%", 1, 0 +; total TS size = 1220 +faultCode = scalar, U08, 1220, "", 1, 0 +heaterDuty = scalar, U08, 1221, "%", 1, 0 +pumpDuty = scalar, U08, 1222, "%", 1, 0 +tempC = scalar, U16, 1224, "C", 1, 0 +nernstVoltage = scalar, U16, 1226, "V", 0.001, 0 +esr = scalar, U16, 1228, "", 1, 0 +; total TS size = 1232 time = { timeNow } @@ -4757,6 +4759,8 @@ entry = brakePedalState, "brake: down", int, "%d" entry = egt1, "egt1", float, "%.3f" entry = egt2, "egt2", float, "%.3f" entry = desiredRpmLimit, "User-defined RPM hard limit", int, "%d" +entry = fuelInjectionCounter, "fuelInjectionCounter", int, "%d" +entry = sparkCounter, "sparkCounter", int, "%d" entry = tpsFrom, "tpsFrom", float, "%.3f" entry = tpsTo, "tpsTo", float, "%.3f" entry = deltaTps, "deltaTps", float, "%.3f" @@ -5496,6 +5500,8 @@ dialog = engine_stateDialog, "engine_state" graphLine = egt2 liveGraph = engine_state_10_Graph, "Graph", South graphLine = desiredRpmLimit + graphLine = fuelInjectionCounter + graphLine = sparkCounter indicatorPanel = tps_accel_stateIndicatorPanel, 2 indicator = {isAboveAccelThreshold}, "isAboveAccelThreshold No", "isAboveAccelThreshold Yes" diff --git a/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini b/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini index 35834ca098..5153aaef90 100644 --- a/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini +++ b/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.08.25.alphax-4chan.4178970769" + signature = "rusEFI 2022.08.25.alphax-4chan.158244069" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.08.25.alphax-4chan.4178970769" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.08.25.alphax-4chan.158244069" ; 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 @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Aug 25 14:51:17 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Aug 25 22:50:04 UTC 2022 pageSize = 21300 page = 1 @@ -2109,7 +2109,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1224 + ochBlockSize = 1232 ; ; see TunerStudioOutputChannels struct @@ -3022,170 +3022,172 @@ unusedBit_22_31 = bits, U32, 992, [31:31] egt1 = scalar, F32, 996, "", 1, 0 egt2 = scalar, F32, 1000, "", 1, 0 desiredRpmLimit = scalar, S16, 1004, "rpm", 1, 0 -; total TS size = 1008 -tpsFrom = scalar, F32, 1008 -tpsTo = scalar, F32, 1012 -deltaTps = scalar, F32, 1016 -extraFuel = scalar, F32, 1020, "", 1, 0 -valueFromTable = scalar, F32, 1024, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1028, [0:0] -isBelowDecelThreshold = bits, U32, 1028, [1:1] -isTimeToResetAccumulator = bits, U32, 1028, [2:2] -isFractionalEnrichment = bits, U32, 1028, [3:3] -belowEpsilon = bits, U32, 1028, [4:4] -tooShort = bits, U32, 1028, [5:5] -unusedBit_11_6 = bits, U32, 1028, [6:6] -unusedBit_11_7 = bits, U32, 1028, [7:7] -unusedBit_11_8 = bits, U32, 1028, [8:8] -unusedBit_11_9 = bits, U32, 1028, [9:9] -unusedBit_11_10 = bits, U32, 1028, [10:10] -unusedBit_11_11 = bits, U32, 1028, [11:11] -unusedBit_11_12 = bits, U32, 1028, [12:12] -unusedBit_11_13 = bits, U32, 1028, [13:13] -unusedBit_11_14 = bits, U32, 1028, [14:14] -unusedBit_11_15 = bits, U32, 1028, [15:15] -unusedBit_11_16 = bits, U32, 1028, [16:16] -unusedBit_11_17 = bits, U32, 1028, [17:17] -unusedBit_11_18 = bits, U32, 1028, [18:18] -unusedBit_11_19 = bits, U32, 1028, [19:19] -unusedBit_11_20 = bits, U32, 1028, [20:20] -unusedBit_11_21 = bits, U32, 1028, [21:21] -unusedBit_11_22 = bits, U32, 1028, [22:22] -unusedBit_11_23 = bits, U32, 1028, [23:23] -unusedBit_11_24 = bits, U32, 1028, [24:24] -unusedBit_11_25 = bits, U32, 1028, [25:25] -unusedBit_11_26 = bits, U32, 1028, [26:26] -unusedBit_11_27 = bits, U32, 1028, [27:27] -unusedBit_11_28 = bits, U32, 1028, [28:28] -unusedBit_11_29 = bits, U32, 1028, [29:29] -unusedBit_11_30 = bits, U32, 1028, [30:30] -unusedBit_11_31 = bits, U32, 1028, [31:31] -fractionalInjFuel = scalar, F32, 1032, "", 1, 0 -accumulatedValue = scalar, F32, 1036, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1040, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1044, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1048, "", 1, 0 -cycleCnt = scalar, S32, 1052, "", 1, 0 -; total TS size = 1056 -hwEventCounters1 = scalar, S32, 1056, "", 1, 0 -hwEventCounters2 = scalar, S32, 1060, "", 1, 0 -hwEventCounters3 = scalar, S32, 1064, "", 1, 0 -hwEventCounters4 = scalar, S32, 1068, "", 1, 0 -hwEventCounters5 = scalar, S32, 1072, "", 1, 0 -hwEventCounters6 = scalar, S32, 1076, "", 1, 0 -vvtCamCounter = scalar, S32, 1080, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1084, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1088, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1092, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1093, "", 1, 0 -; total TS size = 1096 -totalRevolutionCounter = scalar, U32, 1096, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1100, "", 1, 0 -vvtCurrentPosition = scalar, F32, 1104, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1108, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 1112, "", 1, 0 -triggerStateIndex = scalar, U08, 1116, "", 1, 0 -vvtCounter = scalar, U08, 1117, "", 1, 0 -camResyncCounter = scalar, U08, 1118, "", 1, 0 -vvtStateIndex = scalar, U08, 1119, "", 1, 0 -; total TS size = 1120 -m_hasSynchronizedPhase = bits, U32, 1120, [0:0] -unusedBit_1_1 = bits, U32, 1120, [1:1] -unusedBit_1_2 = bits, U32, 1120, [2:2] -unusedBit_1_3 = bits, U32, 1120, [3:3] -unusedBit_1_4 = bits, U32, 1120, [4:4] -unusedBit_1_5 = bits, U32, 1120, [5:5] -unusedBit_1_6 = bits, U32, 1120, [6:6] -unusedBit_1_7 = bits, U32, 1120, [7:7] -unusedBit_1_8 = bits, U32, 1120, [8:8] -unusedBit_1_9 = bits, U32, 1120, [9:9] -unusedBit_1_10 = bits, U32, 1120, [10:10] -unusedBit_1_11 = bits, U32, 1120, [11:11] -unusedBit_1_12 = bits, U32, 1120, [12:12] -unusedBit_1_13 = bits, U32, 1120, [13:13] -unusedBit_1_14 = bits, U32, 1120, [14:14] -unusedBit_1_15 = bits, U32, 1120, [15:15] -unusedBit_1_16 = bits, U32, 1120, [16:16] -unusedBit_1_17 = bits, U32, 1120, [17:17] -unusedBit_1_18 = bits, U32, 1120, [18:18] -unusedBit_1_19 = bits, U32, 1120, [19:19] -unusedBit_1_20 = bits, U32, 1120, [20:20] -unusedBit_1_21 = bits, U32, 1120, [21:21] -unusedBit_1_22 = bits, U32, 1120, [22:22] -unusedBit_1_23 = bits, U32, 1120, [23:23] -unusedBit_1_24 = bits, U32, 1120, [24:24] -unusedBit_1_25 = bits, U32, 1120, [25:25] -unusedBit_1_26 = bits, U32, 1120, [26:26] -unusedBit_1_27 = bits, U32, 1120, [27:27] -unusedBit_1_28 = bits, U32, 1120, [28:28] -unusedBit_1_29 = bits, U32, 1120, [29:29] -unusedBit_1_30 = bits, U32, 1120, [30:30] -unusedBit_1_31 = bits, U32, 1120, [31:31] -; total TS size = 1124 -wallFuelCorrection = scalar, F32, 1124, "", 1, 0 -wallFuel = scalar, F32, 1128, "", 1, 0 +fuelInjectionCounter = scalar, S32, 1008, "", 1, 0 +sparkCounter = scalar, S32, 1012, "", 1, 0 +; total TS size = 1016 +tpsFrom = scalar, F32, 1016 +tpsTo = scalar, F32, 1020 +deltaTps = scalar, F32, 1024 +extraFuel = scalar, F32, 1028, "", 1, 0 +valueFromTable = scalar, F32, 1032, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1036, [0:0] +isBelowDecelThreshold = bits, U32, 1036, [1:1] +isTimeToResetAccumulator = bits, U32, 1036, [2:2] +isFractionalEnrichment = bits, U32, 1036, [3:3] +belowEpsilon = bits, U32, 1036, [4:4] +tooShort = bits, U32, 1036, [5:5] +unusedBit_11_6 = bits, U32, 1036, [6:6] +unusedBit_11_7 = bits, U32, 1036, [7:7] +unusedBit_11_8 = bits, U32, 1036, [8:8] +unusedBit_11_9 = bits, U32, 1036, [9:9] +unusedBit_11_10 = bits, U32, 1036, [10:10] +unusedBit_11_11 = bits, U32, 1036, [11:11] +unusedBit_11_12 = bits, U32, 1036, [12:12] +unusedBit_11_13 = bits, U32, 1036, [13:13] +unusedBit_11_14 = bits, U32, 1036, [14:14] +unusedBit_11_15 = bits, U32, 1036, [15:15] +unusedBit_11_16 = bits, U32, 1036, [16:16] +unusedBit_11_17 = bits, U32, 1036, [17:17] +unusedBit_11_18 = bits, U32, 1036, [18:18] +unusedBit_11_19 = bits, U32, 1036, [19:19] +unusedBit_11_20 = bits, U32, 1036, [20:20] +unusedBit_11_21 = bits, U32, 1036, [21:21] +unusedBit_11_22 = bits, U32, 1036, [22:22] +unusedBit_11_23 = bits, U32, 1036, [23:23] +unusedBit_11_24 = bits, U32, 1036, [24:24] +unusedBit_11_25 = bits, U32, 1036, [25:25] +unusedBit_11_26 = bits, U32, 1036, [26:26] +unusedBit_11_27 = bits, U32, 1036, [27:27] +unusedBit_11_28 = bits, U32, 1036, [28:28] +unusedBit_11_29 = bits, U32, 1036, [29:29] +unusedBit_11_30 = bits, U32, 1036, [30:30] +unusedBit_11_31 = bits, U32, 1036, [31:31] +fractionalInjFuel = scalar, F32, 1040, "", 1, 0 +accumulatedValue = scalar, F32, 1044, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1048, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1052, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1056, "", 1, 0 +cycleCnt = scalar, S32, 1060, "", 1, 0 +; total TS size = 1064 +hwEventCounters1 = scalar, S32, 1064, "", 1, 0 +hwEventCounters2 = scalar, S32, 1068, "", 1, 0 +hwEventCounters3 = scalar, S32, 1072, "", 1, 0 +hwEventCounters4 = scalar, S32, 1076, "", 1, 0 +hwEventCounters5 = scalar, S32, 1080, "", 1, 0 +hwEventCounters6 = scalar, S32, 1084, "", 1, 0 +vvtCamCounter = scalar, S32, 1088, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1092, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1096, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1100, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1101, "", 1, 0 +; total TS size = 1104 +totalRevolutionCounter = scalar, U32, 1104, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1108, "", 1, 0 +vvtCurrentPosition = scalar, F32, 1112, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1116, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 1120, "", 1, 0 +triggerStateIndex = scalar, U08, 1124, "", 1, 0 +vvtCounter = scalar, U08, 1125, "", 1, 0 +camResyncCounter = scalar, U08, 1126, "", 1, 0 +vvtStateIndex = scalar, U08, 1127, "", 1, 0 +; total TS size = 1128 +m_hasSynchronizedPhase = bits, U32, 1128, [0:0] +unusedBit_1_1 = bits, U32, 1128, [1:1] +unusedBit_1_2 = bits, U32, 1128, [2:2] +unusedBit_1_3 = bits, U32, 1128, [3:3] +unusedBit_1_4 = bits, U32, 1128, [4:4] +unusedBit_1_5 = bits, U32, 1128, [5:5] +unusedBit_1_6 = bits, U32, 1128, [6:6] +unusedBit_1_7 = bits, U32, 1128, [7:7] +unusedBit_1_8 = bits, U32, 1128, [8:8] +unusedBit_1_9 = bits, U32, 1128, [9:9] +unusedBit_1_10 = bits, U32, 1128, [10:10] +unusedBit_1_11 = bits, U32, 1128, [11:11] +unusedBit_1_12 = bits, U32, 1128, [12:12] +unusedBit_1_13 = bits, U32, 1128, [13:13] +unusedBit_1_14 = bits, U32, 1128, [14:14] +unusedBit_1_15 = bits, U32, 1128, [15:15] +unusedBit_1_16 = bits, U32, 1128, [16:16] +unusedBit_1_17 = bits, U32, 1128, [17:17] +unusedBit_1_18 = bits, U32, 1128, [18:18] +unusedBit_1_19 = bits, U32, 1128, [19:19] +unusedBit_1_20 = bits, U32, 1128, [20:20] +unusedBit_1_21 = bits, U32, 1128, [21:21] +unusedBit_1_22 = bits, U32, 1128, [22:22] +unusedBit_1_23 = bits, U32, 1128, [23:23] +unusedBit_1_24 = bits, U32, 1128, [24:24] +unusedBit_1_25 = bits, U32, 1128, [25:25] +unusedBit_1_26 = bits, U32, 1128, [26:26] +unusedBit_1_27 = bits, U32, 1128, [27:27] +unusedBit_1_28 = bits, U32, 1128, [28:28] +unusedBit_1_29 = bits, U32, 1128, [29:29] +unusedBit_1_30 = bits, U32, 1128, [30:30] +unusedBit_1_31 = bits, U32, 1128, [31:31] ; total TS size = 1132 -idleState = bits, S32, 1132, [0:2], "not important" -currentIdlePosition = scalar, F32, 1136 -baseIdlePosition = scalar, F32, 1140 -iacByTpsTaper = scalar, F32, 1144 -throttlePedalUpState = scalar, S32, 1148, "", 1, 0 -mightResetPid = bits, U32, 1152, [0:0] -shouldResetPid = bits, U32, 1152, [1:1] -wasResetPid = bits, U32, 1152, [2:2] -mustResetPid = bits, U32, 1152, [3:3] -isCoasting = bits, U32, 1152, [4:4] -useIacTableForCoasting = bits, U32, 1152, [5:5] -notIdling = bits, U32, 1152, [6:6] -needReset = bits, U32, 1152, [7:7] -isInDeadZone = bits, U32, 1152, [8:8] -isBlipping = bits, U32, 1152, [9:9] -useClosedLoop = bits, U32, 1152, [10:10] -badTps = bits, U32, 1152, [11:11] -looksLikeRunning = bits, U32, 1152, [12:12] -looksLikeCoasting = bits, U32, 1152, [13:13] -looksLikeCrankToIdle = bits, U32, 1152, [14:14] -useInstantRpmForIdle = bits, U32, 1152, [15:15] -isVerboseIAC = bits, U32, 1152, [16:16] -unusedBit_22_17 = bits, U32, 1152, [17:17] -unusedBit_22_18 = bits, U32, 1152, [18:18] -unusedBit_22_19 = bits, U32, 1152, [19:19] -unusedBit_22_20 = bits, U32, 1152, [20:20] -unusedBit_22_21 = bits, U32, 1152, [21:21] -unusedBit_22_22 = bits, U32, 1152, [22:22] -unusedBit_22_23 = bits, U32, 1152, [23:23] -unusedBit_22_24 = bits, U32, 1152, [24:24] -unusedBit_22_25 = bits, U32, 1152, [25:25] -unusedBit_22_26 = bits, U32, 1152, [26:26] -unusedBit_22_27 = bits, U32, 1152, [27:27] -unusedBit_22_28 = bits, U32, 1152, [28:28] -unusedBit_22_29 = bits, U32, 1152, [29:29] -unusedBit_22_30 = bits, U32, 1152, [30:30] -unusedBit_22_31 = bits, U32, 1152, [31:31] -targetRpmByClt = scalar, S32, 1156, "", 1, 0 -targetRpmAcBump = scalar, S32, 1160, "", 1, 0 -iacByRpmTaper = scalar, F32, 1164 -luaAdd = scalar, F32, 1168 -; total TS size = 1172 -baseDwell = scalar, F32, 1172, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 1176, "", 1, 0 -luaTimingAdd = scalar, F32, 1180, "", 1, 0 -luaTimingMult = scalar, F32, 1184, "", 1, 0 -; total TS size = 1188 -idlePosition = scalar, F32, 1188, "", 1, 0 -trim = scalar, F32, 1192, "", 1, 0 -luaAdjustment = scalar, F32, 1196, "", 1, 0 -etbFeedForward = scalar, F32, 1200 -etbIntegralError = scalar, F32, 1204, "", 1, 0 -etbCurrentTarget = scalar, F32, 1208, "%", 1, 0 -; total TS size = 1212 -faultCode = scalar, U08, 1212, "", 1, 0 -heaterDuty = scalar, U08, 1213, "%", 1, 0 -pumpDuty = scalar, U08, 1214, "%", 1, 0 -tempC = scalar, U16, 1216, "C", 1, 0 -nernstVoltage = scalar, U16, 1218, "V", 0.001, 0 -esr = scalar, U16, 1220, "", 1, 0 -; total TS size = 1224 +wallFuelCorrection = scalar, F32, 1132, "", 1, 0 +wallFuel = scalar, F32, 1136, "", 1, 0 +; total TS size = 1140 +idleState = bits, S32, 1140, [0:2], "not important" +currentIdlePosition = scalar, F32, 1144 +baseIdlePosition = scalar, F32, 1148 +iacByTpsTaper = scalar, F32, 1152 +throttlePedalUpState = scalar, S32, 1156, "", 1, 0 +mightResetPid = bits, U32, 1160, [0:0] +shouldResetPid = bits, U32, 1160, [1:1] +wasResetPid = bits, U32, 1160, [2:2] +mustResetPid = bits, U32, 1160, [3:3] +isCoasting = bits, U32, 1160, [4:4] +useIacTableForCoasting = bits, U32, 1160, [5:5] +notIdling = bits, U32, 1160, [6:6] +needReset = bits, U32, 1160, [7:7] +isInDeadZone = bits, U32, 1160, [8:8] +isBlipping = bits, U32, 1160, [9:9] +useClosedLoop = bits, U32, 1160, [10:10] +badTps = bits, U32, 1160, [11:11] +looksLikeRunning = bits, U32, 1160, [12:12] +looksLikeCoasting = bits, U32, 1160, [13:13] +looksLikeCrankToIdle = bits, U32, 1160, [14:14] +useInstantRpmForIdle = bits, U32, 1160, [15:15] +isVerboseIAC = bits, U32, 1160, [16:16] +unusedBit_22_17 = bits, U32, 1160, [17:17] +unusedBit_22_18 = bits, U32, 1160, [18:18] +unusedBit_22_19 = bits, U32, 1160, [19:19] +unusedBit_22_20 = bits, U32, 1160, [20:20] +unusedBit_22_21 = bits, U32, 1160, [21:21] +unusedBit_22_22 = bits, U32, 1160, [22:22] +unusedBit_22_23 = bits, U32, 1160, [23:23] +unusedBit_22_24 = bits, U32, 1160, [24:24] +unusedBit_22_25 = bits, U32, 1160, [25:25] +unusedBit_22_26 = bits, U32, 1160, [26:26] +unusedBit_22_27 = bits, U32, 1160, [27:27] +unusedBit_22_28 = bits, U32, 1160, [28:28] +unusedBit_22_29 = bits, U32, 1160, [29:29] +unusedBit_22_30 = bits, U32, 1160, [30:30] +unusedBit_22_31 = bits, U32, 1160, [31:31] +targetRpmByClt = scalar, S32, 1164, "", 1, 0 +targetRpmAcBump = scalar, S32, 1168, "", 1, 0 +iacByRpmTaper = scalar, F32, 1172 +luaAdd = scalar, F32, 1176 +; total TS size = 1180 +baseDwell = scalar, F32, 1180, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 1184, "", 1, 0 +luaTimingAdd = scalar, F32, 1188, "", 1, 0 +luaTimingMult = scalar, F32, 1192, "", 1, 0 +; total TS size = 1196 +idlePosition = scalar, F32, 1196, "", 1, 0 +trim = scalar, F32, 1200, "", 1, 0 +luaAdjustment = scalar, F32, 1204, "", 1, 0 +etbFeedForward = scalar, F32, 1208 +etbIntegralError = scalar, F32, 1212, "", 1, 0 +etbCurrentTarget = scalar, F32, 1216, "%", 1, 0 +; total TS size = 1220 +faultCode = scalar, U08, 1220, "", 1, 0 +heaterDuty = scalar, U08, 1221, "%", 1, 0 +pumpDuty = scalar, U08, 1222, "%", 1, 0 +tempC = scalar, U16, 1224, "C", 1, 0 +nernstVoltage = scalar, U16, 1226, "V", 0.001, 0 +esr = scalar, U16, 1228, "", 1, 0 +; total TS size = 1232 time = { timeNow } @@ -4757,6 +4759,8 @@ entry = brakePedalState, "brake: down", int, "%d" entry = egt1, "egt1", float, "%.3f" entry = egt2, "egt2", float, "%.3f" entry = desiredRpmLimit, "User-defined RPM hard limit", int, "%d" +entry = fuelInjectionCounter, "fuelInjectionCounter", int, "%d" +entry = sparkCounter, "sparkCounter", int, "%d" entry = tpsFrom, "tpsFrom", float, "%.3f" entry = tpsTo, "tpsTo", float, "%.3f" entry = deltaTps, "deltaTps", float, "%.3f" @@ -5498,6 +5502,8 @@ dialog = engine_stateDialog, "engine_state" graphLine = egt2 liveGraph = engine_state_10_Graph, "Graph", South graphLine = desiredRpmLimit + graphLine = fuelInjectionCounter + graphLine = sparkCounter indicatorPanel = tps_accel_stateIndicatorPanel, 2 indicator = {isAboveAccelThreshold}, "isAboveAccelThreshold No", "isAboveAccelThreshold Yes" diff --git a/firmware/tunerstudio/generated/rusefi_atlas.ini b/firmware/tunerstudio/generated/rusefi_atlas.ini index 16f07cff57..65a2fb9fd1 100644 --- a/firmware/tunerstudio/generated/rusefi_atlas.ini +++ b/firmware/tunerstudio/generated/rusefi_atlas.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.08.25.atlas.1858092601" + signature = "rusEFI 2022.08.25.atlas.2662902349" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.08.25.atlas.1858092601" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.08.25.atlas.2662902349" ; 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 @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Aug 25 14:52:11 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Aug 25 22:50:54 UTC 2022 pageSize = 21300 page = 1 @@ -2109,7 +2109,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1224 + ochBlockSize = 1232 ; ; see TunerStudioOutputChannels struct @@ -3022,170 +3022,172 @@ unusedBit_22_31 = bits, U32, 992, [31:31] egt1 = scalar, F32, 996, "", 1, 0 egt2 = scalar, F32, 1000, "", 1, 0 desiredRpmLimit = scalar, S16, 1004, "rpm", 1, 0 -; total TS size = 1008 -tpsFrom = scalar, F32, 1008 -tpsTo = scalar, F32, 1012 -deltaTps = scalar, F32, 1016 -extraFuel = scalar, F32, 1020, "", 1, 0 -valueFromTable = scalar, F32, 1024, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1028, [0:0] -isBelowDecelThreshold = bits, U32, 1028, [1:1] -isTimeToResetAccumulator = bits, U32, 1028, [2:2] -isFractionalEnrichment = bits, U32, 1028, [3:3] -belowEpsilon = bits, U32, 1028, [4:4] -tooShort = bits, U32, 1028, [5:5] -unusedBit_11_6 = bits, U32, 1028, [6:6] -unusedBit_11_7 = bits, U32, 1028, [7:7] -unusedBit_11_8 = bits, U32, 1028, [8:8] -unusedBit_11_9 = bits, U32, 1028, [9:9] -unusedBit_11_10 = bits, U32, 1028, [10:10] -unusedBit_11_11 = bits, U32, 1028, [11:11] -unusedBit_11_12 = bits, U32, 1028, [12:12] -unusedBit_11_13 = bits, U32, 1028, [13:13] -unusedBit_11_14 = bits, U32, 1028, [14:14] -unusedBit_11_15 = bits, U32, 1028, [15:15] -unusedBit_11_16 = bits, U32, 1028, [16:16] -unusedBit_11_17 = bits, U32, 1028, [17:17] -unusedBit_11_18 = bits, U32, 1028, [18:18] -unusedBit_11_19 = bits, U32, 1028, [19:19] -unusedBit_11_20 = bits, U32, 1028, [20:20] -unusedBit_11_21 = bits, U32, 1028, [21:21] -unusedBit_11_22 = bits, U32, 1028, [22:22] -unusedBit_11_23 = bits, U32, 1028, [23:23] -unusedBit_11_24 = bits, U32, 1028, [24:24] -unusedBit_11_25 = bits, U32, 1028, [25:25] -unusedBit_11_26 = bits, U32, 1028, [26:26] -unusedBit_11_27 = bits, U32, 1028, [27:27] -unusedBit_11_28 = bits, U32, 1028, [28:28] -unusedBit_11_29 = bits, U32, 1028, [29:29] -unusedBit_11_30 = bits, U32, 1028, [30:30] -unusedBit_11_31 = bits, U32, 1028, [31:31] -fractionalInjFuel = scalar, F32, 1032, "", 1, 0 -accumulatedValue = scalar, F32, 1036, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1040, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1044, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1048, "", 1, 0 -cycleCnt = scalar, S32, 1052, "", 1, 0 -; total TS size = 1056 -hwEventCounters1 = scalar, S32, 1056, "", 1, 0 -hwEventCounters2 = scalar, S32, 1060, "", 1, 0 -hwEventCounters3 = scalar, S32, 1064, "", 1, 0 -hwEventCounters4 = scalar, S32, 1068, "", 1, 0 -hwEventCounters5 = scalar, S32, 1072, "", 1, 0 -hwEventCounters6 = scalar, S32, 1076, "", 1, 0 -vvtCamCounter = scalar, S32, 1080, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1084, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1088, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1092, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1093, "", 1, 0 -; total TS size = 1096 -totalRevolutionCounter = scalar, U32, 1096, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1100, "", 1, 0 -vvtCurrentPosition = scalar, F32, 1104, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1108, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 1112, "", 1, 0 -triggerStateIndex = scalar, U08, 1116, "", 1, 0 -vvtCounter = scalar, U08, 1117, "", 1, 0 -camResyncCounter = scalar, U08, 1118, "", 1, 0 -vvtStateIndex = scalar, U08, 1119, "", 1, 0 -; total TS size = 1120 -m_hasSynchronizedPhase = bits, U32, 1120, [0:0] -unusedBit_1_1 = bits, U32, 1120, [1:1] -unusedBit_1_2 = bits, U32, 1120, [2:2] -unusedBit_1_3 = bits, U32, 1120, [3:3] -unusedBit_1_4 = bits, U32, 1120, [4:4] -unusedBit_1_5 = bits, U32, 1120, [5:5] -unusedBit_1_6 = bits, U32, 1120, [6:6] -unusedBit_1_7 = bits, U32, 1120, [7:7] -unusedBit_1_8 = bits, U32, 1120, [8:8] -unusedBit_1_9 = bits, U32, 1120, [9:9] -unusedBit_1_10 = bits, U32, 1120, [10:10] -unusedBit_1_11 = bits, U32, 1120, [11:11] -unusedBit_1_12 = bits, U32, 1120, [12:12] -unusedBit_1_13 = bits, U32, 1120, [13:13] -unusedBit_1_14 = bits, U32, 1120, [14:14] -unusedBit_1_15 = bits, U32, 1120, [15:15] -unusedBit_1_16 = bits, U32, 1120, [16:16] -unusedBit_1_17 = bits, U32, 1120, [17:17] -unusedBit_1_18 = bits, U32, 1120, [18:18] -unusedBit_1_19 = bits, U32, 1120, [19:19] -unusedBit_1_20 = bits, U32, 1120, [20:20] -unusedBit_1_21 = bits, U32, 1120, [21:21] -unusedBit_1_22 = bits, U32, 1120, [22:22] -unusedBit_1_23 = bits, U32, 1120, [23:23] -unusedBit_1_24 = bits, U32, 1120, [24:24] -unusedBit_1_25 = bits, U32, 1120, [25:25] -unusedBit_1_26 = bits, U32, 1120, [26:26] -unusedBit_1_27 = bits, U32, 1120, [27:27] -unusedBit_1_28 = bits, U32, 1120, [28:28] -unusedBit_1_29 = bits, U32, 1120, [29:29] -unusedBit_1_30 = bits, U32, 1120, [30:30] -unusedBit_1_31 = bits, U32, 1120, [31:31] -; total TS size = 1124 -wallFuelCorrection = scalar, F32, 1124, "", 1, 0 -wallFuel = scalar, F32, 1128, "", 1, 0 +fuelInjectionCounter = scalar, S32, 1008, "", 1, 0 +sparkCounter = scalar, S32, 1012, "", 1, 0 +; total TS size = 1016 +tpsFrom = scalar, F32, 1016 +tpsTo = scalar, F32, 1020 +deltaTps = scalar, F32, 1024 +extraFuel = scalar, F32, 1028, "", 1, 0 +valueFromTable = scalar, F32, 1032, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1036, [0:0] +isBelowDecelThreshold = bits, U32, 1036, [1:1] +isTimeToResetAccumulator = bits, U32, 1036, [2:2] +isFractionalEnrichment = bits, U32, 1036, [3:3] +belowEpsilon = bits, U32, 1036, [4:4] +tooShort = bits, U32, 1036, [5:5] +unusedBit_11_6 = bits, U32, 1036, [6:6] +unusedBit_11_7 = bits, U32, 1036, [7:7] +unusedBit_11_8 = bits, U32, 1036, [8:8] +unusedBit_11_9 = bits, U32, 1036, [9:9] +unusedBit_11_10 = bits, U32, 1036, [10:10] +unusedBit_11_11 = bits, U32, 1036, [11:11] +unusedBit_11_12 = bits, U32, 1036, [12:12] +unusedBit_11_13 = bits, U32, 1036, [13:13] +unusedBit_11_14 = bits, U32, 1036, [14:14] +unusedBit_11_15 = bits, U32, 1036, [15:15] +unusedBit_11_16 = bits, U32, 1036, [16:16] +unusedBit_11_17 = bits, U32, 1036, [17:17] +unusedBit_11_18 = bits, U32, 1036, [18:18] +unusedBit_11_19 = bits, U32, 1036, [19:19] +unusedBit_11_20 = bits, U32, 1036, [20:20] +unusedBit_11_21 = bits, U32, 1036, [21:21] +unusedBit_11_22 = bits, U32, 1036, [22:22] +unusedBit_11_23 = bits, U32, 1036, [23:23] +unusedBit_11_24 = bits, U32, 1036, [24:24] +unusedBit_11_25 = bits, U32, 1036, [25:25] +unusedBit_11_26 = bits, U32, 1036, [26:26] +unusedBit_11_27 = bits, U32, 1036, [27:27] +unusedBit_11_28 = bits, U32, 1036, [28:28] +unusedBit_11_29 = bits, U32, 1036, [29:29] +unusedBit_11_30 = bits, U32, 1036, [30:30] +unusedBit_11_31 = bits, U32, 1036, [31:31] +fractionalInjFuel = scalar, F32, 1040, "", 1, 0 +accumulatedValue = scalar, F32, 1044, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1048, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1052, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1056, "", 1, 0 +cycleCnt = scalar, S32, 1060, "", 1, 0 +; total TS size = 1064 +hwEventCounters1 = scalar, S32, 1064, "", 1, 0 +hwEventCounters2 = scalar, S32, 1068, "", 1, 0 +hwEventCounters3 = scalar, S32, 1072, "", 1, 0 +hwEventCounters4 = scalar, S32, 1076, "", 1, 0 +hwEventCounters5 = scalar, S32, 1080, "", 1, 0 +hwEventCounters6 = scalar, S32, 1084, "", 1, 0 +vvtCamCounter = scalar, S32, 1088, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1092, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1096, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1100, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1101, "", 1, 0 +; total TS size = 1104 +totalRevolutionCounter = scalar, U32, 1104, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1108, "", 1, 0 +vvtCurrentPosition = scalar, F32, 1112, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1116, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 1120, "", 1, 0 +triggerStateIndex = scalar, U08, 1124, "", 1, 0 +vvtCounter = scalar, U08, 1125, "", 1, 0 +camResyncCounter = scalar, U08, 1126, "", 1, 0 +vvtStateIndex = scalar, U08, 1127, "", 1, 0 +; total TS size = 1128 +m_hasSynchronizedPhase = bits, U32, 1128, [0:0] +unusedBit_1_1 = bits, U32, 1128, [1:1] +unusedBit_1_2 = bits, U32, 1128, [2:2] +unusedBit_1_3 = bits, U32, 1128, [3:3] +unusedBit_1_4 = bits, U32, 1128, [4:4] +unusedBit_1_5 = bits, U32, 1128, [5:5] +unusedBit_1_6 = bits, U32, 1128, [6:6] +unusedBit_1_7 = bits, U32, 1128, [7:7] +unusedBit_1_8 = bits, U32, 1128, [8:8] +unusedBit_1_9 = bits, U32, 1128, [9:9] +unusedBit_1_10 = bits, U32, 1128, [10:10] +unusedBit_1_11 = bits, U32, 1128, [11:11] +unusedBit_1_12 = bits, U32, 1128, [12:12] +unusedBit_1_13 = bits, U32, 1128, [13:13] +unusedBit_1_14 = bits, U32, 1128, [14:14] +unusedBit_1_15 = bits, U32, 1128, [15:15] +unusedBit_1_16 = bits, U32, 1128, [16:16] +unusedBit_1_17 = bits, U32, 1128, [17:17] +unusedBit_1_18 = bits, U32, 1128, [18:18] +unusedBit_1_19 = bits, U32, 1128, [19:19] +unusedBit_1_20 = bits, U32, 1128, [20:20] +unusedBit_1_21 = bits, U32, 1128, [21:21] +unusedBit_1_22 = bits, U32, 1128, [22:22] +unusedBit_1_23 = bits, U32, 1128, [23:23] +unusedBit_1_24 = bits, U32, 1128, [24:24] +unusedBit_1_25 = bits, U32, 1128, [25:25] +unusedBit_1_26 = bits, U32, 1128, [26:26] +unusedBit_1_27 = bits, U32, 1128, [27:27] +unusedBit_1_28 = bits, U32, 1128, [28:28] +unusedBit_1_29 = bits, U32, 1128, [29:29] +unusedBit_1_30 = bits, U32, 1128, [30:30] +unusedBit_1_31 = bits, U32, 1128, [31:31] ; total TS size = 1132 -idleState = bits, S32, 1132, [0:2], "not important" -currentIdlePosition = scalar, F32, 1136 -baseIdlePosition = scalar, F32, 1140 -iacByTpsTaper = scalar, F32, 1144 -throttlePedalUpState = scalar, S32, 1148, "", 1, 0 -mightResetPid = bits, U32, 1152, [0:0] -shouldResetPid = bits, U32, 1152, [1:1] -wasResetPid = bits, U32, 1152, [2:2] -mustResetPid = bits, U32, 1152, [3:3] -isCoasting = bits, U32, 1152, [4:4] -useIacTableForCoasting = bits, U32, 1152, [5:5] -notIdling = bits, U32, 1152, [6:6] -needReset = bits, U32, 1152, [7:7] -isInDeadZone = bits, U32, 1152, [8:8] -isBlipping = bits, U32, 1152, [9:9] -useClosedLoop = bits, U32, 1152, [10:10] -badTps = bits, U32, 1152, [11:11] -looksLikeRunning = bits, U32, 1152, [12:12] -looksLikeCoasting = bits, U32, 1152, [13:13] -looksLikeCrankToIdle = bits, U32, 1152, [14:14] -useInstantRpmForIdle = bits, U32, 1152, [15:15] -isVerboseIAC = bits, U32, 1152, [16:16] -unusedBit_22_17 = bits, U32, 1152, [17:17] -unusedBit_22_18 = bits, U32, 1152, [18:18] -unusedBit_22_19 = bits, U32, 1152, [19:19] -unusedBit_22_20 = bits, U32, 1152, [20:20] -unusedBit_22_21 = bits, U32, 1152, [21:21] -unusedBit_22_22 = bits, U32, 1152, [22:22] -unusedBit_22_23 = bits, U32, 1152, [23:23] -unusedBit_22_24 = bits, U32, 1152, [24:24] -unusedBit_22_25 = bits, U32, 1152, [25:25] -unusedBit_22_26 = bits, U32, 1152, [26:26] -unusedBit_22_27 = bits, U32, 1152, [27:27] -unusedBit_22_28 = bits, U32, 1152, [28:28] -unusedBit_22_29 = bits, U32, 1152, [29:29] -unusedBit_22_30 = bits, U32, 1152, [30:30] -unusedBit_22_31 = bits, U32, 1152, [31:31] -targetRpmByClt = scalar, S32, 1156, "", 1, 0 -targetRpmAcBump = scalar, S32, 1160, "", 1, 0 -iacByRpmTaper = scalar, F32, 1164 -luaAdd = scalar, F32, 1168 -; total TS size = 1172 -baseDwell = scalar, F32, 1172, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 1176, "", 1, 0 -luaTimingAdd = scalar, F32, 1180, "", 1, 0 -luaTimingMult = scalar, F32, 1184, "", 1, 0 -; total TS size = 1188 -idlePosition = scalar, F32, 1188, "", 1, 0 -trim = scalar, F32, 1192, "", 1, 0 -luaAdjustment = scalar, F32, 1196, "", 1, 0 -etbFeedForward = scalar, F32, 1200 -etbIntegralError = scalar, F32, 1204, "", 1, 0 -etbCurrentTarget = scalar, F32, 1208, "%", 1, 0 -; total TS size = 1212 -faultCode = scalar, U08, 1212, "", 1, 0 -heaterDuty = scalar, U08, 1213, "%", 1, 0 -pumpDuty = scalar, U08, 1214, "%", 1, 0 -tempC = scalar, U16, 1216, "C", 1, 0 -nernstVoltage = scalar, U16, 1218, "V", 0.001, 0 -esr = scalar, U16, 1220, "", 1, 0 -; total TS size = 1224 +wallFuelCorrection = scalar, F32, 1132, "", 1, 0 +wallFuel = scalar, F32, 1136, "", 1, 0 +; total TS size = 1140 +idleState = bits, S32, 1140, [0:2], "not important" +currentIdlePosition = scalar, F32, 1144 +baseIdlePosition = scalar, F32, 1148 +iacByTpsTaper = scalar, F32, 1152 +throttlePedalUpState = scalar, S32, 1156, "", 1, 0 +mightResetPid = bits, U32, 1160, [0:0] +shouldResetPid = bits, U32, 1160, [1:1] +wasResetPid = bits, U32, 1160, [2:2] +mustResetPid = bits, U32, 1160, [3:3] +isCoasting = bits, U32, 1160, [4:4] +useIacTableForCoasting = bits, U32, 1160, [5:5] +notIdling = bits, U32, 1160, [6:6] +needReset = bits, U32, 1160, [7:7] +isInDeadZone = bits, U32, 1160, [8:8] +isBlipping = bits, U32, 1160, [9:9] +useClosedLoop = bits, U32, 1160, [10:10] +badTps = bits, U32, 1160, [11:11] +looksLikeRunning = bits, U32, 1160, [12:12] +looksLikeCoasting = bits, U32, 1160, [13:13] +looksLikeCrankToIdle = bits, U32, 1160, [14:14] +useInstantRpmForIdle = bits, U32, 1160, [15:15] +isVerboseIAC = bits, U32, 1160, [16:16] +unusedBit_22_17 = bits, U32, 1160, [17:17] +unusedBit_22_18 = bits, U32, 1160, [18:18] +unusedBit_22_19 = bits, U32, 1160, [19:19] +unusedBit_22_20 = bits, U32, 1160, [20:20] +unusedBit_22_21 = bits, U32, 1160, [21:21] +unusedBit_22_22 = bits, U32, 1160, [22:22] +unusedBit_22_23 = bits, U32, 1160, [23:23] +unusedBit_22_24 = bits, U32, 1160, [24:24] +unusedBit_22_25 = bits, U32, 1160, [25:25] +unusedBit_22_26 = bits, U32, 1160, [26:26] +unusedBit_22_27 = bits, U32, 1160, [27:27] +unusedBit_22_28 = bits, U32, 1160, [28:28] +unusedBit_22_29 = bits, U32, 1160, [29:29] +unusedBit_22_30 = bits, U32, 1160, [30:30] +unusedBit_22_31 = bits, U32, 1160, [31:31] +targetRpmByClt = scalar, S32, 1164, "", 1, 0 +targetRpmAcBump = scalar, S32, 1168, "", 1, 0 +iacByRpmTaper = scalar, F32, 1172 +luaAdd = scalar, F32, 1176 +; total TS size = 1180 +baseDwell = scalar, F32, 1180, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 1184, "", 1, 0 +luaTimingAdd = scalar, F32, 1188, "", 1, 0 +luaTimingMult = scalar, F32, 1192, "", 1, 0 +; total TS size = 1196 +idlePosition = scalar, F32, 1196, "", 1, 0 +trim = scalar, F32, 1200, "", 1, 0 +luaAdjustment = scalar, F32, 1204, "", 1, 0 +etbFeedForward = scalar, F32, 1208 +etbIntegralError = scalar, F32, 1212, "", 1, 0 +etbCurrentTarget = scalar, F32, 1216, "%", 1, 0 +; total TS size = 1220 +faultCode = scalar, U08, 1220, "", 1, 0 +heaterDuty = scalar, U08, 1221, "%", 1, 0 +pumpDuty = scalar, U08, 1222, "%", 1, 0 +tempC = scalar, U16, 1224, "C", 1, 0 +nernstVoltage = scalar, U16, 1226, "V", 0.001, 0 +esr = scalar, U16, 1228, "", 1, 0 +; total TS size = 1232 time = { timeNow } @@ -4757,6 +4759,8 @@ entry = brakePedalState, "brake: down", int, "%d" entry = egt1, "egt1", float, "%.3f" entry = egt2, "egt2", float, "%.3f" entry = desiredRpmLimit, "User-defined RPM hard limit", int, "%d" +entry = fuelInjectionCounter, "fuelInjectionCounter", int, "%d" +entry = sparkCounter, "sparkCounter", int, "%d" entry = tpsFrom, "tpsFrom", float, "%.3f" entry = tpsTo, "tpsTo", float, "%.3f" entry = deltaTps, "deltaTps", float, "%.3f" @@ -5502,6 +5506,8 @@ dialog = engine_stateDialog, "engine_state" graphLine = egt2 liveGraph = engine_state_10_Graph, "Graph", South graphLine = desiredRpmLimit + graphLine = fuelInjectionCounter + graphLine = sparkCounter indicatorPanel = tps_accel_stateIndicatorPanel, 2 indicator = {isAboveAccelThreshold}, "isAboveAccelThreshold No", "isAboveAccelThreshold Yes" diff --git a/firmware/tunerstudio/generated/rusefi_core8.ini b/firmware/tunerstudio/generated/rusefi_core8.ini index 7f5cbd02f4..5d94fa5b18 100644 --- a/firmware/tunerstudio/generated/rusefi_core8.ini +++ b/firmware/tunerstudio/generated/rusefi_core8.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.08.25.core8.2229705447" + signature = "rusEFI 2022.08.25.core8.1956515475" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.08.25.core8.2229705447" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.08.25.core8.1956515475" ; 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 @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Aug 25 14:51:50 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Aug 25 22:50:35 UTC 2022 pageSize = 21300 page = 1 @@ -2109,7 +2109,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1224 + ochBlockSize = 1232 ; ; see TunerStudioOutputChannels struct @@ -3022,170 +3022,172 @@ unusedBit_22_31 = bits, U32, 992, [31:31] egt1 = scalar, F32, 996, "", 1, 0 egt2 = scalar, F32, 1000, "", 1, 0 desiredRpmLimit = scalar, S16, 1004, "rpm", 1, 0 -; total TS size = 1008 -tpsFrom = scalar, F32, 1008 -tpsTo = scalar, F32, 1012 -deltaTps = scalar, F32, 1016 -extraFuel = scalar, F32, 1020, "", 1, 0 -valueFromTable = scalar, F32, 1024, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1028, [0:0] -isBelowDecelThreshold = bits, U32, 1028, [1:1] -isTimeToResetAccumulator = bits, U32, 1028, [2:2] -isFractionalEnrichment = bits, U32, 1028, [3:3] -belowEpsilon = bits, U32, 1028, [4:4] -tooShort = bits, U32, 1028, [5:5] -unusedBit_11_6 = bits, U32, 1028, [6:6] -unusedBit_11_7 = bits, U32, 1028, [7:7] -unusedBit_11_8 = bits, U32, 1028, [8:8] -unusedBit_11_9 = bits, U32, 1028, [9:9] -unusedBit_11_10 = bits, U32, 1028, [10:10] -unusedBit_11_11 = bits, U32, 1028, [11:11] -unusedBit_11_12 = bits, U32, 1028, [12:12] -unusedBit_11_13 = bits, U32, 1028, [13:13] -unusedBit_11_14 = bits, U32, 1028, [14:14] -unusedBit_11_15 = bits, U32, 1028, [15:15] -unusedBit_11_16 = bits, U32, 1028, [16:16] -unusedBit_11_17 = bits, U32, 1028, [17:17] -unusedBit_11_18 = bits, U32, 1028, [18:18] -unusedBit_11_19 = bits, U32, 1028, [19:19] -unusedBit_11_20 = bits, U32, 1028, [20:20] -unusedBit_11_21 = bits, U32, 1028, [21:21] -unusedBit_11_22 = bits, U32, 1028, [22:22] -unusedBit_11_23 = bits, U32, 1028, [23:23] -unusedBit_11_24 = bits, U32, 1028, [24:24] -unusedBit_11_25 = bits, U32, 1028, [25:25] -unusedBit_11_26 = bits, U32, 1028, [26:26] -unusedBit_11_27 = bits, U32, 1028, [27:27] -unusedBit_11_28 = bits, U32, 1028, [28:28] -unusedBit_11_29 = bits, U32, 1028, [29:29] -unusedBit_11_30 = bits, U32, 1028, [30:30] -unusedBit_11_31 = bits, U32, 1028, [31:31] -fractionalInjFuel = scalar, F32, 1032, "", 1, 0 -accumulatedValue = scalar, F32, 1036, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1040, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1044, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1048, "", 1, 0 -cycleCnt = scalar, S32, 1052, "", 1, 0 -; total TS size = 1056 -hwEventCounters1 = scalar, S32, 1056, "", 1, 0 -hwEventCounters2 = scalar, S32, 1060, "", 1, 0 -hwEventCounters3 = scalar, S32, 1064, "", 1, 0 -hwEventCounters4 = scalar, S32, 1068, "", 1, 0 -hwEventCounters5 = scalar, S32, 1072, "", 1, 0 -hwEventCounters6 = scalar, S32, 1076, "", 1, 0 -vvtCamCounter = scalar, S32, 1080, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1084, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1088, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1092, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1093, "", 1, 0 -; total TS size = 1096 -totalRevolutionCounter = scalar, U32, 1096, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1100, "", 1, 0 -vvtCurrentPosition = scalar, F32, 1104, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1108, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 1112, "", 1, 0 -triggerStateIndex = scalar, U08, 1116, "", 1, 0 -vvtCounter = scalar, U08, 1117, "", 1, 0 -camResyncCounter = scalar, U08, 1118, "", 1, 0 -vvtStateIndex = scalar, U08, 1119, "", 1, 0 -; total TS size = 1120 -m_hasSynchronizedPhase = bits, U32, 1120, [0:0] -unusedBit_1_1 = bits, U32, 1120, [1:1] -unusedBit_1_2 = bits, U32, 1120, [2:2] -unusedBit_1_3 = bits, U32, 1120, [3:3] -unusedBit_1_4 = bits, U32, 1120, [4:4] -unusedBit_1_5 = bits, U32, 1120, [5:5] -unusedBit_1_6 = bits, U32, 1120, [6:6] -unusedBit_1_7 = bits, U32, 1120, [7:7] -unusedBit_1_8 = bits, U32, 1120, [8:8] -unusedBit_1_9 = bits, U32, 1120, [9:9] -unusedBit_1_10 = bits, U32, 1120, [10:10] -unusedBit_1_11 = bits, U32, 1120, [11:11] -unusedBit_1_12 = bits, U32, 1120, [12:12] -unusedBit_1_13 = bits, U32, 1120, [13:13] -unusedBit_1_14 = bits, U32, 1120, [14:14] -unusedBit_1_15 = bits, U32, 1120, [15:15] -unusedBit_1_16 = bits, U32, 1120, [16:16] -unusedBit_1_17 = bits, U32, 1120, [17:17] -unusedBit_1_18 = bits, U32, 1120, [18:18] -unusedBit_1_19 = bits, U32, 1120, [19:19] -unusedBit_1_20 = bits, U32, 1120, [20:20] -unusedBit_1_21 = bits, U32, 1120, [21:21] -unusedBit_1_22 = bits, U32, 1120, [22:22] -unusedBit_1_23 = bits, U32, 1120, [23:23] -unusedBit_1_24 = bits, U32, 1120, [24:24] -unusedBit_1_25 = bits, U32, 1120, [25:25] -unusedBit_1_26 = bits, U32, 1120, [26:26] -unusedBit_1_27 = bits, U32, 1120, [27:27] -unusedBit_1_28 = bits, U32, 1120, [28:28] -unusedBit_1_29 = bits, U32, 1120, [29:29] -unusedBit_1_30 = bits, U32, 1120, [30:30] -unusedBit_1_31 = bits, U32, 1120, [31:31] -; total TS size = 1124 -wallFuelCorrection = scalar, F32, 1124, "", 1, 0 -wallFuel = scalar, F32, 1128, "", 1, 0 +fuelInjectionCounter = scalar, S32, 1008, "", 1, 0 +sparkCounter = scalar, S32, 1012, "", 1, 0 +; total TS size = 1016 +tpsFrom = scalar, F32, 1016 +tpsTo = scalar, F32, 1020 +deltaTps = scalar, F32, 1024 +extraFuel = scalar, F32, 1028, "", 1, 0 +valueFromTable = scalar, F32, 1032, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1036, [0:0] +isBelowDecelThreshold = bits, U32, 1036, [1:1] +isTimeToResetAccumulator = bits, U32, 1036, [2:2] +isFractionalEnrichment = bits, U32, 1036, [3:3] +belowEpsilon = bits, U32, 1036, [4:4] +tooShort = bits, U32, 1036, [5:5] +unusedBit_11_6 = bits, U32, 1036, [6:6] +unusedBit_11_7 = bits, U32, 1036, [7:7] +unusedBit_11_8 = bits, U32, 1036, [8:8] +unusedBit_11_9 = bits, U32, 1036, [9:9] +unusedBit_11_10 = bits, U32, 1036, [10:10] +unusedBit_11_11 = bits, U32, 1036, [11:11] +unusedBit_11_12 = bits, U32, 1036, [12:12] +unusedBit_11_13 = bits, U32, 1036, [13:13] +unusedBit_11_14 = bits, U32, 1036, [14:14] +unusedBit_11_15 = bits, U32, 1036, [15:15] +unusedBit_11_16 = bits, U32, 1036, [16:16] +unusedBit_11_17 = bits, U32, 1036, [17:17] +unusedBit_11_18 = bits, U32, 1036, [18:18] +unusedBit_11_19 = bits, U32, 1036, [19:19] +unusedBit_11_20 = bits, U32, 1036, [20:20] +unusedBit_11_21 = bits, U32, 1036, [21:21] +unusedBit_11_22 = bits, U32, 1036, [22:22] +unusedBit_11_23 = bits, U32, 1036, [23:23] +unusedBit_11_24 = bits, U32, 1036, [24:24] +unusedBit_11_25 = bits, U32, 1036, [25:25] +unusedBit_11_26 = bits, U32, 1036, [26:26] +unusedBit_11_27 = bits, U32, 1036, [27:27] +unusedBit_11_28 = bits, U32, 1036, [28:28] +unusedBit_11_29 = bits, U32, 1036, [29:29] +unusedBit_11_30 = bits, U32, 1036, [30:30] +unusedBit_11_31 = bits, U32, 1036, [31:31] +fractionalInjFuel = scalar, F32, 1040, "", 1, 0 +accumulatedValue = scalar, F32, 1044, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1048, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1052, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1056, "", 1, 0 +cycleCnt = scalar, S32, 1060, "", 1, 0 +; total TS size = 1064 +hwEventCounters1 = scalar, S32, 1064, "", 1, 0 +hwEventCounters2 = scalar, S32, 1068, "", 1, 0 +hwEventCounters3 = scalar, S32, 1072, "", 1, 0 +hwEventCounters4 = scalar, S32, 1076, "", 1, 0 +hwEventCounters5 = scalar, S32, 1080, "", 1, 0 +hwEventCounters6 = scalar, S32, 1084, "", 1, 0 +vvtCamCounter = scalar, S32, 1088, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1092, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1096, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1100, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1101, "", 1, 0 +; total TS size = 1104 +totalRevolutionCounter = scalar, U32, 1104, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1108, "", 1, 0 +vvtCurrentPosition = scalar, F32, 1112, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1116, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 1120, "", 1, 0 +triggerStateIndex = scalar, U08, 1124, "", 1, 0 +vvtCounter = scalar, U08, 1125, "", 1, 0 +camResyncCounter = scalar, U08, 1126, "", 1, 0 +vvtStateIndex = scalar, U08, 1127, "", 1, 0 +; total TS size = 1128 +m_hasSynchronizedPhase = bits, U32, 1128, [0:0] +unusedBit_1_1 = bits, U32, 1128, [1:1] +unusedBit_1_2 = bits, U32, 1128, [2:2] +unusedBit_1_3 = bits, U32, 1128, [3:3] +unusedBit_1_4 = bits, U32, 1128, [4:4] +unusedBit_1_5 = bits, U32, 1128, [5:5] +unusedBit_1_6 = bits, U32, 1128, [6:6] +unusedBit_1_7 = bits, U32, 1128, [7:7] +unusedBit_1_8 = bits, U32, 1128, [8:8] +unusedBit_1_9 = bits, U32, 1128, [9:9] +unusedBit_1_10 = bits, U32, 1128, [10:10] +unusedBit_1_11 = bits, U32, 1128, [11:11] +unusedBit_1_12 = bits, U32, 1128, [12:12] +unusedBit_1_13 = bits, U32, 1128, [13:13] +unusedBit_1_14 = bits, U32, 1128, [14:14] +unusedBit_1_15 = bits, U32, 1128, [15:15] +unusedBit_1_16 = bits, U32, 1128, [16:16] +unusedBit_1_17 = bits, U32, 1128, [17:17] +unusedBit_1_18 = bits, U32, 1128, [18:18] +unusedBit_1_19 = bits, U32, 1128, [19:19] +unusedBit_1_20 = bits, U32, 1128, [20:20] +unusedBit_1_21 = bits, U32, 1128, [21:21] +unusedBit_1_22 = bits, U32, 1128, [22:22] +unusedBit_1_23 = bits, U32, 1128, [23:23] +unusedBit_1_24 = bits, U32, 1128, [24:24] +unusedBit_1_25 = bits, U32, 1128, [25:25] +unusedBit_1_26 = bits, U32, 1128, [26:26] +unusedBit_1_27 = bits, U32, 1128, [27:27] +unusedBit_1_28 = bits, U32, 1128, [28:28] +unusedBit_1_29 = bits, U32, 1128, [29:29] +unusedBit_1_30 = bits, U32, 1128, [30:30] +unusedBit_1_31 = bits, U32, 1128, [31:31] ; total TS size = 1132 -idleState = bits, S32, 1132, [0:2], "not important" -currentIdlePosition = scalar, F32, 1136 -baseIdlePosition = scalar, F32, 1140 -iacByTpsTaper = scalar, F32, 1144 -throttlePedalUpState = scalar, S32, 1148, "", 1, 0 -mightResetPid = bits, U32, 1152, [0:0] -shouldResetPid = bits, U32, 1152, [1:1] -wasResetPid = bits, U32, 1152, [2:2] -mustResetPid = bits, U32, 1152, [3:3] -isCoasting = bits, U32, 1152, [4:4] -useIacTableForCoasting = bits, U32, 1152, [5:5] -notIdling = bits, U32, 1152, [6:6] -needReset = bits, U32, 1152, [7:7] -isInDeadZone = bits, U32, 1152, [8:8] -isBlipping = bits, U32, 1152, [9:9] -useClosedLoop = bits, U32, 1152, [10:10] -badTps = bits, U32, 1152, [11:11] -looksLikeRunning = bits, U32, 1152, [12:12] -looksLikeCoasting = bits, U32, 1152, [13:13] -looksLikeCrankToIdle = bits, U32, 1152, [14:14] -useInstantRpmForIdle = bits, U32, 1152, [15:15] -isVerboseIAC = bits, U32, 1152, [16:16] -unusedBit_22_17 = bits, U32, 1152, [17:17] -unusedBit_22_18 = bits, U32, 1152, [18:18] -unusedBit_22_19 = bits, U32, 1152, [19:19] -unusedBit_22_20 = bits, U32, 1152, [20:20] -unusedBit_22_21 = bits, U32, 1152, [21:21] -unusedBit_22_22 = bits, U32, 1152, [22:22] -unusedBit_22_23 = bits, U32, 1152, [23:23] -unusedBit_22_24 = bits, U32, 1152, [24:24] -unusedBit_22_25 = bits, U32, 1152, [25:25] -unusedBit_22_26 = bits, U32, 1152, [26:26] -unusedBit_22_27 = bits, U32, 1152, [27:27] -unusedBit_22_28 = bits, U32, 1152, [28:28] -unusedBit_22_29 = bits, U32, 1152, [29:29] -unusedBit_22_30 = bits, U32, 1152, [30:30] -unusedBit_22_31 = bits, U32, 1152, [31:31] -targetRpmByClt = scalar, S32, 1156, "", 1, 0 -targetRpmAcBump = scalar, S32, 1160, "", 1, 0 -iacByRpmTaper = scalar, F32, 1164 -luaAdd = scalar, F32, 1168 -; total TS size = 1172 -baseDwell = scalar, F32, 1172, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 1176, "", 1, 0 -luaTimingAdd = scalar, F32, 1180, "", 1, 0 -luaTimingMult = scalar, F32, 1184, "", 1, 0 -; total TS size = 1188 -idlePosition = scalar, F32, 1188, "", 1, 0 -trim = scalar, F32, 1192, "", 1, 0 -luaAdjustment = scalar, F32, 1196, "", 1, 0 -etbFeedForward = scalar, F32, 1200 -etbIntegralError = scalar, F32, 1204, "", 1, 0 -etbCurrentTarget = scalar, F32, 1208, "%", 1, 0 -; total TS size = 1212 -faultCode = scalar, U08, 1212, "", 1, 0 -heaterDuty = scalar, U08, 1213, "%", 1, 0 -pumpDuty = scalar, U08, 1214, "%", 1, 0 -tempC = scalar, U16, 1216, "C", 1, 0 -nernstVoltage = scalar, U16, 1218, "V", 0.001, 0 -esr = scalar, U16, 1220, "", 1, 0 -; total TS size = 1224 +wallFuelCorrection = scalar, F32, 1132, "", 1, 0 +wallFuel = scalar, F32, 1136, "", 1, 0 +; total TS size = 1140 +idleState = bits, S32, 1140, [0:2], "not important" +currentIdlePosition = scalar, F32, 1144 +baseIdlePosition = scalar, F32, 1148 +iacByTpsTaper = scalar, F32, 1152 +throttlePedalUpState = scalar, S32, 1156, "", 1, 0 +mightResetPid = bits, U32, 1160, [0:0] +shouldResetPid = bits, U32, 1160, [1:1] +wasResetPid = bits, U32, 1160, [2:2] +mustResetPid = bits, U32, 1160, [3:3] +isCoasting = bits, U32, 1160, [4:4] +useIacTableForCoasting = bits, U32, 1160, [5:5] +notIdling = bits, U32, 1160, [6:6] +needReset = bits, U32, 1160, [7:7] +isInDeadZone = bits, U32, 1160, [8:8] +isBlipping = bits, U32, 1160, [9:9] +useClosedLoop = bits, U32, 1160, [10:10] +badTps = bits, U32, 1160, [11:11] +looksLikeRunning = bits, U32, 1160, [12:12] +looksLikeCoasting = bits, U32, 1160, [13:13] +looksLikeCrankToIdle = bits, U32, 1160, [14:14] +useInstantRpmForIdle = bits, U32, 1160, [15:15] +isVerboseIAC = bits, U32, 1160, [16:16] +unusedBit_22_17 = bits, U32, 1160, [17:17] +unusedBit_22_18 = bits, U32, 1160, [18:18] +unusedBit_22_19 = bits, U32, 1160, [19:19] +unusedBit_22_20 = bits, U32, 1160, [20:20] +unusedBit_22_21 = bits, U32, 1160, [21:21] +unusedBit_22_22 = bits, U32, 1160, [22:22] +unusedBit_22_23 = bits, U32, 1160, [23:23] +unusedBit_22_24 = bits, U32, 1160, [24:24] +unusedBit_22_25 = bits, U32, 1160, [25:25] +unusedBit_22_26 = bits, U32, 1160, [26:26] +unusedBit_22_27 = bits, U32, 1160, [27:27] +unusedBit_22_28 = bits, U32, 1160, [28:28] +unusedBit_22_29 = bits, U32, 1160, [29:29] +unusedBit_22_30 = bits, U32, 1160, [30:30] +unusedBit_22_31 = bits, U32, 1160, [31:31] +targetRpmByClt = scalar, S32, 1164, "", 1, 0 +targetRpmAcBump = scalar, S32, 1168, "", 1, 0 +iacByRpmTaper = scalar, F32, 1172 +luaAdd = scalar, F32, 1176 +; total TS size = 1180 +baseDwell = scalar, F32, 1180, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 1184, "", 1, 0 +luaTimingAdd = scalar, F32, 1188, "", 1, 0 +luaTimingMult = scalar, F32, 1192, "", 1, 0 +; total TS size = 1196 +idlePosition = scalar, F32, 1196, "", 1, 0 +trim = scalar, F32, 1200, "", 1, 0 +luaAdjustment = scalar, F32, 1204, "", 1, 0 +etbFeedForward = scalar, F32, 1208 +etbIntegralError = scalar, F32, 1212, "", 1, 0 +etbCurrentTarget = scalar, F32, 1216, "%", 1, 0 +; total TS size = 1220 +faultCode = scalar, U08, 1220, "", 1, 0 +heaterDuty = scalar, U08, 1221, "%", 1, 0 +pumpDuty = scalar, U08, 1222, "%", 1, 0 +tempC = scalar, U16, 1224, "C", 1, 0 +nernstVoltage = scalar, U16, 1226, "V", 0.001, 0 +esr = scalar, U16, 1228, "", 1, 0 +; total TS size = 1232 time = { timeNow } @@ -4757,6 +4759,8 @@ entry = brakePedalState, "brake: down", int, "%d" entry = egt1, "egt1", float, "%.3f" entry = egt2, "egt2", float, "%.3f" entry = desiredRpmLimit, "User-defined RPM hard limit", int, "%d" +entry = fuelInjectionCounter, "fuelInjectionCounter", int, "%d" +entry = sparkCounter, "sparkCounter", int, "%d" entry = tpsFrom, "tpsFrom", float, "%.3f" entry = tpsTo, "tpsTo", float, "%.3f" entry = deltaTps, "deltaTps", float, "%.3f" @@ -5499,6 +5503,8 @@ dialog = engine_stateDialog, "engine_state" graphLine = egt2 liveGraph = engine_state_10_Graph, "Graph", South graphLine = desiredRpmLimit + graphLine = fuelInjectionCounter + graphLine = sparkCounter indicatorPanel = tps_accel_stateIndicatorPanel, 2 indicator = {isAboveAccelThreshold}, "isAboveAccelThreshold No", "isAboveAccelThreshold Yes" diff --git a/firmware/tunerstudio/generated/rusefi_cypress.ini b/firmware/tunerstudio/generated/rusefi_cypress.ini index 6d229fb7a8..575dff816e 100644 --- a/firmware/tunerstudio/generated/rusefi_cypress.ini +++ b/firmware/tunerstudio/generated/rusefi_cypress.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.08.25.cypress.1913309982" + signature = "rusEFI 2022.08.25.cypress.2188533610" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.08.25.cypress.1913309982" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.08.25.cypress.2188533610" ; 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 @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Thu Aug 25 14:51:11 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Thu Aug 25 22:49:58 UTC 2022 pageSize = 21300 page = 1 @@ -2109,7 +2109,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1224 + ochBlockSize = 1232 ; ; see TunerStudioOutputChannels struct @@ -3022,170 +3022,172 @@ unusedBit_22_31 = bits, U32, 992, [31:31] egt1 = scalar, F32, 996, "", 1, 0 egt2 = scalar, F32, 1000, "", 1, 0 desiredRpmLimit = scalar, S16, 1004, "rpm", 1, 0 -; total TS size = 1008 -tpsFrom = scalar, F32, 1008 -tpsTo = scalar, F32, 1012 -deltaTps = scalar, F32, 1016 -extraFuel = scalar, F32, 1020, "", 1, 0 -valueFromTable = scalar, F32, 1024, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1028, [0:0] -isBelowDecelThreshold = bits, U32, 1028, [1:1] -isTimeToResetAccumulator = bits, U32, 1028, [2:2] -isFractionalEnrichment = bits, U32, 1028, [3:3] -belowEpsilon = bits, U32, 1028, [4:4] -tooShort = bits, U32, 1028, [5:5] -unusedBit_11_6 = bits, U32, 1028, [6:6] -unusedBit_11_7 = bits, U32, 1028, [7:7] -unusedBit_11_8 = bits, U32, 1028, [8:8] -unusedBit_11_9 = bits, U32, 1028, [9:9] -unusedBit_11_10 = bits, U32, 1028, [10:10] -unusedBit_11_11 = bits, U32, 1028, [11:11] -unusedBit_11_12 = bits, U32, 1028, [12:12] -unusedBit_11_13 = bits, U32, 1028, [13:13] -unusedBit_11_14 = bits, U32, 1028, [14:14] -unusedBit_11_15 = bits, U32, 1028, [15:15] -unusedBit_11_16 = bits, U32, 1028, [16:16] -unusedBit_11_17 = bits, U32, 1028, [17:17] -unusedBit_11_18 = bits, U32, 1028, [18:18] -unusedBit_11_19 = bits, U32, 1028, [19:19] -unusedBit_11_20 = bits, U32, 1028, [20:20] -unusedBit_11_21 = bits, U32, 1028, [21:21] -unusedBit_11_22 = bits, U32, 1028, [22:22] -unusedBit_11_23 = bits, U32, 1028, [23:23] -unusedBit_11_24 = bits, U32, 1028, [24:24] -unusedBit_11_25 = bits, U32, 1028, [25:25] -unusedBit_11_26 = bits, U32, 1028, [26:26] -unusedBit_11_27 = bits, U32, 1028, [27:27] -unusedBit_11_28 = bits, U32, 1028, [28:28] -unusedBit_11_29 = bits, U32, 1028, [29:29] -unusedBit_11_30 = bits, U32, 1028, [30:30] -unusedBit_11_31 = bits, U32, 1028, [31:31] -fractionalInjFuel = scalar, F32, 1032, "", 1, 0 -accumulatedValue = scalar, F32, 1036, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1040, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1044, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1048, "", 1, 0 -cycleCnt = scalar, S32, 1052, "", 1, 0 -; total TS size = 1056 -hwEventCounters1 = scalar, S32, 1056, "", 1, 0 -hwEventCounters2 = scalar, S32, 1060, "", 1, 0 -hwEventCounters3 = scalar, S32, 1064, "", 1, 0 -hwEventCounters4 = scalar, S32, 1068, "", 1, 0 -hwEventCounters5 = scalar, S32, 1072, "", 1, 0 -hwEventCounters6 = scalar, S32, 1076, "", 1, 0 -vvtCamCounter = scalar, S32, 1080, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1084, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1088, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1092, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1093, "", 1, 0 -; total TS size = 1096 -totalRevolutionCounter = scalar, U32, 1096, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1100, "", 1, 0 -vvtCurrentPosition = scalar, F32, 1104, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1108, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 1112, "", 1, 0 -triggerStateIndex = scalar, U08, 1116, "", 1, 0 -vvtCounter = scalar, U08, 1117, "", 1, 0 -camResyncCounter = scalar, U08, 1118, "", 1, 0 -vvtStateIndex = scalar, U08, 1119, "", 1, 0 -; total TS size = 1120 -m_hasSynchronizedPhase = bits, U32, 1120, [0:0] -unusedBit_1_1 = bits, U32, 1120, [1:1] -unusedBit_1_2 = bits, U32, 1120, [2:2] -unusedBit_1_3 = bits, U32, 1120, [3:3] -unusedBit_1_4 = bits, U32, 1120, [4:4] -unusedBit_1_5 = bits, U32, 1120, [5:5] -unusedBit_1_6 = bits, U32, 1120, [6:6] -unusedBit_1_7 = bits, U32, 1120, [7:7] -unusedBit_1_8 = bits, U32, 1120, [8:8] -unusedBit_1_9 = bits, U32, 1120, [9:9] -unusedBit_1_10 = bits, U32, 1120, [10:10] -unusedBit_1_11 = bits, U32, 1120, [11:11] -unusedBit_1_12 = bits, U32, 1120, [12:12] -unusedBit_1_13 = bits, U32, 1120, [13:13] -unusedBit_1_14 = bits, U32, 1120, [14:14] -unusedBit_1_15 = bits, U32, 1120, [15:15] -unusedBit_1_16 = bits, U32, 1120, [16:16] -unusedBit_1_17 = bits, U32, 1120, [17:17] -unusedBit_1_18 = bits, U32, 1120, [18:18] -unusedBit_1_19 = bits, U32, 1120, [19:19] -unusedBit_1_20 = bits, U32, 1120, [20:20] -unusedBit_1_21 = bits, U32, 1120, [21:21] -unusedBit_1_22 = bits, U32, 1120, [22:22] -unusedBit_1_23 = bits, U32, 1120, [23:23] -unusedBit_1_24 = bits, U32, 1120, [24:24] -unusedBit_1_25 = bits, U32, 1120, [25:25] -unusedBit_1_26 = bits, U32, 1120, [26:26] -unusedBit_1_27 = bits, U32, 1120, [27:27] -unusedBit_1_28 = bits, U32, 1120, [28:28] -unusedBit_1_29 = bits, U32, 1120, [29:29] -unusedBit_1_30 = bits, U32, 1120, [30:30] -unusedBit_1_31 = bits, U32, 1120, [31:31] -; total TS size = 1124 -wallFuelCorrection = scalar, F32, 1124, "", 1, 0 -wallFuel = scalar, F32, 1128, "", 1, 0 +fuelInjectionCounter = scalar, S32, 1008, "", 1, 0 +sparkCounter = scalar, S32, 1012, "", 1, 0 +; total TS size = 1016 +tpsFrom = scalar, F32, 1016 +tpsTo = scalar, F32, 1020 +deltaTps = scalar, F32, 1024 +extraFuel = scalar, F32, 1028, "", 1, 0 +valueFromTable = scalar, F32, 1032, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1036, [0:0] +isBelowDecelThreshold = bits, U32, 1036, [1:1] +isTimeToResetAccumulator = bits, U32, 1036, [2:2] +isFractionalEnrichment = bits, U32, 1036, [3:3] +belowEpsilon = bits, U32, 1036, [4:4] +tooShort = bits, U32, 1036, [5:5] +unusedBit_11_6 = bits, U32, 1036, [6:6] +unusedBit_11_7 = bits, U32, 1036, [7:7] +unusedBit_11_8 = bits, U32, 1036, [8:8] +unusedBit_11_9 = bits, U32, 1036, [9:9] +unusedBit_11_10 = bits, U32, 1036, [10:10] +unusedBit_11_11 = bits, U32, 1036, [11:11] +unusedBit_11_12 = bits, U32, 1036, [12:12] +unusedBit_11_13 = bits, U32, 1036, [13:13] +unusedBit_11_14 = bits, U32, 1036, [14:14] +unusedBit_11_15 = bits, U32, 1036, [15:15] +unusedBit_11_16 = bits, U32, 1036, [16:16] +unusedBit_11_17 = bits, U32, 1036, [17:17] +unusedBit_11_18 = bits, U32, 1036, [18:18] +unusedBit_11_19 = bits, U32, 1036, [19:19] +unusedBit_11_20 = bits, U32, 1036, [20:20] +unusedBit_11_21 = bits, U32, 1036, [21:21] +unusedBit_11_22 = bits, U32, 1036, [22:22] +unusedBit_11_23 = bits, U32, 1036, [23:23] +unusedBit_11_24 = bits, U32, 1036, [24:24] +unusedBit_11_25 = bits, U32, 1036, [25:25] +unusedBit_11_26 = bits, U32, 1036, [26:26] +unusedBit_11_27 = bits, U32, 1036, [27:27] +unusedBit_11_28 = bits, U32, 1036, [28:28] +unusedBit_11_29 = bits, U32, 1036, [29:29] +unusedBit_11_30 = bits, U32, 1036, [30:30] +unusedBit_11_31 = bits, U32, 1036, [31:31] +fractionalInjFuel = scalar, F32, 1040, "", 1, 0 +accumulatedValue = scalar, F32, 1044, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1048, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1052, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1056, "", 1, 0 +cycleCnt = scalar, S32, 1060, "", 1, 0 +; total TS size = 1064 +hwEventCounters1 = scalar, S32, 1064, "", 1, 0 +hwEventCounters2 = scalar, S32, 1068, "", 1, 0 +hwEventCounters3 = scalar, S32, 1072, "", 1, 0 +hwEventCounters4 = scalar, S32, 1076, "", 1, 0 +hwEventCounters5 = scalar, S32, 1080, "", 1, 0 +hwEventCounters6 = scalar, S32, 1084, "", 1, 0 +vvtCamCounter = scalar, S32, 1088, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1092, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1096, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1100, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1101, "", 1, 0 +; total TS size = 1104 +totalRevolutionCounter = scalar, U32, 1104, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1108, "", 1, 0 +vvtCurrentPosition = scalar, F32, 1112, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1116, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 1120, "", 1, 0 +triggerStateIndex = scalar, U08, 1124, "", 1, 0 +vvtCounter = scalar, U08, 1125, "", 1, 0 +camResyncCounter = scalar, U08, 1126, "", 1, 0 +vvtStateIndex = scalar, U08, 1127, "", 1, 0 +; total TS size = 1128 +m_hasSynchronizedPhase = bits, U32, 1128, [0:0] +unusedBit_1_1 = bits, U32, 1128, [1:1] +unusedBit_1_2 = bits, U32, 1128, [2:2] +unusedBit_1_3 = bits, U32, 1128, [3:3] +unusedBit_1_4 = bits, U32, 1128, [4:4] +unusedBit_1_5 = bits, U32, 1128, [5:5] +unusedBit_1_6 = bits, U32, 1128, [6:6] +unusedBit_1_7 = bits, U32, 1128, [7:7] +unusedBit_1_8 = bits, U32, 1128, [8:8] +unusedBit_1_9 = bits, U32, 1128, [9:9] +unusedBit_1_10 = bits, U32, 1128, [10:10] +unusedBit_1_11 = bits, U32, 1128, [11:11] +unusedBit_1_12 = bits, U32, 1128, [12:12] +unusedBit_1_13 = bits, U32, 1128, [13:13] +unusedBit_1_14 = bits, U32, 1128, [14:14] +unusedBit_1_15 = bits, U32, 1128, [15:15] +unusedBit_1_16 = bits, U32, 1128, [16:16] +unusedBit_1_17 = bits, U32, 1128, [17:17] +unusedBit_1_18 = bits, U32, 1128, [18:18] +unusedBit_1_19 = bits, U32, 1128, [19:19] +unusedBit_1_20 = bits, U32, 1128, [20:20] +unusedBit_1_21 = bits, U32, 1128, [21:21] +unusedBit_1_22 = bits, U32, 1128, [22:22] +unusedBit_1_23 = bits, U32, 1128, [23:23] +unusedBit_1_24 = bits, U32, 1128, [24:24] +unusedBit_1_25 = bits, U32, 1128, [25:25] +unusedBit_1_26 = bits, U32, 1128, [26:26] +unusedBit_1_27 = bits, U32, 1128, [27:27] +unusedBit_1_28 = bits, U32, 1128, [28:28] +unusedBit_1_29 = bits, U32, 1128, [29:29] +unusedBit_1_30 = bits, U32, 1128, [30:30] +unusedBit_1_31 = bits, U32, 1128, [31:31] ; total TS size = 1132 -idleState = bits, S32, 1132, [0:2], "not important" -currentIdlePosition = scalar, F32, 1136 -baseIdlePosition = scalar, F32, 1140 -iacByTpsTaper = scalar, F32, 1144 -throttlePedalUpState = scalar, S32, 1148, "", 1, 0 -mightResetPid = bits, U32, 1152, [0:0] -shouldResetPid = bits, U32, 1152, [1:1] -wasResetPid = bits, U32, 1152, [2:2] -mustResetPid = bits, U32, 1152, [3:3] -isCoasting = bits, U32, 1152, [4:4] -useIacTableForCoasting = bits, U32, 1152, [5:5] -notIdling = bits, U32, 1152, [6:6] -needReset = bits, U32, 1152, [7:7] -isInDeadZone = bits, U32, 1152, [8:8] -isBlipping = bits, U32, 1152, [9:9] -useClosedLoop = bits, U32, 1152, [10:10] -badTps = bits, U32, 1152, [11:11] -looksLikeRunning = bits, U32, 1152, [12:12] -looksLikeCoasting = bits, U32, 1152, [13:13] -looksLikeCrankToIdle = bits, U32, 1152, [14:14] -useInstantRpmForIdle = bits, U32, 1152, [15:15] -isVerboseIAC = bits, U32, 1152, [16:16] -unusedBit_22_17 = bits, U32, 1152, [17:17] -unusedBit_22_18 = bits, U32, 1152, [18:18] -unusedBit_22_19 = bits, U32, 1152, [19:19] -unusedBit_22_20 = bits, U32, 1152, [20:20] -unusedBit_22_21 = bits, U32, 1152, [21:21] -unusedBit_22_22 = bits, U32, 1152, [22:22] -unusedBit_22_23 = bits, U32, 1152, [23:23] -unusedBit_22_24 = bits, U32, 1152, [24:24] -unusedBit_22_25 = bits, U32, 1152, [25:25] -unusedBit_22_26 = bits, U32, 1152, [26:26] -unusedBit_22_27 = bits, U32, 1152, [27:27] -unusedBit_22_28 = bits, U32, 1152, [28:28] -unusedBit_22_29 = bits, U32, 1152, [29:29] -unusedBit_22_30 = bits, U32, 1152, [30:30] -unusedBit_22_31 = bits, U32, 1152, [31:31] -targetRpmByClt = scalar, S32, 1156, "", 1, 0 -targetRpmAcBump = scalar, S32, 1160, "", 1, 0 -iacByRpmTaper = scalar, F32, 1164 -luaAdd = scalar, F32, 1168 -; total TS size = 1172 -baseDwell = scalar, F32, 1172, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 1176, "", 1, 0 -luaTimingAdd = scalar, F32, 1180, "", 1, 0 -luaTimingMult = scalar, F32, 1184, "", 1, 0 -; total TS size = 1188 -idlePosition = scalar, F32, 1188, "", 1, 0 -trim = scalar, F32, 1192, "", 1, 0 -luaAdjustment = scalar, F32, 1196, "", 1, 0 -etbFeedForward = scalar, F32, 1200 -etbIntegralError = scalar, F32, 1204, "", 1, 0 -etbCurrentTarget = scalar, F32, 1208, "%", 1, 0 -; total TS size = 1212 -faultCode = scalar, U08, 1212, "", 1, 0 -heaterDuty = scalar, U08, 1213, "%", 1, 0 -pumpDuty = scalar, U08, 1214, "%", 1, 0 -tempC = scalar, U16, 1216, "C", 1, 0 -nernstVoltage = scalar, U16, 1218, "V", 0.001, 0 -esr = scalar, U16, 1220, "", 1, 0 -; total TS size = 1224 +wallFuelCorrection = scalar, F32, 1132, "", 1, 0 +wallFuel = scalar, F32, 1136, "", 1, 0 +; total TS size = 1140 +idleState = bits, S32, 1140, [0:2], "not important" +currentIdlePosition = scalar, F32, 1144 +baseIdlePosition = scalar, F32, 1148 +iacByTpsTaper = scalar, F32, 1152 +throttlePedalUpState = scalar, S32, 1156, "", 1, 0 +mightResetPid = bits, U32, 1160, [0:0] +shouldResetPid = bits, U32, 1160, [1:1] +wasResetPid = bits, U32, 1160, [2:2] +mustResetPid = bits, U32, 1160, [3:3] +isCoasting = bits, U32, 1160, [4:4] +useIacTableForCoasting = bits, U32, 1160, [5:5] +notIdling = bits, U32, 1160, [6:6] +needReset = bits, U32, 1160, [7:7] +isInDeadZone = bits, U32, 1160, [8:8] +isBlipping = bits, U32, 1160, [9:9] +useClosedLoop = bits, U32, 1160, [10:10] +badTps = bits, U32, 1160, [11:11] +looksLikeRunning = bits, U32, 1160, [12:12] +looksLikeCoasting = bits, U32, 1160, [13:13] +looksLikeCrankToIdle = bits, U32, 1160, [14:14] +useInstantRpmForIdle = bits, U32, 1160, [15:15] +isVerboseIAC = bits, U32, 1160, [16:16] +unusedBit_22_17 = bits, U32, 1160, [17:17] +unusedBit_22_18 = bits, U32, 1160, [18:18] +unusedBit_22_19 = bits, U32, 1160, [19:19] +unusedBit_22_20 = bits, U32, 1160, [20:20] +unusedBit_22_21 = bits, U32, 1160, [21:21] +unusedBit_22_22 = bits, U32, 1160, [22:22] +unusedBit_22_23 = bits, U32, 1160, [23:23] +unusedBit_22_24 = bits, U32, 1160, [24:24] +unusedBit_22_25 = bits, U32, 1160, [25:25] +unusedBit_22_26 = bits, U32, 1160, [26:26] +unusedBit_22_27 = bits, U32, 1160, [27:27] +unusedBit_22_28 = bits, U32, 1160, [28:28] +unusedBit_22_29 = bits, U32, 1160, [29:29] +unusedBit_22_30 = bits, U32, 1160, [30:30] +unusedBit_22_31 = bits, U32, 1160, [31:31] +targetRpmByClt = scalar, S32, 1164, "", 1, 0 +targetRpmAcBump = scalar, S32, 1168, "", 1, 0 +iacByRpmTaper = scalar, F32, 1172 +luaAdd = scalar, F32, 1176 +; total TS size = 1180 +baseDwell = scalar, F32, 1180, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 1184, "", 1, 0 +luaTimingAdd = scalar, F32, 1188, "", 1, 0 +luaTimingMult = scalar, F32, 1192, "", 1, 0 +; total TS size = 1196 +idlePosition = scalar, F32, 1196, "", 1, 0 +trim = scalar, F32, 1200, "", 1, 0 +luaAdjustment = scalar, F32, 1204, "", 1, 0 +etbFeedForward = scalar, F32, 1208 +etbIntegralError = scalar, F32, 1212, "", 1, 0 +etbCurrentTarget = scalar, F32, 1216, "%", 1, 0 +; total TS size = 1220 +faultCode = scalar, U08, 1220, "", 1, 0 +heaterDuty = scalar, U08, 1221, "%", 1, 0 +pumpDuty = scalar, U08, 1222, "%", 1, 0 +tempC = scalar, U16, 1224, "C", 1, 0 +nernstVoltage = scalar, U16, 1226, "V", 0.001, 0 +esr = scalar, U16, 1228, "", 1, 0 +; total TS size = 1232 time = { timeNow } @@ -4757,6 +4759,8 @@ entry = brakePedalState, "brake: down", int, "%d" entry = egt1, "egt1", float, "%.3f" entry = egt2, "egt2", float, "%.3f" entry = desiredRpmLimit, "User-defined RPM hard limit", int, "%d" +entry = fuelInjectionCounter, "fuelInjectionCounter", int, "%d" +entry = sparkCounter, "sparkCounter", int, "%d" entry = tpsFrom, "tpsFrom", float, "%.3f" entry = tpsTo, "tpsTo", float, "%.3f" entry = deltaTps, "deltaTps", float, "%.3f" @@ -5502,6 +5506,8 @@ dialog = engine_stateDialog, "engine_state" graphLine = egt2 liveGraph = engine_state_10_Graph, "Graph", South graphLine = desiredRpmLimit + graphLine = fuelInjectionCounter + graphLine = sparkCounter indicatorPanel = tps_accel_stateIndicatorPanel, 2 indicator = {isAboveAccelThreshold}, "isAboveAccelThreshold No", "isAboveAccelThreshold Yes" diff --git a/firmware/tunerstudio/generated/rusefi_f407-discovery.ini b/firmware/tunerstudio/generated/rusefi_f407-discovery.ini index 5b9b501d78..27882ff1bc 100644 --- a/firmware/tunerstudio/generated/rusefi_f407-discovery.ini +++ b/firmware/tunerstudio/generated/rusefi_f407-discovery.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.08.25.f407-discovery.1913309982" + signature = "rusEFI 2022.08.25.f407-discovery.2188533610" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.08.25.f407-discovery.1913309982" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.08.25.f407-discovery.2188533610" ; 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 @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Aug 25 14:52:07 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Aug 25 22:50:50 UTC 2022 pageSize = 21300 page = 1 @@ -2109,7 +2109,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1224 + ochBlockSize = 1232 ; ; see TunerStudioOutputChannels struct @@ -3022,170 +3022,172 @@ unusedBit_22_31 = bits, U32, 992, [31:31] egt1 = scalar, F32, 996, "", 1, 0 egt2 = scalar, F32, 1000, "", 1, 0 desiredRpmLimit = scalar, S16, 1004, "rpm", 1, 0 -; total TS size = 1008 -tpsFrom = scalar, F32, 1008 -tpsTo = scalar, F32, 1012 -deltaTps = scalar, F32, 1016 -extraFuel = scalar, F32, 1020, "", 1, 0 -valueFromTable = scalar, F32, 1024, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1028, [0:0] -isBelowDecelThreshold = bits, U32, 1028, [1:1] -isTimeToResetAccumulator = bits, U32, 1028, [2:2] -isFractionalEnrichment = bits, U32, 1028, [3:3] -belowEpsilon = bits, U32, 1028, [4:4] -tooShort = bits, U32, 1028, [5:5] -unusedBit_11_6 = bits, U32, 1028, [6:6] -unusedBit_11_7 = bits, U32, 1028, [7:7] -unusedBit_11_8 = bits, U32, 1028, [8:8] -unusedBit_11_9 = bits, U32, 1028, [9:9] -unusedBit_11_10 = bits, U32, 1028, [10:10] -unusedBit_11_11 = bits, U32, 1028, [11:11] -unusedBit_11_12 = bits, U32, 1028, [12:12] -unusedBit_11_13 = bits, U32, 1028, [13:13] -unusedBit_11_14 = bits, U32, 1028, [14:14] -unusedBit_11_15 = bits, U32, 1028, [15:15] -unusedBit_11_16 = bits, U32, 1028, [16:16] -unusedBit_11_17 = bits, U32, 1028, [17:17] -unusedBit_11_18 = bits, U32, 1028, [18:18] -unusedBit_11_19 = bits, U32, 1028, [19:19] -unusedBit_11_20 = bits, U32, 1028, [20:20] -unusedBit_11_21 = bits, U32, 1028, [21:21] -unusedBit_11_22 = bits, U32, 1028, [22:22] -unusedBit_11_23 = bits, U32, 1028, [23:23] -unusedBit_11_24 = bits, U32, 1028, [24:24] -unusedBit_11_25 = bits, U32, 1028, [25:25] -unusedBit_11_26 = bits, U32, 1028, [26:26] -unusedBit_11_27 = bits, U32, 1028, [27:27] -unusedBit_11_28 = bits, U32, 1028, [28:28] -unusedBit_11_29 = bits, U32, 1028, [29:29] -unusedBit_11_30 = bits, U32, 1028, [30:30] -unusedBit_11_31 = bits, U32, 1028, [31:31] -fractionalInjFuel = scalar, F32, 1032, "", 1, 0 -accumulatedValue = scalar, F32, 1036, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1040, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1044, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1048, "", 1, 0 -cycleCnt = scalar, S32, 1052, "", 1, 0 -; total TS size = 1056 -hwEventCounters1 = scalar, S32, 1056, "", 1, 0 -hwEventCounters2 = scalar, S32, 1060, "", 1, 0 -hwEventCounters3 = scalar, S32, 1064, "", 1, 0 -hwEventCounters4 = scalar, S32, 1068, "", 1, 0 -hwEventCounters5 = scalar, S32, 1072, "", 1, 0 -hwEventCounters6 = scalar, S32, 1076, "", 1, 0 -vvtCamCounter = scalar, S32, 1080, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1084, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1088, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1092, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1093, "", 1, 0 -; total TS size = 1096 -totalRevolutionCounter = scalar, U32, 1096, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1100, "", 1, 0 -vvtCurrentPosition = scalar, F32, 1104, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1108, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 1112, "", 1, 0 -triggerStateIndex = scalar, U08, 1116, "", 1, 0 -vvtCounter = scalar, U08, 1117, "", 1, 0 -camResyncCounter = scalar, U08, 1118, "", 1, 0 -vvtStateIndex = scalar, U08, 1119, "", 1, 0 -; total TS size = 1120 -m_hasSynchronizedPhase = bits, U32, 1120, [0:0] -unusedBit_1_1 = bits, U32, 1120, [1:1] -unusedBit_1_2 = bits, U32, 1120, [2:2] -unusedBit_1_3 = bits, U32, 1120, [3:3] -unusedBit_1_4 = bits, U32, 1120, [4:4] -unusedBit_1_5 = bits, U32, 1120, [5:5] -unusedBit_1_6 = bits, U32, 1120, [6:6] -unusedBit_1_7 = bits, U32, 1120, [7:7] -unusedBit_1_8 = bits, U32, 1120, [8:8] -unusedBit_1_9 = bits, U32, 1120, [9:9] -unusedBit_1_10 = bits, U32, 1120, [10:10] -unusedBit_1_11 = bits, U32, 1120, [11:11] -unusedBit_1_12 = bits, U32, 1120, [12:12] -unusedBit_1_13 = bits, U32, 1120, [13:13] -unusedBit_1_14 = bits, U32, 1120, [14:14] -unusedBit_1_15 = bits, U32, 1120, [15:15] -unusedBit_1_16 = bits, U32, 1120, [16:16] -unusedBit_1_17 = bits, U32, 1120, [17:17] -unusedBit_1_18 = bits, U32, 1120, [18:18] -unusedBit_1_19 = bits, U32, 1120, [19:19] -unusedBit_1_20 = bits, U32, 1120, [20:20] -unusedBit_1_21 = bits, U32, 1120, [21:21] -unusedBit_1_22 = bits, U32, 1120, [22:22] -unusedBit_1_23 = bits, U32, 1120, [23:23] -unusedBit_1_24 = bits, U32, 1120, [24:24] -unusedBit_1_25 = bits, U32, 1120, [25:25] -unusedBit_1_26 = bits, U32, 1120, [26:26] -unusedBit_1_27 = bits, U32, 1120, [27:27] -unusedBit_1_28 = bits, U32, 1120, [28:28] -unusedBit_1_29 = bits, U32, 1120, [29:29] -unusedBit_1_30 = bits, U32, 1120, [30:30] -unusedBit_1_31 = bits, U32, 1120, [31:31] -; total TS size = 1124 -wallFuelCorrection = scalar, F32, 1124, "", 1, 0 -wallFuel = scalar, F32, 1128, "", 1, 0 +fuelInjectionCounter = scalar, S32, 1008, "", 1, 0 +sparkCounter = scalar, S32, 1012, "", 1, 0 +; total TS size = 1016 +tpsFrom = scalar, F32, 1016 +tpsTo = scalar, F32, 1020 +deltaTps = scalar, F32, 1024 +extraFuel = scalar, F32, 1028, "", 1, 0 +valueFromTable = scalar, F32, 1032, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1036, [0:0] +isBelowDecelThreshold = bits, U32, 1036, [1:1] +isTimeToResetAccumulator = bits, U32, 1036, [2:2] +isFractionalEnrichment = bits, U32, 1036, [3:3] +belowEpsilon = bits, U32, 1036, [4:4] +tooShort = bits, U32, 1036, [5:5] +unusedBit_11_6 = bits, U32, 1036, [6:6] +unusedBit_11_7 = bits, U32, 1036, [7:7] +unusedBit_11_8 = bits, U32, 1036, [8:8] +unusedBit_11_9 = bits, U32, 1036, [9:9] +unusedBit_11_10 = bits, U32, 1036, [10:10] +unusedBit_11_11 = bits, U32, 1036, [11:11] +unusedBit_11_12 = bits, U32, 1036, [12:12] +unusedBit_11_13 = bits, U32, 1036, [13:13] +unusedBit_11_14 = bits, U32, 1036, [14:14] +unusedBit_11_15 = bits, U32, 1036, [15:15] +unusedBit_11_16 = bits, U32, 1036, [16:16] +unusedBit_11_17 = bits, U32, 1036, [17:17] +unusedBit_11_18 = bits, U32, 1036, [18:18] +unusedBit_11_19 = bits, U32, 1036, [19:19] +unusedBit_11_20 = bits, U32, 1036, [20:20] +unusedBit_11_21 = bits, U32, 1036, [21:21] +unusedBit_11_22 = bits, U32, 1036, [22:22] +unusedBit_11_23 = bits, U32, 1036, [23:23] +unusedBit_11_24 = bits, U32, 1036, [24:24] +unusedBit_11_25 = bits, U32, 1036, [25:25] +unusedBit_11_26 = bits, U32, 1036, [26:26] +unusedBit_11_27 = bits, U32, 1036, [27:27] +unusedBit_11_28 = bits, U32, 1036, [28:28] +unusedBit_11_29 = bits, U32, 1036, [29:29] +unusedBit_11_30 = bits, U32, 1036, [30:30] +unusedBit_11_31 = bits, U32, 1036, [31:31] +fractionalInjFuel = scalar, F32, 1040, "", 1, 0 +accumulatedValue = scalar, F32, 1044, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1048, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1052, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1056, "", 1, 0 +cycleCnt = scalar, S32, 1060, "", 1, 0 +; total TS size = 1064 +hwEventCounters1 = scalar, S32, 1064, "", 1, 0 +hwEventCounters2 = scalar, S32, 1068, "", 1, 0 +hwEventCounters3 = scalar, S32, 1072, "", 1, 0 +hwEventCounters4 = scalar, S32, 1076, "", 1, 0 +hwEventCounters5 = scalar, S32, 1080, "", 1, 0 +hwEventCounters6 = scalar, S32, 1084, "", 1, 0 +vvtCamCounter = scalar, S32, 1088, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1092, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1096, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1100, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1101, "", 1, 0 +; total TS size = 1104 +totalRevolutionCounter = scalar, U32, 1104, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1108, "", 1, 0 +vvtCurrentPosition = scalar, F32, 1112, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1116, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 1120, "", 1, 0 +triggerStateIndex = scalar, U08, 1124, "", 1, 0 +vvtCounter = scalar, U08, 1125, "", 1, 0 +camResyncCounter = scalar, U08, 1126, "", 1, 0 +vvtStateIndex = scalar, U08, 1127, "", 1, 0 +; total TS size = 1128 +m_hasSynchronizedPhase = bits, U32, 1128, [0:0] +unusedBit_1_1 = bits, U32, 1128, [1:1] +unusedBit_1_2 = bits, U32, 1128, [2:2] +unusedBit_1_3 = bits, U32, 1128, [3:3] +unusedBit_1_4 = bits, U32, 1128, [4:4] +unusedBit_1_5 = bits, U32, 1128, [5:5] +unusedBit_1_6 = bits, U32, 1128, [6:6] +unusedBit_1_7 = bits, U32, 1128, [7:7] +unusedBit_1_8 = bits, U32, 1128, [8:8] +unusedBit_1_9 = bits, U32, 1128, [9:9] +unusedBit_1_10 = bits, U32, 1128, [10:10] +unusedBit_1_11 = bits, U32, 1128, [11:11] +unusedBit_1_12 = bits, U32, 1128, [12:12] +unusedBit_1_13 = bits, U32, 1128, [13:13] +unusedBit_1_14 = bits, U32, 1128, [14:14] +unusedBit_1_15 = bits, U32, 1128, [15:15] +unusedBit_1_16 = bits, U32, 1128, [16:16] +unusedBit_1_17 = bits, U32, 1128, [17:17] +unusedBit_1_18 = bits, U32, 1128, [18:18] +unusedBit_1_19 = bits, U32, 1128, [19:19] +unusedBit_1_20 = bits, U32, 1128, [20:20] +unusedBit_1_21 = bits, U32, 1128, [21:21] +unusedBit_1_22 = bits, U32, 1128, [22:22] +unusedBit_1_23 = bits, U32, 1128, [23:23] +unusedBit_1_24 = bits, U32, 1128, [24:24] +unusedBit_1_25 = bits, U32, 1128, [25:25] +unusedBit_1_26 = bits, U32, 1128, [26:26] +unusedBit_1_27 = bits, U32, 1128, [27:27] +unusedBit_1_28 = bits, U32, 1128, [28:28] +unusedBit_1_29 = bits, U32, 1128, [29:29] +unusedBit_1_30 = bits, U32, 1128, [30:30] +unusedBit_1_31 = bits, U32, 1128, [31:31] ; total TS size = 1132 -idleState = bits, S32, 1132, [0:2], "not important" -currentIdlePosition = scalar, F32, 1136 -baseIdlePosition = scalar, F32, 1140 -iacByTpsTaper = scalar, F32, 1144 -throttlePedalUpState = scalar, S32, 1148, "", 1, 0 -mightResetPid = bits, U32, 1152, [0:0] -shouldResetPid = bits, U32, 1152, [1:1] -wasResetPid = bits, U32, 1152, [2:2] -mustResetPid = bits, U32, 1152, [3:3] -isCoasting = bits, U32, 1152, [4:4] -useIacTableForCoasting = bits, U32, 1152, [5:5] -notIdling = bits, U32, 1152, [6:6] -needReset = bits, U32, 1152, [7:7] -isInDeadZone = bits, U32, 1152, [8:8] -isBlipping = bits, U32, 1152, [9:9] -useClosedLoop = bits, U32, 1152, [10:10] -badTps = bits, U32, 1152, [11:11] -looksLikeRunning = bits, U32, 1152, [12:12] -looksLikeCoasting = bits, U32, 1152, [13:13] -looksLikeCrankToIdle = bits, U32, 1152, [14:14] -useInstantRpmForIdle = bits, U32, 1152, [15:15] -isVerboseIAC = bits, U32, 1152, [16:16] -unusedBit_22_17 = bits, U32, 1152, [17:17] -unusedBit_22_18 = bits, U32, 1152, [18:18] -unusedBit_22_19 = bits, U32, 1152, [19:19] -unusedBit_22_20 = bits, U32, 1152, [20:20] -unusedBit_22_21 = bits, U32, 1152, [21:21] -unusedBit_22_22 = bits, U32, 1152, [22:22] -unusedBit_22_23 = bits, U32, 1152, [23:23] -unusedBit_22_24 = bits, U32, 1152, [24:24] -unusedBit_22_25 = bits, U32, 1152, [25:25] -unusedBit_22_26 = bits, U32, 1152, [26:26] -unusedBit_22_27 = bits, U32, 1152, [27:27] -unusedBit_22_28 = bits, U32, 1152, [28:28] -unusedBit_22_29 = bits, U32, 1152, [29:29] -unusedBit_22_30 = bits, U32, 1152, [30:30] -unusedBit_22_31 = bits, U32, 1152, [31:31] -targetRpmByClt = scalar, S32, 1156, "", 1, 0 -targetRpmAcBump = scalar, S32, 1160, "", 1, 0 -iacByRpmTaper = scalar, F32, 1164 -luaAdd = scalar, F32, 1168 -; total TS size = 1172 -baseDwell = scalar, F32, 1172, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 1176, "", 1, 0 -luaTimingAdd = scalar, F32, 1180, "", 1, 0 -luaTimingMult = scalar, F32, 1184, "", 1, 0 -; total TS size = 1188 -idlePosition = scalar, F32, 1188, "", 1, 0 -trim = scalar, F32, 1192, "", 1, 0 -luaAdjustment = scalar, F32, 1196, "", 1, 0 -etbFeedForward = scalar, F32, 1200 -etbIntegralError = scalar, F32, 1204, "", 1, 0 -etbCurrentTarget = scalar, F32, 1208, "%", 1, 0 -; total TS size = 1212 -faultCode = scalar, U08, 1212, "", 1, 0 -heaterDuty = scalar, U08, 1213, "%", 1, 0 -pumpDuty = scalar, U08, 1214, "%", 1, 0 -tempC = scalar, U16, 1216, "C", 1, 0 -nernstVoltage = scalar, U16, 1218, "V", 0.001, 0 -esr = scalar, U16, 1220, "", 1, 0 -; total TS size = 1224 +wallFuelCorrection = scalar, F32, 1132, "", 1, 0 +wallFuel = scalar, F32, 1136, "", 1, 0 +; total TS size = 1140 +idleState = bits, S32, 1140, [0:2], "not important" +currentIdlePosition = scalar, F32, 1144 +baseIdlePosition = scalar, F32, 1148 +iacByTpsTaper = scalar, F32, 1152 +throttlePedalUpState = scalar, S32, 1156, "", 1, 0 +mightResetPid = bits, U32, 1160, [0:0] +shouldResetPid = bits, U32, 1160, [1:1] +wasResetPid = bits, U32, 1160, [2:2] +mustResetPid = bits, U32, 1160, [3:3] +isCoasting = bits, U32, 1160, [4:4] +useIacTableForCoasting = bits, U32, 1160, [5:5] +notIdling = bits, U32, 1160, [6:6] +needReset = bits, U32, 1160, [7:7] +isInDeadZone = bits, U32, 1160, [8:8] +isBlipping = bits, U32, 1160, [9:9] +useClosedLoop = bits, U32, 1160, [10:10] +badTps = bits, U32, 1160, [11:11] +looksLikeRunning = bits, U32, 1160, [12:12] +looksLikeCoasting = bits, U32, 1160, [13:13] +looksLikeCrankToIdle = bits, U32, 1160, [14:14] +useInstantRpmForIdle = bits, U32, 1160, [15:15] +isVerboseIAC = bits, U32, 1160, [16:16] +unusedBit_22_17 = bits, U32, 1160, [17:17] +unusedBit_22_18 = bits, U32, 1160, [18:18] +unusedBit_22_19 = bits, U32, 1160, [19:19] +unusedBit_22_20 = bits, U32, 1160, [20:20] +unusedBit_22_21 = bits, U32, 1160, [21:21] +unusedBit_22_22 = bits, U32, 1160, [22:22] +unusedBit_22_23 = bits, U32, 1160, [23:23] +unusedBit_22_24 = bits, U32, 1160, [24:24] +unusedBit_22_25 = bits, U32, 1160, [25:25] +unusedBit_22_26 = bits, U32, 1160, [26:26] +unusedBit_22_27 = bits, U32, 1160, [27:27] +unusedBit_22_28 = bits, U32, 1160, [28:28] +unusedBit_22_29 = bits, U32, 1160, [29:29] +unusedBit_22_30 = bits, U32, 1160, [30:30] +unusedBit_22_31 = bits, U32, 1160, [31:31] +targetRpmByClt = scalar, S32, 1164, "", 1, 0 +targetRpmAcBump = scalar, S32, 1168, "", 1, 0 +iacByRpmTaper = scalar, F32, 1172 +luaAdd = scalar, F32, 1176 +; total TS size = 1180 +baseDwell = scalar, F32, 1180, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 1184, "", 1, 0 +luaTimingAdd = scalar, F32, 1188, "", 1, 0 +luaTimingMult = scalar, F32, 1192, "", 1, 0 +; total TS size = 1196 +idlePosition = scalar, F32, 1196, "", 1, 0 +trim = scalar, F32, 1200, "", 1, 0 +luaAdjustment = scalar, F32, 1204, "", 1, 0 +etbFeedForward = scalar, F32, 1208 +etbIntegralError = scalar, F32, 1212, "", 1, 0 +etbCurrentTarget = scalar, F32, 1216, "%", 1, 0 +; total TS size = 1220 +faultCode = scalar, U08, 1220, "", 1, 0 +heaterDuty = scalar, U08, 1221, "%", 1, 0 +pumpDuty = scalar, U08, 1222, "%", 1, 0 +tempC = scalar, U16, 1224, "C", 1, 0 +nernstVoltage = scalar, U16, 1226, "V", 0.001, 0 +esr = scalar, U16, 1228, "", 1, 0 +; total TS size = 1232 time = { timeNow } @@ -4757,6 +4759,8 @@ entry = brakePedalState, "brake: down", int, "%d" entry = egt1, "egt1", float, "%.3f" entry = egt2, "egt2", float, "%.3f" entry = desiredRpmLimit, "User-defined RPM hard limit", int, "%d" +entry = fuelInjectionCounter, "fuelInjectionCounter", int, "%d" +entry = sparkCounter, "sparkCounter", int, "%d" entry = tpsFrom, "tpsFrom", float, "%.3f" entry = tpsTo, "tpsTo", float, "%.3f" entry = deltaTps, "deltaTps", float, "%.3f" @@ -5502,6 +5506,8 @@ dialog = engine_stateDialog, "engine_state" graphLine = egt2 liveGraph = engine_state_10_Graph, "Graph", South graphLine = desiredRpmLimit + graphLine = fuelInjectionCounter + graphLine = sparkCounter indicatorPanel = tps_accel_stateIndicatorPanel, 2 indicator = {isAboveAccelThreshold}, "isAboveAccelThreshold No", "isAboveAccelThreshold Yes" diff --git a/firmware/tunerstudio/generated/rusefi_f429-discovery.ini b/firmware/tunerstudio/generated/rusefi_f429-discovery.ini index 23b5c9ba2c..4535315392 100644 --- a/firmware/tunerstudio/generated/rusefi_f429-discovery.ini +++ b/firmware/tunerstudio/generated/rusefi_f429-discovery.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.08.25.f429-discovery.1913309982" + signature = "rusEFI 2022.08.25.f429-discovery.2188533610" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.08.25.f429-discovery.1913309982" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.08.25.f429-discovery.2188533610" ; 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 @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Aug 25 14:52:09 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Aug 25 22:50:52 UTC 2022 pageSize = 21300 page = 1 @@ -2109,7 +2109,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1224 + ochBlockSize = 1232 ; ; see TunerStudioOutputChannels struct @@ -3022,170 +3022,172 @@ unusedBit_22_31 = bits, U32, 992, [31:31] egt1 = scalar, F32, 996, "", 1, 0 egt2 = scalar, F32, 1000, "", 1, 0 desiredRpmLimit = scalar, S16, 1004, "rpm", 1, 0 -; total TS size = 1008 -tpsFrom = scalar, F32, 1008 -tpsTo = scalar, F32, 1012 -deltaTps = scalar, F32, 1016 -extraFuel = scalar, F32, 1020, "", 1, 0 -valueFromTable = scalar, F32, 1024, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1028, [0:0] -isBelowDecelThreshold = bits, U32, 1028, [1:1] -isTimeToResetAccumulator = bits, U32, 1028, [2:2] -isFractionalEnrichment = bits, U32, 1028, [3:3] -belowEpsilon = bits, U32, 1028, [4:4] -tooShort = bits, U32, 1028, [5:5] -unusedBit_11_6 = bits, U32, 1028, [6:6] -unusedBit_11_7 = bits, U32, 1028, [7:7] -unusedBit_11_8 = bits, U32, 1028, [8:8] -unusedBit_11_9 = bits, U32, 1028, [9:9] -unusedBit_11_10 = bits, U32, 1028, [10:10] -unusedBit_11_11 = bits, U32, 1028, [11:11] -unusedBit_11_12 = bits, U32, 1028, [12:12] -unusedBit_11_13 = bits, U32, 1028, [13:13] -unusedBit_11_14 = bits, U32, 1028, [14:14] -unusedBit_11_15 = bits, U32, 1028, [15:15] -unusedBit_11_16 = bits, U32, 1028, [16:16] -unusedBit_11_17 = bits, U32, 1028, [17:17] -unusedBit_11_18 = bits, U32, 1028, [18:18] -unusedBit_11_19 = bits, U32, 1028, [19:19] -unusedBit_11_20 = bits, U32, 1028, [20:20] -unusedBit_11_21 = bits, U32, 1028, [21:21] -unusedBit_11_22 = bits, U32, 1028, [22:22] -unusedBit_11_23 = bits, U32, 1028, [23:23] -unusedBit_11_24 = bits, U32, 1028, [24:24] -unusedBit_11_25 = bits, U32, 1028, [25:25] -unusedBit_11_26 = bits, U32, 1028, [26:26] -unusedBit_11_27 = bits, U32, 1028, [27:27] -unusedBit_11_28 = bits, U32, 1028, [28:28] -unusedBit_11_29 = bits, U32, 1028, [29:29] -unusedBit_11_30 = bits, U32, 1028, [30:30] -unusedBit_11_31 = bits, U32, 1028, [31:31] -fractionalInjFuel = scalar, F32, 1032, "", 1, 0 -accumulatedValue = scalar, F32, 1036, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1040, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1044, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1048, "", 1, 0 -cycleCnt = scalar, S32, 1052, "", 1, 0 -; total TS size = 1056 -hwEventCounters1 = scalar, S32, 1056, "", 1, 0 -hwEventCounters2 = scalar, S32, 1060, "", 1, 0 -hwEventCounters3 = scalar, S32, 1064, "", 1, 0 -hwEventCounters4 = scalar, S32, 1068, "", 1, 0 -hwEventCounters5 = scalar, S32, 1072, "", 1, 0 -hwEventCounters6 = scalar, S32, 1076, "", 1, 0 -vvtCamCounter = scalar, S32, 1080, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1084, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1088, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1092, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1093, "", 1, 0 -; total TS size = 1096 -totalRevolutionCounter = scalar, U32, 1096, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1100, "", 1, 0 -vvtCurrentPosition = scalar, F32, 1104, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1108, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 1112, "", 1, 0 -triggerStateIndex = scalar, U08, 1116, "", 1, 0 -vvtCounter = scalar, U08, 1117, "", 1, 0 -camResyncCounter = scalar, U08, 1118, "", 1, 0 -vvtStateIndex = scalar, U08, 1119, "", 1, 0 -; total TS size = 1120 -m_hasSynchronizedPhase = bits, U32, 1120, [0:0] -unusedBit_1_1 = bits, U32, 1120, [1:1] -unusedBit_1_2 = bits, U32, 1120, [2:2] -unusedBit_1_3 = bits, U32, 1120, [3:3] -unusedBit_1_4 = bits, U32, 1120, [4:4] -unusedBit_1_5 = bits, U32, 1120, [5:5] -unusedBit_1_6 = bits, U32, 1120, [6:6] -unusedBit_1_7 = bits, U32, 1120, [7:7] -unusedBit_1_8 = bits, U32, 1120, [8:8] -unusedBit_1_9 = bits, U32, 1120, [9:9] -unusedBit_1_10 = bits, U32, 1120, [10:10] -unusedBit_1_11 = bits, U32, 1120, [11:11] -unusedBit_1_12 = bits, U32, 1120, [12:12] -unusedBit_1_13 = bits, U32, 1120, [13:13] -unusedBit_1_14 = bits, U32, 1120, [14:14] -unusedBit_1_15 = bits, U32, 1120, [15:15] -unusedBit_1_16 = bits, U32, 1120, [16:16] -unusedBit_1_17 = bits, U32, 1120, [17:17] -unusedBit_1_18 = bits, U32, 1120, [18:18] -unusedBit_1_19 = bits, U32, 1120, [19:19] -unusedBit_1_20 = bits, U32, 1120, [20:20] -unusedBit_1_21 = bits, U32, 1120, [21:21] -unusedBit_1_22 = bits, U32, 1120, [22:22] -unusedBit_1_23 = bits, U32, 1120, [23:23] -unusedBit_1_24 = bits, U32, 1120, [24:24] -unusedBit_1_25 = bits, U32, 1120, [25:25] -unusedBit_1_26 = bits, U32, 1120, [26:26] -unusedBit_1_27 = bits, U32, 1120, [27:27] -unusedBit_1_28 = bits, U32, 1120, [28:28] -unusedBit_1_29 = bits, U32, 1120, [29:29] -unusedBit_1_30 = bits, U32, 1120, [30:30] -unusedBit_1_31 = bits, U32, 1120, [31:31] -; total TS size = 1124 -wallFuelCorrection = scalar, F32, 1124, "", 1, 0 -wallFuel = scalar, F32, 1128, "", 1, 0 +fuelInjectionCounter = scalar, S32, 1008, "", 1, 0 +sparkCounter = scalar, S32, 1012, "", 1, 0 +; total TS size = 1016 +tpsFrom = scalar, F32, 1016 +tpsTo = scalar, F32, 1020 +deltaTps = scalar, F32, 1024 +extraFuel = scalar, F32, 1028, "", 1, 0 +valueFromTable = scalar, F32, 1032, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1036, [0:0] +isBelowDecelThreshold = bits, U32, 1036, [1:1] +isTimeToResetAccumulator = bits, U32, 1036, [2:2] +isFractionalEnrichment = bits, U32, 1036, [3:3] +belowEpsilon = bits, U32, 1036, [4:4] +tooShort = bits, U32, 1036, [5:5] +unusedBit_11_6 = bits, U32, 1036, [6:6] +unusedBit_11_7 = bits, U32, 1036, [7:7] +unusedBit_11_8 = bits, U32, 1036, [8:8] +unusedBit_11_9 = bits, U32, 1036, [9:9] +unusedBit_11_10 = bits, U32, 1036, [10:10] +unusedBit_11_11 = bits, U32, 1036, [11:11] +unusedBit_11_12 = bits, U32, 1036, [12:12] +unusedBit_11_13 = bits, U32, 1036, [13:13] +unusedBit_11_14 = bits, U32, 1036, [14:14] +unusedBit_11_15 = bits, U32, 1036, [15:15] +unusedBit_11_16 = bits, U32, 1036, [16:16] +unusedBit_11_17 = bits, U32, 1036, [17:17] +unusedBit_11_18 = bits, U32, 1036, [18:18] +unusedBit_11_19 = bits, U32, 1036, [19:19] +unusedBit_11_20 = bits, U32, 1036, [20:20] +unusedBit_11_21 = bits, U32, 1036, [21:21] +unusedBit_11_22 = bits, U32, 1036, [22:22] +unusedBit_11_23 = bits, U32, 1036, [23:23] +unusedBit_11_24 = bits, U32, 1036, [24:24] +unusedBit_11_25 = bits, U32, 1036, [25:25] +unusedBit_11_26 = bits, U32, 1036, [26:26] +unusedBit_11_27 = bits, U32, 1036, [27:27] +unusedBit_11_28 = bits, U32, 1036, [28:28] +unusedBit_11_29 = bits, U32, 1036, [29:29] +unusedBit_11_30 = bits, U32, 1036, [30:30] +unusedBit_11_31 = bits, U32, 1036, [31:31] +fractionalInjFuel = scalar, F32, 1040, "", 1, 0 +accumulatedValue = scalar, F32, 1044, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1048, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1052, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1056, "", 1, 0 +cycleCnt = scalar, S32, 1060, "", 1, 0 +; total TS size = 1064 +hwEventCounters1 = scalar, S32, 1064, "", 1, 0 +hwEventCounters2 = scalar, S32, 1068, "", 1, 0 +hwEventCounters3 = scalar, S32, 1072, "", 1, 0 +hwEventCounters4 = scalar, S32, 1076, "", 1, 0 +hwEventCounters5 = scalar, S32, 1080, "", 1, 0 +hwEventCounters6 = scalar, S32, 1084, "", 1, 0 +vvtCamCounter = scalar, S32, 1088, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1092, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1096, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1100, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1101, "", 1, 0 +; total TS size = 1104 +totalRevolutionCounter = scalar, U32, 1104, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1108, "", 1, 0 +vvtCurrentPosition = scalar, F32, 1112, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1116, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 1120, "", 1, 0 +triggerStateIndex = scalar, U08, 1124, "", 1, 0 +vvtCounter = scalar, U08, 1125, "", 1, 0 +camResyncCounter = scalar, U08, 1126, "", 1, 0 +vvtStateIndex = scalar, U08, 1127, "", 1, 0 +; total TS size = 1128 +m_hasSynchronizedPhase = bits, U32, 1128, [0:0] +unusedBit_1_1 = bits, U32, 1128, [1:1] +unusedBit_1_2 = bits, U32, 1128, [2:2] +unusedBit_1_3 = bits, U32, 1128, [3:3] +unusedBit_1_4 = bits, U32, 1128, [4:4] +unusedBit_1_5 = bits, U32, 1128, [5:5] +unusedBit_1_6 = bits, U32, 1128, [6:6] +unusedBit_1_7 = bits, U32, 1128, [7:7] +unusedBit_1_8 = bits, U32, 1128, [8:8] +unusedBit_1_9 = bits, U32, 1128, [9:9] +unusedBit_1_10 = bits, U32, 1128, [10:10] +unusedBit_1_11 = bits, U32, 1128, [11:11] +unusedBit_1_12 = bits, U32, 1128, [12:12] +unusedBit_1_13 = bits, U32, 1128, [13:13] +unusedBit_1_14 = bits, U32, 1128, [14:14] +unusedBit_1_15 = bits, U32, 1128, [15:15] +unusedBit_1_16 = bits, U32, 1128, [16:16] +unusedBit_1_17 = bits, U32, 1128, [17:17] +unusedBit_1_18 = bits, U32, 1128, [18:18] +unusedBit_1_19 = bits, U32, 1128, [19:19] +unusedBit_1_20 = bits, U32, 1128, [20:20] +unusedBit_1_21 = bits, U32, 1128, [21:21] +unusedBit_1_22 = bits, U32, 1128, [22:22] +unusedBit_1_23 = bits, U32, 1128, [23:23] +unusedBit_1_24 = bits, U32, 1128, [24:24] +unusedBit_1_25 = bits, U32, 1128, [25:25] +unusedBit_1_26 = bits, U32, 1128, [26:26] +unusedBit_1_27 = bits, U32, 1128, [27:27] +unusedBit_1_28 = bits, U32, 1128, [28:28] +unusedBit_1_29 = bits, U32, 1128, [29:29] +unusedBit_1_30 = bits, U32, 1128, [30:30] +unusedBit_1_31 = bits, U32, 1128, [31:31] ; total TS size = 1132 -idleState = bits, S32, 1132, [0:2], "not important" -currentIdlePosition = scalar, F32, 1136 -baseIdlePosition = scalar, F32, 1140 -iacByTpsTaper = scalar, F32, 1144 -throttlePedalUpState = scalar, S32, 1148, "", 1, 0 -mightResetPid = bits, U32, 1152, [0:0] -shouldResetPid = bits, U32, 1152, [1:1] -wasResetPid = bits, U32, 1152, [2:2] -mustResetPid = bits, U32, 1152, [3:3] -isCoasting = bits, U32, 1152, [4:4] -useIacTableForCoasting = bits, U32, 1152, [5:5] -notIdling = bits, U32, 1152, [6:6] -needReset = bits, U32, 1152, [7:7] -isInDeadZone = bits, U32, 1152, [8:8] -isBlipping = bits, U32, 1152, [9:9] -useClosedLoop = bits, U32, 1152, [10:10] -badTps = bits, U32, 1152, [11:11] -looksLikeRunning = bits, U32, 1152, [12:12] -looksLikeCoasting = bits, U32, 1152, [13:13] -looksLikeCrankToIdle = bits, U32, 1152, [14:14] -useInstantRpmForIdle = bits, U32, 1152, [15:15] -isVerboseIAC = bits, U32, 1152, [16:16] -unusedBit_22_17 = bits, U32, 1152, [17:17] -unusedBit_22_18 = bits, U32, 1152, [18:18] -unusedBit_22_19 = bits, U32, 1152, [19:19] -unusedBit_22_20 = bits, U32, 1152, [20:20] -unusedBit_22_21 = bits, U32, 1152, [21:21] -unusedBit_22_22 = bits, U32, 1152, [22:22] -unusedBit_22_23 = bits, U32, 1152, [23:23] -unusedBit_22_24 = bits, U32, 1152, [24:24] -unusedBit_22_25 = bits, U32, 1152, [25:25] -unusedBit_22_26 = bits, U32, 1152, [26:26] -unusedBit_22_27 = bits, U32, 1152, [27:27] -unusedBit_22_28 = bits, U32, 1152, [28:28] -unusedBit_22_29 = bits, U32, 1152, [29:29] -unusedBit_22_30 = bits, U32, 1152, [30:30] -unusedBit_22_31 = bits, U32, 1152, [31:31] -targetRpmByClt = scalar, S32, 1156, "", 1, 0 -targetRpmAcBump = scalar, S32, 1160, "", 1, 0 -iacByRpmTaper = scalar, F32, 1164 -luaAdd = scalar, F32, 1168 -; total TS size = 1172 -baseDwell = scalar, F32, 1172, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 1176, "", 1, 0 -luaTimingAdd = scalar, F32, 1180, "", 1, 0 -luaTimingMult = scalar, F32, 1184, "", 1, 0 -; total TS size = 1188 -idlePosition = scalar, F32, 1188, "", 1, 0 -trim = scalar, F32, 1192, "", 1, 0 -luaAdjustment = scalar, F32, 1196, "", 1, 0 -etbFeedForward = scalar, F32, 1200 -etbIntegralError = scalar, F32, 1204, "", 1, 0 -etbCurrentTarget = scalar, F32, 1208, "%", 1, 0 -; total TS size = 1212 -faultCode = scalar, U08, 1212, "", 1, 0 -heaterDuty = scalar, U08, 1213, "%", 1, 0 -pumpDuty = scalar, U08, 1214, "%", 1, 0 -tempC = scalar, U16, 1216, "C", 1, 0 -nernstVoltage = scalar, U16, 1218, "V", 0.001, 0 -esr = scalar, U16, 1220, "", 1, 0 -; total TS size = 1224 +wallFuelCorrection = scalar, F32, 1132, "", 1, 0 +wallFuel = scalar, F32, 1136, "", 1, 0 +; total TS size = 1140 +idleState = bits, S32, 1140, [0:2], "not important" +currentIdlePosition = scalar, F32, 1144 +baseIdlePosition = scalar, F32, 1148 +iacByTpsTaper = scalar, F32, 1152 +throttlePedalUpState = scalar, S32, 1156, "", 1, 0 +mightResetPid = bits, U32, 1160, [0:0] +shouldResetPid = bits, U32, 1160, [1:1] +wasResetPid = bits, U32, 1160, [2:2] +mustResetPid = bits, U32, 1160, [3:3] +isCoasting = bits, U32, 1160, [4:4] +useIacTableForCoasting = bits, U32, 1160, [5:5] +notIdling = bits, U32, 1160, [6:6] +needReset = bits, U32, 1160, [7:7] +isInDeadZone = bits, U32, 1160, [8:8] +isBlipping = bits, U32, 1160, [9:9] +useClosedLoop = bits, U32, 1160, [10:10] +badTps = bits, U32, 1160, [11:11] +looksLikeRunning = bits, U32, 1160, [12:12] +looksLikeCoasting = bits, U32, 1160, [13:13] +looksLikeCrankToIdle = bits, U32, 1160, [14:14] +useInstantRpmForIdle = bits, U32, 1160, [15:15] +isVerboseIAC = bits, U32, 1160, [16:16] +unusedBit_22_17 = bits, U32, 1160, [17:17] +unusedBit_22_18 = bits, U32, 1160, [18:18] +unusedBit_22_19 = bits, U32, 1160, [19:19] +unusedBit_22_20 = bits, U32, 1160, [20:20] +unusedBit_22_21 = bits, U32, 1160, [21:21] +unusedBit_22_22 = bits, U32, 1160, [22:22] +unusedBit_22_23 = bits, U32, 1160, [23:23] +unusedBit_22_24 = bits, U32, 1160, [24:24] +unusedBit_22_25 = bits, U32, 1160, [25:25] +unusedBit_22_26 = bits, U32, 1160, [26:26] +unusedBit_22_27 = bits, U32, 1160, [27:27] +unusedBit_22_28 = bits, U32, 1160, [28:28] +unusedBit_22_29 = bits, U32, 1160, [29:29] +unusedBit_22_30 = bits, U32, 1160, [30:30] +unusedBit_22_31 = bits, U32, 1160, [31:31] +targetRpmByClt = scalar, S32, 1164, "", 1, 0 +targetRpmAcBump = scalar, S32, 1168, "", 1, 0 +iacByRpmTaper = scalar, F32, 1172 +luaAdd = scalar, F32, 1176 +; total TS size = 1180 +baseDwell = scalar, F32, 1180, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 1184, "", 1, 0 +luaTimingAdd = scalar, F32, 1188, "", 1, 0 +luaTimingMult = scalar, F32, 1192, "", 1, 0 +; total TS size = 1196 +idlePosition = scalar, F32, 1196, "", 1, 0 +trim = scalar, F32, 1200, "", 1, 0 +luaAdjustment = scalar, F32, 1204, "", 1, 0 +etbFeedForward = scalar, F32, 1208 +etbIntegralError = scalar, F32, 1212, "", 1, 0 +etbCurrentTarget = scalar, F32, 1216, "%", 1, 0 +; total TS size = 1220 +faultCode = scalar, U08, 1220, "", 1, 0 +heaterDuty = scalar, U08, 1221, "%", 1, 0 +pumpDuty = scalar, U08, 1222, "%", 1, 0 +tempC = scalar, U16, 1224, "C", 1, 0 +nernstVoltage = scalar, U16, 1226, "V", 0.001, 0 +esr = scalar, U16, 1228, "", 1, 0 +; total TS size = 1232 time = { timeNow } @@ -4757,6 +4759,8 @@ entry = brakePedalState, "brake: down", int, "%d" entry = egt1, "egt1", float, "%.3f" entry = egt2, "egt2", float, "%.3f" entry = desiredRpmLimit, "User-defined RPM hard limit", int, "%d" +entry = fuelInjectionCounter, "fuelInjectionCounter", int, "%d" +entry = sparkCounter, "sparkCounter", int, "%d" entry = tpsFrom, "tpsFrom", float, "%.3f" entry = tpsTo, "tpsTo", float, "%.3f" entry = deltaTps, "deltaTps", float, "%.3f" @@ -5502,6 +5506,8 @@ dialog = engine_stateDialog, "engine_state" graphLine = egt2 liveGraph = engine_state_10_Graph, "Graph", South graphLine = desiredRpmLimit + graphLine = fuelInjectionCounter + graphLine = sparkCounter indicatorPanel = tps_accel_stateIndicatorPanel, 2 indicator = {isAboveAccelThreshold}, "isAboveAccelThreshold No", "isAboveAccelThreshold Yes" diff --git a/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini b/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini index eabce704bd..b3859a02a0 100644 --- a/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini +++ b/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.08.25.frankenso_na6.812005338" + signature = "rusEFI 2022.08.25.frankenso_na6.3223233454" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.08.25.frankenso_na6.812005338" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.08.25.frankenso_na6.3223233454" ; 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 @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Aug 25 14:51:54 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Aug 25 22:50:39 UTC 2022 pageSize = 21300 page = 1 @@ -2109,7 +2109,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1224 + ochBlockSize = 1232 ; ; see TunerStudioOutputChannels struct @@ -3022,170 +3022,172 @@ unusedBit_22_31 = bits, U32, 992, [31:31] egt1 = scalar, F32, 996, "", 1, 0 egt2 = scalar, F32, 1000, "", 1, 0 desiredRpmLimit = scalar, S16, 1004, "rpm", 1, 0 -; total TS size = 1008 -tpsFrom = scalar, F32, 1008 -tpsTo = scalar, F32, 1012 -deltaTps = scalar, F32, 1016 -extraFuel = scalar, F32, 1020, "", 1, 0 -valueFromTable = scalar, F32, 1024, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1028, [0:0] -isBelowDecelThreshold = bits, U32, 1028, [1:1] -isTimeToResetAccumulator = bits, U32, 1028, [2:2] -isFractionalEnrichment = bits, U32, 1028, [3:3] -belowEpsilon = bits, U32, 1028, [4:4] -tooShort = bits, U32, 1028, [5:5] -unusedBit_11_6 = bits, U32, 1028, [6:6] -unusedBit_11_7 = bits, U32, 1028, [7:7] -unusedBit_11_8 = bits, U32, 1028, [8:8] -unusedBit_11_9 = bits, U32, 1028, [9:9] -unusedBit_11_10 = bits, U32, 1028, [10:10] -unusedBit_11_11 = bits, U32, 1028, [11:11] -unusedBit_11_12 = bits, U32, 1028, [12:12] -unusedBit_11_13 = bits, U32, 1028, [13:13] -unusedBit_11_14 = bits, U32, 1028, [14:14] -unusedBit_11_15 = bits, U32, 1028, [15:15] -unusedBit_11_16 = bits, U32, 1028, [16:16] -unusedBit_11_17 = bits, U32, 1028, [17:17] -unusedBit_11_18 = bits, U32, 1028, [18:18] -unusedBit_11_19 = bits, U32, 1028, [19:19] -unusedBit_11_20 = bits, U32, 1028, [20:20] -unusedBit_11_21 = bits, U32, 1028, [21:21] -unusedBit_11_22 = bits, U32, 1028, [22:22] -unusedBit_11_23 = bits, U32, 1028, [23:23] -unusedBit_11_24 = bits, U32, 1028, [24:24] -unusedBit_11_25 = bits, U32, 1028, [25:25] -unusedBit_11_26 = bits, U32, 1028, [26:26] -unusedBit_11_27 = bits, U32, 1028, [27:27] -unusedBit_11_28 = bits, U32, 1028, [28:28] -unusedBit_11_29 = bits, U32, 1028, [29:29] -unusedBit_11_30 = bits, U32, 1028, [30:30] -unusedBit_11_31 = bits, U32, 1028, [31:31] -fractionalInjFuel = scalar, F32, 1032, "", 1, 0 -accumulatedValue = scalar, F32, 1036, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1040, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1044, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1048, "", 1, 0 -cycleCnt = scalar, S32, 1052, "", 1, 0 -; total TS size = 1056 -hwEventCounters1 = scalar, S32, 1056, "", 1, 0 -hwEventCounters2 = scalar, S32, 1060, "", 1, 0 -hwEventCounters3 = scalar, S32, 1064, "", 1, 0 -hwEventCounters4 = scalar, S32, 1068, "", 1, 0 -hwEventCounters5 = scalar, S32, 1072, "", 1, 0 -hwEventCounters6 = scalar, S32, 1076, "", 1, 0 -vvtCamCounter = scalar, S32, 1080, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1084, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1088, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1092, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1093, "", 1, 0 -; total TS size = 1096 -totalRevolutionCounter = scalar, U32, 1096, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1100, "", 1, 0 -vvtCurrentPosition = scalar, F32, 1104, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1108, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 1112, "", 1, 0 -triggerStateIndex = scalar, U08, 1116, "", 1, 0 -vvtCounter = scalar, U08, 1117, "", 1, 0 -camResyncCounter = scalar, U08, 1118, "", 1, 0 -vvtStateIndex = scalar, U08, 1119, "", 1, 0 -; total TS size = 1120 -m_hasSynchronizedPhase = bits, U32, 1120, [0:0] -unusedBit_1_1 = bits, U32, 1120, [1:1] -unusedBit_1_2 = bits, U32, 1120, [2:2] -unusedBit_1_3 = bits, U32, 1120, [3:3] -unusedBit_1_4 = bits, U32, 1120, [4:4] -unusedBit_1_5 = bits, U32, 1120, [5:5] -unusedBit_1_6 = bits, U32, 1120, [6:6] -unusedBit_1_7 = bits, U32, 1120, [7:7] -unusedBit_1_8 = bits, U32, 1120, [8:8] -unusedBit_1_9 = bits, U32, 1120, [9:9] -unusedBit_1_10 = bits, U32, 1120, [10:10] -unusedBit_1_11 = bits, U32, 1120, [11:11] -unusedBit_1_12 = bits, U32, 1120, [12:12] -unusedBit_1_13 = bits, U32, 1120, [13:13] -unusedBit_1_14 = bits, U32, 1120, [14:14] -unusedBit_1_15 = bits, U32, 1120, [15:15] -unusedBit_1_16 = bits, U32, 1120, [16:16] -unusedBit_1_17 = bits, U32, 1120, [17:17] -unusedBit_1_18 = bits, U32, 1120, [18:18] -unusedBit_1_19 = bits, U32, 1120, [19:19] -unusedBit_1_20 = bits, U32, 1120, [20:20] -unusedBit_1_21 = bits, U32, 1120, [21:21] -unusedBit_1_22 = bits, U32, 1120, [22:22] -unusedBit_1_23 = bits, U32, 1120, [23:23] -unusedBit_1_24 = bits, U32, 1120, [24:24] -unusedBit_1_25 = bits, U32, 1120, [25:25] -unusedBit_1_26 = bits, U32, 1120, [26:26] -unusedBit_1_27 = bits, U32, 1120, [27:27] -unusedBit_1_28 = bits, U32, 1120, [28:28] -unusedBit_1_29 = bits, U32, 1120, [29:29] -unusedBit_1_30 = bits, U32, 1120, [30:30] -unusedBit_1_31 = bits, U32, 1120, [31:31] -; total TS size = 1124 -wallFuelCorrection = scalar, F32, 1124, "", 1, 0 -wallFuel = scalar, F32, 1128, "", 1, 0 +fuelInjectionCounter = scalar, S32, 1008, "", 1, 0 +sparkCounter = scalar, S32, 1012, "", 1, 0 +; total TS size = 1016 +tpsFrom = scalar, F32, 1016 +tpsTo = scalar, F32, 1020 +deltaTps = scalar, F32, 1024 +extraFuel = scalar, F32, 1028, "", 1, 0 +valueFromTable = scalar, F32, 1032, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1036, [0:0] +isBelowDecelThreshold = bits, U32, 1036, [1:1] +isTimeToResetAccumulator = bits, U32, 1036, [2:2] +isFractionalEnrichment = bits, U32, 1036, [3:3] +belowEpsilon = bits, U32, 1036, [4:4] +tooShort = bits, U32, 1036, [5:5] +unusedBit_11_6 = bits, U32, 1036, [6:6] +unusedBit_11_7 = bits, U32, 1036, [7:7] +unusedBit_11_8 = bits, U32, 1036, [8:8] +unusedBit_11_9 = bits, U32, 1036, [9:9] +unusedBit_11_10 = bits, U32, 1036, [10:10] +unusedBit_11_11 = bits, U32, 1036, [11:11] +unusedBit_11_12 = bits, U32, 1036, [12:12] +unusedBit_11_13 = bits, U32, 1036, [13:13] +unusedBit_11_14 = bits, U32, 1036, [14:14] +unusedBit_11_15 = bits, U32, 1036, [15:15] +unusedBit_11_16 = bits, U32, 1036, [16:16] +unusedBit_11_17 = bits, U32, 1036, [17:17] +unusedBit_11_18 = bits, U32, 1036, [18:18] +unusedBit_11_19 = bits, U32, 1036, [19:19] +unusedBit_11_20 = bits, U32, 1036, [20:20] +unusedBit_11_21 = bits, U32, 1036, [21:21] +unusedBit_11_22 = bits, U32, 1036, [22:22] +unusedBit_11_23 = bits, U32, 1036, [23:23] +unusedBit_11_24 = bits, U32, 1036, [24:24] +unusedBit_11_25 = bits, U32, 1036, [25:25] +unusedBit_11_26 = bits, U32, 1036, [26:26] +unusedBit_11_27 = bits, U32, 1036, [27:27] +unusedBit_11_28 = bits, U32, 1036, [28:28] +unusedBit_11_29 = bits, U32, 1036, [29:29] +unusedBit_11_30 = bits, U32, 1036, [30:30] +unusedBit_11_31 = bits, U32, 1036, [31:31] +fractionalInjFuel = scalar, F32, 1040, "", 1, 0 +accumulatedValue = scalar, F32, 1044, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1048, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1052, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1056, "", 1, 0 +cycleCnt = scalar, S32, 1060, "", 1, 0 +; total TS size = 1064 +hwEventCounters1 = scalar, S32, 1064, "", 1, 0 +hwEventCounters2 = scalar, S32, 1068, "", 1, 0 +hwEventCounters3 = scalar, S32, 1072, "", 1, 0 +hwEventCounters4 = scalar, S32, 1076, "", 1, 0 +hwEventCounters5 = scalar, S32, 1080, "", 1, 0 +hwEventCounters6 = scalar, S32, 1084, "", 1, 0 +vvtCamCounter = scalar, S32, 1088, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1092, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1096, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1100, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1101, "", 1, 0 +; total TS size = 1104 +totalRevolutionCounter = scalar, U32, 1104, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1108, "", 1, 0 +vvtCurrentPosition = scalar, F32, 1112, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1116, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 1120, "", 1, 0 +triggerStateIndex = scalar, U08, 1124, "", 1, 0 +vvtCounter = scalar, U08, 1125, "", 1, 0 +camResyncCounter = scalar, U08, 1126, "", 1, 0 +vvtStateIndex = scalar, U08, 1127, "", 1, 0 +; total TS size = 1128 +m_hasSynchronizedPhase = bits, U32, 1128, [0:0] +unusedBit_1_1 = bits, U32, 1128, [1:1] +unusedBit_1_2 = bits, U32, 1128, [2:2] +unusedBit_1_3 = bits, U32, 1128, [3:3] +unusedBit_1_4 = bits, U32, 1128, [4:4] +unusedBit_1_5 = bits, U32, 1128, [5:5] +unusedBit_1_6 = bits, U32, 1128, [6:6] +unusedBit_1_7 = bits, U32, 1128, [7:7] +unusedBit_1_8 = bits, U32, 1128, [8:8] +unusedBit_1_9 = bits, U32, 1128, [9:9] +unusedBit_1_10 = bits, U32, 1128, [10:10] +unusedBit_1_11 = bits, U32, 1128, [11:11] +unusedBit_1_12 = bits, U32, 1128, [12:12] +unusedBit_1_13 = bits, U32, 1128, [13:13] +unusedBit_1_14 = bits, U32, 1128, [14:14] +unusedBit_1_15 = bits, U32, 1128, [15:15] +unusedBit_1_16 = bits, U32, 1128, [16:16] +unusedBit_1_17 = bits, U32, 1128, [17:17] +unusedBit_1_18 = bits, U32, 1128, [18:18] +unusedBit_1_19 = bits, U32, 1128, [19:19] +unusedBit_1_20 = bits, U32, 1128, [20:20] +unusedBit_1_21 = bits, U32, 1128, [21:21] +unusedBit_1_22 = bits, U32, 1128, [22:22] +unusedBit_1_23 = bits, U32, 1128, [23:23] +unusedBit_1_24 = bits, U32, 1128, [24:24] +unusedBit_1_25 = bits, U32, 1128, [25:25] +unusedBit_1_26 = bits, U32, 1128, [26:26] +unusedBit_1_27 = bits, U32, 1128, [27:27] +unusedBit_1_28 = bits, U32, 1128, [28:28] +unusedBit_1_29 = bits, U32, 1128, [29:29] +unusedBit_1_30 = bits, U32, 1128, [30:30] +unusedBit_1_31 = bits, U32, 1128, [31:31] ; total TS size = 1132 -idleState = bits, S32, 1132, [0:2], "not important" -currentIdlePosition = scalar, F32, 1136 -baseIdlePosition = scalar, F32, 1140 -iacByTpsTaper = scalar, F32, 1144 -throttlePedalUpState = scalar, S32, 1148, "", 1, 0 -mightResetPid = bits, U32, 1152, [0:0] -shouldResetPid = bits, U32, 1152, [1:1] -wasResetPid = bits, U32, 1152, [2:2] -mustResetPid = bits, U32, 1152, [3:3] -isCoasting = bits, U32, 1152, [4:4] -useIacTableForCoasting = bits, U32, 1152, [5:5] -notIdling = bits, U32, 1152, [6:6] -needReset = bits, U32, 1152, [7:7] -isInDeadZone = bits, U32, 1152, [8:8] -isBlipping = bits, U32, 1152, [9:9] -useClosedLoop = bits, U32, 1152, [10:10] -badTps = bits, U32, 1152, [11:11] -looksLikeRunning = bits, U32, 1152, [12:12] -looksLikeCoasting = bits, U32, 1152, [13:13] -looksLikeCrankToIdle = bits, U32, 1152, [14:14] -useInstantRpmForIdle = bits, U32, 1152, [15:15] -isVerboseIAC = bits, U32, 1152, [16:16] -unusedBit_22_17 = bits, U32, 1152, [17:17] -unusedBit_22_18 = bits, U32, 1152, [18:18] -unusedBit_22_19 = bits, U32, 1152, [19:19] -unusedBit_22_20 = bits, U32, 1152, [20:20] -unusedBit_22_21 = bits, U32, 1152, [21:21] -unusedBit_22_22 = bits, U32, 1152, [22:22] -unusedBit_22_23 = bits, U32, 1152, [23:23] -unusedBit_22_24 = bits, U32, 1152, [24:24] -unusedBit_22_25 = bits, U32, 1152, [25:25] -unusedBit_22_26 = bits, U32, 1152, [26:26] -unusedBit_22_27 = bits, U32, 1152, [27:27] -unusedBit_22_28 = bits, U32, 1152, [28:28] -unusedBit_22_29 = bits, U32, 1152, [29:29] -unusedBit_22_30 = bits, U32, 1152, [30:30] -unusedBit_22_31 = bits, U32, 1152, [31:31] -targetRpmByClt = scalar, S32, 1156, "", 1, 0 -targetRpmAcBump = scalar, S32, 1160, "", 1, 0 -iacByRpmTaper = scalar, F32, 1164 -luaAdd = scalar, F32, 1168 -; total TS size = 1172 -baseDwell = scalar, F32, 1172, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 1176, "", 1, 0 -luaTimingAdd = scalar, F32, 1180, "", 1, 0 -luaTimingMult = scalar, F32, 1184, "", 1, 0 -; total TS size = 1188 -idlePosition = scalar, F32, 1188, "", 1, 0 -trim = scalar, F32, 1192, "", 1, 0 -luaAdjustment = scalar, F32, 1196, "", 1, 0 -etbFeedForward = scalar, F32, 1200 -etbIntegralError = scalar, F32, 1204, "", 1, 0 -etbCurrentTarget = scalar, F32, 1208, "%", 1, 0 -; total TS size = 1212 -faultCode = scalar, U08, 1212, "", 1, 0 -heaterDuty = scalar, U08, 1213, "%", 1, 0 -pumpDuty = scalar, U08, 1214, "%", 1, 0 -tempC = scalar, U16, 1216, "C", 1, 0 -nernstVoltage = scalar, U16, 1218, "V", 0.001, 0 -esr = scalar, U16, 1220, "", 1, 0 -; total TS size = 1224 +wallFuelCorrection = scalar, F32, 1132, "", 1, 0 +wallFuel = scalar, F32, 1136, "", 1, 0 +; total TS size = 1140 +idleState = bits, S32, 1140, [0:2], "not important" +currentIdlePosition = scalar, F32, 1144 +baseIdlePosition = scalar, F32, 1148 +iacByTpsTaper = scalar, F32, 1152 +throttlePedalUpState = scalar, S32, 1156, "", 1, 0 +mightResetPid = bits, U32, 1160, [0:0] +shouldResetPid = bits, U32, 1160, [1:1] +wasResetPid = bits, U32, 1160, [2:2] +mustResetPid = bits, U32, 1160, [3:3] +isCoasting = bits, U32, 1160, [4:4] +useIacTableForCoasting = bits, U32, 1160, [5:5] +notIdling = bits, U32, 1160, [6:6] +needReset = bits, U32, 1160, [7:7] +isInDeadZone = bits, U32, 1160, [8:8] +isBlipping = bits, U32, 1160, [9:9] +useClosedLoop = bits, U32, 1160, [10:10] +badTps = bits, U32, 1160, [11:11] +looksLikeRunning = bits, U32, 1160, [12:12] +looksLikeCoasting = bits, U32, 1160, [13:13] +looksLikeCrankToIdle = bits, U32, 1160, [14:14] +useInstantRpmForIdle = bits, U32, 1160, [15:15] +isVerboseIAC = bits, U32, 1160, [16:16] +unusedBit_22_17 = bits, U32, 1160, [17:17] +unusedBit_22_18 = bits, U32, 1160, [18:18] +unusedBit_22_19 = bits, U32, 1160, [19:19] +unusedBit_22_20 = bits, U32, 1160, [20:20] +unusedBit_22_21 = bits, U32, 1160, [21:21] +unusedBit_22_22 = bits, U32, 1160, [22:22] +unusedBit_22_23 = bits, U32, 1160, [23:23] +unusedBit_22_24 = bits, U32, 1160, [24:24] +unusedBit_22_25 = bits, U32, 1160, [25:25] +unusedBit_22_26 = bits, U32, 1160, [26:26] +unusedBit_22_27 = bits, U32, 1160, [27:27] +unusedBit_22_28 = bits, U32, 1160, [28:28] +unusedBit_22_29 = bits, U32, 1160, [29:29] +unusedBit_22_30 = bits, U32, 1160, [30:30] +unusedBit_22_31 = bits, U32, 1160, [31:31] +targetRpmByClt = scalar, S32, 1164, "", 1, 0 +targetRpmAcBump = scalar, S32, 1168, "", 1, 0 +iacByRpmTaper = scalar, F32, 1172 +luaAdd = scalar, F32, 1176 +; total TS size = 1180 +baseDwell = scalar, F32, 1180, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 1184, "", 1, 0 +luaTimingAdd = scalar, F32, 1188, "", 1, 0 +luaTimingMult = scalar, F32, 1192, "", 1, 0 +; total TS size = 1196 +idlePosition = scalar, F32, 1196, "", 1, 0 +trim = scalar, F32, 1200, "", 1, 0 +luaAdjustment = scalar, F32, 1204, "", 1, 0 +etbFeedForward = scalar, F32, 1208 +etbIntegralError = scalar, F32, 1212, "", 1, 0 +etbCurrentTarget = scalar, F32, 1216, "%", 1, 0 +; total TS size = 1220 +faultCode = scalar, U08, 1220, "", 1, 0 +heaterDuty = scalar, U08, 1221, "%", 1, 0 +pumpDuty = scalar, U08, 1222, "%", 1, 0 +tempC = scalar, U16, 1224, "C", 1, 0 +nernstVoltage = scalar, U16, 1226, "V", 0.001, 0 +esr = scalar, U16, 1228, "", 1, 0 +; total TS size = 1232 time = { timeNow } @@ -4757,6 +4759,8 @@ entry = brakePedalState, "brake: down", int, "%d" entry = egt1, "egt1", float, "%.3f" entry = egt2, "egt2", float, "%.3f" entry = desiredRpmLimit, "User-defined RPM hard limit", int, "%d" +entry = fuelInjectionCounter, "fuelInjectionCounter", int, "%d" +entry = sparkCounter, "sparkCounter", int, "%d" entry = tpsFrom, "tpsFrom", float, "%.3f" entry = tpsTo, "tpsTo", float, "%.3f" entry = deltaTps, "deltaTps", float, "%.3f" @@ -5502,6 +5506,8 @@ dialog = engine_stateDialog, "engine_state" graphLine = egt2 liveGraph = engine_state_10_Graph, "Graph", South graphLine = desiredRpmLimit + graphLine = fuelInjectionCounter + graphLine = sparkCounter indicatorPanel = tps_accel_stateIndicatorPanel, 2 indicator = {isAboveAccelThreshold}, "isAboveAccelThreshold No", "isAboveAccelThreshold Yes" diff --git a/firmware/tunerstudio/generated/rusefi_harley81.ini b/firmware/tunerstudio/generated/rusefi_harley81.ini index fa6fea6997..f06c4da086 100644 --- a/firmware/tunerstudio/generated/rusefi_harley81.ini +++ b/firmware/tunerstudio/generated/rusefi_harley81.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.08.25.harley81.2197278257" + signature = "rusEFI 2022.08.25.harley81.1921997381" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.08.25.harley81.2197278257" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.08.25.harley81.1921997381" ; 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 @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Aug 25 14:51:20 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Aug 25 22:50:06 UTC 2022 pageSize = 21300 page = 1 @@ -2109,7 +2109,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1224 + ochBlockSize = 1232 ; ; see TunerStudioOutputChannels struct @@ -3022,170 +3022,172 @@ unusedBit_22_31 = bits, U32, 992, [31:31] egt1 = scalar, F32, 996, "", 1, 0 egt2 = scalar, F32, 1000, "", 1, 0 desiredRpmLimit = scalar, S16, 1004, "rpm", 1, 0 -; total TS size = 1008 -tpsFrom = scalar, F32, 1008 -tpsTo = scalar, F32, 1012 -deltaTps = scalar, F32, 1016 -extraFuel = scalar, F32, 1020, "", 1, 0 -valueFromTable = scalar, F32, 1024, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1028, [0:0] -isBelowDecelThreshold = bits, U32, 1028, [1:1] -isTimeToResetAccumulator = bits, U32, 1028, [2:2] -isFractionalEnrichment = bits, U32, 1028, [3:3] -belowEpsilon = bits, U32, 1028, [4:4] -tooShort = bits, U32, 1028, [5:5] -unusedBit_11_6 = bits, U32, 1028, [6:6] -unusedBit_11_7 = bits, U32, 1028, [7:7] -unusedBit_11_8 = bits, U32, 1028, [8:8] -unusedBit_11_9 = bits, U32, 1028, [9:9] -unusedBit_11_10 = bits, U32, 1028, [10:10] -unusedBit_11_11 = bits, U32, 1028, [11:11] -unusedBit_11_12 = bits, U32, 1028, [12:12] -unusedBit_11_13 = bits, U32, 1028, [13:13] -unusedBit_11_14 = bits, U32, 1028, [14:14] -unusedBit_11_15 = bits, U32, 1028, [15:15] -unusedBit_11_16 = bits, U32, 1028, [16:16] -unusedBit_11_17 = bits, U32, 1028, [17:17] -unusedBit_11_18 = bits, U32, 1028, [18:18] -unusedBit_11_19 = bits, U32, 1028, [19:19] -unusedBit_11_20 = bits, U32, 1028, [20:20] -unusedBit_11_21 = bits, U32, 1028, [21:21] -unusedBit_11_22 = bits, U32, 1028, [22:22] -unusedBit_11_23 = bits, U32, 1028, [23:23] -unusedBit_11_24 = bits, U32, 1028, [24:24] -unusedBit_11_25 = bits, U32, 1028, [25:25] -unusedBit_11_26 = bits, U32, 1028, [26:26] -unusedBit_11_27 = bits, U32, 1028, [27:27] -unusedBit_11_28 = bits, U32, 1028, [28:28] -unusedBit_11_29 = bits, U32, 1028, [29:29] -unusedBit_11_30 = bits, U32, 1028, [30:30] -unusedBit_11_31 = bits, U32, 1028, [31:31] -fractionalInjFuel = scalar, F32, 1032, "", 1, 0 -accumulatedValue = scalar, F32, 1036, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1040, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1044, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1048, "", 1, 0 -cycleCnt = scalar, S32, 1052, "", 1, 0 -; total TS size = 1056 -hwEventCounters1 = scalar, S32, 1056, "", 1, 0 -hwEventCounters2 = scalar, S32, 1060, "", 1, 0 -hwEventCounters3 = scalar, S32, 1064, "", 1, 0 -hwEventCounters4 = scalar, S32, 1068, "", 1, 0 -hwEventCounters5 = scalar, S32, 1072, "", 1, 0 -hwEventCounters6 = scalar, S32, 1076, "", 1, 0 -vvtCamCounter = scalar, S32, 1080, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1084, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1088, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1092, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1093, "", 1, 0 -; total TS size = 1096 -totalRevolutionCounter = scalar, U32, 1096, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1100, "", 1, 0 -vvtCurrentPosition = scalar, F32, 1104, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1108, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 1112, "", 1, 0 -triggerStateIndex = scalar, U08, 1116, "", 1, 0 -vvtCounter = scalar, U08, 1117, "", 1, 0 -camResyncCounter = scalar, U08, 1118, "", 1, 0 -vvtStateIndex = scalar, U08, 1119, "", 1, 0 -; total TS size = 1120 -m_hasSynchronizedPhase = bits, U32, 1120, [0:0] -unusedBit_1_1 = bits, U32, 1120, [1:1] -unusedBit_1_2 = bits, U32, 1120, [2:2] -unusedBit_1_3 = bits, U32, 1120, [3:3] -unusedBit_1_4 = bits, U32, 1120, [4:4] -unusedBit_1_5 = bits, U32, 1120, [5:5] -unusedBit_1_6 = bits, U32, 1120, [6:6] -unusedBit_1_7 = bits, U32, 1120, [7:7] -unusedBit_1_8 = bits, U32, 1120, [8:8] -unusedBit_1_9 = bits, U32, 1120, [9:9] -unusedBit_1_10 = bits, U32, 1120, [10:10] -unusedBit_1_11 = bits, U32, 1120, [11:11] -unusedBit_1_12 = bits, U32, 1120, [12:12] -unusedBit_1_13 = bits, U32, 1120, [13:13] -unusedBit_1_14 = bits, U32, 1120, [14:14] -unusedBit_1_15 = bits, U32, 1120, [15:15] -unusedBit_1_16 = bits, U32, 1120, [16:16] -unusedBit_1_17 = bits, U32, 1120, [17:17] -unusedBit_1_18 = bits, U32, 1120, [18:18] -unusedBit_1_19 = bits, U32, 1120, [19:19] -unusedBit_1_20 = bits, U32, 1120, [20:20] -unusedBit_1_21 = bits, U32, 1120, [21:21] -unusedBit_1_22 = bits, U32, 1120, [22:22] -unusedBit_1_23 = bits, U32, 1120, [23:23] -unusedBit_1_24 = bits, U32, 1120, [24:24] -unusedBit_1_25 = bits, U32, 1120, [25:25] -unusedBit_1_26 = bits, U32, 1120, [26:26] -unusedBit_1_27 = bits, U32, 1120, [27:27] -unusedBit_1_28 = bits, U32, 1120, [28:28] -unusedBit_1_29 = bits, U32, 1120, [29:29] -unusedBit_1_30 = bits, U32, 1120, [30:30] -unusedBit_1_31 = bits, U32, 1120, [31:31] -; total TS size = 1124 -wallFuelCorrection = scalar, F32, 1124, "", 1, 0 -wallFuel = scalar, F32, 1128, "", 1, 0 +fuelInjectionCounter = scalar, S32, 1008, "", 1, 0 +sparkCounter = scalar, S32, 1012, "", 1, 0 +; total TS size = 1016 +tpsFrom = scalar, F32, 1016 +tpsTo = scalar, F32, 1020 +deltaTps = scalar, F32, 1024 +extraFuel = scalar, F32, 1028, "", 1, 0 +valueFromTable = scalar, F32, 1032, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1036, [0:0] +isBelowDecelThreshold = bits, U32, 1036, [1:1] +isTimeToResetAccumulator = bits, U32, 1036, [2:2] +isFractionalEnrichment = bits, U32, 1036, [3:3] +belowEpsilon = bits, U32, 1036, [4:4] +tooShort = bits, U32, 1036, [5:5] +unusedBit_11_6 = bits, U32, 1036, [6:6] +unusedBit_11_7 = bits, U32, 1036, [7:7] +unusedBit_11_8 = bits, U32, 1036, [8:8] +unusedBit_11_9 = bits, U32, 1036, [9:9] +unusedBit_11_10 = bits, U32, 1036, [10:10] +unusedBit_11_11 = bits, U32, 1036, [11:11] +unusedBit_11_12 = bits, U32, 1036, [12:12] +unusedBit_11_13 = bits, U32, 1036, [13:13] +unusedBit_11_14 = bits, U32, 1036, [14:14] +unusedBit_11_15 = bits, U32, 1036, [15:15] +unusedBit_11_16 = bits, U32, 1036, [16:16] +unusedBit_11_17 = bits, U32, 1036, [17:17] +unusedBit_11_18 = bits, U32, 1036, [18:18] +unusedBit_11_19 = bits, U32, 1036, [19:19] +unusedBit_11_20 = bits, U32, 1036, [20:20] +unusedBit_11_21 = bits, U32, 1036, [21:21] +unusedBit_11_22 = bits, U32, 1036, [22:22] +unusedBit_11_23 = bits, U32, 1036, [23:23] +unusedBit_11_24 = bits, U32, 1036, [24:24] +unusedBit_11_25 = bits, U32, 1036, [25:25] +unusedBit_11_26 = bits, U32, 1036, [26:26] +unusedBit_11_27 = bits, U32, 1036, [27:27] +unusedBit_11_28 = bits, U32, 1036, [28:28] +unusedBit_11_29 = bits, U32, 1036, [29:29] +unusedBit_11_30 = bits, U32, 1036, [30:30] +unusedBit_11_31 = bits, U32, 1036, [31:31] +fractionalInjFuel = scalar, F32, 1040, "", 1, 0 +accumulatedValue = scalar, F32, 1044, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1048, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1052, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1056, "", 1, 0 +cycleCnt = scalar, S32, 1060, "", 1, 0 +; total TS size = 1064 +hwEventCounters1 = scalar, S32, 1064, "", 1, 0 +hwEventCounters2 = scalar, S32, 1068, "", 1, 0 +hwEventCounters3 = scalar, S32, 1072, "", 1, 0 +hwEventCounters4 = scalar, S32, 1076, "", 1, 0 +hwEventCounters5 = scalar, S32, 1080, "", 1, 0 +hwEventCounters6 = scalar, S32, 1084, "", 1, 0 +vvtCamCounter = scalar, S32, 1088, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1092, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1096, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1100, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1101, "", 1, 0 +; total TS size = 1104 +totalRevolutionCounter = scalar, U32, 1104, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1108, "", 1, 0 +vvtCurrentPosition = scalar, F32, 1112, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1116, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 1120, "", 1, 0 +triggerStateIndex = scalar, U08, 1124, "", 1, 0 +vvtCounter = scalar, U08, 1125, "", 1, 0 +camResyncCounter = scalar, U08, 1126, "", 1, 0 +vvtStateIndex = scalar, U08, 1127, "", 1, 0 +; total TS size = 1128 +m_hasSynchronizedPhase = bits, U32, 1128, [0:0] +unusedBit_1_1 = bits, U32, 1128, [1:1] +unusedBit_1_2 = bits, U32, 1128, [2:2] +unusedBit_1_3 = bits, U32, 1128, [3:3] +unusedBit_1_4 = bits, U32, 1128, [4:4] +unusedBit_1_5 = bits, U32, 1128, [5:5] +unusedBit_1_6 = bits, U32, 1128, [6:6] +unusedBit_1_7 = bits, U32, 1128, [7:7] +unusedBit_1_8 = bits, U32, 1128, [8:8] +unusedBit_1_9 = bits, U32, 1128, [9:9] +unusedBit_1_10 = bits, U32, 1128, [10:10] +unusedBit_1_11 = bits, U32, 1128, [11:11] +unusedBit_1_12 = bits, U32, 1128, [12:12] +unusedBit_1_13 = bits, U32, 1128, [13:13] +unusedBit_1_14 = bits, U32, 1128, [14:14] +unusedBit_1_15 = bits, U32, 1128, [15:15] +unusedBit_1_16 = bits, U32, 1128, [16:16] +unusedBit_1_17 = bits, U32, 1128, [17:17] +unusedBit_1_18 = bits, U32, 1128, [18:18] +unusedBit_1_19 = bits, U32, 1128, [19:19] +unusedBit_1_20 = bits, U32, 1128, [20:20] +unusedBit_1_21 = bits, U32, 1128, [21:21] +unusedBit_1_22 = bits, U32, 1128, [22:22] +unusedBit_1_23 = bits, U32, 1128, [23:23] +unusedBit_1_24 = bits, U32, 1128, [24:24] +unusedBit_1_25 = bits, U32, 1128, [25:25] +unusedBit_1_26 = bits, U32, 1128, [26:26] +unusedBit_1_27 = bits, U32, 1128, [27:27] +unusedBit_1_28 = bits, U32, 1128, [28:28] +unusedBit_1_29 = bits, U32, 1128, [29:29] +unusedBit_1_30 = bits, U32, 1128, [30:30] +unusedBit_1_31 = bits, U32, 1128, [31:31] ; total TS size = 1132 -idleState = bits, S32, 1132, [0:2], "not important" -currentIdlePosition = scalar, F32, 1136 -baseIdlePosition = scalar, F32, 1140 -iacByTpsTaper = scalar, F32, 1144 -throttlePedalUpState = scalar, S32, 1148, "", 1, 0 -mightResetPid = bits, U32, 1152, [0:0] -shouldResetPid = bits, U32, 1152, [1:1] -wasResetPid = bits, U32, 1152, [2:2] -mustResetPid = bits, U32, 1152, [3:3] -isCoasting = bits, U32, 1152, [4:4] -useIacTableForCoasting = bits, U32, 1152, [5:5] -notIdling = bits, U32, 1152, [6:6] -needReset = bits, U32, 1152, [7:7] -isInDeadZone = bits, U32, 1152, [8:8] -isBlipping = bits, U32, 1152, [9:9] -useClosedLoop = bits, U32, 1152, [10:10] -badTps = bits, U32, 1152, [11:11] -looksLikeRunning = bits, U32, 1152, [12:12] -looksLikeCoasting = bits, U32, 1152, [13:13] -looksLikeCrankToIdle = bits, U32, 1152, [14:14] -useInstantRpmForIdle = bits, U32, 1152, [15:15] -isVerboseIAC = bits, U32, 1152, [16:16] -unusedBit_22_17 = bits, U32, 1152, [17:17] -unusedBit_22_18 = bits, U32, 1152, [18:18] -unusedBit_22_19 = bits, U32, 1152, [19:19] -unusedBit_22_20 = bits, U32, 1152, [20:20] -unusedBit_22_21 = bits, U32, 1152, [21:21] -unusedBit_22_22 = bits, U32, 1152, [22:22] -unusedBit_22_23 = bits, U32, 1152, [23:23] -unusedBit_22_24 = bits, U32, 1152, [24:24] -unusedBit_22_25 = bits, U32, 1152, [25:25] -unusedBit_22_26 = bits, U32, 1152, [26:26] -unusedBit_22_27 = bits, U32, 1152, [27:27] -unusedBit_22_28 = bits, U32, 1152, [28:28] -unusedBit_22_29 = bits, U32, 1152, [29:29] -unusedBit_22_30 = bits, U32, 1152, [30:30] -unusedBit_22_31 = bits, U32, 1152, [31:31] -targetRpmByClt = scalar, S32, 1156, "", 1, 0 -targetRpmAcBump = scalar, S32, 1160, "", 1, 0 -iacByRpmTaper = scalar, F32, 1164 -luaAdd = scalar, F32, 1168 -; total TS size = 1172 -baseDwell = scalar, F32, 1172, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 1176, "", 1, 0 -luaTimingAdd = scalar, F32, 1180, "", 1, 0 -luaTimingMult = scalar, F32, 1184, "", 1, 0 -; total TS size = 1188 -idlePosition = scalar, F32, 1188, "", 1, 0 -trim = scalar, F32, 1192, "", 1, 0 -luaAdjustment = scalar, F32, 1196, "", 1, 0 -etbFeedForward = scalar, F32, 1200 -etbIntegralError = scalar, F32, 1204, "", 1, 0 -etbCurrentTarget = scalar, F32, 1208, "%", 1, 0 -; total TS size = 1212 -faultCode = scalar, U08, 1212, "", 1, 0 -heaterDuty = scalar, U08, 1213, "%", 1, 0 -pumpDuty = scalar, U08, 1214, "%", 1, 0 -tempC = scalar, U16, 1216, "C", 1, 0 -nernstVoltage = scalar, U16, 1218, "V", 0.001, 0 -esr = scalar, U16, 1220, "", 1, 0 -; total TS size = 1224 +wallFuelCorrection = scalar, F32, 1132, "", 1, 0 +wallFuel = scalar, F32, 1136, "", 1, 0 +; total TS size = 1140 +idleState = bits, S32, 1140, [0:2], "not important" +currentIdlePosition = scalar, F32, 1144 +baseIdlePosition = scalar, F32, 1148 +iacByTpsTaper = scalar, F32, 1152 +throttlePedalUpState = scalar, S32, 1156, "", 1, 0 +mightResetPid = bits, U32, 1160, [0:0] +shouldResetPid = bits, U32, 1160, [1:1] +wasResetPid = bits, U32, 1160, [2:2] +mustResetPid = bits, U32, 1160, [3:3] +isCoasting = bits, U32, 1160, [4:4] +useIacTableForCoasting = bits, U32, 1160, [5:5] +notIdling = bits, U32, 1160, [6:6] +needReset = bits, U32, 1160, [7:7] +isInDeadZone = bits, U32, 1160, [8:8] +isBlipping = bits, U32, 1160, [9:9] +useClosedLoop = bits, U32, 1160, [10:10] +badTps = bits, U32, 1160, [11:11] +looksLikeRunning = bits, U32, 1160, [12:12] +looksLikeCoasting = bits, U32, 1160, [13:13] +looksLikeCrankToIdle = bits, U32, 1160, [14:14] +useInstantRpmForIdle = bits, U32, 1160, [15:15] +isVerboseIAC = bits, U32, 1160, [16:16] +unusedBit_22_17 = bits, U32, 1160, [17:17] +unusedBit_22_18 = bits, U32, 1160, [18:18] +unusedBit_22_19 = bits, U32, 1160, [19:19] +unusedBit_22_20 = bits, U32, 1160, [20:20] +unusedBit_22_21 = bits, U32, 1160, [21:21] +unusedBit_22_22 = bits, U32, 1160, [22:22] +unusedBit_22_23 = bits, U32, 1160, [23:23] +unusedBit_22_24 = bits, U32, 1160, [24:24] +unusedBit_22_25 = bits, U32, 1160, [25:25] +unusedBit_22_26 = bits, U32, 1160, [26:26] +unusedBit_22_27 = bits, U32, 1160, [27:27] +unusedBit_22_28 = bits, U32, 1160, [28:28] +unusedBit_22_29 = bits, U32, 1160, [29:29] +unusedBit_22_30 = bits, U32, 1160, [30:30] +unusedBit_22_31 = bits, U32, 1160, [31:31] +targetRpmByClt = scalar, S32, 1164, "", 1, 0 +targetRpmAcBump = scalar, S32, 1168, "", 1, 0 +iacByRpmTaper = scalar, F32, 1172 +luaAdd = scalar, F32, 1176 +; total TS size = 1180 +baseDwell = scalar, F32, 1180, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 1184, "", 1, 0 +luaTimingAdd = scalar, F32, 1188, "", 1, 0 +luaTimingMult = scalar, F32, 1192, "", 1, 0 +; total TS size = 1196 +idlePosition = scalar, F32, 1196, "", 1, 0 +trim = scalar, F32, 1200, "", 1, 0 +luaAdjustment = scalar, F32, 1204, "", 1, 0 +etbFeedForward = scalar, F32, 1208 +etbIntegralError = scalar, F32, 1212, "", 1, 0 +etbCurrentTarget = scalar, F32, 1216, "%", 1, 0 +; total TS size = 1220 +faultCode = scalar, U08, 1220, "", 1, 0 +heaterDuty = scalar, U08, 1221, "%", 1, 0 +pumpDuty = scalar, U08, 1222, "%", 1, 0 +tempC = scalar, U16, 1224, "C", 1, 0 +nernstVoltage = scalar, U16, 1226, "V", 0.001, 0 +esr = scalar, U16, 1228, "", 1, 0 +; total TS size = 1232 time = { timeNow } @@ -4757,6 +4759,8 @@ entry = brakePedalState, "brake: down", int, "%d" entry = egt1, "egt1", float, "%.3f" entry = egt2, "egt2", float, "%.3f" entry = desiredRpmLimit, "User-defined RPM hard limit", int, "%d" +entry = fuelInjectionCounter, "fuelInjectionCounter", int, "%d" +entry = sparkCounter, "sparkCounter", int, "%d" entry = tpsFrom, "tpsFrom", float, "%.3f" entry = tpsTo, "tpsTo", float, "%.3f" entry = deltaTps, "deltaTps", float, "%.3f" @@ -5498,6 +5502,8 @@ dialog = engine_stateDialog, "engine_state" graphLine = egt2 liveGraph = engine_state_10_Graph, "Graph", South graphLine = desiredRpmLimit + graphLine = fuelInjectionCounter + graphLine = sparkCounter indicatorPanel = tps_accel_stateIndicatorPanel, 2 indicator = {isAboveAccelThreshold}, "isAboveAccelThreshold No", "isAboveAccelThreshold Yes" diff --git a/firmware/tunerstudio/generated/rusefi_hellen-gm-e67.ini b/firmware/tunerstudio/generated/rusefi_hellen-gm-e67.ini index 38dac3bdc7..98b14523fc 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen-gm-e67.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen-gm-e67.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.08.25.hellen-gm-e67.3329052328" + signature = "rusEFI 2022.08.25.hellen-gm-e67.907401948" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.08.25.hellen-gm-e67.3329052328" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.08.25.hellen-gm-e67.907401948" ; 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 @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Aug 25 14:51:39 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Aug 25 22:50:24 UTC 2022 pageSize = 21300 page = 1 @@ -2109,7 +2109,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1224 + ochBlockSize = 1232 ; ; see TunerStudioOutputChannels struct @@ -3022,170 +3022,172 @@ unusedBit_22_31 = bits, U32, 992, [31:31] egt1 = scalar, F32, 996, "", 1, 0 egt2 = scalar, F32, 1000, "", 1, 0 desiredRpmLimit = scalar, S16, 1004, "rpm", 1, 0 -; total TS size = 1008 -tpsFrom = scalar, F32, 1008 -tpsTo = scalar, F32, 1012 -deltaTps = scalar, F32, 1016 -extraFuel = scalar, F32, 1020, "", 1, 0 -valueFromTable = scalar, F32, 1024, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1028, [0:0] -isBelowDecelThreshold = bits, U32, 1028, [1:1] -isTimeToResetAccumulator = bits, U32, 1028, [2:2] -isFractionalEnrichment = bits, U32, 1028, [3:3] -belowEpsilon = bits, U32, 1028, [4:4] -tooShort = bits, U32, 1028, [5:5] -unusedBit_11_6 = bits, U32, 1028, [6:6] -unusedBit_11_7 = bits, U32, 1028, [7:7] -unusedBit_11_8 = bits, U32, 1028, [8:8] -unusedBit_11_9 = bits, U32, 1028, [9:9] -unusedBit_11_10 = bits, U32, 1028, [10:10] -unusedBit_11_11 = bits, U32, 1028, [11:11] -unusedBit_11_12 = bits, U32, 1028, [12:12] -unusedBit_11_13 = bits, U32, 1028, [13:13] -unusedBit_11_14 = bits, U32, 1028, [14:14] -unusedBit_11_15 = bits, U32, 1028, [15:15] -unusedBit_11_16 = bits, U32, 1028, [16:16] -unusedBit_11_17 = bits, U32, 1028, [17:17] -unusedBit_11_18 = bits, U32, 1028, [18:18] -unusedBit_11_19 = bits, U32, 1028, [19:19] -unusedBit_11_20 = bits, U32, 1028, [20:20] -unusedBit_11_21 = bits, U32, 1028, [21:21] -unusedBit_11_22 = bits, U32, 1028, [22:22] -unusedBit_11_23 = bits, U32, 1028, [23:23] -unusedBit_11_24 = bits, U32, 1028, [24:24] -unusedBit_11_25 = bits, U32, 1028, [25:25] -unusedBit_11_26 = bits, U32, 1028, [26:26] -unusedBit_11_27 = bits, U32, 1028, [27:27] -unusedBit_11_28 = bits, U32, 1028, [28:28] -unusedBit_11_29 = bits, U32, 1028, [29:29] -unusedBit_11_30 = bits, U32, 1028, [30:30] -unusedBit_11_31 = bits, U32, 1028, [31:31] -fractionalInjFuel = scalar, F32, 1032, "", 1, 0 -accumulatedValue = scalar, F32, 1036, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1040, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1044, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1048, "", 1, 0 -cycleCnt = scalar, S32, 1052, "", 1, 0 -; total TS size = 1056 -hwEventCounters1 = scalar, S32, 1056, "", 1, 0 -hwEventCounters2 = scalar, S32, 1060, "", 1, 0 -hwEventCounters3 = scalar, S32, 1064, "", 1, 0 -hwEventCounters4 = scalar, S32, 1068, "", 1, 0 -hwEventCounters5 = scalar, S32, 1072, "", 1, 0 -hwEventCounters6 = scalar, S32, 1076, "", 1, 0 -vvtCamCounter = scalar, S32, 1080, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1084, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1088, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1092, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1093, "", 1, 0 -; total TS size = 1096 -totalRevolutionCounter = scalar, U32, 1096, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1100, "", 1, 0 -vvtCurrentPosition = scalar, F32, 1104, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1108, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 1112, "", 1, 0 -triggerStateIndex = scalar, U08, 1116, "", 1, 0 -vvtCounter = scalar, U08, 1117, "", 1, 0 -camResyncCounter = scalar, U08, 1118, "", 1, 0 -vvtStateIndex = scalar, U08, 1119, "", 1, 0 -; total TS size = 1120 -m_hasSynchronizedPhase = bits, U32, 1120, [0:0] -unusedBit_1_1 = bits, U32, 1120, [1:1] -unusedBit_1_2 = bits, U32, 1120, [2:2] -unusedBit_1_3 = bits, U32, 1120, [3:3] -unusedBit_1_4 = bits, U32, 1120, [4:4] -unusedBit_1_5 = bits, U32, 1120, [5:5] -unusedBit_1_6 = bits, U32, 1120, [6:6] -unusedBit_1_7 = bits, U32, 1120, [7:7] -unusedBit_1_8 = bits, U32, 1120, [8:8] -unusedBit_1_9 = bits, U32, 1120, [9:9] -unusedBit_1_10 = bits, U32, 1120, [10:10] -unusedBit_1_11 = bits, U32, 1120, [11:11] -unusedBit_1_12 = bits, U32, 1120, [12:12] -unusedBit_1_13 = bits, U32, 1120, [13:13] -unusedBit_1_14 = bits, U32, 1120, [14:14] -unusedBit_1_15 = bits, U32, 1120, [15:15] -unusedBit_1_16 = bits, U32, 1120, [16:16] -unusedBit_1_17 = bits, U32, 1120, [17:17] -unusedBit_1_18 = bits, U32, 1120, [18:18] -unusedBit_1_19 = bits, U32, 1120, [19:19] -unusedBit_1_20 = bits, U32, 1120, [20:20] -unusedBit_1_21 = bits, U32, 1120, [21:21] -unusedBit_1_22 = bits, U32, 1120, [22:22] -unusedBit_1_23 = bits, U32, 1120, [23:23] -unusedBit_1_24 = bits, U32, 1120, [24:24] -unusedBit_1_25 = bits, U32, 1120, [25:25] -unusedBit_1_26 = bits, U32, 1120, [26:26] -unusedBit_1_27 = bits, U32, 1120, [27:27] -unusedBit_1_28 = bits, U32, 1120, [28:28] -unusedBit_1_29 = bits, U32, 1120, [29:29] -unusedBit_1_30 = bits, U32, 1120, [30:30] -unusedBit_1_31 = bits, U32, 1120, [31:31] -; total TS size = 1124 -wallFuelCorrection = scalar, F32, 1124, "", 1, 0 -wallFuel = scalar, F32, 1128, "", 1, 0 +fuelInjectionCounter = scalar, S32, 1008, "", 1, 0 +sparkCounter = scalar, S32, 1012, "", 1, 0 +; total TS size = 1016 +tpsFrom = scalar, F32, 1016 +tpsTo = scalar, F32, 1020 +deltaTps = scalar, F32, 1024 +extraFuel = scalar, F32, 1028, "", 1, 0 +valueFromTable = scalar, F32, 1032, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1036, [0:0] +isBelowDecelThreshold = bits, U32, 1036, [1:1] +isTimeToResetAccumulator = bits, U32, 1036, [2:2] +isFractionalEnrichment = bits, U32, 1036, [3:3] +belowEpsilon = bits, U32, 1036, [4:4] +tooShort = bits, U32, 1036, [5:5] +unusedBit_11_6 = bits, U32, 1036, [6:6] +unusedBit_11_7 = bits, U32, 1036, [7:7] +unusedBit_11_8 = bits, U32, 1036, [8:8] +unusedBit_11_9 = bits, U32, 1036, [9:9] +unusedBit_11_10 = bits, U32, 1036, [10:10] +unusedBit_11_11 = bits, U32, 1036, [11:11] +unusedBit_11_12 = bits, U32, 1036, [12:12] +unusedBit_11_13 = bits, U32, 1036, [13:13] +unusedBit_11_14 = bits, U32, 1036, [14:14] +unusedBit_11_15 = bits, U32, 1036, [15:15] +unusedBit_11_16 = bits, U32, 1036, [16:16] +unusedBit_11_17 = bits, U32, 1036, [17:17] +unusedBit_11_18 = bits, U32, 1036, [18:18] +unusedBit_11_19 = bits, U32, 1036, [19:19] +unusedBit_11_20 = bits, U32, 1036, [20:20] +unusedBit_11_21 = bits, U32, 1036, [21:21] +unusedBit_11_22 = bits, U32, 1036, [22:22] +unusedBit_11_23 = bits, U32, 1036, [23:23] +unusedBit_11_24 = bits, U32, 1036, [24:24] +unusedBit_11_25 = bits, U32, 1036, [25:25] +unusedBit_11_26 = bits, U32, 1036, [26:26] +unusedBit_11_27 = bits, U32, 1036, [27:27] +unusedBit_11_28 = bits, U32, 1036, [28:28] +unusedBit_11_29 = bits, U32, 1036, [29:29] +unusedBit_11_30 = bits, U32, 1036, [30:30] +unusedBit_11_31 = bits, U32, 1036, [31:31] +fractionalInjFuel = scalar, F32, 1040, "", 1, 0 +accumulatedValue = scalar, F32, 1044, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1048, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1052, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1056, "", 1, 0 +cycleCnt = scalar, S32, 1060, "", 1, 0 +; total TS size = 1064 +hwEventCounters1 = scalar, S32, 1064, "", 1, 0 +hwEventCounters2 = scalar, S32, 1068, "", 1, 0 +hwEventCounters3 = scalar, S32, 1072, "", 1, 0 +hwEventCounters4 = scalar, S32, 1076, "", 1, 0 +hwEventCounters5 = scalar, S32, 1080, "", 1, 0 +hwEventCounters6 = scalar, S32, 1084, "", 1, 0 +vvtCamCounter = scalar, S32, 1088, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1092, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1096, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1100, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1101, "", 1, 0 +; total TS size = 1104 +totalRevolutionCounter = scalar, U32, 1104, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1108, "", 1, 0 +vvtCurrentPosition = scalar, F32, 1112, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1116, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 1120, "", 1, 0 +triggerStateIndex = scalar, U08, 1124, "", 1, 0 +vvtCounter = scalar, U08, 1125, "", 1, 0 +camResyncCounter = scalar, U08, 1126, "", 1, 0 +vvtStateIndex = scalar, U08, 1127, "", 1, 0 +; total TS size = 1128 +m_hasSynchronizedPhase = bits, U32, 1128, [0:0] +unusedBit_1_1 = bits, U32, 1128, [1:1] +unusedBit_1_2 = bits, U32, 1128, [2:2] +unusedBit_1_3 = bits, U32, 1128, [3:3] +unusedBit_1_4 = bits, U32, 1128, [4:4] +unusedBit_1_5 = bits, U32, 1128, [5:5] +unusedBit_1_6 = bits, U32, 1128, [6:6] +unusedBit_1_7 = bits, U32, 1128, [7:7] +unusedBit_1_8 = bits, U32, 1128, [8:8] +unusedBit_1_9 = bits, U32, 1128, [9:9] +unusedBit_1_10 = bits, U32, 1128, [10:10] +unusedBit_1_11 = bits, U32, 1128, [11:11] +unusedBit_1_12 = bits, U32, 1128, [12:12] +unusedBit_1_13 = bits, U32, 1128, [13:13] +unusedBit_1_14 = bits, U32, 1128, [14:14] +unusedBit_1_15 = bits, U32, 1128, [15:15] +unusedBit_1_16 = bits, U32, 1128, [16:16] +unusedBit_1_17 = bits, U32, 1128, [17:17] +unusedBit_1_18 = bits, U32, 1128, [18:18] +unusedBit_1_19 = bits, U32, 1128, [19:19] +unusedBit_1_20 = bits, U32, 1128, [20:20] +unusedBit_1_21 = bits, U32, 1128, [21:21] +unusedBit_1_22 = bits, U32, 1128, [22:22] +unusedBit_1_23 = bits, U32, 1128, [23:23] +unusedBit_1_24 = bits, U32, 1128, [24:24] +unusedBit_1_25 = bits, U32, 1128, [25:25] +unusedBit_1_26 = bits, U32, 1128, [26:26] +unusedBit_1_27 = bits, U32, 1128, [27:27] +unusedBit_1_28 = bits, U32, 1128, [28:28] +unusedBit_1_29 = bits, U32, 1128, [29:29] +unusedBit_1_30 = bits, U32, 1128, [30:30] +unusedBit_1_31 = bits, U32, 1128, [31:31] ; total TS size = 1132 -idleState = bits, S32, 1132, [0:2], "not important" -currentIdlePosition = scalar, F32, 1136 -baseIdlePosition = scalar, F32, 1140 -iacByTpsTaper = scalar, F32, 1144 -throttlePedalUpState = scalar, S32, 1148, "", 1, 0 -mightResetPid = bits, U32, 1152, [0:0] -shouldResetPid = bits, U32, 1152, [1:1] -wasResetPid = bits, U32, 1152, [2:2] -mustResetPid = bits, U32, 1152, [3:3] -isCoasting = bits, U32, 1152, [4:4] -useIacTableForCoasting = bits, U32, 1152, [5:5] -notIdling = bits, U32, 1152, [6:6] -needReset = bits, U32, 1152, [7:7] -isInDeadZone = bits, U32, 1152, [8:8] -isBlipping = bits, U32, 1152, [9:9] -useClosedLoop = bits, U32, 1152, [10:10] -badTps = bits, U32, 1152, [11:11] -looksLikeRunning = bits, U32, 1152, [12:12] -looksLikeCoasting = bits, U32, 1152, [13:13] -looksLikeCrankToIdle = bits, U32, 1152, [14:14] -useInstantRpmForIdle = bits, U32, 1152, [15:15] -isVerboseIAC = bits, U32, 1152, [16:16] -unusedBit_22_17 = bits, U32, 1152, [17:17] -unusedBit_22_18 = bits, U32, 1152, [18:18] -unusedBit_22_19 = bits, U32, 1152, [19:19] -unusedBit_22_20 = bits, U32, 1152, [20:20] -unusedBit_22_21 = bits, U32, 1152, [21:21] -unusedBit_22_22 = bits, U32, 1152, [22:22] -unusedBit_22_23 = bits, U32, 1152, [23:23] -unusedBit_22_24 = bits, U32, 1152, [24:24] -unusedBit_22_25 = bits, U32, 1152, [25:25] -unusedBit_22_26 = bits, U32, 1152, [26:26] -unusedBit_22_27 = bits, U32, 1152, [27:27] -unusedBit_22_28 = bits, U32, 1152, [28:28] -unusedBit_22_29 = bits, U32, 1152, [29:29] -unusedBit_22_30 = bits, U32, 1152, [30:30] -unusedBit_22_31 = bits, U32, 1152, [31:31] -targetRpmByClt = scalar, S32, 1156, "", 1, 0 -targetRpmAcBump = scalar, S32, 1160, "", 1, 0 -iacByRpmTaper = scalar, F32, 1164 -luaAdd = scalar, F32, 1168 -; total TS size = 1172 -baseDwell = scalar, F32, 1172, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 1176, "", 1, 0 -luaTimingAdd = scalar, F32, 1180, "", 1, 0 -luaTimingMult = scalar, F32, 1184, "", 1, 0 -; total TS size = 1188 -idlePosition = scalar, F32, 1188, "", 1, 0 -trim = scalar, F32, 1192, "", 1, 0 -luaAdjustment = scalar, F32, 1196, "", 1, 0 -etbFeedForward = scalar, F32, 1200 -etbIntegralError = scalar, F32, 1204, "", 1, 0 -etbCurrentTarget = scalar, F32, 1208, "%", 1, 0 -; total TS size = 1212 -faultCode = scalar, U08, 1212, "", 1, 0 -heaterDuty = scalar, U08, 1213, "%", 1, 0 -pumpDuty = scalar, U08, 1214, "%", 1, 0 -tempC = scalar, U16, 1216, "C", 1, 0 -nernstVoltage = scalar, U16, 1218, "V", 0.001, 0 -esr = scalar, U16, 1220, "", 1, 0 -; total TS size = 1224 +wallFuelCorrection = scalar, F32, 1132, "", 1, 0 +wallFuel = scalar, F32, 1136, "", 1, 0 +; total TS size = 1140 +idleState = bits, S32, 1140, [0:2], "not important" +currentIdlePosition = scalar, F32, 1144 +baseIdlePosition = scalar, F32, 1148 +iacByTpsTaper = scalar, F32, 1152 +throttlePedalUpState = scalar, S32, 1156, "", 1, 0 +mightResetPid = bits, U32, 1160, [0:0] +shouldResetPid = bits, U32, 1160, [1:1] +wasResetPid = bits, U32, 1160, [2:2] +mustResetPid = bits, U32, 1160, [3:3] +isCoasting = bits, U32, 1160, [4:4] +useIacTableForCoasting = bits, U32, 1160, [5:5] +notIdling = bits, U32, 1160, [6:6] +needReset = bits, U32, 1160, [7:7] +isInDeadZone = bits, U32, 1160, [8:8] +isBlipping = bits, U32, 1160, [9:9] +useClosedLoop = bits, U32, 1160, [10:10] +badTps = bits, U32, 1160, [11:11] +looksLikeRunning = bits, U32, 1160, [12:12] +looksLikeCoasting = bits, U32, 1160, [13:13] +looksLikeCrankToIdle = bits, U32, 1160, [14:14] +useInstantRpmForIdle = bits, U32, 1160, [15:15] +isVerboseIAC = bits, U32, 1160, [16:16] +unusedBit_22_17 = bits, U32, 1160, [17:17] +unusedBit_22_18 = bits, U32, 1160, [18:18] +unusedBit_22_19 = bits, U32, 1160, [19:19] +unusedBit_22_20 = bits, U32, 1160, [20:20] +unusedBit_22_21 = bits, U32, 1160, [21:21] +unusedBit_22_22 = bits, U32, 1160, [22:22] +unusedBit_22_23 = bits, U32, 1160, [23:23] +unusedBit_22_24 = bits, U32, 1160, [24:24] +unusedBit_22_25 = bits, U32, 1160, [25:25] +unusedBit_22_26 = bits, U32, 1160, [26:26] +unusedBit_22_27 = bits, U32, 1160, [27:27] +unusedBit_22_28 = bits, U32, 1160, [28:28] +unusedBit_22_29 = bits, U32, 1160, [29:29] +unusedBit_22_30 = bits, U32, 1160, [30:30] +unusedBit_22_31 = bits, U32, 1160, [31:31] +targetRpmByClt = scalar, S32, 1164, "", 1, 0 +targetRpmAcBump = scalar, S32, 1168, "", 1, 0 +iacByRpmTaper = scalar, F32, 1172 +luaAdd = scalar, F32, 1176 +; total TS size = 1180 +baseDwell = scalar, F32, 1180, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 1184, "", 1, 0 +luaTimingAdd = scalar, F32, 1188, "", 1, 0 +luaTimingMult = scalar, F32, 1192, "", 1, 0 +; total TS size = 1196 +idlePosition = scalar, F32, 1196, "", 1, 0 +trim = scalar, F32, 1200, "", 1, 0 +luaAdjustment = scalar, F32, 1204, "", 1, 0 +etbFeedForward = scalar, F32, 1208 +etbIntegralError = scalar, F32, 1212, "", 1, 0 +etbCurrentTarget = scalar, F32, 1216, "%", 1, 0 +; total TS size = 1220 +faultCode = scalar, U08, 1220, "", 1, 0 +heaterDuty = scalar, U08, 1221, "%", 1, 0 +pumpDuty = scalar, U08, 1222, "%", 1, 0 +tempC = scalar, U16, 1224, "C", 1, 0 +nernstVoltage = scalar, U16, 1226, "V", 0.001, 0 +esr = scalar, U16, 1228, "", 1, 0 +; total TS size = 1232 time = { timeNow } @@ -4757,6 +4759,8 @@ entry = brakePedalState, "brake: down", int, "%d" entry = egt1, "egt1", float, "%.3f" entry = egt2, "egt2", float, "%.3f" entry = desiredRpmLimit, "User-defined RPM hard limit", int, "%d" +entry = fuelInjectionCounter, "fuelInjectionCounter", int, "%d" +entry = sparkCounter, "sparkCounter", int, "%d" entry = tpsFrom, "tpsFrom", float, "%.3f" entry = tpsTo, "tpsTo", float, "%.3f" entry = deltaTps, "deltaTps", float, "%.3f" @@ -5498,6 +5502,8 @@ dialog = engine_stateDialog, "engine_state" graphLine = egt2 liveGraph = engine_state_10_Graph, "Graph", South graphLine = desiredRpmLimit + graphLine = fuelInjectionCounter + graphLine = sparkCounter indicatorPanel = tps_accel_stateIndicatorPanel, 2 indicator = {isAboveAccelThreshold}, "isAboveAccelThreshold No", "isAboveAccelThreshold Yes" diff --git a/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini b/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini index 6e53ac9bd9..c0dfa5da4f 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.08.25.hellen-nb1.2877422290" + signature = "rusEFI 2022.08.25.hellen-nb1.1543073446" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.08.25.hellen-nb1.2877422290" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.08.25.hellen-nb1.1543073446" ; 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 @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Aug 25 14:51:37 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Aug 25 22:50:22 UTC 2022 pageSize = 21300 page = 1 @@ -2109,7 +2109,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1224 + ochBlockSize = 1232 ; ; see TunerStudioOutputChannels struct @@ -3022,170 +3022,172 @@ unusedBit_22_31 = bits, U32, 992, [31:31] egt1 = scalar, F32, 996, "", 1, 0 egt2 = scalar, F32, 1000, "", 1, 0 desiredRpmLimit = scalar, S16, 1004, "rpm", 1, 0 -; total TS size = 1008 -tpsFrom = scalar, F32, 1008 -tpsTo = scalar, F32, 1012 -deltaTps = scalar, F32, 1016 -extraFuel = scalar, F32, 1020, "", 1, 0 -valueFromTable = scalar, F32, 1024, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1028, [0:0] -isBelowDecelThreshold = bits, U32, 1028, [1:1] -isTimeToResetAccumulator = bits, U32, 1028, [2:2] -isFractionalEnrichment = bits, U32, 1028, [3:3] -belowEpsilon = bits, U32, 1028, [4:4] -tooShort = bits, U32, 1028, [5:5] -unusedBit_11_6 = bits, U32, 1028, [6:6] -unusedBit_11_7 = bits, U32, 1028, [7:7] -unusedBit_11_8 = bits, U32, 1028, [8:8] -unusedBit_11_9 = bits, U32, 1028, [9:9] -unusedBit_11_10 = bits, U32, 1028, [10:10] -unusedBit_11_11 = bits, U32, 1028, [11:11] -unusedBit_11_12 = bits, U32, 1028, [12:12] -unusedBit_11_13 = bits, U32, 1028, [13:13] -unusedBit_11_14 = bits, U32, 1028, [14:14] -unusedBit_11_15 = bits, U32, 1028, [15:15] -unusedBit_11_16 = bits, U32, 1028, [16:16] -unusedBit_11_17 = bits, U32, 1028, [17:17] -unusedBit_11_18 = bits, U32, 1028, [18:18] -unusedBit_11_19 = bits, U32, 1028, [19:19] -unusedBit_11_20 = bits, U32, 1028, [20:20] -unusedBit_11_21 = bits, U32, 1028, [21:21] -unusedBit_11_22 = bits, U32, 1028, [22:22] -unusedBit_11_23 = bits, U32, 1028, [23:23] -unusedBit_11_24 = bits, U32, 1028, [24:24] -unusedBit_11_25 = bits, U32, 1028, [25:25] -unusedBit_11_26 = bits, U32, 1028, [26:26] -unusedBit_11_27 = bits, U32, 1028, [27:27] -unusedBit_11_28 = bits, U32, 1028, [28:28] -unusedBit_11_29 = bits, U32, 1028, [29:29] -unusedBit_11_30 = bits, U32, 1028, [30:30] -unusedBit_11_31 = bits, U32, 1028, [31:31] -fractionalInjFuel = scalar, F32, 1032, "", 1, 0 -accumulatedValue = scalar, F32, 1036, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1040, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1044, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1048, "", 1, 0 -cycleCnt = scalar, S32, 1052, "", 1, 0 -; total TS size = 1056 -hwEventCounters1 = scalar, S32, 1056, "", 1, 0 -hwEventCounters2 = scalar, S32, 1060, "", 1, 0 -hwEventCounters3 = scalar, S32, 1064, "", 1, 0 -hwEventCounters4 = scalar, S32, 1068, "", 1, 0 -hwEventCounters5 = scalar, S32, 1072, "", 1, 0 -hwEventCounters6 = scalar, S32, 1076, "", 1, 0 -vvtCamCounter = scalar, S32, 1080, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1084, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1088, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1092, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1093, "", 1, 0 -; total TS size = 1096 -totalRevolutionCounter = scalar, U32, 1096, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1100, "", 1, 0 -vvtCurrentPosition = scalar, F32, 1104, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1108, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 1112, "", 1, 0 -triggerStateIndex = scalar, U08, 1116, "", 1, 0 -vvtCounter = scalar, U08, 1117, "", 1, 0 -camResyncCounter = scalar, U08, 1118, "", 1, 0 -vvtStateIndex = scalar, U08, 1119, "", 1, 0 -; total TS size = 1120 -m_hasSynchronizedPhase = bits, U32, 1120, [0:0] -unusedBit_1_1 = bits, U32, 1120, [1:1] -unusedBit_1_2 = bits, U32, 1120, [2:2] -unusedBit_1_3 = bits, U32, 1120, [3:3] -unusedBit_1_4 = bits, U32, 1120, [4:4] -unusedBit_1_5 = bits, U32, 1120, [5:5] -unusedBit_1_6 = bits, U32, 1120, [6:6] -unusedBit_1_7 = bits, U32, 1120, [7:7] -unusedBit_1_8 = bits, U32, 1120, [8:8] -unusedBit_1_9 = bits, U32, 1120, [9:9] -unusedBit_1_10 = bits, U32, 1120, [10:10] -unusedBit_1_11 = bits, U32, 1120, [11:11] -unusedBit_1_12 = bits, U32, 1120, [12:12] -unusedBit_1_13 = bits, U32, 1120, [13:13] -unusedBit_1_14 = bits, U32, 1120, [14:14] -unusedBit_1_15 = bits, U32, 1120, [15:15] -unusedBit_1_16 = bits, U32, 1120, [16:16] -unusedBit_1_17 = bits, U32, 1120, [17:17] -unusedBit_1_18 = bits, U32, 1120, [18:18] -unusedBit_1_19 = bits, U32, 1120, [19:19] -unusedBit_1_20 = bits, U32, 1120, [20:20] -unusedBit_1_21 = bits, U32, 1120, [21:21] -unusedBit_1_22 = bits, U32, 1120, [22:22] -unusedBit_1_23 = bits, U32, 1120, [23:23] -unusedBit_1_24 = bits, U32, 1120, [24:24] -unusedBit_1_25 = bits, U32, 1120, [25:25] -unusedBit_1_26 = bits, U32, 1120, [26:26] -unusedBit_1_27 = bits, U32, 1120, [27:27] -unusedBit_1_28 = bits, U32, 1120, [28:28] -unusedBit_1_29 = bits, U32, 1120, [29:29] -unusedBit_1_30 = bits, U32, 1120, [30:30] -unusedBit_1_31 = bits, U32, 1120, [31:31] -; total TS size = 1124 -wallFuelCorrection = scalar, F32, 1124, "", 1, 0 -wallFuel = scalar, F32, 1128, "", 1, 0 +fuelInjectionCounter = scalar, S32, 1008, "", 1, 0 +sparkCounter = scalar, S32, 1012, "", 1, 0 +; total TS size = 1016 +tpsFrom = scalar, F32, 1016 +tpsTo = scalar, F32, 1020 +deltaTps = scalar, F32, 1024 +extraFuel = scalar, F32, 1028, "", 1, 0 +valueFromTable = scalar, F32, 1032, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1036, [0:0] +isBelowDecelThreshold = bits, U32, 1036, [1:1] +isTimeToResetAccumulator = bits, U32, 1036, [2:2] +isFractionalEnrichment = bits, U32, 1036, [3:3] +belowEpsilon = bits, U32, 1036, [4:4] +tooShort = bits, U32, 1036, [5:5] +unusedBit_11_6 = bits, U32, 1036, [6:6] +unusedBit_11_7 = bits, U32, 1036, [7:7] +unusedBit_11_8 = bits, U32, 1036, [8:8] +unusedBit_11_9 = bits, U32, 1036, [9:9] +unusedBit_11_10 = bits, U32, 1036, [10:10] +unusedBit_11_11 = bits, U32, 1036, [11:11] +unusedBit_11_12 = bits, U32, 1036, [12:12] +unusedBit_11_13 = bits, U32, 1036, [13:13] +unusedBit_11_14 = bits, U32, 1036, [14:14] +unusedBit_11_15 = bits, U32, 1036, [15:15] +unusedBit_11_16 = bits, U32, 1036, [16:16] +unusedBit_11_17 = bits, U32, 1036, [17:17] +unusedBit_11_18 = bits, U32, 1036, [18:18] +unusedBit_11_19 = bits, U32, 1036, [19:19] +unusedBit_11_20 = bits, U32, 1036, [20:20] +unusedBit_11_21 = bits, U32, 1036, [21:21] +unusedBit_11_22 = bits, U32, 1036, [22:22] +unusedBit_11_23 = bits, U32, 1036, [23:23] +unusedBit_11_24 = bits, U32, 1036, [24:24] +unusedBit_11_25 = bits, U32, 1036, [25:25] +unusedBit_11_26 = bits, U32, 1036, [26:26] +unusedBit_11_27 = bits, U32, 1036, [27:27] +unusedBit_11_28 = bits, U32, 1036, [28:28] +unusedBit_11_29 = bits, U32, 1036, [29:29] +unusedBit_11_30 = bits, U32, 1036, [30:30] +unusedBit_11_31 = bits, U32, 1036, [31:31] +fractionalInjFuel = scalar, F32, 1040, "", 1, 0 +accumulatedValue = scalar, F32, 1044, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1048, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1052, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1056, "", 1, 0 +cycleCnt = scalar, S32, 1060, "", 1, 0 +; total TS size = 1064 +hwEventCounters1 = scalar, S32, 1064, "", 1, 0 +hwEventCounters2 = scalar, S32, 1068, "", 1, 0 +hwEventCounters3 = scalar, S32, 1072, "", 1, 0 +hwEventCounters4 = scalar, S32, 1076, "", 1, 0 +hwEventCounters5 = scalar, S32, 1080, "", 1, 0 +hwEventCounters6 = scalar, S32, 1084, "", 1, 0 +vvtCamCounter = scalar, S32, 1088, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1092, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1096, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1100, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1101, "", 1, 0 +; total TS size = 1104 +totalRevolutionCounter = scalar, U32, 1104, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1108, "", 1, 0 +vvtCurrentPosition = scalar, F32, 1112, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1116, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 1120, "", 1, 0 +triggerStateIndex = scalar, U08, 1124, "", 1, 0 +vvtCounter = scalar, U08, 1125, "", 1, 0 +camResyncCounter = scalar, U08, 1126, "", 1, 0 +vvtStateIndex = scalar, U08, 1127, "", 1, 0 +; total TS size = 1128 +m_hasSynchronizedPhase = bits, U32, 1128, [0:0] +unusedBit_1_1 = bits, U32, 1128, [1:1] +unusedBit_1_2 = bits, U32, 1128, [2:2] +unusedBit_1_3 = bits, U32, 1128, [3:3] +unusedBit_1_4 = bits, U32, 1128, [4:4] +unusedBit_1_5 = bits, U32, 1128, [5:5] +unusedBit_1_6 = bits, U32, 1128, [6:6] +unusedBit_1_7 = bits, U32, 1128, [7:7] +unusedBit_1_8 = bits, U32, 1128, [8:8] +unusedBit_1_9 = bits, U32, 1128, [9:9] +unusedBit_1_10 = bits, U32, 1128, [10:10] +unusedBit_1_11 = bits, U32, 1128, [11:11] +unusedBit_1_12 = bits, U32, 1128, [12:12] +unusedBit_1_13 = bits, U32, 1128, [13:13] +unusedBit_1_14 = bits, U32, 1128, [14:14] +unusedBit_1_15 = bits, U32, 1128, [15:15] +unusedBit_1_16 = bits, U32, 1128, [16:16] +unusedBit_1_17 = bits, U32, 1128, [17:17] +unusedBit_1_18 = bits, U32, 1128, [18:18] +unusedBit_1_19 = bits, U32, 1128, [19:19] +unusedBit_1_20 = bits, U32, 1128, [20:20] +unusedBit_1_21 = bits, U32, 1128, [21:21] +unusedBit_1_22 = bits, U32, 1128, [22:22] +unusedBit_1_23 = bits, U32, 1128, [23:23] +unusedBit_1_24 = bits, U32, 1128, [24:24] +unusedBit_1_25 = bits, U32, 1128, [25:25] +unusedBit_1_26 = bits, U32, 1128, [26:26] +unusedBit_1_27 = bits, U32, 1128, [27:27] +unusedBit_1_28 = bits, U32, 1128, [28:28] +unusedBit_1_29 = bits, U32, 1128, [29:29] +unusedBit_1_30 = bits, U32, 1128, [30:30] +unusedBit_1_31 = bits, U32, 1128, [31:31] ; total TS size = 1132 -idleState = bits, S32, 1132, [0:2], "not important" -currentIdlePosition = scalar, F32, 1136 -baseIdlePosition = scalar, F32, 1140 -iacByTpsTaper = scalar, F32, 1144 -throttlePedalUpState = scalar, S32, 1148, "", 1, 0 -mightResetPid = bits, U32, 1152, [0:0] -shouldResetPid = bits, U32, 1152, [1:1] -wasResetPid = bits, U32, 1152, [2:2] -mustResetPid = bits, U32, 1152, [3:3] -isCoasting = bits, U32, 1152, [4:4] -useIacTableForCoasting = bits, U32, 1152, [5:5] -notIdling = bits, U32, 1152, [6:6] -needReset = bits, U32, 1152, [7:7] -isInDeadZone = bits, U32, 1152, [8:8] -isBlipping = bits, U32, 1152, [9:9] -useClosedLoop = bits, U32, 1152, [10:10] -badTps = bits, U32, 1152, [11:11] -looksLikeRunning = bits, U32, 1152, [12:12] -looksLikeCoasting = bits, U32, 1152, [13:13] -looksLikeCrankToIdle = bits, U32, 1152, [14:14] -useInstantRpmForIdle = bits, U32, 1152, [15:15] -isVerboseIAC = bits, U32, 1152, [16:16] -unusedBit_22_17 = bits, U32, 1152, [17:17] -unusedBit_22_18 = bits, U32, 1152, [18:18] -unusedBit_22_19 = bits, U32, 1152, [19:19] -unusedBit_22_20 = bits, U32, 1152, [20:20] -unusedBit_22_21 = bits, U32, 1152, [21:21] -unusedBit_22_22 = bits, U32, 1152, [22:22] -unusedBit_22_23 = bits, U32, 1152, [23:23] -unusedBit_22_24 = bits, U32, 1152, [24:24] -unusedBit_22_25 = bits, U32, 1152, [25:25] -unusedBit_22_26 = bits, U32, 1152, [26:26] -unusedBit_22_27 = bits, U32, 1152, [27:27] -unusedBit_22_28 = bits, U32, 1152, [28:28] -unusedBit_22_29 = bits, U32, 1152, [29:29] -unusedBit_22_30 = bits, U32, 1152, [30:30] -unusedBit_22_31 = bits, U32, 1152, [31:31] -targetRpmByClt = scalar, S32, 1156, "", 1, 0 -targetRpmAcBump = scalar, S32, 1160, "", 1, 0 -iacByRpmTaper = scalar, F32, 1164 -luaAdd = scalar, F32, 1168 -; total TS size = 1172 -baseDwell = scalar, F32, 1172, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 1176, "", 1, 0 -luaTimingAdd = scalar, F32, 1180, "", 1, 0 -luaTimingMult = scalar, F32, 1184, "", 1, 0 -; total TS size = 1188 -idlePosition = scalar, F32, 1188, "", 1, 0 -trim = scalar, F32, 1192, "", 1, 0 -luaAdjustment = scalar, F32, 1196, "", 1, 0 -etbFeedForward = scalar, F32, 1200 -etbIntegralError = scalar, F32, 1204, "", 1, 0 -etbCurrentTarget = scalar, F32, 1208, "%", 1, 0 -; total TS size = 1212 -faultCode = scalar, U08, 1212, "", 1, 0 -heaterDuty = scalar, U08, 1213, "%", 1, 0 -pumpDuty = scalar, U08, 1214, "%", 1, 0 -tempC = scalar, U16, 1216, "C", 1, 0 -nernstVoltage = scalar, U16, 1218, "V", 0.001, 0 -esr = scalar, U16, 1220, "", 1, 0 -; total TS size = 1224 +wallFuelCorrection = scalar, F32, 1132, "", 1, 0 +wallFuel = scalar, F32, 1136, "", 1, 0 +; total TS size = 1140 +idleState = bits, S32, 1140, [0:2], "not important" +currentIdlePosition = scalar, F32, 1144 +baseIdlePosition = scalar, F32, 1148 +iacByTpsTaper = scalar, F32, 1152 +throttlePedalUpState = scalar, S32, 1156, "", 1, 0 +mightResetPid = bits, U32, 1160, [0:0] +shouldResetPid = bits, U32, 1160, [1:1] +wasResetPid = bits, U32, 1160, [2:2] +mustResetPid = bits, U32, 1160, [3:3] +isCoasting = bits, U32, 1160, [4:4] +useIacTableForCoasting = bits, U32, 1160, [5:5] +notIdling = bits, U32, 1160, [6:6] +needReset = bits, U32, 1160, [7:7] +isInDeadZone = bits, U32, 1160, [8:8] +isBlipping = bits, U32, 1160, [9:9] +useClosedLoop = bits, U32, 1160, [10:10] +badTps = bits, U32, 1160, [11:11] +looksLikeRunning = bits, U32, 1160, [12:12] +looksLikeCoasting = bits, U32, 1160, [13:13] +looksLikeCrankToIdle = bits, U32, 1160, [14:14] +useInstantRpmForIdle = bits, U32, 1160, [15:15] +isVerboseIAC = bits, U32, 1160, [16:16] +unusedBit_22_17 = bits, U32, 1160, [17:17] +unusedBit_22_18 = bits, U32, 1160, [18:18] +unusedBit_22_19 = bits, U32, 1160, [19:19] +unusedBit_22_20 = bits, U32, 1160, [20:20] +unusedBit_22_21 = bits, U32, 1160, [21:21] +unusedBit_22_22 = bits, U32, 1160, [22:22] +unusedBit_22_23 = bits, U32, 1160, [23:23] +unusedBit_22_24 = bits, U32, 1160, [24:24] +unusedBit_22_25 = bits, U32, 1160, [25:25] +unusedBit_22_26 = bits, U32, 1160, [26:26] +unusedBit_22_27 = bits, U32, 1160, [27:27] +unusedBit_22_28 = bits, U32, 1160, [28:28] +unusedBit_22_29 = bits, U32, 1160, [29:29] +unusedBit_22_30 = bits, U32, 1160, [30:30] +unusedBit_22_31 = bits, U32, 1160, [31:31] +targetRpmByClt = scalar, S32, 1164, "", 1, 0 +targetRpmAcBump = scalar, S32, 1168, "", 1, 0 +iacByRpmTaper = scalar, F32, 1172 +luaAdd = scalar, F32, 1176 +; total TS size = 1180 +baseDwell = scalar, F32, 1180, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 1184, "", 1, 0 +luaTimingAdd = scalar, F32, 1188, "", 1, 0 +luaTimingMult = scalar, F32, 1192, "", 1, 0 +; total TS size = 1196 +idlePosition = scalar, F32, 1196, "", 1, 0 +trim = scalar, F32, 1200, "", 1, 0 +luaAdjustment = scalar, F32, 1204, "", 1, 0 +etbFeedForward = scalar, F32, 1208 +etbIntegralError = scalar, F32, 1212, "", 1, 0 +etbCurrentTarget = scalar, F32, 1216, "%", 1, 0 +; total TS size = 1220 +faultCode = scalar, U08, 1220, "", 1, 0 +heaterDuty = scalar, U08, 1221, "%", 1, 0 +pumpDuty = scalar, U08, 1222, "%", 1, 0 +tempC = scalar, U16, 1224, "C", 1, 0 +nernstVoltage = scalar, U16, 1226, "V", 0.001, 0 +esr = scalar, U16, 1228, "", 1, 0 +; total TS size = 1232 time = { timeNow } @@ -4757,6 +4759,8 @@ entry = brakePedalState, "brake: down", int, "%d" entry = egt1, "egt1", float, "%.3f" entry = egt2, "egt2", float, "%.3f" entry = desiredRpmLimit, "User-defined RPM hard limit", int, "%d" +entry = fuelInjectionCounter, "fuelInjectionCounter", int, "%d" +entry = sparkCounter, "sparkCounter", int, "%d" entry = tpsFrom, "tpsFrom", float, "%.3f" entry = tpsTo, "tpsTo", float, "%.3f" entry = deltaTps, "deltaTps", float, "%.3f" @@ -5498,6 +5502,8 @@ dialog = engine_stateDialog, "engine_state" graphLine = egt2 liveGraph = engine_state_10_Graph, "Graph", South graphLine = desiredRpmLimit + graphLine = fuelInjectionCounter + graphLine = sparkCounter indicatorPanel = tps_accel_stateIndicatorPanel, 2 indicator = {isAboveAccelThreshold}, "isAboveAccelThreshold No", "isAboveAccelThreshold Yes" diff --git a/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini b/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini index ce51ff891c..5cdca6ec48 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.08.25.hellen121nissan.4208227316" + signature = "rusEFI 2022.08.25.hellen121nissan.179103616" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.08.25.hellen121nissan.4208227316" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.08.25.hellen121nissan.179103616" ; 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 @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Aug 25 14:51:26 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Aug 25 22:50:12 UTC 2022 pageSize = 21300 page = 1 @@ -2109,7 +2109,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1224 + ochBlockSize = 1232 ; ; see TunerStudioOutputChannels struct @@ -3022,170 +3022,172 @@ unusedBit_22_31 = bits, U32, 992, [31:31] egt1 = scalar, F32, 996, "", 1, 0 egt2 = scalar, F32, 1000, "", 1, 0 desiredRpmLimit = scalar, S16, 1004, "rpm", 1, 0 -; total TS size = 1008 -tpsFrom = scalar, F32, 1008 -tpsTo = scalar, F32, 1012 -deltaTps = scalar, F32, 1016 -extraFuel = scalar, F32, 1020, "", 1, 0 -valueFromTable = scalar, F32, 1024, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1028, [0:0] -isBelowDecelThreshold = bits, U32, 1028, [1:1] -isTimeToResetAccumulator = bits, U32, 1028, [2:2] -isFractionalEnrichment = bits, U32, 1028, [3:3] -belowEpsilon = bits, U32, 1028, [4:4] -tooShort = bits, U32, 1028, [5:5] -unusedBit_11_6 = bits, U32, 1028, [6:6] -unusedBit_11_7 = bits, U32, 1028, [7:7] -unusedBit_11_8 = bits, U32, 1028, [8:8] -unusedBit_11_9 = bits, U32, 1028, [9:9] -unusedBit_11_10 = bits, U32, 1028, [10:10] -unusedBit_11_11 = bits, U32, 1028, [11:11] -unusedBit_11_12 = bits, U32, 1028, [12:12] -unusedBit_11_13 = bits, U32, 1028, [13:13] -unusedBit_11_14 = bits, U32, 1028, [14:14] -unusedBit_11_15 = bits, U32, 1028, [15:15] -unusedBit_11_16 = bits, U32, 1028, [16:16] -unusedBit_11_17 = bits, U32, 1028, [17:17] -unusedBit_11_18 = bits, U32, 1028, [18:18] -unusedBit_11_19 = bits, U32, 1028, [19:19] -unusedBit_11_20 = bits, U32, 1028, [20:20] -unusedBit_11_21 = bits, U32, 1028, [21:21] -unusedBit_11_22 = bits, U32, 1028, [22:22] -unusedBit_11_23 = bits, U32, 1028, [23:23] -unusedBit_11_24 = bits, U32, 1028, [24:24] -unusedBit_11_25 = bits, U32, 1028, [25:25] -unusedBit_11_26 = bits, U32, 1028, [26:26] -unusedBit_11_27 = bits, U32, 1028, [27:27] -unusedBit_11_28 = bits, U32, 1028, [28:28] -unusedBit_11_29 = bits, U32, 1028, [29:29] -unusedBit_11_30 = bits, U32, 1028, [30:30] -unusedBit_11_31 = bits, U32, 1028, [31:31] -fractionalInjFuel = scalar, F32, 1032, "", 1, 0 -accumulatedValue = scalar, F32, 1036, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1040, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1044, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1048, "", 1, 0 -cycleCnt = scalar, S32, 1052, "", 1, 0 -; total TS size = 1056 -hwEventCounters1 = scalar, S32, 1056, "", 1, 0 -hwEventCounters2 = scalar, S32, 1060, "", 1, 0 -hwEventCounters3 = scalar, S32, 1064, "", 1, 0 -hwEventCounters4 = scalar, S32, 1068, "", 1, 0 -hwEventCounters5 = scalar, S32, 1072, "", 1, 0 -hwEventCounters6 = scalar, S32, 1076, "", 1, 0 -vvtCamCounter = scalar, S32, 1080, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1084, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1088, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1092, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1093, "", 1, 0 -; total TS size = 1096 -totalRevolutionCounter = scalar, U32, 1096, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1100, "", 1, 0 -vvtCurrentPosition = scalar, F32, 1104, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1108, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 1112, "", 1, 0 -triggerStateIndex = scalar, U08, 1116, "", 1, 0 -vvtCounter = scalar, U08, 1117, "", 1, 0 -camResyncCounter = scalar, U08, 1118, "", 1, 0 -vvtStateIndex = scalar, U08, 1119, "", 1, 0 -; total TS size = 1120 -m_hasSynchronizedPhase = bits, U32, 1120, [0:0] -unusedBit_1_1 = bits, U32, 1120, [1:1] -unusedBit_1_2 = bits, U32, 1120, [2:2] -unusedBit_1_3 = bits, U32, 1120, [3:3] -unusedBit_1_4 = bits, U32, 1120, [4:4] -unusedBit_1_5 = bits, U32, 1120, [5:5] -unusedBit_1_6 = bits, U32, 1120, [6:6] -unusedBit_1_7 = bits, U32, 1120, [7:7] -unusedBit_1_8 = bits, U32, 1120, [8:8] -unusedBit_1_9 = bits, U32, 1120, [9:9] -unusedBit_1_10 = bits, U32, 1120, [10:10] -unusedBit_1_11 = bits, U32, 1120, [11:11] -unusedBit_1_12 = bits, U32, 1120, [12:12] -unusedBit_1_13 = bits, U32, 1120, [13:13] -unusedBit_1_14 = bits, U32, 1120, [14:14] -unusedBit_1_15 = bits, U32, 1120, [15:15] -unusedBit_1_16 = bits, U32, 1120, [16:16] -unusedBit_1_17 = bits, U32, 1120, [17:17] -unusedBit_1_18 = bits, U32, 1120, [18:18] -unusedBit_1_19 = bits, U32, 1120, [19:19] -unusedBit_1_20 = bits, U32, 1120, [20:20] -unusedBit_1_21 = bits, U32, 1120, [21:21] -unusedBit_1_22 = bits, U32, 1120, [22:22] -unusedBit_1_23 = bits, U32, 1120, [23:23] -unusedBit_1_24 = bits, U32, 1120, [24:24] -unusedBit_1_25 = bits, U32, 1120, [25:25] -unusedBit_1_26 = bits, U32, 1120, [26:26] -unusedBit_1_27 = bits, U32, 1120, [27:27] -unusedBit_1_28 = bits, U32, 1120, [28:28] -unusedBit_1_29 = bits, U32, 1120, [29:29] -unusedBit_1_30 = bits, U32, 1120, [30:30] -unusedBit_1_31 = bits, U32, 1120, [31:31] -; total TS size = 1124 -wallFuelCorrection = scalar, F32, 1124, "", 1, 0 -wallFuel = scalar, F32, 1128, "", 1, 0 +fuelInjectionCounter = scalar, S32, 1008, "", 1, 0 +sparkCounter = scalar, S32, 1012, "", 1, 0 +; total TS size = 1016 +tpsFrom = scalar, F32, 1016 +tpsTo = scalar, F32, 1020 +deltaTps = scalar, F32, 1024 +extraFuel = scalar, F32, 1028, "", 1, 0 +valueFromTable = scalar, F32, 1032, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1036, [0:0] +isBelowDecelThreshold = bits, U32, 1036, [1:1] +isTimeToResetAccumulator = bits, U32, 1036, [2:2] +isFractionalEnrichment = bits, U32, 1036, [3:3] +belowEpsilon = bits, U32, 1036, [4:4] +tooShort = bits, U32, 1036, [5:5] +unusedBit_11_6 = bits, U32, 1036, [6:6] +unusedBit_11_7 = bits, U32, 1036, [7:7] +unusedBit_11_8 = bits, U32, 1036, [8:8] +unusedBit_11_9 = bits, U32, 1036, [9:9] +unusedBit_11_10 = bits, U32, 1036, [10:10] +unusedBit_11_11 = bits, U32, 1036, [11:11] +unusedBit_11_12 = bits, U32, 1036, [12:12] +unusedBit_11_13 = bits, U32, 1036, [13:13] +unusedBit_11_14 = bits, U32, 1036, [14:14] +unusedBit_11_15 = bits, U32, 1036, [15:15] +unusedBit_11_16 = bits, U32, 1036, [16:16] +unusedBit_11_17 = bits, U32, 1036, [17:17] +unusedBit_11_18 = bits, U32, 1036, [18:18] +unusedBit_11_19 = bits, U32, 1036, [19:19] +unusedBit_11_20 = bits, U32, 1036, [20:20] +unusedBit_11_21 = bits, U32, 1036, [21:21] +unusedBit_11_22 = bits, U32, 1036, [22:22] +unusedBit_11_23 = bits, U32, 1036, [23:23] +unusedBit_11_24 = bits, U32, 1036, [24:24] +unusedBit_11_25 = bits, U32, 1036, [25:25] +unusedBit_11_26 = bits, U32, 1036, [26:26] +unusedBit_11_27 = bits, U32, 1036, [27:27] +unusedBit_11_28 = bits, U32, 1036, [28:28] +unusedBit_11_29 = bits, U32, 1036, [29:29] +unusedBit_11_30 = bits, U32, 1036, [30:30] +unusedBit_11_31 = bits, U32, 1036, [31:31] +fractionalInjFuel = scalar, F32, 1040, "", 1, 0 +accumulatedValue = scalar, F32, 1044, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1048, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1052, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1056, "", 1, 0 +cycleCnt = scalar, S32, 1060, "", 1, 0 +; total TS size = 1064 +hwEventCounters1 = scalar, S32, 1064, "", 1, 0 +hwEventCounters2 = scalar, S32, 1068, "", 1, 0 +hwEventCounters3 = scalar, S32, 1072, "", 1, 0 +hwEventCounters4 = scalar, S32, 1076, "", 1, 0 +hwEventCounters5 = scalar, S32, 1080, "", 1, 0 +hwEventCounters6 = scalar, S32, 1084, "", 1, 0 +vvtCamCounter = scalar, S32, 1088, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1092, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1096, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1100, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1101, "", 1, 0 +; total TS size = 1104 +totalRevolutionCounter = scalar, U32, 1104, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1108, "", 1, 0 +vvtCurrentPosition = scalar, F32, 1112, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1116, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 1120, "", 1, 0 +triggerStateIndex = scalar, U08, 1124, "", 1, 0 +vvtCounter = scalar, U08, 1125, "", 1, 0 +camResyncCounter = scalar, U08, 1126, "", 1, 0 +vvtStateIndex = scalar, U08, 1127, "", 1, 0 +; total TS size = 1128 +m_hasSynchronizedPhase = bits, U32, 1128, [0:0] +unusedBit_1_1 = bits, U32, 1128, [1:1] +unusedBit_1_2 = bits, U32, 1128, [2:2] +unusedBit_1_3 = bits, U32, 1128, [3:3] +unusedBit_1_4 = bits, U32, 1128, [4:4] +unusedBit_1_5 = bits, U32, 1128, [5:5] +unusedBit_1_6 = bits, U32, 1128, [6:6] +unusedBit_1_7 = bits, U32, 1128, [7:7] +unusedBit_1_8 = bits, U32, 1128, [8:8] +unusedBit_1_9 = bits, U32, 1128, [9:9] +unusedBit_1_10 = bits, U32, 1128, [10:10] +unusedBit_1_11 = bits, U32, 1128, [11:11] +unusedBit_1_12 = bits, U32, 1128, [12:12] +unusedBit_1_13 = bits, U32, 1128, [13:13] +unusedBit_1_14 = bits, U32, 1128, [14:14] +unusedBit_1_15 = bits, U32, 1128, [15:15] +unusedBit_1_16 = bits, U32, 1128, [16:16] +unusedBit_1_17 = bits, U32, 1128, [17:17] +unusedBit_1_18 = bits, U32, 1128, [18:18] +unusedBit_1_19 = bits, U32, 1128, [19:19] +unusedBit_1_20 = bits, U32, 1128, [20:20] +unusedBit_1_21 = bits, U32, 1128, [21:21] +unusedBit_1_22 = bits, U32, 1128, [22:22] +unusedBit_1_23 = bits, U32, 1128, [23:23] +unusedBit_1_24 = bits, U32, 1128, [24:24] +unusedBit_1_25 = bits, U32, 1128, [25:25] +unusedBit_1_26 = bits, U32, 1128, [26:26] +unusedBit_1_27 = bits, U32, 1128, [27:27] +unusedBit_1_28 = bits, U32, 1128, [28:28] +unusedBit_1_29 = bits, U32, 1128, [29:29] +unusedBit_1_30 = bits, U32, 1128, [30:30] +unusedBit_1_31 = bits, U32, 1128, [31:31] ; total TS size = 1132 -idleState = bits, S32, 1132, [0:2], "not important" -currentIdlePosition = scalar, F32, 1136 -baseIdlePosition = scalar, F32, 1140 -iacByTpsTaper = scalar, F32, 1144 -throttlePedalUpState = scalar, S32, 1148, "", 1, 0 -mightResetPid = bits, U32, 1152, [0:0] -shouldResetPid = bits, U32, 1152, [1:1] -wasResetPid = bits, U32, 1152, [2:2] -mustResetPid = bits, U32, 1152, [3:3] -isCoasting = bits, U32, 1152, [4:4] -useIacTableForCoasting = bits, U32, 1152, [5:5] -notIdling = bits, U32, 1152, [6:6] -needReset = bits, U32, 1152, [7:7] -isInDeadZone = bits, U32, 1152, [8:8] -isBlipping = bits, U32, 1152, [9:9] -useClosedLoop = bits, U32, 1152, [10:10] -badTps = bits, U32, 1152, [11:11] -looksLikeRunning = bits, U32, 1152, [12:12] -looksLikeCoasting = bits, U32, 1152, [13:13] -looksLikeCrankToIdle = bits, U32, 1152, [14:14] -useInstantRpmForIdle = bits, U32, 1152, [15:15] -isVerboseIAC = bits, U32, 1152, [16:16] -unusedBit_22_17 = bits, U32, 1152, [17:17] -unusedBit_22_18 = bits, U32, 1152, [18:18] -unusedBit_22_19 = bits, U32, 1152, [19:19] -unusedBit_22_20 = bits, U32, 1152, [20:20] -unusedBit_22_21 = bits, U32, 1152, [21:21] -unusedBit_22_22 = bits, U32, 1152, [22:22] -unusedBit_22_23 = bits, U32, 1152, [23:23] -unusedBit_22_24 = bits, U32, 1152, [24:24] -unusedBit_22_25 = bits, U32, 1152, [25:25] -unusedBit_22_26 = bits, U32, 1152, [26:26] -unusedBit_22_27 = bits, U32, 1152, [27:27] -unusedBit_22_28 = bits, U32, 1152, [28:28] -unusedBit_22_29 = bits, U32, 1152, [29:29] -unusedBit_22_30 = bits, U32, 1152, [30:30] -unusedBit_22_31 = bits, U32, 1152, [31:31] -targetRpmByClt = scalar, S32, 1156, "", 1, 0 -targetRpmAcBump = scalar, S32, 1160, "", 1, 0 -iacByRpmTaper = scalar, F32, 1164 -luaAdd = scalar, F32, 1168 -; total TS size = 1172 -baseDwell = scalar, F32, 1172, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 1176, "", 1, 0 -luaTimingAdd = scalar, F32, 1180, "", 1, 0 -luaTimingMult = scalar, F32, 1184, "", 1, 0 -; total TS size = 1188 -idlePosition = scalar, F32, 1188, "", 1, 0 -trim = scalar, F32, 1192, "", 1, 0 -luaAdjustment = scalar, F32, 1196, "", 1, 0 -etbFeedForward = scalar, F32, 1200 -etbIntegralError = scalar, F32, 1204, "", 1, 0 -etbCurrentTarget = scalar, F32, 1208, "%", 1, 0 -; total TS size = 1212 -faultCode = scalar, U08, 1212, "", 1, 0 -heaterDuty = scalar, U08, 1213, "%", 1, 0 -pumpDuty = scalar, U08, 1214, "%", 1, 0 -tempC = scalar, U16, 1216, "C", 1, 0 -nernstVoltage = scalar, U16, 1218, "V", 0.001, 0 -esr = scalar, U16, 1220, "", 1, 0 -; total TS size = 1224 +wallFuelCorrection = scalar, F32, 1132, "", 1, 0 +wallFuel = scalar, F32, 1136, "", 1, 0 +; total TS size = 1140 +idleState = bits, S32, 1140, [0:2], "not important" +currentIdlePosition = scalar, F32, 1144 +baseIdlePosition = scalar, F32, 1148 +iacByTpsTaper = scalar, F32, 1152 +throttlePedalUpState = scalar, S32, 1156, "", 1, 0 +mightResetPid = bits, U32, 1160, [0:0] +shouldResetPid = bits, U32, 1160, [1:1] +wasResetPid = bits, U32, 1160, [2:2] +mustResetPid = bits, U32, 1160, [3:3] +isCoasting = bits, U32, 1160, [4:4] +useIacTableForCoasting = bits, U32, 1160, [5:5] +notIdling = bits, U32, 1160, [6:6] +needReset = bits, U32, 1160, [7:7] +isInDeadZone = bits, U32, 1160, [8:8] +isBlipping = bits, U32, 1160, [9:9] +useClosedLoop = bits, U32, 1160, [10:10] +badTps = bits, U32, 1160, [11:11] +looksLikeRunning = bits, U32, 1160, [12:12] +looksLikeCoasting = bits, U32, 1160, [13:13] +looksLikeCrankToIdle = bits, U32, 1160, [14:14] +useInstantRpmForIdle = bits, U32, 1160, [15:15] +isVerboseIAC = bits, U32, 1160, [16:16] +unusedBit_22_17 = bits, U32, 1160, [17:17] +unusedBit_22_18 = bits, U32, 1160, [18:18] +unusedBit_22_19 = bits, U32, 1160, [19:19] +unusedBit_22_20 = bits, U32, 1160, [20:20] +unusedBit_22_21 = bits, U32, 1160, [21:21] +unusedBit_22_22 = bits, U32, 1160, [22:22] +unusedBit_22_23 = bits, U32, 1160, [23:23] +unusedBit_22_24 = bits, U32, 1160, [24:24] +unusedBit_22_25 = bits, U32, 1160, [25:25] +unusedBit_22_26 = bits, U32, 1160, [26:26] +unusedBit_22_27 = bits, U32, 1160, [27:27] +unusedBit_22_28 = bits, U32, 1160, [28:28] +unusedBit_22_29 = bits, U32, 1160, [29:29] +unusedBit_22_30 = bits, U32, 1160, [30:30] +unusedBit_22_31 = bits, U32, 1160, [31:31] +targetRpmByClt = scalar, S32, 1164, "", 1, 0 +targetRpmAcBump = scalar, S32, 1168, "", 1, 0 +iacByRpmTaper = scalar, F32, 1172 +luaAdd = scalar, F32, 1176 +; total TS size = 1180 +baseDwell = scalar, F32, 1180, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 1184, "", 1, 0 +luaTimingAdd = scalar, F32, 1188, "", 1, 0 +luaTimingMult = scalar, F32, 1192, "", 1, 0 +; total TS size = 1196 +idlePosition = scalar, F32, 1196, "", 1, 0 +trim = scalar, F32, 1200, "", 1, 0 +luaAdjustment = scalar, F32, 1204, "", 1, 0 +etbFeedForward = scalar, F32, 1208 +etbIntegralError = scalar, F32, 1212, "", 1, 0 +etbCurrentTarget = scalar, F32, 1216, "%", 1, 0 +; total TS size = 1220 +faultCode = scalar, U08, 1220, "", 1, 0 +heaterDuty = scalar, U08, 1221, "%", 1, 0 +pumpDuty = scalar, U08, 1222, "%", 1, 0 +tempC = scalar, U16, 1224, "C", 1, 0 +nernstVoltage = scalar, U16, 1226, "V", 0.001, 0 +esr = scalar, U16, 1228, "", 1, 0 +; total TS size = 1232 time = { timeNow } @@ -4757,6 +4759,8 @@ entry = brakePedalState, "brake: down", int, "%d" entry = egt1, "egt1", float, "%.3f" entry = egt2, "egt2", float, "%.3f" entry = desiredRpmLimit, "User-defined RPM hard limit", int, "%d" +entry = fuelInjectionCounter, "fuelInjectionCounter", int, "%d" +entry = sparkCounter, "sparkCounter", int, "%d" entry = tpsFrom, "tpsFrom", float, "%.3f" entry = tpsTo, "tpsTo", float, "%.3f" entry = deltaTps, "deltaTps", float, "%.3f" @@ -5498,6 +5502,8 @@ dialog = engine_stateDialog, "engine_state" graphLine = egt2 liveGraph = engine_state_10_Graph, "Graph", South graphLine = desiredRpmLimit + graphLine = fuelInjectionCounter + graphLine = sparkCounter indicatorPanel = tps_accel_stateIndicatorPanel, 2 indicator = {isAboveAccelThreshold}, "isAboveAccelThreshold No", "isAboveAccelThreshold Yes" diff --git a/firmware/tunerstudio/generated/rusefi_hellen121vag.ini b/firmware/tunerstudio/generated/rusefi_hellen121vag.ini index 2c41b8a242..6c5fcca00e 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen121vag.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen121vag.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.08.25.hellen121vag.36374628" + signature = "rusEFI 2022.08.25.hellen121vag.4065565712" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.08.25.hellen121vag.36374628" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.08.25.hellen121vag.4065565712" ; 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 @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Aug 25 14:51:24 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Aug 25 22:50:10 UTC 2022 pageSize = 21300 page = 1 @@ -2109,7 +2109,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1224 + ochBlockSize = 1232 ; ; see TunerStudioOutputChannels struct @@ -3022,170 +3022,172 @@ unusedBit_22_31 = bits, U32, 992, [31:31] egt1 = scalar, F32, 996, "", 1, 0 egt2 = scalar, F32, 1000, "", 1, 0 desiredRpmLimit = scalar, S16, 1004, "rpm", 1, 0 -; total TS size = 1008 -tpsFrom = scalar, F32, 1008 -tpsTo = scalar, F32, 1012 -deltaTps = scalar, F32, 1016 -extraFuel = scalar, F32, 1020, "", 1, 0 -valueFromTable = scalar, F32, 1024, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1028, [0:0] -isBelowDecelThreshold = bits, U32, 1028, [1:1] -isTimeToResetAccumulator = bits, U32, 1028, [2:2] -isFractionalEnrichment = bits, U32, 1028, [3:3] -belowEpsilon = bits, U32, 1028, [4:4] -tooShort = bits, U32, 1028, [5:5] -unusedBit_11_6 = bits, U32, 1028, [6:6] -unusedBit_11_7 = bits, U32, 1028, [7:7] -unusedBit_11_8 = bits, U32, 1028, [8:8] -unusedBit_11_9 = bits, U32, 1028, [9:9] -unusedBit_11_10 = bits, U32, 1028, [10:10] -unusedBit_11_11 = bits, U32, 1028, [11:11] -unusedBit_11_12 = bits, U32, 1028, [12:12] -unusedBit_11_13 = bits, U32, 1028, [13:13] -unusedBit_11_14 = bits, U32, 1028, [14:14] -unusedBit_11_15 = bits, U32, 1028, [15:15] -unusedBit_11_16 = bits, U32, 1028, [16:16] -unusedBit_11_17 = bits, U32, 1028, [17:17] -unusedBit_11_18 = bits, U32, 1028, [18:18] -unusedBit_11_19 = bits, U32, 1028, [19:19] -unusedBit_11_20 = bits, U32, 1028, [20:20] -unusedBit_11_21 = bits, U32, 1028, [21:21] -unusedBit_11_22 = bits, U32, 1028, [22:22] -unusedBit_11_23 = bits, U32, 1028, [23:23] -unusedBit_11_24 = bits, U32, 1028, [24:24] -unusedBit_11_25 = bits, U32, 1028, [25:25] -unusedBit_11_26 = bits, U32, 1028, [26:26] -unusedBit_11_27 = bits, U32, 1028, [27:27] -unusedBit_11_28 = bits, U32, 1028, [28:28] -unusedBit_11_29 = bits, U32, 1028, [29:29] -unusedBit_11_30 = bits, U32, 1028, [30:30] -unusedBit_11_31 = bits, U32, 1028, [31:31] -fractionalInjFuel = scalar, F32, 1032, "", 1, 0 -accumulatedValue = scalar, F32, 1036, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1040, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1044, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1048, "", 1, 0 -cycleCnt = scalar, S32, 1052, "", 1, 0 -; total TS size = 1056 -hwEventCounters1 = scalar, S32, 1056, "", 1, 0 -hwEventCounters2 = scalar, S32, 1060, "", 1, 0 -hwEventCounters3 = scalar, S32, 1064, "", 1, 0 -hwEventCounters4 = scalar, S32, 1068, "", 1, 0 -hwEventCounters5 = scalar, S32, 1072, "", 1, 0 -hwEventCounters6 = scalar, S32, 1076, "", 1, 0 -vvtCamCounter = scalar, S32, 1080, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1084, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1088, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1092, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1093, "", 1, 0 -; total TS size = 1096 -totalRevolutionCounter = scalar, U32, 1096, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1100, "", 1, 0 -vvtCurrentPosition = scalar, F32, 1104, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1108, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 1112, "", 1, 0 -triggerStateIndex = scalar, U08, 1116, "", 1, 0 -vvtCounter = scalar, U08, 1117, "", 1, 0 -camResyncCounter = scalar, U08, 1118, "", 1, 0 -vvtStateIndex = scalar, U08, 1119, "", 1, 0 -; total TS size = 1120 -m_hasSynchronizedPhase = bits, U32, 1120, [0:0] -unusedBit_1_1 = bits, U32, 1120, [1:1] -unusedBit_1_2 = bits, U32, 1120, [2:2] -unusedBit_1_3 = bits, U32, 1120, [3:3] -unusedBit_1_4 = bits, U32, 1120, [4:4] -unusedBit_1_5 = bits, U32, 1120, [5:5] -unusedBit_1_6 = bits, U32, 1120, [6:6] -unusedBit_1_7 = bits, U32, 1120, [7:7] -unusedBit_1_8 = bits, U32, 1120, [8:8] -unusedBit_1_9 = bits, U32, 1120, [9:9] -unusedBit_1_10 = bits, U32, 1120, [10:10] -unusedBit_1_11 = bits, U32, 1120, [11:11] -unusedBit_1_12 = bits, U32, 1120, [12:12] -unusedBit_1_13 = bits, U32, 1120, [13:13] -unusedBit_1_14 = bits, U32, 1120, [14:14] -unusedBit_1_15 = bits, U32, 1120, [15:15] -unusedBit_1_16 = bits, U32, 1120, [16:16] -unusedBit_1_17 = bits, U32, 1120, [17:17] -unusedBit_1_18 = bits, U32, 1120, [18:18] -unusedBit_1_19 = bits, U32, 1120, [19:19] -unusedBit_1_20 = bits, U32, 1120, [20:20] -unusedBit_1_21 = bits, U32, 1120, [21:21] -unusedBit_1_22 = bits, U32, 1120, [22:22] -unusedBit_1_23 = bits, U32, 1120, [23:23] -unusedBit_1_24 = bits, U32, 1120, [24:24] -unusedBit_1_25 = bits, U32, 1120, [25:25] -unusedBit_1_26 = bits, U32, 1120, [26:26] -unusedBit_1_27 = bits, U32, 1120, [27:27] -unusedBit_1_28 = bits, U32, 1120, [28:28] -unusedBit_1_29 = bits, U32, 1120, [29:29] -unusedBit_1_30 = bits, U32, 1120, [30:30] -unusedBit_1_31 = bits, U32, 1120, [31:31] -; total TS size = 1124 -wallFuelCorrection = scalar, F32, 1124, "", 1, 0 -wallFuel = scalar, F32, 1128, "", 1, 0 +fuelInjectionCounter = scalar, S32, 1008, "", 1, 0 +sparkCounter = scalar, S32, 1012, "", 1, 0 +; total TS size = 1016 +tpsFrom = scalar, F32, 1016 +tpsTo = scalar, F32, 1020 +deltaTps = scalar, F32, 1024 +extraFuel = scalar, F32, 1028, "", 1, 0 +valueFromTable = scalar, F32, 1032, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1036, [0:0] +isBelowDecelThreshold = bits, U32, 1036, [1:1] +isTimeToResetAccumulator = bits, U32, 1036, [2:2] +isFractionalEnrichment = bits, U32, 1036, [3:3] +belowEpsilon = bits, U32, 1036, [4:4] +tooShort = bits, U32, 1036, [5:5] +unusedBit_11_6 = bits, U32, 1036, [6:6] +unusedBit_11_7 = bits, U32, 1036, [7:7] +unusedBit_11_8 = bits, U32, 1036, [8:8] +unusedBit_11_9 = bits, U32, 1036, [9:9] +unusedBit_11_10 = bits, U32, 1036, [10:10] +unusedBit_11_11 = bits, U32, 1036, [11:11] +unusedBit_11_12 = bits, U32, 1036, [12:12] +unusedBit_11_13 = bits, U32, 1036, [13:13] +unusedBit_11_14 = bits, U32, 1036, [14:14] +unusedBit_11_15 = bits, U32, 1036, [15:15] +unusedBit_11_16 = bits, U32, 1036, [16:16] +unusedBit_11_17 = bits, U32, 1036, [17:17] +unusedBit_11_18 = bits, U32, 1036, [18:18] +unusedBit_11_19 = bits, U32, 1036, [19:19] +unusedBit_11_20 = bits, U32, 1036, [20:20] +unusedBit_11_21 = bits, U32, 1036, [21:21] +unusedBit_11_22 = bits, U32, 1036, [22:22] +unusedBit_11_23 = bits, U32, 1036, [23:23] +unusedBit_11_24 = bits, U32, 1036, [24:24] +unusedBit_11_25 = bits, U32, 1036, [25:25] +unusedBit_11_26 = bits, U32, 1036, [26:26] +unusedBit_11_27 = bits, U32, 1036, [27:27] +unusedBit_11_28 = bits, U32, 1036, [28:28] +unusedBit_11_29 = bits, U32, 1036, [29:29] +unusedBit_11_30 = bits, U32, 1036, [30:30] +unusedBit_11_31 = bits, U32, 1036, [31:31] +fractionalInjFuel = scalar, F32, 1040, "", 1, 0 +accumulatedValue = scalar, F32, 1044, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1048, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1052, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1056, "", 1, 0 +cycleCnt = scalar, S32, 1060, "", 1, 0 +; total TS size = 1064 +hwEventCounters1 = scalar, S32, 1064, "", 1, 0 +hwEventCounters2 = scalar, S32, 1068, "", 1, 0 +hwEventCounters3 = scalar, S32, 1072, "", 1, 0 +hwEventCounters4 = scalar, S32, 1076, "", 1, 0 +hwEventCounters5 = scalar, S32, 1080, "", 1, 0 +hwEventCounters6 = scalar, S32, 1084, "", 1, 0 +vvtCamCounter = scalar, S32, 1088, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1092, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1096, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1100, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1101, "", 1, 0 +; total TS size = 1104 +totalRevolutionCounter = scalar, U32, 1104, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1108, "", 1, 0 +vvtCurrentPosition = scalar, F32, 1112, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1116, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 1120, "", 1, 0 +triggerStateIndex = scalar, U08, 1124, "", 1, 0 +vvtCounter = scalar, U08, 1125, "", 1, 0 +camResyncCounter = scalar, U08, 1126, "", 1, 0 +vvtStateIndex = scalar, U08, 1127, "", 1, 0 +; total TS size = 1128 +m_hasSynchronizedPhase = bits, U32, 1128, [0:0] +unusedBit_1_1 = bits, U32, 1128, [1:1] +unusedBit_1_2 = bits, U32, 1128, [2:2] +unusedBit_1_3 = bits, U32, 1128, [3:3] +unusedBit_1_4 = bits, U32, 1128, [4:4] +unusedBit_1_5 = bits, U32, 1128, [5:5] +unusedBit_1_6 = bits, U32, 1128, [6:6] +unusedBit_1_7 = bits, U32, 1128, [7:7] +unusedBit_1_8 = bits, U32, 1128, [8:8] +unusedBit_1_9 = bits, U32, 1128, [9:9] +unusedBit_1_10 = bits, U32, 1128, [10:10] +unusedBit_1_11 = bits, U32, 1128, [11:11] +unusedBit_1_12 = bits, U32, 1128, [12:12] +unusedBit_1_13 = bits, U32, 1128, [13:13] +unusedBit_1_14 = bits, U32, 1128, [14:14] +unusedBit_1_15 = bits, U32, 1128, [15:15] +unusedBit_1_16 = bits, U32, 1128, [16:16] +unusedBit_1_17 = bits, U32, 1128, [17:17] +unusedBit_1_18 = bits, U32, 1128, [18:18] +unusedBit_1_19 = bits, U32, 1128, [19:19] +unusedBit_1_20 = bits, U32, 1128, [20:20] +unusedBit_1_21 = bits, U32, 1128, [21:21] +unusedBit_1_22 = bits, U32, 1128, [22:22] +unusedBit_1_23 = bits, U32, 1128, [23:23] +unusedBit_1_24 = bits, U32, 1128, [24:24] +unusedBit_1_25 = bits, U32, 1128, [25:25] +unusedBit_1_26 = bits, U32, 1128, [26:26] +unusedBit_1_27 = bits, U32, 1128, [27:27] +unusedBit_1_28 = bits, U32, 1128, [28:28] +unusedBit_1_29 = bits, U32, 1128, [29:29] +unusedBit_1_30 = bits, U32, 1128, [30:30] +unusedBit_1_31 = bits, U32, 1128, [31:31] ; total TS size = 1132 -idleState = bits, S32, 1132, [0:2], "not important" -currentIdlePosition = scalar, F32, 1136 -baseIdlePosition = scalar, F32, 1140 -iacByTpsTaper = scalar, F32, 1144 -throttlePedalUpState = scalar, S32, 1148, "", 1, 0 -mightResetPid = bits, U32, 1152, [0:0] -shouldResetPid = bits, U32, 1152, [1:1] -wasResetPid = bits, U32, 1152, [2:2] -mustResetPid = bits, U32, 1152, [3:3] -isCoasting = bits, U32, 1152, [4:4] -useIacTableForCoasting = bits, U32, 1152, [5:5] -notIdling = bits, U32, 1152, [6:6] -needReset = bits, U32, 1152, [7:7] -isInDeadZone = bits, U32, 1152, [8:8] -isBlipping = bits, U32, 1152, [9:9] -useClosedLoop = bits, U32, 1152, [10:10] -badTps = bits, U32, 1152, [11:11] -looksLikeRunning = bits, U32, 1152, [12:12] -looksLikeCoasting = bits, U32, 1152, [13:13] -looksLikeCrankToIdle = bits, U32, 1152, [14:14] -useInstantRpmForIdle = bits, U32, 1152, [15:15] -isVerboseIAC = bits, U32, 1152, [16:16] -unusedBit_22_17 = bits, U32, 1152, [17:17] -unusedBit_22_18 = bits, U32, 1152, [18:18] -unusedBit_22_19 = bits, U32, 1152, [19:19] -unusedBit_22_20 = bits, U32, 1152, [20:20] -unusedBit_22_21 = bits, U32, 1152, [21:21] -unusedBit_22_22 = bits, U32, 1152, [22:22] -unusedBit_22_23 = bits, U32, 1152, [23:23] -unusedBit_22_24 = bits, U32, 1152, [24:24] -unusedBit_22_25 = bits, U32, 1152, [25:25] -unusedBit_22_26 = bits, U32, 1152, [26:26] -unusedBit_22_27 = bits, U32, 1152, [27:27] -unusedBit_22_28 = bits, U32, 1152, [28:28] -unusedBit_22_29 = bits, U32, 1152, [29:29] -unusedBit_22_30 = bits, U32, 1152, [30:30] -unusedBit_22_31 = bits, U32, 1152, [31:31] -targetRpmByClt = scalar, S32, 1156, "", 1, 0 -targetRpmAcBump = scalar, S32, 1160, "", 1, 0 -iacByRpmTaper = scalar, F32, 1164 -luaAdd = scalar, F32, 1168 -; total TS size = 1172 -baseDwell = scalar, F32, 1172, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 1176, "", 1, 0 -luaTimingAdd = scalar, F32, 1180, "", 1, 0 -luaTimingMult = scalar, F32, 1184, "", 1, 0 -; total TS size = 1188 -idlePosition = scalar, F32, 1188, "", 1, 0 -trim = scalar, F32, 1192, "", 1, 0 -luaAdjustment = scalar, F32, 1196, "", 1, 0 -etbFeedForward = scalar, F32, 1200 -etbIntegralError = scalar, F32, 1204, "", 1, 0 -etbCurrentTarget = scalar, F32, 1208, "%", 1, 0 -; total TS size = 1212 -faultCode = scalar, U08, 1212, "", 1, 0 -heaterDuty = scalar, U08, 1213, "%", 1, 0 -pumpDuty = scalar, U08, 1214, "%", 1, 0 -tempC = scalar, U16, 1216, "C", 1, 0 -nernstVoltage = scalar, U16, 1218, "V", 0.001, 0 -esr = scalar, U16, 1220, "", 1, 0 -; total TS size = 1224 +wallFuelCorrection = scalar, F32, 1132, "", 1, 0 +wallFuel = scalar, F32, 1136, "", 1, 0 +; total TS size = 1140 +idleState = bits, S32, 1140, [0:2], "not important" +currentIdlePosition = scalar, F32, 1144 +baseIdlePosition = scalar, F32, 1148 +iacByTpsTaper = scalar, F32, 1152 +throttlePedalUpState = scalar, S32, 1156, "", 1, 0 +mightResetPid = bits, U32, 1160, [0:0] +shouldResetPid = bits, U32, 1160, [1:1] +wasResetPid = bits, U32, 1160, [2:2] +mustResetPid = bits, U32, 1160, [3:3] +isCoasting = bits, U32, 1160, [4:4] +useIacTableForCoasting = bits, U32, 1160, [5:5] +notIdling = bits, U32, 1160, [6:6] +needReset = bits, U32, 1160, [7:7] +isInDeadZone = bits, U32, 1160, [8:8] +isBlipping = bits, U32, 1160, [9:9] +useClosedLoop = bits, U32, 1160, [10:10] +badTps = bits, U32, 1160, [11:11] +looksLikeRunning = bits, U32, 1160, [12:12] +looksLikeCoasting = bits, U32, 1160, [13:13] +looksLikeCrankToIdle = bits, U32, 1160, [14:14] +useInstantRpmForIdle = bits, U32, 1160, [15:15] +isVerboseIAC = bits, U32, 1160, [16:16] +unusedBit_22_17 = bits, U32, 1160, [17:17] +unusedBit_22_18 = bits, U32, 1160, [18:18] +unusedBit_22_19 = bits, U32, 1160, [19:19] +unusedBit_22_20 = bits, U32, 1160, [20:20] +unusedBit_22_21 = bits, U32, 1160, [21:21] +unusedBit_22_22 = bits, U32, 1160, [22:22] +unusedBit_22_23 = bits, U32, 1160, [23:23] +unusedBit_22_24 = bits, U32, 1160, [24:24] +unusedBit_22_25 = bits, U32, 1160, [25:25] +unusedBit_22_26 = bits, U32, 1160, [26:26] +unusedBit_22_27 = bits, U32, 1160, [27:27] +unusedBit_22_28 = bits, U32, 1160, [28:28] +unusedBit_22_29 = bits, U32, 1160, [29:29] +unusedBit_22_30 = bits, U32, 1160, [30:30] +unusedBit_22_31 = bits, U32, 1160, [31:31] +targetRpmByClt = scalar, S32, 1164, "", 1, 0 +targetRpmAcBump = scalar, S32, 1168, "", 1, 0 +iacByRpmTaper = scalar, F32, 1172 +luaAdd = scalar, F32, 1176 +; total TS size = 1180 +baseDwell = scalar, F32, 1180, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 1184, "", 1, 0 +luaTimingAdd = scalar, F32, 1188, "", 1, 0 +luaTimingMult = scalar, F32, 1192, "", 1, 0 +; total TS size = 1196 +idlePosition = scalar, F32, 1196, "", 1, 0 +trim = scalar, F32, 1200, "", 1, 0 +luaAdjustment = scalar, F32, 1204, "", 1, 0 +etbFeedForward = scalar, F32, 1208 +etbIntegralError = scalar, F32, 1212, "", 1, 0 +etbCurrentTarget = scalar, F32, 1216, "%", 1, 0 +; total TS size = 1220 +faultCode = scalar, U08, 1220, "", 1, 0 +heaterDuty = scalar, U08, 1221, "%", 1, 0 +pumpDuty = scalar, U08, 1222, "%", 1, 0 +tempC = scalar, U16, 1224, "C", 1, 0 +nernstVoltage = scalar, U16, 1226, "V", 0.001, 0 +esr = scalar, U16, 1228, "", 1, 0 +; total TS size = 1232 time = { timeNow } @@ -4757,6 +4759,8 @@ entry = brakePedalState, "brake: down", int, "%d" entry = egt1, "egt1", float, "%.3f" entry = egt2, "egt2", float, "%.3f" entry = desiredRpmLimit, "User-defined RPM hard limit", int, "%d" +entry = fuelInjectionCounter, "fuelInjectionCounter", int, "%d" +entry = sparkCounter, "sparkCounter", int, "%d" entry = tpsFrom, "tpsFrom", float, "%.3f" entry = tpsTo, "tpsTo", float, "%.3f" entry = deltaTps, "deltaTps", float, "%.3f" @@ -5498,6 +5502,8 @@ dialog = engine_stateDialog, "engine_state" graphLine = egt2 liveGraph = engine_state_10_Graph, "Graph", South graphLine = desiredRpmLimit + graphLine = fuelInjectionCounter + graphLine = sparkCounter indicatorPanel = tps_accel_stateIndicatorPanel, 2 indicator = {isAboveAccelThreshold}, "isAboveAccelThreshold No", "isAboveAccelThreshold Yes" diff --git a/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini b/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini index 34c44f4388..473e94be87 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.08.25.hellen128.2364864032" + signature = "rusEFI 2022.08.25.hellen128.2089574996" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.08.25.hellen128.2364864032" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.08.25.hellen128.2089574996" ; 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 @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Aug 25 14:51:22 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Aug 25 22:50:08 UTC 2022 pageSize = 21300 page = 1 @@ -2109,7 +2109,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1224 + ochBlockSize = 1232 ; ; see TunerStudioOutputChannels struct @@ -3022,170 +3022,172 @@ unusedBit_22_31 = bits, U32, 992, [31:31] egt1 = scalar, F32, 996, "", 1, 0 egt2 = scalar, F32, 1000, "", 1, 0 desiredRpmLimit = scalar, S16, 1004, "rpm", 1, 0 -; total TS size = 1008 -tpsFrom = scalar, F32, 1008 -tpsTo = scalar, F32, 1012 -deltaTps = scalar, F32, 1016 -extraFuel = scalar, F32, 1020, "", 1, 0 -valueFromTable = scalar, F32, 1024, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1028, [0:0] -isBelowDecelThreshold = bits, U32, 1028, [1:1] -isTimeToResetAccumulator = bits, U32, 1028, [2:2] -isFractionalEnrichment = bits, U32, 1028, [3:3] -belowEpsilon = bits, U32, 1028, [4:4] -tooShort = bits, U32, 1028, [5:5] -unusedBit_11_6 = bits, U32, 1028, [6:6] -unusedBit_11_7 = bits, U32, 1028, [7:7] -unusedBit_11_8 = bits, U32, 1028, [8:8] -unusedBit_11_9 = bits, U32, 1028, [9:9] -unusedBit_11_10 = bits, U32, 1028, [10:10] -unusedBit_11_11 = bits, U32, 1028, [11:11] -unusedBit_11_12 = bits, U32, 1028, [12:12] -unusedBit_11_13 = bits, U32, 1028, [13:13] -unusedBit_11_14 = bits, U32, 1028, [14:14] -unusedBit_11_15 = bits, U32, 1028, [15:15] -unusedBit_11_16 = bits, U32, 1028, [16:16] -unusedBit_11_17 = bits, U32, 1028, [17:17] -unusedBit_11_18 = bits, U32, 1028, [18:18] -unusedBit_11_19 = bits, U32, 1028, [19:19] -unusedBit_11_20 = bits, U32, 1028, [20:20] -unusedBit_11_21 = bits, U32, 1028, [21:21] -unusedBit_11_22 = bits, U32, 1028, [22:22] -unusedBit_11_23 = bits, U32, 1028, [23:23] -unusedBit_11_24 = bits, U32, 1028, [24:24] -unusedBit_11_25 = bits, U32, 1028, [25:25] -unusedBit_11_26 = bits, U32, 1028, [26:26] -unusedBit_11_27 = bits, U32, 1028, [27:27] -unusedBit_11_28 = bits, U32, 1028, [28:28] -unusedBit_11_29 = bits, U32, 1028, [29:29] -unusedBit_11_30 = bits, U32, 1028, [30:30] -unusedBit_11_31 = bits, U32, 1028, [31:31] -fractionalInjFuel = scalar, F32, 1032, "", 1, 0 -accumulatedValue = scalar, F32, 1036, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1040, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1044, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1048, "", 1, 0 -cycleCnt = scalar, S32, 1052, "", 1, 0 -; total TS size = 1056 -hwEventCounters1 = scalar, S32, 1056, "", 1, 0 -hwEventCounters2 = scalar, S32, 1060, "", 1, 0 -hwEventCounters3 = scalar, S32, 1064, "", 1, 0 -hwEventCounters4 = scalar, S32, 1068, "", 1, 0 -hwEventCounters5 = scalar, S32, 1072, "", 1, 0 -hwEventCounters6 = scalar, S32, 1076, "", 1, 0 -vvtCamCounter = scalar, S32, 1080, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1084, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1088, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1092, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1093, "", 1, 0 -; total TS size = 1096 -totalRevolutionCounter = scalar, U32, 1096, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1100, "", 1, 0 -vvtCurrentPosition = scalar, F32, 1104, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1108, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 1112, "", 1, 0 -triggerStateIndex = scalar, U08, 1116, "", 1, 0 -vvtCounter = scalar, U08, 1117, "", 1, 0 -camResyncCounter = scalar, U08, 1118, "", 1, 0 -vvtStateIndex = scalar, U08, 1119, "", 1, 0 -; total TS size = 1120 -m_hasSynchronizedPhase = bits, U32, 1120, [0:0] -unusedBit_1_1 = bits, U32, 1120, [1:1] -unusedBit_1_2 = bits, U32, 1120, [2:2] -unusedBit_1_3 = bits, U32, 1120, [3:3] -unusedBit_1_4 = bits, U32, 1120, [4:4] -unusedBit_1_5 = bits, U32, 1120, [5:5] -unusedBit_1_6 = bits, U32, 1120, [6:6] -unusedBit_1_7 = bits, U32, 1120, [7:7] -unusedBit_1_8 = bits, U32, 1120, [8:8] -unusedBit_1_9 = bits, U32, 1120, [9:9] -unusedBit_1_10 = bits, U32, 1120, [10:10] -unusedBit_1_11 = bits, U32, 1120, [11:11] -unusedBit_1_12 = bits, U32, 1120, [12:12] -unusedBit_1_13 = bits, U32, 1120, [13:13] -unusedBit_1_14 = bits, U32, 1120, [14:14] -unusedBit_1_15 = bits, U32, 1120, [15:15] -unusedBit_1_16 = bits, U32, 1120, [16:16] -unusedBit_1_17 = bits, U32, 1120, [17:17] -unusedBit_1_18 = bits, U32, 1120, [18:18] -unusedBit_1_19 = bits, U32, 1120, [19:19] -unusedBit_1_20 = bits, U32, 1120, [20:20] -unusedBit_1_21 = bits, U32, 1120, [21:21] -unusedBit_1_22 = bits, U32, 1120, [22:22] -unusedBit_1_23 = bits, U32, 1120, [23:23] -unusedBit_1_24 = bits, U32, 1120, [24:24] -unusedBit_1_25 = bits, U32, 1120, [25:25] -unusedBit_1_26 = bits, U32, 1120, [26:26] -unusedBit_1_27 = bits, U32, 1120, [27:27] -unusedBit_1_28 = bits, U32, 1120, [28:28] -unusedBit_1_29 = bits, U32, 1120, [29:29] -unusedBit_1_30 = bits, U32, 1120, [30:30] -unusedBit_1_31 = bits, U32, 1120, [31:31] -; total TS size = 1124 -wallFuelCorrection = scalar, F32, 1124, "", 1, 0 -wallFuel = scalar, F32, 1128, "", 1, 0 +fuelInjectionCounter = scalar, S32, 1008, "", 1, 0 +sparkCounter = scalar, S32, 1012, "", 1, 0 +; total TS size = 1016 +tpsFrom = scalar, F32, 1016 +tpsTo = scalar, F32, 1020 +deltaTps = scalar, F32, 1024 +extraFuel = scalar, F32, 1028, "", 1, 0 +valueFromTable = scalar, F32, 1032, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1036, [0:0] +isBelowDecelThreshold = bits, U32, 1036, [1:1] +isTimeToResetAccumulator = bits, U32, 1036, [2:2] +isFractionalEnrichment = bits, U32, 1036, [3:3] +belowEpsilon = bits, U32, 1036, [4:4] +tooShort = bits, U32, 1036, [5:5] +unusedBit_11_6 = bits, U32, 1036, [6:6] +unusedBit_11_7 = bits, U32, 1036, [7:7] +unusedBit_11_8 = bits, U32, 1036, [8:8] +unusedBit_11_9 = bits, U32, 1036, [9:9] +unusedBit_11_10 = bits, U32, 1036, [10:10] +unusedBit_11_11 = bits, U32, 1036, [11:11] +unusedBit_11_12 = bits, U32, 1036, [12:12] +unusedBit_11_13 = bits, U32, 1036, [13:13] +unusedBit_11_14 = bits, U32, 1036, [14:14] +unusedBit_11_15 = bits, U32, 1036, [15:15] +unusedBit_11_16 = bits, U32, 1036, [16:16] +unusedBit_11_17 = bits, U32, 1036, [17:17] +unusedBit_11_18 = bits, U32, 1036, [18:18] +unusedBit_11_19 = bits, U32, 1036, [19:19] +unusedBit_11_20 = bits, U32, 1036, [20:20] +unusedBit_11_21 = bits, U32, 1036, [21:21] +unusedBit_11_22 = bits, U32, 1036, [22:22] +unusedBit_11_23 = bits, U32, 1036, [23:23] +unusedBit_11_24 = bits, U32, 1036, [24:24] +unusedBit_11_25 = bits, U32, 1036, [25:25] +unusedBit_11_26 = bits, U32, 1036, [26:26] +unusedBit_11_27 = bits, U32, 1036, [27:27] +unusedBit_11_28 = bits, U32, 1036, [28:28] +unusedBit_11_29 = bits, U32, 1036, [29:29] +unusedBit_11_30 = bits, U32, 1036, [30:30] +unusedBit_11_31 = bits, U32, 1036, [31:31] +fractionalInjFuel = scalar, F32, 1040, "", 1, 0 +accumulatedValue = scalar, F32, 1044, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1048, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1052, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1056, "", 1, 0 +cycleCnt = scalar, S32, 1060, "", 1, 0 +; total TS size = 1064 +hwEventCounters1 = scalar, S32, 1064, "", 1, 0 +hwEventCounters2 = scalar, S32, 1068, "", 1, 0 +hwEventCounters3 = scalar, S32, 1072, "", 1, 0 +hwEventCounters4 = scalar, S32, 1076, "", 1, 0 +hwEventCounters5 = scalar, S32, 1080, "", 1, 0 +hwEventCounters6 = scalar, S32, 1084, "", 1, 0 +vvtCamCounter = scalar, S32, 1088, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1092, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1096, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1100, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1101, "", 1, 0 +; total TS size = 1104 +totalRevolutionCounter = scalar, U32, 1104, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1108, "", 1, 0 +vvtCurrentPosition = scalar, F32, 1112, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1116, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 1120, "", 1, 0 +triggerStateIndex = scalar, U08, 1124, "", 1, 0 +vvtCounter = scalar, U08, 1125, "", 1, 0 +camResyncCounter = scalar, U08, 1126, "", 1, 0 +vvtStateIndex = scalar, U08, 1127, "", 1, 0 +; total TS size = 1128 +m_hasSynchronizedPhase = bits, U32, 1128, [0:0] +unusedBit_1_1 = bits, U32, 1128, [1:1] +unusedBit_1_2 = bits, U32, 1128, [2:2] +unusedBit_1_3 = bits, U32, 1128, [3:3] +unusedBit_1_4 = bits, U32, 1128, [4:4] +unusedBit_1_5 = bits, U32, 1128, [5:5] +unusedBit_1_6 = bits, U32, 1128, [6:6] +unusedBit_1_7 = bits, U32, 1128, [7:7] +unusedBit_1_8 = bits, U32, 1128, [8:8] +unusedBit_1_9 = bits, U32, 1128, [9:9] +unusedBit_1_10 = bits, U32, 1128, [10:10] +unusedBit_1_11 = bits, U32, 1128, [11:11] +unusedBit_1_12 = bits, U32, 1128, [12:12] +unusedBit_1_13 = bits, U32, 1128, [13:13] +unusedBit_1_14 = bits, U32, 1128, [14:14] +unusedBit_1_15 = bits, U32, 1128, [15:15] +unusedBit_1_16 = bits, U32, 1128, [16:16] +unusedBit_1_17 = bits, U32, 1128, [17:17] +unusedBit_1_18 = bits, U32, 1128, [18:18] +unusedBit_1_19 = bits, U32, 1128, [19:19] +unusedBit_1_20 = bits, U32, 1128, [20:20] +unusedBit_1_21 = bits, U32, 1128, [21:21] +unusedBit_1_22 = bits, U32, 1128, [22:22] +unusedBit_1_23 = bits, U32, 1128, [23:23] +unusedBit_1_24 = bits, U32, 1128, [24:24] +unusedBit_1_25 = bits, U32, 1128, [25:25] +unusedBit_1_26 = bits, U32, 1128, [26:26] +unusedBit_1_27 = bits, U32, 1128, [27:27] +unusedBit_1_28 = bits, U32, 1128, [28:28] +unusedBit_1_29 = bits, U32, 1128, [29:29] +unusedBit_1_30 = bits, U32, 1128, [30:30] +unusedBit_1_31 = bits, U32, 1128, [31:31] ; total TS size = 1132 -idleState = bits, S32, 1132, [0:2], "not important" -currentIdlePosition = scalar, F32, 1136 -baseIdlePosition = scalar, F32, 1140 -iacByTpsTaper = scalar, F32, 1144 -throttlePedalUpState = scalar, S32, 1148, "", 1, 0 -mightResetPid = bits, U32, 1152, [0:0] -shouldResetPid = bits, U32, 1152, [1:1] -wasResetPid = bits, U32, 1152, [2:2] -mustResetPid = bits, U32, 1152, [3:3] -isCoasting = bits, U32, 1152, [4:4] -useIacTableForCoasting = bits, U32, 1152, [5:5] -notIdling = bits, U32, 1152, [6:6] -needReset = bits, U32, 1152, [7:7] -isInDeadZone = bits, U32, 1152, [8:8] -isBlipping = bits, U32, 1152, [9:9] -useClosedLoop = bits, U32, 1152, [10:10] -badTps = bits, U32, 1152, [11:11] -looksLikeRunning = bits, U32, 1152, [12:12] -looksLikeCoasting = bits, U32, 1152, [13:13] -looksLikeCrankToIdle = bits, U32, 1152, [14:14] -useInstantRpmForIdle = bits, U32, 1152, [15:15] -isVerboseIAC = bits, U32, 1152, [16:16] -unusedBit_22_17 = bits, U32, 1152, [17:17] -unusedBit_22_18 = bits, U32, 1152, [18:18] -unusedBit_22_19 = bits, U32, 1152, [19:19] -unusedBit_22_20 = bits, U32, 1152, [20:20] -unusedBit_22_21 = bits, U32, 1152, [21:21] -unusedBit_22_22 = bits, U32, 1152, [22:22] -unusedBit_22_23 = bits, U32, 1152, [23:23] -unusedBit_22_24 = bits, U32, 1152, [24:24] -unusedBit_22_25 = bits, U32, 1152, [25:25] -unusedBit_22_26 = bits, U32, 1152, [26:26] -unusedBit_22_27 = bits, U32, 1152, [27:27] -unusedBit_22_28 = bits, U32, 1152, [28:28] -unusedBit_22_29 = bits, U32, 1152, [29:29] -unusedBit_22_30 = bits, U32, 1152, [30:30] -unusedBit_22_31 = bits, U32, 1152, [31:31] -targetRpmByClt = scalar, S32, 1156, "", 1, 0 -targetRpmAcBump = scalar, S32, 1160, "", 1, 0 -iacByRpmTaper = scalar, F32, 1164 -luaAdd = scalar, F32, 1168 -; total TS size = 1172 -baseDwell = scalar, F32, 1172, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 1176, "", 1, 0 -luaTimingAdd = scalar, F32, 1180, "", 1, 0 -luaTimingMult = scalar, F32, 1184, "", 1, 0 -; total TS size = 1188 -idlePosition = scalar, F32, 1188, "", 1, 0 -trim = scalar, F32, 1192, "", 1, 0 -luaAdjustment = scalar, F32, 1196, "", 1, 0 -etbFeedForward = scalar, F32, 1200 -etbIntegralError = scalar, F32, 1204, "", 1, 0 -etbCurrentTarget = scalar, F32, 1208, "%", 1, 0 -; total TS size = 1212 -faultCode = scalar, U08, 1212, "", 1, 0 -heaterDuty = scalar, U08, 1213, "%", 1, 0 -pumpDuty = scalar, U08, 1214, "%", 1, 0 -tempC = scalar, U16, 1216, "C", 1, 0 -nernstVoltage = scalar, U16, 1218, "V", 0.001, 0 -esr = scalar, U16, 1220, "", 1, 0 -; total TS size = 1224 +wallFuelCorrection = scalar, F32, 1132, "", 1, 0 +wallFuel = scalar, F32, 1136, "", 1, 0 +; total TS size = 1140 +idleState = bits, S32, 1140, [0:2], "not important" +currentIdlePosition = scalar, F32, 1144 +baseIdlePosition = scalar, F32, 1148 +iacByTpsTaper = scalar, F32, 1152 +throttlePedalUpState = scalar, S32, 1156, "", 1, 0 +mightResetPid = bits, U32, 1160, [0:0] +shouldResetPid = bits, U32, 1160, [1:1] +wasResetPid = bits, U32, 1160, [2:2] +mustResetPid = bits, U32, 1160, [3:3] +isCoasting = bits, U32, 1160, [4:4] +useIacTableForCoasting = bits, U32, 1160, [5:5] +notIdling = bits, U32, 1160, [6:6] +needReset = bits, U32, 1160, [7:7] +isInDeadZone = bits, U32, 1160, [8:8] +isBlipping = bits, U32, 1160, [9:9] +useClosedLoop = bits, U32, 1160, [10:10] +badTps = bits, U32, 1160, [11:11] +looksLikeRunning = bits, U32, 1160, [12:12] +looksLikeCoasting = bits, U32, 1160, [13:13] +looksLikeCrankToIdle = bits, U32, 1160, [14:14] +useInstantRpmForIdle = bits, U32, 1160, [15:15] +isVerboseIAC = bits, U32, 1160, [16:16] +unusedBit_22_17 = bits, U32, 1160, [17:17] +unusedBit_22_18 = bits, U32, 1160, [18:18] +unusedBit_22_19 = bits, U32, 1160, [19:19] +unusedBit_22_20 = bits, U32, 1160, [20:20] +unusedBit_22_21 = bits, U32, 1160, [21:21] +unusedBit_22_22 = bits, U32, 1160, [22:22] +unusedBit_22_23 = bits, U32, 1160, [23:23] +unusedBit_22_24 = bits, U32, 1160, [24:24] +unusedBit_22_25 = bits, U32, 1160, [25:25] +unusedBit_22_26 = bits, U32, 1160, [26:26] +unusedBit_22_27 = bits, U32, 1160, [27:27] +unusedBit_22_28 = bits, U32, 1160, [28:28] +unusedBit_22_29 = bits, U32, 1160, [29:29] +unusedBit_22_30 = bits, U32, 1160, [30:30] +unusedBit_22_31 = bits, U32, 1160, [31:31] +targetRpmByClt = scalar, S32, 1164, "", 1, 0 +targetRpmAcBump = scalar, S32, 1168, "", 1, 0 +iacByRpmTaper = scalar, F32, 1172 +luaAdd = scalar, F32, 1176 +; total TS size = 1180 +baseDwell = scalar, F32, 1180, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 1184, "", 1, 0 +luaTimingAdd = scalar, F32, 1188, "", 1, 0 +luaTimingMult = scalar, F32, 1192, "", 1, 0 +; total TS size = 1196 +idlePosition = scalar, F32, 1196, "", 1, 0 +trim = scalar, F32, 1200, "", 1, 0 +luaAdjustment = scalar, F32, 1204, "", 1, 0 +etbFeedForward = scalar, F32, 1208 +etbIntegralError = scalar, F32, 1212, "", 1, 0 +etbCurrentTarget = scalar, F32, 1216, "%", 1, 0 +; total TS size = 1220 +faultCode = scalar, U08, 1220, "", 1, 0 +heaterDuty = scalar, U08, 1221, "%", 1, 0 +pumpDuty = scalar, U08, 1222, "%", 1, 0 +tempC = scalar, U16, 1224, "C", 1, 0 +nernstVoltage = scalar, U16, 1226, "V", 0.001, 0 +esr = scalar, U16, 1228, "", 1, 0 +; total TS size = 1232 time = { timeNow } @@ -4757,6 +4759,8 @@ entry = brakePedalState, "brake: down", int, "%d" entry = egt1, "egt1", float, "%.3f" entry = egt2, "egt2", float, "%.3f" entry = desiredRpmLimit, "User-defined RPM hard limit", int, "%d" +entry = fuelInjectionCounter, "fuelInjectionCounter", int, "%d" +entry = sparkCounter, "sparkCounter", int, "%d" entry = tpsFrom, "tpsFrom", float, "%.3f" entry = tpsTo, "tpsTo", float, "%.3f" entry = deltaTps, "deltaTps", float, "%.3f" @@ -5498,6 +5502,8 @@ dialog = engine_stateDialog, "engine_state" graphLine = egt2 liveGraph = engine_state_10_Graph, "Graph", South graphLine = desiredRpmLimit + graphLine = fuelInjectionCounter + graphLine = sparkCounter indicatorPanel = tps_accel_stateIndicatorPanel, 2 indicator = {isAboveAccelThreshold}, "isAboveAccelThreshold No", "isAboveAccelThreshold Yes" diff --git a/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini b/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini index 4affbf54ef..e2eda67411 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.08.25.hellen154hyundai.3930438042" + signature = "rusEFI 2022.08.25.hellen154hyundai.440217070" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.08.25.hellen154hyundai.3930438042" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.08.25.hellen154hyundai.440217070" ; 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 @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Aug 25 14:51:28 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Aug 25 22:50:14 UTC 2022 pageSize = 21300 page = 1 @@ -2109,7 +2109,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1224 + ochBlockSize = 1232 ; ; see TunerStudioOutputChannels struct @@ -3022,170 +3022,172 @@ unusedBit_22_31 = bits, U32, 992, [31:31] egt1 = scalar, F32, 996, "", 1, 0 egt2 = scalar, F32, 1000, "", 1, 0 desiredRpmLimit = scalar, S16, 1004, "rpm", 1, 0 -; total TS size = 1008 -tpsFrom = scalar, F32, 1008 -tpsTo = scalar, F32, 1012 -deltaTps = scalar, F32, 1016 -extraFuel = scalar, F32, 1020, "", 1, 0 -valueFromTable = scalar, F32, 1024, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1028, [0:0] -isBelowDecelThreshold = bits, U32, 1028, [1:1] -isTimeToResetAccumulator = bits, U32, 1028, [2:2] -isFractionalEnrichment = bits, U32, 1028, [3:3] -belowEpsilon = bits, U32, 1028, [4:4] -tooShort = bits, U32, 1028, [5:5] -unusedBit_11_6 = bits, U32, 1028, [6:6] -unusedBit_11_7 = bits, U32, 1028, [7:7] -unusedBit_11_8 = bits, U32, 1028, [8:8] -unusedBit_11_9 = bits, U32, 1028, [9:9] -unusedBit_11_10 = bits, U32, 1028, [10:10] -unusedBit_11_11 = bits, U32, 1028, [11:11] -unusedBit_11_12 = bits, U32, 1028, [12:12] -unusedBit_11_13 = bits, U32, 1028, [13:13] -unusedBit_11_14 = bits, U32, 1028, [14:14] -unusedBit_11_15 = bits, U32, 1028, [15:15] -unusedBit_11_16 = bits, U32, 1028, [16:16] -unusedBit_11_17 = bits, U32, 1028, [17:17] -unusedBit_11_18 = bits, U32, 1028, [18:18] -unusedBit_11_19 = bits, U32, 1028, [19:19] -unusedBit_11_20 = bits, U32, 1028, [20:20] -unusedBit_11_21 = bits, U32, 1028, [21:21] -unusedBit_11_22 = bits, U32, 1028, [22:22] -unusedBit_11_23 = bits, U32, 1028, [23:23] -unusedBit_11_24 = bits, U32, 1028, [24:24] -unusedBit_11_25 = bits, U32, 1028, [25:25] -unusedBit_11_26 = bits, U32, 1028, [26:26] -unusedBit_11_27 = bits, U32, 1028, [27:27] -unusedBit_11_28 = bits, U32, 1028, [28:28] -unusedBit_11_29 = bits, U32, 1028, [29:29] -unusedBit_11_30 = bits, U32, 1028, [30:30] -unusedBit_11_31 = bits, U32, 1028, [31:31] -fractionalInjFuel = scalar, F32, 1032, "", 1, 0 -accumulatedValue = scalar, F32, 1036, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1040, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1044, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1048, "", 1, 0 -cycleCnt = scalar, S32, 1052, "", 1, 0 -; total TS size = 1056 -hwEventCounters1 = scalar, S32, 1056, "", 1, 0 -hwEventCounters2 = scalar, S32, 1060, "", 1, 0 -hwEventCounters3 = scalar, S32, 1064, "", 1, 0 -hwEventCounters4 = scalar, S32, 1068, "", 1, 0 -hwEventCounters5 = scalar, S32, 1072, "", 1, 0 -hwEventCounters6 = scalar, S32, 1076, "", 1, 0 -vvtCamCounter = scalar, S32, 1080, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1084, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1088, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1092, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1093, "", 1, 0 -; total TS size = 1096 -totalRevolutionCounter = scalar, U32, 1096, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1100, "", 1, 0 -vvtCurrentPosition = scalar, F32, 1104, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1108, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 1112, "", 1, 0 -triggerStateIndex = scalar, U08, 1116, "", 1, 0 -vvtCounter = scalar, U08, 1117, "", 1, 0 -camResyncCounter = scalar, U08, 1118, "", 1, 0 -vvtStateIndex = scalar, U08, 1119, "", 1, 0 -; total TS size = 1120 -m_hasSynchronizedPhase = bits, U32, 1120, [0:0] -unusedBit_1_1 = bits, U32, 1120, [1:1] -unusedBit_1_2 = bits, U32, 1120, [2:2] -unusedBit_1_3 = bits, U32, 1120, [3:3] -unusedBit_1_4 = bits, U32, 1120, [4:4] -unusedBit_1_5 = bits, U32, 1120, [5:5] -unusedBit_1_6 = bits, U32, 1120, [6:6] -unusedBit_1_7 = bits, U32, 1120, [7:7] -unusedBit_1_8 = bits, U32, 1120, [8:8] -unusedBit_1_9 = bits, U32, 1120, [9:9] -unusedBit_1_10 = bits, U32, 1120, [10:10] -unusedBit_1_11 = bits, U32, 1120, [11:11] -unusedBit_1_12 = bits, U32, 1120, [12:12] -unusedBit_1_13 = bits, U32, 1120, [13:13] -unusedBit_1_14 = bits, U32, 1120, [14:14] -unusedBit_1_15 = bits, U32, 1120, [15:15] -unusedBit_1_16 = bits, U32, 1120, [16:16] -unusedBit_1_17 = bits, U32, 1120, [17:17] -unusedBit_1_18 = bits, U32, 1120, [18:18] -unusedBit_1_19 = bits, U32, 1120, [19:19] -unusedBit_1_20 = bits, U32, 1120, [20:20] -unusedBit_1_21 = bits, U32, 1120, [21:21] -unusedBit_1_22 = bits, U32, 1120, [22:22] -unusedBit_1_23 = bits, U32, 1120, [23:23] -unusedBit_1_24 = bits, U32, 1120, [24:24] -unusedBit_1_25 = bits, U32, 1120, [25:25] -unusedBit_1_26 = bits, U32, 1120, [26:26] -unusedBit_1_27 = bits, U32, 1120, [27:27] -unusedBit_1_28 = bits, U32, 1120, [28:28] -unusedBit_1_29 = bits, U32, 1120, [29:29] -unusedBit_1_30 = bits, U32, 1120, [30:30] -unusedBit_1_31 = bits, U32, 1120, [31:31] -; total TS size = 1124 -wallFuelCorrection = scalar, F32, 1124, "", 1, 0 -wallFuel = scalar, F32, 1128, "", 1, 0 +fuelInjectionCounter = scalar, S32, 1008, "", 1, 0 +sparkCounter = scalar, S32, 1012, "", 1, 0 +; total TS size = 1016 +tpsFrom = scalar, F32, 1016 +tpsTo = scalar, F32, 1020 +deltaTps = scalar, F32, 1024 +extraFuel = scalar, F32, 1028, "", 1, 0 +valueFromTable = scalar, F32, 1032, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1036, [0:0] +isBelowDecelThreshold = bits, U32, 1036, [1:1] +isTimeToResetAccumulator = bits, U32, 1036, [2:2] +isFractionalEnrichment = bits, U32, 1036, [3:3] +belowEpsilon = bits, U32, 1036, [4:4] +tooShort = bits, U32, 1036, [5:5] +unusedBit_11_6 = bits, U32, 1036, [6:6] +unusedBit_11_7 = bits, U32, 1036, [7:7] +unusedBit_11_8 = bits, U32, 1036, [8:8] +unusedBit_11_9 = bits, U32, 1036, [9:9] +unusedBit_11_10 = bits, U32, 1036, [10:10] +unusedBit_11_11 = bits, U32, 1036, [11:11] +unusedBit_11_12 = bits, U32, 1036, [12:12] +unusedBit_11_13 = bits, U32, 1036, [13:13] +unusedBit_11_14 = bits, U32, 1036, [14:14] +unusedBit_11_15 = bits, U32, 1036, [15:15] +unusedBit_11_16 = bits, U32, 1036, [16:16] +unusedBit_11_17 = bits, U32, 1036, [17:17] +unusedBit_11_18 = bits, U32, 1036, [18:18] +unusedBit_11_19 = bits, U32, 1036, [19:19] +unusedBit_11_20 = bits, U32, 1036, [20:20] +unusedBit_11_21 = bits, U32, 1036, [21:21] +unusedBit_11_22 = bits, U32, 1036, [22:22] +unusedBit_11_23 = bits, U32, 1036, [23:23] +unusedBit_11_24 = bits, U32, 1036, [24:24] +unusedBit_11_25 = bits, U32, 1036, [25:25] +unusedBit_11_26 = bits, U32, 1036, [26:26] +unusedBit_11_27 = bits, U32, 1036, [27:27] +unusedBit_11_28 = bits, U32, 1036, [28:28] +unusedBit_11_29 = bits, U32, 1036, [29:29] +unusedBit_11_30 = bits, U32, 1036, [30:30] +unusedBit_11_31 = bits, U32, 1036, [31:31] +fractionalInjFuel = scalar, F32, 1040, "", 1, 0 +accumulatedValue = scalar, F32, 1044, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1048, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1052, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1056, "", 1, 0 +cycleCnt = scalar, S32, 1060, "", 1, 0 +; total TS size = 1064 +hwEventCounters1 = scalar, S32, 1064, "", 1, 0 +hwEventCounters2 = scalar, S32, 1068, "", 1, 0 +hwEventCounters3 = scalar, S32, 1072, "", 1, 0 +hwEventCounters4 = scalar, S32, 1076, "", 1, 0 +hwEventCounters5 = scalar, S32, 1080, "", 1, 0 +hwEventCounters6 = scalar, S32, 1084, "", 1, 0 +vvtCamCounter = scalar, S32, 1088, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1092, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1096, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1100, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1101, "", 1, 0 +; total TS size = 1104 +totalRevolutionCounter = scalar, U32, 1104, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1108, "", 1, 0 +vvtCurrentPosition = scalar, F32, 1112, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1116, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 1120, "", 1, 0 +triggerStateIndex = scalar, U08, 1124, "", 1, 0 +vvtCounter = scalar, U08, 1125, "", 1, 0 +camResyncCounter = scalar, U08, 1126, "", 1, 0 +vvtStateIndex = scalar, U08, 1127, "", 1, 0 +; total TS size = 1128 +m_hasSynchronizedPhase = bits, U32, 1128, [0:0] +unusedBit_1_1 = bits, U32, 1128, [1:1] +unusedBit_1_2 = bits, U32, 1128, [2:2] +unusedBit_1_3 = bits, U32, 1128, [3:3] +unusedBit_1_4 = bits, U32, 1128, [4:4] +unusedBit_1_5 = bits, U32, 1128, [5:5] +unusedBit_1_6 = bits, U32, 1128, [6:6] +unusedBit_1_7 = bits, U32, 1128, [7:7] +unusedBit_1_8 = bits, U32, 1128, [8:8] +unusedBit_1_9 = bits, U32, 1128, [9:9] +unusedBit_1_10 = bits, U32, 1128, [10:10] +unusedBit_1_11 = bits, U32, 1128, [11:11] +unusedBit_1_12 = bits, U32, 1128, [12:12] +unusedBit_1_13 = bits, U32, 1128, [13:13] +unusedBit_1_14 = bits, U32, 1128, [14:14] +unusedBit_1_15 = bits, U32, 1128, [15:15] +unusedBit_1_16 = bits, U32, 1128, [16:16] +unusedBit_1_17 = bits, U32, 1128, [17:17] +unusedBit_1_18 = bits, U32, 1128, [18:18] +unusedBit_1_19 = bits, U32, 1128, [19:19] +unusedBit_1_20 = bits, U32, 1128, [20:20] +unusedBit_1_21 = bits, U32, 1128, [21:21] +unusedBit_1_22 = bits, U32, 1128, [22:22] +unusedBit_1_23 = bits, U32, 1128, [23:23] +unusedBit_1_24 = bits, U32, 1128, [24:24] +unusedBit_1_25 = bits, U32, 1128, [25:25] +unusedBit_1_26 = bits, U32, 1128, [26:26] +unusedBit_1_27 = bits, U32, 1128, [27:27] +unusedBit_1_28 = bits, U32, 1128, [28:28] +unusedBit_1_29 = bits, U32, 1128, [29:29] +unusedBit_1_30 = bits, U32, 1128, [30:30] +unusedBit_1_31 = bits, U32, 1128, [31:31] ; total TS size = 1132 -idleState = bits, S32, 1132, [0:2], "not important" -currentIdlePosition = scalar, F32, 1136 -baseIdlePosition = scalar, F32, 1140 -iacByTpsTaper = scalar, F32, 1144 -throttlePedalUpState = scalar, S32, 1148, "", 1, 0 -mightResetPid = bits, U32, 1152, [0:0] -shouldResetPid = bits, U32, 1152, [1:1] -wasResetPid = bits, U32, 1152, [2:2] -mustResetPid = bits, U32, 1152, [3:3] -isCoasting = bits, U32, 1152, [4:4] -useIacTableForCoasting = bits, U32, 1152, [5:5] -notIdling = bits, U32, 1152, [6:6] -needReset = bits, U32, 1152, [7:7] -isInDeadZone = bits, U32, 1152, [8:8] -isBlipping = bits, U32, 1152, [9:9] -useClosedLoop = bits, U32, 1152, [10:10] -badTps = bits, U32, 1152, [11:11] -looksLikeRunning = bits, U32, 1152, [12:12] -looksLikeCoasting = bits, U32, 1152, [13:13] -looksLikeCrankToIdle = bits, U32, 1152, [14:14] -useInstantRpmForIdle = bits, U32, 1152, [15:15] -isVerboseIAC = bits, U32, 1152, [16:16] -unusedBit_22_17 = bits, U32, 1152, [17:17] -unusedBit_22_18 = bits, U32, 1152, [18:18] -unusedBit_22_19 = bits, U32, 1152, [19:19] -unusedBit_22_20 = bits, U32, 1152, [20:20] -unusedBit_22_21 = bits, U32, 1152, [21:21] -unusedBit_22_22 = bits, U32, 1152, [22:22] -unusedBit_22_23 = bits, U32, 1152, [23:23] -unusedBit_22_24 = bits, U32, 1152, [24:24] -unusedBit_22_25 = bits, U32, 1152, [25:25] -unusedBit_22_26 = bits, U32, 1152, [26:26] -unusedBit_22_27 = bits, U32, 1152, [27:27] -unusedBit_22_28 = bits, U32, 1152, [28:28] -unusedBit_22_29 = bits, U32, 1152, [29:29] -unusedBit_22_30 = bits, U32, 1152, [30:30] -unusedBit_22_31 = bits, U32, 1152, [31:31] -targetRpmByClt = scalar, S32, 1156, "", 1, 0 -targetRpmAcBump = scalar, S32, 1160, "", 1, 0 -iacByRpmTaper = scalar, F32, 1164 -luaAdd = scalar, F32, 1168 -; total TS size = 1172 -baseDwell = scalar, F32, 1172, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 1176, "", 1, 0 -luaTimingAdd = scalar, F32, 1180, "", 1, 0 -luaTimingMult = scalar, F32, 1184, "", 1, 0 -; total TS size = 1188 -idlePosition = scalar, F32, 1188, "", 1, 0 -trim = scalar, F32, 1192, "", 1, 0 -luaAdjustment = scalar, F32, 1196, "", 1, 0 -etbFeedForward = scalar, F32, 1200 -etbIntegralError = scalar, F32, 1204, "", 1, 0 -etbCurrentTarget = scalar, F32, 1208, "%", 1, 0 -; total TS size = 1212 -faultCode = scalar, U08, 1212, "", 1, 0 -heaterDuty = scalar, U08, 1213, "%", 1, 0 -pumpDuty = scalar, U08, 1214, "%", 1, 0 -tempC = scalar, U16, 1216, "C", 1, 0 -nernstVoltage = scalar, U16, 1218, "V", 0.001, 0 -esr = scalar, U16, 1220, "", 1, 0 -; total TS size = 1224 +wallFuelCorrection = scalar, F32, 1132, "", 1, 0 +wallFuel = scalar, F32, 1136, "", 1, 0 +; total TS size = 1140 +idleState = bits, S32, 1140, [0:2], "not important" +currentIdlePosition = scalar, F32, 1144 +baseIdlePosition = scalar, F32, 1148 +iacByTpsTaper = scalar, F32, 1152 +throttlePedalUpState = scalar, S32, 1156, "", 1, 0 +mightResetPid = bits, U32, 1160, [0:0] +shouldResetPid = bits, U32, 1160, [1:1] +wasResetPid = bits, U32, 1160, [2:2] +mustResetPid = bits, U32, 1160, [3:3] +isCoasting = bits, U32, 1160, [4:4] +useIacTableForCoasting = bits, U32, 1160, [5:5] +notIdling = bits, U32, 1160, [6:6] +needReset = bits, U32, 1160, [7:7] +isInDeadZone = bits, U32, 1160, [8:8] +isBlipping = bits, U32, 1160, [9:9] +useClosedLoop = bits, U32, 1160, [10:10] +badTps = bits, U32, 1160, [11:11] +looksLikeRunning = bits, U32, 1160, [12:12] +looksLikeCoasting = bits, U32, 1160, [13:13] +looksLikeCrankToIdle = bits, U32, 1160, [14:14] +useInstantRpmForIdle = bits, U32, 1160, [15:15] +isVerboseIAC = bits, U32, 1160, [16:16] +unusedBit_22_17 = bits, U32, 1160, [17:17] +unusedBit_22_18 = bits, U32, 1160, [18:18] +unusedBit_22_19 = bits, U32, 1160, [19:19] +unusedBit_22_20 = bits, U32, 1160, [20:20] +unusedBit_22_21 = bits, U32, 1160, [21:21] +unusedBit_22_22 = bits, U32, 1160, [22:22] +unusedBit_22_23 = bits, U32, 1160, [23:23] +unusedBit_22_24 = bits, U32, 1160, [24:24] +unusedBit_22_25 = bits, U32, 1160, [25:25] +unusedBit_22_26 = bits, U32, 1160, [26:26] +unusedBit_22_27 = bits, U32, 1160, [27:27] +unusedBit_22_28 = bits, U32, 1160, [28:28] +unusedBit_22_29 = bits, U32, 1160, [29:29] +unusedBit_22_30 = bits, U32, 1160, [30:30] +unusedBit_22_31 = bits, U32, 1160, [31:31] +targetRpmByClt = scalar, S32, 1164, "", 1, 0 +targetRpmAcBump = scalar, S32, 1168, "", 1, 0 +iacByRpmTaper = scalar, F32, 1172 +luaAdd = scalar, F32, 1176 +; total TS size = 1180 +baseDwell = scalar, F32, 1180, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 1184, "", 1, 0 +luaTimingAdd = scalar, F32, 1188, "", 1, 0 +luaTimingMult = scalar, F32, 1192, "", 1, 0 +; total TS size = 1196 +idlePosition = scalar, F32, 1196, "", 1, 0 +trim = scalar, F32, 1200, "", 1, 0 +luaAdjustment = scalar, F32, 1204, "", 1, 0 +etbFeedForward = scalar, F32, 1208 +etbIntegralError = scalar, F32, 1212, "", 1, 0 +etbCurrentTarget = scalar, F32, 1216, "%", 1, 0 +; total TS size = 1220 +faultCode = scalar, U08, 1220, "", 1, 0 +heaterDuty = scalar, U08, 1221, "%", 1, 0 +pumpDuty = scalar, U08, 1222, "%", 1, 0 +tempC = scalar, U16, 1224, "C", 1, 0 +nernstVoltage = scalar, U16, 1226, "V", 0.001, 0 +esr = scalar, U16, 1228, "", 1, 0 +; total TS size = 1232 time = { timeNow } @@ -4757,6 +4759,8 @@ entry = brakePedalState, "brake: down", int, "%d" entry = egt1, "egt1", float, "%.3f" entry = egt2, "egt2", float, "%.3f" entry = desiredRpmLimit, "User-defined RPM hard limit", int, "%d" +entry = fuelInjectionCounter, "fuelInjectionCounter", int, "%d" +entry = sparkCounter, "sparkCounter", int, "%d" entry = tpsFrom, "tpsFrom", float, "%.3f" entry = tpsTo, "tpsTo", float, "%.3f" entry = deltaTps, "deltaTps", float, "%.3f" @@ -5498,6 +5502,8 @@ dialog = engine_stateDialog, "engine_state" graphLine = egt2 liveGraph = engine_state_10_Graph, "Graph", South graphLine = desiredRpmLimit + graphLine = fuelInjectionCounter + graphLine = sparkCounter indicatorPanel = tps_accel_stateIndicatorPanel, 2 indicator = {isAboveAccelThreshold}, "isAboveAccelThreshold No", "isAboveAccelThreshold Yes" diff --git a/firmware/tunerstudio/generated/rusefi_hellen72.ini b/firmware/tunerstudio/generated/rusefi_hellen72.ini index d4e1978884..3f946da745 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen72.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen72.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.08.25.hellen72.2151014938" + signature = "rusEFI 2022.08.25.hellen72.1884124782" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.08.25.hellen72.2151014938" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.08.25.hellen72.1884124782" ; 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 @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Aug 25 14:51:32 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Aug 25 22:50:18 UTC 2022 pageSize = 21300 page = 1 @@ -2109,7 +2109,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1224 + ochBlockSize = 1232 ; ; see TunerStudioOutputChannels struct @@ -3022,170 +3022,172 @@ unusedBit_22_31 = bits, U32, 992, [31:31] egt1 = scalar, F32, 996, "", 1, 0 egt2 = scalar, F32, 1000, "", 1, 0 desiredRpmLimit = scalar, S16, 1004, "rpm", 1, 0 -; total TS size = 1008 -tpsFrom = scalar, F32, 1008 -tpsTo = scalar, F32, 1012 -deltaTps = scalar, F32, 1016 -extraFuel = scalar, F32, 1020, "", 1, 0 -valueFromTable = scalar, F32, 1024, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1028, [0:0] -isBelowDecelThreshold = bits, U32, 1028, [1:1] -isTimeToResetAccumulator = bits, U32, 1028, [2:2] -isFractionalEnrichment = bits, U32, 1028, [3:3] -belowEpsilon = bits, U32, 1028, [4:4] -tooShort = bits, U32, 1028, [5:5] -unusedBit_11_6 = bits, U32, 1028, [6:6] -unusedBit_11_7 = bits, U32, 1028, [7:7] -unusedBit_11_8 = bits, U32, 1028, [8:8] -unusedBit_11_9 = bits, U32, 1028, [9:9] -unusedBit_11_10 = bits, U32, 1028, [10:10] -unusedBit_11_11 = bits, U32, 1028, [11:11] -unusedBit_11_12 = bits, U32, 1028, [12:12] -unusedBit_11_13 = bits, U32, 1028, [13:13] -unusedBit_11_14 = bits, U32, 1028, [14:14] -unusedBit_11_15 = bits, U32, 1028, [15:15] -unusedBit_11_16 = bits, U32, 1028, [16:16] -unusedBit_11_17 = bits, U32, 1028, [17:17] -unusedBit_11_18 = bits, U32, 1028, [18:18] -unusedBit_11_19 = bits, U32, 1028, [19:19] -unusedBit_11_20 = bits, U32, 1028, [20:20] -unusedBit_11_21 = bits, U32, 1028, [21:21] -unusedBit_11_22 = bits, U32, 1028, [22:22] -unusedBit_11_23 = bits, U32, 1028, [23:23] -unusedBit_11_24 = bits, U32, 1028, [24:24] -unusedBit_11_25 = bits, U32, 1028, [25:25] -unusedBit_11_26 = bits, U32, 1028, [26:26] -unusedBit_11_27 = bits, U32, 1028, [27:27] -unusedBit_11_28 = bits, U32, 1028, [28:28] -unusedBit_11_29 = bits, U32, 1028, [29:29] -unusedBit_11_30 = bits, U32, 1028, [30:30] -unusedBit_11_31 = bits, U32, 1028, [31:31] -fractionalInjFuel = scalar, F32, 1032, "", 1, 0 -accumulatedValue = scalar, F32, 1036, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1040, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1044, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1048, "", 1, 0 -cycleCnt = scalar, S32, 1052, "", 1, 0 -; total TS size = 1056 -hwEventCounters1 = scalar, S32, 1056, "", 1, 0 -hwEventCounters2 = scalar, S32, 1060, "", 1, 0 -hwEventCounters3 = scalar, S32, 1064, "", 1, 0 -hwEventCounters4 = scalar, S32, 1068, "", 1, 0 -hwEventCounters5 = scalar, S32, 1072, "", 1, 0 -hwEventCounters6 = scalar, S32, 1076, "", 1, 0 -vvtCamCounter = scalar, S32, 1080, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1084, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1088, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1092, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1093, "", 1, 0 -; total TS size = 1096 -totalRevolutionCounter = scalar, U32, 1096, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1100, "", 1, 0 -vvtCurrentPosition = scalar, F32, 1104, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1108, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 1112, "", 1, 0 -triggerStateIndex = scalar, U08, 1116, "", 1, 0 -vvtCounter = scalar, U08, 1117, "", 1, 0 -camResyncCounter = scalar, U08, 1118, "", 1, 0 -vvtStateIndex = scalar, U08, 1119, "", 1, 0 -; total TS size = 1120 -m_hasSynchronizedPhase = bits, U32, 1120, [0:0] -unusedBit_1_1 = bits, U32, 1120, [1:1] -unusedBit_1_2 = bits, U32, 1120, [2:2] -unusedBit_1_3 = bits, U32, 1120, [3:3] -unusedBit_1_4 = bits, U32, 1120, [4:4] -unusedBit_1_5 = bits, U32, 1120, [5:5] -unusedBit_1_6 = bits, U32, 1120, [6:6] -unusedBit_1_7 = bits, U32, 1120, [7:7] -unusedBit_1_8 = bits, U32, 1120, [8:8] -unusedBit_1_9 = bits, U32, 1120, [9:9] -unusedBit_1_10 = bits, U32, 1120, [10:10] -unusedBit_1_11 = bits, U32, 1120, [11:11] -unusedBit_1_12 = bits, U32, 1120, [12:12] -unusedBit_1_13 = bits, U32, 1120, [13:13] -unusedBit_1_14 = bits, U32, 1120, [14:14] -unusedBit_1_15 = bits, U32, 1120, [15:15] -unusedBit_1_16 = bits, U32, 1120, [16:16] -unusedBit_1_17 = bits, U32, 1120, [17:17] -unusedBit_1_18 = bits, U32, 1120, [18:18] -unusedBit_1_19 = bits, U32, 1120, [19:19] -unusedBit_1_20 = bits, U32, 1120, [20:20] -unusedBit_1_21 = bits, U32, 1120, [21:21] -unusedBit_1_22 = bits, U32, 1120, [22:22] -unusedBit_1_23 = bits, U32, 1120, [23:23] -unusedBit_1_24 = bits, U32, 1120, [24:24] -unusedBit_1_25 = bits, U32, 1120, [25:25] -unusedBit_1_26 = bits, U32, 1120, [26:26] -unusedBit_1_27 = bits, U32, 1120, [27:27] -unusedBit_1_28 = bits, U32, 1120, [28:28] -unusedBit_1_29 = bits, U32, 1120, [29:29] -unusedBit_1_30 = bits, U32, 1120, [30:30] -unusedBit_1_31 = bits, U32, 1120, [31:31] -; total TS size = 1124 -wallFuelCorrection = scalar, F32, 1124, "", 1, 0 -wallFuel = scalar, F32, 1128, "", 1, 0 +fuelInjectionCounter = scalar, S32, 1008, "", 1, 0 +sparkCounter = scalar, S32, 1012, "", 1, 0 +; total TS size = 1016 +tpsFrom = scalar, F32, 1016 +tpsTo = scalar, F32, 1020 +deltaTps = scalar, F32, 1024 +extraFuel = scalar, F32, 1028, "", 1, 0 +valueFromTable = scalar, F32, 1032, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1036, [0:0] +isBelowDecelThreshold = bits, U32, 1036, [1:1] +isTimeToResetAccumulator = bits, U32, 1036, [2:2] +isFractionalEnrichment = bits, U32, 1036, [3:3] +belowEpsilon = bits, U32, 1036, [4:4] +tooShort = bits, U32, 1036, [5:5] +unusedBit_11_6 = bits, U32, 1036, [6:6] +unusedBit_11_7 = bits, U32, 1036, [7:7] +unusedBit_11_8 = bits, U32, 1036, [8:8] +unusedBit_11_9 = bits, U32, 1036, [9:9] +unusedBit_11_10 = bits, U32, 1036, [10:10] +unusedBit_11_11 = bits, U32, 1036, [11:11] +unusedBit_11_12 = bits, U32, 1036, [12:12] +unusedBit_11_13 = bits, U32, 1036, [13:13] +unusedBit_11_14 = bits, U32, 1036, [14:14] +unusedBit_11_15 = bits, U32, 1036, [15:15] +unusedBit_11_16 = bits, U32, 1036, [16:16] +unusedBit_11_17 = bits, U32, 1036, [17:17] +unusedBit_11_18 = bits, U32, 1036, [18:18] +unusedBit_11_19 = bits, U32, 1036, [19:19] +unusedBit_11_20 = bits, U32, 1036, [20:20] +unusedBit_11_21 = bits, U32, 1036, [21:21] +unusedBit_11_22 = bits, U32, 1036, [22:22] +unusedBit_11_23 = bits, U32, 1036, [23:23] +unusedBit_11_24 = bits, U32, 1036, [24:24] +unusedBit_11_25 = bits, U32, 1036, [25:25] +unusedBit_11_26 = bits, U32, 1036, [26:26] +unusedBit_11_27 = bits, U32, 1036, [27:27] +unusedBit_11_28 = bits, U32, 1036, [28:28] +unusedBit_11_29 = bits, U32, 1036, [29:29] +unusedBit_11_30 = bits, U32, 1036, [30:30] +unusedBit_11_31 = bits, U32, 1036, [31:31] +fractionalInjFuel = scalar, F32, 1040, "", 1, 0 +accumulatedValue = scalar, F32, 1044, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1048, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1052, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1056, "", 1, 0 +cycleCnt = scalar, S32, 1060, "", 1, 0 +; total TS size = 1064 +hwEventCounters1 = scalar, S32, 1064, "", 1, 0 +hwEventCounters2 = scalar, S32, 1068, "", 1, 0 +hwEventCounters3 = scalar, S32, 1072, "", 1, 0 +hwEventCounters4 = scalar, S32, 1076, "", 1, 0 +hwEventCounters5 = scalar, S32, 1080, "", 1, 0 +hwEventCounters6 = scalar, S32, 1084, "", 1, 0 +vvtCamCounter = scalar, S32, 1088, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1092, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1096, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1100, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1101, "", 1, 0 +; total TS size = 1104 +totalRevolutionCounter = scalar, U32, 1104, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1108, "", 1, 0 +vvtCurrentPosition = scalar, F32, 1112, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1116, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 1120, "", 1, 0 +triggerStateIndex = scalar, U08, 1124, "", 1, 0 +vvtCounter = scalar, U08, 1125, "", 1, 0 +camResyncCounter = scalar, U08, 1126, "", 1, 0 +vvtStateIndex = scalar, U08, 1127, "", 1, 0 +; total TS size = 1128 +m_hasSynchronizedPhase = bits, U32, 1128, [0:0] +unusedBit_1_1 = bits, U32, 1128, [1:1] +unusedBit_1_2 = bits, U32, 1128, [2:2] +unusedBit_1_3 = bits, U32, 1128, [3:3] +unusedBit_1_4 = bits, U32, 1128, [4:4] +unusedBit_1_5 = bits, U32, 1128, [5:5] +unusedBit_1_6 = bits, U32, 1128, [6:6] +unusedBit_1_7 = bits, U32, 1128, [7:7] +unusedBit_1_8 = bits, U32, 1128, [8:8] +unusedBit_1_9 = bits, U32, 1128, [9:9] +unusedBit_1_10 = bits, U32, 1128, [10:10] +unusedBit_1_11 = bits, U32, 1128, [11:11] +unusedBit_1_12 = bits, U32, 1128, [12:12] +unusedBit_1_13 = bits, U32, 1128, [13:13] +unusedBit_1_14 = bits, U32, 1128, [14:14] +unusedBit_1_15 = bits, U32, 1128, [15:15] +unusedBit_1_16 = bits, U32, 1128, [16:16] +unusedBit_1_17 = bits, U32, 1128, [17:17] +unusedBit_1_18 = bits, U32, 1128, [18:18] +unusedBit_1_19 = bits, U32, 1128, [19:19] +unusedBit_1_20 = bits, U32, 1128, [20:20] +unusedBit_1_21 = bits, U32, 1128, [21:21] +unusedBit_1_22 = bits, U32, 1128, [22:22] +unusedBit_1_23 = bits, U32, 1128, [23:23] +unusedBit_1_24 = bits, U32, 1128, [24:24] +unusedBit_1_25 = bits, U32, 1128, [25:25] +unusedBit_1_26 = bits, U32, 1128, [26:26] +unusedBit_1_27 = bits, U32, 1128, [27:27] +unusedBit_1_28 = bits, U32, 1128, [28:28] +unusedBit_1_29 = bits, U32, 1128, [29:29] +unusedBit_1_30 = bits, U32, 1128, [30:30] +unusedBit_1_31 = bits, U32, 1128, [31:31] ; total TS size = 1132 -idleState = bits, S32, 1132, [0:2], "not important" -currentIdlePosition = scalar, F32, 1136 -baseIdlePosition = scalar, F32, 1140 -iacByTpsTaper = scalar, F32, 1144 -throttlePedalUpState = scalar, S32, 1148, "", 1, 0 -mightResetPid = bits, U32, 1152, [0:0] -shouldResetPid = bits, U32, 1152, [1:1] -wasResetPid = bits, U32, 1152, [2:2] -mustResetPid = bits, U32, 1152, [3:3] -isCoasting = bits, U32, 1152, [4:4] -useIacTableForCoasting = bits, U32, 1152, [5:5] -notIdling = bits, U32, 1152, [6:6] -needReset = bits, U32, 1152, [7:7] -isInDeadZone = bits, U32, 1152, [8:8] -isBlipping = bits, U32, 1152, [9:9] -useClosedLoop = bits, U32, 1152, [10:10] -badTps = bits, U32, 1152, [11:11] -looksLikeRunning = bits, U32, 1152, [12:12] -looksLikeCoasting = bits, U32, 1152, [13:13] -looksLikeCrankToIdle = bits, U32, 1152, [14:14] -useInstantRpmForIdle = bits, U32, 1152, [15:15] -isVerboseIAC = bits, U32, 1152, [16:16] -unusedBit_22_17 = bits, U32, 1152, [17:17] -unusedBit_22_18 = bits, U32, 1152, [18:18] -unusedBit_22_19 = bits, U32, 1152, [19:19] -unusedBit_22_20 = bits, U32, 1152, [20:20] -unusedBit_22_21 = bits, U32, 1152, [21:21] -unusedBit_22_22 = bits, U32, 1152, [22:22] -unusedBit_22_23 = bits, U32, 1152, [23:23] -unusedBit_22_24 = bits, U32, 1152, [24:24] -unusedBit_22_25 = bits, U32, 1152, [25:25] -unusedBit_22_26 = bits, U32, 1152, [26:26] -unusedBit_22_27 = bits, U32, 1152, [27:27] -unusedBit_22_28 = bits, U32, 1152, [28:28] -unusedBit_22_29 = bits, U32, 1152, [29:29] -unusedBit_22_30 = bits, U32, 1152, [30:30] -unusedBit_22_31 = bits, U32, 1152, [31:31] -targetRpmByClt = scalar, S32, 1156, "", 1, 0 -targetRpmAcBump = scalar, S32, 1160, "", 1, 0 -iacByRpmTaper = scalar, F32, 1164 -luaAdd = scalar, F32, 1168 -; total TS size = 1172 -baseDwell = scalar, F32, 1172, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 1176, "", 1, 0 -luaTimingAdd = scalar, F32, 1180, "", 1, 0 -luaTimingMult = scalar, F32, 1184, "", 1, 0 -; total TS size = 1188 -idlePosition = scalar, F32, 1188, "", 1, 0 -trim = scalar, F32, 1192, "", 1, 0 -luaAdjustment = scalar, F32, 1196, "", 1, 0 -etbFeedForward = scalar, F32, 1200 -etbIntegralError = scalar, F32, 1204, "", 1, 0 -etbCurrentTarget = scalar, F32, 1208, "%", 1, 0 -; total TS size = 1212 -faultCode = scalar, U08, 1212, "", 1, 0 -heaterDuty = scalar, U08, 1213, "%", 1, 0 -pumpDuty = scalar, U08, 1214, "%", 1, 0 -tempC = scalar, U16, 1216, "C", 1, 0 -nernstVoltage = scalar, U16, 1218, "V", 0.001, 0 -esr = scalar, U16, 1220, "", 1, 0 -; total TS size = 1224 +wallFuelCorrection = scalar, F32, 1132, "", 1, 0 +wallFuel = scalar, F32, 1136, "", 1, 0 +; total TS size = 1140 +idleState = bits, S32, 1140, [0:2], "not important" +currentIdlePosition = scalar, F32, 1144 +baseIdlePosition = scalar, F32, 1148 +iacByTpsTaper = scalar, F32, 1152 +throttlePedalUpState = scalar, S32, 1156, "", 1, 0 +mightResetPid = bits, U32, 1160, [0:0] +shouldResetPid = bits, U32, 1160, [1:1] +wasResetPid = bits, U32, 1160, [2:2] +mustResetPid = bits, U32, 1160, [3:3] +isCoasting = bits, U32, 1160, [4:4] +useIacTableForCoasting = bits, U32, 1160, [5:5] +notIdling = bits, U32, 1160, [6:6] +needReset = bits, U32, 1160, [7:7] +isInDeadZone = bits, U32, 1160, [8:8] +isBlipping = bits, U32, 1160, [9:9] +useClosedLoop = bits, U32, 1160, [10:10] +badTps = bits, U32, 1160, [11:11] +looksLikeRunning = bits, U32, 1160, [12:12] +looksLikeCoasting = bits, U32, 1160, [13:13] +looksLikeCrankToIdle = bits, U32, 1160, [14:14] +useInstantRpmForIdle = bits, U32, 1160, [15:15] +isVerboseIAC = bits, U32, 1160, [16:16] +unusedBit_22_17 = bits, U32, 1160, [17:17] +unusedBit_22_18 = bits, U32, 1160, [18:18] +unusedBit_22_19 = bits, U32, 1160, [19:19] +unusedBit_22_20 = bits, U32, 1160, [20:20] +unusedBit_22_21 = bits, U32, 1160, [21:21] +unusedBit_22_22 = bits, U32, 1160, [22:22] +unusedBit_22_23 = bits, U32, 1160, [23:23] +unusedBit_22_24 = bits, U32, 1160, [24:24] +unusedBit_22_25 = bits, U32, 1160, [25:25] +unusedBit_22_26 = bits, U32, 1160, [26:26] +unusedBit_22_27 = bits, U32, 1160, [27:27] +unusedBit_22_28 = bits, U32, 1160, [28:28] +unusedBit_22_29 = bits, U32, 1160, [29:29] +unusedBit_22_30 = bits, U32, 1160, [30:30] +unusedBit_22_31 = bits, U32, 1160, [31:31] +targetRpmByClt = scalar, S32, 1164, "", 1, 0 +targetRpmAcBump = scalar, S32, 1168, "", 1, 0 +iacByRpmTaper = scalar, F32, 1172 +luaAdd = scalar, F32, 1176 +; total TS size = 1180 +baseDwell = scalar, F32, 1180, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 1184, "", 1, 0 +luaTimingAdd = scalar, F32, 1188, "", 1, 0 +luaTimingMult = scalar, F32, 1192, "", 1, 0 +; total TS size = 1196 +idlePosition = scalar, F32, 1196, "", 1, 0 +trim = scalar, F32, 1200, "", 1, 0 +luaAdjustment = scalar, F32, 1204, "", 1, 0 +etbFeedForward = scalar, F32, 1208 +etbIntegralError = scalar, F32, 1212, "", 1, 0 +etbCurrentTarget = scalar, F32, 1216, "%", 1, 0 +; total TS size = 1220 +faultCode = scalar, U08, 1220, "", 1, 0 +heaterDuty = scalar, U08, 1221, "%", 1, 0 +pumpDuty = scalar, U08, 1222, "%", 1, 0 +tempC = scalar, U16, 1224, "C", 1, 0 +nernstVoltage = scalar, U16, 1226, "V", 0.001, 0 +esr = scalar, U16, 1228, "", 1, 0 +; total TS size = 1232 time = { timeNow } @@ -4757,6 +4759,8 @@ entry = brakePedalState, "brake: down", int, "%d" entry = egt1, "egt1", float, "%.3f" entry = egt2, "egt2", float, "%.3f" entry = desiredRpmLimit, "User-defined RPM hard limit", int, "%d" +entry = fuelInjectionCounter, "fuelInjectionCounter", int, "%d" +entry = sparkCounter, "sparkCounter", int, "%d" entry = tpsFrom, "tpsFrom", float, "%.3f" entry = tpsTo, "tpsTo", float, "%.3f" entry = deltaTps, "deltaTps", float, "%.3f" @@ -5498,6 +5502,8 @@ dialog = engine_stateDialog, "engine_state" graphLine = egt2 liveGraph = engine_state_10_Graph, "Graph", South graphLine = desiredRpmLimit + graphLine = fuelInjectionCounter + graphLine = sparkCounter indicatorPanel = tps_accel_stateIndicatorPanel, 2 indicator = {isAboveAccelThreshold}, "isAboveAccelThreshold No", "isAboveAccelThreshold Yes" diff --git a/firmware/tunerstudio/generated/rusefi_hellen81.ini b/firmware/tunerstudio/generated/rusefi_hellen81.ini index 8cb51f3f51..8189188616 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen81.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen81.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.08.25.hellen81.1354699540" + signature = "rusEFI 2022.08.25.hellen81.2697430880" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.08.25.hellen81.1354699540" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.08.25.hellen81.2697430880" ; 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 @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Aug 25 14:51:34 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Aug 25 22:50:20 UTC 2022 pageSize = 21300 page = 1 @@ -2109,7 +2109,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1224 + ochBlockSize = 1232 ; ; see TunerStudioOutputChannels struct @@ -3022,170 +3022,172 @@ unusedBit_22_31 = bits, U32, 992, [31:31] egt1 = scalar, F32, 996, "", 1, 0 egt2 = scalar, F32, 1000, "", 1, 0 desiredRpmLimit = scalar, S16, 1004, "rpm", 1, 0 -; total TS size = 1008 -tpsFrom = scalar, F32, 1008 -tpsTo = scalar, F32, 1012 -deltaTps = scalar, F32, 1016 -extraFuel = scalar, F32, 1020, "", 1, 0 -valueFromTable = scalar, F32, 1024, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1028, [0:0] -isBelowDecelThreshold = bits, U32, 1028, [1:1] -isTimeToResetAccumulator = bits, U32, 1028, [2:2] -isFractionalEnrichment = bits, U32, 1028, [3:3] -belowEpsilon = bits, U32, 1028, [4:4] -tooShort = bits, U32, 1028, [5:5] -unusedBit_11_6 = bits, U32, 1028, [6:6] -unusedBit_11_7 = bits, U32, 1028, [7:7] -unusedBit_11_8 = bits, U32, 1028, [8:8] -unusedBit_11_9 = bits, U32, 1028, [9:9] -unusedBit_11_10 = bits, U32, 1028, [10:10] -unusedBit_11_11 = bits, U32, 1028, [11:11] -unusedBit_11_12 = bits, U32, 1028, [12:12] -unusedBit_11_13 = bits, U32, 1028, [13:13] -unusedBit_11_14 = bits, U32, 1028, [14:14] -unusedBit_11_15 = bits, U32, 1028, [15:15] -unusedBit_11_16 = bits, U32, 1028, [16:16] -unusedBit_11_17 = bits, U32, 1028, [17:17] -unusedBit_11_18 = bits, U32, 1028, [18:18] -unusedBit_11_19 = bits, U32, 1028, [19:19] -unusedBit_11_20 = bits, U32, 1028, [20:20] -unusedBit_11_21 = bits, U32, 1028, [21:21] -unusedBit_11_22 = bits, U32, 1028, [22:22] -unusedBit_11_23 = bits, U32, 1028, [23:23] -unusedBit_11_24 = bits, U32, 1028, [24:24] -unusedBit_11_25 = bits, U32, 1028, [25:25] -unusedBit_11_26 = bits, U32, 1028, [26:26] -unusedBit_11_27 = bits, U32, 1028, [27:27] -unusedBit_11_28 = bits, U32, 1028, [28:28] -unusedBit_11_29 = bits, U32, 1028, [29:29] -unusedBit_11_30 = bits, U32, 1028, [30:30] -unusedBit_11_31 = bits, U32, 1028, [31:31] -fractionalInjFuel = scalar, F32, 1032, "", 1, 0 -accumulatedValue = scalar, F32, 1036, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1040, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1044, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1048, "", 1, 0 -cycleCnt = scalar, S32, 1052, "", 1, 0 -; total TS size = 1056 -hwEventCounters1 = scalar, S32, 1056, "", 1, 0 -hwEventCounters2 = scalar, S32, 1060, "", 1, 0 -hwEventCounters3 = scalar, S32, 1064, "", 1, 0 -hwEventCounters4 = scalar, S32, 1068, "", 1, 0 -hwEventCounters5 = scalar, S32, 1072, "", 1, 0 -hwEventCounters6 = scalar, S32, 1076, "", 1, 0 -vvtCamCounter = scalar, S32, 1080, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1084, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1088, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1092, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1093, "", 1, 0 -; total TS size = 1096 -totalRevolutionCounter = scalar, U32, 1096, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1100, "", 1, 0 -vvtCurrentPosition = scalar, F32, 1104, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1108, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 1112, "", 1, 0 -triggerStateIndex = scalar, U08, 1116, "", 1, 0 -vvtCounter = scalar, U08, 1117, "", 1, 0 -camResyncCounter = scalar, U08, 1118, "", 1, 0 -vvtStateIndex = scalar, U08, 1119, "", 1, 0 -; total TS size = 1120 -m_hasSynchronizedPhase = bits, U32, 1120, [0:0] -unusedBit_1_1 = bits, U32, 1120, [1:1] -unusedBit_1_2 = bits, U32, 1120, [2:2] -unusedBit_1_3 = bits, U32, 1120, [3:3] -unusedBit_1_4 = bits, U32, 1120, [4:4] -unusedBit_1_5 = bits, U32, 1120, [5:5] -unusedBit_1_6 = bits, U32, 1120, [6:6] -unusedBit_1_7 = bits, U32, 1120, [7:7] -unusedBit_1_8 = bits, U32, 1120, [8:8] -unusedBit_1_9 = bits, U32, 1120, [9:9] -unusedBit_1_10 = bits, U32, 1120, [10:10] -unusedBit_1_11 = bits, U32, 1120, [11:11] -unusedBit_1_12 = bits, U32, 1120, [12:12] -unusedBit_1_13 = bits, U32, 1120, [13:13] -unusedBit_1_14 = bits, U32, 1120, [14:14] -unusedBit_1_15 = bits, U32, 1120, [15:15] -unusedBit_1_16 = bits, U32, 1120, [16:16] -unusedBit_1_17 = bits, U32, 1120, [17:17] -unusedBit_1_18 = bits, U32, 1120, [18:18] -unusedBit_1_19 = bits, U32, 1120, [19:19] -unusedBit_1_20 = bits, U32, 1120, [20:20] -unusedBit_1_21 = bits, U32, 1120, [21:21] -unusedBit_1_22 = bits, U32, 1120, [22:22] -unusedBit_1_23 = bits, U32, 1120, [23:23] -unusedBit_1_24 = bits, U32, 1120, [24:24] -unusedBit_1_25 = bits, U32, 1120, [25:25] -unusedBit_1_26 = bits, U32, 1120, [26:26] -unusedBit_1_27 = bits, U32, 1120, [27:27] -unusedBit_1_28 = bits, U32, 1120, [28:28] -unusedBit_1_29 = bits, U32, 1120, [29:29] -unusedBit_1_30 = bits, U32, 1120, [30:30] -unusedBit_1_31 = bits, U32, 1120, [31:31] -; total TS size = 1124 -wallFuelCorrection = scalar, F32, 1124, "", 1, 0 -wallFuel = scalar, F32, 1128, "", 1, 0 +fuelInjectionCounter = scalar, S32, 1008, "", 1, 0 +sparkCounter = scalar, S32, 1012, "", 1, 0 +; total TS size = 1016 +tpsFrom = scalar, F32, 1016 +tpsTo = scalar, F32, 1020 +deltaTps = scalar, F32, 1024 +extraFuel = scalar, F32, 1028, "", 1, 0 +valueFromTable = scalar, F32, 1032, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1036, [0:0] +isBelowDecelThreshold = bits, U32, 1036, [1:1] +isTimeToResetAccumulator = bits, U32, 1036, [2:2] +isFractionalEnrichment = bits, U32, 1036, [3:3] +belowEpsilon = bits, U32, 1036, [4:4] +tooShort = bits, U32, 1036, [5:5] +unusedBit_11_6 = bits, U32, 1036, [6:6] +unusedBit_11_7 = bits, U32, 1036, [7:7] +unusedBit_11_8 = bits, U32, 1036, [8:8] +unusedBit_11_9 = bits, U32, 1036, [9:9] +unusedBit_11_10 = bits, U32, 1036, [10:10] +unusedBit_11_11 = bits, U32, 1036, [11:11] +unusedBit_11_12 = bits, U32, 1036, [12:12] +unusedBit_11_13 = bits, U32, 1036, [13:13] +unusedBit_11_14 = bits, U32, 1036, [14:14] +unusedBit_11_15 = bits, U32, 1036, [15:15] +unusedBit_11_16 = bits, U32, 1036, [16:16] +unusedBit_11_17 = bits, U32, 1036, [17:17] +unusedBit_11_18 = bits, U32, 1036, [18:18] +unusedBit_11_19 = bits, U32, 1036, [19:19] +unusedBit_11_20 = bits, U32, 1036, [20:20] +unusedBit_11_21 = bits, U32, 1036, [21:21] +unusedBit_11_22 = bits, U32, 1036, [22:22] +unusedBit_11_23 = bits, U32, 1036, [23:23] +unusedBit_11_24 = bits, U32, 1036, [24:24] +unusedBit_11_25 = bits, U32, 1036, [25:25] +unusedBit_11_26 = bits, U32, 1036, [26:26] +unusedBit_11_27 = bits, U32, 1036, [27:27] +unusedBit_11_28 = bits, U32, 1036, [28:28] +unusedBit_11_29 = bits, U32, 1036, [29:29] +unusedBit_11_30 = bits, U32, 1036, [30:30] +unusedBit_11_31 = bits, U32, 1036, [31:31] +fractionalInjFuel = scalar, F32, 1040, "", 1, 0 +accumulatedValue = scalar, F32, 1044, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1048, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1052, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1056, "", 1, 0 +cycleCnt = scalar, S32, 1060, "", 1, 0 +; total TS size = 1064 +hwEventCounters1 = scalar, S32, 1064, "", 1, 0 +hwEventCounters2 = scalar, S32, 1068, "", 1, 0 +hwEventCounters3 = scalar, S32, 1072, "", 1, 0 +hwEventCounters4 = scalar, S32, 1076, "", 1, 0 +hwEventCounters5 = scalar, S32, 1080, "", 1, 0 +hwEventCounters6 = scalar, S32, 1084, "", 1, 0 +vvtCamCounter = scalar, S32, 1088, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1092, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1096, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1100, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1101, "", 1, 0 +; total TS size = 1104 +totalRevolutionCounter = scalar, U32, 1104, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1108, "", 1, 0 +vvtCurrentPosition = scalar, F32, 1112, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1116, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 1120, "", 1, 0 +triggerStateIndex = scalar, U08, 1124, "", 1, 0 +vvtCounter = scalar, U08, 1125, "", 1, 0 +camResyncCounter = scalar, U08, 1126, "", 1, 0 +vvtStateIndex = scalar, U08, 1127, "", 1, 0 +; total TS size = 1128 +m_hasSynchronizedPhase = bits, U32, 1128, [0:0] +unusedBit_1_1 = bits, U32, 1128, [1:1] +unusedBit_1_2 = bits, U32, 1128, [2:2] +unusedBit_1_3 = bits, U32, 1128, [3:3] +unusedBit_1_4 = bits, U32, 1128, [4:4] +unusedBit_1_5 = bits, U32, 1128, [5:5] +unusedBit_1_6 = bits, U32, 1128, [6:6] +unusedBit_1_7 = bits, U32, 1128, [7:7] +unusedBit_1_8 = bits, U32, 1128, [8:8] +unusedBit_1_9 = bits, U32, 1128, [9:9] +unusedBit_1_10 = bits, U32, 1128, [10:10] +unusedBit_1_11 = bits, U32, 1128, [11:11] +unusedBit_1_12 = bits, U32, 1128, [12:12] +unusedBit_1_13 = bits, U32, 1128, [13:13] +unusedBit_1_14 = bits, U32, 1128, [14:14] +unusedBit_1_15 = bits, U32, 1128, [15:15] +unusedBit_1_16 = bits, U32, 1128, [16:16] +unusedBit_1_17 = bits, U32, 1128, [17:17] +unusedBit_1_18 = bits, U32, 1128, [18:18] +unusedBit_1_19 = bits, U32, 1128, [19:19] +unusedBit_1_20 = bits, U32, 1128, [20:20] +unusedBit_1_21 = bits, U32, 1128, [21:21] +unusedBit_1_22 = bits, U32, 1128, [22:22] +unusedBit_1_23 = bits, U32, 1128, [23:23] +unusedBit_1_24 = bits, U32, 1128, [24:24] +unusedBit_1_25 = bits, U32, 1128, [25:25] +unusedBit_1_26 = bits, U32, 1128, [26:26] +unusedBit_1_27 = bits, U32, 1128, [27:27] +unusedBit_1_28 = bits, U32, 1128, [28:28] +unusedBit_1_29 = bits, U32, 1128, [29:29] +unusedBit_1_30 = bits, U32, 1128, [30:30] +unusedBit_1_31 = bits, U32, 1128, [31:31] ; total TS size = 1132 -idleState = bits, S32, 1132, [0:2], "not important" -currentIdlePosition = scalar, F32, 1136 -baseIdlePosition = scalar, F32, 1140 -iacByTpsTaper = scalar, F32, 1144 -throttlePedalUpState = scalar, S32, 1148, "", 1, 0 -mightResetPid = bits, U32, 1152, [0:0] -shouldResetPid = bits, U32, 1152, [1:1] -wasResetPid = bits, U32, 1152, [2:2] -mustResetPid = bits, U32, 1152, [3:3] -isCoasting = bits, U32, 1152, [4:4] -useIacTableForCoasting = bits, U32, 1152, [5:5] -notIdling = bits, U32, 1152, [6:6] -needReset = bits, U32, 1152, [7:7] -isInDeadZone = bits, U32, 1152, [8:8] -isBlipping = bits, U32, 1152, [9:9] -useClosedLoop = bits, U32, 1152, [10:10] -badTps = bits, U32, 1152, [11:11] -looksLikeRunning = bits, U32, 1152, [12:12] -looksLikeCoasting = bits, U32, 1152, [13:13] -looksLikeCrankToIdle = bits, U32, 1152, [14:14] -useInstantRpmForIdle = bits, U32, 1152, [15:15] -isVerboseIAC = bits, U32, 1152, [16:16] -unusedBit_22_17 = bits, U32, 1152, [17:17] -unusedBit_22_18 = bits, U32, 1152, [18:18] -unusedBit_22_19 = bits, U32, 1152, [19:19] -unusedBit_22_20 = bits, U32, 1152, [20:20] -unusedBit_22_21 = bits, U32, 1152, [21:21] -unusedBit_22_22 = bits, U32, 1152, [22:22] -unusedBit_22_23 = bits, U32, 1152, [23:23] -unusedBit_22_24 = bits, U32, 1152, [24:24] -unusedBit_22_25 = bits, U32, 1152, [25:25] -unusedBit_22_26 = bits, U32, 1152, [26:26] -unusedBit_22_27 = bits, U32, 1152, [27:27] -unusedBit_22_28 = bits, U32, 1152, [28:28] -unusedBit_22_29 = bits, U32, 1152, [29:29] -unusedBit_22_30 = bits, U32, 1152, [30:30] -unusedBit_22_31 = bits, U32, 1152, [31:31] -targetRpmByClt = scalar, S32, 1156, "", 1, 0 -targetRpmAcBump = scalar, S32, 1160, "", 1, 0 -iacByRpmTaper = scalar, F32, 1164 -luaAdd = scalar, F32, 1168 -; total TS size = 1172 -baseDwell = scalar, F32, 1172, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 1176, "", 1, 0 -luaTimingAdd = scalar, F32, 1180, "", 1, 0 -luaTimingMult = scalar, F32, 1184, "", 1, 0 -; total TS size = 1188 -idlePosition = scalar, F32, 1188, "", 1, 0 -trim = scalar, F32, 1192, "", 1, 0 -luaAdjustment = scalar, F32, 1196, "", 1, 0 -etbFeedForward = scalar, F32, 1200 -etbIntegralError = scalar, F32, 1204, "", 1, 0 -etbCurrentTarget = scalar, F32, 1208, "%", 1, 0 -; total TS size = 1212 -faultCode = scalar, U08, 1212, "", 1, 0 -heaterDuty = scalar, U08, 1213, "%", 1, 0 -pumpDuty = scalar, U08, 1214, "%", 1, 0 -tempC = scalar, U16, 1216, "C", 1, 0 -nernstVoltage = scalar, U16, 1218, "V", 0.001, 0 -esr = scalar, U16, 1220, "", 1, 0 -; total TS size = 1224 +wallFuelCorrection = scalar, F32, 1132, "", 1, 0 +wallFuel = scalar, F32, 1136, "", 1, 0 +; total TS size = 1140 +idleState = bits, S32, 1140, [0:2], "not important" +currentIdlePosition = scalar, F32, 1144 +baseIdlePosition = scalar, F32, 1148 +iacByTpsTaper = scalar, F32, 1152 +throttlePedalUpState = scalar, S32, 1156, "", 1, 0 +mightResetPid = bits, U32, 1160, [0:0] +shouldResetPid = bits, U32, 1160, [1:1] +wasResetPid = bits, U32, 1160, [2:2] +mustResetPid = bits, U32, 1160, [3:3] +isCoasting = bits, U32, 1160, [4:4] +useIacTableForCoasting = bits, U32, 1160, [5:5] +notIdling = bits, U32, 1160, [6:6] +needReset = bits, U32, 1160, [7:7] +isInDeadZone = bits, U32, 1160, [8:8] +isBlipping = bits, U32, 1160, [9:9] +useClosedLoop = bits, U32, 1160, [10:10] +badTps = bits, U32, 1160, [11:11] +looksLikeRunning = bits, U32, 1160, [12:12] +looksLikeCoasting = bits, U32, 1160, [13:13] +looksLikeCrankToIdle = bits, U32, 1160, [14:14] +useInstantRpmForIdle = bits, U32, 1160, [15:15] +isVerboseIAC = bits, U32, 1160, [16:16] +unusedBit_22_17 = bits, U32, 1160, [17:17] +unusedBit_22_18 = bits, U32, 1160, [18:18] +unusedBit_22_19 = bits, U32, 1160, [19:19] +unusedBit_22_20 = bits, U32, 1160, [20:20] +unusedBit_22_21 = bits, U32, 1160, [21:21] +unusedBit_22_22 = bits, U32, 1160, [22:22] +unusedBit_22_23 = bits, U32, 1160, [23:23] +unusedBit_22_24 = bits, U32, 1160, [24:24] +unusedBit_22_25 = bits, U32, 1160, [25:25] +unusedBit_22_26 = bits, U32, 1160, [26:26] +unusedBit_22_27 = bits, U32, 1160, [27:27] +unusedBit_22_28 = bits, U32, 1160, [28:28] +unusedBit_22_29 = bits, U32, 1160, [29:29] +unusedBit_22_30 = bits, U32, 1160, [30:30] +unusedBit_22_31 = bits, U32, 1160, [31:31] +targetRpmByClt = scalar, S32, 1164, "", 1, 0 +targetRpmAcBump = scalar, S32, 1168, "", 1, 0 +iacByRpmTaper = scalar, F32, 1172 +luaAdd = scalar, F32, 1176 +; total TS size = 1180 +baseDwell = scalar, F32, 1180, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 1184, "", 1, 0 +luaTimingAdd = scalar, F32, 1188, "", 1, 0 +luaTimingMult = scalar, F32, 1192, "", 1, 0 +; total TS size = 1196 +idlePosition = scalar, F32, 1196, "", 1, 0 +trim = scalar, F32, 1200, "", 1, 0 +luaAdjustment = scalar, F32, 1204, "", 1, 0 +etbFeedForward = scalar, F32, 1208 +etbIntegralError = scalar, F32, 1212, "", 1, 0 +etbCurrentTarget = scalar, F32, 1216, "%", 1, 0 +; total TS size = 1220 +faultCode = scalar, U08, 1220, "", 1, 0 +heaterDuty = scalar, U08, 1221, "%", 1, 0 +pumpDuty = scalar, U08, 1222, "%", 1, 0 +tempC = scalar, U16, 1224, "C", 1, 0 +nernstVoltage = scalar, U16, 1226, "V", 0.001, 0 +esr = scalar, U16, 1228, "", 1, 0 +; total TS size = 1232 time = { timeNow } @@ -4757,6 +4759,8 @@ entry = brakePedalState, "brake: down", int, "%d" entry = egt1, "egt1", float, "%.3f" entry = egt2, "egt2", float, "%.3f" entry = desiredRpmLimit, "User-defined RPM hard limit", int, "%d" +entry = fuelInjectionCounter, "fuelInjectionCounter", int, "%d" +entry = sparkCounter, "sparkCounter", int, "%d" entry = tpsFrom, "tpsFrom", float, "%.3f" entry = tpsTo, "tpsTo", float, "%.3f" entry = deltaTps, "deltaTps", float, "%.3f" @@ -5497,6 +5501,8 @@ dialog = engine_stateDialog, "engine_state" graphLine = egt2 liveGraph = engine_state_10_Graph, "Graph", South graphLine = desiredRpmLimit + graphLine = fuelInjectionCounter + graphLine = sparkCounter indicatorPanel = tps_accel_stateIndicatorPanel, 2 indicator = {isAboveAccelThreshold}, "isAboveAccelThreshold No", "isAboveAccelThreshold Yes" diff --git a/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini b/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini index b78a2acce5..2fff7fe410 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.08.25.hellen88bmw.1744820434" + signature = "rusEFI 2022.08.25.hellen88bmw.2542226598" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.08.25.hellen88bmw.1744820434" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.08.25.hellen88bmw.2542226598" ; 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 @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Aug 25 14:51:30 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Aug 25 22:50:16 UTC 2022 pageSize = 21300 page = 1 @@ -2109,7 +2109,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1224 + ochBlockSize = 1232 ; ; see TunerStudioOutputChannels struct @@ -3022,170 +3022,172 @@ unusedBit_22_31 = bits, U32, 992, [31:31] egt1 = scalar, F32, 996, "", 1, 0 egt2 = scalar, F32, 1000, "", 1, 0 desiredRpmLimit = scalar, S16, 1004, "rpm", 1, 0 -; total TS size = 1008 -tpsFrom = scalar, F32, 1008 -tpsTo = scalar, F32, 1012 -deltaTps = scalar, F32, 1016 -extraFuel = scalar, F32, 1020, "", 1, 0 -valueFromTable = scalar, F32, 1024, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1028, [0:0] -isBelowDecelThreshold = bits, U32, 1028, [1:1] -isTimeToResetAccumulator = bits, U32, 1028, [2:2] -isFractionalEnrichment = bits, U32, 1028, [3:3] -belowEpsilon = bits, U32, 1028, [4:4] -tooShort = bits, U32, 1028, [5:5] -unusedBit_11_6 = bits, U32, 1028, [6:6] -unusedBit_11_7 = bits, U32, 1028, [7:7] -unusedBit_11_8 = bits, U32, 1028, [8:8] -unusedBit_11_9 = bits, U32, 1028, [9:9] -unusedBit_11_10 = bits, U32, 1028, [10:10] -unusedBit_11_11 = bits, U32, 1028, [11:11] -unusedBit_11_12 = bits, U32, 1028, [12:12] -unusedBit_11_13 = bits, U32, 1028, [13:13] -unusedBit_11_14 = bits, U32, 1028, [14:14] -unusedBit_11_15 = bits, U32, 1028, [15:15] -unusedBit_11_16 = bits, U32, 1028, [16:16] -unusedBit_11_17 = bits, U32, 1028, [17:17] -unusedBit_11_18 = bits, U32, 1028, [18:18] -unusedBit_11_19 = bits, U32, 1028, [19:19] -unusedBit_11_20 = bits, U32, 1028, [20:20] -unusedBit_11_21 = bits, U32, 1028, [21:21] -unusedBit_11_22 = bits, U32, 1028, [22:22] -unusedBit_11_23 = bits, U32, 1028, [23:23] -unusedBit_11_24 = bits, U32, 1028, [24:24] -unusedBit_11_25 = bits, U32, 1028, [25:25] -unusedBit_11_26 = bits, U32, 1028, [26:26] -unusedBit_11_27 = bits, U32, 1028, [27:27] -unusedBit_11_28 = bits, U32, 1028, [28:28] -unusedBit_11_29 = bits, U32, 1028, [29:29] -unusedBit_11_30 = bits, U32, 1028, [30:30] -unusedBit_11_31 = bits, U32, 1028, [31:31] -fractionalInjFuel = scalar, F32, 1032, "", 1, 0 -accumulatedValue = scalar, F32, 1036, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1040, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1044, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1048, "", 1, 0 -cycleCnt = scalar, S32, 1052, "", 1, 0 -; total TS size = 1056 -hwEventCounters1 = scalar, S32, 1056, "", 1, 0 -hwEventCounters2 = scalar, S32, 1060, "", 1, 0 -hwEventCounters3 = scalar, S32, 1064, "", 1, 0 -hwEventCounters4 = scalar, S32, 1068, "", 1, 0 -hwEventCounters5 = scalar, S32, 1072, "", 1, 0 -hwEventCounters6 = scalar, S32, 1076, "", 1, 0 -vvtCamCounter = scalar, S32, 1080, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1084, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1088, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1092, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1093, "", 1, 0 -; total TS size = 1096 -totalRevolutionCounter = scalar, U32, 1096, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1100, "", 1, 0 -vvtCurrentPosition = scalar, F32, 1104, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1108, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 1112, "", 1, 0 -triggerStateIndex = scalar, U08, 1116, "", 1, 0 -vvtCounter = scalar, U08, 1117, "", 1, 0 -camResyncCounter = scalar, U08, 1118, "", 1, 0 -vvtStateIndex = scalar, U08, 1119, "", 1, 0 -; total TS size = 1120 -m_hasSynchronizedPhase = bits, U32, 1120, [0:0] -unusedBit_1_1 = bits, U32, 1120, [1:1] -unusedBit_1_2 = bits, U32, 1120, [2:2] -unusedBit_1_3 = bits, U32, 1120, [3:3] -unusedBit_1_4 = bits, U32, 1120, [4:4] -unusedBit_1_5 = bits, U32, 1120, [5:5] -unusedBit_1_6 = bits, U32, 1120, [6:6] -unusedBit_1_7 = bits, U32, 1120, [7:7] -unusedBit_1_8 = bits, U32, 1120, [8:8] -unusedBit_1_9 = bits, U32, 1120, [9:9] -unusedBit_1_10 = bits, U32, 1120, [10:10] -unusedBit_1_11 = bits, U32, 1120, [11:11] -unusedBit_1_12 = bits, U32, 1120, [12:12] -unusedBit_1_13 = bits, U32, 1120, [13:13] -unusedBit_1_14 = bits, U32, 1120, [14:14] -unusedBit_1_15 = bits, U32, 1120, [15:15] -unusedBit_1_16 = bits, U32, 1120, [16:16] -unusedBit_1_17 = bits, U32, 1120, [17:17] -unusedBit_1_18 = bits, U32, 1120, [18:18] -unusedBit_1_19 = bits, U32, 1120, [19:19] -unusedBit_1_20 = bits, U32, 1120, [20:20] -unusedBit_1_21 = bits, U32, 1120, [21:21] -unusedBit_1_22 = bits, U32, 1120, [22:22] -unusedBit_1_23 = bits, U32, 1120, [23:23] -unusedBit_1_24 = bits, U32, 1120, [24:24] -unusedBit_1_25 = bits, U32, 1120, [25:25] -unusedBit_1_26 = bits, U32, 1120, [26:26] -unusedBit_1_27 = bits, U32, 1120, [27:27] -unusedBit_1_28 = bits, U32, 1120, [28:28] -unusedBit_1_29 = bits, U32, 1120, [29:29] -unusedBit_1_30 = bits, U32, 1120, [30:30] -unusedBit_1_31 = bits, U32, 1120, [31:31] -; total TS size = 1124 -wallFuelCorrection = scalar, F32, 1124, "", 1, 0 -wallFuel = scalar, F32, 1128, "", 1, 0 +fuelInjectionCounter = scalar, S32, 1008, "", 1, 0 +sparkCounter = scalar, S32, 1012, "", 1, 0 +; total TS size = 1016 +tpsFrom = scalar, F32, 1016 +tpsTo = scalar, F32, 1020 +deltaTps = scalar, F32, 1024 +extraFuel = scalar, F32, 1028, "", 1, 0 +valueFromTable = scalar, F32, 1032, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1036, [0:0] +isBelowDecelThreshold = bits, U32, 1036, [1:1] +isTimeToResetAccumulator = bits, U32, 1036, [2:2] +isFractionalEnrichment = bits, U32, 1036, [3:3] +belowEpsilon = bits, U32, 1036, [4:4] +tooShort = bits, U32, 1036, [5:5] +unusedBit_11_6 = bits, U32, 1036, [6:6] +unusedBit_11_7 = bits, U32, 1036, [7:7] +unusedBit_11_8 = bits, U32, 1036, [8:8] +unusedBit_11_9 = bits, U32, 1036, [9:9] +unusedBit_11_10 = bits, U32, 1036, [10:10] +unusedBit_11_11 = bits, U32, 1036, [11:11] +unusedBit_11_12 = bits, U32, 1036, [12:12] +unusedBit_11_13 = bits, U32, 1036, [13:13] +unusedBit_11_14 = bits, U32, 1036, [14:14] +unusedBit_11_15 = bits, U32, 1036, [15:15] +unusedBit_11_16 = bits, U32, 1036, [16:16] +unusedBit_11_17 = bits, U32, 1036, [17:17] +unusedBit_11_18 = bits, U32, 1036, [18:18] +unusedBit_11_19 = bits, U32, 1036, [19:19] +unusedBit_11_20 = bits, U32, 1036, [20:20] +unusedBit_11_21 = bits, U32, 1036, [21:21] +unusedBit_11_22 = bits, U32, 1036, [22:22] +unusedBit_11_23 = bits, U32, 1036, [23:23] +unusedBit_11_24 = bits, U32, 1036, [24:24] +unusedBit_11_25 = bits, U32, 1036, [25:25] +unusedBit_11_26 = bits, U32, 1036, [26:26] +unusedBit_11_27 = bits, U32, 1036, [27:27] +unusedBit_11_28 = bits, U32, 1036, [28:28] +unusedBit_11_29 = bits, U32, 1036, [29:29] +unusedBit_11_30 = bits, U32, 1036, [30:30] +unusedBit_11_31 = bits, U32, 1036, [31:31] +fractionalInjFuel = scalar, F32, 1040, "", 1, 0 +accumulatedValue = scalar, F32, 1044, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1048, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1052, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1056, "", 1, 0 +cycleCnt = scalar, S32, 1060, "", 1, 0 +; total TS size = 1064 +hwEventCounters1 = scalar, S32, 1064, "", 1, 0 +hwEventCounters2 = scalar, S32, 1068, "", 1, 0 +hwEventCounters3 = scalar, S32, 1072, "", 1, 0 +hwEventCounters4 = scalar, S32, 1076, "", 1, 0 +hwEventCounters5 = scalar, S32, 1080, "", 1, 0 +hwEventCounters6 = scalar, S32, 1084, "", 1, 0 +vvtCamCounter = scalar, S32, 1088, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1092, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1096, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1100, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1101, "", 1, 0 +; total TS size = 1104 +totalRevolutionCounter = scalar, U32, 1104, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1108, "", 1, 0 +vvtCurrentPosition = scalar, F32, 1112, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1116, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 1120, "", 1, 0 +triggerStateIndex = scalar, U08, 1124, "", 1, 0 +vvtCounter = scalar, U08, 1125, "", 1, 0 +camResyncCounter = scalar, U08, 1126, "", 1, 0 +vvtStateIndex = scalar, U08, 1127, "", 1, 0 +; total TS size = 1128 +m_hasSynchronizedPhase = bits, U32, 1128, [0:0] +unusedBit_1_1 = bits, U32, 1128, [1:1] +unusedBit_1_2 = bits, U32, 1128, [2:2] +unusedBit_1_3 = bits, U32, 1128, [3:3] +unusedBit_1_4 = bits, U32, 1128, [4:4] +unusedBit_1_5 = bits, U32, 1128, [5:5] +unusedBit_1_6 = bits, U32, 1128, [6:6] +unusedBit_1_7 = bits, U32, 1128, [7:7] +unusedBit_1_8 = bits, U32, 1128, [8:8] +unusedBit_1_9 = bits, U32, 1128, [9:9] +unusedBit_1_10 = bits, U32, 1128, [10:10] +unusedBit_1_11 = bits, U32, 1128, [11:11] +unusedBit_1_12 = bits, U32, 1128, [12:12] +unusedBit_1_13 = bits, U32, 1128, [13:13] +unusedBit_1_14 = bits, U32, 1128, [14:14] +unusedBit_1_15 = bits, U32, 1128, [15:15] +unusedBit_1_16 = bits, U32, 1128, [16:16] +unusedBit_1_17 = bits, U32, 1128, [17:17] +unusedBit_1_18 = bits, U32, 1128, [18:18] +unusedBit_1_19 = bits, U32, 1128, [19:19] +unusedBit_1_20 = bits, U32, 1128, [20:20] +unusedBit_1_21 = bits, U32, 1128, [21:21] +unusedBit_1_22 = bits, U32, 1128, [22:22] +unusedBit_1_23 = bits, U32, 1128, [23:23] +unusedBit_1_24 = bits, U32, 1128, [24:24] +unusedBit_1_25 = bits, U32, 1128, [25:25] +unusedBit_1_26 = bits, U32, 1128, [26:26] +unusedBit_1_27 = bits, U32, 1128, [27:27] +unusedBit_1_28 = bits, U32, 1128, [28:28] +unusedBit_1_29 = bits, U32, 1128, [29:29] +unusedBit_1_30 = bits, U32, 1128, [30:30] +unusedBit_1_31 = bits, U32, 1128, [31:31] ; total TS size = 1132 -idleState = bits, S32, 1132, [0:2], "not important" -currentIdlePosition = scalar, F32, 1136 -baseIdlePosition = scalar, F32, 1140 -iacByTpsTaper = scalar, F32, 1144 -throttlePedalUpState = scalar, S32, 1148, "", 1, 0 -mightResetPid = bits, U32, 1152, [0:0] -shouldResetPid = bits, U32, 1152, [1:1] -wasResetPid = bits, U32, 1152, [2:2] -mustResetPid = bits, U32, 1152, [3:3] -isCoasting = bits, U32, 1152, [4:4] -useIacTableForCoasting = bits, U32, 1152, [5:5] -notIdling = bits, U32, 1152, [6:6] -needReset = bits, U32, 1152, [7:7] -isInDeadZone = bits, U32, 1152, [8:8] -isBlipping = bits, U32, 1152, [9:9] -useClosedLoop = bits, U32, 1152, [10:10] -badTps = bits, U32, 1152, [11:11] -looksLikeRunning = bits, U32, 1152, [12:12] -looksLikeCoasting = bits, U32, 1152, [13:13] -looksLikeCrankToIdle = bits, U32, 1152, [14:14] -useInstantRpmForIdle = bits, U32, 1152, [15:15] -isVerboseIAC = bits, U32, 1152, [16:16] -unusedBit_22_17 = bits, U32, 1152, [17:17] -unusedBit_22_18 = bits, U32, 1152, [18:18] -unusedBit_22_19 = bits, U32, 1152, [19:19] -unusedBit_22_20 = bits, U32, 1152, [20:20] -unusedBit_22_21 = bits, U32, 1152, [21:21] -unusedBit_22_22 = bits, U32, 1152, [22:22] -unusedBit_22_23 = bits, U32, 1152, [23:23] -unusedBit_22_24 = bits, U32, 1152, [24:24] -unusedBit_22_25 = bits, U32, 1152, [25:25] -unusedBit_22_26 = bits, U32, 1152, [26:26] -unusedBit_22_27 = bits, U32, 1152, [27:27] -unusedBit_22_28 = bits, U32, 1152, [28:28] -unusedBit_22_29 = bits, U32, 1152, [29:29] -unusedBit_22_30 = bits, U32, 1152, [30:30] -unusedBit_22_31 = bits, U32, 1152, [31:31] -targetRpmByClt = scalar, S32, 1156, "", 1, 0 -targetRpmAcBump = scalar, S32, 1160, "", 1, 0 -iacByRpmTaper = scalar, F32, 1164 -luaAdd = scalar, F32, 1168 -; total TS size = 1172 -baseDwell = scalar, F32, 1172, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 1176, "", 1, 0 -luaTimingAdd = scalar, F32, 1180, "", 1, 0 -luaTimingMult = scalar, F32, 1184, "", 1, 0 -; total TS size = 1188 -idlePosition = scalar, F32, 1188, "", 1, 0 -trim = scalar, F32, 1192, "", 1, 0 -luaAdjustment = scalar, F32, 1196, "", 1, 0 -etbFeedForward = scalar, F32, 1200 -etbIntegralError = scalar, F32, 1204, "", 1, 0 -etbCurrentTarget = scalar, F32, 1208, "%", 1, 0 -; total TS size = 1212 -faultCode = scalar, U08, 1212, "", 1, 0 -heaterDuty = scalar, U08, 1213, "%", 1, 0 -pumpDuty = scalar, U08, 1214, "%", 1, 0 -tempC = scalar, U16, 1216, "C", 1, 0 -nernstVoltage = scalar, U16, 1218, "V", 0.001, 0 -esr = scalar, U16, 1220, "", 1, 0 -; total TS size = 1224 +wallFuelCorrection = scalar, F32, 1132, "", 1, 0 +wallFuel = scalar, F32, 1136, "", 1, 0 +; total TS size = 1140 +idleState = bits, S32, 1140, [0:2], "not important" +currentIdlePosition = scalar, F32, 1144 +baseIdlePosition = scalar, F32, 1148 +iacByTpsTaper = scalar, F32, 1152 +throttlePedalUpState = scalar, S32, 1156, "", 1, 0 +mightResetPid = bits, U32, 1160, [0:0] +shouldResetPid = bits, U32, 1160, [1:1] +wasResetPid = bits, U32, 1160, [2:2] +mustResetPid = bits, U32, 1160, [3:3] +isCoasting = bits, U32, 1160, [4:4] +useIacTableForCoasting = bits, U32, 1160, [5:5] +notIdling = bits, U32, 1160, [6:6] +needReset = bits, U32, 1160, [7:7] +isInDeadZone = bits, U32, 1160, [8:8] +isBlipping = bits, U32, 1160, [9:9] +useClosedLoop = bits, U32, 1160, [10:10] +badTps = bits, U32, 1160, [11:11] +looksLikeRunning = bits, U32, 1160, [12:12] +looksLikeCoasting = bits, U32, 1160, [13:13] +looksLikeCrankToIdle = bits, U32, 1160, [14:14] +useInstantRpmForIdle = bits, U32, 1160, [15:15] +isVerboseIAC = bits, U32, 1160, [16:16] +unusedBit_22_17 = bits, U32, 1160, [17:17] +unusedBit_22_18 = bits, U32, 1160, [18:18] +unusedBit_22_19 = bits, U32, 1160, [19:19] +unusedBit_22_20 = bits, U32, 1160, [20:20] +unusedBit_22_21 = bits, U32, 1160, [21:21] +unusedBit_22_22 = bits, U32, 1160, [22:22] +unusedBit_22_23 = bits, U32, 1160, [23:23] +unusedBit_22_24 = bits, U32, 1160, [24:24] +unusedBit_22_25 = bits, U32, 1160, [25:25] +unusedBit_22_26 = bits, U32, 1160, [26:26] +unusedBit_22_27 = bits, U32, 1160, [27:27] +unusedBit_22_28 = bits, U32, 1160, [28:28] +unusedBit_22_29 = bits, U32, 1160, [29:29] +unusedBit_22_30 = bits, U32, 1160, [30:30] +unusedBit_22_31 = bits, U32, 1160, [31:31] +targetRpmByClt = scalar, S32, 1164, "", 1, 0 +targetRpmAcBump = scalar, S32, 1168, "", 1, 0 +iacByRpmTaper = scalar, F32, 1172 +luaAdd = scalar, F32, 1176 +; total TS size = 1180 +baseDwell = scalar, F32, 1180, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 1184, "", 1, 0 +luaTimingAdd = scalar, F32, 1188, "", 1, 0 +luaTimingMult = scalar, F32, 1192, "", 1, 0 +; total TS size = 1196 +idlePosition = scalar, F32, 1196, "", 1, 0 +trim = scalar, F32, 1200, "", 1, 0 +luaAdjustment = scalar, F32, 1204, "", 1, 0 +etbFeedForward = scalar, F32, 1208 +etbIntegralError = scalar, F32, 1212, "", 1, 0 +etbCurrentTarget = scalar, F32, 1216, "%", 1, 0 +; total TS size = 1220 +faultCode = scalar, U08, 1220, "", 1, 0 +heaterDuty = scalar, U08, 1221, "%", 1, 0 +pumpDuty = scalar, U08, 1222, "%", 1, 0 +tempC = scalar, U16, 1224, "C", 1, 0 +nernstVoltage = scalar, U16, 1226, "V", 0.001, 0 +esr = scalar, U16, 1228, "", 1, 0 +; total TS size = 1232 time = { timeNow } @@ -4757,6 +4759,8 @@ entry = brakePedalState, "brake: down", int, "%d" entry = egt1, "egt1", float, "%.3f" entry = egt2, "egt2", float, "%.3f" entry = desiredRpmLimit, "User-defined RPM hard limit", int, "%d" +entry = fuelInjectionCounter, "fuelInjectionCounter", int, "%d" +entry = sparkCounter, "sparkCounter", int, "%d" entry = tpsFrom, "tpsFrom", float, "%.3f" entry = tpsTo, "tpsTo", float, "%.3f" entry = deltaTps, "deltaTps", float, "%.3f" @@ -5498,6 +5502,8 @@ dialog = engine_stateDialog, "engine_state" graphLine = egt2 liveGraph = engine_state_10_Graph, "Graph", South graphLine = desiredRpmLimit + graphLine = fuelInjectionCounter + graphLine = sparkCounter indicatorPanel = tps_accel_stateIndicatorPanel, 2 indicator = {isAboveAccelThreshold}, "isAboveAccelThreshold No", "isAboveAccelThreshold Yes" diff --git a/firmware/tunerstudio/generated/rusefi_hellenNA6.ini b/firmware/tunerstudio/generated/rusefi_hellenNA6.ini index ae1f6b1f83..c12cd396db 100644 --- a/firmware/tunerstudio/generated/rusefi_hellenNA6.ini +++ b/firmware/tunerstudio/generated/rusefi_hellenNA6.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.08.25.hellenNA6.4035000958" + signature = "rusEFI 2022.08.25.hellenNA6.16363018" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.08.25.hellenNA6.4035000958" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.08.25.hellenNA6.16363018" ; 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 @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Aug 25 14:51:41 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Aug 25 22:50:26 UTC 2022 pageSize = 21300 page = 1 @@ -2109,7 +2109,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1224 + ochBlockSize = 1232 ; ; see TunerStudioOutputChannels struct @@ -3022,170 +3022,172 @@ unusedBit_22_31 = bits, U32, 992, [31:31] egt1 = scalar, F32, 996, "", 1, 0 egt2 = scalar, F32, 1000, "", 1, 0 desiredRpmLimit = scalar, S16, 1004, "rpm", 1, 0 -; total TS size = 1008 -tpsFrom = scalar, F32, 1008 -tpsTo = scalar, F32, 1012 -deltaTps = scalar, F32, 1016 -extraFuel = scalar, F32, 1020, "", 1, 0 -valueFromTable = scalar, F32, 1024, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1028, [0:0] -isBelowDecelThreshold = bits, U32, 1028, [1:1] -isTimeToResetAccumulator = bits, U32, 1028, [2:2] -isFractionalEnrichment = bits, U32, 1028, [3:3] -belowEpsilon = bits, U32, 1028, [4:4] -tooShort = bits, U32, 1028, [5:5] -unusedBit_11_6 = bits, U32, 1028, [6:6] -unusedBit_11_7 = bits, U32, 1028, [7:7] -unusedBit_11_8 = bits, U32, 1028, [8:8] -unusedBit_11_9 = bits, U32, 1028, [9:9] -unusedBit_11_10 = bits, U32, 1028, [10:10] -unusedBit_11_11 = bits, U32, 1028, [11:11] -unusedBit_11_12 = bits, U32, 1028, [12:12] -unusedBit_11_13 = bits, U32, 1028, [13:13] -unusedBit_11_14 = bits, U32, 1028, [14:14] -unusedBit_11_15 = bits, U32, 1028, [15:15] -unusedBit_11_16 = bits, U32, 1028, [16:16] -unusedBit_11_17 = bits, U32, 1028, [17:17] -unusedBit_11_18 = bits, U32, 1028, [18:18] -unusedBit_11_19 = bits, U32, 1028, [19:19] -unusedBit_11_20 = bits, U32, 1028, [20:20] -unusedBit_11_21 = bits, U32, 1028, [21:21] -unusedBit_11_22 = bits, U32, 1028, [22:22] -unusedBit_11_23 = bits, U32, 1028, [23:23] -unusedBit_11_24 = bits, U32, 1028, [24:24] -unusedBit_11_25 = bits, U32, 1028, [25:25] -unusedBit_11_26 = bits, U32, 1028, [26:26] -unusedBit_11_27 = bits, U32, 1028, [27:27] -unusedBit_11_28 = bits, U32, 1028, [28:28] -unusedBit_11_29 = bits, U32, 1028, [29:29] -unusedBit_11_30 = bits, U32, 1028, [30:30] -unusedBit_11_31 = bits, U32, 1028, [31:31] -fractionalInjFuel = scalar, F32, 1032, "", 1, 0 -accumulatedValue = scalar, F32, 1036, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1040, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1044, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1048, "", 1, 0 -cycleCnt = scalar, S32, 1052, "", 1, 0 -; total TS size = 1056 -hwEventCounters1 = scalar, S32, 1056, "", 1, 0 -hwEventCounters2 = scalar, S32, 1060, "", 1, 0 -hwEventCounters3 = scalar, S32, 1064, "", 1, 0 -hwEventCounters4 = scalar, S32, 1068, "", 1, 0 -hwEventCounters5 = scalar, S32, 1072, "", 1, 0 -hwEventCounters6 = scalar, S32, 1076, "", 1, 0 -vvtCamCounter = scalar, S32, 1080, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1084, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1088, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1092, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1093, "", 1, 0 -; total TS size = 1096 -totalRevolutionCounter = scalar, U32, 1096, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1100, "", 1, 0 -vvtCurrentPosition = scalar, F32, 1104, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1108, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 1112, "", 1, 0 -triggerStateIndex = scalar, U08, 1116, "", 1, 0 -vvtCounter = scalar, U08, 1117, "", 1, 0 -camResyncCounter = scalar, U08, 1118, "", 1, 0 -vvtStateIndex = scalar, U08, 1119, "", 1, 0 -; total TS size = 1120 -m_hasSynchronizedPhase = bits, U32, 1120, [0:0] -unusedBit_1_1 = bits, U32, 1120, [1:1] -unusedBit_1_2 = bits, U32, 1120, [2:2] -unusedBit_1_3 = bits, U32, 1120, [3:3] -unusedBit_1_4 = bits, U32, 1120, [4:4] -unusedBit_1_5 = bits, U32, 1120, [5:5] -unusedBit_1_6 = bits, U32, 1120, [6:6] -unusedBit_1_7 = bits, U32, 1120, [7:7] -unusedBit_1_8 = bits, U32, 1120, [8:8] -unusedBit_1_9 = bits, U32, 1120, [9:9] -unusedBit_1_10 = bits, U32, 1120, [10:10] -unusedBit_1_11 = bits, U32, 1120, [11:11] -unusedBit_1_12 = bits, U32, 1120, [12:12] -unusedBit_1_13 = bits, U32, 1120, [13:13] -unusedBit_1_14 = bits, U32, 1120, [14:14] -unusedBit_1_15 = bits, U32, 1120, [15:15] -unusedBit_1_16 = bits, U32, 1120, [16:16] -unusedBit_1_17 = bits, U32, 1120, [17:17] -unusedBit_1_18 = bits, U32, 1120, [18:18] -unusedBit_1_19 = bits, U32, 1120, [19:19] -unusedBit_1_20 = bits, U32, 1120, [20:20] -unusedBit_1_21 = bits, U32, 1120, [21:21] -unusedBit_1_22 = bits, U32, 1120, [22:22] -unusedBit_1_23 = bits, U32, 1120, [23:23] -unusedBit_1_24 = bits, U32, 1120, [24:24] -unusedBit_1_25 = bits, U32, 1120, [25:25] -unusedBit_1_26 = bits, U32, 1120, [26:26] -unusedBit_1_27 = bits, U32, 1120, [27:27] -unusedBit_1_28 = bits, U32, 1120, [28:28] -unusedBit_1_29 = bits, U32, 1120, [29:29] -unusedBit_1_30 = bits, U32, 1120, [30:30] -unusedBit_1_31 = bits, U32, 1120, [31:31] -; total TS size = 1124 -wallFuelCorrection = scalar, F32, 1124, "", 1, 0 -wallFuel = scalar, F32, 1128, "", 1, 0 +fuelInjectionCounter = scalar, S32, 1008, "", 1, 0 +sparkCounter = scalar, S32, 1012, "", 1, 0 +; total TS size = 1016 +tpsFrom = scalar, F32, 1016 +tpsTo = scalar, F32, 1020 +deltaTps = scalar, F32, 1024 +extraFuel = scalar, F32, 1028, "", 1, 0 +valueFromTable = scalar, F32, 1032, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1036, [0:0] +isBelowDecelThreshold = bits, U32, 1036, [1:1] +isTimeToResetAccumulator = bits, U32, 1036, [2:2] +isFractionalEnrichment = bits, U32, 1036, [3:3] +belowEpsilon = bits, U32, 1036, [4:4] +tooShort = bits, U32, 1036, [5:5] +unusedBit_11_6 = bits, U32, 1036, [6:6] +unusedBit_11_7 = bits, U32, 1036, [7:7] +unusedBit_11_8 = bits, U32, 1036, [8:8] +unusedBit_11_9 = bits, U32, 1036, [9:9] +unusedBit_11_10 = bits, U32, 1036, [10:10] +unusedBit_11_11 = bits, U32, 1036, [11:11] +unusedBit_11_12 = bits, U32, 1036, [12:12] +unusedBit_11_13 = bits, U32, 1036, [13:13] +unusedBit_11_14 = bits, U32, 1036, [14:14] +unusedBit_11_15 = bits, U32, 1036, [15:15] +unusedBit_11_16 = bits, U32, 1036, [16:16] +unusedBit_11_17 = bits, U32, 1036, [17:17] +unusedBit_11_18 = bits, U32, 1036, [18:18] +unusedBit_11_19 = bits, U32, 1036, [19:19] +unusedBit_11_20 = bits, U32, 1036, [20:20] +unusedBit_11_21 = bits, U32, 1036, [21:21] +unusedBit_11_22 = bits, U32, 1036, [22:22] +unusedBit_11_23 = bits, U32, 1036, [23:23] +unusedBit_11_24 = bits, U32, 1036, [24:24] +unusedBit_11_25 = bits, U32, 1036, [25:25] +unusedBit_11_26 = bits, U32, 1036, [26:26] +unusedBit_11_27 = bits, U32, 1036, [27:27] +unusedBit_11_28 = bits, U32, 1036, [28:28] +unusedBit_11_29 = bits, U32, 1036, [29:29] +unusedBit_11_30 = bits, U32, 1036, [30:30] +unusedBit_11_31 = bits, U32, 1036, [31:31] +fractionalInjFuel = scalar, F32, 1040, "", 1, 0 +accumulatedValue = scalar, F32, 1044, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1048, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1052, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1056, "", 1, 0 +cycleCnt = scalar, S32, 1060, "", 1, 0 +; total TS size = 1064 +hwEventCounters1 = scalar, S32, 1064, "", 1, 0 +hwEventCounters2 = scalar, S32, 1068, "", 1, 0 +hwEventCounters3 = scalar, S32, 1072, "", 1, 0 +hwEventCounters4 = scalar, S32, 1076, "", 1, 0 +hwEventCounters5 = scalar, S32, 1080, "", 1, 0 +hwEventCounters6 = scalar, S32, 1084, "", 1, 0 +vvtCamCounter = scalar, S32, 1088, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1092, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1096, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1100, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1101, "", 1, 0 +; total TS size = 1104 +totalRevolutionCounter = scalar, U32, 1104, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1108, "", 1, 0 +vvtCurrentPosition = scalar, F32, 1112, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1116, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 1120, "", 1, 0 +triggerStateIndex = scalar, U08, 1124, "", 1, 0 +vvtCounter = scalar, U08, 1125, "", 1, 0 +camResyncCounter = scalar, U08, 1126, "", 1, 0 +vvtStateIndex = scalar, U08, 1127, "", 1, 0 +; total TS size = 1128 +m_hasSynchronizedPhase = bits, U32, 1128, [0:0] +unusedBit_1_1 = bits, U32, 1128, [1:1] +unusedBit_1_2 = bits, U32, 1128, [2:2] +unusedBit_1_3 = bits, U32, 1128, [3:3] +unusedBit_1_4 = bits, U32, 1128, [4:4] +unusedBit_1_5 = bits, U32, 1128, [5:5] +unusedBit_1_6 = bits, U32, 1128, [6:6] +unusedBit_1_7 = bits, U32, 1128, [7:7] +unusedBit_1_8 = bits, U32, 1128, [8:8] +unusedBit_1_9 = bits, U32, 1128, [9:9] +unusedBit_1_10 = bits, U32, 1128, [10:10] +unusedBit_1_11 = bits, U32, 1128, [11:11] +unusedBit_1_12 = bits, U32, 1128, [12:12] +unusedBit_1_13 = bits, U32, 1128, [13:13] +unusedBit_1_14 = bits, U32, 1128, [14:14] +unusedBit_1_15 = bits, U32, 1128, [15:15] +unusedBit_1_16 = bits, U32, 1128, [16:16] +unusedBit_1_17 = bits, U32, 1128, [17:17] +unusedBit_1_18 = bits, U32, 1128, [18:18] +unusedBit_1_19 = bits, U32, 1128, [19:19] +unusedBit_1_20 = bits, U32, 1128, [20:20] +unusedBit_1_21 = bits, U32, 1128, [21:21] +unusedBit_1_22 = bits, U32, 1128, [22:22] +unusedBit_1_23 = bits, U32, 1128, [23:23] +unusedBit_1_24 = bits, U32, 1128, [24:24] +unusedBit_1_25 = bits, U32, 1128, [25:25] +unusedBit_1_26 = bits, U32, 1128, [26:26] +unusedBit_1_27 = bits, U32, 1128, [27:27] +unusedBit_1_28 = bits, U32, 1128, [28:28] +unusedBit_1_29 = bits, U32, 1128, [29:29] +unusedBit_1_30 = bits, U32, 1128, [30:30] +unusedBit_1_31 = bits, U32, 1128, [31:31] ; total TS size = 1132 -idleState = bits, S32, 1132, [0:2], "not important" -currentIdlePosition = scalar, F32, 1136 -baseIdlePosition = scalar, F32, 1140 -iacByTpsTaper = scalar, F32, 1144 -throttlePedalUpState = scalar, S32, 1148, "", 1, 0 -mightResetPid = bits, U32, 1152, [0:0] -shouldResetPid = bits, U32, 1152, [1:1] -wasResetPid = bits, U32, 1152, [2:2] -mustResetPid = bits, U32, 1152, [3:3] -isCoasting = bits, U32, 1152, [4:4] -useIacTableForCoasting = bits, U32, 1152, [5:5] -notIdling = bits, U32, 1152, [6:6] -needReset = bits, U32, 1152, [7:7] -isInDeadZone = bits, U32, 1152, [8:8] -isBlipping = bits, U32, 1152, [9:9] -useClosedLoop = bits, U32, 1152, [10:10] -badTps = bits, U32, 1152, [11:11] -looksLikeRunning = bits, U32, 1152, [12:12] -looksLikeCoasting = bits, U32, 1152, [13:13] -looksLikeCrankToIdle = bits, U32, 1152, [14:14] -useInstantRpmForIdle = bits, U32, 1152, [15:15] -isVerboseIAC = bits, U32, 1152, [16:16] -unusedBit_22_17 = bits, U32, 1152, [17:17] -unusedBit_22_18 = bits, U32, 1152, [18:18] -unusedBit_22_19 = bits, U32, 1152, [19:19] -unusedBit_22_20 = bits, U32, 1152, [20:20] -unusedBit_22_21 = bits, U32, 1152, [21:21] -unusedBit_22_22 = bits, U32, 1152, [22:22] -unusedBit_22_23 = bits, U32, 1152, [23:23] -unusedBit_22_24 = bits, U32, 1152, [24:24] -unusedBit_22_25 = bits, U32, 1152, [25:25] -unusedBit_22_26 = bits, U32, 1152, [26:26] -unusedBit_22_27 = bits, U32, 1152, [27:27] -unusedBit_22_28 = bits, U32, 1152, [28:28] -unusedBit_22_29 = bits, U32, 1152, [29:29] -unusedBit_22_30 = bits, U32, 1152, [30:30] -unusedBit_22_31 = bits, U32, 1152, [31:31] -targetRpmByClt = scalar, S32, 1156, "", 1, 0 -targetRpmAcBump = scalar, S32, 1160, "", 1, 0 -iacByRpmTaper = scalar, F32, 1164 -luaAdd = scalar, F32, 1168 -; total TS size = 1172 -baseDwell = scalar, F32, 1172, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 1176, "", 1, 0 -luaTimingAdd = scalar, F32, 1180, "", 1, 0 -luaTimingMult = scalar, F32, 1184, "", 1, 0 -; total TS size = 1188 -idlePosition = scalar, F32, 1188, "", 1, 0 -trim = scalar, F32, 1192, "", 1, 0 -luaAdjustment = scalar, F32, 1196, "", 1, 0 -etbFeedForward = scalar, F32, 1200 -etbIntegralError = scalar, F32, 1204, "", 1, 0 -etbCurrentTarget = scalar, F32, 1208, "%", 1, 0 -; total TS size = 1212 -faultCode = scalar, U08, 1212, "", 1, 0 -heaterDuty = scalar, U08, 1213, "%", 1, 0 -pumpDuty = scalar, U08, 1214, "%", 1, 0 -tempC = scalar, U16, 1216, "C", 1, 0 -nernstVoltage = scalar, U16, 1218, "V", 0.001, 0 -esr = scalar, U16, 1220, "", 1, 0 -; total TS size = 1224 +wallFuelCorrection = scalar, F32, 1132, "", 1, 0 +wallFuel = scalar, F32, 1136, "", 1, 0 +; total TS size = 1140 +idleState = bits, S32, 1140, [0:2], "not important" +currentIdlePosition = scalar, F32, 1144 +baseIdlePosition = scalar, F32, 1148 +iacByTpsTaper = scalar, F32, 1152 +throttlePedalUpState = scalar, S32, 1156, "", 1, 0 +mightResetPid = bits, U32, 1160, [0:0] +shouldResetPid = bits, U32, 1160, [1:1] +wasResetPid = bits, U32, 1160, [2:2] +mustResetPid = bits, U32, 1160, [3:3] +isCoasting = bits, U32, 1160, [4:4] +useIacTableForCoasting = bits, U32, 1160, [5:5] +notIdling = bits, U32, 1160, [6:6] +needReset = bits, U32, 1160, [7:7] +isInDeadZone = bits, U32, 1160, [8:8] +isBlipping = bits, U32, 1160, [9:9] +useClosedLoop = bits, U32, 1160, [10:10] +badTps = bits, U32, 1160, [11:11] +looksLikeRunning = bits, U32, 1160, [12:12] +looksLikeCoasting = bits, U32, 1160, [13:13] +looksLikeCrankToIdle = bits, U32, 1160, [14:14] +useInstantRpmForIdle = bits, U32, 1160, [15:15] +isVerboseIAC = bits, U32, 1160, [16:16] +unusedBit_22_17 = bits, U32, 1160, [17:17] +unusedBit_22_18 = bits, U32, 1160, [18:18] +unusedBit_22_19 = bits, U32, 1160, [19:19] +unusedBit_22_20 = bits, U32, 1160, [20:20] +unusedBit_22_21 = bits, U32, 1160, [21:21] +unusedBit_22_22 = bits, U32, 1160, [22:22] +unusedBit_22_23 = bits, U32, 1160, [23:23] +unusedBit_22_24 = bits, U32, 1160, [24:24] +unusedBit_22_25 = bits, U32, 1160, [25:25] +unusedBit_22_26 = bits, U32, 1160, [26:26] +unusedBit_22_27 = bits, U32, 1160, [27:27] +unusedBit_22_28 = bits, U32, 1160, [28:28] +unusedBit_22_29 = bits, U32, 1160, [29:29] +unusedBit_22_30 = bits, U32, 1160, [30:30] +unusedBit_22_31 = bits, U32, 1160, [31:31] +targetRpmByClt = scalar, S32, 1164, "", 1, 0 +targetRpmAcBump = scalar, S32, 1168, "", 1, 0 +iacByRpmTaper = scalar, F32, 1172 +luaAdd = scalar, F32, 1176 +; total TS size = 1180 +baseDwell = scalar, F32, 1180, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 1184, "", 1, 0 +luaTimingAdd = scalar, F32, 1188, "", 1, 0 +luaTimingMult = scalar, F32, 1192, "", 1, 0 +; total TS size = 1196 +idlePosition = scalar, F32, 1196, "", 1, 0 +trim = scalar, F32, 1200, "", 1, 0 +luaAdjustment = scalar, F32, 1204, "", 1, 0 +etbFeedForward = scalar, F32, 1208 +etbIntegralError = scalar, F32, 1212, "", 1, 0 +etbCurrentTarget = scalar, F32, 1216, "%", 1, 0 +; total TS size = 1220 +faultCode = scalar, U08, 1220, "", 1, 0 +heaterDuty = scalar, U08, 1221, "%", 1, 0 +pumpDuty = scalar, U08, 1222, "%", 1, 0 +tempC = scalar, U16, 1224, "C", 1, 0 +nernstVoltage = scalar, U16, 1226, "V", 0.001, 0 +esr = scalar, U16, 1228, "", 1, 0 +; total TS size = 1232 time = { timeNow } @@ -4757,6 +4759,8 @@ entry = brakePedalState, "brake: down", int, "%d" entry = egt1, "egt1", float, "%.3f" entry = egt2, "egt2", float, "%.3f" entry = desiredRpmLimit, "User-defined RPM hard limit", int, "%d" +entry = fuelInjectionCounter, "fuelInjectionCounter", int, "%d" +entry = sparkCounter, "sparkCounter", int, "%d" entry = tpsFrom, "tpsFrom", float, "%.3f" entry = tpsTo, "tpsTo", float, "%.3f" entry = deltaTps, "deltaTps", float, "%.3f" @@ -5498,6 +5502,8 @@ dialog = engine_stateDialog, "engine_state" graphLine = egt2 liveGraph = engine_state_10_Graph, "Graph", South graphLine = desiredRpmLimit + graphLine = fuelInjectionCounter + graphLine = sparkCounter indicatorPanel = tps_accel_stateIndicatorPanel, 2 indicator = {isAboveAccelThreshold}, "isAboveAccelThreshold No", "isAboveAccelThreshold Yes" diff --git a/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini b/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini index 372bc75b65..5f43431c04 100644 --- a/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini +++ b/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.08.25.hellenNA8_96.3523443446" + signature = "rusEFI 2022.08.25.hellenNA8_96.578547330" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.08.25.hellenNA8_96.3523443446" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.08.25.hellenNA8_96.578547330" ; 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 @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Aug 25 14:51:43 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Aug 25 22:50:28 UTC 2022 pageSize = 21300 page = 1 @@ -2109,7 +2109,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1224 + ochBlockSize = 1232 ; ; see TunerStudioOutputChannels struct @@ -3022,170 +3022,172 @@ unusedBit_22_31 = bits, U32, 992, [31:31] egt1 = scalar, F32, 996, "", 1, 0 egt2 = scalar, F32, 1000, "", 1, 0 desiredRpmLimit = scalar, S16, 1004, "rpm", 1, 0 -; total TS size = 1008 -tpsFrom = scalar, F32, 1008 -tpsTo = scalar, F32, 1012 -deltaTps = scalar, F32, 1016 -extraFuel = scalar, F32, 1020, "", 1, 0 -valueFromTable = scalar, F32, 1024, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1028, [0:0] -isBelowDecelThreshold = bits, U32, 1028, [1:1] -isTimeToResetAccumulator = bits, U32, 1028, [2:2] -isFractionalEnrichment = bits, U32, 1028, [3:3] -belowEpsilon = bits, U32, 1028, [4:4] -tooShort = bits, U32, 1028, [5:5] -unusedBit_11_6 = bits, U32, 1028, [6:6] -unusedBit_11_7 = bits, U32, 1028, [7:7] -unusedBit_11_8 = bits, U32, 1028, [8:8] -unusedBit_11_9 = bits, U32, 1028, [9:9] -unusedBit_11_10 = bits, U32, 1028, [10:10] -unusedBit_11_11 = bits, U32, 1028, [11:11] -unusedBit_11_12 = bits, U32, 1028, [12:12] -unusedBit_11_13 = bits, U32, 1028, [13:13] -unusedBit_11_14 = bits, U32, 1028, [14:14] -unusedBit_11_15 = bits, U32, 1028, [15:15] -unusedBit_11_16 = bits, U32, 1028, [16:16] -unusedBit_11_17 = bits, U32, 1028, [17:17] -unusedBit_11_18 = bits, U32, 1028, [18:18] -unusedBit_11_19 = bits, U32, 1028, [19:19] -unusedBit_11_20 = bits, U32, 1028, [20:20] -unusedBit_11_21 = bits, U32, 1028, [21:21] -unusedBit_11_22 = bits, U32, 1028, [22:22] -unusedBit_11_23 = bits, U32, 1028, [23:23] -unusedBit_11_24 = bits, U32, 1028, [24:24] -unusedBit_11_25 = bits, U32, 1028, [25:25] -unusedBit_11_26 = bits, U32, 1028, [26:26] -unusedBit_11_27 = bits, U32, 1028, [27:27] -unusedBit_11_28 = bits, U32, 1028, [28:28] -unusedBit_11_29 = bits, U32, 1028, [29:29] -unusedBit_11_30 = bits, U32, 1028, [30:30] -unusedBit_11_31 = bits, U32, 1028, [31:31] -fractionalInjFuel = scalar, F32, 1032, "", 1, 0 -accumulatedValue = scalar, F32, 1036, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1040, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1044, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1048, "", 1, 0 -cycleCnt = scalar, S32, 1052, "", 1, 0 -; total TS size = 1056 -hwEventCounters1 = scalar, S32, 1056, "", 1, 0 -hwEventCounters2 = scalar, S32, 1060, "", 1, 0 -hwEventCounters3 = scalar, S32, 1064, "", 1, 0 -hwEventCounters4 = scalar, S32, 1068, "", 1, 0 -hwEventCounters5 = scalar, S32, 1072, "", 1, 0 -hwEventCounters6 = scalar, S32, 1076, "", 1, 0 -vvtCamCounter = scalar, S32, 1080, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1084, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1088, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1092, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1093, "", 1, 0 -; total TS size = 1096 -totalRevolutionCounter = scalar, U32, 1096, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1100, "", 1, 0 -vvtCurrentPosition = scalar, F32, 1104, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1108, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 1112, "", 1, 0 -triggerStateIndex = scalar, U08, 1116, "", 1, 0 -vvtCounter = scalar, U08, 1117, "", 1, 0 -camResyncCounter = scalar, U08, 1118, "", 1, 0 -vvtStateIndex = scalar, U08, 1119, "", 1, 0 -; total TS size = 1120 -m_hasSynchronizedPhase = bits, U32, 1120, [0:0] -unusedBit_1_1 = bits, U32, 1120, [1:1] -unusedBit_1_2 = bits, U32, 1120, [2:2] -unusedBit_1_3 = bits, U32, 1120, [3:3] -unusedBit_1_4 = bits, U32, 1120, [4:4] -unusedBit_1_5 = bits, U32, 1120, [5:5] -unusedBit_1_6 = bits, U32, 1120, [6:6] -unusedBit_1_7 = bits, U32, 1120, [7:7] -unusedBit_1_8 = bits, U32, 1120, [8:8] -unusedBit_1_9 = bits, U32, 1120, [9:9] -unusedBit_1_10 = bits, U32, 1120, [10:10] -unusedBit_1_11 = bits, U32, 1120, [11:11] -unusedBit_1_12 = bits, U32, 1120, [12:12] -unusedBit_1_13 = bits, U32, 1120, [13:13] -unusedBit_1_14 = bits, U32, 1120, [14:14] -unusedBit_1_15 = bits, U32, 1120, [15:15] -unusedBit_1_16 = bits, U32, 1120, [16:16] -unusedBit_1_17 = bits, U32, 1120, [17:17] -unusedBit_1_18 = bits, U32, 1120, [18:18] -unusedBit_1_19 = bits, U32, 1120, [19:19] -unusedBit_1_20 = bits, U32, 1120, [20:20] -unusedBit_1_21 = bits, U32, 1120, [21:21] -unusedBit_1_22 = bits, U32, 1120, [22:22] -unusedBit_1_23 = bits, U32, 1120, [23:23] -unusedBit_1_24 = bits, U32, 1120, [24:24] -unusedBit_1_25 = bits, U32, 1120, [25:25] -unusedBit_1_26 = bits, U32, 1120, [26:26] -unusedBit_1_27 = bits, U32, 1120, [27:27] -unusedBit_1_28 = bits, U32, 1120, [28:28] -unusedBit_1_29 = bits, U32, 1120, [29:29] -unusedBit_1_30 = bits, U32, 1120, [30:30] -unusedBit_1_31 = bits, U32, 1120, [31:31] -; total TS size = 1124 -wallFuelCorrection = scalar, F32, 1124, "", 1, 0 -wallFuel = scalar, F32, 1128, "", 1, 0 +fuelInjectionCounter = scalar, S32, 1008, "", 1, 0 +sparkCounter = scalar, S32, 1012, "", 1, 0 +; total TS size = 1016 +tpsFrom = scalar, F32, 1016 +tpsTo = scalar, F32, 1020 +deltaTps = scalar, F32, 1024 +extraFuel = scalar, F32, 1028, "", 1, 0 +valueFromTable = scalar, F32, 1032, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1036, [0:0] +isBelowDecelThreshold = bits, U32, 1036, [1:1] +isTimeToResetAccumulator = bits, U32, 1036, [2:2] +isFractionalEnrichment = bits, U32, 1036, [3:3] +belowEpsilon = bits, U32, 1036, [4:4] +tooShort = bits, U32, 1036, [5:5] +unusedBit_11_6 = bits, U32, 1036, [6:6] +unusedBit_11_7 = bits, U32, 1036, [7:7] +unusedBit_11_8 = bits, U32, 1036, [8:8] +unusedBit_11_9 = bits, U32, 1036, [9:9] +unusedBit_11_10 = bits, U32, 1036, [10:10] +unusedBit_11_11 = bits, U32, 1036, [11:11] +unusedBit_11_12 = bits, U32, 1036, [12:12] +unusedBit_11_13 = bits, U32, 1036, [13:13] +unusedBit_11_14 = bits, U32, 1036, [14:14] +unusedBit_11_15 = bits, U32, 1036, [15:15] +unusedBit_11_16 = bits, U32, 1036, [16:16] +unusedBit_11_17 = bits, U32, 1036, [17:17] +unusedBit_11_18 = bits, U32, 1036, [18:18] +unusedBit_11_19 = bits, U32, 1036, [19:19] +unusedBit_11_20 = bits, U32, 1036, [20:20] +unusedBit_11_21 = bits, U32, 1036, [21:21] +unusedBit_11_22 = bits, U32, 1036, [22:22] +unusedBit_11_23 = bits, U32, 1036, [23:23] +unusedBit_11_24 = bits, U32, 1036, [24:24] +unusedBit_11_25 = bits, U32, 1036, [25:25] +unusedBit_11_26 = bits, U32, 1036, [26:26] +unusedBit_11_27 = bits, U32, 1036, [27:27] +unusedBit_11_28 = bits, U32, 1036, [28:28] +unusedBit_11_29 = bits, U32, 1036, [29:29] +unusedBit_11_30 = bits, U32, 1036, [30:30] +unusedBit_11_31 = bits, U32, 1036, [31:31] +fractionalInjFuel = scalar, F32, 1040, "", 1, 0 +accumulatedValue = scalar, F32, 1044, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1048, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1052, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1056, "", 1, 0 +cycleCnt = scalar, S32, 1060, "", 1, 0 +; total TS size = 1064 +hwEventCounters1 = scalar, S32, 1064, "", 1, 0 +hwEventCounters2 = scalar, S32, 1068, "", 1, 0 +hwEventCounters3 = scalar, S32, 1072, "", 1, 0 +hwEventCounters4 = scalar, S32, 1076, "", 1, 0 +hwEventCounters5 = scalar, S32, 1080, "", 1, 0 +hwEventCounters6 = scalar, S32, 1084, "", 1, 0 +vvtCamCounter = scalar, S32, 1088, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1092, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1096, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1100, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1101, "", 1, 0 +; total TS size = 1104 +totalRevolutionCounter = scalar, U32, 1104, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1108, "", 1, 0 +vvtCurrentPosition = scalar, F32, 1112, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1116, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 1120, "", 1, 0 +triggerStateIndex = scalar, U08, 1124, "", 1, 0 +vvtCounter = scalar, U08, 1125, "", 1, 0 +camResyncCounter = scalar, U08, 1126, "", 1, 0 +vvtStateIndex = scalar, U08, 1127, "", 1, 0 +; total TS size = 1128 +m_hasSynchronizedPhase = bits, U32, 1128, [0:0] +unusedBit_1_1 = bits, U32, 1128, [1:1] +unusedBit_1_2 = bits, U32, 1128, [2:2] +unusedBit_1_3 = bits, U32, 1128, [3:3] +unusedBit_1_4 = bits, U32, 1128, [4:4] +unusedBit_1_5 = bits, U32, 1128, [5:5] +unusedBit_1_6 = bits, U32, 1128, [6:6] +unusedBit_1_7 = bits, U32, 1128, [7:7] +unusedBit_1_8 = bits, U32, 1128, [8:8] +unusedBit_1_9 = bits, U32, 1128, [9:9] +unusedBit_1_10 = bits, U32, 1128, [10:10] +unusedBit_1_11 = bits, U32, 1128, [11:11] +unusedBit_1_12 = bits, U32, 1128, [12:12] +unusedBit_1_13 = bits, U32, 1128, [13:13] +unusedBit_1_14 = bits, U32, 1128, [14:14] +unusedBit_1_15 = bits, U32, 1128, [15:15] +unusedBit_1_16 = bits, U32, 1128, [16:16] +unusedBit_1_17 = bits, U32, 1128, [17:17] +unusedBit_1_18 = bits, U32, 1128, [18:18] +unusedBit_1_19 = bits, U32, 1128, [19:19] +unusedBit_1_20 = bits, U32, 1128, [20:20] +unusedBit_1_21 = bits, U32, 1128, [21:21] +unusedBit_1_22 = bits, U32, 1128, [22:22] +unusedBit_1_23 = bits, U32, 1128, [23:23] +unusedBit_1_24 = bits, U32, 1128, [24:24] +unusedBit_1_25 = bits, U32, 1128, [25:25] +unusedBit_1_26 = bits, U32, 1128, [26:26] +unusedBit_1_27 = bits, U32, 1128, [27:27] +unusedBit_1_28 = bits, U32, 1128, [28:28] +unusedBit_1_29 = bits, U32, 1128, [29:29] +unusedBit_1_30 = bits, U32, 1128, [30:30] +unusedBit_1_31 = bits, U32, 1128, [31:31] ; total TS size = 1132 -idleState = bits, S32, 1132, [0:2], "not important" -currentIdlePosition = scalar, F32, 1136 -baseIdlePosition = scalar, F32, 1140 -iacByTpsTaper = scalar, F32, 1144 -throttlePedalUpState = scalar, S32, 1148, "", 1, 0 -mightResetPid = bits, U32, 1152, [0:0] -shouldResetPid = bits, U32, 1152, [1:1] -wasResetPid = bits, U32, 1152, [2:2] -mustResetPid = bits, U32, 1152, [3:3] -isCoasting = bits, U32, 1152, [4:4] -useIacTableForCoasting = bits, U32, 1152, [5:5] -notIdling = bits, U32, 1152, [6:6] -needReset = bits, U32, 1152, [7:7] -isInDeadZone = bits, U32, 1152, [8:8] -isBlipping = bits, U32, 1152, [9:9] -useClosedLoop = bits, U32, 1152, [10:10] -badTps = bits, U32, 1152, [11:11] -looksLikeRunning = bits, U32, 1152, [12:12] -looksLikeCoasting = bits, U32, 1152, [13:13] -looksLikeCrankToIdle = bits, U32, 1152, [14:14] -useInstantRpmForIdle = bits, U32, 1152, [15:15] -isVerboseIAC = bits, U32, 1152, [16:16] -unusedBit_22_17 = bits, U32, 1152, [17:17] -unusedBit_22_18 = bits, U32, 1152, [18:18] -unusedBit_22_19 = bits, U32, 1152, [19:19] -unusedBit_22_20 = bits, U32, 1152, [20:20] -unusedBit_22_21 = bits, U32, 1152, [21:21] -unusedBit_22_22 = bits, U32, 1152, [22:22] -unusedBit_22_23 = bits, U32, 1152, [23:23] -unusedBit_22_24 = bits, U32, 1152, [24:24] -unusedBit_22_25 = bits, U32, 1152, [25:25] -unusedBit_22_26 = bits, U32, 1152, [26:26] -unusedBit_22_27 = bits, U32, 1152, [27:27] -unusedBit_22_28 = bits, U32, 1152, [28:28] -unusedBit_22_29 = bits, U32, 1152, [29:29] -unusedBit_22_30 = bits, U32, 1152, [30:30] -unusedBit_22_31 = bits, U32, 1152, [31:31] -targetRpmByClt = scalar, S32, 1156, "", 1, 0 -targetRpmAcBump = scalar, S32, 1160, "", 1, 0 -iacByRpmTaper = scalar, F32, 1164 -luaAdd = scalar, F32, 1168 -; total TS size = 1172 -baseDwell = scalar, F32, 1172, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 1176, "", 1, 0 -luaTimingAdd = scalar, F32, 1180, "", 1, 0 -luaTimingMult = scalar, F32, 1184, "", 1, 0 -; total TS size = 1188 -idlePosition = scalar, F32, 1188, "", 1, 0 -trim = scalar, F32, 1192, "", 1, 0 -luaAdjustment = scalar, F32, 1196, "", 1, 0 -etbFeedForward = scalar, F32, 1200 -etbIntegralError = scalar, F32, 1204, "", 1, 0 -etbCurrentTarget = scalar, F32, 1208, "%", 1, 0 -; total TS size = 1212 -faultCode = scalar, U08, 1212, "", 1, 0 -heaterDuty = scalar, U08, 1213, "%", 1, 0 -pumpDuty = scalar, U08, 1214, "%", 1, 0 -tempC = scalar, U16, 1216, "C", 1, 0 -nernstVoltage = scalar, U16, 1218, "V", 0.001, 0 -esr = scalar, U16, 1220, "", 1, 0 -; total TS size = 1224 +wallFuelCorrection = scalar, F32, 1132, "", 1, 0 +wallFuel = scalar, F32, 1136, "", 1, 0 +; total TS size = 1140 +idleState = bits, S32, 1140, [0:2], "not important" +currentIdlePosition = scalar, F32, 1144 +baseIdlePosition = scalar, F32, 1148 +iacByTpsTaper = scalar, F32, 1152 +throttlePedalUpState = scalar, S32, 1156, "", 1, 0 +mightResetPid = bits, U32, 1160, [0:0] +shouldResetPid = bits, U32, 1160, [1:1] +wasResetPid = bits, U32, 1160, [2:2] +mustResetPid = bits, U32, 1160, [3:3] +isCoasting = bits, U32, 1160, [4:4] +useIacTableForCoasting = bits, U32, 1160, [5:5] +notIdling = bits, U32, 1160, [6:6] +needReset = bits, U32, 1160, [7:7] +isInDeadZone = bits, U32, 1160, [8:8] +isBlipping = bits, U32, 1160, [9:9] +useClosedLoop = bits, U32, 1160, [10:10] +badTps = bits, U32, 1160, [11:11] +looksLikeRunning = bits, U32, 1160, [12:12] +looksLikeCoasting = bits, U32, 1160, [13:13] +looksLikeCrankToIdle = bits, U32, 1160, [14:14] +useInstantRpmForIdle = bits, U32, 1160, [15:15] +isVerboseIAC = bits, U32, 1160, [16:16] +unusedBit_22_17 = bits, U32, 1160, [17:17] +unusedBit_22_18 = bits, U32, 1160, [18:18] +unusedBit_22_19 = bits, U32, 1160, [19:19] +unusedBit_22_20 = bits, U32, 1160, [20:20] +unusedBit_22_21 = bits, U32, 1160, [21:21] +unusedBit_22_22 = bits, U32, 1160, [22:22] +unusedBit_22_23 = bits, U32, 1160, [23:23] +unusedBit_22_24 = bits, U32, 1160, [24:24] +unusedBit_22_25 = bits, U32, 1160, [25:25] +unusedBit_22_26 = bits, U32, 1160, [26:26] +unusedBit_22_27 = bits, U32, 1160, [27:27] +unusedBit_22_28 = bits, U32, 1160, [28:28] +unusedBit_22_29 = bits, U32, 1160, [29:29] +unusedBit_22_30 = bits, U32, 1160, [30:30] +unusedBit_22_31 = bits, U32, 1160, [31:31] +targetRpmByClt = scalar, S32, 1164, "", 1, 0 +targetRpmAcBump = scalar, S32, 1168, "", 1, 0 +iacByRpmTaper = scalar, F32, 1172 +luaAdd = scalar, F32, 1176 +; total TS size = 1180 +baseDwell = scalar, F32, 1180, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 1184, "", 1, 0 +luaTimingAdd = scalar, F32, 1188, "", 1, 0 +luaTimingMult = scalar, F32, 1192, "", 1, 0 +; total TS size = 1196 +idlePosition = scalar, F32, 1196, "", 1, 0 +trim = scalar, F32, 1200, "", 1, 0 +luaAdjustment = scalar, F32, 1204, "", 1, 0 +etbFeedForward = scalar, F32, 1208 +etbIntegralError = scalar, F32, 1212, "", 1, 0 +etbCurrentTarget = scalar, F32, 1216, "%", 1, 0 +; total TS size = 1220 +faultCode = scalar, U08, 1220, "", 1, 0 +heaterDuty = scalar, U08, 1221, "%", 1, 0 +pumpDuty = scalar, U08, 1222, "%", 1, 0 +tempC = scalar, U16, 1224, "C", 1, 0 +nernstVoltage = scalar, U16, 1226, "V", 0.001, 0 +esr = scalar, U16, 1228, "", 1, 0 +; total TS size = 1232 time = { timeNow } @@ -4757,6 +4759,8 @@ entry = brakePedalState, "brake: down", int, "%d" entry = egt1, "egt1", float, "%.3f" entry = egt2, "egt2", float, "%.3f" entry = desiredRpmLimit, "User-defined RPM hard limit", int, "%d" +entry = fuelInjectionCounter, "fuelInjectionCounter", int, "%d" +entry = sparkCounter, "sparkCounter", int, "%d" entry = tpsFrom, "tpsFrom", float, "%.3f" entry = tpsTo, "tpsTo", float, "%.3f" entry = deltaTps, "deltaTps", float, "%.3f" @@ -5498,6 +5502,8 @@ dialog = engine_stateDialog, "engine_state" graphLine = egt2 liveGraph = engine_state_10_Graph, "Graph", South graphLine = desiredRpmLimit + graphLine = fuelInjectionCounter + graphLine = sparkCounter indicatorPanel = tps_accel_stateIndicatorPanel, 2 indicator = {isAboveAccelThreshold}, "isAboveAccelThreshold No", "isAboveAccelThreshold Yes" diff --git a/firmware/tunerstudio/generated/rusefi_kin.ini b/firmware/tunerstudio/generated/rusefi_kin.ini index 1f905e1bac..929204346f 100644 --- a/firmware/tunerstudio/generated/rusefi_kin.ini +++ b/firmware/tunerstudio/generated/rusefi_kin.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.08.25.kin.450718162" + signature = "rusEFI 2022.08.25.kin.3936746918" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.08.25.kin.450718162" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.08.25.kin.3936746918" ; 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 @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Thu Aug 25 14:51:09 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Thu Aug 25 22:49:56 UTC 2022 pageSize = 21300 page = 1 @@ -2109,7 +2109,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1224 + ochBlockSize = 1232 ; ; see TunerStudioOutputChannels struct @@ -3022,170 +3022,172 @@ unusedBit_22_31 = bits, U32, 992, [31:31] egt1 = scalar, F32, 996, "", 1, 0 egt2 = scalar, F32, 1000, "", 1, 0 desiredRpmLimit = scalar, S16, 1004, "rpm", 1, 0 -; total TS size = 1008 -tpsFrom = scalar, F32, 1008 -tpsTo = scalar, F32, 1012 -deltaTps = scalar, F32, 1016 -extraFuel = scalar, F32, 1020, "", 1, 0 -valueFromTable = scalar, F32, 1024, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1028, [0:0] -isBelowDecelThreshold = bits, U32, 1028, [1:1] -isTimeToResetAccumulator = bits, U32, 1028, [2:2] -isFractionalEnrichment = bits, U32, 1028, [3:3] -belowEpsilon = bits, U32, 1028, [4:4] -tooShort = bits, U32, 1028, [5:5] -unusedBit_11_6 = bits, U32, 1028, [6:6] -unusedBit_11_7 = bits, U32, 1028, [7:7] -unusedBit_11_8 = bits, U32, 1028, [8:8] -unusedBit_11_9 = bits, U32, 1028, [9:9] -unusedBit_11_10 = bits, U32, 1028, [10:10] -unusedBit_11_11 = bits, U32, 1028, [11:11] -unusedBit_11_12 = bits, U32, 1028, [12:12] -unusedBit_11_13 = bits, U32, 1028, [13:13] -unusedBit_11_14 = bits, U32, 1028, [14:14] -unusedBit_11_15 = bits, U32, 1028, [15:15] -unusedBit_11_16 = bits, U32, 1028, [16:16] -unusedBit_11_17 = bits, U32, 1028, [17:17] -unusedBit_11_18 = bits, U32, 1028, [18:18] -unusedBit_11_19 = bits, U32, 1028, [19:19] -unusedBit_11_20 = bits, U32, 1028, [20:20] -unusedBit_11_21 = bits, U32, 1028, [21:21] -unusedBit_11_22 = bits, U32, 1028, [22:22] -unusedBit_11_23 = bits, U32, 1028, [23:23] -unusedBit_11_24 = bits, U32, 1028, [24:24] -unusedBit_11_25 = bits, U32, 1028, [25:25] -unusedBit_11_26 = bits, U32, 1028, [26:26] -unusedBit_11_27 = bits, U32, 1028, [27:27] -unusedBit_11_28 = bits, U32, 1028, [28:28] -unusedBit_11_29 = bits, U32, 1028, [29:29] -unusedBit_11_30 = bits, U32, 1028, [30:30] -unusedBit_11_31 = bits, U32, 1028, [31:31] -fractionalInjFuel = scalar, F32, 1032, "", 1, 0 -accumulatedValue = scalar, F32, 1036, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1040, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1044, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1048, "", 1, 0 -cycleCnt = scalar, S32, 1052, "", 1, 0 -; total TS size = 1056 -hwEventCounters1 = scalar, S32, 1056, "", 1, 0 -hwEventCounters2 = scalar, S32, 1060, "", 1, 0 -hwEventCounters3 = scalar, S32, 1064, "", 1, 0 -hwEventCounters4 = scalar, S32, 1068, "", 1, 0 -hwEventCounters5 = scalar, S32, 1072, "", 1, 0 -hwEventCounters6 = scalar, S32, 1076, "", 1, 0 -vvtCamCounter = scalar, S32, 1080, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1084, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1088, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1092, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1093, "", 1, 0 -; total TS size = 1096 -totalRevolutionCounter = scalar, U32, 1096, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1100, "", 1, 0 -vvtCurrentPosition = scalar, F32, 1104, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1108, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 1112, "", 1, 0 -triggerStateIndex = scalar, U08, 1116, "", 1, 0 -vvtCounter = scalar, U08, 1117, "", 1, 0 -camResyncCounter = scalar, U08, 1118, "", 1, 0 -vvtStateIndex = scalar, U08, 1119, "", 1, 0 -; total TS size = 1120 -m_hasSynchronizedPhase = bits, U32, 1120, [0:0] -unusedBit_1_1 = bits, U32, 1120, [1:1] -unusedBit_1_2 = bits, U32, 1120, [2:2] -unusedBit_1_3 = bits, U32, 1120, [3:3] -unusedBit_1_4 = bits, U32, 1120, [4:4] -unusedBit_1_5 = bits, U32, 1120, [5:5] -unusedBit_1_6 = bits, U32, 1120, [6:6] -unusedBit_1_7 = bits, U32, 1120, [7:7] -unusedBit_1_8 = bits, U32, 1120, [8:8] -unusedBit_1_9 = bits, U32, 1120, [9:9] -unusedBit_1_10 = bits, U32, 1120, [10:10] -unusedBit_1_11 = bits, U32, 1120, [11:11] -unusedBit_1_12 = bits, U32, 1120, [12:12] -unusedBit_1_13 = bits, U32, 1120, [13:13] -unusedBit_1_14 = bits, U32, 1120, [14:14] -unusedBit_1_15 = bits, U32, 1120, [15:15] -unusedBit_1_16 = bits, U32, 1120, [16:16] -unusedBit_1_17 = bits, U32, 1120, [17:17] -unusedBit_1_18 = bits, U32, 1120, [18:18] -unusedBit_1_19 = bits, U32, 1120, [19:19] -unusedBit_1_20 = bits, U32, 1120, [20:20] -unusedBit_1_21 = bits, U32, 1120, [21:21] -unusedBit_1_22 = bits, U32, 1120, [22:22] -unusedBit_1_23 = bits, U32, 1120, [23:23] -unusedBit_1_24 = bits, U32, 1120, [24:24] -unusedBit_1_25 = bits, U32, 1120, [25:25] -unusedBit_1_26 = bits, U32, 1120, [26:26] -unusedBit_1_27 = bits, U32, 1120, [27:27] -unusedBit_1_28 = bits, U32, 1120, [28:28] -unusedBit_1_29 = bits, U32, 1120, [29:29] -unusedBit_1_30 = bits, U32, 1120, [30:30] -unusedBit_1_31 = bits, U32, 1120, [31:31] -; total TS size = 1124 -wallFuelCorrection = scalar, F32, 1124, "", 1, 0 -wallFuel = scalar, F32, 1128, "", 1, 0 +fuelInjectionCounter = scalar, S32, 1008, "", 1, 0 +sparkCounter = scalar, S32, 1012, "", 1, 0 +; total TS size = 1016 +tpsFrom = scalar, F32, 1016 +tpsTo = scalar, F32, 1020 +deltaTps = scalar, F32, 1024 +extraFuel = scalar, F32, 1028, "", 1, 0 +valueFromTable = scalar, F32, 1032, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1036, [0:0] +isBelowDecelThreshold = bits, U32, 1036, [1:1] +isTimeToResetAccumulator = bits, U32, 1036, [2:2] +isFractionalEnrichment = bits, U32, 1036, [3:3] +belowEpsilon = bits, U32, 1036, [4:4] +tooShort = bits, U32, 1036, [5:5] +unusedBit_11_6 = bits, U32, 1036, [6:6] +unusedBit_11_7 = bits, U32, 1036, [7:7] +unusedBit_11_8 = bits, U32, 1036, [8:8] +unusedBit_11_9 = bits, U32, 1036, [9:9] +unusedBit_11_10 = bits, U32, 1036, [10:10] +unusedBit_11_11 = bits, U32, 1036, [11:11] +unusedBit_11_12 = bits, U32, 1036, [12:12] +unusedBit_11_13 = bits, U32, 1036, [13:13] +unusedBit_11_14 = bits, U32, 1036, [14:14] +unusedBit_11_15 = bits, U32, 1036, [15:15] +unusedBit_11_16 = bits, U32, 1036, [16:16] +unusedBit_11_17 = bits, U32, 1036, [17:17] +unusedBit_11_18 = bits, U32, 1036, [18:18] +unusedBit_11_19 = bits, U32, 1036, [19:19] +unusedBit_11_20 = bits, U32, 1036, [20:20] +unusedBit_11_21 = bits, U32, 1036, [21:21] +unusedBit_11_22 = bits, U32, 1036, [22:22] +unusedBit_11_23 = bits, U32, 1036, [23:23] +unusedBit_11_24 = bits, U32, 1036, [24:24] +unusedBit_11_25 = bits, U32, 1036, [25:25] +unusedBit_11_26 = bits, U32, 1036, [26:26] +unusedBit_11_27 = bits, U32, 1036, [27:27] +unusedBit_11_28 = bits, U32, 1036, [28:28] +unusedBit_11_29 = bits, U32, 1036, [29:29] +unusedBit_11_30 = bits, U32, 1036, [30:30] +unusedBit_11_31 = bits, U32, 1036, [31:31] +fractionalInjFuel = scalar, F32, 1040, "", 1, 0 +accumulatedValue = scalar, F32, 1044, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1048, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1052, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1056, "", 1, 0 +cycleCnt = scalar, S32, 1060, "", 1, 0 +; total TS size = 1064 +hwEventCounters1 = scalar, S32, 1064, "", 1, 0 +hwEventCounters2 = scalar, S32, 1068, "", 1, 0 +hwEventCounters3 = scalar, S32, 1072, "", 1, 0 +hwEventCounters4 = scalar, S32, 1076, "", 1, 0 +hwEventCounters5 = scalar, S32, 1080, "", 1, 0 +hwEventCounters6 = scalar, S32, 1084, "", 1, 0 +vvtCamCounter = scalar, S32, 1088, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1092, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1096, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1100, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1101, "", 1, 0 +; total TS size = 1104 +totalRevolutionCounter = scalar, U32, 1104, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1108, "", 1, 0 +vvtCurrentPosition = scalar, F32, 1112, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1116, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 1120, "", 1, 0 +triggerStateIndex = scalar, U08, 1124, "", 1, 0 +vvtCounter = scalar, U08, 1125, "", 1, 0 +camResyncCounter = scalar, U08, 1126, "", 1, 0 +vvtStateIndex = scalar, U08, 1127, "", 1, 0 +; total TS size = 1128 +m_hasSynchronizedPhase = bits, U32, 1128, [0:0] +unusedBit_1_1 = bits, U32, 1128, [1:1] +unusedBit_1_2 = bits, U32, 1128, [2:2] +unusedBit_1_3 = bits, U32, 1128, [3:3] +unusedBit_1_4 = bits, U32, 1128, [4:4] +unusedBit_1_5 = bits, U32, 1128, [5:5] +unusedBit_1_6 = bits, U32, 1128, [6:6] +unusedBit_1_7 = bits, U32, 1128, [7:7] +unusedBit_1_8 = bits, U32, 1128, [8:8] +unusedBit_1_9 = bits, U32, 1128, [9:9] +unusedBit_1_10 = bits, U32, 1128, [10:10] +unusedBit_1_11 = bits, U32, 1128, [11:11] +unusedBit_1_12 = bits, U32, 1128, [12:12] +unusedBit_1_13 = bits, U32, 1128, [13:13] +unusedBit_1_14 = bits, U32, 1128, [14:14] +unusedBit_1_15 = bits, U32, 1128, [15:15] +unusedBit_1_16 = bits, U32, 1128, [16:16] +unusedBit_1_17 = bits, U32, 1128, [17:17] +unusedBit_1_18 = bits, U32, 1128, [18:18] +unusedBit_1_19 = bits, U32, 1128, [19:19] +unusedBit_1_20 = bits, U32, 1128, [20:20] +unusedBit_1_21 = bits, U32, 1128, [21:21] +unusedBit_1_22 = bits, U32, 1128, [22:22] +unusedBit_1_23 = bits, U32, 1128, [23:23] +unusedBit_1_24 = bits, U32, 1128, [24:24] +unusedBit_1_25 = bits, U32, 1128, [25:25] +unusedBit_1_26 = bits, U32, 1128, [26:26] +unusedBit_1_27 = bits, U32, 1128, [27:27] +unusedBit_1_28 = bits, U32, 1128, [28:28] +unusedBit_1_29 = bits, U32, 1128, [29:29] +unusedBit_1_30 = bits, U32, 1128, [30:30] +unusedBit_1_31 = bits, U32, 1128, [31:31] ; total TS size = 1132 -idleState = bits, S32, 1132, [0:2], "not important" -currentIdlePosition = scalar, F32, 1136 -baseIdlePosition = scalar, F32, 1140 -iacByTpsTaper = scalar, F32, 1144 -throttlePedalUpState = scalar, S32, 1148, "", 1, 0 -mightResetPid = bits, U32, 1152, [0:0] -shouldResetPid = bits, U32, 1152, [1:1] -wasResetPid = bits, U32, 1152, [2:2] -mustResetPid = bits, U32, 1152, [3:3] -isCoasting = bits, U32, 1152, [4:4] -useIacTableForCoasting = bits, U32, 1152, [5:5] -notIdling = bits, U32, 1152, [6:6] -needReset = bits, U32, 1152, [7:7] -isInDeadZone = bits, U32, 1152, [8:8] -isBlipping = bits, U32, 1152, [9:9] -useClosedLoop = bits, U32, 1152, [10:10] -badTps = bits, U32, 1152, [11:11] -looksLikeRunning = bits, U32, 1152, [12:12] -looksLikeCoasting = bits, U32, 1152, [13:13] -looksLikeCrankToIdle = bits, U32, 1152, [14:14] -useInstantRpmForIdle = bits, U32, 1152, [15:15] -isVerboseIAC = bits, U32, 1152, [16:16] -unusedBit_22_17 = bits, U32, 1152, [17:17] -unusedBit_22_18 = bits, U32, 1152, [18:18] -unusedBit_22_19 = bits, U32, 1152, [19:19] -unusedBit_22_20 = bits, U32, 1152, [20:20] -unusedBit_22_21 = bits, U32, 1152, [21:21] -unusedBit_22_22 = bits, U32, 1152, [22:22] -unusedBit_22_23 = bits, U32, 1152, [23:23] -unusedBit_22_24 = bits, U32, 1152, [24:24] -unusedBit_22_25 = bits, U32, 1152, [25:25] -unusedBit_22_26 = bits, U32, 1152, [26:26] -unusedBit_22_27 = bits, U32, 1152, [27:27] -unusedBit_22_28 = bits, U32, 1152, [28:28] -unusedBit_22_29 = bits, U32, 1152, [29:29] -unusedBit_22_30 = bits, U32, 1152, [30:30] -unusedBit_22_31 = bits, U32, 1152, [31:31] -targetRpmByClt = scalar, S32, 1156, "", 1, 0 -targetRpmAcBump = scalar, S32, 1160, "", 1, 0 -iacByRpmTaper = scalar, F32, 1164 -luaAdd = scalar, F32, 1168 -; total TS size = 1172 -baseDwell = scalar, F32, 1172, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 1176, "", 1, 0 -luaTimingAdd = scalar, F32, 1180, "", 1, 0 -luaTimingMult = scalar, F32, 1184, "", 1, 0 -; total TS size = 1188 -idlePosition = scalar, F32, 1188, "", 1, 0 -trim = scalar, F32, 1192, "", 1, 0 -luaAdjustment = scalar, F32, 1196, "", 1, 0 -etbFeedForward = scalar, F32, 1200 -etbIntegralError = scalar, F32, 1204, "", 1, 0 -etbCurrentTarget = scalar, F32, 1208, "%", 1, 0 -; total TS size = 1212 -faultCode = scalar, U08, 1212, "", 1, 0 -heaterDuty = scalar, U08, 1213, "%", 1, 0 -pumpDuty = scalar, U08, 1214, "%", 1, 0 -tempC = scalar, U16, 1216, "C", 1, 0 -nernstVoltage = scalar, U16, 1218, "V", 0.001, 0 -esr = scalar, U16, 1220, "", 1, 0 -; total TS size = 1224 +wallFuelCorrection = scalar, F32, 1132, "", 1, 0 +wallFuel = scalar, F32, 1136, "", 1, 0 +; total TS size = 1140 +idleState = bits, S32, 1140, [0:2], "not important" +currentIdlePosition = scalar, F32, 1144 +baseIdlePosition = scalar, F32, 1148 +iacByTpsTaper = scalar, F32, 1152 +throttlePedalUpState = scalar, S32, 1156, "", 1, 0 +mightResetPid = bits, U32, 1160, [0:0] +shouldResetPid = bits, U32, 1160, [1:1] +wasResetPid = bits, U32, 1160, [2:2] +mustResetPid = bits, U32, 1160, [3:3] +isCoasting = bits, U32, 1160, [4:4] +useIacTableForCoasting = bits, U32, 1160, [5:5] +notIdling = bits, U32, 1160, [6:6] +needReset = bits, U32, 1160, [7:7] +isInDeadZone = bits, U32, 1160, [8:8] +isBlipping = bits, U32, 1160, [9:9] +useClosedLoop = bits, U32, 1160, [10:10] +badTps = bits, U32, 1160, [11:11] +looksLikeRunning = bits, U32, 1160, [12:12] +looksLikeCoasting = bits, U32, 1160, [13:13] +looksLikeCrankToIdle = bits, U32, 1160, [14:14] +useInstantRpmForIdle = bits, U32, 1160, [15:15] +isVerboseIAC = bits, U32, 1160, [16:16] +unusedBit_22_17 = bits, U32, 1160, [17:17] +unusedBit_22_18 = bits, U32, 1160, [18:18] +unusedBit_22_19 = bits, U32, 1160, [19:19] +unusedBit_22_20 = bits, U32, 1160, [20:20] +unusedBit_22_21 = bits, U32, 1160, [21:21] +unusedBit_22_22 = bits, U32, 1160, [22:22] +unusedBit_22_23 = bits, U32, 1160, [23:23] +unusedBit_22_24 = bits, U32, 1160, [24:24] +unusedBit_22_25 = bits, U32, 1160, [25:25] +unusedBit_22_26 = bits, U32, 1160, [26:26] +unusedBit_22_27 = bits, U32, 1160, [27:27] +unusedBit_22_28 = bits, U32, 1160, [28:28] +unusedBit_22_29 = bits, U32, 1160, [29:29] +unusedBit_22_30 = bits, U32, 1160, [30:30] +unusedBit_22_31 = bits, U32, 1160, [31:31] +targetRpmByClt = scalar, S32, 1164, "", 1, 0 +targetRpmAcBump = scalar, S32, 1168, "", 1, 0 +iacByRpmTaper = scalar, F32, 1172 +luaAdd = scalar, F32, 1176 +; total TS size = 1180 +baseDwell = scalar, F32, 1180, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 1184, "", 1, 0 +luaTimingAdd = scalar, F32, 1188, "", 1, 0 +luaTimingMult = scalar, F32, 1192, "", 1, 0 +; total TS size = 1196 +idlePosition = scalar, F32, 1196, "", 1, 0 +trim = scalar, F32, 1200, "", 1, 0 +luaAdjustment = scalar, F32, 1204, "", 1, 0 +etbFeedForward = scalar, F32, 1208 +etbIntegralError = scalar, F32, 1212, "", 1, 0 +etbCurrentTarget = scalar, F32, 1216, "%", 1, 0 +; total TS size = 1220 +faultCode = scalar, U08, 1220, "", 1, 0 +heaterDuty = scalar, U08, 1221, "%", 1, 0 +pumpDuty = scalar, U08, 1222, "%", 1, 0 +tempC = scalar, U16, 1224, "C", 1, 0 +nernstVoltage = scalar, U16, 1226, "V", 0.001, 0 +esr = scalar, U16, 1228, "", 1, 0 +; total TS size = 1232 time = { timeNow } @@ -4757,6 +4759,8 @@ entry = brakePedalState, "brake: down", int, "%d" entry = egt1, "egt1", float, "%.3f" entry = egt2, "egt2", float, "%.3f" entry = desiredRpmLimit, "User-defined RPM hard limit", int, "%d" +entry = fuelInjectionCounter, "fuelInjectionCounter", int, "%d" +entry = sparkCounter, "sparkCounter", int, "%d" entry = tpsFrom, "tpsFrom", float, "%.3f" entry = tpsTo, "tpsTo", float, "%.3f" entry = deltaTps, "deltaTps", float, "%.3f" @@ -5502,6 +5506,8 @@ dialog = engine_stateDialog, "engine_state" graphLine = egt2 liveGraph = engine_state_10_Graph, "Graph", South graphLine = desiredRpmLimit + graphLine = fuelInjectionCounter + graphLine = sparkCounter indicatorPanel = tps_accel_stateIndicatorPanel, 2 indicator = {isAboveAccelThreshold}, "isAboveAccelThreshold No", "isAboveAccelThreshold Yes" diff --git a/firmware/tunerstudio/generated/rusefi_mre_f4.ini b/firmware/tunerstudio/generated/rusefi_mre_f4.ini index 3324bc3777..ddd28035fe 100644 --- a/firmware/tunerstudio/generated/rusefi_mre_f4.ini +++ b/firmware/tunerstudio/generated/rusefi_mre_f4.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.08.25.mre_f4.3185330152" + signature = "rusEFI 2022.08.25.mre_f4.1302647708" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.08.25.mre_f4.3185330152" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.08.25.mre_f4.1302647708" ; 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 @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Aug 25 14:51:47 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Aug 25 22:50:33 UTC 2022 pageSize = 21300 page = 1 @@ -2109,7 +2109,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1224 + ochBlockSize = 1232 ; ; see TunerStudioOutputChannels struct @@ -3022,170 +3022,172 @@ unusedBit_22_31 = bits, U32, 992, [31:31] egt1 = scalar, F32, 996, "", 1, 0 egt2 = scalar, F32, 1000, "", 1, 0 desiredRpmLimit = scalar, S16, 1004, "rpm", 1, 0 -; total TS size = 1008 -tpsFrom = scalar, F32, 1008 -tpsTo = scalar, F32, 1012 -deltaTps = scalar, F32, 1016 -extraFuel = scalar, F32, 1020, "", 1, 0 -valueFromTable = scalar, F32, 1024, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1028, [0:0] -isBelowDecelThreshold = bits, U32, 1028, [1:1] -isTimeToResetAccumulator = bits, U32, 1028, [2:2] -isFractionalEnrichment = bits, U32, 1028, [3:3] -belowEpsilon = bits, U32, 1028, [4:4] -tooShort = bits, U32, 1028, [5:5] -unusedBit_11_6 = bits, U32, 1028, [6:6] -unusedBit_11_7 = bits, U32, 1028, [7:7] -unusedBit_11_8 = bits, U32, 1028, [8:8] -unusedBit_11_9 = bits, U32, 1028, [9:9] -unusedBit_11_10 = bits, U32, 1028, [10:10] -unusedBit_11_11 = bits, U32, 1028, [11:11] -unusedBit_11_12 = bits, U32, 1028, [12:12] -unusedBit_11_13 = bits, U32, 1028, [13:13] -unusedBit_11_14 = bits, U32, 1028, [14:14] -unusedBit_11_15 = bits, U32, 1028, [15:15] -unusedBit_11_16 = bits, U32, 1028, [16:16] -unusedBit_11_17 = bits, U32, 1028, [17:17] -unusedBit_11_18 = bits, U32, 1028, [18:18] -unusedBit_11_19 = bits, U32, 1028, [19:19] -unusedBit_11_20 = bits, U32, 1028, [20:20] -unusedBit_11_21 = bits, U32, 1028, [21:21] -unusedBit_11_22 = bits, U32, 1028, [22:22] -unusedBit_11_23 = bits, U32, 1028, [23:23] -unusedBit_11_24 = bits, U32, 1028, [24:24] -unusedBit_11_25 = bits, U32, 1028, [25:25] -unusedBit_11_26 = bits, U32, 1028, [26:26] -unusedBit_11_27 = bits, U32, 1028, [27:27] -unusedBit_11_28 = bits, U32, 1028, [28:28] -unusedBit_11_29 = bits, U32, 1028, [29:29] -unusedBit_11_30 = bits, U32, 1028, [30:30] -unusedBit_11_31 = bits, U32, 1028, [31:31] -fractionalInjFuel = scalar, F32, 1032, "", 1, 0 -accumulatedValue = scalar, F32, 1036, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1040, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1044, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1048, "", 1, 0 -cycleCnt = scalar, S32, 1052, "", 1, 0 -; total TS size = 1056 -hwEventCounters1 = scalar, S32, 1056, "", 1, 0 -hwEventCounters2 = scalar, S32, 1060, "", 1, 0 -hwEventCounters3 = scalar, S32, 1064, "", 1, 0 -hwEventCounters4 = scalar, S32, 1068, "", 1, 0 -hwEventCounters5 = scalar, S32, 1072, "", 1, 0 -hwEventCounters6 = scalar, S32, 1076, "", 1, 0 -vvtCamCounter = scalar, S32, 1080, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1084, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1088, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1092, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1093, "", 1, 0 -; total TS size = 1096 -totalRevolutionCounter = scalar, U32, 1096, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1100, "", 1, 0 -vvtCurrentPosition = scalar, F32, 1104, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1108, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 1112, "", 1, 0 -triggerStateIndex = scalar, U08, 1116, "", 1, 0 -vvtCounter = scalar, U08, 1117, "", 1, 0 -camResyncCounter = scalar, U08, 1118, "", 1, 0 -vvtStateIndex = scalar, U08, 1119, "", 1, 0 -; total TS size = 1120 -m_hasSynchronizedPhase = bits, U32, 1120, [0:0] -unusedBit_1_1 = bits, U32, 1120, [1:1] -unusedBit_1_2 = bits, U32, 1120, [2:2] -unusedBit_1_3 = bits, U32, 1120, [3:3] -unusedBit_1_4 = bits, U32, 1120, [4:4] -unusedBit_1_5 = bits, U32, 1120, [5:5] -unusedBit_1_6 = bits, U32, 1120, [6:6] -unusedBit_1_7 = bits, U32, 1120, [7:7] -unusedBit_1_8 = bits, U32, 1120, [8:8] -unusedBit_1_9 = bits, U32, 1120, [9:9] -unusedBit_1_10 = bits, U32, 1120, [10:10] -unusedBit_1_11 = bits, U32, 1120, [11:11] -unusedBit_1_12 = bits, U32, 1120, [12:12] -unusedBit_1_13 = bits, U32, 1120, [13:13] -unusedBit_1_14 = bits, U32, 1120, [14:14] -unusedBit_1_15 = bits, U32, 1120, [15:15] -unusedBit_1_16 = bits, U32, 1120, [16:16] -unusedBit_1_17 = bits, U32, 1120, [17:17] -unusedBit_1_18 = bits, U32, 1120, [18:18] -unusedBit_1_19 = bits, U32, 1120, [19:19] -unusedBit_1_20 = bits, U32, 1120, [20:20] -unusedBit_1_21 = bits, U32, 1120, [21:21] -unusedBit_1_22 = bits, U32, 1120, [22:22] -unusedBit_1_23 = bits, U32, 1120, [23:23] -unusedBit_1_24 = bits, U32, 1120, [24:24] -unusedBit_1_25 = bits, U32, 1120, [25:25] -unusedBit_1_26 = bits, U32, 1120, [26:26] -unusedBit_1_27 = bits, U32, 1120, [27:27] -unusedBit_1_28 = bits, U32, 1120, [28:28] -unusedBit_1_29 = bits, U32, 1120, [29:29] -unusedBit_1_30 = bits, U32, 1120, [30:30] -unusedBit_1_31 = bits, U32, 1120, [31:31] -; total TS size = 1124 -wallFuelCorrection = scalar, F32, 1124, "", 1, 0 -wallFuel = scalar, F32, 1128, "", 1, 0 +fuelInjectionCounter = scalar, S32, 1008, "", 1, 0 +sparkCounter = scalar, S32, 1012, "", 1, 0 +; total TS size = 1016 +tpsFrom = scalar, F32, 1016 +tpsTo = scalar, F32, 1020 +deltaTps = scalar, F32, 1024 +extraFuel = scalar, F32, 1028, "", 1, 0 +valueFromTable = scalar, F32, 1032, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1036, [0:0] +isBelowDecelThreshold = bits, U32, 1036, [1:1] +isTimeToResetAccumulator = bits, U32, 1036, [2:2] +isFractionalEnrichment = bits, U32, 1036, [3:3] +belowEpsilon = bits, U32, 1036, [4:4] +tooShort = bits, U32, 1036, [5:5] +unusedBit_11_6 = bits, U32, 1036, [6:6] +unusedBit_11_7 = bits, U32, 1036, [7:7] +unusedBit_11_8 = bits, U32, 1036, [8:8] +unusedBit_11_9 = bits, U32, 1036, [9:9] +unusedBit_11_10 = bits, U32, 1036, [10:10] +unusedBit_11_11 = bits, U32, 1036, [11:11] +unusedBit_11_12 = bits, U32, 1036, [12:12] +unusedBit_11_13 = bits, U32, 1036, [13:13] +unusedBit_11_14 = bits, U32, 1036, [14:14] +unusedBit_11_15 = bits, U32, 1036, [15:15] +unusedBit_11_16 = bits, U32, 1036, [16:16] +unusedBit_11_17 = bits, U32, 1036, [17:17] +unusedBit_11_18 = bits, U32, 1036, [18:18] +unusedBit_11_19 = bits, U32, 1036, [19:19] +unusedBit_11_20 = bits, U32, 1036, [20:20] +unusedBit_11_21 = bits, U32, 1036, [21:21] +unusedBit_11_22 = bits, U32, 1036, [22:22] +unusedBit_11_23 = bits, U32, 1036, [23:23] +unusedBit_11_24 = bits, U32, 1036, [24:24] +unusedBit_11_25 = bits, U32, 1036, [25:25] +unusedBit_11_26 = bits, U32, 1036, [26:26] +unusedBit_11_27 = bits, U32, 1036, [27:27] +unusedBit_11_28 = bits, U32, 1036, [28:28] +unusedBit_11_29 = bits, U32, 1036, [29:29] +unusedBit_11_30 = bits, U32, 1036, [30:30] +unusedBit_11_31 = bits, U32, 1036, [31:31] +fractionalInjFuel = scalar, F32, 1040, "", 1, 0 +accumulatedValue = scalar, F32, 1044, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1048, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1052, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1056, "", 1, 0 +cycleCnt = scalar, S32, 1060, "", 1, 0 +; total TS size = 1064 +hwEventCounters1 = scalar, S32, 1064, "", 1, 0 +hwEventCounters2 = scalar, S32, 1068, "", 1, 0 +hwEventCounters3 = scalar, S32, 1072, "", 1, 0 +hwEventCounters4 = scalar, S32, 1076, "", 1, 0 +hwEventCounters5 = scalar, S32, 1080, "", 1, 0 +hwEventCounters6 = scalar, S32, 1084, "", 1, 0 +vvtCamCounter = scalar, S32, 1088, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1092, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1096, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1100, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1101, "", 1, 0 +; total TS size = 1104 +totalRevolutionCounter = scalar, U32, 1104, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1108, "", 1, 0 +vvtCurrentPosition = scalar, F32, 1112, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1116, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 1120, "", 1, 0 +triggerStateIndex = scalar, U08, 1124, "", 1, 0 +vvtCounter = scalar, U08, 1125, "", 1, 0 +camResyncCounter = scalar, U08, 1126, "", 1, 0 +vvtStateIndex = scalar, U08, 1127, "", 1, 0 +; total TS size = 1128 +m_hasSynchronizedPhase = bits, U32, 1128, [0:0] +unusedBit_1_1 = bits, U32, 1128, [1:1] +unusedBit_1_2 = bits, U32, 1128, [2:2] +unusedBit_1_3 = bits, U32, 1128, [3:3] +unusedBit_1_4 = bits, U32, 1128, [4:4] +unusedBit_1_5 = bits, U32, 1128, [5:5] +unusedBit_1_6 = bits, U32, 1128, [6:6] +unusedBit_1_7 = bits, U32, 1128, [7:7] +unusedBit_1_8 = bits, U32, 1128, [8:8] +unusedBit_1_9 = bits, U32, 1128, [9:9] +unusedBit_1_10 = bits, U32, 1128, [10:10] +unusedBit_1_11 = bits, U32, 1128, [11:11] +unusedBit_1_12 = bits, U32, 1128, [12:12] +unusedBit_1_13 = bits, U32, 1128, [13:13] +unusedBit_1_14 = bits, U32, 1128, [14:14] +unusedBit_1_15 = bits, U32, 1128, [15:15] +unusedBit_1_16 = bits, U32, 1128, [16:16] +unusedBit_1_17 = bits, U32, 1128, [17:17] +unusedBit_1_18 = bits, U32, 1128, [18:18] +unusedBit_1_19 = bits, U32, 1128, [19:19] +unusedBit_1_20 = bits, U32, 1128, [20:20] +unusedBit_1_21 = bits, U32, 1128, [21:21] +unusedBit_1_22 = bits, U32, 1128, [22:22] +unusedBit_1_23 = bits, U32, 1128, [23:23] +unusedBit_1_24 = bits, U32, 1128, [24:24] +unusedBit_1_25 = bits, U32, 1128, [25:25] +unusedBit_1_26 = bits, U32, 1128, [26:26] +unusedBit_1_27 = bits, U32, 1128, [27:27] +unusedBit_1_28 = bits, U32, 1128, [28:28] +unusedBit_1_29 = bits, U32, 1128, [29:29] +unusedBit_1_30 = bits, U32, 1128, [30:30] +unusedBit_1_31 = bits, U32, 1128, [31:31] ; total TS size = 1132 -idleState = bits, S32, 1132, [0:2], "not important" -currentIdlePosition = scalar, F32, 1136 -baseIdlePosition = scalar, F32, 1140 -iacByTpsTaper = scalar, F32, 1144 -throttlePedalUpState = scalar, S32, 1148, "", 1, 0 -mightResetPid = bits, U32, 1152, [0:0] -shouldResetPid = bits, U32, 1152, [1:1] -wasResetPid = bits, U32, 1152, [2:2] -mustResetPid = bits, U32, 1152, [3:3] -isCoasting = bits, U32, 1152, [4:4] -useIacTableForCoasting = bits, U32, 1152, [5:5] -notIdling = bits, U32, 1152, [6:6] -needReset = bits, U32, 1152, [7:7] -isInDeadZone = bits, U32, 1152, [8:8] -isBlipping = bits, U32, 1152, [9:9] -useClosedLoop = bits, U32, 1152, [10:10] -badTps = bits, U32, 1152, [11:11] -looksLikeRunning = bits, U32, 1152, [12:12] -looksLikeCoasting = bits, U32, 1152, [13:13] -looksLikeCrankToIdle = bits, U32, 1152, [14:14] -useInstantRpmForIdle = bits, U32, 1152, [15:15] -isVerboseIAC = bits, U32, 1152, [16:16] -unusedBit_22_17 = bits, U32, 1152, [17:17] -unusedBit_22_18 = bits, U32, 1152, [18:18] -unusedBit_22_19 = bits, U32, 1152, [19:19] -unusedBit_22_20 = bits, U32, 1152, [20:20] -unusedBit_22_21 = bits, U32, 1152, [21:21] -unusedBit_22_22 = bits, U32, 1152, [22:22] -unusedBit_22_23 = bits, U32, 1152, [23:23] -unusedBit_22_24 = bits, U32, 1152, [24:24] -unusedBit_22_25 = bits, U32, 1152, [25:25] -unusedBit_22_26 = bits, U32, 1152, [26:26] -unusedBit_22_27 = bits, U32, 1152, [27:27] -unusedBit_22_28 = bits, U32, 1152, [28:28] -unusedBit_22_29 = bits, U32, 1152, [29:29] -unusedBit_22_30 = bits, U32, 1152, [30:30] -unusedBit_22_31 = bits, U32, 1152, [31:31] -targetRpmByClt = scalar, S32, 1156, "", 1, 0 -targetRpmAcBump = scalar, S32, 1160, "", 1, 0 -iacByRpmTaper = scalar, F32, 1164 -luaAdd = scalar, F32, 1168 -; total TS size = 1172 -baseDwell = scalar, F32, 1172, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 1176, "", 1, 0 -luaTimingAdd = scalar, F32, 1180, "", 1, 0 -luaTimingMult = scalar, F32, 1184, "", 1, 0 -; total TS size = 1188 -idlePosition = scalar, F32, 1188, "", 1, 0 -trim = scalar, F32, 1192, "", 1, 0 -luaAdjustment = scalar, F32, 1196, "", 1, 0 -etbFeedForward = scalar, F32, 1200 -etbIntegralError = scalar, F32, 1204, "", 1, 0 -etbCurrentTarget = scalar, F32, 1208, "%", 1, 0 -; total TS size = 1212 -faultCode = scalar, U08, 1212, "", 1, 0 -heaterDuty = scalar, U08, 1213, "%", 1, 0 -pumpDuty = scalar, U08, 1214, "%", 1, 0 -tempC = scalar, U16, 1216, "C", 1, 0 -nernstVoltage = scalar, U16, 1218, "V", 0.001, 0 -esr = scalar, U16, 1220, "", 1, 0 -; total TS size = 1224 +wallFuelCorrection = scalar, F32, 1132, "", 1, 0 +wallFuel = scalar, F32, 1136, "", 1, 0 +; total TS size = 1140 +idleState = bits, S32, 1140, [0:2], "not important" +currentIdlePosition = scalar, F32, 1144 +baseIdlePosition = scalar, F32, 1148 +iacByTpsTaper = scalar, F32, 1152 +throttlePedalUpState = scalar, S32, 1156, "", 1, 0 +mightResetPid = bits, U32, 1160, [0:0] +shouldResetPid = bits, U32, 1160, [1:1] +wasResetPid = bits, U32, 1160, [2:2] +mustResetPid = bits, U32, 1160, [3:3] +isCoasting = bits, U32, 1160, [4:4] +useIacTableForCoasting = bits, U32, 1160, [5:5] +notIdling = bits, U32, 1160, [6:6] +needReset = bits, U32, 1160, [7:7] +isInDeadZone = bits, U32, 1160, [8:8] +isBlipping = bits, U32, 1160, [9:9] +useClosedLoop = bits, U32, 1160, [10:10] +badTps = bits, U32, 1160, [11:11] +looksLikeRunning = bits, U32, 1160, [12:12] +looksLikeCoasting = bits, U32, 1160, [13:13] +looksLikeCrankToIdle = bits, U32, 1160, [14:14] +useInstantRpmForIdle = bits, U32, 1160, [15:15] +isVerboseIAC = bits, U32, 1160, [16:16] +unusedBit_22_17 = bits, U32, 1160, [17:17] +unusedBit_22_18 = bits, U32, 1160, [18:18] +unusedBit_22_19 = bits, U32, 1160, [19:19] +unusedBit_22_20 = bits, U32, 1160, [20:20] +unusedBit_22_21 = bits, U32, 1160, [21:21] +unusedBit_22_22 = bits, U32, 1160, [22:22] +unusedBit_22_23 = bits, U32, 1160, [23:23] +unusedBit_22_24 = bits, U32, 1160, [24:24] +unusedBit_22_25 = bits, U32, 1160, [25:25] +unusedBit_22_26 = bits, U32, 1160, [26:26] +unusedBit_22_27 = bits, U32, 1160, [27:27] +unusedBit_22_28 = bits, U32, 1160, [28:28] +unusedBit_22_29 = bits, U32, 1160, [29:29] +unusedBit_22_30 = bits, U32, 1160, [30:30] +unusedBit_22_31 = bits, U32, 1160, [31:31] +targetRpmByClt = scalar, S32, 1164, "", 1, 0 +targetRpmAcBump = scalar, S32, 1168, "", 1, 0 +iacByRpmTaper = scalar, F32, 1172 +luaAdd = scalar, F32, 1176 +; total TS size = 1180 +baseDwell = scalar, F32, 1180, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 1184, "", 1, 0 +luaTimingAdd = scalar, F32, 1188, "", 1, 0 +luaTimingMult = scalar, F32, 1192, "", 1, 0 +; total TS size = 1196 +idlePosition = scalar, F32, 1196, "", 1, 0 +trim = scalar, F32, 1200, "", 1, 0 +luaAdjustment = scalar, F32, 1204, "", 1, 0 +etbFeedForward = scalar, F32, 1208 +etbIntegralError = scalar, F32, 1212, "", 1, 0 +etbCurrentTarget = scalar, F32, 1216, "%", 1, 0 +; total TS size = 1220 +faultCode = scalar, U08, 1220, "", 1, 0 +heaterDuty = scalar, U08, 1221, "%", 1, 0 +pumpDuty = scalar, U08, 1222, "%", 1, 0 +tempC = scalar, U16, 1224, "C", 1, 0 +nernstVoltage = scalar, U16, 1226, "V", 0.001, 0 +esr = scalar, U16, 1228, "", 1, 0 +; total TS size = 1232 time = { timeNow } @@ -4757,6 +4759,8 @@ entry = brakePedalState, "brake: down", int, "%d" entry = egt1, "egt1", float, "%.3f" entry = egt2, "egt2", float, "%.3f" entry = desiredRpmLimit, "User-defined RPM hard limit", int, "%d" +entry = fuelInjectionCounter, "fuelInjectionCounter", int, "%d" +entry = sparkCounter, "sparkCounter", int, "%d" entry = tpsFrom, "tpsFrom", float, "%.3f" entry = tpsTo, "tpsTo", float, "%.3f" entry = deltaTps, "deltaTps", float, "%.3f" @@ -5499,6 +5503,8 @@ dialog = engine_stateDialog, "engine_state" graphLine = egt2 liveGraph = engine_state_10_Graph, "Graph", South graphLine = desiredRpmLimit + graphLine = fuelInjectionCounter + graphLine = sparkCounter indicatorPanel = tps_accel_stateIndicatorPanel, 2 indicator = {isAboveAccelThreshold}, "isAboveAccelThreshold No", "isAboveAccelThreshold Yes" diff --git a/firmware/tunerstudio/generated/rusefi_mre_f7.ini b/firmware/tunerstudio/generated/rusefi_mre_f7.ini index 6985239196..1c77a6faec 100644 --- a/firmware/tunerstudio/generated/rusefi_mre_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_mre_f7.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.08.25.mre_f7.3185330152" + signature = "rusEFI 2022.08.25.mre_f7.1302647708" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.08.25.mre_f7.3185330152" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.08.25.mre_f7.1302647708" ; 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 @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Aug 25 14:51:45 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Aug 25 22:50:31 UTC 2022 pageSize = 21300 page = 1 @@ -2109,7 +2109,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1224 + ochBlockSize = 1232 ; ; see TunerStudioOutputChannels struct @@ -3022,170 +3022,172 @@ unusedBit_22_31 = bits, U32, 992, [31:31] egt1 = scalar, F32, 996, "", 1, 0 egt2 = scalar, F32, 1000, "", 1, 0 desiredRpmLimit = scalar, S16, 1004, "rpm", 1, 0 -; total TS size = 1008 -tpsFrom = scalar, F32, 1008 -tpsTo = scalar, F32, 1012 -deltaTps = scalar, F32, 1016 -extraFuel = scalar, F32, 1020, "", 1, 0 -valueFromTable = scalar, F32, 1024, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1028, [0:0] -isBelowDecelThreshold = bits, U32, 1028, [1:1] -isTimeToResetAccumulator = bits, U32, 1028, [2:2] -isFractionalEnrichment = bits, U32, 1028, [3:3] -belowEpsilon = bits, U32, 1028, [4:4] -tooShort = bits, U32, 1028, [5:5] -unusedBit_11_6 = bits, U32, 1028, [6:6] -unusedBit_11_7 = bits, U32, 1028, [7:7] -unusedBit_11_8 = bits, U32, 1028, [8:8] -unusedBit_11_9 = bits, U32, 1028, [9:9] -unusedBit_11_10 = bits, U32, 1028, [10:10] -unusedBit_11_11 = bits, U32, 1028, [11:11] -unusedBit_11_12 = bits, U32, 1028, [12:12] -unusedBit_11_13 = bits, U32, 1028, [13:13] -unusedBit_11_14 = bits, U32, 1028, [14:14] -unusedBit_11_15 = bits, U32, 1028, [15:15] -unusedBit_11_16 = bits, U32, 1028, [16:16] -unusedBit_11_17 = bits, U32, 1028, [17:17] -unusedBit_11_18 = bits, U32, 1028, [18:18] -unusedBit_11_19 = bits, U32, 1028, [19:19] -unusedBit_11_20 = bits, U32, 1028, [20:20] -unusedBit_11_21 = bits, U32, 1028, [21:21] -unusedBit_11_22 = bits, U32, 1028, [22:22] -unusedBit_11_23 = bits, U32, 1028, [23:23] -unusedBit_11_24 = bits, U32, 1028, [24:24] -unusedBit_11_25 = bits, U32, 1028, [25:25] -unusedBit_11_26 = bits, U32, 1028, [26:26] -unusedBit_11_27 = bits, U32, 1028, [27:27] -unusedBit_11_28 = bits, U32, 1028, [28:28] -unusedBit_11_29 = bits, U32, 1028, [29:29] -unusedBit_11_30 = bits, U32, 1028, [30:30] -unusedBit_11_31 = bits, U32, 1028, [31:31] -fractionalInjFuel = scalar, F32, 1032, "", 1, 0 -accumulatedValue = scalar, F32, 1036, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1040, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1044, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1048, "", 1, 0 -cycleCnt = scalar, S32, 1052, "", 1, 0 -; total TS size = 1056 -hwEventCounters1 = scalar, S32, 1056, "", 1, 0 -hwEventCounters2 = scalar, S32, 1060, "", 1, 0 -hwEventCounters3 = scalar, S32, 1064, "", 1, 0 -hwEventCounters4 = scalar, S32, 1068, "", 1, 0 -hwEventCounters5 = scalar, S32, 1072, "", 1, 0 -hwEventCounters6 = scalar, S32, 1076, "", 1, 0 -vvtCamCounter = scalar, S32, 1080, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1084, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1088, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1092, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1093, "", 1, 0 -; total TS size = 1096 -totalRevolutionCounter = scalar, U32, 1096, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1100, "", 1, 0 -vvtCurrentPosition = scalar, F32, 1104, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1108, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 1112, "", 1, 0 -triggerStateIndex = scalar, U08, 1116, "", 1, 0 -vvtCounter = scalar, U08, 1117, "", 1, 0 -camResyncCounter = scalar, U08, 1118, "", 1, 0 -vvtStateIndex = scalar, U08, 1119, "", 1, 0 -; total TS size = 1120 -m_hasSynchronizedPhase = bits, U32, 1120, [0:0] -unusedBit_1_1 = bits, U32, 1120, [1:1] -unusedBit_1_2 = bits, U32, 1120, [2:2] -unusedBit_1_3 = bits, U32, 1120, [3:3] -unusedBit_1_4 = bits, U32, 1120, [4:4] -unusedBit_1_5 = bits, U32, 1120, [5:5] -unusedBit_1_6 = bits, U32, 1120, [6:6] -unusedBit_1_7 = bits, U32, 1120, [7:7] -unusedBit_1_8 = bits, U32, 1120, [8:8] -unusedBit_1_9 = bits, U32, 1120, [9:9] -unusedBit_1_10 = bits, U32, 1120, [10:10] -unusedBit_1_11 = bits, U32, 1120, [11:11] -unusedBit_1_12 = bits, U32, 1120, [12:12] -unusedBit_1_13 = bits, U32, 1120, [13:13] -unusedBit_1_14 = bits, U32, 1120, [14:14] -unusedBit_1_15 = bits, U32, 1120, [15:15] -unusedBit_1_16 = bits, U32, 1120, [16:16] -unusedBit_1_17 = bits, U32, 1120, [17:17] -unusedBit_1_18 = bits, U32, 1120, [18:18] -unusedBit_1_19 = bits, U32, 1120, [19:19] -unusedBit_1_20 = bits, U32, 1120, [20:20] -unusedBit_1_21 = bits, U32, 1120, [21:21] -unusedBit_1_22 = bits, U32, 1120, [22:22] -unusedBit_1_23 = bits, U32, 1120, [23:23] -unusedBit_1_24 = bits, U32, 1120, [24:24] -unusedBit_1_25 = bits, U32, 1120, [25:25] -unusedBit_1_26 = bits, U32, 1120, [26:26] -unusedBit_1_27 = bits, U32, 1120, [27:27] -unusedBit_1_28 = bits, U32, 1120, [28:28] -unusedBit_1_29 = bits, U32, 1120, [29:29] -unusedBit_1_30 = bits, U32, 1120, [30:30] -unusedBit_1_31 = bits, U32, 1120, [31:31] -; total TS size = 1124 -wallFuelCorrection = scalar, F32, 1124, "", 1, 0 -wallFuel = scalar, F32, 1128, "", 1, 0 +fuelInjectionCounter = scalar, S32, 1008, "", 1, 0 +sparkCounter = scalar, S32, 1012, "", 1, 0 +; total TS size = 1016 +tpsFrom = scalar, F32, 1016 +tpsTo = scalar, F32, 1020 +deltaTps = scalar, F32, 1024 +extraFuel = scalar, F32, 1028, "", 1, 0 +valueFromTable = scalar, F32, 1032, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1036, [0:0] +isBelowDecelThreshold = bits, U32, 1036, [1:1] +isTimeToResetAccumulator = bits, U32, 1036, [2:2] +isFractionalEnrichment = bits, U32, 1036, [3:3] +belowEpsilon = bits, U32, 1036, [4:4] +tooShort = bits, U32, 1036, [5:5] +unusedBit_11_6 = bits, U32, 1036, [6:6] +unusedBit_11_7 = bits, U32, 1036, [7:7] +unusedBit_11_8 = bits, U32, 1036, [8:8] +unusedBit_11_9 = bits, U32, 1036, [9:9] +unusedBit_11_10 = bits, U32, 1036, [10:10] +unusedBit_11_11 = bits, U32, 1036, [11:11] +unusedBit_11_12 = bits, U32, 1036, [12:12] +unusedBit_11_13 = bits, U32, 1036, [13:13] +unusedBit_11_14 = bits, U32, 1036, [14:14] +unusedBit_11_15 = bits, U32, 1036, [15:15] +unusedBit_11_16 = bits, U32, 1036, [16:16] +unusedBit_11_17 = bits, U32, 1036, [17:17] +unusedBit_11_18 = bits, U32, 1036, [18:18] +unusedBit_11_19 = bits, U32, 1036, [19:19] +unusedBit_11_20 = bits, U32, 1036, [20:20] +unusedBit_11_21 = bits, U32, 1036, [21:21] +unusedBit_11_22 = bits, U32, 1036, [22:22] +unusedBit_11_23 = bits, U32, 1036, [23:23] +unusedBit_11_24 = bits, U32, 1036, [24:24] +unusedBit_11_25 = bits, U32, 1036, [25:25] +unusedBit_11_26 = bits, U32, 1036, [26:26] +unusedBit_11_27 = bits, U32, 1036, [27:27] +unusedBit_11_28 = bits, U32, 1036, [28:28] +unusedBit_11_29 = bits, U32, 1036, [29:29] +unusedBit_11_30 = bits, U32, 1036, [30:30] +unusedBit_11_31 = bits, U32, 1036, [31:31] +fractionalInjFuel = scalar, F32, 1040, "", 1, 0 +accumulatedValue = scalar, F32, 1044, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1048, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1052, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1056, "", 1, 0 +cycleCnt = scalar, S32, 1060, "", 1, 0 +; total TS size = 1064 +hwEventCounters1 = scalar, S32, 1064, "", 1, 0 +hwEventCounters2 = scalar, S32, 1068, "", 1, 0 +hwEventCounters3 = scalar, S32, 1072, "", 1, 0 +hwEventCounters4 = scalar, S32, 1076, "", 1, 0 +hwEventCounters5 = scalar, S32, 1080, "", 1, 0 +hwEventCounters6 = scalar, S32, 1084, "", 1, 0 +vvtCamCounter = scalar, S32, 1088, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1092, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1096, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1100, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1101, "", 1, 0 +; total TS size = 1104 +totalRevolutionCounter = scalar, U32, 1104, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1108, "", 1, 0 +vvtCurrentPosition = scalar, F32, 1112, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1116, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 1120, "", 1, 0 +triggerStateIndex = scalar, U08, 1124, "", 1, 0 +vvtCounter = scalar, U08, 1125, "", 1, 0 +camResyncCounter = scalar, U08, 1126, "", 1, 0 +vvtStateIndex = scalar, U08, 1127, "", 1, 0 +; total TS size = 1128 +m_hasSynchronizedPhase = bits, U32, 1128, [0:0] +unusedBit_1_1 = bits, U32, 1128, [1:1] +unusedBit_1_2 = bits, U32, 1128, [2:2] +unusedBit_1_3 = bits, U32, 1128, [3:3] +unusedBit_1_4 = bits, U32, 1128, [4:4] +unusedBit_1_5 = bits, U32, 1128, [5:5] +unusedBit_1_6 = bits, U32, 1128, [6:6] +unusedBit_1_7 = bits, U32, 1128, [7:7] +unusedBit_1_8 = bits, U32, 1128, [8:8] +unusedBit_1_9 = bits, U32, 1128, [9:9] +unusedBit_1_10 = bits, U32, 1128, [10:10] +unusedBit_1_11 = bits, U32, 1128, [11:11] +unusedBit_1_12 = bits, U32, 1128, [12:12] +unusedBit_1_13 = bits, U32, 1128, [13:13] +unusedBit_1_14 = bits, U32, 1128, [14:14] +unusedBit_1_15 = bits, U32, 1128, [15:15] +unusedBit_1_16 = bits, U32, 1128, [16:16] +unusedBit_1_17 = bits, U32, 1128, [17:17] +unusedBit_1_18 = bits, U32, 1128, [18:18] +unusedBit_1_19 = bits, U32, 1128, [19:19] +unusedBit_1_20 = bits, U32, 1128, [20:20] +unusedBit_1_21 = bits, U32, 1128, [21:21] +unusedBit_1_22 = bits, U32, 1128, [22:22] +unusedBit_1_23 = bits, U32, 1128, [23:23] +unusedBit_1_24 = bits, U32, 1128, [24:24] +unusedBit_1_25 = bits, U32, 1128, [25:25] +unusedBit_1_26 = bits, U32, 1128, [26:26] +unusedBit_1_27 = bits, U32, 1128, [27:27] +unusedBit_1_28 = bits, U32, 1128, [28:28] +unusedBit_1_29 = bits, U32, 1128, [29:29] +unusedBit_1_30 = bits, U32, 1128, [30:30] +unusedBit_1_31 = bits, U32, 1128, [31:31] ; total TS size = 1132 -idleState = bits, S32, 1132, [0:2], "not important" -currentIdlePosition = scalar, F32, 1136 -baseIdlePosition = scalar, F32, 1140 -iacByTpsTaper = scalar, F32, 1144 -throttlePedalUpState = scalar, S32, 1148, "", 1, 0 -mightResetPid = bits, U32, 1152, [0:0] -shouldResetPid = bits, U32, 1152, [1:1] -wasResetPid = bits, U32, 1152, [2:2] -mustResetPid = bits, U32, 1152, [3:3] -isCoasting = bits, U32, 1152, [4:4] -useIacTableForCoasting = bits, U32, 1152, [5:5] -notIdling = bits, U32, 1152, [6:6] -needReset = bits, U32, 1152, [7:7] -isInDeadZone = bits, U32, 1152, [8:8] -isBlipping = bits, U32, 1152, [9:9] -useClosedLoop = bits, U32, 1152, [10:10] -badTps = bits, U32, 1152, [11:11] -looksLikeRunning = bits, U32, 1152, [12:12] -looksLikeCoasting = bits, U32, 1152, [13:13] -looksLikeCrankToIdle = bits, U32, 1152, [14:14] -useInstantRpmForIdle = bits, U32, 1152, [15:15] -isVerboseIAC = bits, U32, 1152, [16:16] -unusedBit_22_17 = bits, U32, 1152, [17:17] -unusedBit_22_18 = bits, U32, 1152, [18:18] -unusedBit_22_19 = bits, U32, 1152, [19:19] -unusedBit_22_20 = bits, U32, 1152, [20:20] -unusedBit_22_21 = bits, U32, 1152, [21:21] -unusedBit_22_22 = bits, U32, 1152, [22:22] -unusedBit_22_23 = bits, U32, 1152, [23:23] -unusedBit_22_24 = bits, U32, 1152, [24:24] -unusedBit_22_25 = bits, U32, 1152, [25:25] -unusedBit_22_26 = bits, U32, 1152, [26:26] -unusedBit_22_27 = bits, U32, 1152, [27:27] -unusedBit_22_28 = bits, U32, 1152, [28:28] -unusedBit_22_29 = bits, U32, 1152, [29:29] -unusedBit_22_30 = bits, U32, 1152, [30:30] -unusedBit_22_31 = bits, U32, 1152, [31:31] -targetRpmByClt = scalar, S32, 1156, "", 1, 0 -targetRpmAcBump = scalar, S32, 1160, "", 1, 0 -iacByRpmTaper = scalar, F32, 1164 -luaAdd = scalar, F32, 1168 -; total TS size = 1172 -baseDwell = scalar, F32, 1172, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 1176, "", 1, 0 -luaTimingAdd = scalar, F32, 1180, "", 1, 0 -luaTimingMult = scalar, F32, 1184, "", 1, 0 -; total TS size = 1188 -idlePosition = scalar, F32, 1188, "", 1, 0 -trim = scalar, F32, 1192, "", 1, 0 -luaAdjustment = scalar, F32, 1196, "", 1, 0 -etbFeedForward = scalar, F32, 1200 -etbIntegralError = scalar, F32, 1204, "", 1, 0 -etbCurrentTarget = scalar, F32, 1208, "%", 1, 0 -; total TS size = 1212 -faultCode = scalar, U08, 1212, "", 1, 0 -heaterDuty = scalar, U08, 1213, "%", 1, 0 -pumpDuty = scalar, U08, 1214, "%", 1, 0 -tempC = scalar, U16, 1216, "C", 1, 0 -nernstVoltage = scalar, U16, 1218, "V", 0.001, 0 -esr = scalar, U16, 1220, "", 1, 0 -; total TS size = 1224 +wallFuelCorrection = scalar, F32, 1132, "", 1, 0 +wallFuel = scalar, F32, 1136, "", 1, 0 +; total TS size = 1140 +idleState = bits, S32, 1140, [0:2], "not important" +currentIdlePosition = scalar, F32, 1144 +baseIdlePosition = scalar, F32, 1148 +iacByTpsTaper = scalar, F32, 1152 +throttlePedalUpState = scalar, S32, 1156, "", 1, 0 +mightResetPid = bits, U32, 1160, [0:0] +shouldResetPid = bits, U32, 1160, [1:1] +wasResetPid = bits, U32, 1160, [2:2] +mustResetPid = bits, U32, 1160, [3:3] +isCoasting = bits, U32, 1160, [4:4] +useIacTableForCoasting = bits, U32, 1160, [5:5] +notIdling = bits, U32, 1160, [6:6] +needReset = bits, U32, 1160, [7:7] +isInDeadZone = bits, U32, 1160, [8:8] +isBlipping = bits, U32, 1160, [9:9] +useClosedLoop = bits, U32, 1160, [10:10] +badTps = bits, U32, 1160, [11:11] +looksLikeRunning = bits, U32, 1160, [12:12] +looksLikeCoasting = bits, U32, 1160, [13:13] +looksLikeCrankToIdle = bits, U32, 1160, [14:14] +useInstantRpmForIdle = bits, U32, 1160, [15:15] +isVerboseIAC = bits, U32, 1160, [16:16] +unusedBit_22_17 = bits, U32, 1160, [17:17] +unusedBit_22_18 = bits, U32, 1160, [18:18] +unusedBit_22_19 = bits, U32, 1160, [19:19] +unusedBit_22_20 = bits, U32, 1160, [20:20] +unusedBit_22_21 = bits, U32, 1160, [21:21] +unusedBit_22_22 = bits, U32, 1160, [22:22] +unusedBit_22_23 = bits, U32, 1160, [23:23] +unusedBit_22_24 = bits, U32, 1160, [24:24] +unusedBit_22_25 = bits, U32, 1160, [25:25] +unusedBit_22_26 = bits, U32, 1160, [26:26] +unusedBit_22_27 = bits, U32, 1160, [27:27] +unusedBit_22_28 = bits, U32, 1160, [28:28] +unusedBit_22_29 = bits, U32, 1160, [29:29] +unusedBit_22_30 = bits, U32, 1160, [30:30] +unusedBit_22_31 = bits, U32, 1160, [31:31] +targetRpmByClt = scalar, S32, 1164, "", 1, 0 +targetRpmAcBump = scalar, S32, 1168, "", 1, 0 +iacByRpmTaper = scalar, F32, 1172 +luaAdd = scalar, F32, 1176 +; total TS size = 1180 +baseDwell = scalar, F32, 1180, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 1184, "", 1, 0 +luaTimingAdd = scalar, F32, 1188, "", 1, 0 +luaTimingMult = scalar, F32, 1192, "", 1, 0 +; total TS size = 1196 +idlePosition = scalar, F32, 1196, "", 1, 0 +trim = scalar, F32, 1200, "", 1, 0 +luaAdjustment = scalar, F32, 1204, "", 1, 0 +etbFeedForward = scalar, F32, 1208 +etbIntegralError = scalar, F32, 1212, "", 1, 0 +etbCurrentTarget = scalar, F32, 1216, "%", 1, 0 +; total TS size = 1220 +faultCode = scalar, U08, 1220, "", 1, 0 +heaterDuty = scalar, U08, 1221, "%", 1, 0 +pumpDuty = scalar, U08, 1222, "%", 1, 0 +tempC = scalar, U16, 1224, "C", 1, 0 +nernstVoltage = scalar, U16, 1226, "V", 0.001, 0 +esr = scalar, U16, 1228, "", 1, 0 +; total TS size = 1232 time = { timeNow } @@ -4757,6 +4759,8 @@ entry = brakePedalState, "brake: down", int, "%d" entry = egt1, "egt1", float, "%.3f" entry = egt2, "egt2", float, "%.3f" entry = desiredRpmLimit, "User-defined RPM hard limit", int, "%d" +entry = fuelInjectionCounter, "fuelInjectionCounter", int, "%d" +entry = sparkCounter, "sparkCounter", int, "%d" entry = tpsFrom, "tpsFrom", float, "%.3f" entry = tpsTo, "tpsTo", float, "%.3f" entry = deltaTps, "deltaTps", float, "%.3f" @@ -5499,6 +5503,8 @@ dialog = engine_stateDialog, "engine_state" graphLine = egt2 liveGraph = engine_state_10_Graph, "Graph", South graphLine = desiredRpmLimit + graphLine = fuelInjectionCounter + graphLine = sparkCounter indicatorPanel = tps_accel_stateIndicatorPanel, 2 indicator = {isAboveAccelThreshold}, "isAboveAccelThreshold No", "isAboveAccelThreshold Yes" diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_405.ini b/firmware/tunerstudio/generated/rusefi_prometheus_405.ini index eab69e3f17..bbd52a4478 100644 --- a/firmware/tunerstudio/generated/rusefi_prometheus_405.ini +++ b/firmware/tunerstudio/generated/rusefi_prometheus_405.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.08.25.prometheus_405.585110264" + signature = "rusEFI 2022.08.25.prometheus_405.3533211276" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.08.25.prometheus_405.585110264" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.08.25.prometheus_405.3533211276" ; 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 @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Aug 25 14:51:58 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Aug 25 22:50:42 UTC 2022 pageSize = 21300 page = 1 @@ -2109,7 +2109,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1224 + ochBlockSize = 1232 ; ; see TunerStudioOutputChannels struct @@ -3022,170 +3022,172 @@ unusedBit_22_31 = bits, U32, 992, [31:31] egt1 = scalar, F32, 996, "", 1, 0 egt2 = scalar, F32, 1000, "", 1, 0 desiredRpmLimit = scalar, S16, 1004, "rpm", 1, 0 -; total TS size = 1008 -tpsFrom = scalar, F32, 1008 -tpsTo = scalar, F32, 1012 -deltaTps = scalar, F32, 1016 -extraFuel = scalar, F32, 1020, "", 1, 0 -valueFromTable = scalar, F32, 1024, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1028, [0:0] -isBelowDecelThreshold = bits, U32, 1028, [1:1] -isTimeToResetAccumulator = bits, U32, 1028, [2:2] -isFractionalEnrichment = bits, U32, 1028, [3:3] -belowEpsilon = bits, U32, 1028, [4:4] -tooShort = bits, U32, 1028, [5:5] -unusedBit_11_6 = bits, U32, 1028, [6:6] -unusedBit_11_7 = bits, U32, 1028, [7:7] -unusedBit_11_8 = bits, U32, 1028, [8:8] -unusedBit_11_9 = bits, U32, 1028, [9:9] -unusedBit_11_10 = bits, U32, 1028, [10:10] -unusedBit_11_11 = bits, U32, 1028, [11:11] -unusedBit_11_12 = bits, U32, 1028, [12:12] -unusedBit_11_13 = bits, U32, 1028, [13:13] -unusedBit_11_14 = bits, U32, 1028, [14:14] -unusedBit_11_15 = bits, U32, 1028, [15:15] -unusedBit_11_16 = bits, U32, 1028, [16:16] -unusedBit_11_17 = bits, U32, 1028, [17:17] -unusedBit_11_18 = bits, U32, 1028, [18:18] -unusedBit_11_19 = bits, U32, 1028, [19:19] -unusedBit_11_20 = bits, U32, 1028, [20:20] -unusedBit_11_21 = bits, U32, 1028, [21:21] -unusedBit_11_22 = bits, U32, 1028, [22:22] -unusedBit_11_23 = bits, U32, 1028, [23:23] -unusedBit_11_24 = bits, U32, 1028, [24:24] -unusedBit_11_25 = bits, U32, 1028, [25:25] -unusedBit_11_26 = bits, U32, 1028, [26:26] -unusedBit_11_27 = bits, U32, 1028, [27:27] -unusedBit_11_28 = bits, U32, 1028, [28:28] -unusedBit_11_29 = bits, U32, 1028, [29:29] -unusedBit_11_30 = bits, U32, 1028, [30:30] -unusedBit_11_31 = bits, U32, 1028, [31:31] -fractionalInjFuel = scalar, F32, 1032, "", 1, 0 -accumulatedValue = scalar, F32, 1036, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1040, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1044, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1048, "", 1, 0 -cycleCnt = scalar, S32, 1052, "", 1, 0 -; total TS size = 1056 -hwEventCounters1 = scalar, S32, 1056, "", 1, 0 -hwEventCounters2 = scalar, S32, 1060, "", 1, 0 -hwEventCounters3 = scalar, S32, 1064, "", 1, 0 -hwEventCounters4 = scalar, S32, 1068, "", 1, 0 -hwEventCounters5 = scalar, S32, 1072, "", 1, 0 -hwEventCounters6 = scalar, S32, 1076, "", 1, 0 -vvtCamCounter = scalar, S32, 1080, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1084, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1088, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1092, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1093, "", 1, 0 -; total TS size = 1096 -totalRevolutionCounter = scalar, U32, 1096, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1100, "", 1, 0 -vvtCurrentPosition = scalar, F32, 1104, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1108, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 1112, "", 1, 0 -triggerStateIndex = scalar, U08, 1116, "", 1, 0 -vvtCounter = scalar, U08, 1117, "", 1, 0 -camResyncCounter = scalar, U08, 1118, "", 1, 0 -vvtStateIndex = scalar, U08, 1119, "", 1, 0 -; total TS size = 1120 -m_hasSynchronizedPhase = bits, U32, 1120, [0:0] -unusedBit_1_1 = bits, U32, 1120, [1:1] -unusedBit_1_2 = bits, U32, 1120, [2:2] -unusedBit_1_3 = bits, U32, 1120, [3:3] -unusedBit_1_4 = bits, U32, 1120, [4:4] -unusedBit_1_5 = bits, U32, 1120, [5:5] -unusedBit_1_6 = bits, U32, 1120, [6:6] -unusedBit_1_7 = bits, U32, 1120, [7:7] -unusedBit_1_8 = bits, U32, 1120, [8:8] -unusedBit_1_9 = bits, U32, 1120, [9:9] -unusedBit_1_10 = bits, U32, 1120, [10:10] -unusedBit_1_11 = bits, U32, 1120, [11:11] -unusedBit_1_12 = bits, U32, 1120, [12:12] -unusedBit_1_13 = bits, U32, 1120, [13:13] -unusedBit_1_14 = bits, U32, 1120, [14:14] -unusedBit_1_15 = bits, U32, 1120, [15:15] -unusedBit_1_16 = bits, U32, 1120, [16:16] -unusedBit_1_17 = bits, U32, 1120, [17:17] -unusedBit_1_18 = bits, U32, 1120, [18:18] -unusedBit_1_19 = bits, U32, 1120, [19:19] -unusedBit_1_20 = bits, U32, 1120, [20:20] -unusedBit_1_21 = bits, U32, 1120, [21:21] -unusedBit_1_22 = bits, U32, 1120, [22:22] -unusedBit_1_23 = bits, U32, 1120, [23:23] -unusedBit_1_24 = bits, U32, 1120, [24:24] -unusedBit_1_25 = bits, U32, 1120, [25:25] -unusedBit_1_26 = bits, U32, 1120, [26:26] -unusedBit_1_27 = bits, U32, 1120, [27:27] -unusedBit_1_28 = bits, U32, 1120, [28:28] -unusedBit_1_29 = bits, U32, 1120, [29:29] -unusedBit_1_30 = bits, U32, 1120, [30:30] -unusedBit_1_31 = bits, U32, 1120, [31:31] -; total TS size = 1124 -wallFuelCorrection = scalar, F32, 1124, "", 1, 0 -wallFuel = scalar, F32, 1128, "", 1, 0 +fuelInjectionCounter = scalar, S32, 1008, "", 1, 0 +sparkCounter = scalar, S32, 1012, "", 1, 0 +; total TS size = 1016 +tpsFrom = scalar, F32, 1016 +tpsTo = scalar, F32, 1020 +deltaTps = scalar, F32, 1024 +extraFuel = scalar, F32, 1028, "", 1, 0 +valueFromTable = scalar, F32, 1032, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1036, [0:0] +isBelowDecelThreshold = bits, U32, 1036, [1:1] +isTimeToResetAccumulator = bits, U32, 1036, [2:2] +isFractionalEnrichment = bits, U32, 1036, [3:3] +belowEpsilon = bits, U32, 1036, [4:4] +tooShort = bits, U32, 1036, [5:5] +unusedBit_11_6 = bits, U32, 1036, [6:6] +unusedBit_11_7 = bits, U32, 1036, [7:7] +unusedBit_11_8 = bits, U32, 1036, [8:8] +unusedBit_11_9 = bits, U32, 1036, [9:9] +unusedBit_11_10 = bits, U32, 1036, [10:10] +unusedBit_11_11 = bits, U32, 1036, [11:11] +unusedBit_11_12 = bits, U32, 1036, [12:12] +unusedBit_11_13 = bits, U32, 1036, [13:13] +unusedBit_11_14 = bits, U32, 1036, [14:14] +unusedBit_11_15 = bits, U32, 1036, [15:15] +unusedBit_11_16 = bits, U32, 1036, [16:16] +unusedBit_11_17 = bits, U32, 1036, [17:17] +unusedBit_11_18 = bits, U32, 1036, [18:18] +unusedBit_11_19 = bits, U32, 1036, [19:19] +unusedBit_11_20 = bits, U32, 1036, [20:20] +unusedBit_11_21 = bits, U32, 1036, [21:21] +unusedBit_11_22 = bits, U32, 1036, [22:22] +unusedBit_11_23 = bits, U32, 1036, [23:23] +unusedBit_11_24 = bits, U32, 1036, [24:24] +unusedBit_11_25 = bits, U32, 1036, [25:25] +unusedBit_11_26 = bits, U32, 1036, [26:26] +unusedBit_11_27 = bits, U32, 1036, [27:27] +unusedBit_11_28 = bits, U32, 1036, [28:28] +unusedBit_11_29 = bits, U32, 1036, [29:29] +unusedBit_11_30 = bits, U32, 1036, [30:30] +unusedBit_11_31 = bits, U32, 1036, [31:31] +fractionalInjFuel = scalar, F32, 1040, "", 1, 0 +accumulatedValue = scalar, F32, 1044, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1048, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1052, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1056, "", 1, 0 +cycleCnt = scalar, S32, 1060, "", 1, 0 +; total TS size = 1064 +hwEventCounters1 = scalar, S32, 1064, "", 1, 0 +hwEventCounters2 = scalar, S32, 1068, "", 1, 0 +hwEventCounters3 = scalar, S32, 1072, "", 1, 0 +hwEventCounters4 = scalar, S32, 1076, "", 1, 0 +hwEventCounters5 = scalar, S32, 1080, "", 1, 0 +hwEventCounters6 = scalar, S32, 1084, "", 1, 0 +vvtCamCounter = scalar, S32, 1088, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1092, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1096, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1100, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1101, "", 1, 0 +; total TS size = 1104 +totalRevolutionCounter = scalar, U32, 1104, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1108, "", 1, 0 +vvtCurrentPosition = scalar, F32, 1112, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1116, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 1120, "", 1, 0 +triggerStateIndex = scalar, U08, 1124, "", 1, 0 +vvtCounter = scalar, U08, 1125, "", 1, 0 +camResyncCounter = scalar, U08, 1126, "", 1, 0 +vvtStateIndex = scalar, U08, 1127, "", 1, 0 +; total TS size = 1128 +m_hasSynchronizedPhase = bits, U32, 1128, [0:0] +unusedBit_1_1 = bits, U32, 1128, [1:1] +unusedBit_1_2 = bits, U32, 1128, [2:2] +unusedBit_1_3 = bits, U32, 1128, [3:3] +unusedBit_1_4 = bits, U32, 1128, [4:4] +unusedBit_1_5 = bits, U32, 1128, [5:5] +unusedBit_1_6 = bits, U32, 1128, [6:6] +unusedBit_1_7 = bits, U32, 1128, [7:7] +unusedBit_1_8 = bits, U32, 1128, [8:8] +unusedBit_1_9 = bits, U32, 1128, [9:9] +unusedBit_1_10 = bits, U32, 1128, [10:10] +unusedBit_1_11 = bits, U32, 1128, [11:11] +unusedBit_1_12 = bits, U32, 1128, [12:12] +unusedBit_1_13 = bits, U32, 1128, [13:13] +unusedBit_1_14 = bits, U32, 1128, [14:14] +unusedBit_1_15 = bits, U32, 1128, [15:15] +unusedBit_1_16 = bits, U32, 1128, [16:16] +unusedBit_1_17 = bits, U32, 1128, [17:17] +unusedBit_1_18 = bits, U32, 1128, [18:18] +unusedBit_1_19 = bits, U32, 1128, [19:19] +unusedBit_1_20 = bits, U32, 1128, [20:20] +unusedBit_1_21 = bits, U32, 1128, [21:21] +unusedBit_1_22 = bits, U32, 1128, [22:22] +unusedBit_1_23 = bits, U32, 1128, [23:23] +unusedBit_1_24 = bits, U32, 1128, [24:24] +unusedBit_1_25 = bits, U32, 1128, [25:25] +unusedBit_1_26 = bits, U32, 1128, [26:26] +unusedBit_1_27 = bits, U32, 1128, [27:27] +unusedBit_1_28 = bits, U32, 1128, [28:28] +unusedBit_1_29 = bits, U32, 1128, [29:29] +unusedBit_1_30 = bits, U32, 1128, [30:30] +unusedBit_1_31 = bits, U32, 1128, [31:31] ; total TS size = 1132 -idleState = bits, S32, 1132, [0:2], "not important" -currentIdlePosition = scalar, F32, 1136 -baseIdlePosition = scalar, F32, 1140 -iacByTpsTaper = scalar, F32, 1144 -throttlePedalUpState = scalar, S32, 1148, "", 1, 0 -mightResetPid = bits, U32, 1152, [0:0] -shouldResetPid = bits, U32, 1152, [1:1] -wasResetPid = bits, U32, 1152, [2:2] -mustResetPid = bits, U32, 1152, [3:3] -isCoasting = bits, U32, 1152, [4:4] -useIacTableForCoasting = bits, U32, 1152, [5:5] -notIdling = bits, U32, 1152, [6:6] -needReset = bits, U32, 1152, [7:7] -isInDeadZone = bits, U32, 1152, [8:8] -isBlipping = bits, U32, 1152, [9:9] -useClosedLoop = bits, U32, 1152, [10:10] -badTps = bits, U32, 1152, [11:11] -looksLikeRunning = bits, U32, 1152, [12:12] -looksLikeCoasting = bits, U32, 1152, [13:13] -looksLikeCrankToIdle = bits, U32, 1152, [14:14] -useInstantRpmForIdle = bits, U32, 1152, [15:15] -isVerboseIAC = bits, U32, 1152, [16:16] -unusedBit_22_17 = bits, U32, 1152, [17:17] -unusedBit_22_18 = bits, U32, 1152, [18:18] -unusedBit_22_19 = bits, U32, 1152, [19:19] -unusedBit_22_20 = bits, U32, 1152, [20:20] -unusedBit_22_21 = bits, U32, 1152, [21:21] -unusedBit_22_22 = bits, U32, 1152, [22:22] -unusedBit_22_23 = bits, U32, 1152, [23:23] -unusedBit_22_24 = bits, U32, 1152, [24:24] -unusedBit_22_25 = bits, U32, 1152, [25:25] -unusedBit_22_26 = bits, U32, 1152, [26:26] -unusedBit_22_27 = bits, U32, 1152, [27:27] -unusedBit_22_28 = bits, U32, 1152, [28:28] -unusedBit_22_29 = bits, U32, 1152, [29:29] -unusedBit_22_30 = bits, U32, 1152, [30:30] -unusedBit_22_31 = bits, U32, 1152, [31:31] -targetRpmByClt = scalar, S32, 1156, "", 1, 0 -targetRpmAcBump = scalar, S32, 1160, "", 1, 0 -iacByRpmTaper = scalar, F32, 1164 -luaAdd = scalar, F32, 1168 -; total TS size = 1172 -baseDwell = scalar, F32, 1172, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 1176, "", 1, 0 -luaTimingAdd = scalar, F32, 1180, "", 1, 0 -luaTimingMult = scalar, F32, 1184, "", 1, 0 -; total TS size = 1188 -idlePosition = scalar, F32, 1188, "", 1, 0 -trim = scalar, F32, 1192, "", 1, 0 -luaAdjustment = scalar, F32, 1196, "", 1, 0 -etbFeedForward = scalar, F32, 1200 -etbIntegralError = scalar, F32, 1204, "", 1, 0 -etbCurrentTarget = scalar, F32, 1208, "%", 1, 0 -; total TS size = 1212 -faultCode = scalar, U08, 1212, "", 1, 0 -heaterDuty = scalar, U08, 1213, "%", 1, 0 -pumpDuty = scalar, U08, 1214, "%", 1, 0 -tempC = scalar, U16, 1216, "C", 1, 0 -nernstVoltage = scalar, U16, 1218, "V", 0.001, 0 -esr = scalar, U16, 1220, "", 1, 0 -; total TS size = 1224 +wallFuelCorrection = scalar, F32, 1132, "", 1, 0 +wallFuel = scalar, F32, 1136, "", 1, 0 +; total TS size = 1140 +idleState = bits, S32, 1140, [0:2], "not important" +currentIdlePosition = scalar, F32, 1144 +baseIdlePosition = scalar, F32, 1148 +iacByTpsTaper = scalar, F32, 1152 +throttlePedalUpState = scalar, S32, 1156, "", 1, 0 +mightResetPid = bits, U32, 1160, [0:0] +shouldResetPid = bits, U32, 1160, [1:1] +wasResetPid = bits, U32, 1160, [2:2] +mustResetPid = bits, U32, 1160, [3:3] +isCoasting = bits, U32, 1160, [4:4] +useIacTableForCoasting = bits, U32, 1160, [5:5] +notIdling = bits, U32, 1160, [6:6] +needReset = bits, U32, 1160, [7:7] +isInDeadZone = bits, U32, 1160, [8:8] +isBlipping = bits, U32, 1160, [9:9] +useClosedLoop = bits, U32, 1160, [10:10] +badTps = bits, U32, 1160, [11:11] +looksLikeRunning = bits, U32, 1160, [12:12] +looksLikeCoasting = bits, U32, 1160, [13:13] +looksLikeCrankToIdle = bits, U32, 1160, [14:14] +useInstantRpmForIdle = bits, U32, 1160, [15:15] +isVerboseIAC = bits, U32, 1160, [16:16] +unusedBit_22_17 = bits, U32, 1160, [17:17] +unusedBit_22_18 = bits, U32, 1160, [18:18] +unusedBit_22_19 = bits, U32, 1160, [19:19] +unusedBit_22_20 = bits, U32, 1160, [20:20] +unusedBit_22_21 = bits, U32, 1160, [21:21] +unusedBit_22_22 = bits, U32, 1160, [22:22] +unusedBit_22_23 = bits, U32, 1160, [23:23] +unusedBit_22_24 = bits, U32, 1160, [24:24] +unusedBit_22_25 = bits, U32, 1160, [25:25] +unusedBit_22_26 = bits, U32, 1160, [26:26] +unusedBit_22_27 = bits, U32, 1160, [27:27] +unusedBit_22_28 = bits, U32, 1160, [28:28] +unusedBit_22_29 = bits, U32, 1160, [29:29] +unusedBit_22_30 = bits, U32, 1160, [30:30] +unusedBit_22_31 = bits, U32, 1160, [31:31] +targetRpmByClt = scalar, S32, 1164, "", 1, 0 +targetRpmAcBump = scalar, S32, 1168, "", 1, 0 +iacByRpmTaper = scalar, F32, 1172 +luaAdd = scalar, F32, 1176 +; total TS size = 1180 +baseDwell = scalar, F32, 1180, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 1184, "", 1, 0 +luaTimingAdd = scalar, F32, 1188, "", 1, 0 +luaTimingMult = scalar, F32, 1192, "", 1, 0 +; total TS size = 1196 +idlePosition = scalar, F32, 1196, "", 1, 0 +trim = scalar, F32, 1200, "", 1, 0 +luaAdjustment = scalar, F32, 1204, "", 1, 0 +etbFeedForward = scalar, F32, 1208 +etbIntegralError = scalar, F32, 1212, "", 1, 0 +etbCurrentTarget = scalar, F32, 1216, "%", 1, 0 +; total TS size = 1220 +faultCode = scalar, U08, 1220, "", 1, 0 +heaterDuty = scalar, U08, 1221, "%", 1, 0 +pumpDuty = scalar, U08, 1222, "%", 1, 0 +tempC = scalar, U16, 1224, "C", 1, 0 +nernstVoltage = scalar, U16, 1226, "V", 0.001, 0 +esr = scalar, U16, 1228, "", 1, 0 +; total TS size = 1232 time = { timeNow } @@ -4757,6 +4759,8 @@ entry = brakePedalState, "brake: down", int, "%d" entry = egt1, "egt1", float, "%.3f" entry = egt2, "egt2", float, "%.3f" entry = desiredRpmLimit, "User-defined RPM hard limit", int, "%d" +entry = fuelInjectionCounter, "fuelInjectionCounter", int, "%d" +entry = sparkCounter, "sparkCounter", int, "%d" entry = tpsFrom, "tpsFrom", float, "%.3f" entry = tpsTo, "tpsTo", float, "%.3f" entry = deltaTps, "deltaTps", float, "%.3f" @@ -5497,6 +5501,8 @@ dialog = engine_stateDialog, "engine_state" graphLine = egt2 liveGraph = engine_state_10_Graph, "Graph", South graphLine = desiredRpmLimit + graphLine = fuelInjectionCounter + graphLine = sparkCounter indicatorPanel = tps_accel_stateIndicatorPanel, 2 indicator = {isAboveAccelThreshold}, "isAboveAccelThreshold No", "isAboveAccelThreshold Yes" diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_469.ini b/firmware/tunerstudio/generated/rusefi_prometheus_469.ini index ce3a61f791..7b134b3283 100644 --- a/firmware/tunerstudio/generated/rusefi_prometheus_469.ini +++ b/firmware/tunerstudio/generated/rusefi_prometheus_469.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.08.25.prometheus_469.585110264" + signature = "rusEFI 2022.08.25.prometheus_469.3533211276" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.08.25.prometheus_469.585110264" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.08.25.prometheus_469.3533211276" ; 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 @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Aug 25 14:51:56 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Aug 25 22:50:40 UTC 2022 pageSize = 21300 page = 1 @@ -2109,7 +2109,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1224 + ochBlockSize = 1232 ; ; see TunerStudioOutputChannels struct @@ -3022,170 +3022,172 @@ unusedBit_22_31 = bits, U32, 992, [31:31] egt1 = scalar, F32, 996, "", 1, 0 egt2 = scalar, F32, 1000, "", 1, 0 desiredRpmLimit = scalar, S16, 1004, "rpm", 1, 0 -; total TS size = 1008 -tpsFrom = scalar, F32, 1008 -tpsTo = scalar, F32, 1012 -deltaTps = scalar, F32, 1016 -extraFuel = scalar, F32, 1020, "", 1, 0 -valueFromTable = scalar, F32, 1024, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1028, [0:0] -isBelowDecelThreshold = bits, U32, 1028, [1:1] -isTimeToResetAccumulator = bits, U32, 1028, [2:2] -isFractionalEnrichment = bits, U32, 1028, [3:3] -belowEpsilon = bits, U32, 1028, [4:4] -tooShort = bits, U32, 1028, [5:5] -unusedBit_11_6 = bits, U32, 1028, [6:6] -unusedBit_11_7 = bits, U32, 1028, [7:7] -unusedBit_11_8 = bits, U32, 1028, [8:8] -unusedBit_11_9 = bits, U32, 1028, [9:9] -unusedBit_11_10 = bits, U32, 1028, [10:10] -unusedBit_11_11 = bits, U32, 1028, [11:11] -unusedBit_11_12 = bits, U32, 1028, [12:12] -unusedBit_11_13 = bits, U32, 1028, [13:13] -unusedBit_11_14 = bits, U32, 1028, [14:14] -unusedBit_11_15 = bits, U32, 1028, [15:15] -unusedBit_11_16 = bits, U32, 1028, [16:16] -unusedBit_11_17 = bits, U32, 1028, [17:17] -unusedBit_11_18 = bits, U32, 1028, [18:18] -unusedBit_11_19 = bits, U32, 1028, [19:19] -unusedBit_11_20 = bits, U32, 1028, [20:20] -unusedBit_11_21 = bits, U32, 1028, [21:21] -unusedBit_11_22 = bits, U32, 1028, [22:22] -unusedBit_11_23 = bits, U32, 1028, [23:23] -unusedBit_11_24 = bits, U32, 1028, [24:24] -unusedBit_11_25 = bits, U32, 1028, [25:25] -unusedBit_11_26 = bits, U32, 1028, [26:26] -unusedBit_11_27 = bits, U32, 1028, [27:27] -unusedBit_11_28 = bits, U32, 1028, [28:28] -unusedBit_11_29 = bits, U32, 1028, [29:29] -unusedBit_11_30 = bits, U32, 1028, [30:30] -unusedBit_11_31 = bits, U32, 1028, [31:31] -fractionalInjFuel = scalar, F32, 1032, "", 1, 0 -accumulatedValue = scalar, F32, 1036, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1040, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1044, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1048, "", 1, 0 -cycleCnt = scalar, S32, 1052, "", 1, 0 -; total TS size = 1056 -hwEventCounters1 = scalar, S32, 1056, "", 1, 0 -hwEventCounters2 = scalar, S32, 1060, "", 1, 0 -hwEventCounters3 = scalar, S32, 1064, "", 1, 0 -hwEventCounters4 = scalar, S32, 1068, "", 1, 0 -hwEventCounters5 = scalar, S32, 1072, "", 1, 0 -hwEventCounters6 = scalar, S32, 1076, "", 1, 0 -vvtCamCounter = scalar, S32, 1080, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1084, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1088, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1092, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1093, "", 1, 0 -; total TS size = 1096 -totalRevolutionCounter = scalar, U32, 1096, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1100, "", 1, 0 -vvtCurrentPosition = scalar, F32, 1104, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1108, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 1112, "", 1, 0 -triggerStateIndex = scalar, U08, 1116, "", 1, 0 -vvtCounter = scalar, U08, 1117, "", 1, 0 -camResyncCounter = scalar, U08, 1118, "", 1, 0 -vvtStateIndex = scalar, U08, 1119, "", 1, 0 -; total TS size = 1120 -m_hasSynchronizedPhase = bits, U32, 1120, [0:0] -unusedBit_1_1 = bits, U32, 1120, [1:1] -unusedBit_1_2 = bits, U32, 1120, [2:2] -unusedBit_1_3 = bits, U32, 1120, [3:3] -unusedBit_1_4 = bits, U32, 1120, [4:4] -unusedBit_1_5 = bits, U32, 1120, [5:5] -unusedBit_1_6 = bits, U32, 1120, [6:6] -unusedBit_1_7 = bits, U32, 1120, [7:7] -unusedBit_1_8 = bits, U32, 1120, [8:8] -unusedBit_1_9 = bits, U32, 1120, [9:9] -unusedBit_1_10 = bits, U32, 1120, [10:10] -unusedBit_1_11 = bits, U32, 1120, [11:11] -unusedBit_1_12 = bits, U32, 1120, [12:12] -unusedBit_1_13 = bits, U32, 1120, [13:13] -unusedBit_1_14 = bits, U32, 1120, [14:14] -unusedBit_1_15 = bits, U32, 1120, [15:15] -unusedBit_1_16 = bits, U32, 1120, [16:16] -unusedBit_1_17 = bits, U32, 1120, [17:17] -unusedBit_1_18 = bits, U32, 1120, [18:18] -unusedBit_1_19 = bits, U32, 1120, [19:19] -unusedBit_1_20 = bits, U32, 1120, [20:20] -unusedBit_1_21 = bits, U32, 1120, [21:21] -unusedBit_1_22 = bits, U32, 1120, [22:22] -unusedBit_1_23 = bits, U32, 1120, [23:23] -unusedBit_1_24 = bits, U32, 1120, [24:24] -unusedBit_1_25 = bits, U32, 1120, [25:25] -unusedBit_1_26 = bits, U32, 1120, [26:26] -unusedBit_1_27 = bits, U32, 1120, [27:27] -unusedBit_1_28 = bits, U32, 1120, [28:28] -unusedBit_1_29 = bits, U32, 1120, [29:29] -unusedBit_1_30 = bits, U32, 1120, [30:30] -unusedBit_1_31 = bits, U32, 1120, [31:31] -; total TS size = 1124 -wallFuelCorrection = scalar, F32, 1124, "", 1, 0 -wallFuel = scalar, F32, 1128, "", 1, 0 +fuelInjectionCounter = scalar, S32, 1008, "", 1, 0 +sparkCounter = scalar, S32, 1012, "", 1, 0 +; total TS size = 1016 +tpsFrom = scalar, F32, 1016 +tpsTo = scalar, F32, 1020 +deltaTps = scalar, F32, 1024 +extraFuel = scalar, F32, 1028, "", 1, 0 +valueFromTable = scalar, F32, 1032, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1036, [0:0] +isBelowDecelThreshold = bits, U32, 1036, [1:1] +isTimeToResetAccumulator = bits, U32, 1036, [2:2] +isFractionalEnrichment = bits, U32, 1036, [3:3] +belowEpsilon = bits, U32, 1036, [4:4] +tooShort = bits, U32, 1036, [5:5] +unusedBit_11_6 = bits, U32, 1036, [6:6] +unusedBit_11_7 = bits, U32, 1036, [7:7] +unusedBit_11_8 = bits, U32, 1036, [8:8] +unusedBit_11_9 = bits, U32, 1036, [9:9] +unusedBit_11_10 = bits, U32, 1036, [10:10] +unusedBit_11_11 = bits, U32, 1036, [11:11] +unusedBit_11_12 = bits, U32, 1036, [12:12] +unusedBit_11_13 = bits, U32, 1036, [13:13] +unusedBit_11_14 = bits, U32, 1036, [14:14] +unusedBit_11_15 = bits, U32, 1036, [15:15] +unusedBit_11_16 = bits, U32, 1036, [16:16] +unusedBit_11_17 = bits, U32, 1036, [17:17] +unusedBit_11_18 = bits, U32, 1036, [18:18] +unusedBit_11_19 = bits, U32, 1036, [19:19] +unusedBit_11_20 = bits, U32, 1036, [20:20] +unusedBit_11_21 = bits, U32, 1036, [21:21] +unusedBit_11_22 = bits, U32, 1036, [22:22] +unusedBit_11_23 = bits, U32, 1036, [23:23] +unusedBit_11_24 = bits, U32, 1036, [24:24] +unusedBit_11_25 = bits, U32, 1036, [25:25] +unusedBit_11_26 = bits, U32, 1036, [26:26] +unusedBit_11_27 = bits, U32, 1036, [27:27] +unusedBit_11_28 = bits, U32, 1036, [28:28] +unusedBit_11_29 = bits, U32, 1036, [29:29] +unusedBit_11_30 = bits, U32, 1036, [30:30] +unusedBit_11_31 = bits, U32, 1036, [31:31] +fractionalInjFuel = scalar, F32, 1040, "", 1, 0 +accumulatedValue = scalar, F32, 1044, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1048, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1052, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1056, "", 1, 0 +cycleCnt = scalar, S32, 1060, "", 1, 0 +; total TS size = 1064 +hwEventCounters1 = scalar, S32, 1064, "", 1, 0 +hwEventCounters2 = scalar, S32, 1068, "", 1, 0 +hwEventCounters3 = scalar, S32, 1072, "", 1, 0 +hwEventCounters4 = scalar, S32, 1076, "", 1, 0 +hwEventCounters5 = scalar, S32, 1080, "", 1, 0 +hwEventCounters6 = scalar, S32, 1084, "", 1, 0 +vvtCamCounter = scalar, S32, 1088, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1092, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1096, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1100, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1101, "", 1, 0 +; total TS size = 1104 +totalRevolutionCounter = scalar, U32, 1104, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1108, "", 1, 0 +vvtCurrentPosition = scalar, F32, 1112, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1116, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 1120, "", 1, 0 +triggerStateIndex = scalar, U08, 1124, "", 1, 0 +vvtCounter = scalar, U08, 1125, "", 1, 0 +camResyncCounter = scalar, U08, 1126, "", 1, 0 +vvtStateIndex = scalar, U08, 1127, "", 1, 0 +; total TS size = 1128 +m_hasSynchronizedPhase = bits, U32, 1128, [0:0] +unusedBit_1_1 = bits, U32, 1128, [1:1] +unusedBit_1_2 = bits, U32, 1128, [2:2] +unusedBit_1_3 = bits, U32, 1128, [3:3] +unusedBit_1_4 = bits, U32, 1128, [4:4] +unusedBit_1_5 = bits, U32, 1128, [5:5] +unusedBit_1_6 = bits, U32, 1128, [6:6] +unusedBit_1_7 = bits, U32, 1128, [7:7] +unusedBit_1_8 = bits, U32, 1128, [8:8] +unusedBit_1_9 = bits, U32, 1128, [9:9] +unusedBit_1_10 = bits, U32, 1128, [10:10] +unusedBit_1_11 = bits, U32, 1128, [11:11] +unusedBit_1_12 = bits, U32, 1128, [12:12] +unusedBit_1_13 = bits, U32, 1128, [13:13] +unusedBit_1_14 = bits, U32, 1128, [14:14] +unusedBit_1_15 = bits, U32, 1128, [15:15] +unusedBit_1_16 = bits, U32, 1128, [16:16] +unusedBit_1_17 = bits, U32, 1128, [17:17] +unusedBit_1_18 = bits, U32, 1128, [18:18] +unusedBit_1_19 = bits, U32, 1128, [19:19] +unusedBit_1_20 = bits, U32, 1128, [20:20] +unusedBit_1_21 = bits, U32, 1128, [21:21] +unusedBit_1_22 = bits, U32, 1128, [22:22] +unusedBit_1_23 = bits, U32, 1128, [23:23] +unusedBit_1_24 = bits, U32, 1128, [24:24] +unusedBit_1_25 = bits, U32, 1128, [25:25] +unusedBit_1_26 = bits, U32, 1128, [26:26] +unusedBit_1_27 = bits, U32, 1128, [27:27] +unusedBit_1_28 = bits, U32, 1128, [28:28] +unusedBit_1_29 = bits, U32, 1128, [29:29] +unusedBit_1_30 = bits, U32, 1128, [30:30] +unusedBit_1_31 = bits, U32, 1128, [31:31] ; total TS size = 1132 -idleState = bits, S32, 1132, [0:2], "not important" -currentIdlePosition = scalar, F32, 1136 -baseIdlePosition = scalar, F32, 1140 -iacByTpsTaper = scalar, F32, 1144 -throttlePedalUpState = scalar, S32, 1148, "", 1, 0 -mightResetPid = bits, U32, 1152, [0:0] -shouldResetPid = bits, U32, 1152, [1:1] -wasResetPid = bits, U32, 1152, [2:2] -mustResetPid = bits, U32, 1152, [3:3] -isCoasting = bits, U32, 1152, [4:4] -useIacTableForCoasting = bits, U32, 1152, [5:5] -notIdling = bits, U32, 1152, [6:6] -needReset = bits, U32, 1152, [7:7] -isInDeadZone = bits, U32, 1152, [8:8] -isBlipping = bits, U32, 1152, [9:9] -useClosedLoop = bits, U32, 1152, [10:10] -badTps = bits, U32, 1152, [11:11] -looksLikeRunning = bits, U32, 1152, [12:12] -looksLikeCoasting = bits, U32, 1152, [13:13] -looksLikeCrankToIdle = bits, U32, 1152, [14:14] -useInstantRpmForIdle = bits, U32, 1152, [15:15] -isVerboseIAC = bits, U32, 1152, [16:16] -unusedBit_22_17 = bits, U32, 1152, [17:17] -unusedBit_22_18 = bits, U32, 1152, [18:18] -unusedBit_22_19 = bits, U32, 1152, [19:19] -unusedBit_22_20 = bits, U32, 1152, [20:20] -unusedBit_22_21 = bits, U32, 1152, [21:21] -unusedBit_22_22 = bits, U32, 1152, [22:22] -unusedBit_22_23 = bits, U32, 1152, [23:23] -unusedBit_22_24 = bits, U32, 1152, [24:24] -unusedBit_22_25 = bits, U32, 1152, [25:25] -unusedBit_22_26 = bits, U32, 1152, [26:26] -unusedBit_22_27 = bits, U32, 1152, [27:27] -unusedBit_22_28 = bits, U32, 1152, [28:28] -unusedBit_22_29 = bits, U32, 1152, [29:29] -unusedBit_22_30 = bits, U32, 1152, [30:30] -unusedBit_22_31 = bits, U32, 1152, [31:31] -targetRpmByClt = scalar, S32, 1156, "", 1, 0 -targetRpmAcBump = scalar, S32, 1160, "", 1, 0 -iacByRpmTaper = scalar, F32, 1164 -luaAdd = scalar, F32, 1168 -; total TS size = 1172 -baseDwell = scalar, F32, 1172, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 1176, "", 1, 0 -luaTimingAdd = scalar, F32, 1180, "", 1, 0 -luaTimingMult = scalar, F32, 1184, "", 1, 0 -; total TS size = 1188 -idlePosition = scalar, F32, 1188, "", 1, 0 -trim = scalar, F32, 1192, "", 1, 0 -luaAdjustment = scalar, F32, 1196, "", 1, 0 -etbFeedForward = scalar, F32, 1200 -etbIntegralError = scalar, F32, 1204, "", 1, 0 -etbCurrentTarget = scalar, F32, 1208, "%", 1, 0 -; total TS size = 1212 -faultCode = scalar, U08, 1212, "", 1, 0 -heaterDuty = scalar, U08, 1213, "%", 1, 0 -pumpDuty = scalar, U08, 1214, "%", 1, 0 -tempC = scalar, U16, 1216, "C", 1, 0 -nernstVoltage = scalar, U16, 1218, "V", 0.001, 0 -esr = scalar, U16, 1220, "", 1, 0 -; total TS size = 1224 +wallFuelCorrection = scalar, F32, 1132, "", 1, 0 +wallFuel = scalar, F32, 1136, "", 1, 0 +; total TS size = 1140 +idleState = bits, S32, 1140, [0:2], "not important" +currentIdlePosition = scalar, F32, 1144 +baseIdlePosition = scalar, F32, 1148 +iacByTpsTaper = scalar, F32, 1152 +throttlePedalUpState = scalar, S32, 1156, "", 1, 0 +mightResetPid = bits, U32, 1160, [0:0] +shouldResetPid = bits, U32, 1160, [1:1] +wasResetPid = bits, U32, 1160, [2:2] +mustResetPid = bits, U32, 1160, [3:3] +isCoasting = bits, U32, 1160, [4:4] +useIacTableForCoasting = bits, U32, 1160, [5:5] +notIdling = bits, U32, 1160, [6:6] +needReset = bits, U32, 1160, [7:7] +isInDeadZone = bits, U32, 1160, [8:8] +isBlipping = bits, U32, 1160, [9:9] +useClosedLoop = bits, U32, 1160, [10:10] +badTps = bits, U32, 1160, [11:11] +looksLikeRunning = bits, U32, 1160, [12:12] +looksLikeCoasting = bits, U32, 1160, [13:13] +looksLikeCrankToIdle = bits, U32, 1160, [14:14] +useInstantRpmForIdle = bits, U32, 1160, [15:15] +isVerboseIAC = bits, U32, 1160, [16:16] +unusedBit_22_17 = bits, U32, 1160, [17:17] +unusedBit_22_18 = bits, U32, 1160, [18:18] +unusedBit_22_19 = bits, U32, 1160, [19:19] +unusedBit_22_20 = bits, U32, 1160, [20:20] +unusedBit_22_21 = bits, U32, 1160, [21:21] +unusedBit_22_22 = bits, U32, 1160, [22:22] +unusedBit_22_23 = bits, U32, 1160, [23:23] +unusedBit_22_24 = bits, U32, 1160, [24:24] +unusedBit_22_25 = bits, U32, 1160, [25:25] +unusedBit_22_26 = bits, U32, 1160, [26:26] +unusedBit_22_27 = bits, U32, 1160, [27:27] +unusedBit_22_28 = bits, U32, 1160, [28:28] +unusedBit_22_29 = bits, U32, 1160, [29:29] +unusedBit_22_30 = bits, U32, 1160, [30:30] +unusedBit_22_31 = bits, U32, 1160, [31:31] +targetRpmByClt = scalar, S32, 1164, "", 1, 0 +targetRpmAcBump = scalar, S32, 1168, "", 1, 0 +iacByRpmTaper = scalar, F32, 1172 +luaAdd = scalar, F32, 1176 +; total TS size = 1180 +baseDwell = scalar, F32, 1180, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 1184, "", 1, 0 +luaTimingAdd = scalar, F32, 1188, "", 1, 0 +luaTimingMult = scalar, F32, 1192, "", 1, 0 +; total TS size = 1196 +idlePosition = scalar, F32, 1196, "", 1, 0 +trim = scalar, F32, 1200, "", 1, 0 +luaAdjustment = scalar, F32, 1204, "", 1, 0 +etbFeedForward = scalar, F32, 1208 +etbIntegralError = scalar, F32, 1212, "", 1, 0 +etbCurrentTarget = scalar, F32, 1216, "%", 1, 0 +; total TS size = 1220 +faultCode = scalar, U08, 1220, "", 1, 0 +heaterDuty = scalar, U08, 1221, "%", 1, 0 +pumpDuty = scalar, U08, 1222, "%", 1, 0 +tempC = scalar, U16, 1224, "C", 1, 0 +nernstVoltage = scalar, U16, 1226, "V", 0.001, 0 +esr = scalar, U16, 1228, "", 1, 0 +; total TS size = 1232 time = { timeNow } @@ -4757,6 +4759,8 @@ entry = brakePedalState, "brake: down", int, "%d" entry = egt1, "egt1", float, "%.3f" entry = egt2, "egt2", float, "%.3f" entry = desiredRpmLimit, "User-defined RPM hard limit", int, "%d" +entry = fuelInjectionCounter, "fuelInjectionCounter", int, "%d" +entry = sparkCounter, "sparkCounter", int, "%d" entry = tpsFrom, "tpsFrom", float, "%.3f" entry = tpsTo, "tpsTo", float, "%.3f" entry = deltaTps, "deltaTps", float, "%.3f" @@ -5497,6 +5501,8 @@ dialog = engine_stateDialog, "engine_state" graphLine = egt2 liveGraph = engine_state_10_Graph, "Graph", South graphLine = desiredRpmLimit + graphLine = fuelInjectionCounter + graphLine = sparkCounter indicatorPanel = tps_accel_stateIndicatorPanel, 2 indicator = {isAboveAccelThreshold}, "isAboveAccelThreshold No", "isAboveAccelThreshold Yes" diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f4.ini b/firmware/tunerstudio/generated/rusefi_proteus_f4.ini index 89cf2cfbf7..70b757a1e4 100644 --- a/firmware/tunerstudio/generated/rusefi_proteus_f4.ini +++ b/firmware/tunerstudio/generated/rusefi_proteus_f4.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.08.25.proteus_f4.3620146280" + signature = "rusEFI 2022.08.25.proteus_f4.666867740" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.08.25.proteus_f4.3620146280" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.08.25.proteus_f4.666867740" ; 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 @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Aug 25 14:52:02 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Aug 25 22:50:46 UTC 2022 pageSize = 21300 page = 1 @@ -2109,7 +2109,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1224 + ochBlockSize = 1232 ; ; see TunerStudioOutputChannels struct @@ -3022,170 +3022,172 @@ unusedBit_22_31 = bits, U32, 992, [31:31] egt1 = scalar, F32, 996, "", 1, 0 egt2 = scalar, F32, 1000, "", 1, 0 desiredRpmLimit = scalar, S16, 1004, "rpm", 1, 0 -; total TS size = 1008 -tpsFrom = scalar, F32, 1008 -tpsTo = scalar, F32, 1012 -deltaTps = scalar, F32, 1016 -extraFuel = scalar, F32, 1020, "", 1, 0 -valueFromTable = scalar, F32, 1024, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1028, [0:0] -isBelowDecelThreshold = bits, U32, 1028, [1:1] -isTimeToResetAccumulator = bits, U32, 1028, [2:2] -isFractionalEnrichment = bits, U32, 1028, [3:3] -belowEpsilon = bits, U32, 1028, [4:4] -tooShort = bits, U32, 1028, [5:5] -unusedBit_11_6 = bits, U32, 1028, [6:6] -unusedBit_11_7 = bits, U32, 1028, [7:7] -unusedBit_11_8 = bits, U32, 1028, [8:8] -unusedBit_11_9 = bits, U32, 1028, [9:9] -unusedBit_11_10 = bits, U32, 1028, [10:10] -unusedBit_11_11 = bits, U32, 1028, [11:11] -unusedBit_11_12 = bits, U32, 1028, [12:12] -unusedBit_11_13 = bits, U32, 1028, [13:13] -unusedBit_11_14 = bits, U32, 1028, [14:14] -unusedBit_11_15 = bits, U32, 1028, [15:15] -unusedBit_11_16 = bits, U32, 1028, [16:16] -unusedBit_11_17 = bits, U32, 1028, [17:17] -unusedBit_11_18 = bits, U32, 1028, [18:18] -unusedBit_11_19 = bits, U32, 1028, [19:19] -unusedBit_11_20 = bits, U32, 1028, [20:20] -unusedBit_11_21 = bits, U32, 1028, [21:21] -unusedBit_11_22 = bits, U32, 1028, [22:22] -unusedBit_11_23 = bits, U32, 1028, [23:23] -unusedBit_11_24 = bits, U32, 1028, [24:24] -unusedBit_11_25 = bits, U32, 1028, [25:25] -unusedBit_11_26 = bits, U32, 1028, [26:26] -unusedBit_11_27 = bits, U32, 1028, [27:27] -unusedBit_11_28 = bits, U32, 1028, [28:28] -unusedBit_11_29 = bits, U32, 1028, [29:29] -unusedBit_11_30 = bits, U32, 1028, [30:30] -unusedBit_11_31 = bits, U32, 1028, [31:31] -fractionalInjFuel = scalar, F32, 1032, "", 1, 0 -accumulatedValue = scalar, F32, 1036, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1040, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1044, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1048, "", 1, 0 -cycleCnt = scalar, S32, 1052, "", 1, 0 -; total TS size = 1056 -hwEventCounters1 = scalar, S32, 1056, "", 1, 0 -hwEventCounters2 = scalar, S32, 1060, "", 1, 0 -hwEventCounters3 = scalar, S32, 1064, "", 1, 0 -hwEventCounters4 = scalar, S32, 1068, "", 1, 0 -hwEventCounters5 = scalar, S32, 1072, "", 1, 0 -hwEventCounters6 = scalar, S32, 1076, "", 1, 0 -vvtCamCounter = scalar, S32, 1080, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1084, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1088, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1092, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1093, "", 1, 0 -; total TS size = 1096 -totalRevolutionCounter = scalar, U32, 1096, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1100, "", 1, 0 -vvtCurrentPosition = scalar, F32, 1104, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1108, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 1112, "", 1, 0 -triggerStateIndex = scalar, U08, 1116, "", 1, 0 -vvtCounter = scalar, U08, 1117, "", 1, 0 -camResyncCounter = scalar, U08, 1118, "", 1, 0 -vvtStateIndex = scalar, U08, 1119, "", 1, 0 -; total TS size = 1120 -m_hasSynchronizedPhase = bits, U32, 1120, [0:0] -unusedBit_1_1 = bits, U32, 1120, [1:1] -unusedBit_1_2 = bits, U32, 1120, [2:2] -unusedBit_1_3 = bits, U32, 1120, [3:3] -unusedBit_1_4 = bits, U32, 1120, [4:4] -unusedBit_1_5 = bits, U32, 1120, [5:5] -unusedBit_1_6 = bits, U32, 1120, [6:6] -unusedBit_1_7 = bits, U32, 1120, [7:7] -unusedBit_1_8 = bits, U32, 1120, [8:8] -unusedBit_1_9 = bits, U32, 1120, [9:9] -unusedBit_1_10 = bits, U32, 1120, [10:10] -unusedBit_1_11 = bits, U32, 1120, [11:11] -unusedBit_1_12 = bits, U32, 1120, [12:12] -unusedBit_1_13 = bits, U32, 1120, [13:13] -unusedBit_1_14 = bits, U32, 1120, [14:14] -unusedBit_1_15 = bits, U32, 1120, [15:15] -unusedBit_1_16 = bits, U32, 1120, [16:16] -unusedBit_1_17 = bits, U32, 1120, [17:17] -unusedBit_1_18 = bits, U32, 1120, [18:18] -unusedBit_1_19 = bits, U32, 1120, [19:19] -unusedBit_1_20 = bits, U32, 1120, [20:20] -unusedBit_1_21 = bits, U32, 1120, [21:21] -unusedBit_1_22 = bits, U32, 1120, [22:22] -unusedBit_1_23 = bits, U32, 1120, [23:23] -unusedBit_1_24 = bits, U32, 1120, [24:24] -unusedBit_1_25 = bits, U32, 1120, [25:25] -unusedBit_1_26 = bits, U32, 1120, [26:26] -unusedBit_1_27 = bits, U32, 1120, [27:27] -unusedBit_1_28 = bits, U32, 1120, [28:28] -unusedBit_1_29 = bits, U32, 1120, [29:29] -unusedBit_1_30 = bits, U32, 1120, [30:30] -unusedBit_1_31 = bits, U32, 1120, [31:31] -; total TS size = 1124 -wallFuelCorrection = scalar, F32, 1124, "", 1, 0 -wallFuel = scalar, F32, 1128, "", 1, 0 +fuelInjectionCounter = scalar, S32, 1008, "", 1, 0 +sparkCounter = scalar, S32, 1012, "", 1, 0 +; total TS size = 1016 +tpsFrom = scalar, F32, 1016 +tpsTo = scalar, F32, 1020 +deltaTps = scalar, F32, 1024 +extraFuel = scalar, F32, 1028, "", 1, 0 +valueFromTable = scalar, F32, 1032, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1036, [0:0] +isBelowDecelThreshold = bits, U32, 1036, [1:1] +isTimeToResetAccumulator = bits, U32, 1036, [2:2] +isFractionalEnrichment = bits, U32, 1036, [3:3] +belowEpsilon = bits, U32, 1036, [4:4] +tooShort = bits, U32, 1036, [5:5] +unusedBit_11_6 = bits, U32, 1036, [6:6] +unusedBit_11_7 = bits, U32, 1036, [7:7] +unusedBit_11_8 = bits, U32, 1036, [8:8] +unusedBit_11_9 = bits, U32, 1036, [9:9] +unusedBit_11_10 = bits, U32, 1036, [10:10] +unusedBit_11_11 = bits, U32, 1036, [11:11] +unusedBit_11_12 = bits, U32, 1036, [12:12] +unusedBit_11_13 = bits, U32, 1036, [13:13] +unusedBit_11_14 = bits, U32, 1036, [14:14] +unusedBit_11_15 = bits, U32, 1036, [15:15] +unusedBit_11_16 = bits, U32, 1036, [16:16] +unusedBit_11_17 = bits, U32, 1036, [17:17] +unusedBit_11_18 = bits, U32, 1036, [18:18] +unusedBit_11_19 = bits, U32, 1036, [19:19] +unusedBit_11_20 = bits, U32, 1036, [20:20] +unusedBit_11_21 = bits, U32, 1036, [21:21] +unusedBit_11_22 = bits, U32, 1036, [22:22] +unusedBit_11_23 = bits, U32, 1036, [23:23] +unusedBit_11_24 = bits, U32, 1036, [24:24] +unusedBit_11_25 = bits, U32, 1036, [25:25] +unusedBit_11_26 = bits, U32, 1036, [26:26] +unusedBit_11_27 = bits, U32, 1036, [27:27] +unusedBit_11_28 = bits, U32, 1036, [28:28] +unusedBit_11_29 = bits, U32, 1036, [29:29] +unusedBit_11_30 = bits, U32, 1036, [30:30] +unusedBit_11_31 = bits, U32, 1036, [31:31] +fractionalInjFuel = scalar, F32, 1040, "", 1, 0 +accumulatedValue = scalar, F32, 1044, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1048, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1052, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1056, "", 1, 0 +cycleCnt = scalar, S32, 1060, "", 1, 0 +; total TS size = 1064 +hwEventCounters1 = scalar, S32, 1064, "", 1, 0 +hwEventCounters2 = scalar, S32, 1068, "", 1, 0 +hwEventCounters3 = scalar, S32, 1072, "", 1, 0 +hwEventCounters4 = scalar, S32, 1076, "", 1, 0 +hwEventCounters5 = scalar, S32, 1080, "", 1, 0 +hwEventCounters6 = scalar, S32, 1084, "", 1, 0 +vvtCamCounter = scalar, S32, 1088, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1092, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1096, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1100, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1101, "", 1, 0 +; total TS size = 1104 +totalRevolutionCounter = scalar, U32, 1104, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1108, "", 1, 0 +vvtCurrentPosition = scalar, F32, 1112, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1116, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 1120, "", 1, 0 +triggerStateIndex = scalar, U08, 1124, "", 1, 0 +vvtCounter = scalar, U08, 1125, "", 1, 0 +camResyncCounter = scalar, U08, 1126, "", 1, 0 +vvtStateIndex = scalar, U08, 1127, "", 1, 0 +; total TS size = 1128 +m_hasSynchronizedPhase = bits, U32, 1128, [0:0] +unusedBit_1_1 = bits, U32, 1128, [1:1] +unusedBit_1_2 = bits, U32, 1128, [2:2] +unusedBit_1_3 = bits, U32, 1128, [3:3] +unusedBit_1_4 = bits, U32, 1128, [4:4] +unusedBit_1_5 = bits, U32, 1128, [5:5] +unusedBit_1_6 = bits, U32, 1128, [6:6] +unusedBit_1_7 = bits, U32, 1128, [7:7] +unusedBit_1_8 = bits, U32, 1128, [8:8] +unusedBit_1_9 = bits, U32, 1128, [9:9] +unusedBit_1_10 = bits, U32, 1128, [10:10] +unusedBit_1_11 = bits, U32, 1128, [11:11] +unusedBit_1_12 = bits, U32, 1128, [12:12] +unusedBit_1_13 = bits, U32, 1128, [13:13] +unusedBit_1_14 = bits, U32, 1128, [14:14] +unusedBit_1_15 = bits, U32, 1128, [15:15] +unusedBit_1_16 = bits, U32, 1128, [16:16] +unusedBit_1_17 = bits, U32, 1128, [17:17] +unusedBit_1_18 = bits, U32, 1128, [18:18] +unusedBit_1_19 = bits, U32, 1128, [19:19] +unusedBit_1_20 = bits, U32, 1128, [20:20] +unusedBit_1_21 = bits, U32, 1128, [21:21] +unusedBit_1_22 = bits, U32, 1128, [22:22] +unusedBit_1_23 = bits, U32, 1128, [23:23] +unusedBit_1_24 = bits, U32, 1128, [24:24] +unusedBit_1_25 = bits, U32, 1128, [25:25] +unusedBit_1_26 = bits, U32, 1128, [26:26] +unusedBit_1_27 = bits, U32, 1128, [27:27] +unusedBit_1_28 = bits, U32, 1128, [28:28] +unusedBit_1_29 = bits, U32, 1128, [29:29] +unusedBit_1_30 = bits, U32, 1128, [30:30] +unusedBit_1_31 = bits, U32, 1128, [31:31] ; total TS size = 1132 -idleState = bits, S32, 1132, [0:2], "not important" -currentIdlePosition = scalar, F32, 1136 -baseIdlePosition = scalar, F32, 1140 -iacByTpsTaper = scalar, F32, 1144 -throttlePedalUpState = scalar, S32, 1148, "", 1, 0 -mightResetPid = bits, U32, 1152, [0:0] -shouldResetPid = bits, U32, 1152, [1:1] -wasResetPid = bits, U32, 1152, [2:2] -mustResetPid = bits, U32, 1152, [3:3] -isCoasting = bits, U32, 1152, [4:4] -useIacTableForCoasting = bits, U32, 1152, [5:5] -notIdling = bits, U32, 1152, [6:6] -needReset = bits, U32, 1152, [7:7] -isInDeadZone = bits, U32, 1152, [8:8] -isBlipping = bits, U32, 1152, [9:9] -useClosedLoop = bits, U32, 1152, [10:10] -badTps = bits, U32, 1152, [11:11] -looksLikeRunning = bits, U32, 1152, [12:12] -looksLikeCoasting = bits, U32, 1152, [13:13] -looksLikeCrankToIdle = bits, U32, 1152, [14:14] -useInstantRpmForIdle = bits, U32, 1152, [15:15] -isVerboseIAC = bits, U32, 1152, [16:16] -unusedBit_22_17 = bits, U32, 1152, [17:17] -unusedBit_22_18 = bits, U32, 1152, [18:18] -unusedBit_22_19 = bits, U32, 1152, [19:19] -unusedBit_22_20 = bits, U32, 1152, [20:20] -unusedBit_22_21 = bits, U32, 1152, [21:21] -unusedBit_22_22 = bits, U32, 1152, [22:22] -unusedBit_22_23 = bits, U32, 1152, [23:23] -unusedBit_22_24 = bits, U32, 1152, [24:24] -unusedBit_22_25 = bits, U32, 1152, [25:25] -unusedBit_22_26 = bits, U32, 1152, [26:26] -unusedBit_22_27 = bits, U32, 1152, [27:27] -unusedBit_22_28 = bits, U32, 1152, [28:28] -unusedBit_22_29 = bits, U32, 1152, [29:29] -unusedBit_22_30 = bits, U32, 1152, [30:30] -unusedBit_22_31 = bits, U32, 1152, [31:31] -targetRpmByClt = scalar, S32, 1156, "", 1, 0 -targetRpmAcBump = scalar, S32, 1160, "", 1, 0 -iacByRpmTaper = scalar, F32, 1164 -luaAdd = scalar, F32, 1168 -; total TS size = 1172 -baseDwell = scalar, F32, 1172, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 1176, "", 1, 0 -luaTimingAdd = scalar, F32, 1180, "", 1, 0 -luaTimingMult = scalar, F32, 1184, "", 1, 0 -; total TS size = 1188 -idlePosition = scalar, F32, 1188, "", 1, 0 -trim = scalar, F32, 1192, "", 1, 0 -luaAdjustment = scalar, F32, 1196, "", 1, 0 -etbFeedForward = scalar, F32, 1200 -etbIntegralError = scalar, F32, 1204, "", 1, 0 -etbCurrentTarget = scalar, F32, 1208, "%", 1, 0 -; total TS size = 1212 -faultCode = scalar, U08, 1212, "", 1, 0 -heaterDuty = scalar, U08, 1213, "%", 1, 0 -pumpDuty = scalar, U08, 1214, "%", 1, 0 -tempC = scalar, U16, 1216, "C", 1, 0 -nernstVoltage = scalar, U16, 1218, "V", 0.001, 0 -esr = scalar, U16, 1220, "", 1, 0 -; total TS size = 1224 +wallFuelCorrection = scalar, F32, 1132, "", 1, 0 +wallFuel = scalar, F32, 1136, "", 1, 0 +; total TS size = 1140 +idleState = bits, S32, 1140, [0:2], "not important" +currentIdlePosition = scalar, F32, 1144 +baseIdlePosition = scalar, F32, 1148 +iacByTpsTaper = scalar, F32, 1152 +throttlePedalUpState = scalar, S32, 1156, "", 1, 0 +mightResetPid = bits, U32, 1160, [0:0] +shouldResetPid = bits, U32, 1160, [1:1] +wasResetPid = bits, U32, 1160, [2:2] +mustResetPid = bits, U32, 1160, [3:3] +isCoasting = bits, U32, 1160, [4:4] +useIacTableForCoasting = bits, U32, 1160, [5:5] +notIdling = bits, U32, 1160, [6:6] +needReset = bits, U32, 1160, [7:7] +isInDeadZone = bits, U32, 1160, [8:8] +isBlipping = bits, U32, 1160, [9:9] +useClosedLoop = bits, U32, 1160, [10:10] +badTps = bits, U32, 1160, [11:11] +looksLikeRunning = bits, U32, 1160, [12:12] +looksLikeCoasting = bits, U32, 1160, [13:13] +looksLikeCrankToIdle = bits, U32, 1160, [14:14] +useInstantRpmForIdle = bits, U32, 1160, [15:15] +isVerboseIAC = bits, U32, 1160, [16:16] +unusedBit_22_17 = bits, U32, 1160, [17:17] +unusedBit_22_18 = bits, U32, 1160, [18:18] +unusedBit_22_19 = bits, U32, 1160, [19:19] +unusedBit_22_20 = bits, U32, 1160, [20:20] +unusedBit_22_21 = bits, U32, 1160, [21:21] +unusedBit_22_22 = bits, U32, 1160, [22:22] +unusedBit_22_23 = bits, U32, 1160, [23:23] +unusedBit_22_24 = bits, U32, 1160, [24:24] +unusedBit_22_25 = bits, U32, 1160, [25:25] +unusedBit_22_26 = bits, U32, 1160, [26:26] +unusedBit_22_27 = bits, U32, 1160, [27:27] +unusedBit_22_28 = bits, U32, 1160, [28:28] +unusedBit_22_29 = bits, U32, 1160, [29:29] +unusedBit_22_30 = bits, U32, 1160, [30:30] +unusedBit_22_31 = bits, U32, 1160, [31:31] +targetRpmByClt = scalar, S32, 1164, "", 1, 0 +targetRpmAcBump = scalar, S32, 1168, "", 1, 0 +iacByRpmTaper = scalar, F32, 1172 +luaAdd = scalar, F32, 1176 +; total TS size = 1180 +baseDwell = scalar, F32, 1180, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 1184, "", 1, 0 +luaTimingAdd = scalar, F32, 1188, "", 1, 0 +luaTimingMult = scalar, F32, 1192, "", 1, 0 +; total TS size = 1196 +idlePosition = scalar, F32, 1196, "", 1, 0 +trim = scalar, F32, 1200, "", 1, 0 +luaAdjustment = scalar, F32, 1204, "", 1, 0 +etbFeedForward = scalar, F32, 1208 +etbIntegralError = scalar, F32, 1212, "", 1, 0 +etbCurrentTarget = scalar, F32, 1216, "%", 1, 0 +; total TS size = 1220 +faultCode = scalar, U08, 1220, "", 1, 0 +heaterDuty = scalar, U08, 1221, "%", 1, 0 +pumpDuty = scalar, U08, 1222, "%", 1, 0 +tempC = scalar, U16, 1224, "C", 1, 0 +nernstVoltage = scalar, U16, 1226, "V", 0.001, 0 +esr = scalar, U16, 1228, "", 1, 0 +; total TS size = 1232 time = { timeNow } @@ -4757,6 +4759,8 @@ entry = brakePedalState, "brake: down", int, "%d" entry = egt1, "egt1", float, "%.3f" entry = egt2, "egt2", float, "%.3f" entry = desiredRpmLimit, "User-defined RPM hard limit", int, "%d" +entry = fuelInjectionCounter, "fuelInjectionCounter", int, "%d" +entry = sparkCounter, "sparkCounter", int, "%d" entry = tpsFrom, "tpsFrom", float, "%.3f" entry = tpsTo, "tpsTo", float, "%.3f" entry = deltaTps, "deltaTps", float, "%.3f" @@ -5495,6 +5499,8 @@ dialog = engine_stateDialog, "engine_state" graphLine = egt2 liveGraph = engine_state_10_Graph, "Graph", South graphLine = desiredRpmLimit + graphLine = fuelInjectionCounter + graphLine = sparkCounter indicatorPanel = tps_accel_stateIndicatorPanel, 2 indicator = {isAboveAccelThreshold}, "isAboveAccelThreshold No", "isAboveAccelThreshold Yes" diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f7.ini b/firmware/tunerstudio/generated/rusefi_proteus_f7.ini index f1a0ee2356..df83177e3a 100644 --- a/firmware/tunerstudio/generated/rusefi_proteus_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_proteus_f7.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.08.25.proteus_f7.3620146280" + signature = "rusEFI 2022.08.25.proteus_f7.666867740" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.08.25.proteus_f7.3620146280" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.08.25.proteus_f7.666867740" ; 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 @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Aug 25 14:52:00 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Aug 25 22:50:44 UTC 2022 pageSize = 21300 page = 1 @@ -2109,7 +2109,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1224 + ochBlockSize = 1232 ; ; see TunerStudioOutputChannels struct @@ -3022,170 +3022,172 @@ unusedBit_22_31 = bits, U32, 992, [31:31] egt1 = scalar, F32, 996, "", 1, 0 egt2 = scalar, F32, 1000, "", 1, 0 desiredRpmLimit = scalar, S16, 1004, "rpm", 1, 0 -; total TS size = 1008 -tpsFrom = scalar, F32, 1008 -tpsTo = scalar, F32, 1012 -deltaTps = scalar, F32, 1016 -extraFuel = scalar, F32, 1020, "", 1, 0 -valueFromTable = scalar, F32, 1024, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1028, [0:0] -isBelowDecelThreshold = bits, U32, 1028, [1:1] -isTimeToResetAccumulator = bits, U32, 1028, [2:2] -isFractionalEnrichment = bits, U32, 1028, [3:3] -belowEpsilon = bits, U32, 1028, [4:4] -tooShort = bits, U32, 1028, [5:5] -unusedBit_11_6 = bits, U32, 1028, [6:6] -unusedBit_11_7 = bits, U32, 1028, [7:7] -unusedBit_11_8 = bits, U32, 1028, [8:8] -unusedBit_11_9 = bits, U32, 1028, [9:9] -unusedBit_11_10 = bits, U32, 1028, [10:10] -unusedBit_11_11 = bits, U32, 1028, [11:11] -unusedBit_11_12 = bits, U32, 1028, [12:12] -unusedBit_11_13 = bits, U32, 1028, [13:13] -unusedBit_11_14 = bits, U32, 1028, [14:14] -unusedBit_11_15 = bits, U32, 1028, [15:15] -unusedBit_11_16 = bits, U32, 1028, [16:16] -unusedBit_11_17 = bits, U32, 1028, [17:17] -unusedBit_11_18 = bits, U32, 1028, [18:18] -unusedBit_11_19 = bits, U32, 1028, [19:19] -unusedBit_11_20 = bits, U32, 1028, [20:20] -unusedBit_11_21 = bits, U32, 1028, [21:21] -unusedBit_11_22 = bits, U32, 1028, [22:22] -unusedBit_11_23 = bits, U32, 1028, [23:23] -unusedBit_11_24 = bits, U32, 1028, [24:24] -unusedBit_11_25 = bits, U32, 1028, [25:25] -unusedBit_11_26 = bits, U32, 1028, [26:26] -unusedBit_11_27 = bits, U32, 1028, [27:27] -unusedBit_11_28 = bits, U32, 1028, [28:28] -unusedBit_11_29 = bits, U32, 1028, [29:29] -unusedBit_11_30 = bits, U32, 1028, [30:30] -unusedBit_11_31 = bits, U32, 1028, [31:31] -fractionalInjFuel = scalar, F32, 1032, "", 1, 0 -accumulatedValue = scalar, F32, 1036, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1040, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1044, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1048, "", 1, 0 -cycleCnt = scalar, S32, 1052, "", 1, 0 -; total TS size = 1056 -hwEventCounters1 = scalar, S32, 1056, "", 1, 0 -hwEventCounters2 = scalar, S32, 1060, "", 1, 0 -hwEventCounters3 = scalar, S32, 1064, "", 1, 0 -hwEventCounters4 = scalar, S32, 1068, "", 1, 0 -hwEventCounters5 = scalar, S32, 1072, "", 1, 0 -hwEventCounters6 = scalar, S32, 1076, "", 1, 0 -vvtCamCounter = scalar, S32, 1080, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1084, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1088, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1092, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1093, "", 1, 0 -; total TS size = 1096 -totalRevolutionCounter = scalar, U32, 1096, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1100, "", 1, 0 -vvtCurrentPosition = scalar, F32, 1104, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1108, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 1112, "", 1, 0 -triggerStateIndex = scalar, U08, 1116, "", 1, 0 -vvtCounter = scalar, U08, 1117, "", 1, 0 -camResyncCounter = scalar, U08, 1118, "", 1, 0 -vvtStateIndex = scalar, U08, 1119, "", 1, 0 -; total TS size = 1120 -m_hasSynchronizedPhase = bits, U32, 1120, [0:0] -unusedBit_1_1 = bits, U32, 1120, [1:1] -unusedBit_1_2 = bits, U32, 1120, [2:2] -unusedBit_1_3 = bits, U32, 1120, [3:3] -unusedBit_1_4 = bits, U32, 1120, [4:4] -unusedBit_1_5 = bits, U32, 1120, [5:5] -unusedBit_1_6 = bits, U32, 1120, [6:6] -unusedBit_1_7 = bits, U32, 1120, [7:7] -unusedBit_1_8 = bits, U32, 1120, [8:8] -unusedBit_1_9 = bits, U32, 1120, [9:9] -unusedBit_1_10 = bits, U32, 1120, [10:10] -unusedBit_1_11 = bits, U32, 1120, [11:11] -unusedBit_1_12 = bits, U32, 1120, [12:12] -unusedBit_1_13 = bits, U32, 1120, [13:13] -unusedBit_1_14 = bits, U32, 1120, [14:14] -unusedBit_1_15 = bits, U32, 1120, [15:15] -unusedBit_1_16 = bits, U32, 1120, [16:16] -unusedBit_1_17 = bits, U32, 1120, [17:17] -unusedBit_1_18 = bits, U32, 1120, [18:18] -unusedBit_1_19 = bits, U32, 1120, [19:19] -unusedBit_1_20 = bits, U32, 1120, [20:20] -unusedBit_1_21 = bits, U32, 1120, [21:21] -unusedBit_1_22 = bits, U32, 1120, [22:22] -unusedBit_1_23 = bits, U32, 1120, [23:23] -unusedBit_1_24 = bits, U32, 1120, [24:24] -unusedBit_1_25 = bits, U32, 1120, [25:25] -unusedBit_1_26 = bits, U32, 1120, [26:26] -unusedBit_1_27 = bits, U32, 1120, [27:27] -unusedBit_1_28 = bits, U32, 1120, [28:28] -unusedBit_1_29 = bits, U32, 1120, [29:29] -unusedBit_1_30 = bits, U32, 1120, [30:30] -unusedBit_1_31 = bits, U32, 1120, [31:31] -; total TS size = 1124 -wallFuelCorrection = scalar, F32, 1124, "", 1, 0 -wallFuel = scalar, F32, 1128, "", 1, 0 +fuelInjectionCounter = scalar, S32, 1008, "", 1, 0 +sparkCounter = scalar, S32, 1012, "", 1, 0 +; total TS size = 1016 +tpsFrom = scalar, F32, 1016 +tpsTo = scalar, F32, 1020 +deltaTps = scalar, F32, 1024 +extraFuel = scalar, F32, 1028, "", 1, 0 +valueFromTable = scalar, F32, 1032, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1036, [0:0] +isBelowDecelThreshold = bits, U32, 1036, [1:1] +isTimeToResetAccumulator = bits, U32, 1036, [2:2] +isFractionalEnrichment = bits, U32, 1036, [3:3] +belowEpsilon = bits, U32, 1036, [4:4] +tooShort = bits, U32, 1036, [5:5] +unusedBit_11_6 = bits, U32, 1036, [6:6] +unusedBit_11_7 = bits, U32, 1036, [7:7] +unusedBit_11_8 = bits, U32, 1036, [8:8] +unusedBit_11_9 = bits, U32, 1036, [9:9] +unusedBit_11_10 = bits, U32, 1036, [10:10] +unusedBit_11_11 = bits, U32, 1036, [11:11] +unusedBit_11_12 = bits, U32, 1036, [12:12] +unusedBit_11_13 = bits, U32, 1036, [13:13] +unusedBit_11_14 = bits, U32, 1036, [14:14] +unusedBit_11_15 = bits, U32, 1036, [15:15] +unusedBit_11_16 = bits, U32, 1036, [16:16] +unusedBit_11_17 = bits, U32, 1036, [17:17] +unusedBit_11_18 = bits, U32, 1036, [18:18] +unusedBit_11_19 = bits, U32, 1036, [19:19] +unusedBit_11_20 = bits, U32, 1036, [20:20] +unusedBit_11_21 = bits, U32, 1036, [21:21] +unusedBit_11_22 = bits, U32, 1036, [22:22] +unusedBit_11_23 = bits, U32, 1036, [23:23] +unusedBit_11_24 = bits, U32, 1036, [24:24] +unusedBit_11_25 = bits, U32, 1036, [25:25] +unusedBit_11_26 = bits, U32, 1036, [26:26] +unusedBit_11_27 = bits, U32, 1036, [27:27] +unusedBit_11_28 = bits, U32, 1036, [28:28] +unusedBit_11_29 = bits, U32, 1036, [29:29] +unusedBit_11_30 = bits, U32, 1036, [30:30] +unusedBit_11_31 = bits, U32, 1036, [31:31] +fractionalInjFuel = scalar, F32, 1040, "", 1, 0 +accumulatedValue = scalar, F32, 1044, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1048, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1052, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1056, "", 1, 0 +cycleCnt = scalar, S32, 1060, "", 1, 0 +; total TS size = 1064 +hwEventCounters1 = scalar, S32, 1064, "", 1, 0 +hwEventCounters2 = scalar, S32, 1068, "", 1, 0 +hwEventCounters3 = scalar, S32, 1072, "", 1, 0 +hwEventCounters4 = scalar, S32, 1076, "", 1, 0 +hwEventCounters5 = scalar, S32, 1080, "", 1, 0 +hwEventCounters6 = scalar, S32, 1084, "", 1, 0 +vvtCamCounter = scalar, S32, 1088, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1092, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1096, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1100, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1101, "", 1, 0 +; total TS size = 1104 +totalRevolutionCounter = scalar, U32, 1104, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1108, "", 1, 0 +vvtCurrentPosition = scalar, F32, 1112, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1116, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 1120, "", 1, 0 +triggerStateIndex = scalar, U08, 1124, "", 1, 0 +vvtCounter = scalar, U08, 1125, "", 1, 0 +camResyncCounter = scalar, U08, 1126, "", 1, 0 +vvtStateIndex = scalar, U08, 1127, "", 1, 0 +; total TS size = 1128 +m_hasSynchronizedPhase = bits, U32, 1128, [0:0] +unusedBit_1_1 = bits, U32, 1128, [1:1] +unusedBit_1_2 = bits, U32, 1128, [2:2] +unusedBit_1_3 = bits, U32, 1128, [3:3] +unusedBit_1_4 = bits, U32, 1128, [4:4] +unusedBit_1_5 = bits, U32, 1128, [5:5] +unusedBit_1_6 = bits, U32, 1128, [6:6] +unusedBit_1_7 = bits, U32, 1128, [7:7] +unusedBit_1_8 = bits, U32, 1128, [8:8] +unusedBit_1_9 = bits, U32, 1128, [9:9] +unusedBit_1_10 = bits, U32, 1128, [10:10] +unusedBit_1_11 = bits, U32, 1128, [11:11] +unusedBit_1_12 = bits, U32, 1128, [12:12] +unusedBit_1_13 = bits, U32, 1128, [13:13] +unusedBit_1_14 = bits, U32, 1128, [14:14] +unusedBit_1_15 = bits, U32, 1128, [15:15] +unusedBit_1_16 = bits, U32, 1128, [16:16] +unusedBit_1_17 = bits, U32, 1128, [17:17] +unusedBit_1_18 = bits, U32, 1128, [18:18] +unusedBit_1_19 = bits, U32, 1128, [19:19] +unusedBit_1_20 = bits, U32, 1128, [20:20] +unusedBit_1_21 = bits, U32, 1128, [21:21] +unusedBit_1_22 = bits, U32, 1128, [22:22] +unusedBit_1_23 = bits, U32, 1128, [23:23] +unusedBit_1_24 = bits, U32, 1128, [24:24] +unusedBit_1_25 = bits, U32, 1128, [25:25] +unusedBit_1_26 = bits, U32, 1128, [26:26] +unusedBit_1_27 = bits, U32, 1128, [27:27] +unusedBit_1_28 = bits, U32, 1128, [28:28] +unusedBit_1_29 = bits, U32, 1128, [29:29] +unusedBit_1_30 = bits, U32, 1128, [30:30] +unusedBit_1_31 = bits, U32, 1128, [31:31] ; total TS size = 1132 -idleState = bits, S32, 1132, [0:2], "not important" -currentIdlePosition = scalar, F32, 1136 -baseIdlePosition = scalar, F32, 1140 -iacByTpsTaper = scalar, F32, 1144 -throttlePedalUpState = scalar, S32, 1148, "", 1, 0 -mightResetPid = bits, U32, 1152, [0:0] -shouldResetPid = bits, U32, 1152, [1:1] -wasResetPid = bits, U32, 1152, [2:2] -mustResetPid = bits, U32, 1152, [3:3] -isCoasting = bits, U32, 1152, [4:4] -useIacTableForCoasting = bits, U32, 1152, [5:5] -notIdling = bits, U32, 1152, [6:6] -needReset = bits, U32, 1152, [7:7] -isInDeadZone = bits, U32, 1152, [8:8] -isBlipping = bits, U32, 1152, [9:9] -useClosedLoop = bits, U32, 1152, [10:10] -badTps = bits, U32, 1152, [11:11] -looksLikeRunning = bits, U32, 1152, [12:12] -looksLikeCoasting = bits, U32, 1152, [13:13] -looksLikeCrankToIdle = bits, U32, 1152, [14:14] -useInstantRpmForIdle = bits, U32, 1152, [15:15] -isVerboseIAC = bits, U32, 1152, [16:16] -unusedBit_22_17 = bits, U32, 1152, [17:17] -unusedBit_22_18 = bits, U32, 1152, [18:18] -unusedBit_22_19 = bits, U32, 1152, [19:19] -unusedBit_22_20 = bits, U32, 1152, [20:20] -unusedBit_22_21 = bits, U32, 1152, [21:21] -unusedBit_22_22 = bits, U32, 1152, [22:22] -unusedBit_22_23 = bits, U32, 1152, [23:23] -unusedBit_22_24 = bits, U32, 1152, [24:24] -unusedBit_22_25 = bits, U32, 1152, [25:25] -unusedBit_22_26 = bits, U32, 1152, [26:26] -unusedBit_22_27 = bits, U32, 1152, [27:27] -unusedBit_22_28 = bits, U32, 1152, [28:28] -unusedBit_22_29 = bits, U32, 1152, [29:29] -unusedBit_22_30 = bits, U32, 1152, [30:30] -unusedBit_22_31 = bits, U32, 1152, [31:31] -targetRpmByClt = scalar, S32, 1156, "", 1, 0 -targetRpmAcBump = scalar, S32, 1160, "", 1, 0 -iacByRpmTaper = scalar, F32, 1164 -luaAdd = scalar, F32, 1168 -; total TS size = 1172 -baseDwell = scalar, F32, 1172, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 1176, "", 1, 0 -luaTimingAdd = scalar, F32, 1180, "", 1, 0 -luaTimingMult = scalar, F32, 1184, "", 1, 0 -; total TS size = 1188 -idlePosition = scalar, F32, 1188, "", 1, 0 -trim = scalar, F32, 1192, "", 1, 0 -luaAdjustment = scalar, F32, 1196, "", 1, 0 -etbFeedForward = scalar, F32, 1200 -etbIntegralError = scalar, F32, 1204, "", 1, 0 -etbCurrentTarget = scalar, F32, 1208, "%", 1, 0 -; total TS size = 1212 -faultCode = scalar, U08, 1212, "", 1, 0 -heaterDuty = scalar, U08, 1213, "%", 1, 0 -pumpDuty = scalar, U08, 1214, "%", 1, 0 -tempC = scalar, U16, 1216, "C", 1, 0 -nernstVoltage = scalar, U16, 1218, "V", 0.001, 0 -esr = scalar, U16, 1220, "", 1, 0 -; total TS size = 1224 +wallFuelCorrection = scalar, F32, 1132, "", 1, 0 +wallFuel = scalar, F32, 1136, "", 1, 0 +; total TS size = 1140 +idleState = bits, S32, 1140, [0:2], "not important" +currentIdlePosition = scalar, F32, 1144 +baseIdlePosition = scalar, F32, 1148 +iacByTpsTaper = scalar, F32, 1152 +throttlePedalUpState = scalar, S32, 1156, "", 1, 0 +mightResetPid = bits, U32, 1160, [0:0] +shouldResetPid = bits, U32, 1160, [1:1] +wasResetPid = bits, U32, 1160, [2:2] +mustResetPid = bits, U32, 1160, [3:3] +isCoasting = bits, U32, 1160, [4:4] +useIacTableForCoasting = bits, U32, 1160, [5:5] +notIdling = bits, U32, 1160, [6:6] +needReset = bits, U32, 1160, [7:7] +isInDeadZone = bits, U32, 1160, [8:8] +isBlipping = bits, U32, 1160, [9:9] +useClosedLoop = bits, U32, 1160, [10:10] +badTps = bits, U32, 1160, [11:11] +looksLikeRunning = bits, U32, 1160, [12:12] +looksLikeCoasting = bits, U32, 1160, [13:13] +looksLikeCrankToIdle = bits, U32, 1160, [14:14] +useInstantRpmForIdle = bits, U32, 1160, [15:15] +isVerboseIAC = bits, U32, 1160, [16:16] +unusedBit_22_17 = bits, U32, 1160, [17:17] +unusedBit_22_18 = bits, U32, 1160, [18:18] +unusedBit_22_19 = bits, U32, 1160, [19:19] +unusedBit_22_20 = bits, U32, 1160, [20:20] +unusedBit_22_21 = bits, U32, 1160, [21:21] +unusedBit_22_22 = bits, U32, 1160, [22:22] +unusedBit_22_23 = bits, U32, 1160, [23:23] +unusedBit_22_24 = bits, U32, 1160, [24:24] +unusedBit_22_25 = bits, U32, 1160, [25:25] +unusedBit_22_26 = bits, U32, 1160, [26:26] +unusedBit_22_27 = bits, U32, 1160, [27:27] +unusedBit_22_28 = bits, U32, 1160, [28:28] +unusedBit_22_29 = bits, U32, 1160, [29:29] +unusedBit_22_30 = bits, U32, 1160, [30:30] +unusedBit_22_31 = bits, U32, 1160, [31:31] +targetRpmByClt = scalar, S32, 1164, "", 1, 0 +targetRpmAcBump = scalar, S32, 1168, "", 1, 0 +iacByRpmTaper = scalar, F32, 1172 +luaAdd = scalar, F32, 1176 +; total TS size = 1180 +baseDwell = scalar, F32, 1180, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 1184, "", 1, 0 +luaTimingAdd = scalar, F32, 1188, "", 1, 0 +luaTimingMult = scalar, F32, 1192, "", 1, 0 +; total TS size = 1196 +idlePosition = scalar, F32, 1196, "", 1, 0 +trim = scalar, F32, 1200, "", 1, 0 +luaAdjustment = scalar, F32, 1204, "", 1, 0 +etbFeedForward = scalar, F32, 1208 +etbIntegralError = scalar, F32, 1212, "", 1, 0 +etbCurrentTarget = scalar, F32, 1216, "%", 1, 0 +; total TS size = 1220 +faultCode = scalar, U08, 1220, "", 1, 0 +heaterDuty = scalar, U08, 1221, "%", 1, 0 +pumpDuty = scalar, U08, 1222, "%", 1, 0 +tempC = scalar, U16, 1224, "C", 1, 0 +nernstVoltage = scalar, U16, 1226, "V", 0.001, 0 +esr = scalar, U16, 1228, "", 1, 0 +; total TS size = 1232 time = { timeNow } @@ -4757,6 +4759,8 @@ entry = brakePedalState, "brake: down", int, "%d" entry = egt1, "egt1", float, "%.3f" entry = egt2, "egt2", float, "%.3f" entry = desiredRpmLimit, "User-defined RPM hard limit", int, "%d" +entry = fuelInjectionCounter, "fuelInjectionCounter", int, "%d" +entry = sparkCounter, "sparkCounter", int, "%d" entry = tpsFrom, "tpsFrom", float, "%.3f" entry = tpsTo, "tpsTo", float, "%.3f" entry = deltaTps, "deltaTps", float, "%.3f" @@ -5495,6 +5499,8 @@ dialog = engine_stateDialog, "engine_state" graphLine = egt2 liveGraph = engine_state_10_Graph, "Graph", South graphLine = desiredRpmLimit + graphLine = fuelInjectionCounter + graphLine = sparkCounter indicatorPanel = tps_accel_stateIndicatorPanel, 2 indicator = {isAboveAccelThreshold}, "isAboveAccelThreshold No", "isAboveAccelThreshold Yes" diff --git a/firmware/tunerstudio/generated/rusefi_proteus_h7.ini b/firmware/tunerstudio/generated/rusefi_proteus_h7.ini index 99a3a6e492..c7ab4a15a9 100644 --- a/firmware/tunerstudio/generated/rusefi_proteus_h7.ini +++ b/firmware/tunerstudio/generated/rusefi_proteus_h7.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.08.25.proteus_h7.3620146280" + signature = "rusEFI 2022.08.25.proteus_h7.666867740" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.08.25.proteus_h7.3620146280" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.08.25.proteus_h7.666867740" ; 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 @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Aug 25 14:52:05 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Aug 25 22:50:48 UTC 2022 pageSize = 21300 page = 1 @@ -2109,7 +2109,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1224 + ochBlockSize = 1232 ; ; see TunerStudioOutputChannels struct @@ -3022,170 +3022,172 @@ unusedBit_22_31 = bits, U32, 992, [31:31] egt1 = scalar, F32, 996, "", 1, 0 egt2 = scalar, F32, 1000, "", 1, 0 desiredRpmLimit = scalar, S16, 1004, "rpm", 1, 0 -; total TS size = 1008 -tpsFrom = scalar, F32, 1008 -tpsTo = scalar, F32, 1012 -deltaTps = scalar, F32, 1016 -extraFuel = scalar, F32, 1020, "", 1, 0 -valueFromTable = scalar, F32, 1024, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1028, [0:0] -isBelowDecelThreshold = bits, U32, 1028, [1:1] -isTimeToResetAccumulator = bits, U32, 1028, [2:2] -isFractionalEnrichment = bits, U32, 1028, [3:3] -belowEpsilon = bits, U32, 1028, [4:4] -tooShort = bits, U32, 1028, [5:5] -unusedBit_11_6 = bits, U32, 1028, [6:6] -unusedBit_11_7 = bits, U32, 1028, [7:7] -unusedBit_11_8 = bits, U32, 1028, [8:8] -unusedBit_11_9 = bits, U32, 1028, [9:9] -unusedBit_11_10 = bits, U32, 1028, [10:10] -unusedBit_11_11 = bits, U32, 1028, [11:11] -unusedBit_11_12 = bits, U32, 1028, [12:12] -unusedBit_11_13 = bits, U32, 1028, [13:13] -unusedBit_11_14 = bits, U32, 1028, [14:14] -unusedBit_11_15 = bits, U32, 1028, [15:15] -unusedBit_11_16 = bits, U32, 1028, [16:16] -unusedBit_11_17 = bits, U32, 1028, [17:17] -unusedBit_11_18 = bits, U32, 1028, [18:18] -unusedBit_11_19 = bits, U32, 1028, [19:19] -unusedBit_11_20 = bits, U32, 1028, [20:20] -unusedBit_11_21 = bits, U32, 1028, [21:21] -unusedBit_11_22 = bits, U32, 1028, [22:22] -unusedBit_11_23 = bits, U32, 1028, [23:23] -unusedBit_11_24 = bits, U32, 1028, [24:24] -unusedBit_11_25 = bits, U32, 1028, [25:25] -unusedBit_11_26 = bits, U32, 1028, [26:26] -unusedBit_11_27 = bits, U32, 1028, [27:27] -unusedBit_11_28 = bits, U32, 1028, [28:28] -unusedBit_11_29 = bits, U32, 1028, [29:29] -unusedBit_11_30 = bits, U32, 1028, [30:30] -unusedBit_11_31 = bits, U32, 1028, [31:31] -fractionalInjFuel = scalar, F32, 1032, "", 1, 0 -accumulatedValue = scalar, F32, 1036, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1040, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1044, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1048, "", 1, 0 -cycleCnt = scalar, S32, 1052, "", 1, 0 -; total TS size = 1056 -hwEventCounters1 = scalar, S32, 1056, "", 1, 0 -hwEventCounters2 = scalar, S32, 1060, "", 1, 0 -hwEventCounters3 = scalar, S32, 1064, "", 1, 0 -hwEventCounters4 = scalar, S32, 1068, "", 1, 0 -hwEventCounters5 = scalar, S32, 1072, "", 1, 0 -hwEventCounters6 = scalar, S32, 1076, "", 1, 0 -vvtCamCounter = scalar, S32, 1080, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1084, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1088, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1092, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1093, "", 1, 0 -; total TS size = 1096 -totalRevolutionCounter = scalar, U32, 1096, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1100, "", 1, 0 -vvtCurrentPosition = scalar, F32, 1104, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1108, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 1112, "", 1, 0 -triggerStateIndex = scalar, U08, 1116, "", 1, 0 -vvtCounter = scalar, U08, 1117, "", 1, 0 -camResyncCounter = scalar, U08, 1118, "", 1, 0 -vvtStateIndex = scalar, U08, 1119, "", 1, 0 -; total TS size = 1120 -m_hasSynchronizedPhase = bits, U32, 1120, [0:0] -unusedBit_1_1 = bits, U32, 1120, [1:1] -unusedBit_1_2 = bits, U32, 1120, [2:2] -unusedBit_1_3 = bits, U32, 1120, [3:3] -unusedBit_1_4 = bits, U32, 1120, [4:4] -unusedBit_1_5 = bits, U32, 1120, [5:5] -unusedBit_1_6 = bits, U32, 1120, [6:6] -unusedBit_1_7 = bits, U32, 1120, [7:7] -unusedBit_1_8 = bits, U32, 1120, [8:8] -unusedBit_1_9 = bits, U32, 1120, [9:9] -unusedBit_1_10 = bits, U32, 1120, [10:10] -unusedBit_1_11 = bits, U32, 1120, [11:11] -unusedBit_1_12 = bits, U32, 1120, [12:12] -unusedBit_1_13 = bits, U32, 1120, [13:13] -unusedBit_1_14 = bits, U32, 1120, [14:14] -unusedBit_1_15 = bits, U32, 1120, [15:15] -unusedBit_1_16 = bits, U32, 1120, [16:16] -unusedBit_1_17 = bits, U32, 1120, [17:17] -unusedBit_1_18 = bits, U32, 1120, [18:18] -unusedBit_1_19 = bits, U32, 1120, [19:19] -unusedBit_1_20 = bits, U32, 1120, [20:20] -unusedBit_1_21 = bits, U32, 1120, [21:21] -unusedBit_1_22 = bits, U32, 1120, [22:22] -unusedBit_1_23 = bits, U32, 1120, [23:23] -unusedBit_1_24 = bits, U32, 1120, [24:24] -unusedBit_1_25 = bits, U32, 1120, [25:25] -unusedBit_1_26 = bits, U32, 1120, [26:26] -unusedBit_1_27 = bits, U32, 1120, [27:27] -unusedBit_1_28 = bits, U32, 1120, [28:28] -unusedBit_1_29 = bits, U32, 1120, [29:29] -unusedBit_1_30 = bits, U32, 1120, [30:30] -unusedBit_1_31 = bits, U32, 1120, [31:31] -; total TS size = 1124 -wallFuelCorrection = scalar, F32, 1124, "", 1, 0 -wallFuel = scalar, F32, 1128, "", 1, 0 +fuelInjectionCounter = scalar, S32, 1008, "", 1, 0 +sparkCounter = scalar, S32, 1012, "", 1, 0 +; total TS size = 1016 +tpsFrom = scalar, F32, 1016 +tpsTo = scalar, F32, 1020 +deltaTps = scalar, F32, 1024 +extraFuel = scalar, F32, 1028, "", 1, 0 +valueFromTable = scalar, F32, 1032, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1036, [0:0] +isBelowDecelThreshold = bits, U32, 1036, [1:1] +isTimeToResetAccumulator = bits, U32, 1036, [2:2] +isFractionalEnrichment = bits, U32, 1036, [3:3] +belowEpsilon = bits, U32, 1036, [4:4] +tooShort = bits, U32, 1036, [5:5] +unusedBit_11_6 = bits, U32, 1036, [6:6] +unusedBit_11_7 = bits, U32, 1036, [7:7] +unusedBit_11_8 = bits, U32, 1036, [8:8] +unusedBit_11_9 = bits, U32, 1036, [9:9] +unusedBit_11_10 = bits, U32, 1036, [10:10] +unusedBit_11_11 = bits, U32, 1036, [11:11] +unusedBit_11_12 = bits, U32, 1036, [12:12] +unusedBit_11_13 = bits, U32, 1036, [13:13] +unusedBit_11_14 = bits, U32, 1036, [14:14] +unusedBit_11_15 = bits, U32, 1036, [15:15] +unusedBit_11_16 = bits, U32, 1036, [16:16] +unusedBit_11_17 = bits, U32, 1036, [17:17] +unusedBit_11_18 = bits, U32, 1036, [18:18] +unusedBit_11_19 = bits, U32, 1036, [19:19] +unusedBit_11_20 = bits, U32, 1036, [20:20] +unusedBit_11_21 = bits, U32, 1036, [21:21] +unusedBit_11_22 = bits, U32, 1036, [22:22] +unusedBit_11_23 = bits, U32, 1036, [23:23] +unusedBit_11_24 = bits, U32, 1036, [24:24] +unusedBit_11_25 = bits, U32, 1036, [25:25] +unusedBit_11_26 = bits, U32, 1036, [26:26] +unusedBit_11_27 = bits, U32, 1036, [27:27] +unusedBit_11_28 = bits, U32, 1036, [28:28] +unusedBit_11_29 = bits, U32, 1036, [29:29] +unusedBit_11_30 = bits, U32, 1036, [30:30] +unusedBit_11_31 = bits, U32, 1036, [31:31] +fractionalInjFuel = scalar, F32, 1040, "", 1, 0 +accumulatedValue = scalar, F32, 1044, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1048, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1052, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1056, "", 1, 0 +cycleCnt = scalar, S32, 1060, "", 1, 0 +; total TS size = 1064 +hwEventCounters1 = scalar, S32, 1064, "", 1, 0 +hwEventCounters2 = scalar, S32, 1068, "", 1, 0 +hwEventCounters3 = scalar, S32, 1072, "", 1, 0 +hwEventCounters4 = scalar, S32, 1076, "", 1, 0 +hwEventCounters5 = scalar, S32, 1080, "", 1, 0 +hwEventCounters6 = scalar, S32, 1084, "", 1, 0 +vvtCamCounter = scalar, S32, 1088, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1092, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1096, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1100, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1101, "", 1, 0 +; total TS size = 1104 +totalRevolutionCounter = scalar, U32, 1104, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1108, "", 1, 0 +vvtCurrentPosition = scalar, F32, 1112, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1116, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 1120, "", 1, 0 +triggerStateIndex = scalar, U08, 1124, "", 1, 0 +vvtCounter = scalar, U08, 1125, "", 1, 0 +camResyncCounter = scalar, U08, 1126, "", 1, 0 +vvtStateIndex = scalar, U08, 1127, "", 1, 0 +; total TS size = 1128 +m_hasSynchronizedPhase = bits, U32, 1128, [0:0] +unusedBit_1_1 = bits, U32, 1128, [1:1] +unusedBit_1_2 = bits, U32, 1128, [2:2] +unusedBit_1_3 = bits, U32, 1128, [3:3] +unusedBit_1_4 = bits, U32, 1128, [4:4] +unusedBit_1_5 = bits, U32, 1128, [5:5] +unusedBit_1_6 = bits, U32, 1128, [6:6] +unusedBit_1_7 = bits, U32, 1128, [7:7] +unusedBit_1_8 = bits, U32, 1128, [8:8] +unusedBit_1_9 = bits, U32, 1128, [9:9] +unusedBit_1_10 = bits, U32, 1128, [10:10] +unusedBit_1_11 = bits, U32, 1128, [11:11] +unusedBit_1_12 = bits, U32, 1128, [12:12] +unusedBit_1_13 = bits, U32, 1128, [13:13] +unusedBit_1_14 = bits, U32, 1128, [14:14] +unusedBit_1_15 = bits, U32, 1128, [15:15] +unusedBit_1_16 = bits, U32, 1128, [16:16] +unusedBit_1_17 = bits, U32, 1128, [17:17] +unusedBit_1_18 = bits, U32, 1128, [18:18] +unusedBit_1_19 = bits, U32, 1128, [19:19] +unusedBit_1_20 = bits, U32, 1128, [20:20] +unusedBit_1_21 = bits, U32, 1128, [21:21] +unusedBit_1_22 = bits, U32, 1128, [22:22] +unusedBit_1_23 = bits, U32, 1128, [23:23] +unusedBit_1_24 = bits, U32, 1128, [24:24] +unusedBit_1_25 = bits, U32, 1128, [25:25] +unusedBit_1_26 = bits, U32, 1128, [26:26] +unusedBit_1_27 = bits, U32, 1128, [27:27] +unusedBit_1_28 = bits, U32, 1128, [28:28] +unusedBit_1_29 = bits, U32, 1128, [29:29] +unusedBit_1_30 = bits, U32, 1128, [30:30] +unusedBit_1_31 = bits, U32, 1128, [31:31] ; total TS size = 1132 -idleState = bits, S32, 1132, [0:2], "not important" -currentIdlePosition = scalar, F32, 1136 -baseIdlePosition = scalar, F32, 1140 -iacByTpsTaper = scalar, F32, 1144 -throttlePedalUpState = scalar, S32, 1148, "", 1, 0 -mightResetPid = bits, U32, 1152, [0:0] -shouldResetPid = bits, U32, 1152, [1:1] -wasResetPid = bits, U32, 1152, [2:2] -mustResetPid = bits, U32, 1152, [3:3] -isCoasting = bits, U32, 1152, [4:4] -useIacTableForCoasting = bits, U32, 1152, [5:5] -notIdling = bits, U32, 1152, [6:6] -needReset = bits, U32, 1152, [7:7] -isInDeadZone = bits, U32, 1152, [8:8] -isBlipping = bits, U32, 1152, [9:9] -useClosedLoop = bits, U32, 1152, [10:10] -badTps = bits, U32, 1152, [11:11] -looksLikeRunning = bits, U32, 1152, [12:12] -looksLikeCoasting = bits, U32, 1152, [13:13] -looksLikeCrankToIdle = bits, U32, 1152, [14:14] -useInstantRpmForIdle = bits, U32, 1152, [15:15] -isVerboseIAC = bits, U32, 1152, [16:16] -unusedBit_22_17 = bits, U32, 1152, [17:17] -unusedBit_22_18 = bits, U32, 1152, [18:18] -unusedBit_22_19 = bits, U32, 1152, [19:19] -unusedBit_22_20 = bits, U32, 1152, [20:20] -unusedBit_22_21 = bits, U32, 1152, [21:21] -unusedBit_22_22 = bits, U32, 1152, [22:22] -unusedBit_22_23 = bits, U32, 1152, [23:23] -unusedBit_22_24 = bits, U32, 1152, [24:24] -unusedBit_22_25 = bits, U32, 1152, [25:25] -unusedBit_22_26 = bits, U32, 1152, [26:26] -unusedBit_22_27 = bits, U32, 1152, [27:27] -unusedBit_22_28 = bits, U32, 1152, [28:28] -unusedBit_22_29 = bits, U32, 1152, [29:29] -unusedBit_22_30 = bits, U32, 1152, [30:30] -unusedBit_22_31 = bits, U32, 1152, [31:31] -targetRpmByClt = scalar, S32, 1156, "", 1, 0 -targetRpmAcBump = scalar, S32, 1160, "", 1, 0 -iacByRpmTaper = scalar, F32, 1164 -luaAdd = scalar, F32, 1168 -; total TS size = 1172 -baseDwell = scalar, F32, 1172, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 1176, "", 1, 0 -luaTimingAdd = scalar, F32, 1180, "", 1, 0 -luaTimingMult = scalar, F32, 1184, "", 1, 0 -; total TS size = 1188 -idlePosition = scalar, F32, 1188, "", 1, 0 -trim = scalar, F32, 1192, "", 1, 0 -luaAdjustment = scalar, F32, 1196, "", 1, 0 -etbFeedForward = scalar, F32, 1200 -etbIntegralError = scalar, F32, 1204, "", 1, 0 -etbCurrentTarget = scalar, F32, 1208, "%", 1, 0 -; total TS size = 1212 -faultCode = scalar, U08, 1212, "", 1, 0 -heaterDuty = scalar, U08, 1213, "%", 1, 0 -pumpDuty = scalar, U08, 1214, "%", 1, 0 -tempC = scalar, U16, 1216, "C", 1, 0 -nernstVoltage = scalar, U16, 1218, "V", 0.001, 0 -esr = scalar, U16, 1220, "", 1, 0 -; total TS size = 1224 +wallFuelCorrection = scalar, F32, 1132, "", 1, 0 +wallFuel = scalar, F32, 1136, "", 1, 0 +; total TS size = 1140 +idleState = bits, S32, 1140, [0:2], "not important" +currentIdlePosition = scalar, F32, 1144 +baseIdlePosition = scalar, F32, 1148 +iacByTpsTaper = scalar, F32, 1152 +throttlePedalUpState = scalar, S32, 1156, "", 1, 0 +mightResetPid = bits, U32, 1160, [0:0] +shouldResetPid = bits, U32, 1160, [1:1] +wasResetPid = bits, U32, 1160, [2:2] +mustResetPid = bits, U32, 1160, [3:3] +isCoasting = bits, U32, 1160, [4:4] +useIacTableForCoasting = bits, U32, 1160, [5:5] +notIdling = bits, U32, 1160, [6:6] +needReset = bits, U32, 1160, [7:7] +isInDeadZone = bits, U32, 1160, [8:8] +isBlipping = bits, U32, 1160, [9:9] +useClosedLoop = bits, U32, 1160, [10:10] +badTps = bits, U32, 1160, [11:11] +looksLikeRunning = bits, U32, 1160, [12:12] +looksLikeCoasting = bits, U32, 1160, [13:13] +looksLikeCrankToIdle = bits, U32, 1160, [14:14] +useInstantRpmForIdle = bits, U32, 1160, [15:15] +isVerboseIAC = bits, U32, 1160, [16:16] +unusedBit_22_17 = bits, U32, 1160, [17:17] +unusedBit_22_18 = bits, U32, 1160, [18:18] +unusedBit_22_19 = bits, U32, 1160, [19:19] +unusedBit_22_20 = bits, U32, 1160, [20:20] +unusedBit_22_21 = bits, U32, 1160, [21:21] +unusedBit_22_22 = bits, U32, 1160, [22:22] +unusedBit_22_23 = bits, U32, 1160, [23:23] +unusedBit_22_24 = bits, U32, 1160, [24:24] +unusedBit_22_25 = bits, U32, 1160, [25:25] +unusedBit_22_26 = bits, U32, 1160, [26:26] +unusedBit_22_27 = bits, U32, 1160, [27:27] +unusedBit_22_28 = bits, U32, 1160, [28:28] +unusedBit_22_29 = bits, U32, 1160, [29:29] +unusedBit_22_30 = bits, U32, 1160, [30:30] +unusedBit_22_31 = bits, U32, 1160, [31:31] +targetRpmByClt = scalar, S32, 1164, "", 1, 0 +targetRpmAcBump = scalar, S32, 1168, "", 1, 0 +iacByRpmTaper = scalar, F32, 1172 +luaAdd = scalar, F32, 1176 +; total TS size = 1180 +baseDwell = scalar, F32, 1180, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 1184, "", 1, 0 +luaTimingAdd = scalar, F32, 1188, "", 1, 0 +luaTimingMult = scalar, F32, 1192, "", 1, 0 +; total TS size = 1196 +idlePosition = scalar, F32, 1196, "", 1, 0 +trim = scalar, F32, 1200, "", 1, 0 +luaAdjustment = scalar, F32, 1204, "", 1, 0 +etbFeedForward = scalar, F32, 1208 +etbIntegralError = scalar, F32, 1212, "", 1, 0 +etbCurrentTarget = scalar, F32, 1216, "%", 1, 0 +; total TS size = 1220 +faultCode = scalar, U08, 1220, "", 1, 0 +heaterDuty = scalar, U08, 1221, "%", 1, 0 +pumpDuty = scalar, U08, 1222, "%", 1, 0 +tempC = scalar, U16, 1224, "C", 1, 0 +nernstVoltage = scalar, U16, 1226, "V", 0.001, 0 +esr = scalar, U16, 1228, "", 1, 0 +; total TS size = 1232 time = { timeNow } @@ -4757,6 +4759,8 @@ entry = brakePedalState, "brake: down", int, "%d" entry = egt1, "egt1", float, "%.3f" entry = egt2, "egt2", float, "%.3f" entry = desiredRpmLimit, "User-defined RPM hard limit", int, "%d" +entry = fuelInjectionCounter, "fuelInjectionCounter", int, "%d" +entry = sparkCounter, "sparkCounter", int, "%d" entry = tpsFrom, "tpsFrom", float, "%.3f" entry = tpsTo, "tpsTo", float, "%.3f" entry = deltaTps, "deltaTps", float, "%.3f" @@ -5495,6 +5499,8 @@ dialog = engine_stateDialog, "engine_state" graphLine = egt2 liveGraph = engine_state_10_Graph, "Graph", South graphLine = desiredRpmLimit + graphLine = fuelInjectionCounter + graphLine = sparkCounter indicatorPanel = tps_accel_stateIndicatorPanel, 2 indicator = {isAboveAccelThreshold}, "isAboveAccelThreshold No", "isAboveAccelThreshold Yes" diff --git a/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini b/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini index 1643f63659..5f7b30092b 100644 --- a/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.08.25.subaru_eg33_f7.1010269350" + signature = "rusEFI 2022.08.25.subaru_eg33_f7.3427789010" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.08.25.subaru_eg33_f7.1010269350" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.08.25.subaru_eg33_f7.3427789010" ; 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 @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on config/boards/subaru_eg33/config/gen_subaru_config.sh integration/rusefi_config.txt Thu Aug 25 14:51:13 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on config/boards/subaru_eg33/config/gen_subaru_config.sh integration/rusefi_config.txt Thu Aug 25 22:50:00 UTC 2022 pageSize = 21300 page = 1 @@ -2109,7 +2109,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1224 + ochBlockSize = 1232 ; ; see TunerStudioOutputChannels struct @@ -3022,170 +3022,172 @@ unusedBit_22_31 = bits, U32, 992, [31:31] egt1 = scalar, F32, 996, "", 1, 0 egt2 = scalar, F32, 1000, "", 1, 0 desiredRpmLimit = scalar, S16, 1004, "rpm", 1, 0 -; total TS size = 1008 -tpsFrom = scalar, F32, 1008 -tpsTo = scalar, F32, 1012 -deltaTps = scalar, F32, 1016 -extraFuel = scalar, F32, 1020, "", 1, 0 -valueFromTable = scalar, F32, 1024, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1028, [0:0] -isBelowDecelThreshold = bits, U32, 1028, [1:1] -isTimeToResetAccumulator = bits, U32, 1028, [2:2] -isFractionalEnrichment = bits, U32, 1028, [3:3] -belowEpsilon = bits, U32, 1028, [4:4] -tooShort = bits, U32, 1028, [5:5] -unusedBit_11_6 = bits, U32, 1028, [6:6] -unusedBit_11_7 = bits, U32, 1028, [7:7] -unusedBit_11_8 = bits, U32, 1028, [8:8] -unusedBit_11_9 = bits, U32, 1028, [9:9] -unusedBit_11_10 = bits, U32, 1028, [10:10] -unusedBit_11_11 = bits, U32, 1028, [11:11] -unusedBit_11_12 = bits, U32, 1028, [12:12] -unusedBit_11_13 = bits, U32, 1028, [13:13] -unusedBit_11_14 = bits, U32, 1028, [14:14] -unusedBit_11_15 = bits, U32, 1028, [15:15] -unusedBit_11_16 = bits, U32, 1028, [16:16] -unusedBit_11_17 = bits, U32, 1028, [17:17] -unusedBit_11_18 = bits, U32, 1028, [18:18] -unusedBit_11_19 = bits, U32, 1028, [19:19] -unusedBit_11_20 = bits, U32, 1028, [20:20] -unusedBit_11_21 = bits, U32, 1028, [21:21] -unusedBit_11_22 = bits, U32, 1028, [22:22] -unusedBit_11_23 = bits, U32, 1028, [23:23] -unusedBit_11_24 = bits, U32, 1028, [24:24] -unusedBit_11_25 = bits, U32, 1028, [25:25] -unusedBit_11_26 = bits, U32, 1028, [26:26] -unusedBit_11_27 = bits, U32, 1028, [27:27] -unusedBit_11_28 = bits, U32, 1028, [28:28] -unusedBit_11_29 = bits, U32, 1028, [29:29] -unusedBit_11_30 = bits, U32, 1028, [30:30] -unusedBit_11_31 = bits, U32, 1028, [31:31] -fractionalInjFuel = scalar, F32, 1032, "", 1, 0 -accumulatedValue = scalar, F32, 1036, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1040, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1044, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1048, "", 1, 0 -cycleCnt = scalar, S32, 1052, "", 1, 0 -; total TS size = 1056 -hwEventCounters1 = scalar, S32, 1056, "", 1, 0 -hwEventCounters2 = scalar, S32, 1060, "", 1, 0 -hwEventCounters3 = scalar, S32, 1064, "", 1, 0 -hwEventCounters4 = scalar, S32, 1068, "", 1, 0 -hwEventCounters5 = scalar, S32, 1072, "", 1, 0 -hwEventCounters6 = scalar, S32, 1076, "", 1, 0 -vvtCamCounter = scalar, S32, 1080, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1084, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1088, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1092, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1093, "", 1, 0 -; total TS size = 1096 -totalRevolutionCounter = scalar, U32, 1096, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1100, "", 1, 0 -vvtCurrentPosition = scalar, F32, 1104, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1108, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 1112, "", 1, 0 -triggerStateIndex = scalar, U08, 1116, "", 1, 0 -vvtCounter = scalar, U08, 1117, "", 1, 0 -camResyncCounter = scalar, U08, 1118, "", 1, 0 -vvtStateIndex = scalar, U08, 1119, "", 1, 0 -; total TS size = 1120 -m_hasSynchronizedPhase = bits, U32, 1120, [0:0] -unusedBit_1_1 = bits, U32, 1120, [1:1] -unusedBit_1_2 = bits, U32, 1120, [2:2] -unusedBit_1_3 = bits, U32, 1120, [3:3] -unusedBit_1_4 = bits, U32, 1120, [4:4] -unusedBit_1_5 = bits, U32, 1120, [5:5] -unusedBit_1_6 = bits, U32, 1120, [6:6] -unusedBit_1_7 = bits, U32, 1120, [7:7] -unusedBit_1_8 = bits, U32, 1120, [8:8] -unusedBit_1_9 = bits, U32, 1120, [9:9] -unusedBit_1_10 = bits, U32, 1120, [10:10] -unusedBit_1_11 = bits, U32, 1120, [11:11] -unusedBit_1_12 = bits, U32, 1120, [12:12] -unusedBit_1_13 = bits, U32, 1120, [13:13] -unusedBit_1_14 = bits, U32, 1120, [14:14] -unusedBit_1_15 = bits, U32, 1120, [15:15] -unusedBit_1_16 = bits, U32, 1120, [16:16] -unusedBit_1_17 = bits, U32, 1120, [17:17] -unusedBit_1_18 = bits, U32, 1120, [18:18] -unusedBit_1_19 = bits, U32, 1120, [19:19] -unusedBit_1_20 = bits, U32, 1120, [20:20] -unusedBit_1_21 = bits, U32, 1120, [21:21] -unusedBit_1_22 = bits, U32, 1120, [22:22] -unusedBit_1_23 = bits, U32, 1120, [23:23] -unusedBit_1_24 = bits, U32, 1120, [24:24] -unusedBit_1_25 = bits, U32, 1120, [25:25] -unusedBit_1_26 = bits, U32, 1120, [26:26] -unusedBit_1_27 = bits, U32, 1120, [27:27] -unusedBit_1_28 = bits, U32, 1120, [28:28] -unusedBit_1_29 = bits, U32, 1120, [29:29] -unusedBit_1_30 = bits, U32, 1120, [30:30] -unusedBit_1_31 = bits, U32, 1120, [31:31] -; total TS size = 1124 -wallFuelCorrection = scalar, F32, 1124, "", 1, 0 -wallFuel = scalar, F32, 1128, "", 1, 0 +fuelInjectionCounter = scalar, S32, 1008, "", 1, 0 +sparkCounter = scalar, S32, 1012, "", 1, 0 +; total TS size = 1016 +tpsFrom = scalar, F32, 1016 +tpsTo = scalar, F32, 1020 +deltaTps = scalar, F32, 1024 +extraFuel = scalar, F32, 1028, "", 1, 0 +valueFromTable = scalar, F32, 1032, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1036, [0:0] +isBelowDecelThreshold = bits, U32, 1036, [1:1] +isTimeToResetAccumulator = bits, U32, 1036, [2:2] +isFractionalEnrichment = bits, U32, 1036, [3:3] +belowEpsilon = bits, U32, 1036, [4:4] +tooShort = bits, U32, 1036, [5:5] +unusedBit_11_6 = bits, U32, 1036, [6:6] +unusedBit_11_7 = bits, U32, 1036, [7:7] +unusedBit_11_8 = bits, U32, 1036, [8:8] +unusedBit_11_9 = bits, U32, 1036, [9:9] +unusedBit_11_10 = bits, U32, 1036, [10:10] +unusedBit_11_11 = bits, U32, 1036, [11:11] +unusedBit_11_12 = bits, U32, 1036, [12:12] +unusedBit_11_13 = bits, U32, 1036, [13:13] +unusedBit_11_14 = bits, U32, 1036, [14:14] +unusedBit_11_15 = bits, U32, 1036, [15:15] +unusedBit_11_16 = bits, U32, 1036, [16:16] +unusedBit_11_17 = bits, U32, 1036, [17:17] +unusedBit_11_18 = bits, U32, 1036, [18:18] +unusedBit_11_19 = bits, U32, 1036, [19:19] +unusedBit_11_20 = bits, U32, 1036, [20:20] +unusedBit_11_21 = bits, U32, 1036, [21:21] +unusedBit_11_22 = bits, U32, 1036, [22:22] +unusedBit_11_23 = bits, U32, 1036, [23:23] +unusedBit_11_24 = bits, U32, 1036, [24:24] +unusedBit_11_25 = bits, U32, 1036, [25:25] +unusedBit_11_26 = bits, U32, 1036, [26:26] +unusedBit_11_27 = bits, U32, 1036, [27:27] +unusedBit_11_28 = bits, U32, 1036, [28:28] +unusedBit_11_29 = bits, U32, 1036, [29:29] +unusedBit_11_30 = bits, U32, 1036, [30:30] +unusedBit_11_31 = bits, U32, 1036, [31:31] +fractionalInjFuel = scalar, F32, 1040, "", 1, 0 +accumulatedValue = scalar, F32, 1044, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1048, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1052, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1056, "", 1, 0 +cycleCnt = scalar, S32, 1060, "", 1, 0 +; total TS size = 1064 +hwEventCounters1 = scalar, S32, 1064, "", 1, 0 +hwEventCounters2 = scalar, S32, 1068, "", 1, 0 +hwEventCounters3 = scalar, S32, 1072, "", 1, 0 +hwEventCounters4 = scalar, S32, 1076, "", 1, 0 +hwEventCounters5 = scalar, S32, 1080, "", 1, 0 +hwEventCounters6 = scalar, S32, 1084, "", 1, 0 +vvtCamCounter = scalar, S32, 1088, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1092, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1096, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1100, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1101, "", 1, 0 +; total TS size = 1104 +totalRevolutionCounter = scalar, U32, 1104, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1108, "", 1, 0 +vvtCurrentPosition = scalar, F32, 1112, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1116, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 1120, "", 1, 0 +triggerStateIndex = scalar, U08, 1124, "", 1, 0 +vvtCounter = scalar, U08, 1125, "", 1, 0 +camResyncCounter = scalar, U08, 1126, "", 1, 0 +vvtStateIndex = scalar, U08, 1127, "", 1, 0 +; total TS size = 1128 +m_hasSynchronizedPhase = bits, U32, 1128, [0:0] +unusedBit_1_1 = bits, U32, 1128, [1:1] +unusedBit_1_2 = bits, U32, 1128, [2:2] +unusedBit_1_3 = bits, U32, 1128, [3:3] +unusedBit_1_4 = bits, U32, 1128, [4:4] +unusedBit_1_5 = bits, U32, 1128, [5:5] +unusedBit_1_6 = bits, U32, 1128, [6:6] +unusedBit_1_7 = bits, U32, 1128, [7:7] +unusedBit_1_8 = bits, U32, 1128, [8:8] +unusedBit_1_9 = bits, U32, 1128, [9:9] +unusedBit_1_10 = bits, U32, 1128, [10:10] +unusedBit_1_11 = bits, U32, 1128, [11:11] +unusedBit_1_12 = bits, U32, 1128, [12:12] +unusedBit_1_13 = bits, U32, 1128, [13:13] +unusedBit_1_14 = bits, U32, 1128, [14:14] +unusedBit_1_15 = bits, U32, 1128, [15:15] +unusedBit_1_16 = bits, U32, 1128, [16:16] +unusedBit_1_17 = bits, U32, 1128, [17:17] +unusedBit_1_18 = bits, U32, 1128, [18:18] +unusedBit_1_19 = bits, U32, 1128, [19:19] +unusedBit_1_20 = bits, U32, 1128, [20:20] +unusedBit_1_21 = bits, U32, 1128, [21:21] +unusedBit_1_22 = bits, U32, 1128, [22:22] +unusedBit_1_23 = bits, U32, 1128, [23:23] +unusedBit_1_24 = bits, U32, 1128, [24:24] +unusedBit_1_25 = bits, U32, 1128, [25:25] +unusedBit_1_26 = bits, U32, 1128, [26:26] +unusedBit_1_27 = bits, U32, 1128, [27:27] +unusedBit_1_28 = bits, U32, 1128, [28:28] +unusedBit_1_29 = bits, U32, 1128, [29:29] +unusedBit_1_30 = bits, U32, 1128, [30:30] +unusedBit_1_31 = bits, U32, 1128, [31:31] ; total TS size = 1132 -idleState = bits, S32, 1132, [0:2], "not important" -currentIdlePosition = scalar, F32, 1136 -baseIdlePosition = scalar, F32, 1140 -iacByTpsTaper = scalar, F32, 1144 -throttlePedalUpState = scalar, S32, 1148, "", 1, 0 -mightResetPid = bits, U32, 1152, [0:0] -shouldResetPid = bits, U32, 1152, [1:1] -wasResetPid = bits, U32, 1152, [2:2] -mustResetPid = bits, U32, 1152, [3:3] -isCoasting = bits, U32, 1152, [4:4] -useIacTableForCoasting = bits, U32, 1152, [5:5] -notIdling = bits, U32, 1152, [6:6] -needReset = bits, U32, 1152, [7:7] -isInDeadZone = bits, U32, 1152, [8:8] -isBlipping = bits, U32, 1152, [9:9] -useClosedLoop = bits, U32, 1152, [10:10] -badTps = bits, U32, 1152, [11:11] -looksLikeRunning = bits, U32, 1152, [12:12] -looksLikeCoasting = bits, U32, 1152, [13:13] -looksLikeCrankToIdle = bits, U32, 1152, [14:14] -useInstantRpmForIdle = bits, U32, 1152, [15:15] -isVerboseIAC = bits, U32, 1152, [16:16] -unusedBit_22_17 = bits, U32, 1152, [17:17] -unusedBit_22_18 = bits, U32, 1152, [18:18] -unusedBit_22_19 = bits, U32, 1152, [19:19] -unusedBit_22_20 = bits, U32, 1152, [20:20] -unusedBit_22_21 = bits, U32, 1152, [21:21] -unusedBit_22_22 = bits, U32, 1152, [22:22] -unusedBit_22_23 = bits, U32, 1152, [23:23] -unusedBit_22_24 = bits, U32, 1152, [24:24] -unusedBit_22_25 = bits, U32, 1152, [25:25] -unusedBit_22_26 = bits, U32, 1152, [26:26] -unusedBit_22_27 = bits, U32, 1152, [27:27] -unusedBit_22_28 = bits, U32, 1152, [28:28] -unusedBit_22_29 = bits, U32, 1152, [29:29] -unusedBit_22_30 = bits, U32, 1152, [30:30] -unusedBit_22_31 = bits, U32, 1152, [31:31] -targetRpmByClt = scalar, S32, 1156, "", 1, 0 -targetRpmAcBump = scalar, S32, 1160, "", 1, 0 -iacByRpmTaper = scalar, F32, 1164 -luaAdd = scalar, F32, 1168 -; total TS size = 1172 -baseDwell = scalar, F32, 1172, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 1176, "", 1, 0 -luaTimingAdd = scalar, F32, 1180, "", 1, 0 -luaTimingMult = scalar, F32, 1184, "", 1, 0 -; total TS size = 1188 -idlePosition = scalar, F32, 1188, "", 1, 0 -trim = scalar, F32, 1192, "", 1, 0 -luaAdjustment = scalar, F32, 1196, "", 1, 0 -etbFeedForward = scalar, F32, 1200 -etbIntegralError = scalar, F32, 1204, "", 1, 0 -etbCurrentTarget = scalar, F32, 1208, "%", 1, 0 -; total TS size = 1212 -faultCode = scalar, U08, 1212, "", 1, 0 -heaterDuty = scalar, U08, 1213, "%", 1, 0 -pumpDuty = scalar, U08, 1214, "%", 1, 0 -tempC = scalar, U16, 1216, "C", 1, 0 -nernstVoltage = scalar, U16, 1218, "V", 0.001, 0 -esr = scalar, U16, 1220, "", 1, 0 -; total TS size = 1224 +wallFuelCorrection = scalar, F32, 1132, "", 1, 0 +wallFuel = scalar, F32, 1136, "", 1, 0 +; total TS size = 1140 +idleState = bits, S32, 1140, [0:2], "not important" +currentIdlePosition = scalar, F32, 1144 +baseIdlePosition = scalar, F32, 1148 +iacByTpsTaper = scalar, F32, 1152 +throttlePedalUpState = scalar, S32, 1156, "", 1, 0 +mightResetPid = bits, U32, 1160, [0:0] +shouldResetPid = bits, U32, 1160, [1:1] +wasResetPid = bits, U32, 1160, [2:2] +mustResetPid = bits, U32, 1160, [3:3] +isCoasting = bits, U32, 1160, [4:4] +useIacTableForCoasting = bits, U32, 1160, [5:5] +notIdling = bits, U32, 1160, [6:6] +needReset = bits, U32, 1160, [7:7] +isInDeadZone = bits, U32, 1160, [8:8] +isBlipping = bits, U32, 1160, [9:9] +useClosedLoop = bits, U32, 1160, [10:10] +badTps = bits, U32, 1160, [11:11] +looksLikeRunning = bits, U32, 1160, [12:12] +looksLikeCoasting = bits, U32, 1160, [13:13] +looksLikeCrankToIdle = bits, U32, 1160, [14:14] +useInstantRpmForIdle = bits, U32, 1160, [15:15] +isVerboseIAC = bits, U32, 1160, [16:16] +unusedBit_22_17 = bits, U32, 1160, [17:17] +unusedBit_22_18 = bits, U32, 1160, [18:18] +unusedBit_22_19 = bits, U32, 1160, [19:19] +unusedBit_22_20 = bits, U32, 1160, [20:20] +unusedBit_22_21 = bits, U32, 1160, [21:21] +unusedBit_22_22 = bits, U32, 1160, [22:22] +unusedBit_22_23 = bits, U32, 1160, [23:23] +unusedBit_22_24 = bits, U32, 1160, [24:24] +unusedBit_22_25 = bits, U32, 1160, [25:25] +unusedBit_22_26 = bits, U32, 1160, [26:26] +unusedBit_22_27 = bits, U32, 1160, [27:27] +unusedBit_22_28 = bits, U32, 1160, [28:28] +unusedBit_22_29 = bits, U32, 1160, [29:29] +unusedBit_22_30 = bits, U32, 1160, [30:30] +unusedBit_22_31 = bits, U32, 1160, [31:31] +targetRpmByClt = scalar, S32, 1164, "", 1, 0 +targetRpmAcBump = scalar, S32, 1168, "", 1, 0 +iacByRpmTaper = scalar, F32, 1172 +luaAdd = scalar, F32, 1176 +; total TS size = 1180 +baseDwell = scalar, F32, 1180, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 1184, "", 1, 0 +luaTimingAdd = scalar, F32, 1188, "", 1, 0 +luaTimingMult = scalar, F32, 1192, "", 1, 0 +; total TS size = 1196 +idlePosition = scalar, F32, 1196, "", 1, 0 +trim = scalar, F32, 1200, "", 1, 0 +luaAdjustment = scalar, F32, 1204, "", 1, 0 +etbFeedForward = scalar, F32, 1208 +etbIntegralError = scalar, F32, 1212, "", 1, 0 +etbCurrentTarget = scalar, F32, 1216, "%", 1, 0 +; total TS size = 1220 +faultCode = scalar, U08, 1220, "", 1, 0 +heaterDuty = scalar, U08, 1221, "%", 1, 0 +pumpDuty = scalar, U08, 1222, "%", 1, 0 +tempC = scalar, U16, 1224, "C", 1, 0 +nernstVoltage = scalar, U16, 1226, "V", 0.001, 0 +esr = scalar, U16, 1228, "", 1, 0 +; total TS size = 1232 time = { timeNow } @@ -4757,6 +4759,8 @@ entry = brakePedalState, "brake: down", int, "%d" entry = egt1, "egt1", float, "%.3f" entry = egt2, "egt2", float, "%.3f" entry = desiredRpmLimit, "User-defined RPM hard limit", int, "%d" +entry = fuelInjectionCounter, "fuelInjectionCounter", int, "%d" +entry = sparkCounter, "sparkCounter", int, "%d" entry = tpsFrom, "tpsFrom", float, "%.3f" entry = tpsTo, "tpsTo", float, "%.3f" entry = deltaTps, "deltaTps", float, "%.3f" @@ -5498,6 +5502,8 @@ dialog = engine_stateDialog, "engine_state" graphLine = egt2 liveGraph = engine_state_10_Graph, "Graph", South graphLine = desiredRpmLimit + graphLine = fuelInjectionCounter + graphLine = sparkCounter indicatorPanel = tps_accel_stateIndicatorPanel, 2 indicator = {isAboveAccelThreshold}, "isAboveAccelThreshold No", "isAboveAccelThreshold Yes" diff --git a/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini b/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini index 3eafce6b43..5c46af12af 100644 --- a/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini +++ b/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.08.25.tdg-pdm8.3624011082" + signature = "rusEFI 2022.08.25.tdg-pdm8.679121214" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.08.25.tdg-pdm8.3624011082" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.08.25.tdg-pdm8.679121214" ; 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 @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Aug 25 14:52:13 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Aug 25 22:50:56 UTC 2022 pageSize = 21300 page = 1 @@ -2109,7 +2109,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1224 + ochBlockSize = 1232 ; ; see TunerStudioOutputChannels struct @@ -3022,170 +3022,172 @@ unusedBit_22_31 = bits, U32, 992, [31:31] egt1 = scalar, F32, 996, "", 1, 0 egt2 = scalar, F32, 1000, "", 1, 0 desiredRpmLimit = scalar, S16, 1004, "rpm", 1, 0 -; total TS size = 1008 -tpsFrom = scalar, F32, 1008 -tpsTo = scalar, F32, 1012 -deltaTps = scalar, F32, 1016 -extraFuel = scalar, F32, 1020, "", 1, 0 -valueFromTable = scalar, F32, 1024, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1028, [0:0] -isBelowDecelThreshold = bits, U32, 1028, [1:1] -isTimeToResetAccumulator = bits, U32, 1028, [2:2] -isFractionalEnrichment = bits, U32, 1028, [3:3] -belowEpsilon = bits, U32, 1028, [4:4] -tooShort = bits, U32, 1028, [5:5] -unusedBit_11_6 = bits, U32, 1028, [6:6] -unusedBit_11_7 = bits, U32, 1028, [7:7] -unusedBit_11_8 = bits, U32, 1028, [8:8] -unusedBit_11_9 = bits, U32, 1028, [9:9] -unusedBit_11_10 = bits, U32, 1028, [10:10] -unusedBit_11_11 = bits, U32, 1028, [11:11] -unusedBit_11_12 = bits, U32, 1028, [12:12] -unusedBit_11_13 = bits, U32, 1028, [13:13] -unusedBit_11_14 = bits, U32, 1028, [14:14] -unusedBit_11_15 = bits, U32, 1028, [15:15] -unusedBit_11_16 = bits, U32, 1028, [16:16] -unusedBit_11_17 = bits, U32, 1028, [17:17] -unusedBit_11_18 = bits, U32, 1028, [18:18] -unusedBit_11_19 = bits, U32, 1028, [19:19] -unusedBit_11_20 = bits, U32, 1028, [20:20] -unusedBit_11_21 = bits, U32, 1028, [21:21] -unusedBit_11_22 = bits, U32, 1028, [22:22] -unusedBit_11_23 = bits, U32, 1028, [23:23] -unusedBit_11_24 = bits, U32, 1028, [24:24] -unusedBit_11_25 = bits, U32, 1028, [25:25] -unusedBit_11_26 = bits, U32, 1028, [26:26] -unusedBit_11_27 = bits, U32, 1028, [27:27] -unusedBit_11_28 = bits, U32, 1028, [28:28] -unusedBit_11_29 = bits, U32, 1028, [29:29] -unusedBit_11_30 = bits, U32, 1028, [30:30] -unusedBit_11_31 = bits, U32, 1028, [31:31] -fractionalInjFuel = scalar, F32, 1032, "", 1, 0 -accumulatedValue = scalar, F32, 1036, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1040, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1044, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1048, "", 1, 0 -cycleCnt = scalar, S32, 1052, "", 1, 0 -; total TS size = 1056 -hwEventCounters1 = scalar, S32, 1056, "", 1, 0 -hwEventCounters2 = scalar, S32, 1060, "", 1, 0 -hwEventCounters3 = scalar, S32, 1064, "", 1, 0 -hwEventCounters4 = scalar, S32, 1068, "", 1, 0 -hwEventCounters5 = scalar, S32, 1072, "", 1, 0 -hwEventCounters6 = scalar, S32, 1076, "", 1, 0 -vvtCamCounter = scalar, S32, 1080, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1084, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1088, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1092, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1093, "", 1, 0 -; total TS size = 1096 -totalRevolutionCounter = scalar, U32, 1096, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1100, "", 1, 0 -vvtCurrentPosition = scalar, F32, 1104, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1108, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 1112, "", 1, 0 -triggerStateIndex = scalar, U08, 1116, "", 1, 0 -vvtCounter = scalar, U08, 1117, "", 1, 0 -camResyncCounter = scalar, U08, 1118, "", 1, 0 -vvtStateIndex = scalar, U08, 1119, "", 1, 0 -; total TS size = 1120 -m_hasSynchronizedPhase = bits, U32, 1120, [0:0] -unusedBit_1_1 = bits, U32, 1120, [1:1] -unusedBit_1_2 = bits, U32, 1120, [2:2] -unusedBit_1_3 = bits, U32, 1120, [3:3] -unusedBit_1_4 = bits, U32, 1120, [4:4] -unusedBit_1_5 = bits, U32, 1120, [5:5] -unusedBit_1_6 = bits, U32, 1120, [6:6] -unusedBit_1_7 = bits, U32, 1120, [7:7] -unusedBit_1_8 = bits, U32, 1120, [8:8] -unusedBit_1_9 = bits, U32, 1120, [9:9] -unusedBit_1_10 = bits, U32, 1120, [10:10] -unusedBit_1_11 = bits, U32, 1120, [11:11] -unusedBit_1_12 = bits, U32, 1120, [12:12] -unusedBit_1_13 = bits, U32, 1120, [13:13] -unusedBit_1_14 = bits, U32, 1120, [14:14] -unusedBit_1_15 = bits, U32, 1120, [15:15] -unusedBit_1_16 = bits, U32, 1120, [16:16] -unusedBit_1_17 = bits, U32, 1120, [17:17] -unusedBit_1_18 = bits, U32, 1120, [18:18] -unusedBit_1_19 = bits, U32, 1120, [19:19] -unusedBit_1_20 = bits, U32, 1120, [20:20] -unusedBit_1_21 = bits, U32, 1120, [21:21] -unusedBit_1_22 = bits, U32, 1120, [22:22] -unusedBit_1_23 = bits, U32, 1120, [23:23] -unusedBit_1_24 = bits, U32, 1120, [24:24] -unusedBit_1_25 = bits, U32, 1120, [25:25] -unusedBit_1_26 = bits, U32, 1120, [26:26] -unusedBit_1_27 = bits, U32, 1120, [27:27] -unusedBit_1_28 = bits, U32, 1120, [28:28] -unusedBit_1_29 = bits, U32, 1120, [29:29] -unusedBit_1_30 = bits, U32, 1120, [30:30] -unusedBit_1_31 = bits, U32, 1120, [31:31] -; total TS size = 1124 -wallFuelCorrection = scalar, F32, 1124, "", 1, 0 -wallFuel = scalar, F32, 1128, "", 1, 0 +fuelInjectionCounter = scalar, S32, 1008, "", 1, 0 +sparkCounter = scalar, S32, 1012, "", 1, 0 +; total TS size = 1016 +tpsFrom = scalar, F32, 1016 +tpsTo = scalar, F32, 1020 +deltaTps = scalar, F32, 1024 +extraFuel = scalar, F32, 1028, "", 1, 0 +valueFromTable = scalar, F32, 1032, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1036, [0:0] +isBelowDecelThreshold = bits, U32, 1036, [1:1] +isTimeToResetAccumulator = bits, U32, 1036, [2:2] +isFractionalEnrichment = bits, U32, 1036, [3:3] +belowEpsilon = bits, U32, 1036, [4:4] +tooShort = bits, U32, 1036, [5:5] +unusedBit_11_6 = bits, U32, 1036, [6:6] +unusedBit_11_7 = bits, U32, 1036, [7:7] +unusedBit_11_8 = bits, U32, 1036, [8:8] +unusedBit_11_9 = bits, U32, 1036, [9:9] +unusedBit_11_10 = bits, U32, 1036, [10:10] +unusedBit_11_11 = bits, U32, 1036, [11:11] +unusedBit_11_12 = bits, U32, 1036, [12:12] +unusedBit_11_13 = bits, U32, 1036, [13:13] +unusedBit_11_14 = bits, U32, 1036, [14:14] +unusedBit_11_15 = bits, U32, 1036, [15:15] +unusedBit_11_16 = bits, U32, 1036, [16:16] +unusedBit_11_17 = bits, U32, 1036, [17:17] +unusedBit_11_18 = bits, U32, 1036, [18:18] +unusedBit_11_19 = bits, U32, 1036, [19:19] +unusedBit_11_20 = bits, U32, 1036, [20:20] +unusedBit_11_21 = bits, U32, 1036, [21:21] +unusedBit_11_22 = bits, U32, 1036, [22:22] +unusedBit_11_23 = bits, U32, 1036, [23:23] +unusedBit_11_24 = bits, U32, 1036, [24:24] +unusedBit_11_25 = bits, U32, 1036, [25:25] +unusedBit_11_26 = bits, U32, 1036, [26:26] +unusedBit_11_27 = bits, U32, 1036, [27:27] +unusedBit_11_28 = bits, U32, 1036, [28:28] +unusedBit_11_29 = bits, U32, 1036, [29:29] +unusedBit_11_30 = bits, U32, 1036, [30:30] +unusedBit_11_31 = bits, U32, 1036, [31:31] +fractionalInjFuel = scalar, F32, 1040, "", 1, 0 +accumulatedValue = scalar, F32, 1044, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1048, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1052, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1056, "", 1, 0 +cycleCnt = scalar, S32, 1060, "", 1, 0 +; total TS size = 1064 +hwEventCounters1 = scalar, S32, 1064, "", 1, 0 +hwEventCounters2 = scalar, S32, 1068, "", 1, 0 +hwEventCounters3 = scalar, S32, 1072, "", 1, 0 +hwEventCounters4 = scalar, S32, 1076, "", 1, 0 +hwEventCounters5 = scalar, S32, 1080, "", 1, 0 +hwEventCounters6 = scalar, S32, 1084, "", 1, 0 +vvtCamCounter = scalar, S32, 1088, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1092, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1096, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1100, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1101, "", 1, 0 +; total TS size = 1104 +totalRevolutionCounter = scalar, U32, 1104, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1108, "", 1, 0 +vvtCurrentPosition = scalar, F32, 1112, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1116, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 1120, "", 1, 0 +triggerStateIndex = scalar, U08, 1124, "", 1, 0 +vvtCounter = scalar, U08, 1125, "", 1, 0 +camResyncCounter = scalar, U08, 1126, "", 1, 0 +vvtStateIndex = scalar, U08, 1127, "", 1, 0 +; total TS size = 1128 +m_hasSynchronizedPhase = bits, U32, 1128, [0:0] +unusedBit_1_1 = bits, U32, 1128, [1:1] +unusedBit_1_2 = bits, U32, 1128, [2:2] +unusedBit_1_3 = bits, U32, 1128, [3:3] +unusedBit_1_4 = bits, U32, 1128, [4:4] +unusedBit_1_5 = bits, U32, 1128, [5:5] +unusedBit_1_6 = bits, U32, 1128, [6:6] +unusedBit_1_7 = bits, U32, 1128, [7:7] +unusedBit_1_8 = bits, U32, 1128, [8:8] +unusedBit_1_9 = bits, U32, 1128, [9:9] +unusedBit_1_10 = bits, U32, 1128, [10:10] +unusedBit_1_11 = bits, U32, 1128, [11:11] +unusedBit_1_12 = bits, U32, 1128, [12:12] +unusedBit_1_13 = bits, U32, 1128, [13:13] +unusedBit_1_14 = bits, U32, 1128, [14:14] +unusedBit_1_15 = bits, U32, 1128, [15:15] +unusedBit_1_16 = bits, U32, 1128, [16:16] +unusedBit_1_17 = bits, U32, 1128, [17:17] +unusedBit_1_18 = bits, U32, 1128, [18:18] +unusedBit_1_19 = bits, U32, 1128, [19:19] +unusedBit_1_20 = bits, U32, 1128, [20:20] +unusedBit_1_21 = bits, U32, 1128, [21:21] +unusedBit_1_22 = bits, U32, 1128, [22:22] +unusedBit_1_23 = bits, U32, 1128, [23:23] +unusedBit_1_24 = bits, U32, 1128, [24:24] +unusedBit_1_25 = bits, U32, 1128, [25:25] +unusedBit_1_26 = bits, U32, 1128, [26:26] +unusedBit_1_27 = bits, U32, 1128, [27:27] +unusedBit_1_28 = bits, U32, 1128, [28:28] +unusedBit_1_29 = bits, U32, 1128, [29:29] +unusedBit_1_30 = bits, U32, 1128, [30:30] +unusedBit_1_31 = bits, U32, 1128, [31:31] ; total TS size = 1132 -idleState = bits, S32, 1132, [0:2], "not important" -currentIdlePosition = scalar, F32, 1136 -baseIdlePosition = scalar, F32, 1140 -iacByTpsTaper = scalar, F32, 1144 -throttlePedalUpState = scalar, S32, 1148, "", 1, 0 -mightResetPid = bits, U32, 1152, [0:0] -shouldResetPid = bits, U32, 1152, [1:1] -wasResetPid = bits, U32, 1152, [2:2] -mustResetPid = bits, U32, 1152, [3:3] -isCoasting = bits, U32, 1152, [4:4] -useIacTableForCoasting = bits, U32, 1152, [5:5] -notIdling = bits, U32, 1152, [6:6] -needReset = bits, U32, 1152, [7:7] -isInDeadZone = bits, U32, 1152, [8:8] -isBlipping = bits, U32, 1152, [9:9] -useClosedLoop = bits, U32, 1152, [10:10] -badTps = bits, U32, 1152, [11:11] -looksLikeRunning = bits, U32, 1152, [12:12] -looksLikeCoasting = bits, U32, 1152, [13:13] -looksLikeCrankToIdle = bits, U32, 1152, [14:14] -useInstantRpmForIdle = bits, U32, 1152, [15:15] -isVerboseIAC = bits, U32, 1152, [16:16] -unusedBit_22_17 = bits, U32, 1152, [17:17] -unusedBit_22_18 = bits, U32, 1152, [18:18] -unusedBit_22_19 = bits, U32, 1152, [19:19] -unusedBit_22_20 = bits, U32, 1152, [20:20] -unusedBit_22_21 = bits, U32, 1152, [21:21] -unusedBit_22_22 = bits, U32, 1152, [22:22] -unusedBit_22_23 = bits, U32, 1152, [23:23] -unusedBit_22_24 = bits, U32, 1152, [24:24] -unusedBit_22_25 = bits, U32, 1152, [25:25] -unusedBit_22_26 = bits, U32, 1152, [26:26] -unusedBit_22_27 = bits, U32, 1152, [27:27] -unusedBit_22_28 = bits, U32, 1152, [28:28] -unusedBit_22_29 = bits, U32, 1152, [29:29] -unusedBit_22_30 = bits, U32, 1152, [30:30] -unusedBit_22_31 = bits, U32, 1152, [31:31] -targetRpmByClt = scalar, S32, 1156, "", 1, 0 -targetRpmAcBump = scalar, S32, 1160, "", 1, 0 -iacByRpmTaper = scalar, F32, 1164 -luaAdd = scalar, F32, 1168 -; total TS size = 1172 -baseDwell = scalar, F32, 1172, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 1176, "", 1, 0 -luaTimingAdd = scalar, F32, 1180, "", 1, 0 -luaTimingMult = scalar, F32, 1184, "", 1, 0 -; total TS size = 1188 -idlePosition = scalar, F32, 1188, "", 1, 0 -trim = scalar, F32, 1192, "", 1, 0 -luaAdjustment = scalar, F32, 1196, "", 1, 0 -etbFeedForward = scalar, F32, 1200 -etbIntegralError = scalar, F32, 1204, "", 1, 0 -etbCurrentTarget = scalar, F32, 1208, "%", 1, 0 -; total TS size = 1212 -faultCode = scalar, U08, 1212, "", 1, 0 -heaterDuty = scalar, U08, 1213, "%", 1, 0 -pumpDuty = scalar, U08, 1214, "%", 1, 0 -tempC = scalar, U16, 1216, "C", 1, 0 -nernstVoltage = scalar, U16, 1218, "V", 0.001, 0 -esr = scalar, U16, 1220, "", 1, 0 -; total TS size = 1224 +wallFuelCorrection = scalar, F32, 1132, "", 1, 0 +wallFuel = scalar, F32, 1136, "", 1, 0 +; total TS size = 1140 +idleState = bits, S32, 1140, [0:2], "not important" +currentIdlePosition = scalar, F32, 1144 +baseIdlePosition = scalar, F32, 1148 +iacByTpsTaper = scalar, F32, 1152 +throttlePedalUpState = scalar, S32, 1156, "", 1, 0 +mightResetPid = bits, U32, 1160, [0:0] +shouldResetPid = bits, U32, 1160, [1:1] +wasResetPid = bits, U32, 1160, [2:2] +mustResetPid = bits, U32, 1160, [3:3] +isCoasting = bits, U32, 1160, [4:4] +useIacTableForCoasting = bits, U32, 1160, [5:5] +notIdling = bits, U32, 1160, [6:6] +needReset = bits, U32, 1160, [7:7] +isInDeadZone = bits, U32, 1160, [8:8] +isBlipping = bits, U32, 1160, [9:9] +useClosedLoop = bits, U32, 1160, [10:10] +badTps = bits, U32, 1160, [11:11] +looksLikeRunning = bits, U32, 1160, [12:12] +looksLikeCoasting = bits, U32, 1160, [13:13] +looksLikeCrankToIdle = bits, U32, 1160, [14:14] +useInstantRpmForIdle = bits, U32, 1160, [15:15] +isVerboseIAC = bits, U32, 1160, [16:16] +unusedBit_22_17 = bits, U32, 1160, [17:17] +unusedBit_22_18 = bits, U32, 1160, [18:18] +unusedBit_22_19 = bits, U32, 1160, [19:19] +unusedBit_22_20 = bits, U32, 1160, [20:20] +unusedBit_22_21 = bits, U32, 1160, [21:21] +unusedBit_22_22 = bits, U32, 1160, [22:22] +unusedBit_22_23 = bits, U32, 1160, [23:23] +unusedBit_22_24 = bits, U32, 1160, [24:24] +unusedBit_22_25 = bits, U32, 1160, [25:25] +unusedBit_22_26 = bits, U32, 1160, [26:26] +unusedBit_22_27 = bits, U32, 1160, [27:27] +unusedBit_22_28 = bits, U32, 1160, [28:28] +unusedBit_22_29 = bits, U32, 1160, [29:29] +unusedBit_22_30 = bits, U32, 1160, [30:30] +unusedBit_22_31 = bits, U32, 1160, [31:31] +targetRpmByClt = scalar, S32, 1164, "", 1, 0 +targetRpmAcBump = scalar, S32, 1168, "", 1, 0 +iacByRpmTaper = scalar, F32, 1172 +luaAdd = scalar, F32, 1176 +; total TS size = 1180 +baseDwell = scalar, F32, 1180, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 1184, "", 1, 0 +luaTimingAdd = scalar, F32, 1188, "", 1, 0 +luaTimingMult = scalar, F32, 1192, "", 1, 0 +; total TS size = 1196 +idlePosition = scalar, F32, 1196, "", 1, 0 +trim = scalar, F32, 1200, "", 1, 0 +luaAdjustment = scalar, F32, 1204, "", 1, 0 +etbFeedForward = scalar, F32, 1208 +etbIntegralError = scalar, F32, 1212, "", 1, 0 +etbCurrentTarget = scalar, F32, 1216, "%", 1, 0 +; total TS size = 1220 +faultCode = scalar, U08, 1220, "", 1, 0 +heaterDuty = scalar, U08, 1221, "%", 1, 0 +pumpDuty = scalar, U08, 1222, "%", 1, 0 +tempC = scalar, U16, 1224, "C", 1, 0 +nernstVoltage = scalar, U16, 1226, "V", 0.001, 0 +esr = scalar, U16, 1228, "", 1, 0 +; total TS size = 1232 time = { timeNow } @@ -4757,6 +4759,8 @@ entry = brakePedalState, "brake: down", int, "%d" entry = egt1, "egt1", float, "%.3f" entry = egt2, "egt2", float, "%.3f" entry = desiredRpmLimit, "User-defined RPM hard limit", int, "%d" +entry = fuelInjectionCounter, "fuelInjectionCounter", int, "%d" +entry = sparkCounter, "sparkCounter", int, "%d" entry = tpsFrom, "tpsFrom", float, "%.3f" entry = tpsTo, "tpsTo", float, "%.3f" entry = deltaTps, "deltaTps", float, "%.3f" @@ -5502,6 +5506,8 @@ dialog = engine_stateDialog, "engine_state" graphLine = egt2 liveGraph = engine_state_10_Graph, "Graph", South graphLine = desiredRpmLimit + graphLine = fuelInjectionCounter + graphLine = sparkCounter indicatorPanel = tps_accel_stateIndicatorPanel, 2 indicator = {isAboveAccelThreshold}, "isAboveAccelThreshold No", "isAboveAccelThreshold Yes" 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 cdad22c81d..6a42aa9360 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 ConfigDefinition.jar based on (unknown script) controllers/algo/engine_state.txt Wed Aug 24 22:14:46 UTC 2022 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/algo/engine_state.txt Thu Aug 25 22:49:55 UTC 2022 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -520,6 +520,8 @@ public class EngineState { public static final Field EGT2 = Field.create("EGT2", 144, FieldType.FLOAT); public static final Field DESIREDRPMLIMIT = Field.create("DESIREDRPMLIMIT", 148, FieldType.INT16).setScale(1.0); public static final Field ALIGNMENTFILL_AT_150 = Field.create("ALIGNMENTFILL_AT_150", 150, FieldType.INT8).setScale(1.0); + public static final Field FUELINJECTIONCOUNTER = Field.create("FUELINJECTIONCOUNTER", 152, FieldType.INT).setScale(1.0); + public static final Field SPARKCOUNTER = Field.create("SPARKCOUNTER", 156, FieldType.INT).setScale(1.0); public static final Field[] VALUES = { LUA_FUELADD, LUA_FUELMULT, @@ -655,5 +657,7 @@ public class EngineState { EGT2, DESIREDRPMLIMIT, ALIGNMENTFILL_AT_150, + FUELINJECTIONCOUNTER, + SPARKCOUNTER, }; } 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 05a01b43d5..2ab6d13b51 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 ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Aug 25 14:52:19 UTC 2022 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Aug 25 22:51:00 UTC 2022 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -1882,7 +1882,6 @@ public class Fields { public static final int servoOutputPins7_offset = 2086; public static final int servoOutputPins8_offset = 2088; public static final int showHumanReadableWarning_offset = 960; - public static final int SIGNATURE_HASH = 1913309982; public static final int silentTriggerError_offset = 1360; public static final int skippedWheelOnCam_offset = 1360; public static final int slowAdcAlpha_offset = 1600; @@ -2373,10 +2372,10 @@ 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 2022.08.25.all.1913309982"; + public static final String TS_SIGNATURE = "rusEFI 2022.08.25.all.2188533610"; 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 = 1224; + public static final int TS_TOTAL_OUTPUT_SIZE = 1232; public static final int TsCalMode_EtbKd = 5; public static final int TsCalMode_EtbKi = 4; public static final int TsCalMode_EtbKp = 3;