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 a1ae34fd68..ac06d00b12 100644 --- a/firmware/config/boards/cypress/config/controllers/algo/rusefi_generated.h +++ b/firmware/config/boards/cypress/config/controllers/algo/rusefi_generated.h @@ -1967,7 +1967,7 @@ #define show_Frankenso_presets true #define show_test_presets true #define showHumanReadableWarning_offset 960 -#define SIGNATURE_HASH 4136941473 +#define SIGNATURE_HASH 4059657144 #define silentTriggerError_offset 1360 #define skippedWheelOnCam_offset 1360 #define slowAdcAlpha_offset 1600 @@ -2525,12 +2525,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.09.24.cypress.4136941473" +#define TS_SIGNATURE "rusEFI 2022.09.24.cypress.4059657144" #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 1260 +#define TS_TOTAL_OUTPUT_SIZE 1264 #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 d69826b8f0..74005ee8a8 100644 --- a/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h +++ b/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h @@ -1967,7 +1967,7 @@ #define show_Frankenso_presets true #define show_test_presets true #define showHumanReadableWarning_offset 960 -#define SIGNATURE_HASH 2655196525 +#define SIGNATURE_HASH 2569982324 #define silentTriggerError_offset 1360 #define skippedWheelOnCam_offset 1360 #define slowAdcAlpha_offset 1600 @@ -2525,12 +2525,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.09.24.kin.2655196525" +#define TS_SIGNATURE "rusEFI 2022.09.24.kin.2569982324" #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 1260 +#define TS_TOTAL_OUTPUT_SIZE 1264 #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 39b6e51c76..c987271eeb 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 @@ -1933,7 +1933,7 @@ #define show_Proteus_presets false #define show_test_presets false #define showHumanReadableWarning_offset 960 -#define SIGNATURE_HASH 2408214139 +#define SIGNATURE_HASH 2296883810 #define silentTriggerError_offset 1360 #define skippedWheelOnCam_offset 1360 #define slowAdcAlpha_offset 1600 @@ -2492,12 +2492,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.09.24.subaru_eg33_f7.2408214139" +#define TS_SIGNATURE "rusEFI 2022.09.24.subaru_eg33_f7.2296883810" #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 1260 +#define TS_TOTAL_OUTPUT_SIZE 1264 #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 a7d030133e..505011e04c 100644 --- a/firmware/console/binary/generated/data_logs.ini +++ b/firmware/console/binary/generated/data_logs.ini @@ -430,6 +430,7 @@ entry = mapVvt_MAP_AT_DIFF, "mapVvt_MAP_AT_DIFF", float, "%.3f" entry = mapVvt_MAP_AT_CYCLE_COUNT, "mapVvt_MAP_AT_CYCLE_COUNT", int, "%d" entry = mapVvt_map_peak, "mapVvt_map_peak", int, "%d" entry = currentEngineDecodedPhase, "Engine Phase", float, "%.3f" +entry = triggerToothAngleError, "triggerToothAngleError", float, "%.3f" entry = crankSynchronizationCounter, "Crank sync counter", int, "%d" entry = vvtSyncGapRatio, "vvtSyncGapRatio", float, "%.3f" entry = vvtCurrentPosition, "vvtCurrentPosition", float, "%.3f" diff --git a/firmware/console/binary/generated/fancy_content.ini b/firmware/console/binary/generated/fancy_content.ini index ad7aa8ed57..5ed6f65897 100644 --- a/firmware/console/binary/generated/fancy_content.ini +++ b/firmware/console/binary/generated/fancy_content.ini @@ -223,6 +223,8 @@ dialog = trigger_centralDialog, "trigger_central" graphLine = mapVvt_MAP_AT_CYCLE_COUNT graphLine = mapVvt_map_peak graphLine = currentEngineDecodedPhase + liveGraph = trigger_central_4_Graph, "Graph", South + graphLine = triggerToothAngleError dialog = trigger_stateDialog, "trigger_state" diff --git a/firmware/console/binary/generated/output_channels.ini b/firmware/console/binary/generated/output_channels.ini index 0bbe383e0a..2d05a614f7 100644 --- a/firmware/console/binary/generated/output_channels.ini +++ b/firmware/console/binary/generated/output_channels.ini @@ -993,143 +993,144 @@ mapVvt_MAP_AT_DIFF = scalar, F32, 1116, "", 1, 0 mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1120, "", 1, 0 mapVvt_map_peak = scalar, U08, 1121, "", 1, 0 currentEngineDecodedPhase = scalar, F32, 1124, "deg", 1, 0 -; total TS size = 1128 -crankSynchronizationCounter = scalar, U32, 1128, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1132, "", 1, 0 -vvtCurrentPosition = scalar, F32, 1136, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1140, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 1144, "", 1, 0 -triggerStateIndex = scalar, U08, 1148, "", 1, 0 -vvtCounter = scalar, U08, 1149, "", 1, 0 -camResyncCounter = scalar, U08, 1150, "", 1, 0 -vvtStateIndex = scalar, U08, 1151, "", 1, 0 -; total TS size = 1152 -m_hasSynchronizedPhase = bits, U32, 1152, [0:0] -unusedBit_1_1 = bits, U32, 1152, [1:1] -unusedBit_1_2 = bits, U32, 1152, [2:2] -unusedBit_1_3 = bits, U32, 1152, [3:3] -unusedBit_1_4 = bits, U32, 1152, [4:4] -unusedBit_1_5 = bits, U32, 1152, [5:5] -unusedBit_1_6 = bits, U32, 1152, [6:6] -unusedBit_1_7 = bits, U32, 1152, [7:7] -unusedBit_1_8 = bits, U32, 1152, [8:8] -unusedBit_1_9 = bits, U32, 1152, [9:9] -unusedBit_1_10 = bits, U32, 1152, [10:10] -unusedBit_1_11 = bits, U32, 1152, [11:11] -unusedBit_1_12 = bits, U32, 1152, [12:12] -unusedBit_1_13 = bits, U32, 1152, [13:13] -unusedBit_1_14 = bits, U32, 1152, [14:14] -unusedBit_1_15 = bits, U32, 1152, [15:15] -unusedBit_1_16 = bits, U32, 1152, [16:16] -unusedBit_1_17 = bits, U32, 1152, [17:17] -unusedBit_1_18 = bits, U32, 1152, [18:18] -unusedBit_1_19 = bits, U32, 1152, [19:19] -unusedBit_1_20 = bits, U32, 1152, [20:20] -unusedBit_1_21 = bits, U32, 1152, [21:21] -unusedBit_1_22 = bits, U32, 1152, [22:22] -unusedBit_1_23 = bits, U32, 1152, [23:23] -unusedBit_1_24 = bits, U32, 1152, [24:24] -unusedBit_1_25 = bits, U32, 1152, [25:25] -unusedBit_1_26 = bits, U32, 1152, [26:26] -unusedBit_1_27 = bits, U32, 1152, [27:27] -unusedBit_1_28 = bits, U32, 1152, [28:28] -unusedBit_1_29 = bits, U32, 1152, [29:29] -unusedBit_1_30 = bits, U32, 1152, [30:30] -unusedBit_1_31 = bits, U32, 1152, [31:31] +triggerToothAngleError = scalar, F32, 1128, "deg", 1, 0 +; total TS size = 1132 +crankSynchronizationCounter = scalar, U32, 1132, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1136, "", 1, 0 +vvtCurrentPosition = scalar, F32, 1140, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1144, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 1148, "", 1, 0 +triggerStateIndex = scalar, U08, 1152, "", 1, 0 +vvtCounter = scalar, U08, 1153, "", 1, 0 +camResyncCounter = scalar, U08, 1154, "", 1, 0 +vvtStateIndex = scalar, U08, 1155, "", 1, 0 ; total TS size = 1156 -wallFuelCorrection = scalar, F32, 1156, "", 1, 0 -wallFuel = scalar, F32, 1160, "", 1, 0 -; total TS size = 1164 -idleState = bits, S32, 1164, [0:2], "not important" -currentIdlePosition = scalar, F32, 1168 -baseIdlePosition = scalar, F32, 1172 -iacByTpsTaper = scalar, F32, 1176 -throttlePedalUpState = scalar, S32, 1180, "", 1, 0 -mightResetPid = bits, U32, 1184, [0:0] -shouldResetPid = bits, U32, 1184, [1:1] -wasResetPid = bits, U32, 1184, [2:2] -mustResetPid = bits, U32, 1184, [3:3] -isCranking = bits, U32, 1184, [4:4] -useIacTableForCoasting = bits, U32, 1184, [5:5] -notIdling = bits, U32, 1184, [6:6] -needReset = bits, U32, 1184, [7:7] -isInDeadZone = bits, U32, 1184, [8:8] -isBlipping = bits, U32, 1184, [9:9] -useClosedLoop = bits, U32, 1184, [10:10] -badTps = bits, U32, 1184, [11:11] -looksLikeRunning = bits, U32, 1184, [12:12] -looksLikeCoasting = bits, U32, 1184, [13:13] -looksLikeCrankToIdle = bits, U32, 1184, [14:14] -isVerboseIAC = bits, U32, 1184, [15:15] -isIdleCoasting = bits, U32, 1184, [16:16] -unusedBit_22_17 = bits, U32, 1184, [17:17] -unusedBit_22_18 = bits, U32, 1184, [18:18] -unusedBit_22_19 = bits, U32, 1184, [19:19] -unusedBit_22_20 = bits, U32, 1184, [20:20] -unusedBit_22_21 = bits, U32, 1184, [21:21] -unusedBit_22_22 = bits, U32, 1184, [22:22] -unusedBit_22_23 = bits, U32, 1184, [23:23] -unusedBit_22_24 = bits, U32, 1184, [24:24] -unusedBit_22_25 = bits, U32, 1184, [25:25] -unusedBit_22_26 = bits, U32, 1184, [26:26] -unusedBit_22_27 = bits, U32, 1184, [27:27] -unusedBit_22_28 = bits, U32, 1184, [28:28] -unusedBit_22_29 = bits, U32, 1184, [29:29] -unusedBit_22_30 = bits, U32, 1184, [30:30] -unusedBit_22_31 = bits, U32, 1184, [31:31] -targetRpmByClt = scalar, S32, 1188, "", 1, 0 -targetRpmAcBump = scalar, S32, 1192, "", 1, 0 -iacByRpmTaper = scalar, F32, 1196 -luaAdd = scalar, F32, 1200 -; total TS size = 1204 -baseDwell = scalar, F32, 1204, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 1208, "", 1, 0 -luaTimingAdd = scalar, F32, 1212, "", 1, 0 -luaTimingMult = scalar, F32, 1216, "", 1, 0 -; total TS size = 1220 -idlePosition = scalar, F32, 1220, "", 1, 0 -trim = scalar, F32, 1224, "", 1, 0 -luaAdjustment = scalar, F32, 1228, "", 1, 0 -etbFeedForward = scalar, F32, 1232 -etbIntegralError = scalar, F32, 1236, "", 1, 0 -etbCurrentTarget = scalar, F32, 1240, "%", 1, 0 -etbRevLimitActive = bits, U32, 1244, [0:0] -unusedBit_7_1 = bits, U32, 1244, [1:1] -unusedBit_7_2 = bits, U32, 1244, [2:2] -unusedBit_7_3 = bits, U32, 1244, [3:3] -unusedBit_7_4 = bits, U32, 1244, [4:4] -unusedBit_7_5 = bits, U32, 1244, [5:5] -unusedBit_7_6 = bits, U32, 1244, [6:6] -unusedBit_7_7 = bits, U32, 1244, [7:7] -unusedBit_7_8 = bits, U32, 1244, [8:8] -unusedBit_7_9 = bits, U32, 1244, [9:9] -unusedBit_7_10 = bits, U32, 1244, [10:10] -unusedBit_7_11 = bits, U32, 1244, [11:11] -unusedBit_7_12 = bits, U32, 1244, [12:12] -unusedBit_7_13 = bits, U32, 1244, [13:13] -unusedBit_7_14 = bits, U32, 1244, [14:14] -unusedBit_7_15 = bits, U32, 1244, [15:15] -unusedBit_7_16 = bits, U32, 1244, [16:16] -unusedBit_7_17 = bits, U32, 1244, [17:17] -unusedBit_7_18 = bits, U32, 1244, [18:18] -unusedBit_7_19 = bits, U32, 1244, [19:19] -unusedBit_7_20 = bits, U32, 1244, [20:20] -unusedBit_7_21 = bits, U32, 1244, [21:21] -unusedBit_7_22 = bits, U32, 1244, [22:22] -unusedBit_7_23 = bits, U32, 1244, [23:23] -unusedBit_7_24 = bits, U32, 1244, [24:24] -unusedBit_7_25 = bits, U32, 1244, [25:25] -unusedBit_7_26 = bits, U32, 1244, [26:26] -unusedBit_7_27 = bits, U32, 1244, [27:27] -unusedBit_7_28 = bits, U32, 1244, [28:28] -unusedBit_7_29 = bits, U32, 1244, [29:29] -unusedBit_7_30 = bits, U32, 1244, [30:30] -unusedBit_7_31 = bits, U32, 1244, [31:31] -; total TS size = 1248 -faultCode = scalar, U08, 1248, "", 1, 0 -heaterDuty = scalar, U08, 1249, "%", 1, 0 -pumpDuty = scalar, U08, 1250, "%", 1, 0 -tempC = scalar, U16, 1252, "C", 1, 0 -nernstVoltage = scalar, U16, 1254, "V", 0.001, 0 -esr = scalar, U16, 1256, "", 1, 0 -; total TS size = 1260 +m_hasSynchronizedPhase = bits, U32, 1156, [0:0] +unusedBit_1_1 = bits, U32, 1156, [1:1] +unusedBit_1_2 = bits, U32, 1156, [2:2] +unusedBit_1_3 = bits, U32, 1156, [3:3] +unusedBit_1_4 = bits, U32, 1156, [4:4] +unusedBit_1_5 = bits, U32, 1156, [5:5] +unusedBit_1_6 = bits, U32, 1156, [6:6] +unusedBit_1_7 = bits, U32, 1156, [7:7] +unusedBit_1_8 = bits, U32, 1156, [8:8] +unusedBit_1_9 = bits, U32, 1156, [9:9] +unusedBit_1_10 = bits, U32, 1156, [10:10] +unusedBit_1_11 = bits, U32, 1156, [11:11] +unusedBit_1_12 = bits, U32, 1156, [12:12] +unusedBit_1_13 = bits, U32, 1156, [13:13] +unusedBit_1_14 = bits, U32, 1156, [14:14] +unusedBit_1_15 = bits, U32, 1156, [15:15] +unusedBit_1_16 = bits, U32, 1156, [16:16] +unusedBit_1_17 = bits, U32, 1156, [17:17] +unusedBit_1_18 = bits, U32, 1156, [18:18] +unusedBit_1_19 = bits, U32, 1156, [19:19] +unusedBit_1_20 = bits, U32, 1156, [20:20] +unusedBit_1_21 = bits, U32, 1156, [21:21] +unusedBit_1_22 = bits, U32, 1156, [22:22] +unusedBit_1_23 = bits, U32, 1156, [23:23] +unusedBit_1_24 = bits, U32, 1156, [24:24] +unusedBit_1_25 = bits, U32, 1156, [25:25] +unusedBit_1_26 = bits, U32, 1156, [26:26] +unusedBit_1_27 = bits, U32, 1156, [27:27] +unusedBit_1_28 = bits, U32, 1156, [28:28] +unusedBit_1_29 = bits, U32, 1156, [29:29] +unusedBit_1_30 = bits, U32, 1156, [30:30] +unusedBit_1_31 = bits, U32, 1156, [31:31] +; total TS size = 1160 +wallFuelCorrection = scalar, F32, 1160, "", 1, 0 +wallFuel = scalar, F32, 1164, "", 1, 0 +; total TS size = 1168 +idleState = bits, S32, 1168, [0:2], "not important" +currentIdlePosition = scalar, F32, 1172 +baseIdlePosition = scalar, F32, 1176 +iacByTpsTaper = scalar, F32, 1180 +throttlePedalUpState = scalar, S32, 1184, "", 1, 0 +mightResetPid = bits, U32, 1188, [0:0] +shouldResetPid = bits, U32, 1188, [1:1] +wasResetPid = bits, U32, 1188, [2:2] +mustResetPid = bits, U32, 1188, [3:3] +isCranking = bits, U32, 1188, [4:4] +useIacTableForCoasting = bits, U32, 1188, [5:5] +notIdling = bits, U32, 1188, [6:6] +needReset = bits, U32, 1188, [7:7] +isInDeadZone = bits, U32, 1188, [8:8] +isBlipping = bits, U32, 1188, [9:9] +useClosedLoop = bits, U32, 1188, [10:10] +badTps = bits, U32, 1188, [11:11] +looksLikeRunning = bits, U32, 1188, [12:12] +looksLikeCoasting = bits, U32, 1188, [13:13] +looksLikeCrankToIdle = bits, U32, 1188, [14:14] +isVerboseIAC = bits, U32, 1188, [15:15] +isIdleCoasting = bits, U32, 1188, [16:16] +unusedBit_22_17 = bits, U32, 1188, [17:17] +unusedBit_22_18 = bits, U32, 1188, [18:18] +unusedBit_22_19 = bits, U32, 1188, [19:19] +unusedBit_22_20 = bits, U32, 1188, [20:20] +unusedBit_22_21 = bits, U32, 1188, [21:21] +unusedBit_22_22 = bits, U32, 1188, [22:22] +unusedBit_22_23 = bits, U32, 1188, [23:23] +unusedBit_22_24 = bits, U32, 1188, [24:24] +unusedBit_22_25 = bits, U32, 1188, [25:25] +unusedBit_22_26 = bits, U32, 1188, [26:26] +unusedBit_22_27 = bits, U32, 1188, [27:27] +unusedBit_22_28 = bits, U32, 1188, [28:28] +unusedBit_22_29 = bits, U32, 1188, [29:29] +unusedBit_22_30 = bits, U32, 1188, [30:30] +unusedBit_22_31 = bits, U32, 1188, [31:31] +targetRpmByClt = scalar, S32, 1192, "", 1, 0 +targetRpmAcBump = scalar, S32, 1196, "", 1, 0 +iacByRpmTaper = scalar, F32, 1200 +luaAdd = scalar, F32, 1204 +; total TS size = 1208 +baseDwell = scalar, F32, 1208, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 1212, "", 1, 0 +luaTimingAdd = scalar, F32, 1216, "", 1, 0 +luaTimingMult = scalar, F32, 1220, "", 1, 0 +; total TS size = 1224 +idlePosition = scalar, F32, 1224, "", 1, 0 +trim = scalar, F32, 1228, "", 1, 0 +luaAdjustment = scalar, F32, 1232, "", 1, 0 +etbFeedForward = scalar, F32, 1236 +etbIntegralError = scalar, F32, 1240, "", 1, 0 +etbCurrentTarget = scalar, F32, 1244, "%", 1, 0 +etbRevLimitActive = bits, U32, 1248, [0:0] +unusedBit_7_1 = bits, U32, 1248, [1:1] +unusedBit_7_2 = bits, U32, 1248, [2:2] +unusedBit_7_3 = bits, U32, 1248, [3:3] +unusedBit_7_4 = bits, U32, 1248, [4:4] +unusedBit_7_5 = bits, U32, 1248, [5:5] +unusedBit_7_6 = bits, U32, 1248, [6:6] +unusedBit_7_7 = bits, U32, 1248, [7:7] +unusedBit_7_8 = bits, U32, 1248, [8:8] +unusedBit_7_9 = bits, U32, 1248, [9:9] +unusedBit_7_10 = bits, U32, 1248, [10:10] +unusedBit_7_11 = bits, U32, 1248, [11:11] +unusedBit_7_12 = bits, U32, 1248, [12:12] +unusedBit_7_13 = bits, U32, 1248, [13:13] +unusedBit_7_14 = bits, U32, 1248, [14:14] +unusedBit_7_15 = bits, U32, 1248, [15:15] +unusedBit_7_16 = bits, U32, 1248, [16:16] +unusedBit_7_17 = bits, U32, 1248, [17:17] +unusedBit_7_18 = bits, U32, 1248, [18:18] +unusedBit_7_19 = bits, U32, 1248, [19:19] +unusedBit_7_20 = bits, U32, 1248, [20:20] +unusedBit_7_21 = bits, U32, 1248, [21:21] +unusedBit_7_22 = bits, U32, 1248, [22:22] +unusedBit_7_23 = bits, U32, 1248, [23:23] +unusedBit_7_24 = bits, U32, 1248, [24:24] +unusedBit_7_25 = bits, U32, 1248, [25:25] +unusedBit_7_26 = bits, U32, 1248, [26:26] +unusedBit_7_27 = bits, U32, 1248, [27:27] +unusedBit_7_28 = bits, U32, 1248, [28:28] +unusedBit_7_29 = bits, U32, 1248, [29:29] +unusedBit_7_30 = bits, U32, 1248, [30:30] +unusedBit_7_31 = bits, U32, 1248, [31:31] +; total TS size = 1252 +faultCode = scalar, U08, 1252, "", 1, 0 +heaterDuty = scalar, U08, 1253, "%", 1, 0 +pumpDuty = scalar, U08, 1254, "%", 1, 0 +tempC = scalar, U16, 1256, "C", 1, 0 +nernstVoltage = scalar, U16, 1258, "V", 0.001, 0 +esr = scalar, U16, 1260, "", 1, 0 +; total TS size = 1264 diff --git a/firmware/console/binary/generated/sensors.java b/firmware/console/binary/generated/sensors.java index b91357d625..e615d6cd91 100644 --- a/firmware/console/binary/generated/sensors.java +++ b/firmware/console/binary/generated/sensors.java @@ -459,41 +459,42 @@ mapVvt_MAP_AT_CYCLE_COUNT("mapVvt_MAP_AT_CYCLE_COUNT", SensorCategory.SENSOR_INP mapVvt_map_peak("mapVvt_map_peak", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1121, 1.0, -10000.0, 10000.0, ""), alignmentFill_at_38("need 4 byte alignment", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1122, 1.0, -20.0, 100.0, "units"), currentEngineDecodedPhase("Engine Phase", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1124, 1.0, 0.0, 0.0, "deg"), -crankSynchronizationCounter("Crank sync counter\nUsually matches crank revolutions", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1128, 1.0, -1.0, -1.0, ""), -vvtSyncGapRatio("vvtSyncGapRatio", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1132, 1.0, -10000.0, 10000.0, ""), -vvtCurrentPosition("vvtCurrentPosition", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1136, 1.0, -10000.0, 10000.0, ""), -triggerSyncGapRatio("Trigger Sync Latest Ratio", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1140, 1.0, -10000.0, 10000.0, ""), -triggerActualSyncGapRatio("trigger: unused field?", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1144, 1.0, -1.0, -1.0, ""), -triggerStateIndex("triggerStateIndex", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1148, 1.0, -1.0, -1.0, ""), -vvtCounter("vvtCounter", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1149, 1.0, -1.0, -1.0, ""), -camResyncCounter("camResyncCounter", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1150, 1.0, -1.0, -1.0, ""), -vvtStateIndex("vvtStateIndex", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1151, 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, 1156, 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, 1160, 1.0, -1.0, -1.0, ""), -idleState("idleState", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1164, 1.0, -1.0, -1.0, ""), -currentIdlePosition("idle: current position\nthat's current position with CLT and IAT corrections", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1168, 1.0, -1.0, -1.0, ""), -baseIdlePosition("idle: base value\ncurrent position without adjustments (iacByTpsTaper, afterCrankingIACtaperDuration)", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1172, 1.0, -1.0, -1.0, ""), -iacByTpsTaper("idle: iacByTpsTaper portion of idle", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1176, 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, 1180, 1.0, -1.0, -1.0, ""), -targetRpmByClt("idle: target by CLT", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1188, 1.0, -1.0, -1.0, ""), -targetRpmAcBump("idle: A/C bump", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1192, 1.0, -1.0, -1.0, ""), -iacByRpmTaper("idle: iacByRpmTaper portion of idle", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1196, 1.0, -1.0, -1.0, ""), -luaAdd("idle: Lua Adder", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1200, 1.0, -1.0, -1.0, ""), -baseDwell("baseDwell", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1204, 1.0, -1.0, -1.0, ""), -dwellVoltageCorrection("dwellVoltageCorrection", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1208, 1.0, -1.0, -1.0, ""), -luaTimingAdd("luaTimingAdd", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1212, 1.0, -1.0, -1.0, ""), -luaTimingMult("luaTimingMult", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1216, 1.0, -1.0, -1.0, ""), -idlePosition("idlePosition", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1220, 1.0, -1.0, -1.0, ""), -trim("trim", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1224, 1.0, -1.0, -1.0, ""), -luaAdjustment("luaAdjustment", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1228, 1.0, -1.0, -1.0, ""), -etbFeedForward("etbFeedForward", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1232, 1.0, -1.0, -1.0, ""), -etbIntegralError("etbIntegralError", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1236, 1.0, -10000.0, 10000.0, ""), -etbCurrentTarget("etbCurrentTarget", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1240, 1.0, -10000.0, 10000.0, "%"), -faultCode("faultCode", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1248, 1.0, -1.0, -1.0, ""), -heaterDuty("heaterDuty", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1249, 1.0, 0.0, 100.0, "%"), -pumpDuty("pumpDuty", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1250, 1.0, 0.0, 100.0, "%"), -alignmentFill_at_3("need 4 byte alignment", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1251, 1.0, -20.0, 100.0, "units"), -tempC("tempC", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1252, 1.0, 500.0, 1000.0, "C"), -nernstVoltage("nernstVoltage", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1254, 0.001, 0.0, 1.0, "V"), -esr("esr", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1256, 1.0, -1.0, -1.0, ""), -alignmentFill_at_10("need 4 byte alignment", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1258, 1.0, -20.0, 100.0, "units"), +triggerToothAngleError("triggerToothAngleError", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1128, 1.0, -30.0, 30.0, "deg"), +crankSynchronizationCounter("Crank sync counter\nUsually matches crank revolutions", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1132, 1.0, -1.0, -1.0, ""), +vvtSyncGapRatio("vvtSyncGapRatio", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1136, 1.0, -10000.0, 10000.0, ""), +vvtCurrentPosition("vvtCurrentPosition", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1140, 1.0, -10000.0, 10000.0, ""), +triggerSyncGapRatio("Trigger Sync Latest Ratio", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1144, 1.0, -10000.0, 10000.0, ""), +triggerActualSyncGapRatio("trigger: unused field?", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1148, 1.0, -1.0, -1.0, ""), +triggerStateIndex("triggerStateIndex", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1152, 1.0, -1.0, -1.0, ""), +vvtCounter("vvtCounter", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1153, 1.0, -1.0, -1.0, ""), +camResyncCounter("camResyncCounter", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1154, 1.0, -1.0, -1.0, ""), +vvtStateIndex("vvtStateIndex", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1155, 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, 1160, 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, 1164, 1.0, -1.0, -1.0, ""), +idleState("idleState", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1168, 1.0, -1.0, -1.0, ""), +currentIdlePosition("idle: current position\nthat's current position with CLT and IAT corrections", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1172, 1.0, -1.0, -1.0, ""), +baseIdlePosition("idle: base value\ncurrent position without adjustments (iacByTpsTaper, afterCrankingIACtaperDuration)", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1176, 1.0, -1.0, -1.0, ""), +iacByTpsTaper("idle: iacByTpsTaper portion of idle", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1180, 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, 1184, 1.0, -1.0, -1.0, ""), +targetRpmByClt("idle: target by CLT", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1192, 1.0, -1.0, -1.0, ""), +targetRpmAcBump("idle: A/C bump", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1196, 1.0, -1.0, -1.0, ""), +iacByRpmTaper("idle: iacByRpmTaper portion of idle", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1200, 1.0, -1.0, -1.0, ""), +luaAdd("idle: Lua Adder", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1204, 1.0, -1.0, -1.0, ""), +baseDwell("baseDwell", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1208, 1.0, -1.0, -1.0, ""), +dwellVoltageCorrection("dwellVoltageCorrection", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1212, 1.0, -1.0, -1.0, ""), +luaTimingAdd("luaTimingAdd", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1216, 1.0, -1.0, -1.0, ""), +luaTimingMult("luaTimingMult", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1220, 1.0, -1.0, -1.0, ""), +idlePosition("idlePosition", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1224, 1.0, -1.0, -1.0, ""), +trim("trim", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1228, 1.0, -1.0, -1.0, ""), +luaAdjustment("luaAdjustment", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1232, 1.0, -1.0, -1.0, ""), +etbFeedForward("etbFeedForward", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1236, 1.0, -1.0, -1.0, ""), +etbIntegralError("etbIntegralError", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1240, 1.0, -10000.0, 10000.0, ""), +etbCurrentTarget("etbCurrentTarget", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1244, 1.0, -10000.0, 10000.0, "%"), +faultCode("faultCode", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1252, 1.0, -1.0, -1.0, ""), +heaterDuty("heaterDuty", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1253, 1.0, 0.0, 100.0, "%"), +pumpDuty("pumpDuty", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1254, 1.0, 0.0, 100.0, "%"), +alignmentFill_at_3("need 4 byte alignment", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1255, 1.0, -20.0, 100.0, "units"), +tempC("tempC", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1256, 1.0, 500.0, 1000.0, "C"), +nernstVoltage("nernstVoltage", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1258, 0.001, 0.0, 1.0, "V"), +esr("esr", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1260, 1.0, -1.0, -1.0, ""), +alignmentFill_at_10("need 4 byte alignment", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1262, 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 42677003d5..8fea7d1c12 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 1260 \ No newline at end of file +#define TS_TOTAL_OUTPUT_SIZE 1264 \ No newline at end of file diff --git a/firmware/controllers/generated/rusefi_generated.h b/firmware/controllers/generated/rusefi_generated.h index e2af4f2aca..bf6d6eced3 100644 --- a/firmware/controllers/generated/rusefi_generated.h +++ b/firmware/controllers/generated/rusefi_generated.h @@ -1967,7 +1967,7 @@ #define show_Frankenso_presets true #define show_test_presets true #define showHumanReadableWarning_offset 960 -#define SIGNATURE_HASH 4136941473 +#define SIGNATURE_HASH 4059657144 #define silentTriggerError_offset 1360 #define skippedWheelOnCam_offset 1360 #define slowAdcAlpha_offset 1600 @@ -2525,12 +2525,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.09.24.all.4136941473" +#define TS_SIGNATURE "rusEFI 2022.09.24.all.4059657144" #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 1260 +#define TS_TOTAL_OUTPUT_SIZE 1264 #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 57409611d6..bc32afd46a 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 3786653678 -#define TS_SIGNATURE "rusEFI 2022.09.24.48way.3786653678" +#define SIGNATURE_HASH 3873340407 +#define TS_SIGNATURE "rusEFI 2022.09.24.48way.3873340407" diff --git a/firmware/controllers/generated/signature_all.h b/firmware/controllers/generated/signature_all.h index 76cc80c3bc..4a0e131f49 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 4136941473 -#define TS_SIGNATURE "rusEFI 2022.09.24.all.4136941473" +#define SIGNATURE_HASH 4059657144 +#define TS_SIGNATURE "rusEFI 2022.09.24.all.4059657144" diff --git a/firmware/controllers/generated/signature_alphax-2chan.h b/firmware/controllers/generated/signature_alphax-2chan.h index e0cba8e2c3..66dd653fa1 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 3297127117 -#define TS_SIGNATURE "rusEFI 2022.09.24.alphax-2chan.3297127117" +#define SIGNATURE_HASH 3287019220 +#define TS_SIGNATURE "rusEFI 2022.09.24.alphax-2chan.3287019220" diff --git a/firmware/controllers/generated/signature_alphax-4chan.h b/firmware/controllers/generated/signature_alphax-4chan.h index b7a5f969d5..1e365902ed 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 2106094638 -#define TS_SIGNATURE "rusEFI 2022.09.24.alphax-4chan.2106094638" +#define SIGNATURE_HASH 2061873207 +#define TS_SIGNATURE "rusEFI 2022.09.24.alphax-4chan.2061873207" diff --git a/firmware/controllers/generated/signature_atlas.h b/firmware/controllers/generated/signature_atlas.h index ff969c86b6..b49ba77c7f 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 3932045958 -#define TS_SIGNATURE "rusEFI 2022.09.24.atlas.3932045958" +#define SIGNATURE_HASH 3979576991 +#define TS_SIGNATURE "rusEFI 2022.09.24.atlas.3979576991" diff --git a/firmware/controllers/generated/signature_core8.h b/firmware/controllers/generated/signature_core8.h index da732ea816..c02bc47836 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 7923288 -#define TS_SIGNATURE "rusEFI 2022.09.24.core8.7923288" +#define SIGNATURE_HASH 118825537 +#define TS_SIGNATURE "rusEFI 2022.09.24.core8.118825537" diff --git a/firmware/controllers/generated/signature_cypress.h b/firmware/controllers/generated/signature_cypress.h index 63052a782f..0959ebb294 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 4136941473 -#define TS_SIGNATURE "rusEFI 2022.09.24.cypress.4136941473" +#define SIGNATURE_HASH 4059657144 +#define TS_SIGNATURE "rusEFI 2022.09.24.cypress.4059657144" diff --git a/firmware/controllers/generated/signature_f407-discovery.h b/firmware/controllers/generated/signature_f407-discovery.h index 2c9496c30d..00c265b8c1 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 4136941473 -#define TS_SIGNATURE "rusEFI 2022.09.24.f407-discovery.4136941473" +#define SIGNATURE_HASH 4059657144 +#define TS_SIGNATURE "rusEFI 2022.09.24.f407-discovery.4059657144" diff --git a/firmware/controllers/generated/signature_f429-discovery.h b/firmware/controllers/generated/signature_f429-discovery.h index 9737fc764c..fc8438ea48 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 4136941473 -#define TS_SIGNATURE "rusEFI 2022.09.24.f429-discovery.4136941473" +#define SIGNATURE_HASH 4059657144 +#define TS_SIGNATURE "rusEFI 2022.09.24.f429-discovery.4059657144" diff --git a/firmware/controllers/generated/signature_frankenso_na6.h b/firmware/controllers/generated/signature_frankenso_na6.h index 2a7d78b380..d320695bbb 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 3036171109 -#define TS_SIGNATURE "rusEFI 2022.09.24.frankenso_na6.3036171109" +#define SIGNATURE_HASH 3012923260 +#define TS_SIGNATURE "rusEFI 2022.09.24.frankenso_na6.3012923260" diff --git a/firmware/controllers/generated/signature_harley81.h b/firmware/controllers/generated/signature_harley81.h index 4b79047a4f..4866c0d7ac 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 107590286 -#define TS_SIGNATURE "rusEFI 2022.09.24.harley81.107590286" +#define SIGNATURE_HASH 17069719 +#define TS_SIGNATURE "rusEFI 2022.09.24.harley81.17069719" diff --git a/firmware/controllers/generated/signature_hellen-gm-e67.h b/firmware/controllers/generated/signature_hellen-gm-e67.h index 513babc9a0..0ec8baa1e6 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 1123234327 -#define TS_SIGNATURE "rusEFI 2022.09.24.hellen-gm-e67.1123234327" +#define SIGNATURE_HASH 1168045582 +#define TS_SIGNATURE "rusEFI 2022.09.24.hellen-gm-e67.1168045582" diff --git a/firmware/controllers/generated/signature_hellen-nb1.h b/firmware/controllers/generated/signature_hellen-nb1.h index 658b947178..09a782677e 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 790595181 -#define TS_SIGNATURE "rusEFI 2022.09.24.hellen-nb1.790595181" +#define SIGNATURE_HASH 678576756 +#define TS_SIGNATURE "rusEFI 2022.09.24.hellen-nb1.678576756" diff --git a/firmware/controllers/generated/signature_hellen121nissan.h b/firmware/controllers/generated/signature_hellen121nissan.h index 5c8702086f..84913cc88d 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 2118782795 -#define TS_SIGNATURE "rusEFI 2022.09.24.hellen121nissan.2118782795" +#define SIGNATURE_HASH 2032651090 +#define TS_SIGNATURE "rusEFI 2022.09.24.hellen121nissan.2032651090" diff --git a/firmware/controllers/generated/signature_hellen121vag.h b/firmware/controllers/generated/signature_hellen121vag.h index e0f3b384a1..5ab2582618 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 2260038875 -#define TS_SIGNATURE "rusEFI 2022.09.24.hellen121vag.2260038875" +#define SIGNATURE_HASH 2178461890 +#define TS_SIGNATURE "rusEFI 2022.09.24.hellen121vag.2178461890" diff --git a/firmware/controllers/generated/signature_hellen128.h b/firmware/controllers/generated/signature_hellen128.h index c13fe16d12..7b2ccdf869 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 141200031 -#define TS_SIGNATURE "rusEFI 2022.09.24.hellen128.141200031" +#define SIGNATURE_HASH 252137094 +#define TS_SIGNATURE "rusEFI 2022.09.24.hellen128.252137094" diff --git a/firmware/controllers/generated/signature_hellen154hyundai.h b/firmware/controllers/generated/signature_hellen154hyundai.h index f080c96e44..42a362b2d3 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 1859896613 -#define TS_SIGNATURE "rusEFI 2022.09.24.hellen154hyundai.1859896613" +#define SIGNATURE_HASH 1773535548 +#define TS_SIGNATURE "rusEFI 2022.09.24.hellen154hyundai.1773535548" diff --git a/firmware/controllers/generated/signature_hellen72.h b/firmware/controllers/generated/signature_hellen72.h index deadd95470..bc9e2c5ed3 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 78356133 -#define TS_SIGNATURE "rusEFI 2022.09.24.hellen72.78356133" +#define SIGNATURE_HASH 63331004 +#define TS_SIGNATURE "rusEFI 2022.09.24.hellen72.63331004" diff --git a/firmware/controllers/generated/signature_hellen81.h b/firmware/controllers/generated/signature_hellen81.h index 8a039c4ff8..7d8d2d31cc 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 3558961067 -#define TS_SIGNATURE "rusEFI 2022.09.24.hellen81.3558961067" +#define SIGNATURE_HASH 3545017266 +#define TS_SIGNATURE "rusEFI 2022.09.24.hellen81.3545017266" diff --git a/firmware/controllers/generated/signature_hellen88bmw.h b/firmware/controllers/generated/signature_hellen88bmw.h index f0296aa40b..d91a1ebd6c 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 3814827117 -#define TS_SIGNATURE "rusEFI 2022.09.24.hellen88bmw.3814827117" +#define SIGNATURE_HASH 3826016372 +#define TS_SIGNATURE "rusEFI 2022.09.24.hellen88bmw.3826016372" diff --git a/firmware/controllers/generated/signature_hellenNA6.h b/firmware/controllers/generated/signature_hellenNA6.h index 0e870c9d60..4bea74a44a 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 2832729750 -#define TS_SIGNATURE "rusEFI 2022.09.24.hellenNA6.2832729750" +#define SIGNATURE_HASH 2947924623 +#define TS_SIGNATURE "rusEFI 2022.09.24.hellenNA6.2947924623" diff --git a/firmware/controllers/generated/signature_hellenNA8_96.h b/firmware/controllers/generated/signature_hellenNA8_96.h index ec721b24b6..3d98c1de6b 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 1453131337 -#define TS_SIGNATURE "rusEFI 2022.09.24.hellenNA8_96.1453131337" +#define SIGNATURE_HASH 1374732880 +#define TS_SIGNATURE "rusEFI 2022.09.24.hellenNA8_96.1374732880" diff --git a/firmware/controllers/generated/signature_kin.h b/firmware/controllers/generated/signature_kin.h index 83685de849..977126ae7a 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 2655196525 -#define TS_SIGNATURE "rusEFI 2022.09.24.kin.2655196525" +#define SIGNATURE_HASH 2569982324 +#define TS_SIGNATURE "rusEFI 2022.09.24.kin.2569982324" diff --git a/firmware/controllers/generated/signature_mre_f4.h b/firmware/controllers/generated/signature_mre_f4.h index 68bc760383..6ca4c1f6c6 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 2848348590 -#define TS_SIGNATURE "rusEFI 2022.09.24.mre_f4.2848348590" +#define SIGNATURE_HASH 2930482615 +#define TS_SIGNATURE "rusEFI 2022.09.24.mre_f4.2930482615" diff --git a/firmware/controllers/generated/signature_mre_f7.h b/firmware/controllers/generated/signature_mre_f7.h index 8fb42992cd..403348fc01 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 2848348590 -#define TS_SIGNATURE "rusEFI 2022.09.24.mre_f7.2848348590" +#define SIGNATURE_HASH 2930482615 +#define TS_SIGNATURE "rusEFI 2022.09.24.mre_f7.2930482615" diff --git a/firmware/controllers/generated/signature_prometheus_405.h b/firmware/controllers/generated/signature_prometheus_405.h index 4cc2753b7a..dd411de3e9 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 2793303623 -#define TS_SIGNATURE "rusEFI 2022.09.24.prometheus_405.2793303623" +#define SIGNATURE_HASH 2702420574 +#define TS_SIGNATURE "rusEFI 2022.09.24.prometheus_405.2702420574" diff --git a/firmware/controllers/generated/signature_prometheus_469.h b/firmware/controllers/generated/signature_prometheus_469.h index 31e08dbbd5..9c3e7555ad 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 2793303623 -#define TS_SIGNATURE "rusEFI 2022.09.24.prometheus_469.2793303623" +#define SIGNATURE_HASH 2702420574 +#define TS_SIGNATURE "rusEFI 2022.09.24.prometheus_469.2702420574" diff --git a/firmware/controllers/generated/signature_proteus_f4.h b/firmware/controllers/generated/signature_proteus_f4.h index 95d2370740..39d6fc7af4 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 1398370519 -#define TS_SIGNATURE "rusEFI 2022.09.24.proteus_f4.1398370519" +#define SIGNATURE_HASH 1412740302 +#define TS_SIGNATURE "rusEFI 2022.09.24.proteus_f4.1412740302" diff --git a/firmware/controllers/generated/signature_proteus_f7.h b/firmware/controllers/generated/signature_proteus_f7.h index 34c60e0284..36a3d5fc17 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 1398370519 -#define TS_SIGNATURE "rusEFI 2022.09.24.proteus_f7.1398370519" +#define SIGNATURE_HASH 1412740302 +#define TS_SIGNATURE "rusEFI 2022.09.24.proteus_f7.1412740302" diff --git a/firmware/controllers/generated/signature_proteus_h7.h b/firmware/controllers/generated/signature_proteus_h7.h index b566b7dc3b..76be4f2ada 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 1398370519 -#define TS_SIGNATURE "rusEFI 2022.09.24.proteus_h7.1398370519" +#define SIGNATURE_HASH 1412740302 +#define TS_SIGNATURE "rusEFI 2022.09.24.proteus_h7.1412740302" diff --git a/firmware/controllers/generated/signature_subaru_eg33_f7.h b/firmware/controllers/generated/signature_subaru_eg33_f7.h index 051c3eb927..214978db18 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 2408214139 -#define TS_SIGNATURE "rusEFI 2022.09.24.subaru_eg33_f7.2408214139" +#define SIGNATURE_HASH 2296883810 +#define TS_SIGNATURE "rusEFI 2022.09.24.subaru_eg33_f7.2296883810" diff --git a/firmware/controllers/generated/signature_tdg-pdm8.h b/firmware/controllers/generated/signature_tdg-pdm8.h index a1a0dc9cd9..6e3744d618 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 1553758709 -#define TS_SIGNATURE "rusEFI 2022.09.24.tdg-pdm8.1553758709" +#define SIGNATURE_HASH 1542569452 +#define TS_SIGNATURE "rusEFI 2022.09.24.tdg-pdm8.1542569452" diff --git a/firmware/controllers/trigger/trigger_central_generated.h b/firmware/controllers/trigger/trigger_central_generated.h index efab2cf563..389289eae2 100644 --- a/firmware/controllers/trigger/trigger_central_generated.h +++ b/firmware/controllers/trigger/trigger_central_generated.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/trigger/trigger_central.txt Thu Sep 01 14:10:15 UTC 2022 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/trigger/trigger_central.txt Sat Sep 24 04:28:19 UTC 2022 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -43,8 +43,13 @@ struct trigger_central_s { * offset 40 */ scaled_channel currentEngineDecodedPhase = (float)0; + /** + deg + * offset 44 + */ + float triggerToothAngleError = (float)0; }; -static_assert(sizeof(trigger_central_s) == 44); +static_assert(sizeof(trigger_central_s) == 48); // end -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/trigger/trigger_central.txt Thu Sep 01 14:10:15 UTC 2022 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/trigger/trigger_central.txt Sat Sep 24 04:28:19 UTC 2022 diff --git a/firmware/tunerstudio/generated/rusefi.ini b/firmware/tunerstudio/generated/rusefi.ini index 9d023a9be4..971561bd9d 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.09.24.all.4136941473" + signature = "rusEFI 2022.09.24.all.4059657144" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.09.24.all.4136941473" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.09.24.all.4059657144" ; 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 Fri Sep 23 23:16:45 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Sep 24 04:29:20 UTC 2022 pageSize = 22048 page = 1 @@ -2140,7 +2140,7 @@ ignBlends4_blendValues = array, U08, 22038, [8], "%", 0.5, 0, 0, 100, 1 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1260 + ochBlockSize = 1264 ; ; see TunerStudioOutputChannels struct @@ -3141,146 +3141,147 @@ mapVvt_MAP_AT_DIFF = scalar, F32, 1116, "", 1, 0 mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1120, "", 1, 0 mapVvt_map_peak = scalar, U08, 1121, "", 1, 0 currentEngineDecodedPhase = scalar, F32, 1124, "deg", 1, 0 -; total TS size = 1128 -crankSynchronizationCounter = scalar, U32, 1128, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1132, "", 1, 0 -vvtCurrentPosition = scalar, F32, 1136, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1140, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 1144, "", 1, 0 -triggerStateIndex = scalar, U08, 1148, "", 1, 0 -vvtCounter = scalar, U08, 1149, "", 1, 0 -camResyncCounter = scalar, U08, 1150, "", 1, 0 -vvtStateIndex = scalar, U08, 1151, "", 1, 0 -; total TS size = 1152 -m_hasSynchronizedPhase = bits, U32, 1152, [0:0] -unusedBit_1_1 = bits, U32, 1152, [1:1] -unusedBit_1_2 = bits, U32, 1152, [2:2] -unusedBit_1_3 = bits, U32, 1152, [3:3] -unusedBit_1_4 = bits, U32, 1152, [4:4] -unusedBit_1_5 = bits, U32, 1152, [5:5] -unusedBit_1_6 = bits, U32, 1152, [6:6] -unusedBit_1_7 = bits, U32, 1152, [7:7] -unusedBit_1_8 = bits, U32, 1152, [8:8] -unusedBit_1_9 = bits, U32, 1152, [9:9] -unusedBit_1_10 = bits, U32, 1152, [10:10] -unusedBit_1_11 = bits, U32, 1152, [11:11] -unusedBit_1_12 = bits, U32, 1152, [12:12] -unusedBit_1_13 = bits, U32, 1152, [13:13] -unusedBit_1_14 = bits, U32, 1152, [14:14] -unusedBit_1_15 = bits, U32, 1152, [15:15] -unusedBit_1_16 = bits, U32, 1152, [16:16] -unusedBit_1_17 = bits, U32, 1152, [17:17] -unusedBit_1_18 = bits, U32, 1152, [18:18] -unusedBit_1_19 = bits, U32, 1152, [19:19] -unusedBit_1_20 = bits, U32, 1152, [20:20] -unusedBit_1_21 = bits, U32, 1152, [21:21] -unusedBit_1_22 = bits, U32, 1152, [22:22] -unusedBit_1_23 = bits, U32, 1152, [23:23] -unusedBit_1_24 = bits, U32, 1152, [24:24] -unusedBit_1_25 = bits, U32, 1152, [25:25] -unusedBit_1_26 = bits, U32, 1152, [26:26] -unusedBit_1_27 = bits, U32, 1152, [27:27] -unusedBit_1_28 = bits, U32, 1152, [28:28] -unusedBit_1_29 = bits, U32, 1152, [29:29] -unusedBit_1_30 = bits, U32, 1152, [30:30] -unusedBit_1_31 = bits, U32, 1152, [31:31] +triggerToothAngleError = scalar, F32, 1128, "deg", 1, 0 +; total TS size = 1132 +crankSynchronizationCounter = scalar, U32, 1132, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1136, "", 1, 0 +vvtCurrentPosition = scalar, F32, 1140, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1144, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 1148, "", 1, 0 +triggerStateIndex = scalar, U08, 1152, "", 1, 0 +vvtCounter = scalar, U08, 1153, "", 1, 0 +camResyncCounter = scalar, U08, 1154, "", 1, 0 +vvtStateIndex = scalar, U08, 1155, "", 1, 0 ; total TS size = 1156 -wallFuelCorrection = scalar, F32, 1156, "", 1, 0 -wallFuel = scalar, F32, 1160, "", 1, 0 -; total TS size = 1164 -idleState = bits, S32, 1164, [0:2], "not important" -currentIdlePosition = scalar, F32, 1168 -baseIdlePosition = scalar, F32, 1172 -iacByTpsTaper = scalar, F32, 1176 -throttlePedalUpState = scalar, S32, 1180, "", 1, 0 -mightResetPid = bits, U32, 1184, [0:0] -shouldResetPid = bits, U32, 1184, [1:1] -wasResetPid = bits, U32, 1184, [2:2] -mustResetPid = bits, U32, 1184, [3:3] -isCranking = bits, U32, 1184, [4:4] -useIacTableForCoasting = bits, U32, 1184, [5:5] -notIdling = bits, U32, 1184, [6:6] -needReset = bits, U32, 1184, [7:7] -isInDeadZone = bits, U32, 1184, [8:8] -isBlipping = bits, U32, 1184, [9:9] -useClosedLoop = bits, U32, 1184, [10:10] -badTps = bits, U32, 1184, [11:11] -looksLikeRunning = bits, U32, 1184, [12:12] -looksLikeCoasting = bits, U32, 1184, [13:13] -looksLikeCrankToIdle = bits, U32, 1184, [14:14] -isVerboseIAC = bits, U32, 1184, [15:15] -isIdleCoasting = bits, U32, 1184, [16:16] -unusedBit_22_17 = bits, U32, 1184, [17:17] -unusedBit_22_18 = bits, U32, 1184, [18:18] -unusedBit_22_19 = bits, U32, 1184, [19:19] -unusedBit_22_20 = bits, U32, 1184, [20:20] -unusedBit_22_21 = bits, U32, 1184, [21:21] -unusedBit_22_22 = bits, U32, 1184, [22:22] -unusedBit_22_23 = bits, U32, 1184, [23:23] -unusedBit_22_24 = bits, U32, 1184, [24:24] -unusedBit_22_25 = bits, U32, 1184, [25:25] -unusedBit_22_26 = bits, U32, 1184, [26:26] -unusedBit_22_27 = bits, U32, 1184, [27:27] -unusedBit_22_28 = bits, U32, 1184, [28:28] -unusedBit_22_29 = bits, U32, 1184, [29:29] -unusedBit_22_30 = bits, U32, 1184, [30:30] -unusedBit_22_31 = bits, U32, 1184, [31:31] -targetRpmByClt = scalar, S32, 1188, "", 1, 0 -targetRpmAcBump = scalar, S32, 1192, "", 1, 0 -iacByRpmTaper = scalar, F32, 1196 -luaAdd = scalar, F32, 1200 -; total TS size = 1204 -baseDwell = scalar, F32, 1204, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 1208, "", 1, 0 -luaTimingAdd = scalar, F32, 1212, "", 1, 0 -luaTimingMult = scalar, F32, 1216, "", 1, 0 -; total TS size = 1220 -idlePosition = scalar, F32, 1220, "", 1, 0 -trim = scalar, F32, 1224, "", 1, 0 -luaAdjustment = scalar, F32, 1228, "", 1, 0 -etbFeedForward = scalar, F32, 1232 -etbIntegralError = scalar, F32, 1236, "", 1, 0 -etbCurrentTarget = scalar, F32, 1240, "%", 1, 0 -etbRevLimitActive = bits, U32, 1244, [0:0] -unusedBit_7_1 = bits, U32, 1244, [1:1] -unusedBit_7_2 = bits, U32, 1244, [2:2] -unusedBit_7_3 = bits, U32, 1244, [3:3] -unusedBit_7_4 = bits, U32, 1244, [4:4] -unusedBit_7_5 = bits, U32, 1244, [5:5] -unusedBit_7_6 = bits, U32, 1244, [6:6] -unusedBit_7_7 = bits, U32, 1244, [7:7] -unusedBit_7_8 = bits, U32, 1244, [8:8] -unusedBit_7_9 = bits, U32, 1244, [9:9] -unusedBit_7_10 = bits, U32, 1244, [10:10] -unusedBit_7_11 = bits, U32, 1244, [11:11] -unusedBit_7_12 = bits, U32, 1244, [12:12] -unusedBit_7_13 = bits, U32, 1244, [13:13] -unusedBit_7_14 = bits, U32, 1244, [14:14] -unusedBit_7_15 = bits, U32, 1244, [15:15] -unusedBit_7_16 = bits, U32, 1244, [16:16] -unusedBit_7_17 = bits, U32, 1244, [17:17] -unusedBit_7_18 = bits, U32, 1244, [18:18] -unusedBit_7_19 = bits, U32, 1244, [19:19] -unusedBit_7_20 = bits, U32, 1244, [20:20] -unusedBit_7_21 = bits, U32, 1244, [21:21] -unusedBit_7_22 = bits, U32, 1244, [22:22] -unusedBit_7_23 = bits, U32, 1244, [23:23] -unusedBit_7_24 = bits, U32, 1244, [24:24] -unusedBit_7_25 = bits, U32, 1244, [25:25] -unusedBit_7_26 = bits, U32, 1244, [26:26] -unusedBit_7_27 = bits, U32, 1244, [27:27] -unusedBit_7_28 = bits, U32, 1244, [28:28] -unusedBit_7_29 = bits, U32, 1244, [29:29] -unusedBit_7_30 = bits, U32, 1244, [30:30] -unusedBit_7_31 = bits, U32, 1244, [31:31] -; total TS size = 1248 -faultCode = scalar, U08, 1248, "", 1, 0 -heaterDuty = scalar, U08, 1249, "%", 1, 0 -pumpDuty = scalar, U08, 1250, "%", 1, 0 -tempC = scalar, U16, 1252, "C", 1, 0 -nernstVoltage = scalar, U16, 1254, "V", 0.001, 0 -esr = scalar, U16, 1256, "", 1, 0 -; total TS size = 1260 +m_hasSynchronizedPhase = bits, U32, 1156, [0:0] +unusedBit_1_1 = bits, U32, 1156, [1:1] +unusedBit_1_2 = bits, U32, 1156, [2:2] +unusedBit_1_3 = bits, U32, 1156, [3:3] +unusedBit_1_4 = bits, U32, 1156, [4:4] +unusedBit_1_5 = bits, U32, 1156, [5:5] +unusedBit_1_6 = bits, U32, 1156, [6:6] +unusedBit_1_7 = bits, U32, 1156, [7:7] +unusedBit_1_8 = bits, U32, 1156, [8:8] +unusedBit_1_9 = bits, U32, 1156, [9:9] +unusedBit_1_10 = bits, U32, 1156, [10:10] +unusedBit_1_11 = bits, U32, 1156, [11:11] +unusedBit_1_12 = bits, U32, 1156, [12:12] +unusedBit_1_13 = bits, U32, 1156, [13:13] +unusedBit_1_14 = bits, U32, 1156, [14:14] +unusedBit_1_15 = bits, U32, 1156, [15:15] +unusedBit_1_16 = bits, U32, 1156, [16:16] +unusedBit_1_17 = bits, U32, 1156, [17:17] +unusedBit_1_18 = bits, U32, 1156, [18:18] +unusedBit_1_19 = bits, U32, 1156, [19:19] +unusedBit_1_20 = bits, U32, 1156, [20:20] +unusedBit_1_21 = bits, U32, 1156, [21:21] +unusedBit_1_22 = bits, U32, 1156, [22:22] +unusedBit_1_23 = bits, U32, 1156, [23:23] +unusedBit_1_24 = bits, U32, 1156, [24:24] +unusedBit_1_25 = bits, U32, 1156, [25:25] +unusedBit_1_26 = bits, U32, 1156, [26:26] +unusedBit_1_27 = bits, U32, 1156, [27:27] +unusedBit_1_28 = bits, U32, 1156, [28:28] +unusedBit_1_29 = bits, U32, 1156, [29:29] +unusedBit_1_30 = bits, U32, 1156, [30:30] +unusedBit_1_31 = bits, U32, 1156, [31:31] +; total TS size = 1160 +wallFuelCorrection = scalar, F32, 1160, "", 1, 0 +wallFuel = scalar, F32, 1164, "", 1, 0 +; total TS size = 1168 +idleState = bits, S32, 1168, [0:2], "not important" +currentIdlePosition = scalar, F32, 1172 +baseIdlePosition = scalar, F32, 1176 +iacByTpsTaper = scalar, F32, 1180 +throttlePedalUpState = scalar, S32, 1184, "", 1, 0 +mightResetPid = bits, U32, 1188, [0:0] +shouldResetPid = bits, U32, 1188, [1:1] +wasResetPid = bits, U32, 1188, [2:2] +mustResetPid = bits, U32, 1188, [3:3] +isCranking = bits, U32, 1188, [4:4] +useIacTableForCoasting = bits, U32, 1188, [5:5] +notIdling = bits, U32, 1188, [6:6] +needReset = bits, U32, 1188, [7:7] +isInDeadZone = bits, U32, 1188, [8:8] +isBlipping = bits, U32, 1188, [9:9] +useClosedLoop = bits, U32, 1188, [10:10] +badTps = bits, U32, 1188, [11:11] +looksLikeRunning = bits, U32, 1188, [12:12] +looksLikeCoasting = bits, U32, 1188, [13:13] +looksLikeCrankToIdle = bits, U32, 1188, [14:14] +isVerboseIAC = bits, U32, 1188, [15:15] +isIdleCoasting = bits, U32, 1188, [16:16] +unusedBit_22_17 = bits, U32, 1188, [17:17] +unusedBit_22_18 = bits, U32, 1188, [18:18] +unusedBit_22_19 = bits, U32, 1188, [19:19] +unusedBit_22_20 = bits, U32, 1188, [20:20] +unusedBit_22_21 = bits, U32, 1188, [21:21] +unusedBit_22_22 = bits, U32, 1188, [22:22] +unusedBit_22_23 = bits, U32, 1188, [23:23] +unusedBit_22_24 = bits, U32, 1188, [24:24] +unusedBit_22_25 = bits, U32, 1188, [25:25] +unusedBit_22_26 = bits, U32, 1188, [26:26] +unusedBit_22_27 = bits, U32, 1188, [27:27] +unusedBit_22_28 = bits, U32, 1188, [28:28] +unusedBit_22_29 = bits, U32, 1188, [29:29] +unusedBit_22_30 = bits, U32, 1188, [30:30] +unusedBit_22_31 = bits, U32, 1188, [31:31] +targetRpmByClt = scalar, S32, 1192, "", 1, 0 +targetRpmAcBump = scalar, S32, 1196, "", 1, 0 +iacByRpmTaper = scalar, F32, 1200 +luaAdd = scalar, F32, 1204 +; total TS size = 1208 +baseDwell = scalar, F32, 1208, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 1212, "", 1, 0 +luaTimingAdd = scalar, F32, 1216, "", 1, 0 +luaTimingMult = scalar, F32, 1220, "", 1, 0 +; total TS size = 1224 +idlePosition = scalar, F32, 1224, "", 1, 0 +trim = scalar, F32, 1228, "", 1, 0 +luaAdjustment = scalar, F32, 1232, "", 1, 0 +etbFeedForward = scalar, F32, 1236 +etbIntegralError = scalar, F32, 1240, "", 1, 0 +etbCurrentTarget = scalar, F32, 1244, "%", 1, 0 +etbRevLimitActive = bits, U32, 1248, [0:0] +unusedBit_7_1 = bits, U32, 1248, [1:1] +unusedBit_7_2 = bits, U32, 1248, [2:2] +unusedBit_7_3 = bits, U32, 1248, [3:3] +unusedBit_7_4 = bits, U32, 1248, [4:4] +unusedBit_7_5 = bits, U32, 1248, [5:5] +unusedBit_7_6 = bits, U32, 1248, [6:6] +unusedBit_7_7 = bits, U32, 1248, [7:7] +unusedBit_7_8 = bits, U32, 1248, [8:8] +unusedBit_7_9 = bits, U32, 1248, [9:9] +unusedBit_7_10 = bits, U32, 1248, [10:10] +unusedBit_7_11 = bits, U32, 1248, [11:11] +unusedBit_7_12 = bits, U32, 1248, [12:12] +unusedBit_7_13 = bits, U32, 1248, [13:13] +unusedBit_7_14 = bits, U32, 1248, [14:14] +unusedBit_7_15 = bits, U32, 1248, [15:15] +unusedBit_7_16 = bits, U32, 1248, [16:16] +unusedBit_7_17 = bits, U32, 1248, [17:17] +unusedBit_7_18 = bits, U32, 1248, [18:18] +unusedBit_7_19 = bits, U32, 1248, [19:19] +unusedBit_7_20 = bits, U32, 1248, [20:20] +unusedBit_7_21 = bits, U32, 1248, [21:21] +unusedBit_7_22 = bits, U32, 1248, [22:22] +unusedBit_7_23 = bits, U32, 1248, [23:23] +unusedBit_7_24 = bits, U32, 1248, [24:24] +unusedBit_7_25 = bits, U32, 1248, [25:25] +unusedBit_7_26 = bits, U32, 1248, [26:26] +unusedBit_7_27 = bits, U32, 1248, [27:27] +unusedBit_7_28 = bits, U32, 1248, [28:28] +unusedBit_7_29 = bits, U32, 1248, [29:29] +unusedBit_7_30 = bits, U32, 1248, [30:30] +unusedBit_7_31 = bits, U32, 1248, [31:31] +; total TS size = 1252 +faultCode = scalar, U08, 1252, "", 1, 0 +heaterDuty = scalar, U08, 1253, "%", 1, 0 +pumpDuty = scalar, U08, 1254, "%", 1, 0 +tempC = scalar, U16, 1256, "C", 1, 0 +nernstVoltage = scalar, U16, 1258, "V", 0.001, 0 +esr = scalar, U16, 1260, "", 1, 0 +; total TS size = 1264 time = { timeNow } @@ -4993,6 +4994,7 @@ entry = mapVvt_MAP_AT_DIFF, "mapVvt_MAP_AT_DIFF", float, "%.3f" entry = mapVvt_MAP_AT_CYCLE_COUNT, "mapVvt_MAP_AT_CYCLE_COUNT", int, "%d" entry = mapVvt_map_peak, "mapVvt_map_peak", int, "%d" entry = currentEngineDecodedPhase, "Engine Phase", float, "%.3f" +entry = triggerToothAngleError, "triggerToothAngleError", float, "%.3f" entry = crankSynchronizationCounter, "Crank sync counter", int, "%d" entry = vvtSyncGapRatio, "vvtSyncGapRatio", float, "%.3f" entry = vvtCurrentPosition, "vvtCurrentPosition", float, "%.3f" @@ -5783,6 +5785,8 @@ dialog = trigger_centralDialog, "trigger_central" graphLine = mapVvt_MAP_AT_CYCLE_COUNT graphLine = mapVvt_map_peak graphLine = currentEngineDecodedPhase + liveGraph = trigger_central_4_Graph, "Graph", South + graphLine = triggerToothAngleError dialog = trigger_stateDialog, "trigger_state" diff --git a/firmware/tunerstudio/generated/rusefi_48way.ini b/firmware/tunerstudio/generated/rusefi_48way.ini index 615e844d25..5650b832f5 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.09.24.48way.3786653678" + signature = "rusEFI 2022.09.24.48way.3873340407" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.09.24.48way.3786653678" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.09.24.48way.3873340407" ; 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 Fri Sep 23 23:16:24 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Sep 24 04:28:59 UTC 2022 pageSize = 22048 page = 1 @@ -2140,7 +2140,7 @@ ignBlends4_blendValues = array, U08, 22038, [8], "%", 0.5, 0, 0, 100, 1 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1260 + ochBlockSize = 1264 ; ; see TunerStudioOutputChannels struct @@ -3141,146 +3141,147 @@ mapVvt_MAP_AT_DIFF = scalar, F32, 1116, "", 1, 0 mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1120, "", 1, 0 mapVvt_map_peak = scalar, U08, 1121, "", 1, 0 currentEngineDecodedPhase = scalar, F32, 1124, "deg", 1, 0 -; total TS size = 1128 -crankSynchronizationCounter = scalar, U32, 1128, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1132, "", 1, 0 -vvtCurrentPosition = scalar, F32, 1136, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1140, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 1144, "", 1, 0 -triggerStateIndex = scalar, U08, 1148, "", 1, 0 -vvtCounter = scalar, U08, 1149, "", 1, 0 -camResyncCounter = scalar, U08, 1150, "", 1, 0 -vvtStateIndex = scalar, U08, 1151, "", 1, 0 -; total TS size = 1152 -m_hasSynchronizedPhase = bits, U32, 1152, [0:0] -unusedBit_1_1 = bits, U32, 1152, [1:1] -unusedBit_1_2 = bits, U32, 1152, [2:2] -unusedBit_1_3 = bits, U32, 1152, [3:3] -unusedBit_1_4 = bits, U32, 1152, [4:4] -unusedBit_1_5 = bits, U32, 1152, [5:5] -unusedBit_1_6 = bits, U32, 1152, [6:6] -unusedBit_1_7 = bits, U32, 1152, [7:7] -unusedBit_1_8 = bits, U32, 1152, [8:8] -unusedBit_1_9 = bits, U32, 1152, [9:9] -unusedBit_1_10 = bits, U32, 1152, [10:10] -unusedBit_1_11 = bits, U32, 1152, [11:11] -unusedBit_1_12 = bits, U32, 1152, [12:12] -unusedBit_1_13 = bits, U32, 1152, [13:13] -unusedBit_1_14 = bits, U32, 1152, [14:14] -unusedBit_1_15 = bits, U32, 1152, [15:15] -unusedBit_1_16 = bits, U32, 1152, [16:16] -unusedBit_1_17 = bits, U32, 1152, [17:17] -unusedBit_1_18 = bits, U32, 1152, [18:18] -unusedBit_1_19 = bits, U32, 1152, [19:19] -unusedBit_1_20 = bits, U32, 1152, [20:20] -unusedBit_1_21 = bits, U32, 1152, [21:21] -unusedBit_1_22 = bits, U32, 1152, [22:22] -unusedBit_1_23 = bits, U32, 1152, [23:23] -unusedBit_1_24 = bits, U32, 1152, [24:24] -unusedBit_1_25 = bits, U32, 1152, [25:25] -unusedBit_1_26 = bits, U32, 1152, [26:26] -unusedBit_1_27 = bits, U32, 1152, [27:27] -unusedBit_1_28 = bits, U32, 1152, [28:28] -unusedBit_1_29 = bits, U32, 1152, [29:29] -unusedBit_1_30 = bits, U32, 1152, [30:30] -unusedBit_1_31 = bits, U32, 1152, [31:31] +triggerToothAngleError = scalar, F32, 1128, "deg", 1, 0 +; total TS size = 1132 +crankSynchronizationCounter = scalar, U32, 1132, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1136, "", 1, 0 +vvtCurrentPosition = scalar, F32, 1140, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1144, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 1148, "", 1, 0 +triggerStateIndex = scalar, U08, 1152, "", 1, 0 +vvtCounter = scalar, U08, 1153, "", 1, 0 +camResyncCounter = scalar, U08, 1154, "", 1, 0 +vvtStateIndex = scalar, U08, 1155, "", 1, 0 ; total TS size = 1156 -wallFuelCorrection = scalar, F32, 1156, "", 1, 0 -wallFuel = scalar, F32, 1160, "", 1, 0 -; total TS size = 1164 -idleState = bits, S32, 1164, [0:2], "not important" -currentIdlePosition = scalar, F32, 1168 -baseIdlePosition = scalar, F32, 1172 -iacByTpsTaper = scalar, F32, 1176 -throttlePedalUpState = scalar, S32, 1180, "", 1, 0 -mightResetPid = bits, U32, 1184, [0:0] -shouldResetPid = bits, U32, 1184, [1:1] -wasResetPid = bits, U32, 1184, [2:2] -mustResetPid = bits, U32, 1184, [3:3] -isCranking = bits, U32, 1184, [4:4] -useIacTableForCoasting = bits, U32, 1184, [5:5] -notIdling = bits, U32, 1184, [6:6] -needReset = bits, U32, 1184, [7:7] -isInDeadZone = bits, U32, 1184, [8:8] -isBlipping = bits, U32, 1184, [9:9] -useClosedLoop = bits, U32, 1184, [10:10] -badTps = bits, U32, 1184, [11:11] -looksLikeRunning = bits, U32, 1184, [12:12] -looksLikeCoasting = bits, U32, 1184, [13:13] -looksLikeCrankToIdle = bits, U32, 1184, [14:14] -isVerboseIAC = bits, U32, 1184, [15:15] -isIdleCoasting = bits, U32, 1184, [16:16] -unusedBit_22_17 = bits, U32, 1184, [17:17] -unusedBit_22_18 = bits, U32, 1184, [18:18] -unusedBit_22_19 = bits, U32, 1184, [19:19] -unusedBit_22_20 = bits, U32, 1184, [20:20] -unusedBit_22_21 = bits, U32, 1184, [21:21] -unusedBit_22_22 = bits, U32, 1184, [22:22] -unusedBit_22_23 = bits, U32, 1184, [23:23] -unusedBit_22_24 = bits, U32, 1184, [24:24] -unusedBit_22_25 = bits, U32, 1184, [25:25] -unusedBit_22_26 = bits, U32, 1184, [26:26] -unusedBit_22_27 = bits, U32, 1184, [27:27] -unusedBit_22_28 = bits, U32, 1184, [28:28] -unusedBit_22_29 = bits, U32, 1184, [29:29] -unusedBit_22_30 = bits, U32, 1184, [30:30] -unusedBit_22_31 = bits, U32, 1184, [31:31] -targetRpmByClt = scalar, S32, 1188, "", 1, 0 -targetRpmAcBump = scalar, S32, 1192, "", 1, 0 -iacByRpmTaper = scalar, F32, 1196 -luaAdd = scalar, F32, 1200 -; total TS size = 1204 -baseDwell = scalar, F32, 1204, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 1208, "", 1, 0 -luaTimingAdd = scalar, F32, 1212, "", 1, 0 -luaTimingMult = scalar, F32, 1216, "", 1, 0 -; total TS size = 1220 -idlePosition = scalar, F32, 1220, "", 1, 0 -trim = scalar, F32, 1224, "", 1, 0 -luaAdjustment = scalar, F32, 1228, "", 1, 0 -etbFeedForward = scalar, F32, 1232 -etbIntegralError = scalar, F32, 1236, "", 1, 0 -etbCurrentTarget = scalar, F32, 1240, "%", 1, 0 -etbRevLimitActive = bits, U32, 1244, [0:0] -unusedBit_7_1 = bits, U32, 1244, [1:1] -unusedBit_7_2 = bits, U32, 1244, [2:2] -unusedBit_7_3 = bits, U32, 1244, [3:3] -unusedBit_7_4 = bits, U32, 1244, [4:4] -unusedBit_7_5 = bits, U32, 1244, [5:5] -unusedBit_7_6 = bits, U32, 1244, [6:6] -unusedBit_7_7 = bits, U32, 1244, [7:7] -unusedBit_7_8 = bits, U32, 1244, [8:8] -unusedBit_7_9 = bits, U32, 1244, [9:9] -unusedBit_7_10 = bits, U32, 1244, [10:10] -unusedBit_7_11 = bits, U32, 1244, [11:11] -unusedBit_7_12 = bits, U32, 1244, [12:12] -unusedBit_7_13 = bits, U32, 1244, [13:13] -unusedBit_7_14 = bits, U32, 1244, [14:14] -unusedBit_7_15 = bits, U32, 1244, [15:15] -unusedBit_7_16 = bits, U32, 1244, [16:16] -unusedBit_7_17 = bits, U32, 1244, [17:17] -unusedBit_7_18 = bits, U32, 1244, [18:18] -unusedBit_7_19 = bits, U32, 1244, [19:19] -unusedBit_7_20 = bits, U32, 1244, [20:20] -unusedBit_7_21 = bits, U32, 1244, [21:21] -unusedBit_7_22 = bits, U32, 1244, [22:22] -unusedBit_7_23 = bits, U32, 1244, [23:23] -unusedBit_7_24 = bits, U32, 1244, [24:24] -unusedBit_7_25 = bits, U32, 1244, [25:25] -unusedBit_7_26 = bits, U32, 1244, [26:26] -unusedBit_7_27 = bits, U32, 1244, [27:27] -unusedBit_7_28 = bits, U32, 1244, [28:28] -unusedBit_7_29 = bits, U32, 1244, [29:29] -unusedBit_7_30 = bits, U32, 1244, [30:30] -unusedBit_7_31 = bits, U32, 1244, [31:31] -; total TS size = 1248 -faultCode = scalar, U08, 1248, "", 1, 0 -heaterDuty = scalar, U08, 1249, "%", 1, 0 -pumpDuty = scalar, U08, 1250, "%", 1, 0 -tempC = scalar, U16, 1252, "C", 1, 0 -nernstVoltage = scalar, U16, 1254, "V", 0.001, 0 -esr = scalar, U16, 1256, "", 1, 0 -; total TS size = 1260 +m_hasSynchronizedPhase = bits, U32, 1156, [0:0] +unusedBit_1_1 = bits, U32, 1156, [1:1] +unusedBit_1_2 = bits, U32, 1156, [2:2] +unusedBit_1_3 = bits, U32, 1156, [3:3] +unusedBit_1_4 = bits, U32, 1156, [4:4] +unusedBit_1_5 = bits, U32, 1156, [5:5] +unusedBit_1_6 = bits, U32, 1156, [6:6] +unusedBit_1_7 = bits, U32, 1156, [7:7] +unusedBit_1_8 = bits, U32, 1156, [8:8] +unusedBit_1_9 = bits, U32, 1156, [9:9] +unusedBit_1_10 = bits, U32, 1156, [10:10] +unusedBit_1_11 = bits, U32, 1156, [11:11] +unusedBit_1_12 = bits, U32, 1156, [12:12] +unusedBit_1_13 = bits, U32, 1156, [13:13] +unusedBit_1_14 = bits, U32, 1156, [14:14] +unusedBit_1_15 = bits, U32, 1156, [15:15] +unusedBit_1_16 = bits, U32, 1156, [16:16] +unusedBit_1_17 = bits, U32, 1156, [17:17] +unusedBit_1_18 = bits, U32, 1156, [18:18] +unusedBit_1_19 = bits, U32, 1156, [19:19] +unusedBit_1_20 = bits, U32, 1156, [20:20] +unusedBit_1_21 = bits, U32, 1156, [21:21] +unusedBit_1_22 = bits, U32, 1156, [22:22] +unusedBit_1_23 = bits, U32, 1156, [23:23] +unusedBit_1_24 = bits, U32, 1156, [24:24] +unusedBit_1_25 = bits, U32, 1156, [25:25] +unusedBit_1_26 = bits, U32, 1156, [26:26] +unusedBit_1_27 = bits, U32, 1156, [27:27] +unusedBit_1_28 = bits, U32, 1156, [28:28] +unusedBit_1_29 = bits, U32, 1156, [29:29] +unusedBit_1_30 = bits, U32, 1156, [30:30] +unusedBit_1_31 = bits, U32, 1156, [31:31] +; total TS size = 1160 +wallFuelCorrection = scalar, F32, 1160, "", 1, 0 +wallFuel = scalar, F32, 1164, "", 1, 0 +; total TS size = 1168 +idleState = bits, S32, 1168, [0:2], "not important" +currentIdlePosition = scalar, F32, 1172 +baseIdlePosition = scalar, F32, 1176 +iacByTpsTaper = scalar, F32, 1180 +throttlePedalUpState = scalar, S32, 1184, "", 1, 0 +mightResetPid = bits, U32, 1188, [0:0] +shouldResetPid = bits, U32, 1188, [1:1] +wasResetPid = bits, U32, 1188, [2:2] +mustResetPid = bits, U32, 1188, [3:3] +isCranking = bits, U32, 1188, [4:4] +useIacTableForCoasting = bits, U32, 1188, [5:5] +notIdling = bits, U32, 1188, [6:6] +needReset = bits, U32, 1188, [7:7] +isInDeadZone = bits, U32, 1188, [8:8] +isBlipping = bits, U32, 1188, [9:9] +useClosedLoop = bits, U32, 1188, [10:10] +badTps = bits, U32, 1188, [11:11] +looksLikeRunning = bits, U32, 1188, [12:12] +looksLikeCoasting = bits, U32, 1188, [13:13] +looksLikeCrankToIdle = bits, U32, 1188, [14:14] +isVerboseIAC = bits, U32, 1188, [15:15] +isIdleCoasting = bits, U32, 1188, [16:16] +unusedBit_22_17 = bits, U32, 1188, [17:17] +unusedBit_22_18 = bits, U32, 1188, [18:18] +unusedBit_22_19 = bits, U32, 1188, [19:19] +unusedBit_22_20 = bits, U32, 1188, [20:20] +unusedBit_22_21 = bits, U32, 1188, [21:21] +unusedBit_22_22 = bits, U32, 1188, [22:22] +unusedBit_22_23 = bits, U32, 1188, [23:23] +unusedBit_22_24 = bits, U32, 1188, [24:24] +unusedBit_22_25 = bits, U32, 1188, [25:25] +unusedBit_22_26 = bits, U32, 1188, [26:26] +unusedBit_22_27 = bits, U32, 1188, [27:27] +unusedBit_22_28 = bits, U32, 1188, [28:28] +unusedBit_22_29 = bits, U32, 1188, [29:29] +unusedBit_22_30 = bits, U32, 1188, [30:30] +unusedBit_22_31 = bits, U32, 1188, [31:31] +targetRpmByClt = scalar, S32, 1192, "", 1, 0 +targetRpmAcBump = scalar, S32, 1196, "", 1, 0 +iacByRpmTaper = scalar, F32, 1200 +luaAdd = scalar, F32, 1204 +; total TS size = 1208 +baseDwell = scalar, F32, 1208, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 1212, "", 1, 0 +luaTimingAdd = scalar, F32, 1216, "", 1, 0 +luaTimingMult = scalar, F32, 1220, "", 1, 0 +; total TS size = 1224 +idlePosition = scalar, F32, 1224, "", 1, 0 +trim = scalar, F32, 1228, "", 1, 0 +luaAdjustment = scalar, F32, 1232, "", 1, 0 +etbFeedForward = scalar, F32, 1236 +etbIntegralError = scalar, F32, 1240, "", 1, 0 +etbCurrentTarget = scalar, F32, 1244, "%", 1, 0 +etbRevLimitActive = bits, U32, 1248, [0:0] +unusedBit_7_1 = bits, U32, 1248, [1:1] +unusedBit_7_2 = bits, U32, 1248, [2:2] +unusedBit_7_3 = bits, U32, 1248, [3:3] +unusedBit_7_4 = bits, U32, 1248, [4:4] +unusedBit_7_5 = bits, U32, 1248, [5:5] +unusedBit_7_6 = bits, U32, 1248, [6:6] +unusedBit_7_7 = bits, U32, 1248, [7:7] +unusedBit_7_8 = bits, U32, 1248, [8:8] +unusedBit_7_9 = bits, U32, 1248, [9:9] +unusedBit_7_10 = bits, U32, 1248, [10:10] +unusedBit_7_11 = bits, U32, 1248, [11:11] +unusedBit_7_12 = bits, U32, 1248, [12:12] +unusedBit_7_13 = bits, U32, 1248, [13:13] +unusedBit_7_14 = bits, U32, 1248, [14:14] +unusedBit_7_15 = bits, U32, 1248, [15:15] +unusedBit_7_16 = bits, U32, 1248, [16:16] +unusedBit_7_17 = bits, U32, 1248, [17:17] +unusedBit_7_18 = bits, U32, 1248, [18:18] +unusedBit_7_19 = bits, U32, 1248, [19:19] +unusedBit_7_20 = bits, U32, 1248, [20:20] +unusedBit_7_21 = bits, U32, 1248, [21:21] +unusedBit_7_22 = bits, U32, 1248, [22:22] +unusedBit_7_23 = bits, U32, 1248, [23:23] +unusedBit_7_24 = bits, U32, 1248, [24:24] +unusedBit_7_25 = bits, U32, 1248, [25:25] +unusedBit_7_26 = bits, U32, 1248, [26:26] +unusedBit_7_27 = bits, U32, 1248, [27:27] +unusedBit_7_28 = bits, U32, 1248, [28:28] +unusedBit_7_29 = bits, U32, 1248, [29:29] +unusedBit_7_30 = bits, U32, 1248, [30:30] +unusedBit_7_31 = bits, U32, 1248, [31:31] +; total TS size = 1252 +faultCode = scalar, U08, 1252, "", 1, 0 +heaterDuty = scalar, U08, 1253, "%", 1, 0 +pumpDuty = scalar, U08, 1254, "%", 1, 0 +tempC = scalar, U16, 1256, "C", 1, 0 +nernstVoltage = scalar, U16, 1258, "V", 0.001, 0 +esr = scalar, U16, 1260, "", 1, 0 +; total TS size = 1264 time = { timeNow } @@ -4993,6 +4994,7 @@ entry = mapVvt_MAP_AT_DIFF, "mapVvt_MAP_AT_DIFF", float, "%.3f" entry = mapVvt_MAP_AT_CYCLE_COUNT, "mapVvt_MAP_AT_CYCLE_COUNT", int, "%d" entry = mapVvt_map_peak, "mapVvt_map_peak", int, "%d" entry = currentEngineDecodedPhase, "Engine Phase", float, "%.3f" +entry = triggerToothAngleError, "triggerToothAngleError", float, "%.3f" entry = crankSynchronizationCounter, "Crank sync counter", int, "%d" entry = vvtSyncGapRatio, "vvtSyncGapRatio", float, "%.3f" entry = vvtCurrentPosition, "vvtCurrentPosition", float, "%.3f" @@ -5781,6 +5783,8 @@ dialog = trigger_centralDialog, "trigger_central" graphLine = mapVvt_MAP_AT_CYCLE_COUNT graphLine = mapVvt_map_peak graphLine = currentEngineDecodedPhase + liveGraph = trigger_central_4_Graph, "Graph", South + graphLine = triggerToothAngleError dialog = trigger_stateDialog, "trigger_state" diff --git a/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini b/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini index ac9dc99694..e2716e585a 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.09.24.alphax-2chan.3297127117" + signature = "rusEFI 2022.09.24.alphax-2chan.3287019220" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.09.24.alphax-2chan.3297127117" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.09.24.alphax-2chan.3287019220" ; 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 Fri Sep 23 23:15:52 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Sep 24 04:28:26 UTC 2022 pageSize = 22048 page = 1 @@ -2140,7 +2140,7 @@ ignBlends4_blendValues = array, U08, 22038, [8], "%", 0.5, 0, 0, 100, 1 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1260 + ochBlockSize = 1264 ; ; see TunerStudioOutputChannels struct @@ -3141,146 +3141,147 @@ mapVvt_MAP_AT_DIFF = scalar, F32, 1116, "", 1, 0 mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1120, "", 1, 0 mapVvt_map_peak = scalar, U08, 1121, "", 1, 0 currentEngineDecodedPhase = scalar, F32, 1124, "deg", 1, 0 -; total TS size = 1128 -crankSynchronizationCounter = scalar, U32, 1128, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1132, "", 1, 0 -vvtCurrentPosition = scalar, F32, 1136, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1140, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 1144, "", 1, 0 -triggerStateIndex = scalar, U08, 1148, "", 1, 0 -vvtCounter = scalar, U08, 1149, "", 1, 0 -camResyncCounter = scalar, U08, 1150, "", 1, 0 -vvtStateIndex = scalar, U08, 1151, "", 1, 0 -; total TS size = 1152 -m_hasSynchronizedPhase = bits, U32, 1152, [0:0] -unusedBit_1_1 = bits, U32, 1152, [1:1] -unusedBit_1_2 = bits, U32, 1152, [2:2] -unusedBit_1_3 = bits, U32, 1152, [3:3] -unusedBit_1_4 = bits, U32, 1152, [4:4] -unusedBit_1_5 = bits, U32, 1152, [5:5] -unusedBit_1_6 = bits, U32, 1152, [6:6] -unusedBit_1_7 = bits, U32, 1152, [7:7] -unusedBit_1_8 = bits, U32, 1152, [8:8] -unusedBit_1_9 = bits, U32, 1152, [9:9] -unusedBit_1_10 = bits, U32, 1152, [10:10] -unusedBit_1_11 = bits, U32, 1152, [11:11] -unusedBit_1_12 = bits, U32, 1152, [12:12] -unusedBit_1_13 = bits, U32, 1152, [13:13] -unusedBit_1_14 = bits, U32, 1152, [14:14] -unusedBit_1_15 = bits, U32, 1152, [15:15] -unusedBit_1_16 = bits, U32, 1152, [16:16] -unusedBit_1_17 = bits, U32, 1152, [17:17] -unusedBit_1_18 = bits, U32, 1152, [18:18] -unusedBit_1_19 = bits, U32, 1152, [19:19] -unusedBit_1_20 = bits, U32, 1152, [20:20] -unusedBit_1_21 = bits, U32, 1152, [21:21] -unusedBit_1_22 = bits, U32, 1152, [22:22] -unusedBit_1_23 = bits, U32, 1152, [23:23] -unusedBit_1_24 = bits, U32, 1152, [24:24] -unusedBit_1_25 = bits, U32, 1152, [25:25] -unusedBit_1_26 = bits, U32, 1152, [26:26] -unusedBit_1_27 = bits, U32, 1152, [27:27] -unusedBit_1_28 = bits, U32, 1152, [28:28] -unusedBit_1_29 = bits, U32, 1152, [29:29] -unusedBit_1_30 = bits, U32, 1152, [30:30] -unusedBit_1_31 = bits, U32, 1152, [31:31] +triggerToothAngleError = scalar, F32, 1128, "deg", 1, 0 +; total TS size = 1132 +crankSynchronizationCounter = scalar, U32, 1132, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1136, "", 1, 0 +vvtCurrentPosition = scalar, F32, 1140, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1144, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 1148, "", 1, 0 +triggerStateIndex = scalar, U08, 1152, "", 1, 0 +vvtCounter = scalar, U08, 1153, "", 1, 0 +camResyncCounter = scalar, U08, 1154, "", 1, 0 +vvtStateIndex = scalar, U08, 1155, "", 1, 0 ; total TS size = 1156 -wallFuelCorrection = scalar, F32, 1156, "", 1, 0 -wallFuel = scalar, F32, 1160, "", 1, 0 -; total TS size = 1164 -idleState = bits, S32, 1164, [0:2], "not important" -currentIdlePosition = scalar, F32, 1168 -baseIdlePosition = scalar, F32, 1172 -iacByTpsTaper = scalar, F32, 1176 -throttlePedalUpState = scalar, S32, 1180, "", 1, 0 -mightResetPid = bits, U32, 1184, [0:0] -shouldResetPid = bits, U32, 1184, [1:1] -wasResetPid = bits, U32, 1184, [2:2] -mustResetPid = bits, U32, 1184, [3:3] -isCranking = bits, U32, 1184, [4:4] -useIacTableForCoasting = bits, U32, 1184, [5:5] -notIdling = bits, U32, 1184, [6:6] -needReset = bits, U32, 1184, [7:7] -isInDeadZone = bits, U32, 1184, [8:8] -isBlipping = bits, U32, 1184, [9:9] -useClosedLoop = bits, U32, 1184, [10:10] -badTps = bits, U32, 1184, [11:11] -looksLikeRunning = bits, U32, 1184, [12:12] -looksLikeCoasting = bits, U32, 1184, [13:13] -looksLikeCrankToIdle = bits, U32, 1184, [14:14] -isVerboseIAC = bits, U32, 1184, [15:15] -isIdleCoasting = bits, U32, 1184, [16:16] -unusedBit_22_17 = bits, U32, 1184, [17:17] -unusedBit_22_18 = bits, U32, 1184, [18:18] -unusedBit_22_19 = bits, U32, 1184, [19:19] -unusedBit_22_20 = bits, U32, 1184, [20:20] -unusedBit_22_21 = bits, U32, 1184, [21:21] -unusedBit_22_22 = bits, U32, 1184, [22:22] -unusedBit_22_23 = bits, U32, 1184, [23:23] -unusedBit_22_24 = bits, U32, 1184, [24:24] -unusedBit_22_25 = bits, U32, 1184, [25:25] -unusedBit_22_26 = bits, U32, 1184, [26:26] -unusedBit_22_27 = bits, U32, 1184, [27:27] -unusedBit_22_28 = bits, U32, 1184, [28:28] -unusedBit_22_29 = bits, U32, 1184, [29:29] -unusedBit_22_30 = bits, U32, 1184, [30:30] -unusedBit_22_31 = bits, U32, 1184, [31:31] -targetRpmByClt = scalar, S32, 1188, "", 1, 0 -targetRpmAcBump = scalar, S32, 1192, "", 1, 0 -iacByRpmTaper = scalar, F32, 1196 -luaAdd = scalar, F32, 1200 -; total TS size = 1204 -baseDwell = scalar, F32, 1204, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 1208, "", 1, 0 -luaTimingAdd = scalar, F32, 1212, "", 1, 0 -luaTimingMult = scalar, F32, 1216, "", 1, 0 -; total TS size = 1220 -idlePosition = scalar, F32, 1220, "", 1, 0 -trim = scalar, F32, 1224, "", 1, 0 -luaAdjustment = scalar, F32, 1228, "", 1, 0 -etbFeedForward = scalar, F32, 1232 -etbIntegralError = scalar, F32, 1236, "", 1, 0 -etbCurrentTarget = scalar, F32, 1240, "%", 1, 0 -etbRevLimitActive = bits, U32, 1244, [0:0] -unusedBit_7_1 = bits, U32, 1244, [1:1] -unusedBit_7_2 = bits, U32, 1244, [2:2] -unusedBit_7_3 = bits, U32, 1244, [3:3] -unusedBit_7_4 = bits, U32, 1244, [4:4] -unusedBit_7_5 = bits, U32, 1244, [5:5] -unusedBit_7_6 = bits, U32, 1244, [6:6] -unusedBit_7_7 = bits, U32, 1244, [7:7] -unusedBit_7_8 = bits, U32, 1244, [8:8] -unusedBit_7_9 = bits, U32, 1244, [9:9] -unusedBit_7_10 = bits, U32, 1244, [10:10] -unusedBit_7_11 = bits, U32, 1244, [11:11] -unusedBit_7_12 = bits, U32, 1244, [12:12] -unusedBit_7_13 = bits, U32, 1244, [13:13] -unusedBit_7_14 = bits, U32, 1244, [14:14] -unusedBit_7_15 = bits, U32, 1244, [15:15] -unusedBit_7_16 = bits, U32, 1244, [16:16] -unusedBit_7_17 = bits, U32, 1244, [17:17] -unusedBit_7_18 = bits, U32, 1244, [18:18] -unusedBit_7_19 = bits, U32, 1244, [19:19] -unusedBit_7_20 = bits, U32, 1244, [20:20] -unusedBit_7_21 = bits, U32, 1244, [21:21] -unusedBit_7_22 = bits, U32, 1244, [22:22] -unusedBit_7_23 = bits, U32, 1244, [23:23] -unusedBit_7_24 = bits, U32, 1244, [24:24] -unusedBit_7_25 = bits, U32, 1244, [25:25] -unusedBit_7_26 = bits, U32, 1244, [26:26] -unusedBit_7_27 = bits, U32, 1244, [27:27] -unusedBit_7_28 = bits, U32, 1244, [28:28] -unusedBit_7_29 = bits, U32, 1244, [29:29] -unusedBit_7_30 = bits, U32, 1244, [30:30] -unusedBit_7_31 = bits, U32, 1244, [31:31] -; total TS size = 1248 -faultCode = scalar, U08, 1248, "", 1, 0 -heaterDuty = scalar, U08, 1249, "%", 1, 0 -pumpDuty = scalar, U08, 1250, "%", 1, 0 -tempC = scalar, U16, 1252, "C", 1, 0 -nernstVoltage = scalar, U16, 1254, "V", 0.001, 0 -esr = scalar, U16, 1256, "", 1, 0 -; total TS size = 1260 +m_hasSynchronizedPhase = bits, U32, 1156, [0:0] +unusedBit_1_1 = bits, U32, 1156, [1:1] +unusedBit_1_2 = bits, U32, 1156, [2:2] +unusedBit_1_3 = bits, U32, 1156, [3:3] +unusedBit_1_4 = bits, U32, 1156, [4:4] +unusedBit_1_5 = bits, U32, 1156, [5:5] +unusedBit_1_6 = bits, U32, 1156, [6:6] +unusedBit_1_7 = bits, U32, 1156, [7:7] +unusedBit_1_8 = bits, U32, 1156, [8:8] +unusedBit_1_9 = bits, U32, 1156, [9:9] +unusedBit_1_10 = bits, U32, 1156, [10:10] +unusedBit_1_11 = bits, U32, 1156, [11:11] +unusedBit_1_12 = bits, U32, 1156, [12:12] +unusedBit_1_13 = bits, U32, 1156, [13:13] +unusedBit_1_14 = bits, U32, 1156, [14:14] +unusedBit_1_15 = bits, U32, 1156, [15:15] +unusedBit_1_16 = bits, U32, 1156, [16:16] +unusedBit_1_17 = bits, U32, 1156, [17:17] +unusedBit_1_18 = bits, U32, 1156, [18:18] +unusedBit_1_19 = bits, U32, 1156, [19:19] +unusedBit_1_20 = bits, U32, 1156, [20:20] +unusedBit_1_21 = bits, U32, 1156, [21:21] +unusedBit_1_22 = bits, U32, 1156, [22:22] +unusedBit_1_23 = bits, U32, 1156, [23:23] +unusedBit_1_24 = bits, U32, 1156, [24:24] +unusedBit_1_25 = bits, U32, 1156, [25:25] +unusedBit_1_26 = bits, U32, 1156, [26:26] +unusedBit_1_27 = bits, U32, 1156, [27:27] +unusedBit_1_28 = bits, U32, 1156, [28:28] +unusedBit_1_29 = bits, U32, 1156, [29:29] +unusedBit_1_30 = bits, U32, 1156, [30:30] +unusedBit_1_31 = bits, U32, 1156, [31:31] +; total TS size = 1160 +wallFuelCorrection = scalar, F32, 1160, "", 1, 0 +wallFuel = scalar, F32, 1164, "", 1, 0 +; total TS size = 1168 +idleState = bits, S32, 1168, [0:2], "not important" +currentIdlePosition = scalar, F32, 1172 +baseIdlePosition = scalar, F32, 1176 +iacByTpsTaper = scalar, F32, 1180 +throttlePedalUpState = scalar, S32, 1184, "", 1, 0 +mightResetPid = bits, U32, 1188, [0:0] +shouldResetPid = bits, U32, 1188, [1:1] +wasResetPid = bits, U32, 1188, [2:2] +mustResetPid = bits, U32, 1188, [3:3] +isCranking = bits, U32, 1188, [4:4] +useIacTableForCoasting = bits, U32, 1188, [5:5] +notIdling = bits, U32, 1188, [6:6] +needReset = bits, U32, 1188, [7:7] +isInDeadZone = bits, U32, 1188, [8:8] +isBlipping = bits, U32, 1188, [9:9] +useClosedLoop = bits, U32, 1188, [10:10] +badTps = bits, U32, 1188, [11:11] +looksLikeRunning = bits, U32, 1188, [12:12] +looksLikeCoasting = bits, U32, 1188, [13:13] +looksLikeCrankToIdle = bits, U32, 1188, [14:14] +isVerboseIAC = bits, U32, 1188, [15:15] +isIdleCoasting = bits, U32, 1188, [16:16] +unusedBit_22_17 = bits, U32, 1188, [17:17] +unusedBit_22_18 = bits, U32, 1188, [18:18] +unusedBit_22_19 = bits, U32, 1188, [19:19] +unusedBit_22_20 = bits, U32, 1188, [20:20] +unusedBit_22_21 = bits, U32, 1188, [21:21] +unusedBit_22_22 = bits, U32, 1188, [22:22] +unusedBit_22_23 = bits, U32, 1188, [23:23] +unusedBit_22_24 = bits, U32, 1188, [24:24] +unusedBit_22_25 = bits, U32, 1188, [25:25] +unusedBit_22_26 = bits, U32, 1188, [26:26] +unusedBit_22_27 = bits, U32, 1188, [27:27] +unusedBit_22_28 = bits, U32, 1188, [28:28] +unusedBit_22_29 = bits, U32, 1188, [29:29] +unusedBit_22_30 = bits, U32, 1188, [30:30] +unusedBit_22_31 = bits, U32, 1188, [31:31] +targetRpmByClt = scalar, S32, 1192, "", 1, 0 +targetRpmAcBump = scalar, S32, 1196, "", 1, 0 +iacByRpmTaper = scalar, F32, 1200 +luaAdd = scalar, F32, 1204 +; total TS size = 1208 +baseDwell = scalar, F32, 1208, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 1212, "", 1, 0 +luaTimingAdd = scalar, F32, 1216, "", 1, 0 +luaTimingMult = scalar, F32, 1220, "", 1, 0 +; total TS size = 1224 +idlePosition = scalar, F32, 1224, "", 1, 0 +trim = scalar, F32, 1228, "", 1, 0 +luaAdjustment = scalar, F32, 1232, "", 1, 0 +etbFeedForward = scalar, F32, 1236 +etbIntegralError = scalar, F32, 1240, "", 1, 0 +etbCurrentTarget = scalar, F32, 1244, "%", 1, 0 +etbRevLimitActive = bits, U32, 1248, [0:0] +unusedBit_7_1 = bits, U32, 1248, [1:1] +unusedBit_7_2 = bits, U32, 1248, [2:2] +unusedBit_7_3 = bits, U32, 1248, [3:3] +unusedBit_7_4 = bits, U32, 1248, [4:4] +unusedBit_7_5 = bits, U32, 1248, [5:5] +unusedBit_7_6 = bits, U32, 1248, [6:6] +unusedBit_7_7 = bits, U32, 1248, [7:7] +unusedBit_7_8 = bits, U32, 1248, [8:8] +unusedBit_7_9 = bits, U32, 1248, [9:9] +unusedBit_7_10 = bits, U32, 1248, [10:10] +unusedBit_7_11 = bits, U32, 1248, [11:11] +unusedBit_7_12 = bits, U32, 1248, [12:12] +unusedBit_7_13 = bits, U32, 1248, [13:13] +unusedBit_7_14 = bits, U32, 1248, [14:14] +unusedBit_7_15 = bits, U32, 1248, [15:15] +unusedBit_7_16 = bits, U32, 1248, [16:16] +unusedBit_7_17 = bits, U32, 1248, [17:17] +unusedBit_7_18 = bits, U32, 1248, [18:18] +unusedBit_7_19 = bits, U32, 1248, [19:19] +unusedBit_7_20 = bits, U32, 1248, [20:20] +unusedBit_7_21 = bits, U32, 1248, [21:21] +unusedBit_7_22 = bits, U32, 1248, [22:22] +unusedBit_7_23 = bits, U32, 1248, [23:23] +unusedBit_7_24 = bits, U32, 1248, [24:24] +unusedBit_7_25 = bits, U32, 1248, [25:25] +unusedBit_7_26 = bits, U32, 1248, [26:26] +unusedBit_7_27 = bits, U32, 1248, [27:27] +unusedBit_7_28 = bits, U32, 1248, [28:28] +unusedBit_7_29 = bits, U32, 1248, [29:29] +unusedBit_7_30 = bits, U32, 1248, [30:30] +unusedBit_7_31 = bits, U32, 1248, [31:31] +; total TS size = 1252 +faultCode = scalar, U08, 1252, "", 1, 0 +heaterDuty = scalar, U08, 1253, "%", 1, 0 +pumpDuty = scalar, U08, 1254, "%", 1, 0 +tempC = scalar, U16, 1256, "C", 1, 0 +nernstVoltage = scalar, U16, 1258, "V", 0.001, 0 +esr = scalar, U16, 1260, "", 1, 0 +; total TS size = 1264 time = { timeNow } @@ -4993,6 +4994,7 @@ entry = mapVvt_MAP_AT_DIFF, "mapVvt_MAP_AT_DIFF", float, "%.3f" entry = mapVvt_MAP_AT_CYCLE_COUNT, "mapVvt_MAP_AT_CYCLE_COUNT", int, "%d" entry = mapVvt_map_peak, "mapVvt_map_peak", int, "%d" entry = currentEngineDecodedPhase, "Engine Phase", float, "%.3f" +entry = triggerToothAngleError, "triggerToothAngleError", float, "%.3f" entry = crankSynchronizationCounter, "Crank sync counter", int, "%d" entry = vvtSyncGapRatio, "vvtSyncGapRatio", float, "%.3f" entry = vvtCurrentPosition, "vvtCurrentPosition", float, "%.3f" @@ -5777,6 +5779,8 @@ dialog = trigger_centralDialog, "trigger_central" graphLine = mapVvt_MAP_AT_CYCLE_COUNT graphLine = mapVvt_map_peak graphLine = currentEngineDecodedPhase + liveGraph = trigger_central_4_Graph, "Graph", South + graphLine = triggerToothAngleError dialog = trigger_stateDialog, "trigger_state" diff --git a/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini b/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini index bc62d79661..f59ca0d139 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.09.24.alphax-4chan.2106094638" + signature = "rusEFI 2022.09.24.alphax-4chan.2061873207" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.09.24.alphax-4chan.2106094638" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.09.24.alphax-4chan.2061873207" ; 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 Fri Sep 23 23:15:54 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Sep 24 04:28:28 UTC 2022 pageSize = 22048 page = 1 @@ -2140,7 +2140,7 @@ ignBlends4_blendValues = array, U08, 22038, [8], "%", 0.5, 0, 0, 100, 1 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1260 + ochBlockSize = 1264 ; ; see TunerStudioOutputChannels struct @@ -3141,146 +3141,147 @@ mapVvt_MAP_AT_DIFF = scalar, F32, 1116, "", 1, 0 mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1120, "", 1, 0 mapVvt_map_peak = scalar, U08, 1121, "", 1, 0 currentEngineDecodedPhase = scalar, F32, 1124, "deg", 1, 0 -; total TS size = 1128 -crankSynchronizationCounter = scalar, U32, 1128, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1132, "", 1, 0 -vvtCurrentPosition = scalar, F32, 1136, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1140, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 1144, "", 1, 0 -triggerStateIndex = scalar, U08, 1148, "", 1, 0 -vvtCounter = scalar, U08, 1149, "", 1, 0 -camResyncCounter = scalar, U08, 1150, "", 1, 0 -vvtStateIndex = scalar, U08, 1151, "", 1, 0 -; total TS size = 1152 -m_hasSynchronizedPhase = bits, U32, 1152, [0:0] -unusedBit_1_1 = bits, U32, 1152, [1:1] -unusedBit_1_2 = bits, U32, 1152, [2:2] -unusedBit_1_3 = bits, U32, 1152, [3:3] -unusedBit_1_4 = bits, U32, 1152, [4:4] -unusedBit_1_5 = bits, U32, 1152, [5:5] -unusedBit_1_6 = bits, U32, 1152, [6:6] -unusedBit_1_7 = bits, U32, 1152, [7:7] -unusedBit_1_8 = bits, U32, 1152, [8:8] -unusedBit_1_9 = bits, U32, 1152, [9:9] -unusedBit_1_10 = bits, U32, 1152, [10:10] -unusedBit_1_11 = bits, U32, 1152, [11:11] -unusedBit_1_12 = bits, U32, 1152, [12:12] -unusedBit_1_13 = bits, U32, 1152, [13:13] -unusedBit_1_14 = bits, U32, 1152, [14:14] -unusedBit_1_15 = bits, U32, 1152, [15:15] -unusedBit_1_16 = bits, U32, 1152, [16:16] -unusedBit_1_17 = bits, U32, 1152, [17:17] -unusedBit_1_18 = bits, U32, 1152, [18:18] -unusedBit_1_19 = bits, U32, 1152, [19:19] -unusedBit_1_20 = bits, U32, 1152, [20:20] -unusedBit_1_21 = bits, U32, 1152, [21:21] -unusedBit_1_22 = bits, U32, 1152, [22:22] -unusedBit_1_23 = bits, U32, 1152, [23:23] -unusedBit_1_24 = bits, U32, 1152, [24:24] -unusedBit_1_25 = bits, U32, 1152, [25:25] -unusedBit_1_26 = bits, U32, 1152, [26:26] -unusedBit_1_27 = bits, U32, 1152, [27:27] -unusedBit_1_28 = bits, U32, 1152, [28:28] -unusedBit_1_29 = bits, U32, 1152, [29:29] -unusedBit_1_30 = bits, U32, 1152, [30:30] -unusedBit_1_31 = bits, U32, 1152, [31:31] +triggerToothAngleError = scalar, F32, 1128, "deg", 1, 0 +; total TS size = 1132 +crankSynchronizationCounter = scalar, U32, 1132, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1136, "", 1, 0 +vvtCurrentPosition = scalar, F32, 1140, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1144, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 1148, "", 1, 0 +triggerStateIndex = scalar, U08, 1152, "", 1, 0 +vvtCounter = scalar, U08, 1153, "", 1, 0 +camResyncCounter = scalar, U08, 1154, "", 1, 0 +vvtStateIndex = scalar, U08, 1155, "", 1, 0 ; total TS size = 1156 -wallFuelCorrection = scalar, F32, 1156, "", 1, 0 -wallFuel = scalar, F32, 1160, "", 1, 0 -; total TS size = 1164 -idleState = bits, S32, 1164, [0:2], "not important" -currentIdlePosition = scalar, F32, 1168 -baseIdlePosition = scalar, F32, 1172 -iacByTpsTaper = scalar, F32, 1176 -throttlePedalUpState = scalar, S32, 1180, "", 1, 0 -mightResetPid = bits, U32, 1184, [0:0] -shouldResetPid = bits, U32, 1184, [1:1] -wasResetPid = bits, U32, 1184, [2:2] -mustResetPid = bits, U32, 1184, [3:3] -isCranking = bits, U32, 1184, [4:4] -useIacTableForCoasting = bits, U32, 1184, [5:5] -notIdling = bits, U32, 1184, [6:6] -needReset = bits, U32, 1184, [7:7] -isInDeadZone = bits, U32, 1184, [8:8] -isBlipping = bits, U32, 1184, [9:9] -useClosedLoop = bits, U32, 1184, [10:10] -badTps = bits, U32, 1184, [11:11] -looksLikeRunning = bits, U32, 1184, [12:12] -looksLikeCoasting = bits, U32, 1184, [13:13] -looksLikeCrankToIdle = bits, U32, 1184, [14:14] -isVerboseIAC = bits, U32, 1184, [15:15] -isIdleCoasting = bits, U32, 1184, [16:16] -unusedBit_22_17 = bits, U32, 1184, [17:17] -unusedBit_22_18 = bits, U32, 1184, [18:18] -unusedBit_22_19 = bits, U32, 1184, [19:19] -unusedBit_22_20 = bits, U32, 1184, [20:20] -unusedBit_22_21 = bits, U32, 1184, [21:21] -unusedBit_22_22 = bits, U32, 1184, [22:22] -unusedBit_22_23 = bits, U32, 1184, [23:23] -unusedBit_22_24 = bits, U32, 1184, [24:24] -unusedBit_22_25 = bits, U32, 1184, [25:25] -unusedBit_22_26 = bits, U32, 1184, [26:26] -unusedBit_22_27 = bits, U32, 1184, [27:27] -unusedBit_22_28 = bits, U32, 1184, [28:28] -unusedBit_22_29 = bits, U32, 1184, [29:29] -unusedBit_22_30 = bits, U32, 1184, [30:30] -unusedBit_22_31 = bits, U32, 1184, [31:31] -targetRpmByClt = scalar, S32, 1188, "", 1, 0 -targetRpmAcBump = scalar, S32, 1192, "", 1, 0 -iacByRpmTaper = scalar, F32, 1196 -luaAdd = scalar, F32, 1200 -; total TS size = 1204 -baseDwell = scalar, F32, 1204, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 1208, "", 1, 0 -luaTimingAdd = scalar, F32, 1212, "", 1, 0 -luaTimingMult = scalar, F32, 1216, "", 1, 0 -; total TS size = 1220 -idlePosition = scalar, F32, 1220, "", 1, 0 -trim = scalar, F32, 1224, "", 1, 0 -luaAdjustment = scalar, F32, 1228, "", 1, 0 -etbFeedForward = scalar, F32, 1232 -etbIntegralError = scalar, F32, 1236, "", 1, 0 -etbCurrentTarget = scalar, F32, 1240, "%", 1, 0 -etbRevLimitActive = bits, U32, 1244, [0:0] -unusedBit_7_1 = bits, U32, 1244, [1:1] -unusedBit_7_2 = bits, U32, 1244, [2:2] -unusedBit_7_3 = bits, U32, 1244, [3:3] -unusedBit_7_4 = bits, U32, 1244, [4:4] -unusedBit_7_5 = bits, U32, 1244, [5:5] -unusedBit_7_6 = bits, U32, 1244, [6:6] -unusedBit_7_7 = bits, U32, 1244, [7:7] -unusedBit_7_8 = bits, U32, 1244, [8:8] -unusedBit_7_9 = bits, U32, 1244, [9:9] -unusedBit_7_10 = bits, U32, 1244, [10:10] -unusedBit_7_11 = bits, U32, 1244, [11:11] -unusedBit_7_12 = bits, U32, 1244, [12:12] -unusedBit_7_13 = bits, U32, 1244, [13:13] -unusedBit_7_14 = bits, U32, 1244, [14:14] -unusedBit_7_15 = bits, U32, 1244, [15:15] -unusedBit_7_16 = bits, U32, 1244, [16:16] -unusedBit_7_17 = bits, U32, 1244, [17:17] -unusedBit_7_18 = bits, U32, 1244, [18:18] -unusedBit_7_19 = bits, U32, 1244, [19:19] -unusedBit_7_20 = bits, U32, 1244, [20:20] -unusedBit_7_21 = bits, U32, 1244, [21:21] -unusedBit_7_22 = bits, U32, 1244, [22:22] -unusedBit_7_23 = bits, U32, 1244, [23:23] -unusedBit_7_24 = bits, U32, 1244, [24:24] -unusedBit_7_25 = bits, U32, 1244, [25:25] -unusedBit_7_26 = bits, U32, 1244, [26:26] -unusedBit_7_27 = bits, U32, 1244, [27:27] -unusedBit_7_28 = bits, U32, 1244, [28:28] -unusedBit_7_29 = bits, U32, 1244, [29:29] -unusedBit_7_30 = bits, U32, 1244, [30:30] -unusedBit_7_31 = bits, U32, 1244, [31:31] -; total TS size = 1248 -faultCode = scalar, U08, 1248, "", 1, 0 -heaterDuty = scalar, U08, 1249, "%", 1, 0 -pumpDuty = scalar, U08, 1250, "%", 1, 0 -tempC = scalar, U16, 1252, "C", 1, 0 -nernstVoltage = scalar, U16, 1254, "V", 0.001, 0 -esr = scalar, U16, 1256, "", 1, 0 -; total TS size = 1260 +m_hasSynchronizedPhase = bits, U32, 1156, [0:0] +unusedBit_1_1 = bits, U32, 1156, [1:1] +unusedBit_1_2 = bits, U32, 1156, [2:2] +unusedBit_1_3 = bits, U32, 1156, [3:3] +unusedBit_1_4 = bits, U32, 1156, [4:4] +unusedBit_1_5 = bits, U32, 1156, [5:5] +unusedBit_1_6 = bits, U32, 1156, [6:6] +unusedBit_1_7 = bits, U32, 1156, [7:7] +unusedBit_1_8 = bits, U32, 1156, [8:8] +unusedBit_1_9 = bits, U32, 1156, [9:9] +unusedBit_1_10 = bits, U32, 1156, [10:10] +unusedBit_1_11 = bits, U32, 1156, [11:11] +unusedBit_1_12 = bits, U32, 1156, [12:12] +unusedBit_1_13 = bits, U32, 1156, [13:13] +unusedBit_1_14 = bits, U32, 1156, [14:14] +unusedBit_1_15 = bits, U32, 1156, [15:15] +unusedBit_1_16 = bits, U32, 1156, [16:16] +unusedBit_1_17 = bits, U32, 1156, [17:17] +unusedBit_1_18 = bits, U32, 1156, [18:18] +unusedBit_1_19 = bits, U32, 1156, [19:19] +unusedBit_1_20 = bits, U32, 1156, [20:20] +unusedBit_1_21 = bits, U32, 1156, [21:21] +unusedBit_1_22 = bits, U32, 1156, [22:22] +unusedBit_1_23 = bits, U32, 1156, [23:23] +unusedBit_1_24 = bits, U32, 1156, [24:24] +unusedBit_1_25 = bits, U32, 1156, [25:25] +unusedBit_1_26 = bits, U32, 1156, [26:26] +unusedBit_1_27 = bits, U32, 1156, [27:27] +unusedBit_1_28 = bits, U32, 1156, [28:28] +unusedBit_1_29 = bits, U32, 1156, [29:29] +unusedBit_1_30 = bits, U32, 1156, [30:30] +unusedBit_1_31 = bits, U32, 1156, [31:31] +; total TS size = 1160 +wallFuelCorrection = scalar, F32, 1160, "", 1, 0 +wallFuel = scalar, F32, 1164, "", 1, 0 +; total TS size = 1168 +idleState = bits, S32, 1168, [0:2], "not important" +currentIdlePosition = scalar, F32, 1172 +baseIdlePosition = scalar, F32, 1176 +iacByTpsTaper = scalar, F32, 1180 +throttlePedalUpState = scalar, S32, 1184, "", 1, 0 +mightResetPid = bits, U32, 1188, [0:0] +shouldResetPid = bits, U32, 1188, [1:1] +wasResetPid = bits, U32, 1188, [2:2] +mustResetPid = bits, U32, 1188, [3:3] +isCranking = bits, U32, 1188, [4:4] +useIacTableForCoasting = bits, U32, 1188, [5:5] +notIdling = bits, U32, 1188, [6:6] +needReset = bits, U32, 1188, [7:7] +isInDeadZone = bits, U32, 1188, [8:8] +isBlipping = bits, U32, 1188, [9:9] +useClosedLoop = bits, U32, 1188, [10:10] +badTps = bits, U32, 1188, [11:11] +looksLikeRunning = bits, U32, 1188, [12:12] +looksLikeCoasting = bits, U32, 1188, [13:13] +looksLikeCrankToIdle = bits, U32, 1188, [14:14] +isVerboseIAC = bits, U32, 1188, [15:15] +isIdleCoasting = bits, U32, 1188, [16:16] +unusedBit_22_17 = bits, U32, 1188, [17:17] +unusedBit_22_18 = bits, U32, 1188, [18:18] +unusedBit_22_19 = bits, U32, 1188, [19:19] +unusedBit_22_20 = bits, U32, 1188, [20:20] +unusedBit_22_21 = bits, U32, 1188, [21:21] +unusedBit_22_22 = bits, U32, 1188, [22:22] +unusedBit_22_23 = bits, U32, 1188, [23:23] +unusedBit_22_24 = bits, U32, 1188, [24:24] +unusedBit_22_25 = bits, U32, 1188, [25:25] +unusedBit_22_26 = bits, U32, 1188, [26:26] +unusedBit_22_27 = bits, U32, 1188, [27:27] +unusedBit_22_28 = bits, U32, 1188, [28:28] +unusedBit_22_29 = bits, U32, 1188, [29:29] +unusedBit_22_30 = bits, U32, 1188, [30:30] +unusedBit_22_31 = bits, U32, 1188, [31:31] +targetRpmByClt = scalar, S32, 1192, "", 1, 0 +targetRpmAcBump = scalar, S32, 1196, "", 1, 0 +iacByRpmTaper = scalar, F32, 1200 +luaAdd = scalar, F32, 1204 +; total TS size = 1208 +baseDwell = scalar, F32, 1208, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 1212, "", 1, 0 +luaTimingAdd = scalar, F32, 1216, "", 1, 0 +luaTimingMult = scalar, F32, 1220, "", 1, 0 +; total TS size = 1224 +idlePosition = scalar, F32, 1224, "", 1, 0 +trim = scalar, F32, 1228, "", 1, 0 +luaAdjustment = scalar, F32, 1232, "", 1, 0 +etbFeedForward = scalar, F32, 1236 +etbIntegralError = scalar, F32, 1240, "", 1, 0 +etbCurrentTarget = scalar, F32, 1244, "%", 1, 0 +etbRevLimitActive = bits, U32, 1248, [0:0] +unusedBit_7_1 = bits, U32, 1248, [1:1] +unusedBit_7_2 = bits, U32, 1248, [2:2] +unusedBit_7_3 = bits, U32, 1248, [3:3] +unusedBit_7_4 = bits, U32, 1248, [4:4] +unusedBit_7_5 = bits, U32, 1248, [5:5] +unusedBit_7_6 = bits, U32, 1248, [6:6] +unusedBit_7_7 = bits, U32, 1248, [7:7] +unusedBit_7_8 = bits, U32, 1248, [8:8] +unusedBit_7_9 = bits, U32, 1248, [9:9] +unusedBit_7_10 = bits, U32, 1248, [10:10] +unusedBit_7_11 = bits, U32, 1248, [11:11] +unusedBit_7_12 = bits, U32, 1248, [12:12] +unusedBit_7_13 = bits, U32, 1248, [13:13] +unusedBit_7_14 = bits, U32, 1248, [14:14] +unusedBit_7_15 = bits, U32, 1248, [15:15] +unusedBit_7_16 = bits, U32, 1248, [16:16] +unusedBit_7_17 = bits, U32, 1248, [17:17] +unusedBit_7_18 = bits, U32, 1248, [18:18] +unusedBit_7_19 = bits, U32, 1248, [19:19] +unusedBit_7_20 = bits, U32, 1248, [20:20] +unusedBit_7_21 = bits, U32, 1248, [21:21] +unusedBit_7_22 = bits, U32, 1248, [22:22] +unusedBit_7_23 = bits, U32, 1248, [23:23] +unusedBit_7_24 = bits, U32, 1248, [24:24] +unusedBit_7_25 = bits, U32, 1248, [25:25] +unusedBit_7_26 = bits, U32, 1248, [26:26] +unusedBit_7_27 = bits, U32, 1248, [27:27] +unusedBit_7_28 = bits, U32, 1248, [28:28] +unusedBit_7_29 = bits, U32, 1248, [29:29] +unusedBit_7_30 = bits, U32, 1248, [30:30] +unusedBit_7_31 = bits, U32, 1248, [31:31] +; total TS size = 1252 +faultCode = scalar, U08, 1252, "", 1, 0 +heaterDuty = scalar, U08, 1253, "%", 1, 0 +pumpDuty = scalar, U08, 1254, "%", 1, 0 +tempC = scalar, U16, 1256, "C", 1, 0 +nernstVoltage = scalar, U16, 1258, "V", 0.001, 0 +esr = scalar, U16, 1260, "", 1, 0 +; total TS size = 1264 time = { timeNow } @@ -4993,6 +4994,7 @@ entry = mapVvt_MAP_AT_DIFF, "mapVvt_MAP_AT_DIFF", float, "%.3f" entry = mapVvt_MAP_AT_CYCLE_COUNT, "mapVvt_MAP_AT_CYCLE_COUNT", int, "%d" entry = mapVvt_map_peak, "mapVvt_map_peak", int, "%d" entry = currentEngineDecodedPhase, "Engine Phase", float, "%.3f" +entry = triggerToothAngleError, "triggerToothAngleError", float, "%.3f" entry = crankSynchronizationCounter, "Crank sync counter", int, "%d" entry = vvtSyncGapRatio, "vvtSyncGapRatio", float, "%.3f" entry = vvtCurrentPosition, "vvtCurrentPosition", float, "%.3f" @@ -5780,6 +5782,8 @@ dialog = trigger_centralDialog, "trigger_central" graphLine = mapVvt_MAP_AT_CYCLE_COUNT graphLine = mapVvt_map_peak graphLine = currentEngineDecodedPhase + liveGraph = trigger_central_4_Graph, "Graph", South + graphLine = triggerToothAngleError dialog = trigger_stateDialog, "trigger_state" diff --git a/firmware/tunerstudio/generated/rusefi_atlas.ini b/firmware/tunerstudio/generated/rusefi_atlas.ini index 8fdd57d00f..51384095d3 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.09.24.atlas.3932045958" + signature = "rusEFI 2022.09.24.atlas.3979576991" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.09.24.atlas.3932045958" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.09.24.atlas.3979576991" ; 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 Fri Sep 23 23:16:41 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Sep 24 04:29:16 UTC 2022 pageSize = 22048 page = 1 @@ -2140,7 +2140,7 @@ ignBlends4_blendValues = array, U08, 22038, [8], "%", 0.5, 0, 0, 100, 1 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1260 + ochBlockSize = 1264 ; ; see TunerStudioOutputChannels struct @@ -3141,146 +3141,147 @@ mapVvt_MAP_AT_DIFF = scalar, F32, 1116, "", 1, 0 mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1120, "", 1, 0 mapVvt_map_peak = scalar, U08, 1121, "", 1, 0 currentEngineDecodedPhase = scalar, F32, 1124, "deg", 1, 0 -; total TS size = 1128 -crankSynchronizationCounter = scalar, U32, 1128, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1132, "", 1, 0 -vvtCurrentPosition = scalar, F32, 1136, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1140, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 1144, "", 1, 0 -triggerStateIndex = scalar, U08, 1148, "", 1, 0 -vvtCounter = scalar, U08, 1149, "", 1, 0 -camResyncCounter = scalar, U08, 1150, "", 1, 0 -vvtStateIndex = scalar, U08, 1151, "", 1, 0 -; total TS size = 1152 -m_hasSynchronizedPhase = bits, U32, 1152, [0:0] -unusedBit_1_1 = bits, U32, 1152, [1:1] -unusedBit_1_2 = bits, U32, 1152, [2:2] -unusedBit_1_3 = bits, U32, 1152, [3:3] -unusedBit_1_4 = bits, U32, 1152, [4:4] -unusedBit_1_5 = bits, U32, 1152, [5:5] -unusedBit_1_6 = bits, U32, 1152, [6:6] -unusedBit_1_7 = bits, U32, 1152, [7:7] -unusedBit_1_8 = bits, U32, 1152, [8:8] -unusedBit_1_9 = bits, U32, 1152, [9:9] -unusedBit_1_10 = bits, U32, 1152, [10:10] -unusedBit_1_11 = bits, U32, 1152, [11:11] -unusedBit_1_12 = bits, U32, 1152, [12:12] -unusedBit_1_13 = bits, U32, 1152, [13:13] -unusedBit_1_14 = bits, U32, 1152, [14:14] -unusedBit_1_15 = bits, U32, 1152, [15:15] -unusedBit_1_16 = bits, U32, 1152, [16:16] -unusedBit_1_17 = bits, U32, 1152, [17:17] -unusedBit_1_18 = bits, U32, 1152, [18:18] -unusedBit_1_19 = bits, U32, 1152, [19:19] -unusedBit_1_20 = bits, U32, 1152, [20:20] -unusedBit_1_21 = bits, U32, 1152, [21:21] -unusedBit_1_22 = bits, U32, 1152, [22:22] -unusedBit_1_23 = bits, U32, 1152, [23:23] -unusedBit_1_24 = bits, U32, 1152, [24:24] -unusedBit_1_25 = bits, U32, 1152, [25:25] -unusedBit_1_26 = bits, U32, 1152, [26:26] -unusedBit_1_27 = bits, U32, 1152, [27:27] -unusedBit_1_28 = bits, U32, 1152, [28:28] -unusedBit_1_29 = bits, U32, 1152, [29:29] -unusedBit_1_30 = bits, U32, 1152, [30:30] -unusedBit_1_31 = bits, U32, 1152, [31:31] +triggerToothAngleError = scalar, F32, 1128, "deg", 1, 0 +; total TS size = 1132 +crankSynchronizationCounter = scalar, U32, 1132, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1136, "", 1, 0 +vvtCurrentPosition = scalar, F32, 1140, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1144, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 1148, "", 1, 0 +triggerStateIndex = scalar, U08, 1152, "", 1, 0 +vvtCounter = scalar, U08, 1153, "", 1, 0 +camResyncCounter = scalar, U08, 1154, "", 1, 0 +vvtStateIndex = scalar, U08, 1155, "", 1, 0 ; total TS size = 1156 -wallFuelCorrection = scalar, F32, 1156, "", 1, 0 -wallFuel = scalar, F32, 1160, "", 1, 0 -; total TS size = 1164 -idleState = bits, S32, 1164, [0:2], "not important" -currentIdlePosition = scalar, F32, 1168 -baseIdlePosition = scalar, F32, 1172 -iacByTpsTaper = scalar, F32, 1176 -throttlePedalUpState = scalar, S32, 1180, "", 1, 0 -mightResetPid = bits, U32, 1184, [0:0] -shouldResetPid = bits, U32, 1184, [1:1] -wasResetPid = bits, U32, 1184, [2:2] -mustResetPid = bits, U32, 1184, [3:3] -isCranking = bits, U32, 1184, [4:4] -useIacTableForCoasting = bits, U32, 1184, [5:5] -notIdling = bits, U32, 1184, [6:6] -needReset = bits, U32, 1184, [7:7] -isInDeadZone = bits, U32, 1184, [8:8] -isBlipping = bits, U32, 1184, [9:9] -useClosedLoop = bits, U32, 1184, [10:10] -badTps = bits, U32, 1184, [11:11] -looksLikeRunning = bits, U32, 1184, [12:12] -looksLikeCoasting = bits, U32, 1184, [13:13] -looksLikeCrankToIdle = bits, U32, 1184, [14:14] -isVerboseIAC = bits, U32, 1184, [15:15] -isIdleCoasting = bits, U32, 1184, [16:16] -unusedBit_22_17 = bits, U32, 1184, [17:17] -unusedBit_22_18 = bits, U32, 1184, [18:18] -unusedBit_22_19 = bits, U32, 1184, [19:19] -unusedBit_22_20 = bits, U32, 1184, [20:20] -unusedBit_22_21 = bits, U32, 1184, [21:21] -unusedBit_22_22 = bits, U32, 1184, [22:22] -unusedBit_22_23 = bits, U32, 1184, [23:23] -unusedBit_22_24 = bits, U32, 1184, [24:24] -unusedBit_22_25 = bits, U32, 1184, [25:25] -unusedBit_22_26 = bits, U32, 1184, [26:26] -unusedBit_22_27 = bits, U32, 1184, [27:27] -unusedBit_22_28 = bits, U32, 1184, [28:28] -unusedBit_22_29 = bits, U32, 1184, [29:29] -unusedBit_22_30 = bits, U32, 1184, [30:30] -unusedBit_22_31 = bits, U32, 1184, [31:31] -targetRpmByClt = scalar, S32, 1188, "", 1, 0 -targetRpmAcBump = scalar, S32, 1192, "", 1, 0 -iacByRpmTaper = scalar, F32, 1196 -luaAdd = scalar, F32, 1200 -; total TS size = 1204 -baseDwell = scalar, F32, 1204, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 1208, "", 1, 0 -luaTimingAdd = scalar, F32, 1212, "", 1, 0 -luaTimingMult = scalar, F32, 1216, "", 1, 0 -; total TS size = 1220 -idlePosition = scalar, F32, 1220, "", 1, 0 -trim = scalar, F32, 1224, "", 1, 0 -luaAdjustment = scalar, F32, 1228, "", 1, 0 -etbFeedForward = scalar, F32, 1232 -etbIntegralError = scalar, F32, 1236, "", 1, 0 -etbCurrentTarget = scalar, F32, 1240, "%", 1, 0 -etbRevLimitActive = bits, U32, 1244, [0:0] -unusedBit_7_1 = bits, U32, 1244, [1:1] -unusedBit_7_2 = bits, U32, 1244, [2:2] -unusedBit_7_3 = bits, U32, 1244, [3:3] -unusedBit_7_4 = bits, U32, 1244, [4:4] -unusedBit_7_5 = bits, U32, 1244, [5:5] -unusedBit_7_6 = bits, U32, 1244, [6:6] -unusedBit_7_7 = bits, U32, 1244, [7:7] -unusedBit_7_8 = bits, U32, 1244, [8:8] -unusedBit_7_9 = bits, U32, 1244, [9:9] -unusedBit_7_10 = bits, U32, 1244, [10:10] -unusedBit_7_11 = bits, U32, 1244, [11:11] -unusedBit_7_12 = bits, U32, 1244, [12:12] -unusedBit_7_13 = bits, U32, 1244, [13:13] -unusedBit_7_14 = bits, U32, 1244, [14:14] -unusedBit_7_15 = bits, U32, 1244, [15:15] -unusedBit_7_16 = bits, U32, 1244, [16:16] -unusedBit_7_17 = bits, U32, 1244, [17:17] -unusedBit_7_18 = bits, U32, 1244, [18:18] -unusedBit_7_19 = bits, U32, 1244, [19:19] -unusedBit_7_20 = bits, U32, 1244, [20:20] -unusedBit_7_21 = bits, U32, 1244, [21:21] -unusedBit_7_22 = bits, U32, 1244, [22:22] -unusedBit_7_23 = bits, U32, 1244, [23:23] -unusedBit_7_24 = bits, U32, 1244, [24:24] -unusedBit_7_25 = bits, U32, 1244, [25:25] -unusedBit_7_26 = bits, U32, 1244, [26:26] -unusedBit_7_27 = bits, U32, 1244, [27:27] -unusedBit_7_28 = bits, U32, 1244, [28:28] -unusedBit_7_29 = bits, U32, 1244, [29:29] -unusedBit_7_30 = bits, U32, 1244, [30:30] -unusedBit_7_31 = bits, U32, 1244, [31:31] -; total TS size = 1248 -faultCode = scalar, U08, 1248, "", 1, 0 -heaterDuty = scalar, U08, 1249, "%", 1, 0 -pumpDuty = scalar, U08, 1250, "%", 1, 0 -tempC = scalar, U16, 1252, "C", 1, 0 -nernstVoltage = scalar, U16, 1254, "V", 0.001, 0 -esr = scalar, U16, 1256, "", 1, 0 -; total TS size = 1260 +m_hasSynchronizedPhase = bits, U32, 1156, [0:0] +unusedBit_1_1 = bits, U32, 1156, [1:1] +unusedBit_1_2 = bits, U32, 1156, [2:2] +unusedBit_1_3 = bits, U32, 1156, [3:3] +unusedBit_1_4 = bits, U32, 1156, [4:4] +unusedBit_1_5 = bits, U32, 1156, [5:5] +unusedBit_1_6 = bits, U32, 1156, [6:6] +unusedBit_1_7 = bits, U32, 1156, [7:7] +unusedBit_1_8 = bits, U32, 1156, [8:8] +unusedBit_1_9 = bits, U32, 1156, [9:9] +unusedBit_1_10 = bits, U32, 1156, [10:10] +unusedBit_1_11 = bits, U32, 1156, [11:11] +unusedBit_1_12 = bits, U32, 1156, [12:12] +unusedBit_1_13 = bits, U32, 1156, [13:13] +unusedBit_1_14 = bits, U32, 1156, [14:14] +unusedBit_1_15 = bits, U32, 1156, [15:15] +unusedBit_1_16 = bits, U32, 1156, [16:16] +unusedBit_1_17 = bits, U32, 1156, [17:17] +unusedBit_1_18 = bits, U32, 1156, [18:18] +unusedBit_1_19 = bits, U32, 1156, [19:19] +unusedBit_1_20 = bits, U32, 1156, [20:20] +unusedBit_1_21 = bits, U32, 1156, [21:21] +unusedBit_1_22 = bits, U32, 1156, [22:22] +unusedBit_1_23 = bits, U32, 1156, [23:23] +unusedBit_1_24 = bits, U32, 1156, [24:24] +unusedBit_1_25 = bits, U32, 1156, [25:25] +unusedBit_1_26 = bits, U32, 1156, [26:26] +unusedBit_1_27 = bits, U32, 1156, [27:27] +unusedBit_1_28 = bits, U32, 1156, [28:28] +unusedBit_1_29 = bits, U32, 1156, [29:29] +unusedBit_1_30 = bits, U32, 1156, [30:30] +unusedBit_1_31 = bits, U32, 1156, [31:31] +; total TS size = 1160 +wallFuelCorrection = scalar, F32, 1160, "", 1, 0 +wallFuel = scalar, F32, 1164, "", 1, 0 +; total TS size = 1168 +idleState = bits, S32, 1168, [0:2], "not important" +currentIdlePosition = scalar, F32, 1172 +baseIdlePosition = scalar, F32, 1176 +iacByTpsTaper = scalar, F32, 1180 +throttlePedalUpState = scalar, S32, 1184, "", 1, 0 +mightResetPid = bits, U32, 1188, [0:0] +shouldResetPid = bits, U32, 1188, [1:1] +wasResetPid = bits, U32, 1188, [2:2] +mustResetPid = bits, U32, 1188, [3:3] +isCranking = bits, U32, 1188, [4:4] +useIacTableForCoasting = bits, U32, 1188, [5:5] +notIdling = bits, U32, 1188, [6:6] +needReset = bits, U32, 1188, [7:7] +isInDeadZone = bits, U32, 1188, [8:8] +isBlipping = bits, U32, 1188, [9:9] +useClosedLoop = bits, U32, 1188, [10:10] +badTps = bits, U32, 1188, [11:11] +looksLikeRunning = bits, U32, 1188, [12:12] +looksLikeCoasting = bits, U32, 1188, [13:13] +looksLikeCrankToIdle = bits, U32, 1188, [14:14] +isVerboseIAC = bits, U32, 1188, [15:15] +isIdleCoasting = bits, U32, 1188, [16:16] +unusedBit_22_17 = bits, U32, 1188, [17:17] +unusedBit_22_18 = bits, U32, 1188, [18:18] +unusedBit_22_19 = bits, U32, 1188, [19:19] +unusedBit_22_20 = bits, U32, 1188, [20:20] +unusedBit_22_21 = bits, U32, 1188, [21:21] +unusedBit_22_22 = bits, U32, 1188, [22:22] +unusedBit_22_23 = bits, U32, 1188, [23:23] +unusedBit_22_24 = bits, U32, 1188, [24:24] +unusedBit_22_25 = bits, U32, 1188, [25:25] +unusedBit_22_26 = bits, U32, 1188, [26:26] +unusedBit_22_27 = bits, U32, 1188, [27:27] +unusedBit_22_28 = bits, U32, 1188, [28:28] +unusedBit_22_29 = bits, U32, 1188, [29:29] +unusedBit_22_30 = bits, U32, 1188, [30:30] +unusedBit_22_31 = bits, U32, 1188, [31:31] +targetRpmByClt = scalar, S32, 1192, "", 1, 0 +targetRpmAcBump = scalar, S32, 1196, "", 1, 0 +iacByRpmTaper = scalar, F32, 1200 +luaAdd = scalar, F32, 1204 +; total TS size = 1208 +baseDwell = scalar, F32, 1208, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 1212, "", 1, 0 +luaTimingAdd = scalar, F32, 1216, "", 1, 0 +luaTimingMult = scalar, F32, 1220, "", 1, 0 +; total TS size = 1224 +idlePosition = scalar, F32, 1224, "", 1, 0 +trim = scalar, F32, 1228, "", 1, 0 +luaAdjustment = scalar, F32, 1232, "", 1, 0 +etbFeedForward = scalar, F32, 1236 +etbIntegralError = scalar, F32, 1240, "", 1, 0 +etbCurrentTarget = scalar, F32, 1244, "%", 1, 0 +etbRevLimitActive = bits, U32, 1248, [0:0] +unusedBit_7_1 = bits, U32, 1248, [1:1] +unusedBit_7_2 = bits, U32, 1248, [2:2] +unusedBit_7_3 = bits, U32, 1248, [3:3] +unusedBit_7_4 = bits, U32, 1248, [4:4] +unusedBit_7_5 = bits, U32, 1248, [5:5] +unusedBit_7_6 = bits, U32, 1248, [6:6] +unusedBit_7_7 = bits, U32, 1248, [7:7] +unusedBit_7_8 = bits, U32, 1248, [8:8] +unusedBit_7_9 = bits, U32, 1248, [9:9] +unusedBit_7_10 = bits, U32, 1248, [10:10] +unusedBit_7_11 = bits, U32, 1248, [11:11] +unusedBit_7_12 = bits, U32, 1248, [12:12] +unusedBit_7_13 = bits, U32, 1248, [13:13] +unusedBit_7_14 = bits, U32, 1248, [14:14] +unusedBit_7_15 = bits, U32, 1248, [15:15] +unusedBit_7_16 = bits, U32, 1248, [16:16] +unusedBit_7_17 = bits, U32, 1248, [17:17] +unusedBit_7_18 = bits, U32, 1248, [18:18] +unusedBit_7_19 = bits, U32, 1248, [19:19] +unusedBit_7_20 = bits, U32, 1248, [20:20] +unusedBit_7_21 = bits, U32, 1248, [21:21] +unusedBit_7_22 = bits, U32, 1248, [22:22] +unusedBit_7_23 = bits, U32, 1248, [23:23] +unusedBit_7_24 = bits, U32, 1248, [24:24] +unusedBit_7_25 = bits, U32, 1248, [25:25] +unusedBit_7_26 = bits, U32, 1248, [26:26] +unusedBit_7_27 = bits, U32, 1248, [27:27] +unusedBit_7_28 = bits, U32, 1248, [28:28] +unusedBit_7_29 = bits, U32, 1248, [29:29] +unusedBit_7_30 = bits, U32, 1248, [30:30] +unusedBit_7_31 = bits, U32, 1248, [31:31] +; total TS size = 1252 +faultCode = scalar, U08, 1252, "", 1, 0 +heaterDuty = scalar, U08, 1253, "%", 1, 0 +pumpDuty = scalar, U08, 1254, "%", 1, 0 +tempC = scalar, U16, 1256, "C", 1, 0 +nernstVoltage = scalar, U16, 1258, "V", 0.001, 0 +esr = scalar, U16, 1260, "", 1, 0 +; total TS size = 1264 time = { timeNow } @@ -4993,6 +4994,7 @@ entry = mapVvt_MAP_AT_DIFF, "mapVvt_MAP_AT_DIFF", float, "%.3f" entry = mapVvt_MAP_AT_CYCLE_COUNT, "mapVvt_MAP_AT_CYCLE_COUNT", int, "%d" entry = mapVvt_map_peak, "mapVvt_map_peak", int, "%d" entry = currentEngineDecodedPhase, "Engine Phase", float, "%.3f" +entry = triggerToothAngleError, "triggerToothAngleError", float, "%.3f" entry = crankSynchronizationCounter, "Crank sync counter", int, "%d" entry = vvtSyncGapRatio, "vvtSyncGapRatio", float, "%.3f" entry = vvtCurrentPosition, "vvtCurrentPosition", float, "%.3f" @@ -5783,6 +5785,8 @@ dialog = trigger_centralDialog, "trigger_central" graphLine = mapVvt_MAP_AT_CYCLE_COUNT graphLine = mapVvt_map_peak graphLine = currentEngineDecodedPhase + liveGraph = trigger_central_4_Graph, "Graph", South + graphLine = triggerToothAngleError dialog = trigger_stateDialog, "trigger_state" diff --git a/firmware/tunerstudio/generated/rusefi_core8.ini b/firmware/tunerstudio/generated/rusefi_core8.ini index 7a1433e668..51d601efa2 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.09.24.core8.7923288" + signature = "rusEFI 2022.09.24.core8.118825537" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.09.24.core8.7923288" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.09.24.core8.118825537" ; 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 Fri Sep 23 23:16:22 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Sep 24 04:28:57 UTC 2022 pageSize = 22048 page = 1 @@ -2140,7 +2140,7 @@ ignBlends4_blendValues = array, U08, 22038, [8], "%", 0.5, 0, 0, 100, 1 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1260 + ochBlockSize = 1264 ; ; see TunerStudioOutputChannels struct @@ -3141,146 +3141,147 @@ mapVvt_MAP_AT_DIFF = scalar, F32, 1116, "", 1, 0 mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1120, "", 1, 0 mapVvt_map_peak = scalar, U08, 1121, "", 1, 0 currentEngineDecodedPhase = scalar, F32, 1124, "deg", 1, 0 -; total TS size = 1128 -crankSynchronizationCounter = scalar, U32, 1128, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1132, "", 1, 0 -vvtCurrentPosition = scalar, F32, 1136, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1140, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 1144, "", 1, 0 -triggerStateIndex = scalar, U08, 1148, "", 1, 0 -vvtCounter = scalar, U08, 1149, "", 1, 0 -camResyncCounter = scalar, U08, 1150, "", 1, 0 -vvtStateIndex = scalar, U08, 1151, "", 1, 0 -; total TS size = 1152 -m_hasSynchronizedPhase = bits, U32, 1152, [0:0] -unusedBit_1_1 = bits, U32, 1152, [1:1] -unusedBit_1_2 = bits, U32, 1152, [2:2] -unusedBit_1_3 = bits, U32, 1152, [3:3] -unusedBit_1_4 = bits, U32, 1152, [4:4] -unusedBit_1_5 = bits, U32, 1152, [5:5] -unusedBit_1_6 = bits, U32, 1152, [6:6] -unusedBit_1_7 = bits, U32, 1152, [7:7] -unusedBit_1_8 = bits, U32, 1152, [8:8] -unusedBit_1_9 = bits, U32, 1152, [9:9] -unusedBit_1_10 = bits, U32, 1152, [10:10] -unusedBit_1_11 = bits, U32, 1152, [11:11] -unusedBit_1_12 = bits, U32, 1152, [12:12] -unusedBit_1_13 = bits, U32, 1152, [13:13] -unusedBit_1_14 = bits, U32, 1152, [14:14] -unusedBit_1_15 = bits, U32, 1152, [15:15] -unusedBit_1_16 = bits, U32, 1152, [16:16] -unusedBit_1_17 = bits, U32, 1152, [17:17] -unusedBit_1_18 = bits, U32, 1152, [18:18] -unusedBit_1_19 = bits, U32, 1152, [19:19] -unusedBit_1_20 = bits, U32, 1152, [20:20] -unusedBit_1_21 = bits, U32, 1152, [21:21] -unusedBit_1_22 = bits, U32, 1152, [22:22] -unusedBit_1_23 = bits, U32, 1152, [23:23] -unusedBit_1_24 = bits, U32, 1152, [24:24] -unusedBit_1_25 = bits, U32, 1152, [25:25] -unusedBit_1_26 = bits, U32, 1152, [26:26] -unusedBit_1_27 = bits, U32, 1152, [27:27] -unusedBit_1_28 = bits, U32, 1152, [28:28] -unusedBit_1_29 = bits, U32, 1152, [29:29] -unusedBit_1_30 = bits, U32, 1152, [30:30] -unusedBit_1_31 = bits, U32, 1152, [31:31] +triggerToothAngleError = scalar, F32, 1128, "deg", 1, 0 +; total TS size = 1132 +crankSynchronizationCounter = scalar, U32, 1132, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1136, "", 1, 0 +vvtCurrentPosition = scalar, F32, 1140, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1144, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 1148, "", 1, 0 +triggerStateIndex = scalar, U08, 1152, "", 1, 0 +vvtCounter = scalar, U08, 1153, "", 1, 0 +camResyncCounter = scalar, U08, 1154, "", 1, 0 +vvtStateIndex = scalar, U08, 1155, "", 1, 0 ; total TS size = 1156 -wallFuelCorrection = scalar, F32, 1156, "", 1, 0 -wallFuel = scalar, F32, 1160, "", 1, 0 -; total TS size = 1164 -idleState = bits, S32, 1164, [0:2], "not important" -currentIdlePosition = scalar, F32, 1168 -baseIdlePosition = scalar, F32, 1172 -iacByTpsTaper = scalar, F32, 1176 -throttlePedalUpState = scalar, S32, 1180, "", 1, 0 -mightResetPid = bits, U32, 1184, [0:0] -shouldResetPid = bits, U32, 1184, [1:1] -wasResetPid = bits, U32, 1184, [2:2] -mustResetPid = bits, U32, 1184, [3:3] -isCranking = bits, U32, 1184, [4:4] -useIacTableForCoasting = bits, U32, 1184, [5:5] -notIdling = bits, U32, 1184, [6:6] -needReset = bits, U32, 1184, [7:7] -isInDeadZone = bits, U32, 1184, [8:8] -isBlipping = bits, U32, 1184, [9:9] -useClosedLoop = bits, U32, 1184, [10:10] -badTps = bits, U32, 1184, [11:11] -looksLikeRunning = bits, U32, 1184, [12:12] -looksLikeCoasting = bits, U32, 1184, [13:13] -looksLikeCrankToIdle = bits, U32, 1184, [14:14] -isVerboseIAC = bits, U32, 1184, [15:15] -isIdleCoasting = bits, U32, 1184, [16:16] -unusedBit_22_17 = bits, U32, 1184, [17:17] -unusedBit_22_18 = bits, U32, 1184, [18:18] -unusedBit_22_19 = bits, U32, 1184, [19:19] -unusedBit_22_20 = bits, U32, 1184, [20:20] -unusedBit_22_21 = bits, U32, 1184, [21:21] -unusedBit_22_22 = bits, U32, 1184, [22:22] -unusedBit_22_23 = bits, U32, 1184, [23:23] -unusedBit_22_24 = bits, U32, 1184, [24:24] -unusedBit_22_25 = bits, U32, 1184, [25:25] -unusedBit_22_26 = bits, U32, 1184, [26:26] -unusedBit_22_27 = bits, U32, 1184, [27:27] -unusedBit_22_28 = bits, U32, 1184, [28:28] -unusedBit_22_29 = bits, U32, 1184, [29:29] -unusedBit_22_30 = bits, U32, 1184, [30:30] -unusedBit_22_31 = bits, U32, 1184, [31:31] -targetRpmByClt = scalar, S32, 1188, "", 1, 0 -targetRpmAcBump = scalar, S32, 1192, "", 1, 0 -iacByRpmTaper = scalar, F32, 1196 -luaAdd = scalar, F32, 1200 -; total TS size = 1204 -baseDwell = scalar, F32, 1204, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 1208, "", 1, 0 -luaTimingAdd = scalar, F32, 1212, "", 1, 0 -luaTimingMult = scalar, F32, 1216, "", 1, 0 -; total TS size = 1220 -idlePosition = scalar, F32, 1220, "", 1, 0 -trim = scalar, F32, 1224, "", 1, 0 -luaAdjustment = scalar, F32, 1228, "", 1, 0 -etbFeedForward = scalar, F32, 1232 -etbIntegralError = scalar, F32, 1236, "", 1, 0 -etbCurrentTarget = scalar, F32, 1240, "%", 1, 0 -etbRevLimitActive = bits, U32, 1244, [0:0] -unusedBit_7_1 = bits, U32, 1244, [1:1] -unusedBit_7_2 = bits, U32, 1244, [2:2] -unusedBit_7_3 = bits, U32, 1244, [3:3] -unusedBit_7_4 = bits, U32, 1244, [4:4] -unusedBit_7_5 = bits, U32, 1244, [5:5] -unusedBit_7_6 = bits, U32, 1244, [6:6] -unusedBit_7_7 = bits, U32, 1244, [7:7] -unusedBit_7_8 = bits, U32, 1244, [8:8] -unusedBit_7_9 = bits, U32, 1244, [9:9] -unusedBit_7_10 = bits, U32, 1244, [10:10] -unusedBit_7_11 = bits, U32, 1244, [11:11] -unusedBit_7_12 = bits, U32, 1244, [12:12] -unusedBit_7_13 = bits, U32, 1244, [13:13] -unusedBit_7_14 = bits, U32, 1244, [14:14] -unusedBit_7_15 = bits, U32, 1244, [15:15] -unusedBit_7_16 = bits, U32, 1244, [16:16] -unusedBit_7_17 = bits, U32, 1244, [17:17] -unusedBit_7_18 = bits, U32, 1244, [18:18] -unusedBit_7_19 = bits, U32, 1244, [19:19] -unusedBit_7_20 = bits, U32, 1244, [20:20] -unusedBit_7_21 = bits, U32, 1244, [21:21] -unusedBit_7_22 = bits, U32, 1244, [22:22] -unusedBit_7_23 = bits, U32, 1244, [23:23] -unusedBit_7_24 = bits, U32, 1244, [24:24] -unusedBit_7_25 = bits, U32, 1244, [25:25] -unusedBit_7_26 = bits, U32, 1244, [26:26] -unusedBit_7_27 = bits, U32, 1244, [27:27] -unusedBit_7_28 = bits, U32, 1244, [28:28] -unusedBit_7_29 = bits, U32, 1244, [29:29] -unusedBit_7_30 = bits, U32, 1244, [30:30] -unusedBit_7_31 = bits, U32, 1244, [31:31] -; total TS size = 1248 -faultCode = scalar, U08, 1248, "", 1, 0 -heaterDuty = scalar, U08, 1249, "%", 1, 0 -pumpDuty = scalar, U08, 1250, "%", 1, 0 -tempC = scalar, U16, 1252, "C", 1, 0 -nernstVoltage = scalar, U16, 1254, "V", 0.001, 0 -esr = scalar, U16, 1256, "", 1, 0 -; total TS size = 1260 +m_hasSynchronizedPhase = bits, U32, 1156, [0:0] +unusedBit_1_1 = bits, U32, 1156, [1:1] +unusedBit_1_2 = bits, U32, 1156, [2:2] +unusedBit_1_3 = bits, U32, 1156, [3:3] +unusedBit_1_4 = bits, U32, 1156, [4:4] +unusedBit_1_5 = bits, U32, 1156, [5:5] +unusedBit_1_6 = bits, U32, 1156, [6:6] +unusedBit_1_7 = bits, U32, 1156, [7:7] +unusedBit_1_8 = bits, U32, 1156, [8:8] +unusedBit_1_9 = bits, U32, 1156, [9:9] +unusedBit_1_10 = bits, U32, 1156, [10:10] +unusedBit_1_11 = bits, U32, 1156, [11:11] +unusedBit_1_12 = bits, U32, 1156, [12:12] +unusedBit_1_13 = bits, U32, 1156, [13:13] +unusedBit_1_14 = bits, U32, 1156, [14:14] +unusedBit_1_15 = bits, U32, 1156, [15:15] +unusedBit_1_16 = bits, U32, 1156, [16:16] +unusedBit_1_17 = bits, U32, 1156, [17:17] +unusedBit_1_18 = bits, U32, 1156, [18:18] +unusedBit_1_19 = bits, U32, 1156, [19:19] +unusedBit_1_20 = bits, U32, 1156, [20:20] +unusedBit_1_21 = bits, U32, 1156, [21:21] +unusedBit_1_22 = bits, U32, 1156, [22:22] +unusedBit_1_23 = bits, U32, 1156, [23:23] +unusedBit_1_24 = bits, U32, 1156, [24:24] +unusedBit_1_25 = bits, U32, 1156, [25:25] +unusedBit_1_26 = bits, U32, 1156, [26:26] +unusedBit_1_27 = bits, U32, 1156, [27:27] +unusedBit_1_28 = bits, U32, 1156, [28:28] +unusedBit_1_29 = bits, U32, 1156, [29:29] +unusedBit_1_30 = bits, U32, 1156, [30:30] +unusedBit_1_31 = bits, U32, 1156, [31:31] +; total TS size = 1160 +wallFuelCorrection = scalar, F32, 1160, "", 1, 0 +wallFuel = scalar, F32, 1164, "", 1, 0 +; total TS size = 1168 +idleState = bits, S32, 1168, [0:2], "not important" +currentIdlePosition = scalar, F32, 1172 +baseIdlePosition = scalar, F32, 1176 +iacByTpsTaper = scalar, F32, 1180 +throttlePedalUpState = scalar, S32, 1184, "", 1, 0 +mightResetPid = bits, U32, 1188, [0:0] +shouldResetPid = bits, U32, 1188, [1:1] +wasResetPid = bits, U32, 1188, [2:2] +mustResetPid = bits, U32, 1188, [3:3] +isCranking = bits, U32, 1188, [4:4] +useIacTableForCoasting = bits, U32, 1188, [5:5] +notIdling = bits, U32, 1188, [6:6] +needReset = bits, U32, 1188, [7:7] +isInDeadZone = bits, U32, 1188, [8:8] +isBlipping = bits, U32, 1188, [9:9] +useClosedLoop = bits, U32, 1188, [10:10] +badTps = bits, U32, 1188, [11:11] +looksLikeRunning = bits, U32, 1188, [12:12] +looksLikeCoasting = bits, U32, 1188, [13:13] +looksLikeCrankToIdle = bits, U32, 1188, [14:14] +isVerboseIAC = bits, U32, 1188, [15:15] +isIdleCoasting = bits, U32, 1188, [16:16] +unusedBit_22_17 = bits, U32, 1188, [17:17] +unusedBit_22_18 = bits, U32, 1188, [18:18] +unusedBit_22_19 = bits, U32, 1188, [19:19] +unusedBit_22_20 = bits, U32, 1188, [20:20] +unusedBit_22_21 = bits, U32, 1188, [21:21] +unusedBit_22_22 = bits, U32, 1188, [22:22] +unusedBit_22_23 = bits, U32, 1188, [23:23] +unusedBit_22_24 = bits, U32, 1188, [24:24] +unusedBit_22_25 = bits, U32, 1188, [25:25] +unusedBit_22_26 = bits, U32, 1188, [26:26] +unusedBit_22_27 = bits, U32, 1188, [27:27] +unusedBit_22_28 = bits, U32, 1188, [28:28] +unusedBit_22_29 = bits, U32, 1188, [29:29] +unusedBit_22_30 = bits, U32, 1188, [30:30] +unusedBit_22_31 = bits, U32, 1188, [31:31] +targetRpmByClt = scalar, S32, 1192, "", 1, 0 +targetRpmAcBump = scalar, S32, 1196, "", 1, 0 +iacByRpmTaper = scalar, F32, 1200 +luaAdd = scalar, F32, 1204 +; total TS size = 1208 +baseDwell = scalar, F32, 1208, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 1212, "", 1, 0 +luaTimingAdd = scalar, F32, 1216, "", 1, 0 +luaTimingMult = scalar, F32, 1220, "", 1, 0 +; total TS size = 1224 +idlePosition = scalar, F32, 1224, "", 1, 0 +trim = scalar, F32, 1228, "", 1, 0 +luaAdjustment = scalar, F32, 1232, "", 1, 0 +etbFeedForward = scalar, F32, 1236 +etbIntegralError = scalar, F32, 1240, "", 1, 0 +etbCurrentTarget = scalar, F32, 1244, "%", 1, 0 +etbRevLimitActive = bits, U32, 1248, [0:0] +unusedBit_7_1 = bits, U32, 1248, [1:1] +unusedBit_7_2 = bits, U32, 1248, [2:2] +unusedBit_7_3 = bits, U32, 1248, [3:3] +unusedBit_7_4 = bits, U32, 1248, [4:4] +unusedBit_7_5 = bits, U32, 1248, [5:5] +unusedBit_7_6 = bits, U32, 1248, [6:6] +unusedBit_7_7 = bits, U32, 1248, [7:7] +unusedBit_7_8 = bits, U32, 1248, [8:8] +unusedBit_7_9 = bits, U32, 1248, [9:9] +unusedBit_7_10 = bits, U32, 1248, [10:10] +unusedBit_7_11 = bits, U32, 1248, [11:11] +unusedBit_7_12 = bits, U32, 1248, [12:12] +unusedBit_7_13 = bits, U32, 1248, [13:13] +unusedBit_7_14 = bits, U32, 1248, [14:14] +unusedBit_7_15 = bits, U32, 1248, [15:15] +unusedBit_7_16 = bits, U32, 1248, [16:16] +unusedBit_7_17 = bits, U32, 1248, [17:17] +unusedBit_7_18 = bits, U32, 1248, [18:18] +unusedBit_7_19 = bits, U32, 1248, [19:19] +unusedBit_7_20 = bits, U32, 1248, [20:20] +unusedBit_7_21 = bits, U32, 1248, [21:21] +unusedBit_7_22 = bits, U32, 1248, [22:22] +unusedBit_7_23 = bits, U32, 1248, [23:23] +unusedBit_7_24 = bits, U32, 1248, [24:24] +unusedBit_7_25 = bits, U32, 1248, [25:25] +unusedBit_7_26 = bits, U32, 1248, [26:26] +unusedBit_7_27 = bits, U32, 1248, [27:27] +unusedBit_7_28 = bits, U32, 1248, [28:28] +unusedBit_7_29 = bits, U32, 1248, [29:29] +unusedBit_7_30 = bits, U32, 1248, [30:30] +unusedBit_7_31 = bits, U32, 1248, [31:31] +; total TS size = 1252 +faultCode = scalar, U08, 1252, "", 1, 0 +heaterDuty = scalar, U08, 1253, "%", 1, 0 +pumpDuty = scalar, U08, 1254, "%", 1, 0 +tempC = scalar, U16, 1256, "C", 1, 0 +nernstVoltage = scalar, U16, 1258, "V", 0.001, 0 +esr = scalar, U16, 1260, "", 1, 0 +; total TS size = 1264 time = { timeNow } @@ -4993,6 +4994,7 @@ entry = mapVvt_MAP_AT_DIFF, "mapVvt_MAP_AT_DIFF", float, "%.3f" entry = mapVvt_MAP_AT_CYCLE_COUNT, "mapVvt_MAP_AT_CYCLE_COUNT", int, "%d" entry = mapVvt_map_peak, "mapVvt_map_peak", int, "%d" entry = currentEngineDecodedPhase, "Engine Phase", float, "%.3f" +entry = triggerToothAngleError, "triggerToothAngleError", float, "%.3f" entry = crankSynchronizationCounter, "Crank sync counter", int, "%d" entry = vvtSyncGapRatio, "vvtSyncGapRatio", float, "%.3f" entry = vvtCurrentPosition, "vvtCurrentPosition", float, "%.3f" @@ -5781,6 +5783,8 @@ dialog = trigger_centralDialog, "trigger_central" graphLine = mapVvt_MAP_AT_CYCLE_COUNT graphLine = mapVvt_map_peak graphLine = currentEngineDecodedPhase + liveGraph = trigger_central_4_Graph, "Graph", South + graphLine = triggerToothAngleError dialog = trigger_stateDialog, "trigger_state" diff --git a/firmware/tunerstudio/generated/rusefi_cypress.ini b/firmware/tunerstudio/generated/rusefi_cypress.ini index c8615c07a3..71df28ae46 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.09.24.cypress.4136941473" + signature = "rusEFI 2022.09.24.cypress.4059657144" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.09.24.cypress.4136941473" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.09.24.cypress.4059657144" ; 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 Fri Sep 23 23:15:48 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Sat Sep 24 04:28:22 UTC 2022 pageSize = 22048 page = 1 @@ -2140,7 +2140,7 @@ ignBlends4_blendValues = array, U08, 22038, [8], "%", 0.5, 0, 0, 100, 1 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1260 + ochBlockSize = 1264 ; ; see TunerStudioOutputChannels struct @@ -3141,146 +3141,147 @@ mapVvt_MAP_AT_DIFF = scalar, F32, 1116, "", 1, 0 mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1120, "", 1, 0 mapVvt_map_peak = scalar, U08, 1121, "", 1, 0 currentEngineDecodedPhase = scalar, F32, 1124, "deg", 1, 0 -; total TS size = 1128 -crankSynchronizationCounter = scalar, U32, 1128, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1132, "", 1, 0 -vvtCurrentPosition = scalar, F32, 1136, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1140, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 1144, "", 1, 0 -triggerStateIndex = scalar, U08, 1148, "", 1, 0 -vvtCounter = scalar, U08, 1149, "", 1, 0 -camResyncCounter = scalar, U08, 1150, "", 1, 0 -vvtStateIndex = scalar, U08, 1151, "", 1, 0 -; total TS size = 1152 -m_hasSynchronizedPhase = bits, U32, 1152, [0:0] -unusedBit_1_1 = bits, U32, 1152, [1:1] -unusedBit_1_2 = bits, U32, 1152, [2:2] -unusedBit_1_3 = bits, U32, 1152, [3:3] -unusedBit_1_4 = bits, U32, 1152, [4:4] -unusedBit_1_5 = bits, U32, 1152, [5:5] -unusedBit_1_6 = bits, U32, 1152, [6:6] -unusedBit_1_7 = bits, U32, 1152, [7:7] -unusedBit_1_8 = bits, U32, 1152, [8:8] -unusedBit_1_9 = bits, U32, 1152, [9:9] -unusedBit_1_10 = bits, U32, 1152, [10:10] -unusedBit_1_11 = bits, U32, 1152, [11:11] -unusedBit_1_12 = bits, U32, 1152, [12:12] -unusedBit_1_13 = bits, U32, 1152, [13:13] -unusedBit_1_14 = bits, U32, 1152, [14:14] -unusedBit_1_15 = bits, U32, 1152, [15:15] -unusedBit_1_16 = bits, U32, 1152, [16:16] -unusedBit_1_17 = bits, U32, 1152, [17:17] -unusedBit_1_18 = bits, U32, 1152, [18:18] -unusedBit_1_19 = bits, U32, 1152, [19:19] -unusedBit_1_20 = bits, U32, 1152, [20:20] -unusedBit_1_21 = bits, U32, 1152, [21:21] -unusedBit_1_22 = bits, U32, 1152, [22:22] -unusedBit_1_23 = bits, U32, 1152, [23:23] -unusedBit_1_24 = bits, U32, 1152, [24:24] -unusedBit_1_25 = bits, U32, 1152, [25:25] -unusedBit_1_26 = bits, U32, 1152, [26:26] -unusedBit_1_27 = bits, U32, 1152, [27:27] -unusedBit_1_28 = bits, U32, 1152, [28:28] -unusedBit_1_29 = bits, U32, 1152, [29:29] -unusedBit_1_30 = bits, U32, 1152, [30:30] -unusedBit_1_31 = bits, U32, 1152, [31:31] +triggerToothAngleError = scalar, F32, 1128, "deg", 1, 0 +; total TS size = 1132 +crankSynchronizationCounter = scalar, U32, 1132, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1136, "", 1, 0 +vvtCurrentPosition = scalar, F32, 1140, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1144, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 1148, "", 1, 0 +triggerStateIndex = scalar, U08, 1152, "", 1, 0 +vvtCounter = scalar, U08, 1153, "", 1, 0 +camResyncCounter = scalar, U08, 1154, "", 1, 0 +vvtStateIndex = scalar, U08, 1155, "", 1, 0 ; total TS size = 1156 -wallFuelCorrection = scalar, F32, 1156, "", 1, 0 -wallFuel = scalar, F32, 1160, "", 1, 0 -; total TS size = 1164 -idleState = bits, S32, 1164, [0:2], "not important" -currentIdlePosition = scalar, F32, 1168 -baseIdlePosition = scalar, F32, 1172 -iacByTpsTaper = scalar, F32, 1176 -throttlePedalUpState = scalar, S32, 1180, "", 1, 0 -mightResetPid = bits, U32, 1184, [0:0] -shouldResetPid = bits, U32, 1184, [1:1] -wasResetPid = bits, U32, 1184, [2:2] -mustResetPid = bits, U32, 1184, [3:3] -isCranking = bits, U32, 1184, [4:4] -useIacTableForCoasting = bits, U32, 1184, [5:5] -notIdling = bits, U32, 1184, [6:6] -needReset = bits, U32, 1184, [7:7] -isInDeadZone = bits, U32, 1184, [8:8] -isBlipping = bits, U32, 1184, [9:9] -useClosedLoop = bits, U32, 1184, [10:10] -badTps = bits, U32, 1184, [11:11] -looksLikeRunning = bits, U32, 1184, [12:12] -looksLikeCoasting = bits, U32, 1184, [13:13] -looksLikeCrankToIdle = bits, U32, 1184, [14:14] -isVerboseIAC = bits, U32, 1184, [15:15] -isIdleCoasting = bits, U32, 1184, [16:16] -unusedBit_22_17 = bits, U32, 1184, [17:17] -unusedBit_22_18 = bits, U32, 1184, [18:18] -unusedBit_22_19 = bits, U32, 1184, [19:19] -unusedBit_22_20 = bits, U32, 1184, [20:20] -unusedBit_22_21 = bits, U32, 1184, [21:21] -unusedBit_22_22 = bits, U32, 1184, [22:22] -unusedBit_22_23 = bits, U32, 1184, [23:23] -unusedBit_22_24 = bits, U32, 1184, [24:24] -unusedBit_22_25 = bits, U32, 1184, [25:25] -unusedBit_22_26 = bits, U32, 1184, [26:26] -unusedBit_22_27 = bits, U32, 1184, [27:27] -unusedBit_22_28 = bits, U32, 1184, [28:28] -unusedBit_22_29 = bits, U32, 1184, [29:29] -unusedBit_22_30 = bits, U32, 1184, [30:30] -unusedBit_22_31 = bits, U32, 1184, [31:31] -targetRpmByClt = scalar, S32, 1188, "", 1, 0 -targetRpmAcBump = scalar, S32, 1192, "", 1, 0 -iacByRpmTaper = scalar, F32, 1196 -luaAdd = scalar, F32, 1200 -; total TS size = 1204 -baseDwell = scalar, F32, 1204, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 1208, "", 1, 0 -luaTimingAdd = scalar, F32, 1212, "", 1, 0 -luaTimingMult = scalar, F32, 1216, "", 1, 0 -; total TS size = 1220 -idlePosition = scalar, F32, 1220, "", 1, 0 -trim = scalar, F32, 1224, "", 1, 0 -luaAdjustment = scalar, F32, 1228, "", 1, 0 -etbFeedForward = scalar, F32, 1232 -etbIntegralError = scalar, F32, 1236, "", 1, 0 -etbCurrentTarget = scalar, F32, 1240, "%", 1, 0 -etbRevLimitActive = bits, U32, 1244, [0:0] -unusedBit_7_1 = bits, U32, 1244, [1:1] -unusedBit_7_2 = bits, U32, 1244, [2:2] -unusedBit_7_3 = bits, U32, 1244, [3:3] -unusedBit_7_4 = bits, U32, 1244, [4:4] -unusedBit_7_5 = bits, U32, 1244, [5:5] -unusedBit_7_6 = bits, U32, 1244, [6:6] -unusedBit_7_7 = bits, U32, 1244, [7:7] -unusedBit_7_8 = bits, U32, 1244, [8:8] -unusedBit_7_9 = bits, U32, 1244, [9:9] -unusedBit_7_10 = bits, U32, 1244, [10:10] -unusedBit_7_11 = bits, U32, 1244, [11:11] -unusedBit_7_12 = bits, U32, 1244, [12:12] -unusedBit_7_13 = bits, U32, 1244, [13:13] -unusedBit_7_14 = bits, U32, 1244, [14:14] -unusedBit_7_15 = bits, U32, 1244, [15:15] -unusedBit_7_16 = bits, U32, 1244, [16:16] -unusedBit_7_17 = bits, U32, 1244, [17:17] -unusedBit_7_18 = bits, U32, 1244, [18:18] -unusedBit_7_19 = bits, U32, 1244, [19:19] -unusedBit_7_20 = bits, U32, 1244, [20:20] -unusedBit_7_21 = bits, U32, 1244, [21:21] -unusedBit_7_22 = bits, U32, 1244, [22:22] -unusedBit_7_23 = bits, U32, 1244, [23:23] -unusedBit_7_24 = bits, U32, 1244, [24:24] -unusedBit_7_25 = bits, U32, 1244, [25:25] -unusedBit_7_26 = bits, U32, 1244, [26:26] -unusedBit_7_27 = bits, U32, 1244, [27:27] -unusedBit_7_28 = bits, U32, 1244, [28:28] -unusedBit_7_29 = bits, U32, 1244, [29:29] -unusedBit_7_30 = bits, U32, 1244, [30:30] -unusedBit_7_31 = bits, U32, 1244, [31:31] -; total TS size = 1248 -faultCode = scalar, U08, 1248, "", 1, 0 -heaterDuty = scalar, U08, 1249, "%", 1, 0 -pumpDuty = scalar, U08, 1250, "%", 1, 0 -tempC = scalar, U16, 1252, "C", 1, 0 -nernstVoltage = scalar, U16, 1254, "V", 0.001, 0 -esr = scalar, U16, 1256, "", 1, 0 -; total TS size = 1260 +m_hasSynchronizedPhase = bits, U32, 1156, [0:0] +unusedBit_1_1 = bits, U32, 1156, [1:1] +unusedBit_1_2 = bits, U32, 1156, [2:2] +unusedBit_1_3 = bits, U32, 1156, [3:3] +unusedBit_1_4 = bits, U32, 1156, [4:4] +unusedBit_1_5 = bits, U32, 1156, [5:5] +unusedBit_1_6 = bits, U32, 1156, [6:6] +unusedBit_1_7 = bits, U32, 1156, [7:7] +unusedBit_1_8 = bits, U32, 1156, [8:8] +unusedBit_1_9 = bits, U32, 1156, [9:9] +unusedBit_1_10 = bits, U32, 1156, [10:10] +unusedBit_1_11 = bits, U32, 1156, [11:11] +unusedBit_1_12 = bits, U32, 1156, [12:12] +unusedBit_1_13 = bits, U32, 1156, [13:13] +unusedBit_1_14 = bits, U32, 1156, [14:14] +unusedBit_1_15 = bits, U32, 1156, [15:15] +unusedBit_1_16 = bits, U32, 1156, [16:16] +unusedBit_1_17 = bits, U32, 1156, [17:17] +unusedBit_1_18 = bits, U32, 1156, [18:18] +unusedBit_1_19 = bits, U32, 1156, [19:19] +unusedBit_1_20 = bits, U32, 1156, [20:20] +unusedBit_1_21 = bits, U32, 1156, [21:21] +unusedBit_1_22 = bits, U32, 1156, [22:22] +unusedBit_1_23 = bits, U32, 1156, [23:23] +unusedBit_1_24 = bits, U32, 1156, [24:24] +unusedBit_1_25 = bits, U32, 1156, [25:25] +unusedBit_1_26 = bits, U32, 1156, [26:26] +unusedBit_1_27 = bits, U32, 1156, [27:27] +unusedBit_1_28 = bits, U32, 1156, [28:28] +unusedBit_1_29 = bits, U32, 1156, [29:29] +unusedBit_1_30 = bits, U32, 1156, [30:30] +unusedBit_1_31 = bits, U32, 1156, [31:31] +; total TS size = 1160 +wallFuelCorrection = scalar, F32, 1160, "", 1, 0 +wallFuel = scalar, F32, 1164, "", 1, 0 +; total TS size = 1168 +idleState = bits, S32, 1168, [0:2], "not important" +currentIdlePosition = scalar, F32, 1172 +baseIdlePosition = scalar, F32, 1176 +iacByTpsTaper = scalar, F32, 1180 +throttlePedalUpState = scalar, S32, 1184, "", 1, 0 +mightResetPid = bits, U32, 1188, [0:0] +shouldResetPid = bits, U32, 1188, [1:1] +wasResetPid = bits, U32, 1188, [2:2] +mustResetPid = bits, U32, 1188, [3:3] +isCranking = bits, U32, 1188, [4:4] +useIacTableForCoasting = bits, U32, 1188, [5:5] +notIdling = bits, U32, 1188, [6:6] +needReset = bits, U32, 1188, [7:7] +isInDeadZone = bits, U32, 1188, [8:8] +isBlipping = bits, U32, 1188, [9:9] +useClosedLoop = bits, U32, 1188, [10:10] +badTps = bits, U32, 1188, [11:11] +looksLikeRunning = bits, U32, 1188, [12:12] +looksLikeCoasting = bits, U32, 1188, [13:13] +looksLikeCrankToIdle = bits, U32, 1188, [14:14] +isVerboseIAC = bits, U32, 1188, [15:15] +isIdleCoasting = bits, U32, 1188, [16:16] +unusedBit_22_17 = bits, U32, 1188, [17:17] +unusedBit_22_18 = bits, U32, 1188, [18:18] +unusedBit_22_19 = bits, U32, 1188, [19:19] +unusedBit_22_20 = bits, U32, 1188, [20:20] +unusedBit_22_21 = bits, U32, 1188, [21:21] +unusedBit_22_22 = bits, U32, 1188, [22:22] +unusedBit_22_23 = bits, U32, 1188, [23:23] +unusedBit_22_24 = bits, U32, 1188, [24:24] +unusedBit_22_25 = bits, U32, 1188, [25:25] +unusedBit_22_26 = bits, U32, 1188, [26:26] +unusedBit_22_27 = bits, U32, 1188, [27:27] +unusedBit_22_28 = bits, U32, 1188, [28:28] +unusedBit_22_29 = bits, U32, 1188, [29:29] +unusedBit_22_30 = bits, U32, 1188, [30:30] +unusedBit_22_31 = bits, U32, 1188, [31:31] +targetRpmByClt = scalar, S32, 1192, "", 1, 0 +targetRpmAcBump = scalar, S32, 1196, "", 1, 0 +iacByRpmTaper = scalar, F32, 1200 +luaAdd = scalar, F32, 1204 +; total TS size = 1208 +baseDwell = scalar, F32, 1208, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 1212, "", 1, 0 +luaTimingAdd = scalar, F32, 1216, "", 1, 0 +luaTimingMult = scalar, F32, 1220, "", 1, 0 +; total TS size = 1224 +idlePosition = scalar, F32, 1224, "", 1, 0 +trim = scalar, F32, 1228, "", 1, 0 +luaAdjustment = scalar, F32, 1232, "", 1, 0 +etbFeedForward = scalar, F32, 1236 +etbIntegralError = scalar, F32, 1240, "", 1, 0 +etbCurrentTarget = scalar, F32, 1244, "%", 1, 0 +etbRevLimitActive = bits, U32, 1248, [0:0] +unusedBit_7_1 = bits, U32, 1248, [1:1] +unusedBit_7_2 = bits, U32, 1248, [2:2] +unusedBit_7_3 = bits, U32, 1248, [3:3] +unusedBit_7_4 = bits, U32, 1248, [4:4] +unusedBit_7_5 = bits, U32, 1248, [5:5] +unusedBit_7_6 = bits, U32, 1248, [6:6] +unusedBit_7_7 = bits, U32, 1248, [7:7] +unusedBit_7_8 = bits, U32, 1248, [8:8] +unusedBit_7_9 = bits, U32, 1248, [9:9] +unusedBit_7_10 = bits, U32, 1248, [10:10] +unusedBit_7_11 = bits, U32, 1248, [11:11] +unusedBit_7_12 = bits, U32, 1248, [12:12] +unusedBit_7_13 = bits, U32, 1248, [13:13] +unusedBit_7_14 = bits, U32, 1248, [14:14] +unusedBit_7_15 = bits, U32, 1248, [15:15] +unusedBit_7_16 = bits, U32, 1248, [16:16] +unusedBit_7_17 = bits, U32, 1248, [17:17] +unusedBit_7_18 = bits, U32, 1248, [18:18] +unusedBit_7_19 = bits, U32, 1248, [19:19] +unusedBit_7_20 = bits, U32, 1248, [20:20] +unusedBit_7_21 = bits, U32, 1248, [21:21] +unusedBit_7_22 = bits, U32, 1248, [22:22] +unusedBit_7_23 = bits, U32, 1248, [23:23] +unusedBit_7_24 = bits, U32, 1248, [24:24] +unusedBit_7_25 = bits, U32, 1248, [25:25] +unusedBit_7_26 = bits, U32, 1248, [26:26] +unusedBit_7_27 = bits, U32, 1248, [27:27] +unusedBit_7_28 = bits, U32, 1248, [28:28] +unusedBit_7_29 = bits, U32, 1248, [29:29] +unusedBit_7_30 = bits, U32, 1248, [30:30] +unusedBit_7_31 = bits, U32, 1248, [31:31] +; total TS size = 1252 +faultCode = scalar, U08, 1252, "", 1, 0 +heaterDuty = scalar, U08, 1253, "%", 1, 0 +pumpDuty = scalar, U08, 1254, "%", 1, 0 +tempC = scalar, U16, 1256, "C", 1, 0 +nernstVoltage = scalar, U16, 1258, "V", 0.001, 0 +esr = scalar, U16, 1260, "", 1, 0 +; total TS size = 1264 time = { timeNow } @@ -4993,6 +4994,7 @@ entry = mapVvt_MAP_AT_DIFF, "mapVvt_MAP_AT_DIFF", float, "%.3f" entry = mapVvt_MAP_AT_CYCLE_COUNT, "mapVvt_MAP_AT_CYCLE_COUNT", int, "%d" entry = mapVvt_map_peak, "mapVvt_map_peak", int, "%d" entry = currentEngineDecodedPhase, "Engine Phase", float, "%.3f" +entry = triggerToothAngleError, "triggerToothAngleError", float, "%.3f" entry = crankSynchronizationCounter, "Crank sync counter", int, "%d" entry = vvtSyncGapRatio, "vvtSyncGapRatio", float, "%.3f" entry = vvtCurrentPosition, "vvtCurrentPosition", float, "%.3f" @@ -5783,6 +5785,8 @@ dialog = trigger_centralDialog, "trigger_central" graphLine = mapVvt_MAP_AT_CYCLE_COUNT graphLine = mapVvt_map_peak graphLine = currentEngineDecodedPhase + liveGraph = trigger_central_4_Graph, "Graph", South + graphLine = triggerToothAngleError dialog = trigger_stateDialog, "trigger_state" diff --git a/firmware/tunerstudio/generated/rusefi_f407-discovery.ini b/firmware/tunerstudio/generated/rusefi_f407-discovery.ini index 8544ab3255..c1ad1308f0 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.09.24.f407-discovery.4136941473" + signature = "rusEFI 2022.09.24.f407-discovery.4059657144" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.09.24.f407-discovery.4136941473" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.09.24.f407-discovery.4059657144" ; 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 Fri Sep 23 23:16:37 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Sep 24 04:29:12 UTC 2022 pageSize = 22048 page = 1 @@ -2140,7 +2140,7 @@ ignBlends4_blendValues = array, U08, 22038, [8], "%", 0.5, 0, 0, 100, 1 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1260 + ochBlockSize = 1264 ; ; see TunerStudioOutputChannels struct @@ -3141,146 +3141,147 @@ mapVvt_MAP_AT_DIFF = scalar, F32, 1116, "", 1, 0 mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1120, "", 1, 0 mapVvt_map_peak = scalar, U08, 1121, "", 1, 0 currentEngineDecodedPhase = scalar, F32, 1124, "deg", 1, 0 -; total TS size = 1128 -crankSynchronizationCounter = scalar, U32, 1128, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1132, "", 1, 0 -vvtCurrentPosition = scalar, F32, 1136, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1140, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 1144, "", 1, 0 -triggerStateIndex = scalar, U08, 1148, "", 1, 0 -vvtCounter = scalar, U08, 1149, "", 1, 0 -camResyncCounter = scalar, U08, 1150, "", 1, 0 -vvtStateIndex = scalar, U08, 1151, "", 1, 0 -; total TS size = 1152 -m_hasSynchronizedPhase = bits, U32, 1152, [0:0] -unusedBit_1_1 = bits, U32, 1152, [1:1] -unusedBit_1_2 = bits, U32, 1152, [2:2] -unusedBit_1_3 = bits, U32, 1152, [3:3] -unusedBit_1_4 = bits, U32, 1152, [4:4] -unusedBit_1_5 = bits, U32, 1152, [5:5] -unusedBit_1_6 = bits, U32, 1152, [6:6] -unusedBit_1_7 = bits, U32, 1152, [7:7] -unusedBit_1_8 = bits, U32, 1152, [8:8] -unusedBit_1_9 = bits, U32, 1152, [9:9] -unusedBit_1_10 = bits, U32, 1152, [10:10] -unusedBit_1_11 = bits, U32, 1152, [11:11] -unusedBit_1_12 = bits, U32, 1152, [12:12] -unusedBit_1_13 = bits, U32, 1152, [13:13] -unusedBit_1_14 = bits, U32, 1152, [14:14] -unusedBit_1_15 = bits, U32, 1152, [15:15] -unusedBit_1_16 = bits, U32, 1152, [16:16] -unusedBit_1_17 = bits, U32, 1152, [17:17] -unusedBit_1_18 = bits, U32, 1152, [18:18] -unusedBit_1_19 = bits, U32, 1152, [19:19] -unusedBit_1_20 = bits, U32, 1152, [20:20] -unusedBit_1_21 = bits, U32, 1152, [21:21] -unusedBit_1_22 = bits, U32, 1152, [22:22] -unusedBit_1_23 = bits, U32, 1152, [23:23] -unusedBit_1_24 = bits, U32, 1152, [24:24] -unusedBit_1_25 = bits, U32, 1152, [25:25] -unusedBit_1_26 = bits, U32, 1152, [26:26] -unusedBit_1_27 = bits, U32, 1152, [27:27] -unusedBit_1_28 = bits, U32, 1152, [28:28] -unusedBit_1_29 = bits, U32, 1152, [29:29] -unusedBit_1_30 = bits, U32, 1152, [30:30] -unusedBit_1_31 = bits, U32, 1152, [31:31] +triggerToothAngleError = scalar, F32, 1128, "deg", 1, 0 +; total TS size = 1132 +crankSynchronizationCounter = scalar, U32, 1132, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1136, "", 1, 0 +vvtCurrentPosition = scalar, F32, 1140, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1144, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 1148, "", 1, 0 +triggerStateIndex = scalar, U08, 1152, "", 1, 0 +vvtCounter = scalar, U08, 1153, "", 1, 0 +camResyncCounter = scalar, U08, 1154, "", 1, 0 +vvtStateIndex = scalar, U08, 1155, "", 1, 0 ; total TS size = 1156 -wallFuelCorrection = scalar, F32, 1156, "", 1, 0 -wallFuel = scalar, F32, 1160, "", 1, 0 -; total TS size = 1164 -idleState = bits, S32, 1164, [0:2], "not important" -currentIdlePosition = scalar, F32, 1168 -baseIdlePosition = scalar, F32, 1172 -iacByTpsTaper = scalar, F32, 1176 -throttlePedalUpState = scalar, S32, 1180, "", 1, 0 -mightResetPid = bits, U32, 1184, [0:0] -shouldResetPid = bits, U32, 1184, [1:1] -wasResetPid = bits, U32, 1184, [2:2] -mustResetPid = bits, U32, 1184, [3:3] -isCranking = bits, U32, 1184, [4:4] -useIacTableForCoasting = bits, U32, 1184, [5:5] -notIdling = bits, U32, 1184, [6:6] -needReset = bits, U32, 1184, [7:7] -isInDeadZone = bits, U32, 1184, [8:8] -isBlipping = bits, U32, 1184, [9:9] -useClosedLoop = bits, U32, 1184, [10:10] -badTps = bits, U32, 1184, [11:11] -looksLikeRunning = bits, U32, 1184, [12:12] -looksLikeCoasting = bits, U32, 1184, [13:13] -looksLikeCrankToIdle = bits, U32, 1184, [14:14] -isVerboseIAC = bits, U32, 1184, [15:15] -isIdleCoasting = bits, U32, 1184, [16:16] -unusedBit_22_17 = bits, U32, 1184, [17:17] -unusedBit_22_18 = bits, U32, 1184, [18:18] -unusedBit_22_19 = bits, U32, 1184, [19:19] -unusedBit_22_20 = bits, U32, 1184, [20:20] -unusedBit_22_21 = bits, U32, 1184, [21:21] -unusedBit_22_22 = bits, U32, 1184, [22:22] -unusedBit_22_23 = bits, U32, 1184, [23:23] -unusedBit_22_24 = bits, U32, 1184, [24:24] -unusedBit_22_25 = bits, U32, 1184, [25:25] -unusedBit_22_26 = bits, U32, 1184, [26:26] -unusedBit_22_27 = bits, U32, 1184, [27:27] -unusedBit_22_28 = bits, U32, 1184, [28:28] -unusedBit_22_29 = bits, U32, 1184, [29:29] -unusedBit_22_30 = bits, U32, 1184, [30:30] -unusedBit_22_31 = bits, U32, 1184, [31:31] -targetRpmByClt = scalar, S32, 1188, "", 1, 0 -targetRpmAcBump = scalar, S32, 1192, "", 1, 0 -iacByRpmTaper = scalar, F32, 1196 -luaAdd = scalar, F32, 1200 -; total TS size = 1204 -baseDwell = scalar, F32, 1204, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 1208, "", 1, 0 -luaTimingAdd = scalar, F32, 1212, "", 1, 0 -luaTimingMult = scalar, F32, 1216, "", 1, 0 -; total TS size = 1220 -idlePosition = scalar, F32, 1220, "", 1, 0 -trim = scalar, F32, 1224, "", 1, 0 -luaAdjustment = scalar, F32, 1228, "", 1, 0 -etbFeedForward = scalar, F32, 1232 -etbIntegralError = scalar, F32, 1236, "", 1, 0 -etbCurrentTarget = scalar, F32, 1240, "%", 1, 0 -etbRevLimitActive = bits, U32, 1244, [0:0] -unusedBit_7_1 = bits, U32, 1244, [1:1] -unusedBit_7_2 = bits, U32, 1244, [2:2] -unusedBit_7_3 = bits, U32, 1244, [3:3] -unusedBit_7_4 = bits, U32, 1244, [4:4] -unusedBit_7_5 = bits, U32, 1244, [5:5] -unusedBit_7_6 = bits, U32, 1244, [6:6] -unusedBit_7_7 = bits, U32, 1244, [7:7] -unusedBit_7_8 = bits, U32, 1244, [8:8] -unusedBit_7_9 = bits, U32, 1244, [9:9] -unusedBit_7_10 = bits, U32, 1244, [10:10] -unusedBit_7_11 = bits, U32, 1244, [11:11] -unusedBit_7_12 = bits, U32, 1244, [12:12] -unusedBit_7_13 = bits, U32, 1244, [13:13] -unusedBit_7_14 = bits, U32, 1244, [14:14] -unusedBit_7_15 = bits, U32, 1244, [15:15] -unusedBit_7_16 = bits, U32, 1244, [16:16] -unusedBit_7_17 = bits, U32, 1244, [17:17] -unusedBit_7_18 = bits, U32, 1244, [18:18] -unusedBit_7_19 = bits, U32, 1244, [19:19] -unusedBit_7_20 = bits, U32, 1244, [20:20] -unusedBit_7_21 = bits, U32, 1244, [21:21] -unusedBit_7_22 = bits, U32, 1244, [22:22] -unusedBit_7_23 = bits, U32, 1244, [23:23] -unusedBit_7_24 = bits, U32, 1244, [24:24] -unusedBit_7_25 = bits, U32, 1244, [25:25] -unusedBit_7_26 = bits, U32, 1244, [26:26] -unusedBit_7_27 = bits, U32, 1244, [27:27] -unusedBit_7_28 = bits, U32, 1244, [28:28] -unusedBit_7_29 = bits, U32, 1244, [29:29] -unusedBit_7_30 = bits, U32, 1244, [30:30] -unusedBit_7_31 = bits, U32, 1244, [31:31] -; total TS size = 1248 -faultCode = scalar, U08, 1248, "", 1, 0 -heaterDuty = scalar, U08, 1249, "%", 1, 0 -pumpDuty = scalar, U08, 1250, "%", 1, 0 -tempC = scalar, U16, 1252, "C", 1, 0 -nernstVoltage = scalar, U16, 1254, "V", 0.001, 0 -esr = scalar, U16, 1256, "", 1, 0 -; total TS size = 1260 +m_hasSynchronizedPhase = bits, U32, 1156, [0:0] +unusedBit_1_1 = bits, U32, 1156, [1:1] +unusedBit_1_2 = bits, U32, 1156, [2:2] +unusedBit_1_3 = bits, U32, 1156, [3:3] +unusedBit_1_4 = bits, U32, 1156, [4:4] +unusedBit_1_5 = bits, U32, 1156, [5:5] +unusedBit_1_6 = bits, U32, 1156, [6:6] +unusedBit_1_7 = bits, U32, 1156, [7:7] +unusedBit_1_8 = bits, U32, 1156, [8:8] +unusedBit_1_9 = bits, U32, 1156, [9:9] +unusedBit_1_10 = bits, U32, 1156, [10:10] +unusedBit_1_11 = bits, U32, 1156, [11:11] +unusedBit_1_12 = bits, U32, 1156, [12:12] +unusedBit_1_13 = bits, U32, 1156, [13:13] +unusedBit_1_14 = bits, U32, 1156, [14:14] +unusedBit_1_15 = bits, U32, 1156, [15:15] +unusedBit_1_16 = bits, U32, 1156, [16:16] +unusedBit_1_17 = bits, U32, 1156, [17:17] +unusedBit_1_18 = bits, U32, 1156, [18:18] +unusedBit_1_19 = bits, U32, 1156, [19:19] +unusedBit_1_20 = bits, U32, 1156, [20:20] +unusedBit_1_21 = bits, U32, 1156, [21:21] +unusedBit_1_22 = bits, U32, 1156, [22:22] +unusedBit_1_23 = bits, U32, 1156, [23:23] +unusedBit_1_24 = bits, U32, 1156, [24:24] +unusedBit_1_25 = bits, U32, 1156, [25:25] +unusedBit_1_26 = bits, U32, 1156, [26:26] +unusedBit_1_27 = bits, U32, 1156, [27:27] +unusedBit_1_28 = bits, U32, 1156, [28:28] +unusedBit_1_29 = bits, U32, 1156, [29:29] +unusedBit_1_30 = bits, U32, 1156, [30:30] +unusedBit_1_31 = bits, U32, 1156, [31:31] +; total TS size = 1160 +wallFuelCorrection = scalar, F32, 1160, "", 1, 0 +wallFuel = scalar, F32, 1164, "", 1, 0 +; total TS size = 1168 +idleState = bits, S32, 1168, [0:2], "not important" +currentIdlePosition = scalar, F32, 1172 +baseIdlePosition = scalar, F32, 1176 +iacByTpsTaper = scalar, F32, 1180 +throttlePedalUpState = scalar, S32, 1184, "", 1, 0 +mightResetPid = bits, U32, 1188, [0:0] +shouldResetPid = bits, U32, 1188, [1:1] +wasResetPid = bits, U32, 1188, [2:2] +mustResetPid = bits, U32, 1188, [3:3] +isCranking = bits, U32, 1188, [4:4] +useIacTableForCoasting = bits, U32, 1188, [5:5] +notIdling = bits, U32, 1188, [6:6] +needReset = bits, U32, 1188, [7:7] +isInDeadZone = bits, U32, 1188, [8:8] +isBlipping = bits, U32, 1188, [9:9] +useClosedLoop = bits, U32, 1188, [10:10] +badTps = bits, U32, 1188, [11:11] +looksLikeRunning = bits, U32, 1188, [12:12] +looksLikeCoasting = bits, U32, 1188, [13:13] +looksLikeCrankToIdle = bits, U32, 1188, [14:14] +isVerboseIAC = bits, U32, 1188, [15:15] +isIdleCoasting = bits, U32, 1188, [16:16] +unusedBit_22_17 = bits, U32, 1188, [17:17] +unusedBit_22_18 = bits, U32, 1188, [18:18] +unusedBit_22_19 = bits, U32, 1188, [19:19] +unusedBit_22_20 = bits, U32, 1188, [20:20] +unusedBit_22_21 = bits, U32, 1188, [21:21] +unusedBit_22_22 = bits, U32, 1188, [22:22] +unusedBit_22_23 = bits, U32, 1188, [23:23] +unusedBit_22_24 = bits, U32, 1188, [24:24] +unusedBit_22_25 = bits, U32, 1188, [25:25] +unusedBit_22_26 = bits, U32, 1188, [26:26] +unusedBit_22_27 = bits, U32, 1188, [27:27] +unusedBit_22_28 = bits, U32, 1188, [28:28] +unusedBit_22_29 = bits, U32, 1188, [29:29] +unusedBit_22_30 = bits, U32, 1188, [30:30] +unusedBit_22_31 = bits, U32, 1188, [31:31] +targetRpmByClt = scalar, S32, 1192, "", 1, 0 +targetRpmAcBump = scalar, S32, 1196, "", 1, 0 +iacByRpmTaper = scalar, F32, 1200 +luaAdd = scalar, F32, 1204 +; total TS size = 1208 +baseDwell = scalar, F32, 1208, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 1212, "", 1, 0 +luaTimingAdd = scalar, F32, 1216, "", 1, 0 +luaTimingMult = scalar, F32, 1220, "", 1, 0 +; total TS size = 1224 +idlePosition = scalar, F32, 1224, "", 1, 0 +trim = scalar, F32, 1228, "", 1, 0 +luaAdjustment = scalar, F32, 1232, "", 1, 0 +etbFeedForward = scalar, F32, 1236 +etbIntegralError = scalar, F32, 1240, "", 1, 0 +etbCurrentTarget = scalar, F32, 1244, "%", 1, 0 +etbRevLimitActive = bits, U32, 1248, [0:0] +unusedBit_7_1 = bits, U32, 1248, [1:1] +unusedBit_7_2 = bits, U32, 1248, [2:2] +unusedBit_7_3 = bits, U32, 1248, [3:3] +unusedBit_7_4 = bits, U32, 1248, [4:4] +unusedBit_7_5 = bits, U32, 1248, [5:5] +unusedBit_7_6 = bits, U32, 1248, [6:6] +unusedBit_7_7 = bits, U32, 1248, [7:7] +unusedBit_7_8 = bits, U32, 1248, [8:8] +unusedBit_7_9 = bits, U32, 1248, [9:9] +unusedBit_7_10 = bits, U32, 1248, [10:10] +unusedBit_7_11 = bits, U32, 1248, [11:11] +unusedBit_7_12 = bits, U32, 1248, [12:12] +unusedBit_7_13 = bits, U32, 1248, [13:13] +unusedBit_7_14 = bits, U32, 1248, [14:14] +unusedBit_7_15 = bits, U32, 1248, [15:15] +unusedBit_7_16 = bits, U32, 1248, [16:16] +unusedBit_7_17 = bits, U32, 1248, [17:17] +unusedBit_7_18 = bits, U32, 1248, [18:18] +unusedBit_7_19 = bits, U32, 1248, [19:19] +unusedBit_7_20 = bits, U32, 1248, [20:20] +unusedBit_7_21 = bits, U32, 1248, [21:21] +unusedBit_7_22 = bits, U32, 1248, [22:22] +unusedBit_7_23 = bits, U32, 1248, [23:23] +unusedBit_7_24 = bits, U32, 1248, [24:24] +unusedBit_7_25 = bits, U32, 1248, [25:25] +unusedBit_7_26 = bits, U32, 1248, [26:26] +unusedBit_7_27 = bits, U32, 1248, [27:27] +unusedBit_7_28 = bits, U32, 1248, [28:28] +unusedBit_7_29 = bits, U32, 1248, [29:29] +unusedBit_7_30 = bits, U32, 1248, [30:30] +unusedBit_7_31 = bits, U32, 1248, [31:31] +; total TS size = 1252 +faultCode = scalar, U08, 1252, "", 1, 0 +heaterDuty = scalar, U08, 1253, "%", 1, 0 +pumpDuty = scalar, U08, 1254, "%", 1, 0 +tempC = scalar, U16, 1256, "C", 1, 0 +nernstVoltage = scalar, U16, 1258, "V", 0.001, 0 +esr = scalar, U16, 1260, "", 1, 0 +; total TS size = 1264 time = { timeNow } @@ -4993,6 +4994,7 @@ entry = mapVvt_MAP_AT_DIFF, "mapVvt_MAP_AT_DIFF", float, "%.3f" entry = mapVvt_MAP_AT_CYCLE_COUNT, "mapVvt_MAP_AT_CYCLE_COUNT", int, "%d" entry = mapVvt_map_peak, "mapVvt_map_peak", int, "%d" entry = currentEngineDecodedPhase, "Engine Phase", float, "%.3f" +entry = triggerToothAngleError, "triggerToothAngleError", float, "%.3f" entry = crankSynchronizationCounter, "Crank sync counter", int, "%d" entry = vvtSyncGapRatio, "vvtSyncGapRatio", float, "%.3f" entry = vvtCurrentPosition, "vvtCurrentPosition", float, "%.3f" @@ -5783,6 +5785,8 @@ dialog = trigger_centralDialog, "trigger_central" graphLine = mapVvt_MAP_AT_CYCLE_COUNT graphLine = mapVvt_map_peak graphLine = currentEngineDecodedPhase + liveGraph = trigger_central_4_Graph, "Graph", South + graphLine = triggerToothAngleError dialog = trigger_stateDialog, "trigger_state" diff --git a/firmware/tunerstudio/generated/rusefi_f429-discovery.ini b/firmware/tunerstudio/generated/rusefi_f429-discovery.ini index 5e8524c1c1..e49d24674a 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.09.24.f429-discovery.4136941473" + signature = "rusEFI 2022.09.24.f429-discovery.4059657144" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.09.24.f429-discovery.4136941473" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.09.24.f429-discovery.4059657144" ; 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 Fri Sep 23 23:16:39 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Sep 24 04:29:14 UTC 2022 pageSize = 22048 page = 1 @@ -2140,7 +2140,7 @@ ignBlends4_blendValues = array, U08, 22038, [8], "%", 0.5, 0, 0, 100, 1 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1260 + ochBlockSize = 1264 ; ; see TunerStudioOutputChannels struct @@ -3141,146 +3141,147 @@ mapVvt_MAP_AT_DIFF = scalar, F32, 1116, "", 1, 0 mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1120, "", 1, 0 mapVvt_map_peak = scalar, U08, 1121, "", 1, 0 currentEngineDecodedPhase = scalar, F32, 1124, "deg", 1, 0 -; total TS size = 1128 -crankSynchronizationCounter = scalar, U32, 1128, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1132, "", 1, 0 -vvtCurrentPosition = scalar, F32, 1136, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1140, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 1144, "", 1, 0 -triggerStateIndex = scalar, U08, 1148, "", 1, 0 -vvtCounter = scalar, U08, 1149, "", 1, 0 -camResyncCounter = scalar, U08, 1150, "", 1, 0 -vvtStateIndex = scalar, U08, 1151, "", 1, 0 -; total TS size = 1152 -m_hasSynchronizedPhase = bits, U32, 1152, [0:0] -unusedBit_1_1 = bits, U32, 1152, [1:1] -unusedBit_1_2 = bits, U32, 1152, [2:2] -unusedBit_1_3 = bits, U32, 1152, [3:3] -unusedBit_1_4 = bits, U32, 1152, [4:4] -unusedBit_1_5 = bits, U32, 1152, [5:5] -unusedBit_1_6 = bits, U32, 1152, [6:6] -unusedBit_1_7 = bits, U32, 1152, [7:7] -unusedBit_1_8 = bits, U32, 1152, [8:8] -unusedBit_1_9 = bits, U32, 1152, [9:9] -unusedBit_1_10 = bits, U32, 1152, [10:10] -unusedBit_1_11 = bits, U32, 1152, [11:11] -unusedBit_1_12 = bits, U32, 1152, [12:12] -unusedBit_1_13 = bits, U32, 1152, [13:13] -unusedBit_1_14 = bits, U32, 1152, [14:14] -unusedBit_1_15 = bits, U32, 1152, [15:15] -unusedBit_1_16 = bits, U32, 1152, [16:16] -unusedBit_1_17 = bits, U32, 1152, [17:17] -unusedBit_1_18 = bits, U32, 1152, [18:18] -unusedBit_1_19 = bits, U32, 1152, [19:19] -unusedBit_1_20 = bits, U32, 1152, [20:20] -unusedBit_1_21 = bits, U32, 1152, [21:21] -unusedBit_1_22 = bits, U32, 1152, [22:22] -unusedBit_1_23 = bits, U32, 1152, [23:23] -unusedBit_1_24 = bits, U32, 1152, [24:24] -unusedBit_1_25 = bits, U32, 1152, [25:25] -unusedBit_1_26 = bits, U32, 1152, [26:26] -unusedBit_1_27 = bits, U32, 1152, [27:27] -unusedBit_1_28 = bits, U32, 1152, [28:28] -unusedBit_1_29 = bits, U32, 1152, [29:29] -unusedBit_1_30 = bits, U32, 1152, [30:30] -unusedBit_1_31 = bits, U32, 1152, [31:31] +triggerToothAngleError = scalar, F32, 1128, "deg", 1, 0 +; total TS size = 1132 +crankSynchronizationCounter = scalar, U32, 1132, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1136, "", 1, 0 +vvtCurrentPosition = scalar, F32, 1140, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1144, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 1148, "", 1, 0 +triggerStateIndex = scalar, U08, 1152, "", 1, 0 +vvtCounter = scalar, U08, 1153, "", 1, 0 +camResyncCounter = scalar, U08, 1154, "", 1, 0 +vvtStateIndex = scalar, U08, 1155, "", 1, 0 ; total TS size = 1156 -wallFuelCorrection = scalar, F32, 1156, "", 1, 0 -wallFuel = scalar, F32, 1160, "", 1, 0 -; total TS size = 1164 -idleState = bits, S32, 1164, [0:2], "not important" -currentIdlePosition = scalar, F32, 1168 -baseIdlePosition = scalar, F32, 1172 -iacByTpsTaper = scalar, F32, 1176 -throttlePedalUpState = scalar, S32, 1180, "", 1, 0 -mightResetPid = bits, U32, 1184, [0:0] -shouldResetPid = bits, U32, 1184, [1:1] -wasResetPid = bits, U32, 1184, [2:2] -mustResetPid = bits, U32, 1184, [3:3] -isCranking = bits, U32, 1184, [4:4] -useIacTableForCoasting = bits, U32, 1184, [5:5] -notIdling = bits, U32, 1184, [6:6] -needReset = bits, U32, 1184, [7:7] -isInDeadZone = bits, U32, 1184, [8:8] -isBlipping = bits, U32, 1184, [9:9] -useClosedLoop = bits, U32, 1184, [10:10] -badTps = bits, U32, 1184, [11:11] -looksLikeRunning = bits, U32, 1184, [12:12] -looksLikeCoasting = bits, U32, 1184, [13:13] -looksLikeCrankToIdle = bits, U32, 1184, [14:14] -isVerboseIAC = bits, U32, 1184, [15:15] -isIdleCoasting = bits, U32, 1184, [16:16] -unusedBit_22_17 = bits, U32, 1184, [17:17] -unusedBit_22_18 = bits, U32, 1184, [18:18] -unusedBit_22_19 = bits, U32, 1184, [19:19] -unusedBit_22_20 = bits, U32, 1184, [20:20] -unusedBit_22_21 = bits, U32, 1184, [21:21] -unusedBit_22_22 = bits, U32, 1184, [22:22] -unusedBit_22_23 = bits, U32, 1184, [23:23] -unusedBit_22_24 = bits, U32, 1184, [24:24] -unusedBit_22_25 = bits, U32, 1184, [25:25] -unusedBit_22_26 = bits, U32, 1184, [26:26] -unusedBit_22_27 = bits, U32, 1184, [27:27] -unusedBit_22_28 = bits, U32, 1184, [28:28] -unusedBit_22_29 = bits, U32, 1184, [29:29] -unusedBit_22_30 = bits, U32, 1184, [30:30] -unusedBit_22_31 = bits, U32, 1184, [31:31] -targetRpmByClt = scalar, S32, 1188, "", 1, 0 -targetRpmAcBump = scalar, S32, 1192, "", 1, 0 -iacByRpmTaper = scalar, F32, 1196 -luaAdd = scalar, F32, 1200 -; total TS size = 1204 -baseDwell = scalar, F32, 1204, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 1208, "", 1, 0 -luaTimingAdd = scalar, F32, 1212, "", 1, 0 -luaTimingMult = scalar, F32, 1216, "", 1, 0 -; total TS size = 1220 -idlePosition = scalar, F32, 1220, "", 1, 0 -trim = scalar, F32, 1224, "", 1, 0 -luaAdjustment = scalar, F32, 1228, "", 1, 0 -etbFeedForward = scalar, F32, 1232 -etbIntegralError = scalar, F32, 1236, "", 1, 0 -etbCurrentTarget = scalar, F32, 1240, "%", 1, 0 -etbRevLimitActive = bits, U32, 1244, [0:0] -unusedBit_7_1 = bits, U32, 1244, [1:1] -unusedBit_7_2 = bits, U32, 1244, [2:2] -unusedBit_7_3 = bits, U32, 1244, [3:3] -unusedBit_7_4 = bits, U32, 1244, [4:4] -unusedBit_7_5 = bits, U32, 1244, [5:5] -unusedBit_7_6 = bits, U32, 1244, [6:6] -unusedBit_7_7 = bits, U32, 1244, [7:7] -unusedBit_7_8 = bits, U32, 1244, [8:8] -unusedBit_7_9 = bits, U32, 1244, [9:9] -unusedBit_7_10 = bits, U32, 1244, [10:10] -unusedBit_7_11 = bits, U32, 1244, [11:11] -unusedBit_7_12 = bits, U32, 1244, [12:12] -unusedBit_7_13 = bits, U32, 1244, [13:13] -unusedBit_7_14 = bits, U32, 1244, [14:14] -unusedBit_7_15 = bits, U32, 1244, [15:15] -unusedBit_7_16 = bits, U32, 1244, [16:16] -unusedBit_7_17 = bits, U32, 1244, [17:17] -unusedBit_7_18 = bits, U32, 1244, [18:18] -unusedBit_7_19 = bits, U32, 1244, [19:19] -unusedBit_7_20 = bits, U32, 1244, [20:20] -unusedBit_7_21 = bits, U32, 1244, [21:21] -unusedBit_7_22 = bits, U32, 1244, [22:22] -unusedBit_7_23 = bits, U32, 1244, [23:23] -unusedBit_7_24 = bits, U32, 1244, [24:24] -unusedBit_7_25 = bits, U32, 1244, [25:25] -unusedBit_7_26 = bits, U32, 1244, [26:26] -unusedBit_7_27 = bits, U32, 1244, [27:27] -unusedBit_7_28 = bits, U32, 1244, [28:28] -unusedBit_7_29 = bits, U32, 1244, [29:29] -unusedBit_7_30 = bits, U32, 1244, [30:30] -unusedBit_7_31 = bits, U32, 1244, [31:31] -; total TS size = 1248 -faultCode = scalar, U08, 1248, "", 1, 0 -heaterDuty = scalar, U08, 1249, "%", 1, 0 -pumpDuty = scalar, U08, 1250, "%", 1, 0 -tempC = scalar, U16, 1252, "C", 1, 0 -nernstVoltage = scalar, U16, 1254, "V", 0.001, 0 -esr = scalar, U16, 1256, "", 1, 0 -; total TS size = 1260 +m_hasSynchronizedPhase = bits, U32, 1156, [0:0] +unusedBit_1_1 = bits, U32, 1156, [1:1] +unusedBit_1_2 = bits, U32, 1156, [2:2] +unusedBit_1_3 = bits, U32, 1156, [3:3] +unusedBit_1_4 = bits, U32, 1156, [4:4] +unusedBit_1_5 = bits, U32, 1156, [5:5] +unusedBit_1_6 = bits, U32, 1156, [6:6] +unusedBit_1_7 = bits, U32, 1156, [7:7] +unusedBit_1_8 = bits, U32, 1156, [8:8] +unusedBit_1_9 = bits, U32, 1156, [9:9] +unusedBit_1_10 = bits, U32, 1156, [10:10] +unusedBit_1_11 = bits, U32, 1156, [11:11] +unusedBit_1_12 = bits, U32, 1156, [12:12] +unusedBit_1_13 = bits, U32, 1156, [13:13] +unusedBit_1_14 = bits, U32, 1156, [14:14] +unusedBit_1_15 = bits, U32, 1156, [15:15] +unusedBit_1_16 = bits, U32, 1156, [16:16] +unusedBit_1_17 = bits, U32, 1156, [17:17] +unusedBit_1_18 = bits, U32, 1156, [18:18] +unusedBit_1_19 = bits, U32, 1156, [19:19] +unusedBit_1_20 = bits, U32, 1156, [20:20] +unusedBit_1_21 = bits, U32, 1156, [21:21] +unusedBit_1_22 = bits, U32, 1156, [22:22] +unusedBit_1_23 = bits, U32, 1156, [23:23] +unusedBit_1_24 = bits, U32, 1156, [24:24] +unusedBit_1_25 = bits, U32, 1156, [25:25] +unusedBit_1_26 = bits, U32, 1156, [26:26] +unusedBit_1_27 = bits, U32, 1156, [27:27] +unusedBit_1_28 = bits, U32, 1156, [28:28] +unusedBit_1_29 = bits, U32, 1156, [29:29] +unusedBit_1_30 = bits, U32, 1156, [30:30] +unusedBit_1_31 = bits, U32, 1156, [31:31] +; total TS size = 1160 +wallFuelCorrection = scalar, F32, 1160, "", 1, 0 +wallFuel = scalar, F32, 1164, "", 1, 0 +; total TS size = 1168 +idleState = bits, S32, 1168, [0:2], "not important" +currentIdlePosition = scalar, F32, 1172 +baseIdlePosition = scalar, F32, 1176 +iacByTpsTaper = scalar, F32, 1180 +throttlePedalUpState = scalar, S32, 1184, "", 1, 0 +mightResetPid = bits, U32, 1188, [0:0] +shouldResetPid = bits, U32, 1188, [1:1] +wasResetPid = bits, U32, 1188, [2:2] +mustResetPid = bits, U32, 1188, [3:3] +isCranking = bits, U32, 1188, [4:4] +useIacTableForCoasting = bits, U32, 1188, [5:5] +notIdling = bits, U32, 1188, [6:6] +needReset = bits, U32, 1188, [7:7] +isInDeadZone = bits, U32, 1188, [8:8] +isBlipping = bits, U32, 1188, [9:9] +useClosedLoop = bits, U32, 1188, [10:10] +badTps = bits, U32, 1188, [11:11] +looksLikeRunning = bits, U32, 1188, [12:12] +looksLikeCoasting = bits, U32, 1188, [13:13] +looksLikeCrankToIdle = bits, U32, 1188, [14:14] +isVerboseIAC = bits, U32, 1188, [15:15] +isIdleCoasting = bits, U32, 1188, [16:16] +unusedBit_22_17 = bits, U32, 1188, [17:17] +unusedBit_22_18 = bits, U32, 1188, [18:18] +unusedBit_22_19 = bits, U32, 1188, [19:19] +unusedBit_22_20 = bits, U32, 1188, [20:20] +unusedBit_22_21 = bits, U32, 1188, [21:21] +unusedBit_22_22 = bits, U32, 1188, [22:22] +unusedBit_22_23 = bits, U32, 1188, [23:23] +unusedBit_22_24 = bits, U32, 1188, [24:24] +unusedBit_22_25 = bits, U32, 1188, [25:25] +unusedBit_22_26 = bits, U32, 1188, [26:26] +unusedBit_22_27 = bits, U32, 1188, [27:27] +unusedBit_22_28 = bits, U32, 1188, [28:28] +unusedBit_22_29 = bits, U32, 1188, [29:29] +unusedBit_22_30 = bits, U32, 1188, [30:30] +unusedBit_22_31 = bits, U32, 1188, [31:31] +targetRpmByClt = scalar, S32, 1192, "", 1, 0 +targetRpmAcBump = scalar, S32, 1196, "", 1, 0 +iacByRpmTaper = scalar, F32, 1200 +luaAdd = scalar, F32, 1204 +; total TS size = 1208 +baseDwell = scalar, F32, 1208, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 1212, "", 1, 0 +luaTimingAdd = scalar, F32, 1216, "", 1, 0 +luaTimingMult = scalar, F32, 1220, "", 1, 0 +; total TS size = 1224 +idlePosition = scalar, F32, 1224, "", 1, 0 +trim = scalar, F32, 1228, "", 1, 0 +luaAdjustment = scalar, F32, 1232, "", 1, 0 +etbFeedForward = scalar, F32, 1236 +etbIntegralError = scalar, F32, 1240, "", 1, 0 +etbCurrentTarget = scalar, F32, 1244, "%", 1, 0 +etbRevLimitActive = bits, U32, 1248, [0:0] +unusedBit_7_1 = bits, U32, 1248, [1:1] +unusedBit_7_2 = bits, U32, 1248, [2:2] +unusedBit_7_3 = bits, U32, 1248, [3:3] +unusedBit_7_4 = bits, U32, 1248, [4:4] +unusedBit_7_5 = bits, U32, 1248, [5:5] +unusedBit_7_6 = bits, U32, 1248, [6:6] +unusedBit_7_7 = bits, U32, 1248, [7:7] +unusedBit_7_8 = bits, U32, 1248, [8:8] +unusedBit_7_9 = bits, U32, 1248, [9:9] +unusedBit_7_10 = bits, U32, 1248, [10:10] +unusedBit_7_11 = bits, U32, 1248, [11:11] +unusedBit_7_12 = bits, U32, 1248, [12:12] +unusedBit_7_13 = bits, U32, 1248, [13:13] +unusedBit_7_14 = bits, U32, 1248, [14:14] +unusedBit_7_15 = bits, U32, 1248, [15:15] +unusedBit_7_16 = bits, U32, 1248, [16:16] +unusedBit_7_17 = bits, U32, 1248, [17:17] +unusedBit_7_18 = bits, U32, 1248, [18:18] +unusedBit_7_19 = bits, U32, 1248, [19:19] +unusedBit_7_20 = bits, U32, 1248, [20:20] +unusedBit_7_21 = bits, U32, 1248, [21:21] +unusedBit_7_22 = bits, U32, 1248, [22:22] +unusedBit_7_23 = bits, U32, 1248, [23:23] +unusedBit_7_24 = bits, U32, 1248, [24:24] +unusedBit_7_25 = bits, U32, 1248, [25:25] +unusedBit_7_26 = bits, U32, 1248, [26:26] +unusedBit_7_27 = bits, U32, 1248, [27:27] +unusedBit_7_28 = bits, U32, 1248, [28:28] +unusedBit_7_29 = bits, U32, 1248, [29:29] +unusedBit_7_30 = bits, U32, 1248, [30:30] +unusedBit_7_31 = bits, U32, 1248, [31:31] +; total TS size = 1252 +faultCode = scalar, U08, 1252, "", 1, 0 +heaterDuty = scalar, U08, 1253, "%", 1, 0 +pumpDuty = scalar, U08, 1254, "%", 1, 0 +tempC = scalar, U16, 1256, "C", 1, 0 +nernstVoltage = scalar, U16, 1258, "V", 0.001, 0 +esr = scalar, U16, 1260, "", 1, 0 +; total TS size = 1264 time = { timeNow } @@ -4993,6 +4994,7 @@ entry = mapVvt_MAP_AT_DIFF, "mapVvt_MAP_AT_DIFF", float, "%.3f" entry = mapVvt_MAP_AT_CYCLE_COUNT, "mapVvt_MAP_AT_CYCLE_COUNT", int, "%d" entry = mapVvt_map_peak, "mapVvt_map_peak", int, "%d" entry = currentEngineDecodedPhase, "Engine Phase", float, "%.3f" +entry = triggerToothAngleError, "triggerToothAngleError", float, "%.3f" entry = crankSynchronizationCounter, "Crank sync counter", int, "%d" entry = vvtSyncGapRatio, "vvtSyncGapRatio", float, "%.3f" entry = vvtCurrentPosition, "vvtCurrentPosition", float, "%.3f" @@ -5783,6 +5785,8 @@ dialog = trigger_centralDialog, "trigger_central" graphLine = mapVvt_MAP_AT_CYCLE_COUNT graphLine = mapVvt_map_peak graphLine = currentEngineDecodedPhase + liveGraph = trigger_central_4_Graph, "Graph", South + graphLine = triggerToothAngleError dialog = trigger_stateDialog, "trigger_state" diff --git a/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini b/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini index e2d2f86533..bdd1d76265 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.09.24.frankenso_na6.3036171109" + signature = "rusEFI 2022.09.24.frankenso_na6.3012923260" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.09.24.frankenso_na6.3036171109" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.09.24.frankenso_na6.3012923260" ; 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 Fri Sep 23 23:16:26 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Sep 24 04:29:01 UTC 2022 pageSize = 22048 page = 1 @@ -2140,7 +2140,7 @@ ignBlends4_blendValues = array, U08, 22038, [8], "%", 0.5, 0, 0, 100, 1 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1260 + ochBlockSize = 1264 ; ; see TunerStudioOutputChannels struct @@ -3141,146 +3141,147 @@ mapVvt_MAP_AT_DIFF = scalar, F32, 1116, "", 1, 0 mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1120, "", 1, 0 mapVvt_map_peak = scalar, U08, 1121, "", 1, 0 currentEngineDecodedPhase = scalar, F32, 1124, "deg", 1, 0 -; total TS size = 1128 -crankSynchronizationCounter = scalar, U32, 1128, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1132, "", 1, 0 -vvtCurrentPosition = scalar, F32, 1136, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1140, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 1144, "", 1, 0 -triggerStateIndex = scalar, U08, 1148, "", 1, 0 -vvtCounter = scalar, U08, 1149, "", 1, 0 -camResyncCounter = scalar, U08, 1150, "", 1, 0 -vvtStateIndex = scalar, U08, 1151, "", 1, 0 -; total TS size = 1152 -m_hasSynchronizedPhase = bits, U32, 1152, [0:0] -unusedBit_1_1 = bits, U32, 1152, [1:1] -unusedBit_1_2 = bits, U32, 1152, [2:2] -unusedBit_1_3 = bits, U32, 1152, [3:3] -unusedBit_1_4 = bits, U32, 1152, [4:4] -unusedBit_1_5 = bits, U32, 1152, [5:5] -unusedBit_1_6 = bits, U32, 1152, [6:6] -unusedBit_1_7 = bits, U32, 1152, [7:7] -unusedBit_1_8 = bits, U32, 1152, [8:8] -unusedBit_1_9 = bits, U32, 1152, [9:9] -unusedBit_1_10 = bits, U32, 1152, [10:10] -unusedBit_1_11 = bits, U32, 1152, [11:11] -unusedBit_1_12 = bits, U32, 1152, [12:12] -unusedBit_1_13 = bits, U32, 1152, [13:13] -unusedBit_1_14 = bits, U32, 1152, [14:14] -unusedBit_1_15 = bits, U32, 1152, [15:15] -unusedBit_1_16 = bits, U32, 1152, [16:16] -unusedBit_1_17 = bits, U32, 1152, [17:17] -unusedBit_1_18 = bits, U32, 1152, [18:18] -unusedBit_1_19 = bits, U32, 1152, [19:19] -unusedBit_1_20 = bits, U32, 1152, [20:20] -unusedBit_1_21 = bits, U32, 1152, [21:21] -unusedBit_1_22 = bits, U32, 1152, [22:22] -unusedBit_1_23 = bits, U32, 1152, [23:23] -unusedBit_1_24 = bits, U32, 1152, [24:24] -unusedBit_1_25 = bits, U32, 1152, [25:25] -unusedBit_1_26 = bits, U32, 1152, [26:26] -unusedBit_1_27 = bits, U32, 1152, [27:27] -unusedBit_1_28 = bits, U32, 1152, [28:28] -unusedBit_1_29 = bits, U32, 1152, [29:29] -unusedBit_1_30 = bits, U32, 1152, [30:30] -unusedBit_1_31 = bits, U32, 1152, [31:31] +triggerToothAngleError = scalar, F32, 1128, "deg", 1, 0 +; total TS size = 1132 +crankSynchronizationCounter = scalar, U32, 1132, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1136, "", 1, 0 +vvtCurrentPosition = scalar, F32, 1140, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1144, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 1148, "", 1, 0 +triggerStateIndex = scalar, U08, 1152, "", 1, 0 +vvtCounter = scalar, U08, 1153, "", 1, 0 +camResyncCounter = scalar, U08, 1154, "", 1, 0 +vvtStateIndex = scalar, U08, 1155, "", 1, 0 ; total TS size = 1156 -wallFuelCorrection = scalar, F32, 1156, "", 1, 0 -wallFuel = scalar, F32, 1160, "", 1, 0 -; total TS size = 1164 -idleState = bits, S32, 1164, [0:2], "not important" -currentIdlePosition = scalar, F32, 1168 -baseIdlePosition = scalar, F32, 1172 -iacByTpsTaper = scalar, F32, 1176 -throttlePedalUpState = scalar, S32, 1180, "", 1, 0 -mightResetPid = bits, U32, 1184, [0:0] -shouldResetPid = bits, U32, 1184, [1:1] -wasResetPid = bits, U32, 1184, [2:2] -mustResetPid = bits, U32, 1184, [3:3] -isCranking = bits, U32, 1184, [4:4] -useIacTableForCoasting = bits, U32, 1184, [5:5] -notIdling = bits, U32, 1184, [6:6] -needReset = bits, U32, 1184, [7:7] -isInDeadZone = bits, U32, 1184, [8:8] -isBlipping = bits, U32, 1184, [9:9] -useClosedLoop = bits, U32, 1184, [10:10] -badTps = bits, U32, 1184, [11:11] -looksLikeRunning = bits, U32, 1184, [12:12] -looksLikeCoasting = bits, U32, 1184, [13:13] -looksLikeCrankToIdle = bits, U32, 1184, [14:14] -isVerboseIAC = bits, U32, 1184, [15:15] -isIdleCoasting = bits, U32, 1184, [16:16] -unusedBit_22_17 = bits, U32, 1184, [17:17] -unusedBit_22_18 = bits, U32, 1184, [18:18] -unusedBit_22_19 = bits, U32, 1184, [19:19] -unusedBit_22_20 = bits, U32, 1184, [20:20] -unusedBit_22_21 = bits, U32, 1184, [21:21] -unusedBit_22_22 = bits, U32, 1184, [22:22] -unusedBit_22_23 = bits, U32, 1184, [23:23] -unusedBit_22_24 = bits, U32, 1184, [24:24] -unusedBit_22_25 = bits, U32, 1184, [25:25] -unusedBit_22_26 = bits, U32, 1184, [26:26] -unusedBit_22_27 = bits, U32, 1184, [27:27] -unusedBit_22_28 = bits, U32, 1184, [28:28] -unusedBit_22_29 = bits, U32, 1184, [29:29] -unusedBit_22_30 = bits, U32, 1184, [30:30] -unusedBit_22_31 = bits, U32, 1184, [31:31] -targetRpmByClt = scalar, S32, 1188, "", 1, 0 -targetRpmAcBump = scalar, S32, 1192, "", 1, 0 -iacByRpmTaper = scalar, F32, 1196 -luaAdd = scalar, F32, 1200 -; total TS size = 1204 -baseDwell = scalar, F32, 1204, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 1208, "", 1, 0 -luaTimingAdd = scalar, F32, 1212, "", 1, 0 -luaTimingMult = scalar, F32, 1216, "", 1, 0 -; total TS size = 1220 -idlePosition = scalar, F32, 1220, "", 1, 0 -trim = scalar, F32, 1224, "", 1, 0 -luaAdjustment = scalar, F32, 1228, "", 1, 0 -etbFeedForward = scalar, F32, 1232 -etbIntegralError = scalar, F32, 1236, "", 1, 0 -etbCurrentTarget = scalar, F32, 1240, "%", 1, 0 -etbRevLimitActive = bits, U32, 1244, [0:0] -unusedBit_7_1 = bits, U32, 1244, [1:1] -unusedBit_7_2 = bits, U32, 1244, [2:2] -unusedBit_7_3 = bits, U32, 1244, [3:3] -unusedBit_7_4 = bits, U32, 1244, [4:4] -unusedBit_7_5 = bits, U32, 1244, [5:5] -unusedBit_7_6 = bits, U32, 1244, [6:6] -unusedBit_7_7 = bits, U32, 1244, [7:7] -unusedBit_7_8 = bits, U32, 1244, [8:8] -unusedBit_7_9 = bits, U32, 1244, [9:9] -unusedBit_7_10 = bits, U32, 1244, [10:10] -unusedBit_7_11 = bits, U32, 1244, [11:11] -unusedBit_7_12 = bits, U32, 1244, [12:12] -unusedBit_7_13 = bits, U32, 1244, [13:13] -unusedBit_7_14 = bits, U32, 1244, [14:14] -unusedBit_7_15 = bits, U32, 1244, [15:15] -unusedBit_7_16 = bits, U32, 1244, [16:16] -unusedBit_7_17 = bits, U32, 1244, [17:17] -unusedBit_7_18 = bits, U32, 1244, [18:18] -unusedBit_7_19 = bits, U32, 1244, [19:19] -unusedBit_7_20 = bits, U32, 1244, [20:20] -unusedBit_7_21 = bits, U32, 1244, [21:21] -unusedBit_7_22 = bits, U32, 1244, [22:22] -unusedBit_7_23 = bits, U32, 1244, [23:23] -unusedBit_7_24 = bits, U32, 1244, [24:24] -unusedBit_7_25 = bits, U32, 1244, [25:25] -unusedBit_7_26 = bits, U32, 1244, [26:26] -unusedBit_7_27 = bits, U32, 1244, [27:27] -unusedBit_7_28 = bits, U32, 1244, [28:28] -unusedBit_7_29 = bits, U32, 1244, [29:29] -unusedBit_7_30 = bits, U32, 1244, [30:30] -unusedBit_7_31 = bits, U32, 1244, [31:31] -; total TS size = 1248 -faultCode = scalar, U08, 1248, "", 1, 0 -heaterDuty = scalar, U08, 1249, "%", 1, 0 -pumpDuty = scalar, U08, 1250, "%", 1, 0 -tempC = scalar, U16, 1252, "C", 1, 0 -nernstVoltage = scalar, U16, 1254, "V", 0.001, 0 -esr = scalar, U16, 1256, "", 1, 0 -; total TS size = 1260 +m_hasSynchronizedPhase = bits, U32, 1156, [0:0] +unusedBit_1_1 = bits, U32, 1156, [1:1] +unusedBit_1_2 = bits, U32, 1156, [2:2] +unusedBit_1_3 = bits, U32, 1156, [3:3] +unusedBit_1_4 = bits, U32, 1156, [4:4] +unusedBit_1_5 = bits, U32, 1156, [5:5] +unusedBit_1_6 = bits, U32, 1156, [6:6] +unusedBit_1_7 = bits, U32, 1156, [7:7] +unusedBit_1_8 = bits, U32, 1156, [8:8] +unusedBit_1_9 = bits, U32, 1156, [9:9] +unusedBit_1_10 = bits, U32, 1156, [10:10] +unusedBit_1_11 = bits, U32, 1156, [11:11] +unusedBit_1_12 = bits, U32, 1156, [12:12] +unusedBit_1_13 = bits, U32, 1156, [13:13] +unusedBit_1_14 = bits, U32, 1156, [14:14] +unusedBit_1_15 = bits, U32, 1156, [15:15] +unusedBit_1_16 = bits, U32, 1156, [16:16] +unusedBit_1_17 = bits, U32, 1156, [17:17] +unusedBit_1_18 = bits, U32, 1156, [18:18] +unusedBit_1_19 = bits, U32, 1156, [19:19] +unusedBit_1_20 = bits, U32, 1156, [20:20] +unusedBit_1_21 = bits, U32, 1156, [21:21] +unusedBit_1_22 = bits, U32, 1156, [22:22] +unusedBit_1_23 = bits, U32, 1156, [23:23] +unusedBit_1_24 = bits, U32, 1156, [24:24] +unusedBit_1_25 = bits, U32, 1156, [25:25] +unusedBit_1_26 = bits, U32, 1156, [26:26] +unusedBit_1_27 = bits, U32, 1156, [27:27] +unusedBit_1_28 = bits, U32, 1156, [28:28] +unusedBit_1_29 = bits, U32, 1156, [29:29] +unusedBit_1_30 = bits, U32, 1156, [30:30] +unusedBit_1_31 = bits, U32, 1156, [31:31] +; total TS size = 1160 +wallFuelCorrection = scalar, F32, 1160, "", 1, 0 +wallFuel = scalar, F32, 1164, "", 1, 0 +; total TS size = 1168 +idleState = bits, S32, 1168, [0:2], "not important" +currentIdlePosition = scalar, F32, 1172 +baseIdlePosition = scalar, F32, 1176 +iacByTpsTaper = scalar, F32, 1180 +throttlePedalUpState = scalar, S32, 1184, "", 1, 0 +mightResetPid = bits, U32, 1188, [0:0] +shouldResetPid = bits, U32, 1188, [1:1] +wasResetPid = bits, U32, 1188, [2:2] +mustResetPid = bits, U32, 1188, [3:3] +isCranking = bits, U32, 1188, [4:4] +useIacTableForCoasting = bits, U32, 1188, [5:5] +notIdling = bits, U32, 1188, [6:6] +needReset = bits, U32, 1188, [7:7] +isInDeadZone = bits, U32, 1188, [8:8] +isBlipping = bits, U32, 1188, [9:9] +useClosedLoop = bits, U32, 1188, [10:10] +badTps = bits, U32, 1188, [11:11] +looksLikeRunning = bits, U32, 1188, [12:12] +looksLikeCoasting = bits, U32, 1188, [13:13] +looksLikeCrankToIdle = bits, U32, 1188, [14:14] +isVerboseIAC = bits, U32, 1188, [15:15] +isIdleCoasting = bits, U32, 1188, [16:16] +unusedBit_22_17 = bits, U32, 1188, [17:17] +unusedBit_22_18 = bits, U32, 1188, [18:18] +unusedBit_22_19 = bits, U32, 1188, [19:19] +unusedBit_22_20 = bits, U32, 1188, [20:20] +unusedBit_22_21 = bits, U32, 1188, [21:21] +unusedBit_22_22 = bits, U32, 1188, [22:22] +unusedBit_22_23 = bits, U32, 1188, [23:23] +unusedBit_22_24 = bits, U32, 1188, [24:24] +unusedBit_22_25 = bits, U32, 1188, [25:25] +unusedBit_22_26 = bits, U32, 1188, [26:26] +unusedBit_22_27 = bits, U32, 1188, [27:27] +unusedBit_22_28 = bits, U32, 1188, [28:28] +unusedBit_22_29 = bits, U32, 1188, [29:29] +unusedBit_22_30 = bits, U32, 1188, [30:30] +unusedBit_22_31 = bits, U32, 1188, [31:31] +targetRpmByClt = scalar, S32, 1192, "", 1, 0 +targetRpmAcBump = scalar, S32, 1196, "", 1, 0 +iacByRpmTaper = scalar, F32, 1200 +luaAdd = scalar, F32, 1204 +; total TS size = 1208 +baseDwell = scalar, F32, 1208, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 1212, "", 1, 0 +luaTimingAdd = scalar, F32, 1216, "", 1, 0 +luaTimingMult = scalar, F32, 1220, "", 1, 0 +; total TS size = 1224 +idlePosition = scalar, F32, 1224, "", 1, 0 +trim = scalar, F32, 1228, "", 1, 0 +luaAdjustment = scalar, F32, 1232, "", 1, 0 +etbFeedForward = scalar, F32, 1236 +etbIntegralError = scalar, F32, 1240, "", 1, 0 +etbCurrentTarget = scalar, F32, 1244, "%", 1, 0 +etbRevLimitActive = bits, U32, 1248, [0:0] +unusedBit_7_1 = bits, U32, 1248, [1:1] +unusedBit_7_2 = bits, U32, 1248, [2:2] +unusedBit_7_3 = bits, U32, 1248, [3:3] +unusedBit_7_4 = bits, U32, 1248, [4:4] +unusedBit_7_5 = bits, U32, 1248, [5:5] +unusedBit_7_6 = bits, U32, 1248, [6:6] +unusedBit_7_7 = bits, U32, 1248, [7:7] +unusedBit_7_8 = bits, U32, 1248, [8:8] +unusedBit_7_9 = bits, U32, 1248, [9:9] +unusedBit_7_10 = bits, U32, 1248, [10:10] +unusedBit_7_11 = bits, U32, 1248, [11:11] +unusedBit_7_12 = bits, U32, 1248, [12:12] +unusedBit_7_13 = bits, U32, 1248, [13:13] +unusedBit_7_14 = bits, U32, 1248, [14:14] +unusedBit_7_15 = bits, U32, 1248, [15:15] +unusedBit_7_16 = bits, U32, 1248, [16:16] +unusedBit_7_17 = bits, U32, 1248, [17:17] +unusedBit_7_18 = bits, U32, 1248, [18:18] +unusedBit_7_19 = bits, U32, 1248, [19:19] +unusedBit_7_20 = bits, U32, 1248, [20:20] +unusedBit_7_21 = bits, U32, 1248, [21:21] +unusedBit_7_22 = bits, U32, 1248, [22:22] +unusedBit_7_23 = bits, U32, 1248, [23:23] +unusedBit_7_24 = bits, U32, 1248, [24:24] +unusedBit_7_25 = bits, U32, 1248, [25:25] +unusedBit_7_26 = bits, U32, 1248, [26:26] +unusedBit_7_27 = bits, U32, 1248, [27:27] +unusedBit_7_28 = bits, U32, 1248, [28:28] +unusedBit_7_29 = bits, U32, 1248, [29:29] +unusedBit_7_30 = bits, U32, 1248, [30:30] +unusedBit_7_31 = bits, U32, 1248, [31:31] +; total TS size = 1252 +faultCode = scalar, U08, 1252, "", 1, 0 +heaterDuty = scalar, U08, 1253, "%", 1, 0 +pumpDuty = scalar, U08, 1254, "%", 1, 0 +tempC = scalar, U16, 1256, "C", 1, 0 +nernstVoltage = scalar, U16, 1258, "V", 0.001, 0 +esr = scalar, U16, 1260, "", 1, 0 +; total TS size = 1264 time = { timeNow } @@ -4993,6 +4994,7 @@ entry = mapVvt_MAP_AT_DIFF, "mapVvt_MAP_AT_DIFF", float, "%.3f" entry = mapVvt_MAP_AT_CYCLE_COUNT, "mapVvt_MAP_AT_CYCLE_COUNT", int, "%d" entry = mapVvt_map_peak, "mapVvt_map_peak", int, "%d" entry = currentEngineDecodedPhase, "Engine Phase", float, "%.3f" +entry = triggerToothAngleError, "triggerToothAngleError", float, "%.3f" entry = crankSynchronizationCounter, "Crank sync counter", int, "%d" entry = vvtSyncGapRatio, "vvtSyncGapRatio", float, "%.3f" entry = vvtCurrentPosition, "vvtCurrentPosition", float, "%.3f" @@ -5783,6 +5785,8 @@ dialog = trigger_centralDialog, "trigger_central" graphLine = mapVvt_MAP_AT_CYCLE_COUNT graphLine = mapVvt_map_peak graphLine = currentEngineDecodedPhase + liveGraph = trigger_central_4_Graph, "Graph", South + graphLine = triggerToothAngleError dialog = trigger_stateDialog, "trigger_state" diff --git a/firmware/tunerstudio/generated/rusefi_harley81.ini b/firmware/tunerstudio/generated/rusefi_harley81.ini index 4f18872766..02478e2e96 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.09.24.harley81.107590286" + signature = "rusEFI 2022.09.24.harley81.17069719" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.09.24.harley81.107590286" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.09.24.harley81.17069719" ; 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 Fri Sep 23 23:15:56 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Sep 24 04:28:30 UTC 2022 pageSize = 22048 page = 1 @@ -2140,7 +2140,7 @@ ignBlends4_blendValues = array, U08, 22038, [8], "%", 0.5, 0, 0, 100, 1 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1260 + ochBlockSize = 1264 ; ; see TunerStudioOutputChannels struct @@ -3141,146 +3141,147 @@ mapVvt_MAP_AT_DIFF = scalar, F32, 1116, "", 1, 0 mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1120, "", 1, 0 mapVvt_map_peak = scalar, U08, 1121, "", 1, 0 currentEngineDecodedPhase = scalar, F32, 1124, "deg", 1, 0 -; total TS size = 1128 -crankSynchronizationCounter = scalar, U32, 1128, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1132, "", 1, 0 -vvtCurrentPosition = scalar, F32, 1136, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1140, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 1144, "", 1, 0 -triggerStateIndex = scalar, U08, 1148, "", 1, 0 -vvtCounter = scalar, U08, 1149, "", 1, 0 -camResyncCounter = scalar, U08, 1150, "", 1, 0 -vvtStateIndex = scalar, U08, 1151, "", 1, 0 -; total TS size = 1152 -m_hasSynchronizedPhase = bits, U32, 1152, [0:0] -unusedBit_1_1 = bits, U32, 1152, [1:1] -unusedBit_1_2 = bits, U32, 1152, [2:2] -unusedBit_1_3 = bits, U32, 1152, [3:3] -unusedBit_1_4 = bits, U32, 1152, [4:4] -unusedBit_1_5 = bits, U32, 1152, [5:5] -unusedBit_1_6 = bits, U32, 1152, [6:6] -unusedBit_1_7 = bits, U32, 1152, [7:7] -unusedBit_1_8 = bits, U32, 1152, [8:8] -unusedBit_1_9 = bits, U32, 1152, [9:9] -unusedBit_1_10 = bits, U32, 1152, [10:10] -unusedBit_1_11 = bits, U32, 1152, [11:11] -unusedBit_1_12 = bits, U32, 1152, [12:12] -unusedBit_1_13 = bits, U32, 1152, [13:13] -unusedBit_1_14 = bits, U32, 1152, [14:14] -unusedBit_1_15 = bits, U32, 1152, [15:15] -unusedBit_1_16 = bits, U32, 1152, [16:16] -unusedBit_1_17 = bits, U32, 1152, [17:17] -unusedBit_1_18 = bits, U32, 1152, [18:18] -unusedBit_1_19 = bits, U32, 1152, [19:19] -unusedBit_1_20 = bits, U32, 1152, [20:20] -unusedBit_1_21 = bits, U32, 1152, [21:21] -unusedBit_1_22 = bits, U32, 1152, [22:22] -unusedBit_1_23 = bits, U32, 1152, [23:23] -unusedBit_1_24 = bits, U32, 1152, [24:24] -unusedBit_1_25 = bits, U32, 1152, [25:25] -unusedBit_1_26 = bits, U32, 1152, [26:26] -unusedBit_1_27 = bits, U32, 1152, [27:27] -unusedBit_1_28 = bits, U32, 1152, [28:28] -unusedBit_1_29 = bits, U32, 1152, [29:29] -unusedBit_1_30 = bits, U32, 1152, [30:30] -unusedBit_1_31 = bits, U32, 1152, [31:31] +triggerToothAngleError = scalar, F32, 1128, "deg", 1, 0 +; total TS size = 1132 +crankSynchronizationCounter = scalar, U32, 1132, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1136, "", 1, 0 +vvtCurrentPosition = scalar, F32, 1140, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1144, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 1148, "", 1, 0 +triggerStateIndex = scalar, U08, 1152, "", 1, 0 +vvtCounter = scalar, U08, 1153, "", 1, 0 +camResyncCounter = scalar, U08, 1154, "", 1, 0 +vvtStateIndex = scalar, U08, 1155, "", 1, 0 ; total TS size = 1156 -wallFuelCorrection = scalar, F32, 1156, "", 1, 0 -wallFuel = scalar, F32, 1160, "", 1, 0 -; total TS size = 1164 -idleState = bits, S32, 1164, [0:2], "not important" -currentIdlePosition = scalar, F32, 1168 -baseIdlePosition = scalar, F32, 1172 -iacByTpsTaper = scalar, F32, 1176 -throttlePedalUpState = scalar, S32, 1180, "", 1, 0 -mightResetPid = bits, U32, 1184, [0:0] -shouldResetPid = bits, U32, 1184, [1:1] -wasResetPid = bits, U32, 1184, [2:2] -mustResetPid = bits, U32, 1184, [3:3] -isCranking = bits, U32, 1184, [4:4] -useIacTableForCoasting = bits, U32, 1184, [5:5] -notIdling = bits, U32, 1184, [6:6] -needReset = bits, U32, 1184, [7:7] -isInDeadZone = bits, U32, 1184, [8:8] -isBlipping = bits, U32, 1184, [9:9] -useClosedLoop = bits, U32, 1184, [10:10] -badTps = bits, U32, 1184, [11:11] -looksLikeRunning = bits, U32, 1184, [12:12] -looksLikeCoasting = bits, U32, 1184, [13:13] -looksLikeCrankToIdle = bits, U32, 1184, [14:14] -isVerboseIAC = bits, U32, 1184, [15:15] -isIdleCoasting = bits, U32, 1184, [16:16] -unusedBit_22_17 = bits, U32, 1184, [17:17] -unusedBit_22_18 = bits, U32, 1184, [18:18] -unusedBit_22_19 = bits, U32, 1184, [19:19] -unusedBit_22_20 = bits, U32, 1184, [20:20] -unusedBit_22_21 = bits, U32, 1184, [21:21] -unusedBit_22_22 = bits, U32, 1184, [22:22] -unusedBit_22_23 = bits, U32, 1184, [23:23] -unusedBit_22_24 = bits, U32, 1184, [24:24] -unusedBit_22_25 = bits, U32, 1184, [25:25] -unusedBit_22_26 = bits, U32, 1184, [26:26] -unusedBit_22_27 = bits, U32, 1184, [27:27] -unusedBit_22_28 = bits, U32, 1184, [28:28] -unusedBit_22_29 = bits, U32, 1184, [29:29] -unusedBit_22_30 = bits, U32, 1184, [30:30] -unusedBit_22_31 = bits, U32, 1184, [31:31] -targetRpmByClt = scalar, S32, 1188, "", 1, 0 -targetRpmAcBump = scalar, S32, 1192, "", 1, 0 -iacByRpmTaper = scalar, F32, 1196 -luaAdd = scalar, F32, 1200 -; total TS size = 1204 -baseDwell = scalar, F32, 1204, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 1208, "", 1, 0 -luaTimingAdd = scalar, F32, 1212, "", 1, 0 -luaTimingMult = scalar, F32, 1216, "", 1, 0 -; total TS size = 1220 -idlePosition = scalar, F32, 1220, "", 1, 0 -trim = scalar, F32, 1224, "", 1, 0 -luaAdjustment = scalar, F32, 1228, "", 1, 0 -etbFeedForward = scalar, F32, 1232 -etbIntegralError = scalar, F32, 1236, "", 1, 0 -etbCurrentTarget = scalar, F32, 1240, "%", 1, 0 -etbRevLimitActive = bits, U32, 1244, [0:0] -unusedBit_7_1 = bits, U32, 1244, [1:1] -unusedBit_7_2 = bits, U32, 1244, [2:2] -unusedBit_7_3 = bits, U32, 1244, [3:3] -unusedBit_7_4 = bits, U32, 1244, [4:4] -unusedBit_7_5 = bits, U32, 1244, [5:5] -unusedBit_7_6 = bits, U32, 1244, [6:6] -unusedBit_7_7 = bits, U32, 1244, [7:7] -unusedBit_7_8 = bits, U32, 1244, [8:8] -unusedBit_7_9 = bits, U32, 1244, [9:9] -unusedBit_7_10 = bits, U32, 1244, [10:10] -unusedBit_7_11 = bits, U32, 1244, [11:11] -unusedBit_7_12 = bits, U32, 1244, [12:12] -unusedBit_7_13 = bits, U32, 1244, [13:13] -unusedBit_7_14 = bits, U32, 1244, [14:14] -unusedBit_7_15 = bits, U32, 1244, [15:15] -unusedBit_7_16 = bits, U32, 1244, [16:16] -unusedBit_7_17 = bits, U32, 1244, [17:17] -unusedBit_7_18 = bits, U32, 1244, [18:18] -unusedBit_7_19 = bits, U32, 1244, [19:19] -unusedBit_7_20 = bits, U32, 1244, [20:20] -unusedBit_7_21 = bits, U32, 1244, [21:21] -unusedBit_7_22 = bits, U32, 1244, [22:22] -unusedBit_7_23 = bits, U32, 1244, [23:23] -unusedBit_7_24 = bits, U32, 1244, [24:24] -unusedBit_7_25 = bits, U32, 1244, [25:25] -unusedBit_7_26 = bits, U32, 1244, [26:26] -unusedBit_7_27 = bits, U32, 1244, [27:27] -unusedBit_7_28 = bits, U32, 1244, [28:28] -unusedBit_7_29 = bits, U32, 1244, [29:29] -unusedBit_7_30 = bits, U32, 1244, [30:30] -unusedBit_7_31 = bits, U32, 1244, [31:31] -; total TS size = 1248 -faultCode = scalar, U08, 1248, "", 1, 0 -heaterDuty = scalar, U08, 1249, "%", 1, 0 -pumpDuty = scalar, U08, 1250, "%", 1, 0 -tempC = scalar, U16, 1252, "C", 1, 0 -nernstVoltage = scalar, U16, 1254, "V", 0.001, 0 -esr = scalar, U16, 1256, "", 1, 0 -; total TS size = 1260 +m_hasSynchronizedPhase = bits, U32, 1156, [0:0] +unusedBit_1_1 = bits, U32, 1156, [1:1] +unusedBit_1_2 = bits, U32, 1156, [2:2] +unusedBit_1_3 = bits, U32, 1156, [3:3] +unusedBit_1_4 = bits, U32, 1156, [4:4] +unusedBit_1_5 = bits, U32, 1156, [5:5] +unusedBit_1_6 = bits, U32, 1156, [6:6] +unusedBit_1_7 = bits, U32, 1156, [7:7] +unusedBit_1_8 = bits, U32, 1156, [8:8] +unusedBit_1_9 = bits, U32, 1156, [9:9] +unusedBit_1_10 = bits, U32, 1156, [10:10] +unusedBit_1_11 = bits, U32, 1156, [11:11] +unusedBit_1_12 = bits, U32, 1156, [12:12] +unusedBit_1_13 = bits, U32, 1156, [13:13] +unusedBit_1_14 = bits, U32, 1156, [14:14] +unusedBit_1_15 = bits, U32, 1156, [15:15] +unusedBit_1_16 = bits, U32, 1156, [16:16] +unusedBit_1_17 = bits, U32, 1156, [17:17] +unusedBit_1_18 = bits, U32, 1156, [18:18] +unusedBit_1_19 = bits, U32, 1156, [19:19] +unusedBit_1_20 = bits, U32, 1156, [20:20] +unusedBit_1_21 = bits, U32, 1156, [21:21] +unusedBit_1_22 = bits, U32, 1156, [22:22] +unusedBit_1_23 = bits, U32, 1156, [23:23] +unusedBit_1_24 = bits, U32, 1156, [24:24] +unusedBit_1_25 = bits, U32, 1156, [25:25] +unusedBit_1_26 = bits, U32, 1156, [26:26] +unusedBit_1_27 = bits, U32, 1156, [27:27] +unusedBit_1_28 = bits, U32, 1156, [28:28] +unusedBit_1_29 = bits, U32, 1156, [29:29] +unusedBit_1_30 = bits, U32, 1156, [30:30] +unusedBit_1_31 = bits, U32, 1156, [31:31] +; total TS size = 1160 +wallFuelCorrection = scalar, F32, 1160, "", 1, 0 +wallFuel = scalar, F32, 1164, "", 1, 0 +; total TS size = 1168 +idleState = bits, S32, 1168, [0:2], "not important" +currentIdlePosition = scalar, F32, 1172 +baseIdlePosition = scalar, F32, 1176 +iacByTpsTaper = scalar, F32, 1180 +throttlePedalUpState = scalar, S32, 1184, "", 1, 0 +mightResetPid = bits, U32, 1188, [0:0] +shouldResetPid = bits, U32, 1188, [1:1] +wasResetPid = bits, U32, 1188, [2:2] +mustResetPid = bits, U32, 1188, [3:3] +isCranking = bits, U32, 1188, [4:4] +useIacTableForCoasting = bits, U32, 1188, [5:5] +notIdling = bits, U32, 1188, [6:6] +needReset = bits, U32, 1188, [7:7] +isInDeadZone = bits, U32, 1188, [8:8] +isBlipping = bits, U32, 1188, [9:9] +useClosedLoop = bits, U32, 1188, [10:10] +badTps = bits, U32, 1188, [11:11] +looksLikeRunning = bits, U32, 1188, [12:12] +looksLikeCoasting = bits, U32, 1188, [13:13] +looksLikeCrankToIdle = bits, U32, 1188, [14:14] +isVerboseIAC = bits, U32, 1188, [15:15] +isIdleCoasting = bits, U32, 1188, [16:16] +unusedBit_22_17 = bits, U32, 1188, [17:17] +unusedBit_22_18 = bits, U32, 1188, [18:18] +unusedBit_22_19 = bits, U32, 1188, [19:19] +unusedBit_22_20 = bits, U32, 1188, [20:20] +unusedBit_22_21 = bits, U32, 1188, [21:21] +unusedBit_22_22 = bits, U32, 1188, [22:22] +unusedBit_22_23 = bits, U32, 1188, [23:23] +unusedBit_22_24 = bits, U32, 1188, [24:24] +unusedBit_22_25 = bits, U32, 1188, [25:25] +unusedBit_22_26 = bits, U32, 1188, [26:26] +unusedBit_22_27 = bits, U32, 1188, [27:27] +unusedBit_22_28 = bits, U32, 1188, [28:28] +unusedBit_22_29 = bits, U32, 1188, [29:29] +unusedBit_22_30 = bits, U32, 1188, [30:30] +unusedBit_22_31 = bits, U32, 1188, [31:31] +targetRpmByClt = scalar, S32, 1192, "", 1, 0 +targetRpmAcBump = scalar, S32, 1196, "", 1, 0 +iacByRpmTaper = scalar, F32, 1200 +luaAdd = scalar, F32, 1204 +; total TS size = 1208 +baseDwell = scalar, F32, 1208, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 1212, "", 1, 0 +luaTimingAdd = scalar, F32, 1216, "", 1, 0 +luaTimingMult = scalar, F32, 1220, "", 1, 0 +; total TS size = 1224 +idlePosition = scalar, F32, 1224, "", 1, 0 +trim = scalar, F32, 1228, "", 1, 0 +luaAdjustment = scalar, F32, 1232, "", 1, 0 +etbFeedForward = scalar, F32, 1236 +etbIntegralError = scalar, F32, 1240, "", 1, 0 +etbCurrentTarget = scalar, F32, 1244, "%", 1, 0 +etbRevLimitActive = bits, U32, 1248, [0:0] +unusedBit_7_1 = bits, U32, 1248, [1:1] +unusedBit_7_2 = bits, U32, 1248, [2:2] +unusedBit_7_3 = bits, U32, 1248, [3:3] +unusedBit_7_4 = bits, U32, 1248, [4:4] +unusedBit_7_5 = bits, U32, 1248, [5:5] +unusedBit_7_6 = bits, U32, 1248, [6:6] +unusedBit_7_7 = bits, U32, 1248, [7:7] +unusedBit_7_8 = bits, U32, 1248, [8:8] +unusedBit_7_9 = bits, U32, 1248, [9:9] +unusedBit_7_10 = bits, U32, 1248, [10:10] +unusedBit_7_11 = bits, U32, 1248, [11:11] +unusedBit_7_12 = bits, U32, 1248, [12:12] +unusedBit_7_13 = bits, U32, 1248, [13:13] +unusedBit_7_14 = bits, U32, 1248, [14:14] +unusedBit_7_15 = bits, U32, 1248, [15:15] +unusedBit_7_16 = bits, U32, 1248, [16:16] +unusedBit_7_17 = bits, U32, 1248, [17:17] +unusedBit_7_18 = bits, U32, 1248, [18:18] +unusedBit_7_19 = bits, U32, 1248, [19:19] +unusedBit_7_20 = bits, U32, 1248, [20:20] +unusedBit_7_21 = bits, U32, 1248, [21:21] +unusedBit_7_22 = bits, U32, 1248, [22:22] +unusedBit_7_23 = bits, U32, 1248, [23:23] +unusedBit_7_24 = bits, U32, 1248, [24:24] +unusedBit_7_25 = bits, U32, 1248, [25:25] +unusedBit_7_26 = bits, U32, 1248, [26:26] +unusedBit_7_27 = bits, U32, 1248, [27:27] +unusedBit_7_28 = bits, U32, 1248, [28:28] +unusedBit_7_29 = bits, U32, 1248, [29:29] +unusedBit_7_30 = bits, U32, 1248, [30:30] +unusedBit_7_31 = bits, U32, 1248, [31:31] +; total TS size = 1252 +faultCode = scalar, U08, 1252, "", 1, 0 +heaterDuty = scalar, U08, 1253, "%", 1, 0 +pumpDuty = scalar, U08, 1254, "%", 1, 0 +tempC = scalar, U16, 1256, "C", 1, 0 +nernstVoltage = scalar, U16, 1258, "V", 0.001, 0 +esr = scalar, U16, 1260, "", 1, 0 +; total TS size = 1264 time = { timeNow } @@ -4993,6 +4994,7 @@ entry = mapVvt_MAP_AT_DIFF, "mapVvt_MAP_AT_DIFF", float, "%.3f" entry = mapVvt_MAP_AT_CYCLE_COUNT, "mapVvt_MAP_AT_CYCLE_COUNT", int, "%d" entry = mapVvt_map_peak, "mapVvt_map_peak", int, "%d" entry = currentEngineDecodedPhase, "Engine Phase", float, "%.3f" +entry = triggerToothAngleError, "triggerToothAngleError", float, "%.3f" entry = crankSynchronizationCounter, "Crank sync counter", int, "%d" entry = vvtSyncGapRatio, "vvtSyncGapRatio", float, "%.3f" entry = vvtCurrentPosition, "vvtCurrentPosition", float, "%.3f" @@ -5780,6 +5782,8 @@ dialog = trigger_centralDialog, "trigger_central" graphLine = mapVvt_MAP_AT_CYCLE_COUNT graphLine = mapVvt_map_peak graphLine = currentEngineDecodedPhase + liveGraph = trigger_central_4_Graph, "Graph", South + graphLine = triggerToothAngleError dialog = trigger_stateDialog, "trigger_state" diff --git a/firmware/tunerstudio/generated/rusefi_hellen-gm-e67.ini b/firmware/tunerstudio/generated/rusefi_hellen-gm-e67.ini index 467b41b5e5..7c72469df3 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.09.24.hellen-gm-e67.1123234327" + signature = "rusEFI 2022.09.24.hellen-gm-e67.1168045582" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.09.24.hellen-gm-e67.1123234327" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.09.24.hellen-gm-e67.1168045582" ; 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 Fri Sep 23 23:16:12 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Sep 24 04:28:47 UTC 2022 pageSize = 22048 page = 1 @@ -2140,7 +2140,7 @@ ignBlends4_blendValues = array, U08, 22038, [8], "%", 0.5, 0, 0, 100, 1 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1260 + ochBlockSize = 1264 ; ; see TunerStudioOutputChannels struct @@ -3141,146 +3141,147 @@ mapVvt_MAP_AT_DIFF = scalar, F32, 1116, "", 1, 0 mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1120, "", 1, 0 mapVvt_map_peak = scalar, U08, 1121, "", 1, 0 currentEngineDecodedPhase = scalar, F32, 1124, "deg", 1, 0 -; total TS size = 1128 -crankSynchronizationCounter = scalar, U32, 1128, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1132, "", 1, 0 -vvtCurrentPosition = scalar, F32, 1136, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1140, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 1144, "", 1, 0 -triggerStateIndex = scalar, U08, 1148, "", 1, 0 -vvtCounter = scalar, U08, 1149, "", 1, 0 -camResyncCounter = scalar, U08, 1150, "", 1, 0 -vvtStateIndex = scalar, U08, 1151, "", 1, 0 -; total TS size = 1152 -m_hasSynchronizedPhase = bits, U32, 1152, [0:0] -unusedBit_1_1 = bits, U32, 1152, [1:1] -unusedBit_1_2 = bits, U32, 1152, [2:2] -unusedBit_1_3 = bits, U32, 1152, [3:3] -unusedBit_1_4 = bits, U32, 1152, [4:4] -unusedBit_1_5 = bits, U32, 1152, [5:5] -unusedBit_1_6 = bits, U32, 1152, [6:6] -unusedBit_1_7 = bits, U32, 1152, [7:7] -unusedBit_1_8 = bits, U32, 1152, [8:8] -unusedBit_1_9 = bits, U32, 1152, [9:9] -unusedBit_1_10 = bits, U32, 1152, [10:10] -unusedBit_1_11 = bits, U32, 1152, [11:11] -unusedBit_1_12 = bits, U32, 1152, [12:12] -unusedBit_1_13 = bits, U32, 1152, [13:13] -unusedBit_1_14 = bits, U32, 1152, [14:14] -unusedBit_1_15 = bits, U32, 1152, [15:15] -unusedBit_1_16 = bits, U32, 1152, [16:16] -unusedBit_1_17 = bits, U32, 1152, [17:17] -unusedBit_1_18 = bits, U32, 1152, [18:18] -unusedBit_1_19 = bits, U32, 1152, [19:19] -unusedBit_1_20 = bits, U32, 1152, [20:20] -unusedBit_1_21 = bits, U32, 1152, [21:21] -unusedBit_1_22 = bits, U32, 1152, [22:22] -unusedBit_1_23 = bits, U32, 1152, [23:23] -unusedBit_1_24 = bits, U32, 1152, [24:24] -unusedBit_1_25 = bits, U32, 1152, [25:25] -unusedBit_1_26 = bits, U32, 1152, [26:26] -unusedBit_1_27 = bits, U32, 1152, [27:27] -unusedBit_1_28 = bits, U32, 1152, [28:28] -unusedBit_1_29 = bits, U32, 1152, [29:29] -unusedBit_1_30 = bits, U32, 1152, [30:30] -unusedBit_1_31 = bits, U32, 1152, [31:31] +triggerToothAngleError = scalar, F32, 1128, "deg", 1, 0 +; total TS size = 1132 +crankSynchronizationCounter = scalar, U32, 1132, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1136, "", 1, 0 +vvtCurrentPosition = scalar, F32, 1140, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1144, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 1148, "", 1, 0 +triggerStateIndex = scalar, U08, 1152, "", 1, 0 +vvtCounter = scalar, U08, 1153, "", 1, 0 +camResyncCounter = scalar, U08, 1154, "", 1, 0 +vvtStateIndex = scalar, U08, 1155, "", 1, 0 ; total TS size = 1156 -wallFuelCorrection = scalar, F32, 1156, "", 1, 0 -wallFuel = scalar, F32, 1160, "", 1, 0 -; total TS size = 1164 -idleState = bits, S32, 1164, [0:2], "not important" -currentIdlePosition = scalar, F32, 1168 -baseIdlePosition = scalar, F32, 1172 -iacByTpsTaper = scalar, F32, 1176 -throttlePedalUpState = scalar, S32, 1180, "", 1, 0 -mightResetPid = bits, U32, 1184, [0:0] -shouldResetPid = bits, U32, 1184, [1:1] -wasResetPid = bits, U32, 1184, [2:2] -mustResetPid = bits, U32, 1184, [3:3] -isCranking = bits, U32, 1184, [4:4] -useIacTableForCoasting = bits, U32, 1184, [5:5] -notIdling = bits, U32, 1184, [6:6] -needReset = bits, U32, 1184, [7:7] -isInDeadZone = bits, U32, 1184, [8:8] -isBlipping = bits, U32, 1184, [9:9] -useClosedLoop = bits, U32, 1184, [10:10] -badTps = bits, U32, 1184, [11:11] -looksLikeRunning = bits, U32, 1184, [12:12] -looksLikeCoasting = bits, U32, 1184, [13:13] -looksLikeCrankToIdle = bits, U32, 1184, [14:14] -isVerboseIAC = bits, U32, 1184, [15:15] -isIdleCoasting = bits, U32, 1184, [16:16] -unusedBit_22_17 = bits, U32, 1184, [17:17] -unusedBit_22_18 = bits, U32, 1184, [18:18] -unusedBit_22_19 = bits, U32, 1184, [19:19] -unusedBit_22_20 = bits, U32, 1184, [20:20] -unusedBit_22_21 = bits, U32, 1184, [21:21] -unusedBit_22_22 = bits, U32, 1184, [22:22] -unusedBit_22_23 = bits, U32, 1184, [23:23] -unusedBit_22_24 = bits, U32, 1184, [24:24] -unusedBit_22_25 = bits, U32, 1184, [25:25] -unusedBit_22_26 = bits, U32, 1184, [26:26] -unusedBit_22_27 = bits, U32, 1184, [27:27] -unusedBit_22_28 = bits, U32, 1184, [28:28] -unusedBit_22_29 = bits, U32, 1184, [29:29] -unusedBit_22_30 = bits, U32, 1184, [30:30] -unusedBit_22_31 = bits, U32, 1184, [31:31] -targetRpmByClt = scalar, S32, 1188, "", 1, 0 -targetRpmAcBump = scalar, S32, 1192, "", 1, 0 -iacByRpmTaper = scalar, F32, 1196 -luaAdd = scalar, F32, 1200 -; total TS size = 1204 -baseDwell = scalar, F32, 1204, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 1208, "", 1, 0 -luaTimingAdd = scalar, F32, 1212, "", 1, 0 -luaTimingMult = scalar, F32, 1216, "", 1, 0 -; total TS size = 1220 -idlePosition = scalar, F32, 1220, "", 1, 0 -trim = scalar, F32, 1224, "", 1, 0 -luaAdjustment = scalar, F32, 1228, "", 1, 0 -etbFeedForward = scalar, F32, 1232 -etbIntegralError = scalar, F32, 1236, "", 1, 0 -etbCurrentTarget = scalar, F32, 1240, "%", 1, 0 -etbRevLimitActive = bits, U32, 1244, [0:0] -unusedBit_7_1 = bits, U32, 1244, [1:1] -unusedBit_7_2 = bits, U32, 1244, [2:2] -unusedBit_7_3 = bits, U32, 1244, [3:3] -unusedBit_7_4 = bits, U32, 1244, [4:4] -unusedBit_7_5 = bits, U32, 1244, [5:5] -unusedBit_7_6 = bits, U32, 1244, [6:6] -unusedBit_7_7 = bits, U32, 1244, [7:7] -unusedBit_7_8 = bits, U32, 1244, [8:8] -unusedBit_7_9 = bits, U32, 1244, [9:9] -unusedBit_7_10 = bits, U32, 1244, [10:10] -unusedBit_7_11 = bits, U32, 1244, [11:11] -unusedBit_7_12 = bits, U32, 1244, [12:12] -unusedBit_7_13 = bits, U32, 1244, [13:13] -unusedBit_7_14 = bits, U32, 1244, [14:14] -unusedBit_7_15 = bits, U32, 1244, [15:15] -unusedBit_7_16 = bits, U32, 1244, [16:16] -unusedBit_7_17 = bits, U32, 1244, [17:17] -unusedBit_7_18 = bits, U32, 1244, [18:18] -unusedBit_7_19 = bits, U32, 1244, [19:19] -unusedBit_7_20 = bits, U32, 1244, [20:20] -unusedBit_7_21 = bits, U32, 1244, [21:21] -unusedBit_7_22 = bits, U32, 1244, [22:22] -unusedBit_7_23 = bits, U32, 1244, [23:23] -unusedBit_7_24 = bits, U32, 1244, [24:24] -unusedBit_7_25 = bits, U32, 1244, [25:25] -unusedBit_7_26 = bits, U32, 1244, [26:26] -unusedBit_7_27 = bits, U32, 1244, [27:27] -unusedBit_7_28 = bits, U32, 1244, [28:28] -unusedBit_7_29 = bits, U32, 1244, [29:29] -unusedBit_7_30 = bits, U32, 1244, [30:30] -unusedBit_7_31 = bits, U32, 1244, [31:31] -; total TS size = 1248 -faultCode = scalar, U08, 1248, "", 1, 0 -heaterDuty = scalar, U08, 1249, "%", 1, 0 -pumpDuty = scalar, U08, 1250, "%", 1, 0 -tempC = scalar, U16, 1252, "C", 1, 0 -nernstVoltage = scalar, U16, 1254, "V", 0.001, 0 -esr = scalar, U16, 1256, "", 1, 0 -; total TS size = 1260 +m_hasSynchronizedPhase = bits, U32, 1156, [0:0] +unusedBit_1_1 = bits, U32, 1156, [1:1] +unusedBit_1_2 = bits, U32, 1156, [2:2] +unusedBit_1_3 = bits, U32, 1156, [3:3] +unusedBit_1_4 = bits, U32, 1156, [4:4] +unusedBit_1_5 = bits, U32, 1156, [5:5] +unusedBit_1_6 = bits, U32, 1156, [6:6] +unusedBit_1_7 = bits, U32, 1156, [7:7] +unusedBit_1_8 = bits, U32, 1156, [8:8] +unusedBit_1_9 = bits, U32, 1156, [9:9] +unusedBit_1_10 = bits, U32, 1156, [10:10] +unusedBit_1_11 = bits, U32, 1156, [11:11] +unusedBit_1_12 = bits, U32, 1156, [12:12] +unusedBit_1_13 = bits, U32, 1156, [13:13] +unusedBit_1_14 = bits, U32, 1156, [14:14] +unusedBit_1_15 = bits, U32, 1156, [15:15] +unusedBit_1_16 = bits, U32, 1156, [16:16] +unusedBit_1_17 = bits, U32, 1156, [17:17] +unusedBit_1_18 = bits, U32, 1156, [18:18] +unusedBit_1_19 = bits, U32, 1156, [19:19] +unusedBit_1_20 = bits, U32, 1156, [20:20] +unusedBit_1_21 = bits, U32, 1156, [21:21] +unusedBit_1_22 = bits, U32, 1156, [22:22] +unusedBit_1_23 = bits, U32, 1156, [23:23] +unusedBit_1_24 = bits, U32, 1156, [24:24] +unusedBit_1_25 = bits, U32, 1156, [25:25] +unusedBit_1_26 = bits, U32, 1156, [26:26] +unusedBit_1_27 = bits, U32, 1156, [27:27] +unusedBit_1_28 = bits, U32, 1156, [28:28] +unusedBit_1_29 = bits, U32, 1156, [29:29] +unusedBit_1_30 = bits, U32, 1156, [30:30] +unusedBit_1_31 = bits, U32, 1156, [31:31] +; total TS size = 1160 +wallFuelCorrection = scalar, F32, 1160, "", 1, 0 +wallFuel = scalar, F32, 1164, "", 1, 0 +; total TS size = 1168 +idleState = bits, S32, 1168, [0:2], "not important" +currentIdlePosition = scalar, F32, 1172 +baseIdlePosition = scalar, F32, 1176 +iacByTpsTaper = scalar, F32, 1180 +throttlePedalUpState = scalar, S32, 1184, "", 1, 0 +mightResetPid = bits, U32, 1188, [0:0] +shouldResetPid = bits, U32, 1188, [1:1] +wasResetPid = bits, U32, 1188, [2:2] +mustResetPid = bits, U32, 1188, [3:3] +isCranking = bits, U32, 1188, [4:4] +useIacTableForCoasting = bits, U32, 1188, [5:5] +notIdling = bits, U32, 1188, [6:6] +needReset = bits, U32, 1188, [7:7] +isInDeadZone = bits, U32, 1188, [8:8] +isBlipping = bits, U32, 1188, [9:9] +useClosedLoop = bits, U32, 1188, [10:10] +badTps = bits, U32, 1188, [11:11] +looksLikeRunning = bits, U32, 1188, [12:12] +looksLikeCoasting = bits, U32, 1188, [13:13] +looksLikeCrankToIdle = bits, U32, 1188, [14:14] +isVerboseIAC = bits, U32, 1188, [15:15] +isIdleCoasting = bits, U32, 1188, [16:16] +unusedBit_22_17 = bits, U32, 1188, [17:17] +unusedBit_22_18 = bits, U32, 1188, [18:18] +unusedBit_22_19 = bits, U32, 1188, [19:19] +unusedBit_22_20 = bits, U32, 1188, [20:20] +unusedBit_22_21 = bits, U32, 1188, [21:21] +unusedBit_22_22 = bits, U32, 1188, [22:22] +unusedBit_22_23 = bits, U32, 1188, [23:23] +unusedBit_22_24 = bits, U32, 1188, [24:24] +unusedBit_22_25 = bits, U32, 1188, [25:25] +unusedBit_22_26 = bits, U32, 1188, [26:26] +unusedBit_22_27 = bits, U32, 1188, [27:27] +unusedBit_22_28 = bits, U32, 1188, [28:28] +unusedBit_22_29 = bits, U32, 1188, [29:29] +unusedBit_22_30 = bits, U32, 1188, [30:30] +unusedBit_22_31 = bits, U32, 1188, [31:31] +targetRpmByClt = scalar, S32, 1192, "", 1, 0 +targetRpmAcBump = scalar, S32, 1196, "", 1, 0 +iacByRpmTaper = scalar, F32, 1200 +luaAdd = scalar, F32, 1204 +; total TS size = 1208 +baseDwell = scalar, F32, 1208, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 1212, "", 1, 0 +luaTimingAdd = scalar, F32, 1216, "", 1, 0 +luaTimingMult = scalar, F32, 1220, "", 1, 0 +; total TS size = 1224 +idlePosition = scalar, F32, 1224, "", 1, 0 +trim = scalar, F32, 1228, "", 1, 0 +luaAdjustment = scalar, F32, 1232, "", 1, 0 +etbFeedForward = scalar, F32, 1236 +etbIntegralError = scalar, F32, 1240, "", 1, 0 +etbCurrentTarget = scalar, F32, 1244, "%", 1, 0 +etbRevLimitActive = bits, U32, 1248, [0:0] +unusedBit_7_1 = bits, U32, 1248, [1:1] +unusedBit_7_2 = bits, U32, 1248, [2:2] +unusedBit_7_3 = bits, U32, 1248, [3:3] +unusedBit_7_4 = bits, U32, 1248, [4:4] +unusedBit_7_5 = bits, U32, 1248, [5:5] +unusedBit_7_6 = bits, U32, 1248, [6:6] +unusedBit_7_7 = bits, U32, 1248, [7:7] +unusedBit_7_8 = bits, U32, 1248, [8:8] +unusedBit_7_9 = bits, U32, 1248, [9:9] +unusedBit_7_10 = bits, U32, 1248, [10:10] +unusedBit_7_11 = bits, U32, 1248, [11:11] +unusedBit_7_12 = bits, U32, 1248, [12:12] +unusedBit_7_13 = bits, U32, 1248, [13:13] +unusedBit_7_14 = bits, U32, 1248, [14:14] +unusedBit_7_15 = bits, U32, 1248, [15:15] +unusedBit_7_16 = bits, U32, 1248, [16:16] +unusedBit_7_17 = bits, U32, 1248, [17:17] +unusedBit_7_18 = bits, U32, 1248, [18:18] +unusedBit_7_19 = bits, U32, 1248, [19:19] +unusedBit_7_20 = bits, U32, 1248, [20:20] +unusedBit_7_21 = bits, U32, 1248, [21:21] +unusedBit_7_22 = bits, U32, 1248, [22:22] +unusedBit_7_23 = bits, U32, 1248, [23:23] +unusedBit_7_24 = bits, U32, 1248, [24:24] +unusedBit_7_25 = bits, U32, 1248, [25:25] +unusedBit_7_26 = bits, U32, 1248, [26:26] +unusedBit_7_27 = bits, U32, 1248, [27:27] +unusedBit_7_28 = bits, U32, 1248, [28:28] +unusedBit_7_29 = bits, U32, 1248, [29:29] +unusedBit_7_30 = bits, U32, 1248, [30:30] +unusedBit_7_31 = bits, U32, 1248, [31:31] +; total TS size = 1252 +faultCode = scalar, U08, 1252, "", 1, 0 +heaterDuty = scalar, U08, 1253, "%", 1, 0 +pumpDuty = scalar, U08, 1254, "%", 1, 0 +tempC = scalar, U16, 1256, "C", 1, 0 +nernstVoltage = scalar, U16, 1258, "V", 0.001, 0 +esr = scalar, U16, 1260, "", 1, 0 +; total TS size = 1264 time = { timeNow } @@ -4993,6 +4994,7 @@ entry = mapVvt_MAP_AT_DIFF, "mapVvt_MAP_AT_DIFF", float, "%.3f" entry = mapVvt_MAP_AT_CYCLE_COUNT, "mapVvt_MAP_AT_CYCLE_COUNT", int, "%d" entry = mapVvt_map_peak, "mapVvt_map_peak", int, "%d" entry = currentEngineDecodedPhase, "Engine Phase", float, "%.3f" +entry = triggerToothAngleError, "triggerToothAngleError", float, "%.3f" entry = crankSynchronizationCounter, "Crank sync counter", int, "%d" entry = vvtSyncGapRatio, "vvtSyncGapRatio", float, "%.3f" entry = vvtCurrentPosition, "vvtCurrentPosition", float, "%.3f" @@ -5780,6 +5782,8 @@ dialog = trigger_centralDialog, "trigger_central" graphLine = mapVvt_MAP_AT_CYCLE_COUNT graphLine = mapVvt_map_peak graphLine = currentEngineDecodedPhase + liveGraph = trigger_central_4_Graph, "Graph", South + graphLine = triggerToothAngleError dialog = trigger_stateDialog, "trigger_state" diff --git a/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini b/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini index f92a2633d4..91b371c5be 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.09.24.hellen-nb1.790595181" + signature = "rusEFI 2022.09.24.hellen-nb1.678576756" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.09.24.hellen-nb1.790595181" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.09.24.hellen-nb1.678576756" ; 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 Fri Sep 23 23:16:11 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Sep 24 04:28:45 UTC 2022 pageSize = 22048 page = 1 @@ -2140,7 +2140,7 @@ ignBlends4_blendValues = array, U08, 22038, [8], "%", 0.5, 0, 0, 100, 1 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1260 + ochBlockSize = 1264 ; ; see TunerStudioOutputChannels struct @@ -3141,146 +3141,147 @@ mapVvt_MAP_AT_DIFF = scalar, F32, 1116, "", 1, 0 mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1120, "", 1, 0 mapVvt_map_peak = scalar, U08, 1121, "", 1, 0 currentEngineDecodedPhase = scalar, F32, 1124, "deg", 1, 0 -; total TS size = 1128 -crankSynchronizationCounter = scalar, U32, 1128, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1132, "", 1, 0 -vvtCurrentPosition = scalar, F32, 1136, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1140, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 1144, "", 1, 0 -triggerStateIndex = scalar, U08, 1148, "", 1, 0 -vvtCounter = scalar, U08, 1149, "", 1, 0 -camResyncCounter = scalar, U08, 1150, "", 1, 0 -vvtStateIndex = scalar, U08, 1151, "", 1, 0 -; total TS size = 1152 -m_hasSynchronizedPhase = bits, U32, 1152, [0:0] -unusedBit_1_1 = bits, U32, 1152, [1:1] -unusedBit_1_2 = bits, U32, 1152, [2:2] -unusedBit_1_3 = bits, U32, 1152, [3:3] -unusedBit_1_4 = bits, U32, 1152, [4:4] -unusedBit_1_5 = bits, U32, 1152, [5:5] -unusedBit_1_6 = bits, U32, 1152, [6:6] -unusedBit_1_7 = bits, U32, 1152, [7:7] -unusedBit_1_8 = bits, U32, 1152, [8:8] -unusedBit_1_9 = bits, U32, 1152, [9:9] -unusedBit_1_10 = bits, U32, 1152, [10:10] -unusedBit_1_11 = bits, U32, 1152, [11:11] -unusedBit_1_12 = bits, U32, 1152, [12:12] -unusedBit_1_13 = bits, U32, 1152, [13:13] -unusedBit_1_14 = bits, U32, 1152, [14:14] -unusedBit_1_15 = bits, U32, 1152, [15:15] -unusedBit_1_16 = bits, U32, 1152, [16:16] -unusedBit_1_17 = bits, U32, 1152, [17:17] -unusedBit_1_18 = bits, U32, 1152, [18:18] -unusedBit_1_19 = bits, U32, 1152, [19:19] -unusedBit_1_20 = bits, U32, 1152, [20:20] -unusedBit_1_21 = bits, U32, 1152, [21:21] -unusedBit_1_22 = bits, U32, 1152, [22:22] -unusedBit_1_23 = bits, U32, 1152, [23:23] -unusedBit_1_24 = bits, U32, 1152, [24:24] -unusedBit_1_25 = bits, U32, 1152, [25:25] -unusedBit_1_26 = bits, U32, 1152, [26:26] -unusedBit_1_27 = bits, U32, 1152, [27:27] -unusedBit_1_28 = bits, U32, 1152, [28:28] -unusedBit_1_29 = bits, U32, 1152, [29:29] -unusedBit_1_30 = bits, U32, 1152, [30:30] -unusedBit_1_31 = bits, U32, 1152, [31:31] +triggerToothAngleError = scalar, F32, 1128, "deg", 1, 0 +; total TS size = 1132 +crankSynchronizationCounter = scalar, U32, 1132, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1136, "", 1, 0 +vvtCurrentPosition = scalar, F32, 1140, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1144, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 1148, "", 1, 0 +triggerStateIndex = scalar, U08, 1152, "", 1, 0 +vvtCounter = scalar, U08, 1153, "", 1, 0 +camResyncCounter = scalar, U08, 1154, "", 1, 0 +vvtStateIndex = scalar, U08, 1155, "", 1, 0 ; total TS size = 1156 -wallFuelCorrection = scalar, F32, 1156, "", 1, 0 -wallFuel = scalar, F32, 1160, "", 1, 0 -; total TS size = 1164 -idleState = bits, S32, 1164, [0:2], "not important" -currentIdlePosition = scalar, F32, 1168 -baseIdlePosition = scalar, F32, 1172 -iacByTpsTaper = scalar, F32, 1176 -throttlePedalUpState = scalar, S32, 1180, "", 1, 0 -mightResetPid = bits, U32, 1184, [0:0] -shouldResetPid = bits, U32, 1184, [1:1] -wasResetPid = bits, U32, 1184, [2:2] -mustResetPid = bits, U32, 1184, [3:3] -isCranking = bits, U32, 1184, [4:4] -useIacTableForCoasting = bits, U32, 1184, [5:5] -notIdling = bits, U32, 1184, [6:6] -needReset = bits, U32, 1184, [7:7] -isInDeadZone = bits, U32, 1184, [8:8] -isBlipping = bits, U32, 1184, [9:9] -useClosedLoop = bits, U32, 1184, [10:10] -badTps = bits, U32, 1184, [11:11] -looksLikeRunning = bits, U32, 1184, [12:12] -looksLikeCoasting = bits, U32, 1184, [13:13] -looksLikeCrankToIdle = bits, U32, 1184, [14:14] -isVerboseIAC = bits, U32, 1184, [15:15] -isIdleCoasting = bits, U32, 1184, [16:16] -unusedBit_22_17 = bits, U32, 1184, [17:17] -unusedBit_22_18 = bits, U32, 1184, [18:18] -unusedBit_22_19 = bits, U32, 1184, [19:19] -unusedBit_22_20 = bits, U32, 1184, [20:20] -unusedBit_22_21 = bits, U32, 1184, [21:21] -unusedBit_22_22 = bits, U32, 1184, [22:22] -unusedBit_22_23 = bits, U32, 1184, [23:23] -unusedBit_22_24 = bits, U32, 1184, [24:24] -unusedBit_22_25 = bits, U32, 1184, [25:25] -unusedBit_22_26 = bits, U32, 1184, [26:26] -unusedBit_22_27 = bits, U32, 1184, [27:27] -unusedBit_22_28 = bits, U32, 1184, [28:28] -unusedBit_22_29 = bits, U32, 1184, [29:29] -unusedBit_22_30 = bits, U32, 1184, [30:30] -unusedBit_22_31 = bits, U32, 1184, [31:31] -targetRpmByClt = scalar, S32, 1188, "", 1, 0 -targetRpmAcBump = scalar, S32, 1192, "", 1, 0 -iacByRpmTaper = scalar, F32, 1196 -luaAdd = scalar, F32, 1200 -; total TS size = 1204 -baseDwell = scalar, F32, 1204, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 1208, "", 1, 0 -luaTimingAdd = scalar, F32, 1212, "", 1, 0 -luaTimingMult = scalar, F32, 1216, "", 1, 0 -; total TS size = 1220 -idlePosition = scalar, F32, 1220, "", 1, 0 -trim = scalar, F32, 1224, "", 1, 0 -luaAdjustment = scalar, F32, 1228, "", 1, 0 -etbFeedForward = scalar, F32, 1232 -etbIntegralError = scalar, F32, 1236, "", 1, 0 -etbCurrentTarget = scalar, F32, 1240, "%", 1, 0 -etbRevLimitActive = bits, U32, 1244, [0:0] -unusedBit_7_1 = bits, U32, 1244, [1:1] -unusedBit_7_2 = bits, U32, 1244, [2:2] -unusedBit_7_3 = bits, U32, 1244, [3:3] -unusedBit_7_4 = bits, U32, 1244, [4:4] -unusedBit_7_5 = bits, U32, 1244, [5:5] -unusedBit_7_6 = bits, U32, 1244, [6:6] -unusedBit_7_7 = bits, U32, 1244, [7:7] -unusedBit_7_8 = bits, U32, 1244, [8:8] -unusedBit_7_9 = bits, U32, 1244, [9:9] -unusedBit_7_10 = bits, U32, 1244, [10:10] -unusedBit_7_11 = bits, U32, 1244, [11:11] -unusedBit_7_12 = bits, U32, 1244, [12:12] -unusedBit_7_13 = bits, U32, 1244, [13:13] -unusedBit_7_14 = bits, U32, 1244, [14:14] -unusedBit_7_15 = bits, U32, 1244, [15:15] -unusedBit_7_16 = bits, U32, 1244, [16:16] -unusedBit_7_17 = bits, U32, 1244, [17:17] -unusedBit_7_18 = bits, U32, 1244, [18:18] -unusedBit_7_19 = bits, U32, 1244, [19:19] -unusedBit_7_20 = bits, U32, 1244, [20:20] -unusedBit_7_21 = bits, U32, 1244, [21:21] -unusedBit_7_22 = bits, U32, 1244, [22:22] -unusedBit_7_23 = bits, U32, 1244, [23:23] -unusedBit_7_24 = bits, U32, 1244, [24:24] -unusedBit_7_25 = bits, U32, 1244, [25:25] -unusedBit_7_26 = bits, U32, 1244, [26:26] -unusedBit_7_27 = bits, U32, 1244, [27:27] -unusedBit_7_28 = bits, U32, 1244, [28:28] -unusedBit_7_29 = bits, U32, 1244, [29:29] -unusedBit_7_30 = bits, U32, 1244, [30:30] -unusedBit_7_31 = bits, U32, 1244, [31:31] -; total TS size = 1248 -faultCode = scalar, U08, 1248, "", 1, 0 -heaterDuty = scalar, U08, 1249, "%", 1, 0 -pumpDuty = scalar, U08, 1250, "%", 1, 0 -tempC = scalar, U16, 1252, "C", 1, 0 -nernstVoltage = scalar, U16, 1254, "V", 0.001, 0 -esr = scalar, U16, 1256, "", 1, 0 -; total TS size = 1260 +m_hasSynchronizedPhase = bits, U32, 1156, [0:0] +unusedBit_1_1 = bits, U32, 1156, [1:1] +unusedBit_1_2 = bits, U32, 1156, [2:2] +unusedBit_1_3 = bits, U32, 1156, [3:3] +unusedBit_1_4 = bits, U32, 1156, [4:4] +unusedBit_1_5 = bits, U32, 1156, [5:5] +unusedBit_1_6 = bits, U32, 1156, [6:6] +unusedBit_1_7 = bits, U32, 1156, [7:7] +unusedBit_1_8 = bits, U32, 1156, [8:8] +unusedBit_1_9 = bits, U32, 1156, [9:9] +unusedBit_1_10 = bits, U32, 1156, [10:10] +unusedBit_1_11 = bits, U32, 1156, [11:11] +unusedBit_1_12 = bits, U32, 1156, [12:12] +unusedBit_1_13 = bits, U32, 1156, [13:13] +unusedBit_1_14 = bits, U32, 1156, [14:14] +unusedBit_1_15 = bits, U32, 1156, [15:15] +unusedBit_1_16 = bits, U32, 1156, [16:16] +unusedBit_1_17 = bits, U32, 1156, [17:17] +unusedBit_1_18 = bits, U32, 1156, [18:18] +unusedBit_1_19 = bits, U32, 1156, [19:19] +unusedBit_1_20 = bits, U32, 1156, [20:20] +unusedBit_1_21 = bits, U32, 1156, [21:21] +unusedBit_1_22 = bits, U32, 1156, [22:22] +unusedBit_1_23 = bits, U32, 1156, [23:23] +unusedBit_1_24 = bits, U32, 1156, [24:24] +unusedBit_1_25 = bits, U32, 1156, [25:25] +unusedBit_1_26 = bits, U32, 1156, [26:26] +unusedBit_1_27 = bits, U32, 1156, [27:27] +unusedBit_1_28 = bits, U32, 1156, [28:28] +unusedBit_1_29 = bits, U32, 1156, [29:29] +unusedBit_1_30 = bits, U32, 1156, [30:30] +unusedBit_1_31 = bits, U32, 1156, [31:31] +; total TS size = 1160 +wallFuelCorrection = scalar, F32, 1160, "", 1, 0 +wallFuel = scalar, F32, 1164, "", 1, 0 +; total TS size = 1168 +idleState = bits, S32, 1168, [0:2], "not important" +currentIdlePosition = scalar, F32, 1172 +baseIdlePosition = scalar, F32, 1176 +iacByTpsTaper = scalar, F32, 1180 +throttlePedalUpState = scalar, S32, 1184, "", 1, 0 +mightResetPid = bits, U32, 1188, [0:0] +shouldResetPid = bits, U32, 1188, [1:1] +wasResetPid = bits, U32, 1188, [2:2] +mustResetPid = bits, U32, 1188, [3:3] +isCranking = bits, U32, 1188, [4:4] +useIacTableForCoasting = bits, U32, 1188, [5:5] +notIdling = bits, U32, 1188, [6:6] +needReset = bits, U32, 1188, [7:7] +isInDeadZone = bits, U32, 1188, [8:8] +isBlipping = bits, U32, 1188, [9:9] +useClosedLoop = bits, U32, 1188, [10:10] +badTps = bits, U32, 1188, [11:11] +looksLikeRunning = bits, U32, 1188, [12:12] +looksLikeCoasting = bits, U32, 1188, [13:13] +looksLikeCrankToIdle = bits, U32, 1188, [14:14] +isVerboseIAC = bits, U32, 1188, [15:15] +isIdleCoasting = bits, U32, 1188, [16:16] +unusedBit_22_17 = bits, U32, 1188, [17:17] +unusedBit_22_18 = bits, U32, 1188, [18:18] +unusedBit_22_19 = bits, U32, 1188, [19:19] +unusedBit_22_20 = bits, U32, 1188, [20:20] +unusedBit_22_21 = bits, U32, 1188, [21:21] +unusedBit_22_22 = bits, U32, 1188, [22:22] +unusedBit_22_23 = bits, U32, 1188, [23:23] +unusedBit_22_24 = bits, U32, 1188, [24:24] +unusedBit_22_25 = bits, U32, 1188, [25:25] +unusedBit_22_26 = bits, U32, 1188, [26:26] +unusedBit_22_27 = bits, U32, 1188, [27:27] +unusedBit_22_28 = bits, U32, 1188, [28:28] +unusedBit_22_29 = bits, U32, 1188, [29:29] +unusedBit_22_30 = bits, U32, 1188, [30:30] +unusedBit_22_31 = bits, U32, 1188, [31:31] +targetRpmByClt = scalar, S32, 1192, "", 1, 0 +targetRpmAcBump = scalar, S32, 1196, "", 1, 0 +iacByRpmTaper = scalar, F32, 1200 +luaAdd = scalar, F32, 1204 +; total TS size = 1208 +baseDwell = scalar, F32, 1208, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 1212, "", 1, 0 +luaTimingAdd = scalar, F32, 1216, "", 1, 0 +luaTimingMult = scalar, F32, 1220, "", 1, 0 +; total TS size = 1224 +idlePosition = scalar, F32, 1224, "", 1, 0 +trim = scalar, F32, 1228, "", 1, 0 +luaAdjustment = scalar, F32, 1232, "", 1, 0 +etbFeedForward = scalar, F32, 1236 +etbIntegralError = scalar, F32, 1240, "", 1, 0 +etbCurrentTarget = scalar, F32, 1244, "%", 1, 0 +etbRevLimitActive = bits, U32, 1248, [0:0] +unusedBit_7_1 = bits, U32, 1248, [1:1] +unusedBit_7_2 = bits, U32, 1248, [2:2] +unusedBit_7_3 = bits, U32, 1248, [3:3] +unusedBit_7_4 = bits, U32, 1248, [4:4] +unusedBit_7_5 = bits, U32, 1248, [5:5] +unusedBit_7_6 = bits, U32, 1248, [6:6] +unusedBit_7_7 = bits, U32, 1248, [7:7] +unusedBit_7_8 = bits, U32, 1248, [8:8] +unusedBit_7_9 = bits, U32, 1248, [9:9] +unusedBit_7_10 = bits, U32, 1248, [10:10] +unusedBit_7_11 = bits, U32, 1248, [11:11] +unusedBit_7_12 = bits, U32, 1248, [12:12] +unusedBit_7_13 = bits, U32, 1248, [13:13] +unusedBit_7_14 = bits, U32, 1248, [14:14] +unusedBit_7_15 = bits, U32, 1248, [15:15] +unusedBit_7_16 = bits, U32, 1248, [16:16] +unusedBit_7_17 = bits, U32, 1248, [17:17] +unusedBit_7_18 = bits, U32, 1248, [18:18] +unusedBit_7_19 = bits, U32, 1248, [19:19] +unusedBit_7_20 = bits, U32, 1248, [20:20] +unusedBit_7_21 = bits, U32, 1248, [21:21] +unusedBit_7_22 = bits, U32, 1248, [22:22] +unusedBit_7_23 = bits, U32, 1248, [23:23] +unusedBit_7_24 = bits, U32, 1248, [24:24] +unusedBit_7_25 = bits, U32, 1248, [25:25] +unusedBit_7_26 = bits, U32, 1248, [26:26] +unusedBit_7_27 = bits, U32, 1248, [27:27] +unusedBit_7_28 = bits, U32, 1248, [28:28] +unusedBit_7_29 = bits, U32, 1248, [29:29] +unusedBit_7_30 = bits, U32, 1248, [30:30] +unusedBit_7_31 = bits, U32, 1248, [31:31] +; total TS size = 1252 +faultCode = scalar, U08, 1252, "", 1, 0 +heaterDuty = scalar, U08, 1253, "%", 1, 0 +pumpDuty = scalar, U08, 1254, "%", 1, 0 +tempC = scalar, U16, 1256, "C", 1, 0 +nernstVoltage = scalar, U16, 1258, "V", 0.001, 0 +esr = scalar, U16, 1260, "", 1, 0 +; total TS size = 1264 time = { timeNow } @@ -4993,6 +4994,7 @@ entry = mapVvt_MAP_AT_DIFF, "mapVvt_MAP_AT_DIFF", float, "%.3f" entry = mapVvt_MAP_AT_CYCLE_COUNT, "mapVvt_MAP_AT_CYCLE_COUNT", int, "%d" entry = mapVvt_map_peak, "mapVvt_map_peak", int, "%d" entry = currentEngineDecodedPhase, "Engine Phase", float, "%.3f" +entry = triggerToothAngleError, "triggerToothAngleError", float, "%.3f" entry = crankSynchronizationCounter, "Crank sync counter", int, "%d" entry = vvtSyncGapRatio, "vvtSyncGapRatio", float, "%.3f" entry = vvtCurrentPosition, "vvtCurrentPosition", float, "%.3f" @@ -5780,6 +5782,8 @@ dialog = trigger_centralDialog, "trigger_central" graphLine = mapVvt_MAP_AT_CYCLE_COUNT graphLine = mapVvt_map_peak graphLine = currentEngineDecodedPhase + liveGraph = trigger_central_4_Graph, "Graph", South + graphLine = triggerToothAngleError dialog = trigger_stateDialog, "trigger_state" diff --git a/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini b/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini index be87542ef9..265b9dca4b 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.09.24.hellen121nissan.2118782795" + signature = "rusEFI 2022.09.24.hellen121nissan.2032651090" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.09.24.hellen121nissan.2118782795" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.09.24.hellen121nissan.2032651090" ; 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 Fri Sep 23 23:16:01 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Sep 24 04:28:36 UTC 2022 pageSize = 22048 page = 1 @@ -2140,7 +2140,7 @@ ignBlends4_blendValues = array, U08, 22038, [8], "%", 0.5, 0, 0, 100, 1 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1260 + ochBlockSize = 1264 ; ; see TunerStudioOutputChannels struct @@ -3141,146 +3141,147 @@ mapVvt_MAP_AT_DIFF = scalar, F32, 1116, "", 1, 0 mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1120, "", 1, 0 mapVvt_map_peak = scalar, U08, 1121, "", 1, 0 currentEngineDecodedPhase = scalar, F32, 1124, "deg", 1, 0 -; total TS size = 1128 -crankSynchronizationCounter = scalar, U32, 1128, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1132, "", 1, 0 -vvtCurrentPosition = scalar, F32, 1136, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1140, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 1144, "", 1, 0 -triggerStateIndex = scalar, U08, 1148, "", 1, 0 -vvtCounter = scalar, U08, 1149, "", 1, 0 -camResyncCounter = scalar, U08, 1150, "", 1, 0 -vvtStateIndex = scalar, U08, 1151, "", 1, 0 -; total TS size = 1152 -m_hasSynchronizedPhase = bits, U32, 1152, [0:0] -unusedBit_1_1 = bits, U32, 1152, [1:1] -unusedBit_1_2 = bits, U32, 1152, [2:2] -unusedBit_1_3 = bits, U32, 1152, [3:3] -unusedBit_1_4 = bits, U32, 1152, [4:4] -unusedBit_1_5 = bits, U32, 1152, [5:5] -unusedBit_1_6 = bits, U32, 1152, [6:6] -unusedBit_1_7 = bits, U32, 1152, [7:7] -unusedBit_1_8 = bits, U32, 1152, [8:8] -unusedBit_1_9 = bits, U32, 1152, [9:9] -unusedBit_1_10 = bits, U32, 1152, [10:10] -unusedBit_1_11 = bits, U32, 1152, [11:11] -unusedBit_1_12 = bits, U32, 1152, [12:12] -unusedBit_1_13 = bits, U32, 1152, [13:13] -unusedBit_1_14 = bits, U32, 1152, [14:14] -unusedBit_1_15 = bits, U32, 1152, [15:15] -unusedBit_1_16 = bits, U32, 1152, [16:16] -unusedBit_1_17 = bits, U32, 1152, [17:17] -unusedBit_1_18 = bits, U32, 1152, [18:18] -unusedBit_1_19 = bits, U32, 1152, [19:19] -unusedBit_1_20 = bits, U32, 1152, [20:20] -unusedBit_1_21 = bits, U32, 1152, [21:21] -unusedBit_1_22 = bits, U32, 1152, [22:22] -unusedBit_1_23 = bits, U32, 1152, [23:23] -unusedBit_1_24 = bits, U32, 1152, [24:24] -unusedBit_1_25 = bits, U32, 1152, [25:25] -unusedBit_1_26 = bits, U32, 1152, [26:26] -unusedBit_1_27 = bits, U32, 1152, [27:27] -unusedBit_1_28 = bits, U32, 1152, [28:28] -unusedBit_1_29 = bits, U32, 1152, [29:29] -unusedBit_1_30 = bits, U32, 1152, [30:30] -unusedBit_1_31 = bits, U32, 1152, [31:31] +triggerToothAngleError = scalar, F32, 1128, "deg", 1, 0 +; total TS size = 1132 +crankSynchronizationCounter = scalar, U32, 1132, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1136, "", 1, 0 +vvtCurrentPosition = scalar, F32, 1140, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1144, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 1148, "", 1, 0 +triggerStateIndex = scalar, U08, 1152, "", 1, 0 +vvtCounter = scalar, U08, 1153, "", 1, 0 +camResyncCounter = scalar, U08, 1154, "", 1, 0 +vvtStateIndex = scalar, U08, 1155, "", 1, 0 ; total TS size = 1156 -wallFuelCorrection = scalar, F32, 1156, "", 1, 0 -wallFuel = scalar, F32, 1160, "", 1, 0 -; total TS size = 1164 -idleState = bits, S32, 1164, [0:2], "not important" -currentIdlePosition = scalar, F32, 1168 -baseIdlePosition = scalar, F32, 1172 -iacByTpsTaper = scalar, F32, 1176 -throttlePedalUpState = scalar, S32, 1180, "", 1, 0 -mightResetPid = bits, U32, 1184, [0:0] -shouldResetPid = bits, U32, 1184, [1:1] -wasResetPid = bits, U32, 1184, [2:2] -mustResetPid = bits, U32, 1184, [3:3] -isCranking = bits, U32, 1184, [4:4] -useIacTableForCoasting = bits, U32, 1184, [5:5] -notIdling = bits, U32, 1184, [6:6] -needReset = bits, U32, 1184, [7:7] -isInDeadZone = bits, U32, 1184, [8:8] -isBlipping = bits, U32, 1184, [9:9] -useClosedLoop = bits, U32, 1184, [10:10] -badTps = bits, U32, 1184, [11:11] -looksLikeRunning = bits, U32, 1184, [12:12] -looksLikeCoasting = bits, U32, 1184, [13:13] -looksLikeCrankToIdle = bits, U32, 1184, [14:14] -isVerboseIAC = bits, U32, 1184, [15:15] -isIdleCoasting = bits, U32, 1184, [16:16] -unusedBit_22_17 = bits, U32, 1184, [17:17] -unusedBit_22_18 = bits, U32, 1184, [18:18] -unusedBit_22_19 = bits, U32, 1184, [19:19] -unusedBit_22_20 = bits, U32, 1184, [20:20] -unusedBit_22_21 = bits, U32, 1184, [21:21] -unusedBit_22_22 = bits, U32, 1184, [22:22] -unusedBit_22_23 = bits, U32, 1184, [23:23] -unusedBit_22_24 = bits, U32, 1184, [24:24] -unusedBit_22_25 = bits, U32, 1184, [25:25] -unusedBit_22_26 = bits, U32, 1184, [26:26] -unusedBit_22_27 = bits, U32, 1184, [27:27] -unusedBit_22_28 = bits, U32, 1184, [28:28] -unusedBit_22_29 = bits, U32, 1184, [29:29] -unusedBit_22_30 = bits, U32, 1184, [30:30] -unusedBit_22_31 = bits, U32, 1184, [31:31] -targetRpmByClt = scalar, S32, 1188, "", 1, 0 -targetRpmAcBump = scalar, S32, 1192, "", 1, 0 -iacByRpmTaper = scalar, F32, 1196 -luaAdd = scalar, F32, 1200 -; total TS size = 1204 -baseDwell = scalar, F32, 1204, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 1208, "", 1, 0 -luaTimingAdd = scalar, F32, 1212, "", 1, 0 -luaTimingMult = scalar, F32, 1216, "", 1, 0 -; total TS size = 1220 -idlePosition = scalar, F32, 1220, "", 1, 0 -trim = scalar, F32, 1224, "", 1, 0 -luaAdjustment = scalar, F32, 1228, "", 1, 0 -etbFeedForward = scalar, F32, 1232 -etbIntegralError = scalar, F32, 1236, "", 1, 0 -etbCurrentTarget = scalar, F32, 1240, "%", 1, 0 -etbRevLimitActive = bits, U32, 1244, [0:0] -unusedBit_7_1 = bits, U32, 1244, [1:1] -unusedBit_7_2 = bits, U32, 1244, [2:2] -unusedBit_7_3 = bits, U32, 1244, [3:3] -unusedBit_7_4 = bits, U32, 1244, [4:4] -unusedBit_7_5 = bits, U32, 1244, [5:5] -unusedBit_7_6 = bits, U32, 1244, [6:6] -unusedBit_7_7 = bits, U32, 1244, [7:7] -unusedBit_7_8 = bits, U32, 1244, [8:8] -unusedBit_7_9 = bits, U32, 1244, [9:9] -unusedBit_7_10 = bits, U32, 1244, [10:10] -unusedBit_7_11 = bits, U32, 1244, [11:11] -unusedBit_7_12 = bits, U32, 1244, [12:12] -unusedBit_7_13 = bits, U32, 1244, [13:13] -unusedBit_7_14 = bits, U32, 1244, [14:14] -unusedBit_7_15 = bits, U32, 1244, [15:15] -unusedBit_7_16 = bits, U32, 1244, [16:16] -unusedBit_7_17 = bits, U32, 1244, [17:17] -unusedBit_7_18 = bits, U32, 1244, [18:18] -unusedBit_7_19 = bits, U32, 1244, [19:19] -unusedBit_7_20 = bits, U32, 1244, [20:20] -unusedBit_7_21 = bits, U32, 1244, [21:21] -unusedBit_7_22 = bits, U32, 1244, [22:22] -unusedBit_7_23 = bits, U32, 1244, [23:23] -unusedBit_7_24 = bits, U32, 1244, [24:24] -unusedBit_7_25 = bits, U32, 1244, [25:25] -unusedBit_7_26 = bits, U32, 1244, [26:26] -unusedBit_7_27 = bits, U32, 1244, [27:27] -unusedBit_7_28 = bits, U32, 1244, [28:28] -unusedBit_7_29 = bits, U32, 1244, [29:29] -unusedBit_7_30 = bits, U32, 1244, [30:30] -unusedBit_7_31 = bits, U32, 1244, [31:31] -; total TS size = 1248 -faultCode = scalar, U08, 1248, "", 1, 0 -heaterDuty = scalar, U08, 1249, "%", 1, 0 -pumpDuty = scalar, U08, 1250, "%", 1, 0 -tempC = scalar, U16, 1252, "C", 1, 0 -nernstVoltage = scalar, U16, 1254, "V", 0.001, 0 -esr = scalar, U16, 1256, "", 1, 0 -; total TS size = 1260 +m_hasSynchronizedPhase = bits, U32, 1156, [0:0] +unusedBit_1_1 = bits, U32, 1156, [1:1] +unusedBit_1_2 = bits, U32, 1156, [2:2] +unusedBit_1_3 = bits, U32, 1156, [3:3] +unusedBit_1_4 = bits, U32, 1156, [4:4] +unusedBit_1_5 = bits, U32, 1156, [5:5] +unusedBit_1_6 = bits, U32, 1156, [6:6] +unusedBit_1_7 = bits, U32, 1156, [7:7] +unusedBit_1_8 = bits, U32, 1156, [8:8] +unusedBit_1_9 = bits, U32, 1156, [9:9] +unusedBit_1_10 = bits, U32, 1156, [10:10] +unusedBit_1_11 = bits, U32, 1156, [11:11] +unusedBit_1_12 = bits, U32, 1156, [12:12] +unusedBit_1_13 = bits, U32, 1156, [13:13] +unusedBit_1_14 = bits, U32, 1156, [14:14] +unusedBit_1_15 = bits, U32, 1156, [15:15] +unusedBit_1_16 = bits, U32, 1156, [16:16] +unusedBit_1_17 = bits, U32, 1156, [17:17] +unusedBit_1_18 = bits, U32, 1156, [18:18] +unusedBit_1_19 = bits, U32, 1156, [19:19] +unusedBit_1_20 = bits, U32, 1156, [20:20] +unusedBit_1_21 = bits, U32, 1156, [21:21] +unusedBit_1_22 = bits, U32, 1156, [22:22] +unusedBit_1_23 = bits, U32, 1156, [23:23] +unusedBit_1_24 = bits, U32, 1156, [24:24] +unusedBit_1_25 = bits, U32, 1156, [25:25] +unusedBit_1_26 = bits, U32, 1156, [26:26] +unusedBit_1_27 = bits, U32, 1156, [27:27] +unusedBit_1_28 = bits, U32, 1156, [28:28] +unusedBit_1_29 = bits, U32, 1156, [29:29] +unusedBit_1_30 = bits, U32, 1156, [30:30] +unusedBit_1_31 = bits, U32, 1156, [31:31] +; total TS size = 1160 +wallFuelCorrection = scalar, F32, 1160, "", 1, 0 +wallFuel = scalar, F32, 1164, "", 1, 0 +; total TS size = 1168 +idleState = bits, S32, 1168, [0:2], "not important" +currentIdlePosition = scalar, F32, 1172 +baseIdlePosition = scalar, F32, 1176 +iacByTpsTaper = scalar, F32, 1180 +throttlePedalUpState = scalar, S32, 1184, "", 1, 0 +mightResetPid = bits, U32, 1188, [0:0] +shouldResetPid = bits, U32, 1188, [1:1] +wasResetPid = bits, U32, 1188, [2:2] +mustResetPid = bits, U32, 1188, [3:3] +isCranking = bits, U32, 1188, [4:4] +useIacTableForCoasting = bits, U32, 1188, [5:5] +notIdling = bits, U32, 1188, [6:6] +needReset = bits, U32, 1188, [7:7] +isInDeadZone = bits, U32, 1188, [8:8] +isBlipping = bits, U32, 1188, [9:9] +useClosedLoop = bits, U32, 1188, [10:10] +badTps = bits, U32, 1188, [11:11] +looksLikeRunning = bits, U32, 1188, [12:12] +looksLikeCoasting = bits, U32, 1188, [13:13] +looksLikeCrankToIdle = bits, U32, 1188, [14:14] +isVerboseIAC = bits, U32, 1188, [15:15] +isIdleCoasting = bits, U32, 1188, [16:16] +unusedBit_22_17 = bits, U32, 1188, [17:17] +unusedBit_22_18 = bits, U32, 1188, [18:18] +unusedBit_22_19 = bits, U32, 1188, [19:19] +unusedBit_22_20 = bits, U32, 1188, [20:20] +unusedBit_22_21 = bits, U32, 1188, [21:21] +unusedBit_22_22 = bits, U32, 1188, [22:22] +unusedBit_22_23 = bits, U32, 1188, [23:23] +unusedBit_22_24 = bits, U32, 1188, [24:24] +unusedBit_22_25 = bits, U32, 1188, [25:25] +unusedBit_22_26 = bits, U32, 1188, [26:26] +unusedBit_22_27 = bits, U32, 1188, [27:27] +unusedBit_22_28 = bits, U32, 1188, [28:28] +unusedBit_22_29 = bits, U32, 1188, [29:29] +unusedBit_22_30 = bits, U32, 1188, [30:30] +unusedBit_22_31 = bits, U32, 1188, [31:31] +targetRpmByClt = scalar, S32, 1192, "", 1, 0 +targetRpmAcBump = scalar, S32, 1196, "", 1, 0 +iacByRpmTaper = scalar, F32, 1200 +luaAdd = scalar, F32, 1204 +; total TS size = 1208 +baseDwell = scalar, F32, 1208, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 1212, "", 1, 0 +luaTimingAdd = scalar, F32, 1216, "", 1, 0 +luaTimingMult = scalar, F32, 1220, "", 1, 0 +; total TS size = 1224 +idlePosition = scalar, F32, 1224, "", 1, 0 +trim = scalar, F32, 1228, "", 1, 0 +luaAdjustment = scalar, F32, 1232, "", 1, 0 +etbFeedForward = scalar, F32, 1236 +etbIntegralError = scalar, F32, 1240, "", 1, 0 +etbCurrentTarget = scalar, F32, 1244, "%", 1, 0 +etbRevLimitActive = bits, U32, 1248, [0:0] +unusedBit_7_1 = bits, U32, 1248, [1:1] +unusedBit_7_2 = bits, U32, 1248, [2:2] +unusedBit_7_3 = bits, U32, 1248, [3:3] +unusedBit_7_4 = bits, U32, 1248, [4:4] +unusedBit_7_5 = bits, U32, 1248, [5:5] +unusedBit_7_6 = bits, U32, 1248, [6:6] +unusedBit_7_7 = bits, U32, 1248, [7:7] +unusedBit_7_8 = bits, U32, 1248, [8:8] +unusedBit_7_9 = bits, U32, 1248, [9:9] +unusedBit_7_10 = bits, U32, 1248, [10:10] +unusedBit_7_11 = bits, U32, 1248, [11:11] +unusedBit_7_12 = bits, U32, 1248, [12:12] +unusedBit_7_13 = bits, U32, 1248, [13:13] +unusedBit_7_14 = bits, U32, 1248, [14:14] +unusedBit_7_15 = bits, U32, 1248, [15:15] +unusedBit_7_16 = bits, U32, 1248, [16:16] +unusedBit_7_17 = bits, U32, 1248, [17:17] +unusedBit_7_18 = bits, U32, 1248, [18:18] +unusedBit_7_19 = bits, U32, 1248, [19:19] +unusedBit_7_20 = bits, U32, 1248, [20:20] +unusedBit_7_21 = bits, U32, 1248, [21:21] +unusedBit_7_22 = bits, U32, 1248, [22:22] +unusedBit_7_23 = bits, U32, 1248, [23:23] +unusedBit_7_24 = bits, U32, 1248, [24:24] +unusedBit_7_25 = bits, U32, 1248, [25:25] +unusedBit_7_26 = bits, U32, 1248, [26:26] +unusedBit_7_27 = bits, U32, 1248, [27:27] +unusedBit_7_28 = bits, U32, 1248, [28:28] +unusedBit_7_29 = bits, U32, 1248, [29:29] +unusedBit_7_30 = bits, U32, 1248, [30:30] +unusedBit_7_31 = bits, U32, 1248, [31:31] +; total TS size = 1252 +faultCode = scalar, U08, 1252, "", 1, 0 +heaterDuty = scalar, U08, 1253, "%", 1, 0 +pumpDuty = scalar, U08, 1254, "%", 1, 0 +tempC = scalar, U16, 1256, "C", 1, 0 +nernstVoltage = scalar, U16, 1258, "V", 0.001, 0 +esr = scalar, U16, 1260, "", 1, 0 +; total TS size = 1264 time = { timeNow } @@ -4993,6 +4994,7 @@ entry = mapVvt_MAP_AT_DIFF, "mapVvt_MAP_AT_DIFF", float, "%.3f" entry = mapVvt_MAP_AT_CYCLE_COUNT, "mapVvt_MAP_AT_CYCLE_COUNT", int, "%d" entry = mapVvt_map_peak, "mapVvt_map_peak", int, "%d" entry = currentEngineDecodedPhase, "Engine Phase", float, "%.3f" +entry = triggerToothAngleError, "triggerToothAngleError", float, "%.3f" entry = crankSynchronizationCounter, "Crank sync counter", int, "%d" entry = vvtSyncGapRatio, "vvtSyncGapRatio", float, "%.3f" entry = vvtCurrentPosition, "vvtCurrentPosition", float, "%.3f" @@ -5780,6 +5782,8 @@ dialog = trigger_centralDialog, "trigger_central" graphLine = mapVvt_MAP_AT_CYCLE_COUNT graphLine = mapVvt_map_peak graphLine = currentEngineDecodedPhase + liveGraph = trigger_central_4_Graph, "Graph", South + graphLine = triggerToothAngleError dialog = trigger_stateDialog, "trigger_state" diff --git a/firmware/tunerstudio/generated/rusefi_hellen121vag.ini b/firmware/tunerstudio/generated/rusefi_hellen121vag.ini index a88417e8cc..a1b7a65b9e 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.09.24.hellen121vag.2260038875" + signature = "rusEFI 2022.09.24.hellen121vag.2178461890" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.09.24.hellen121vag.2260038875" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.09.24.hellen121vag.2178461890" ; 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 Fri Sep 23 23:15:59 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Sep 24 04:28:34 UTC 2022 pageSize = 22048 page = 1 @@ -2140,7 +2140,7 @@ ignBlends4_blendValues = array, U08, 22038, [8], "%", 0.5, 0, 0, 100, 1 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1260 + ochBlockSize = 1264 ; ; see TunerStudioOutputChannels struct @@ -3141,146 +3141,147 @@ mapVvt_MAP_AT_DIFF = scalar, F32, 1116, "", 1, 0 mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1120, "", 1, 0 mapVvt_map_peak = scalar, U08, 1121, "", 1, 0 currentEngineDecodedPhase = scalar, F32, 1124, "deg", 1, 0 -; total TS size = 1128 -crankSynchronizationCounter = scalar, U32, 1128, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1132, "", 1, 0 -vvtCurrentPosition = scalar, F32, 1136, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1140, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 1144, "", 1, 0 -triggerStateIndex = scalar, U08, 1148, "", 1, 0 -vvtCounter = scalar, U08, 1149, "", 1, 0 -camResyncCounter = scalar, U08, 1150, "", 1, 0 -vvtStateIndex = scalar, U08, 1151, "", 1, 0 -; total TS size = 1152 -m_hasSynchronizedPhase = bits, U32, 1152, [0:0] -unusedBit_1_1 = bits, U32, 1152, [1:1] -unusedBit_1_2 = bits, U32, 1152, [2:2] -unusedBit_1_3 = bits, U32, 1152, [3:3] -unusedBit_1_4 = bits, U32, 1152, [4:4] -unusedBit_1_5 = bits, U32, 1152, [5:5] -unusedBit_1_6 = bits, U32, 1152, [6:6] -unusedBit_1_7 = bits, U32, 1152, [7:7] -unusedBit_1_8 = bits, U32, 1152, [8:8] -unusedBit_1_9 = bits, U32, 1152, [9:9] -unusedBit_1_10 = bits, U32, 1152, [10:10] -unusedBit_1_11 = bits, U32, 1152, [11:11] -unusedBit_1_12 = bits, U32, 1152, [12:12] -unusedBit_1_13 = bits, U32, 1152, [13:13] -unusedBit_1_14 = bits, U32, 1152, [14:14] -unusedBit_1_15 = bits, U32, 1152, [15:15] -unusedBit_1_16 = bits, U32, 1152, [16:16] -unusedBit_1_17 = bits, U32, 1152, [17:17] -unusedBit_1_18 = bits, U32, 1152, [18:18] -unusedBit_1_19 = bits, U32, 1152, [19:19] -unusedBit_1_20 = bits, U32, 1152, [20:20] -unusedBit_1_21 = bits, U32, 1152, [21:21] -unusedBit_1_22 = bits, U32, 1152, [22:22] -unusedBit_1_23 = bits, U32, 1152, [23:23] -unusedBit_1_24 = bits, U32, 1152, [24:24] -unusedBit_1_25 = bits, U32, 1152, [25:25] -unusedBit_1_26 = bits, U32, 1152, [26:26] -unusedBit_1_27 = bits, U32, 1152, [27:27] -unusedBit_1_28 = bits, U32, 1152, [28:28] -unusedBit_1_29 = bits, U32, 1152, [29:29] -unusedBit_1_30 = bits, U32, 1152, [30:30] -unusedBit_1_31 = bits, U32, 1152, [31:31] +triggerToothAngleError = scalar, F32, 1128, "deg", 1, 0 +; total TS size = 1132 +crankSynchronizationCounter = scalar, U32, 1132, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1136, "", 1, 0 +vvtCurrentPosition = scalar, F32, 1140, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1144, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 1148, "", 1, 0 +triggerStateIndex = scalar, U08, 1152, "", 1, 0 +vvtCounter = scalar, U08, 1153, "", 1, 0 +camResyncCounter = scalar, U08, 1154, "", 1, 0 +vvtStateIndex = scalar, U08, 1155, "", 1, 0 ; total TS size = 1156 -wallFuelCorrection = scalar, F32, 1156, "", 1, 0 -wallFuel = scalar, F32, 1160, "", 1, 0 -; total TS size = 1164 -idleState = bits, S32, 1164, [0:2], "not important" -currentIdlePosition = scalar, F32, 1168 -baseIdlePosition = scalar, F32, 1172 -iacByTpsTaper = scalar, F32, 1176 -throttlePedalUpState = scalar, S32, 1180, "", 1, 0 -mightResetPid = bits, U32, 1184, [0:0] -shouldResetPid = bits, U32, 1184, [1:1] -wasResetPid = bits, U32, 1184, [2:2] -mustResetPid = bits, U32, 1184, [3:3] -isCranking = bits, U32, 1184, [4:4] -useIacTableForCoasting = bits, U32, 1184, [5:5] -notIdling = bits, U32, 1184, [6:6] -needReset = bits, U32, 1184, [7:7] -isInDeadZone = bits, U32, 1184, [8:8] -isBlipping = bits, U32, 1184, [9:9] -useClosedLoop = bits, U32, 1184, [10:10] -badTps = bits, U32, 1184, [11:11] -looksLikeRunning = bits, U32, 1184, [12:12] -looksLikeCoasting = bits, U32, 1184, [13:13] -looksLikeCrankToIdle = bits, U32, 1184, [14:14] -isVerboseIAC = bits, U32, 1184, [15:15] -isIdleCoasting = bits, U32, 1184, [16:16] -unusedBit_22_17 = bits, U32, 1184, [17:17] -unusedBit_22_18 = bits, U32, 1184, [18:18] -unusedBit_22_19 = bits, U32, 1184, [19:19] -unusedBit_22_20 = bits, U32, 1184, [20:20] -unusedBit_22_21 = bits, U32, 1184, [21:21] -unusedBit_22_22 = bits, U32, 1184, [22:22] -unusedBit_22_23 = bits, U32, 1184, [23:23] -unusedBit_22_24 = bits, U32, 1184, [24:24] -unusedBit_22_25 = bits, U32, 1184, [25:25] -unusedBit_22_26 = bits, U32, 1184, [26:26] -unusedBit_22_27 = bits, U32, 1184, [27:27] -unusedBit_22_28 = bits, U32, 1184, [28:28] -unusedBit_22_29 = bits, U32, 1184, [29:29] -unusedBit_22_30 = bits, U32, 1184, [30:30] -unusedBit_22_31 = bits, U32, 1184, [31:31] -targetRpmByClt = scalar, S32, 1188, "", 1, 0 -targetRpmAcBump = scalar, S32, 1192, "", 1, 0 -iacByRpmTaper = scalar, F32, 1196 -luaAdd = scalar, F32, 1200 -; total TS size = 1204 -baseDwell = scalar, F32, 1204, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 1208, "", 1, 0 -luaTimingAdd = scalar, F32, 1212, "", 1, 0 -luaTimingMult = scalar, F32, 1216, "", 1, 0 -; total TS size = 1220 -idlePosition = scalar, F32, 1220, "", 1, 0 -trim = scalar, F32, 1224, "", 1, 0 -luaAdjustment = scalar, F32, 1228, "", 1, 0 -etbFeedForward = scalar, F32, 1232 -etbIntegralError = scalar, F32, 1236, "", 1, 0 -etbCurrentTarget = scalar, F32, 1240, "%", 1, 0 -etbRevLimitActive = bits, U32, 1244, [0:0] -unusedBit_7_1 = bits, U32, 1244, [1:1] -unusedBit_7_2 = bits, U32, 1244, [2:2] -unusedBit_7_3 = bits, U32, 1244, [3:3] -unusedBit_7_4 = bits, U32, 1244, [4:4] -unusedBit_7_5 = bits, U32, 1244, [5:5] -unusedBit_7_6 = bits, U32, 1244, [6:6] -unusedBit_7_7 = bits, U32, 1244, [7:7] -unusedBit_7_8 = bits, U32, 1244, [8:8] -unusedBit_7_9 = bits, U32, 1244, [9:9] -unusedBit_7_10 = bits, U32, 1244, [10:10] -unusedBit_7_11 = bits, U32, 1244, [11:11] -unusedBit_7_12 = bits, U32, 1244, [12:12] -unusedBit_7_13 = bits, U32, 1244, [13:13] -unusedBit_7_14 = bits, U32, 1244, [14:14] -unusedBit_7_15 = bits, U32, 1244, [15:15] -unusedBit_7_16 = bits, U32, 1244, [16:16] -unusedBit_7_17 = bits, U32, 1244, [17:17] -unusedBit_7_18 = bits, U32, 1244, [18:18] -unusedBit_7_19 = bits, U32, 1244, [19:19] -unusedBit_7_20 = bits, U32, 1244, [20:20] -unusedBit_7_21 = bits, U32, 1244, [21:21] -unusedBit_7_22 = bits, U32, 1244, [22:22] -unusedBit_7_23 = bits, U32, 1244, [23:23] -unusedBit_7_24 = bits, U32, 1244, [24:24] -unusedBit_7_25 = bits, U32, 1244, [25:25] -unusedBit_7_26 = bits, U32, 1244, [26:26] -unusedBit_7_27 = bits, U32, 1244, [27:27] -unusedBit_7_28 = bits, U32, 1244, [28:28] -unusedBit_7_29 = bits, U32, 1244, [29:29] -unusedBit_7_30 = bits, U32, 1244, [30:30] -unusedBit_7_31 = bits, U32, 1244, [31:31] -; total TS size = 1248 -faultCode = scalar, U08, 1248, "", 1, 0 -heaterDuty = scalar, U08, 1249, "%", 1, 0 -pumpDuty = scalar, U08, 1250, "%", 1, 0 -tempC = scalar, U16, 1252, "C", 1, 0 -nernstVoltage = scalar, U16, 1254, "V", 0.001, 0 -esr = scalar, U16, 1256, "", 1, 0 -; total TS size = 1260 +m_hasSynchronizedPhase = bits, U32, 1156, [0:0] +unusedBit_1_1 = bits, U32, 1156, [1:1] +unusedBit_1_2 = bits, U32, 1156, [2:2] +unusedBit_1_3 = bits, U32, 1156, [3:3] +unusedBit_1_4 = bits, U32, 1156, [4:4] +unusedBit_1_5 = bits, U32, 1156, [5:5] +unusedBit_1_6 = bits, U32, 1156, [6:6] +unusedBit_1_7 = bits, U32, 1156, [7:7] +unusedBit_1_8 = bits, U32, 1156, [8:8] +unusedBit_1_9 = bits, U32, 1156, [9:9] +unusedBit_1_10 = bits, U32, 1156, [10:10] +unusedBit_1_11 = bits, U32, 1156, [11:11] +unusedBit_1_12 = bits, U32, 1156, [12:12] +unusedBit_1_13 = bits, U32, 1156, [13:13] +unusedBit_1_14 = bits, U32, 1156, [14:14] +unusedBit_1_15 = bits, U32, 1156, [15:15] +unusedBit_1_16 = bits, U32, 1156, [16:16] +unusedBit_1_17 = bits, U32, 1156, [17:17] +unusedBit_1_18 = bits, U32, 1156, [18:18] +unusedBit_1_19 = bits, U32, 1156, [19:19] +unusedBit_1_20 = bits, U32, 1156, [20:20] +unusedBit_1_21 = bits, U32, 1156, [21:21] +unusedBit_1_22 = bits, U32, 1156, [22:22] +unusedBit_1_23 = bits, U32, 1156, [23:23] +unusedBit_1_24 = bits, U32, 1156, [24:24] +unusedBit_1_25 = bits, U32, 1156, [25:25] +unusedBit_1_26 = bits, U32, 1156, [26:26] +unusedBit_1_27 = bits, U32, 1156, [27:27] +unusedBit_1_28 = bits, U32, 1156, [28:28] +unusedBit_1_29 = bits, U32, 1156, [29:29] +unusedBit_1_30 = bits, U32, 1156, [30:30] +unusedBit_1_31 = bits, U32, 1156, [31:31] +; total TS size = 1160 +wallFuelCorrection = scalar, F32, 1160, "", 1, 0 +wallFuel = scalar, F32, 1164, "", 1, 0 +; total TS size = 1168 +idleState = bits, S32, 1168, [0:2], "not important" +currentIdlePosition = scalar, F32, 1172 +baseIdlePosition = scalar, F32, 1176 +iacByTpsTaper = scalar, F32, 1180 +throttlePedalUpState = scalar, S32, 1184, "", 1, 0 +mightResetPid = bits, U32, 1188, [0:0] +shouldResetPid = bits, U32, 1188, [1:1] +wasResetPid = bits, U32, 1188, [2:2] +mustResetPid = bits, U32, 1188, [3:3] +isCranking = bits, U32, 1188, [4:4] +useIacTableForCoasting = bits, U32, 1188, [5:5] +notIdling = bits, U32, 1188, [6:6] +needReset = bits, U32, 1188, [7:7] +isInDeadZone = bits, U32, 1188, [8:8] +isBlipping = bits, U32, 1188, [9:9] +useClosedLoop = bits, U32, 1188, [10:10] +badTps = bits, U32, 1188, [11:11] +looksLikeRunning = bits, U32, 1188, [12:12] +looksLikeCoasting = bits, U32, 1188, [13:13] +looksLikeCrankToIdle = bits, U32, 1188, [14:14] +isVerboseIAC = bits, U32, 1188, [15:15] +isIdleCoasting = bits, U32, 1188, [16:16] +unusedBit_22_17 = bits, U32, 1188, [17:17] +unusedBit_22_18 = bits, U32, 1188, [18:18] +unusedBit_22_19 = bits, U32, 1188, [19:19] +unusedBit_22_20 = bits, U32, 1188, [20:20] +unusedBit_22_21 = bits, U32, 1188, [21:21] +unusedBit_22_22 = bits, U32, 1188, [22:22] +unusedBit_22_23 = bits, U32, 1188, [23:23] +unusedBit_22_24 = bits, U32, 1188, [24:24] +unusedBit_22_25 = bits, U32, 1188, [25:25] +unusedBit_22_26 = bits, U32, 1188, [26:26] +unusedBit_22_27 = bits, U32, 1188, [27:27] +unusedBit_22_28 = bits, U32, 1188, [28:28] +unusedBit_22_29 = bits, U32, 1188, [29:29] +unusedBit_22_30 = bits, U32, 1188, [30:30] +unusedBit_22_31 = bits, U32, 1188, [31:31] +targetRpmByClt = scalar, S32, 1192, "", 1, 0 +targetRpmAcBump = scalar, S32, 1196, "", 1, 0 +iacByRpmTaper = scalar, F32, 1200 +luaAdd = scalar, F32, 1204 +; total TS size = 1208 +baseDwell = scalar, F32, 1208, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 1212, "", 1, 0 +luaTimingAdd = scalar, F32, 1216, "", 1, 0 +luaTimingMult = scalar, F32, 1220, "", 1, 0 +; total TS size = 1224 +idlePosition = scalar, F32, 1224, "", 1, 0 +trim = scalar, F32, 1228, "", 1, 0 +luaAdjustment = scalar, F32, 1232, "", 1, 0 +etbFeedForward = scalar, F32, 1236 +etbIntegralError = scalar, F32, 1240, "", 1, 0 +etbCurrentTarget = scalar, F32, 1244, "%", 1, 0 +etbRevLimitActive = bits, U32, 1248, [0:0] +unusedBit_7_1 = bits, U32, 1248, [1:1] +unusedBit_7_2 = bits, U32, 1248, [2:2] +unusedBit_7_3 = bits, U32, 1248, [3:3] +unusedBit_7_4 = bits, U32, 1248, [4:4] +unusedBit_7_5 = bits, U32, 1248, [5:5] +unusedBit_7_6 = bits, U32, 1248, [6:6] +unusedBit_7_7 = bits, U32, 1248, [7:7] +unusedBit_7_8 = bits, U32, 1248, [8:8] +unusedBit_7_9 = bits, U32, 1248, [9:9] +unusedBit_7_10 = bits, U32, 1248, [10:10] +unusedBit_7_11 = bits, U32, 1248, [11:11] +unusedBit_7_12 = bits, U32, 1248, [12:12] +unusedBit_7_13 = bits, U32, 1248, [13:13] +unusedBit_7_14 = bits, U32, 1248, [14:14] +unusedBit_7_15 = bits, U32, 1248, [15:15] +unusedBit_7_16 = bits, U32, 1248, [16:16] +unusedBit_7_17 = bits, U32, 1248, [17:17] +unusedBit_7_18 = bits, U32, 1248, [18:18] +unusedBit_7_19 = bits, U32, 1248, [19:19] +unusedBit_7_20 = bits, U32, 1248, [20:20] +unusedBit_7_21 = bits, U32, 1248, [21:21] +unusedBit_7_22 = bits, U32, 1248, [22:22] +unusedBit_7_23 = bits, U32, 1248, [23:23] +unusedBit_7_24 = bits, U32, 1248, [24:24] +unusedBit_7_25 = bits, U32, 1248, [25:25] +unusedBit_7_26 = bits, U32, 1248, [26:26] +unusedBit_7_27 = bits, U32, 1248, [27:27] +unusedBit_7_28 = bits, U32, 1248, [28:28] +unusedBit_7_29 = bits, U32, 1248, [29:29] +unusedBit_7_30 = bits, U32, 1248, [30:30] +unusedBit_7_31 = bits, U32, 1248, [31:31] +; total TS size = 1252 +faultCode = scalar, U08, 1252, "", 1, 0 +heaterDuty = scalar, U08, 1253, "%", 1, 0 +pumpDuty = scalar, U08, 1254, "%", 1, 0 +tempC = scalar, U16, 1256, "C", 1, 0 +nernstVoltage = scalar, U16, 1258, "V", 0.001, 0 +esr = scalar, U16, 1260, "", 1, 0 +; total TS size = 1264 time = { timeNow } @@ -4993,6 +4994,7 @@ entry = mapVvt_MAP_AT_DIFF, "mapVvt_MAP_AT_DIFF", float, "%.3f" entry = mapVvt_MAP_AT_CYCLE_COUNT, "mapVvt_MAP_AT_CYCLE_COUNT", int, "%d" entry = mapVvt_map_peak, "mapVvt_map_peak", int, "%d" entry = currentEngineDecodedPhase, "Engine Phase", float, "%.3f" +entry = triggerToothAngleError, "triggerToothAngleError", float, "%.3f" entry = crankSynchronizationCounter, "Crank sync counter", int, "%d" entry = vvtSyncGapRatio, "vvtSyncGapRatio", float, "%.3f" entry = vvtCurrentPosition, "vvtCurrentPosition", float, "%.3f" @@ -5780,6 +5782,8 @@ dialog = trigger_centralDialog, "trigger_central" graphLine = mapVvt_MAP_AT_CYCLE_COUNT graphLine = mapVvt_map_peak graphLine = currentEngineDecodedPhase + liveGraph = trigger_central_4_Graph, "Graph", South + graphLine = triggerToothAngleError dialog = trigger_stateDialog, "trigger_state" diff --git a/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini b/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini index 71e5f53dc6..763d2284a5 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.09.24.hellen128.141200031" + signature = "rusEFI 2022.09.24.hellen128.252137094" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.09.24.hellen128.141200031" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.09.24.hellen128.252137094" ; 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 Fri Sep 23 23:15:57 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Sep 24 04:28:32 UTC 2022 pageSize = 22048 page = 1 @@ -2140,7 +2140,7 @@ ignBlends4_blendValues = array, U08, 22038, [8], "%", 0.5, 0, 0, 100, 1 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1260 + ochBlockSize = 1264 ; ; see TunerStudioOutputChannels struct @@ -3141,146 +3141,147 @@ mapVvt_MAP_AT_DIFF = scalar, F32, 1116, "", 1, 0 mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1120, "", 1, 0 mapVvt_map_peak = scalar, U08, 1121, "", 1, 0 currentEngineDecodedPhase = scalar, F32, 1124, "deg", 1, 0 -; total TS size = 1128 -crankSynchronizationCounter = scalar, U32, 1128, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1132, "", 1, 0 -vvtCurrentPosition = scalar, F32, 1136, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1140, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 1144, "", 1, 0 -triggerStateIndex = scalar, U08, 1148, "", 1, 0 -vvtCounter = scalar, U08, 1149, "", 1, 0 -camResyncCounter = scalar, U08, 1150, "", 1, 0 -vvtStateIndex = scalar, U08, 1151, "", 1, 0 -; total TS size = 1152 -m_hasSynchronizedPhase = bits, U32, 1152, [0:0] -unusedBit_1_1 = bits, U32, 1152, [1:1] -unusedBit_1_2 = bits, U32, 1152, [2:2] -unusedBit_1_3 = bits, U32, 1152, [3:3] -unusedBit_1_4 = bits, U32, 1152, [4:4] -unusedBit_1_5 = bits, U32, 1152, [5:5] -unusedBit_1_6 = bits, U32, 1152, [6:6] -unusedBit_1_7 = bits, U32, 1152, [7:7] -unusedBit_1_8 = bits, U32, 1152, [8:8] -unusedBit_1_9 = bits, U32, 1152, [9:9] -unusedBit_1_10 = bits, U32, 1152, [10:10] -unusedBit_1_11 = bits, U32, 1152, [11:11] -unusedBit_1_12 = bits, U32, 1152, [12:12] -unusedBit_1_13 = bits, U32, 1152, [13:13] -unusedBit_1_14 = bits, U32, 1152, [14:14] -unusedBit_1_15 = bits, U32, 1152, [15:15] -unusedBit_1_16 = bits, U32, 1152, [16:16] -unusedBit_1_17 = bits, U32, 1152, [17:17] -unusedBit_1_18 = bits, U32, 1152, [18:18] -unusedBit_1_19 = bits, U32, 1152, [19:19] -unusedBit_1_20 = bits, U32, 1152, [20:20] -unusedBit_1_21 = bits, U32, 1152, [21:21] -unusedBit_1_22 = bits, U32, 1152, [22:22] -unusedBit_1_23 = bits, U32, 1152, [23:23] -unusedBit_1_24 = bits, U32, 1152, [24:24] -unusedBit_1_25 = bits, U32, 1152, [25:25] -unusedBit_1_26 = bits, U32, 1152, [26:26] -unusedBit_1_27 = bits, U32, 1152, [27:27] -unusedBit_1_28 = bits, U32, 1152, [28:28] -unusedBit_1_29 = bits, U32, 1152, [29:29] -unusedBit_1_30 = bits, U32, 1152, [30:30] -unusedBit_1_31 = bits, U32, 1152, [31:31] +triggerToothAngleError = scalar, F32, 1128, "deg", 1, 0 +; total TS size = 1132 +crankSynchronizationCounter = scalar, U32, 1132, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1136, "", 1, 0 +vvtCurrentPosition = scalar, F32, 1140, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1144, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 1148, "", 1, 0 +triggerStateIndex = scalar, U08, 1152, "", 1, 0 +vvtCounter = scalar, U08, 1153, "", 1, 0 +camResyncCounter = scalar, U08, 1154, "", 1, 0 +vvtStateIndex = scalar, U08, 1155, "", 1, 0 ; total TS size = 1156 -wallFuelCorrection = scalar, F32, 1156, "", 1, 0 -wallFuel = scalar, F32, 1160, "", 1, 0 -; total TS size = 1164 -idleState = bits, S32, 1164, [0:2], "not important" -currentIdlePosition = scalar, F32, 1168 -baseIdlePosition = scalar, F32, 1172 -iacByTpsTaper = scalar, F32, 1176 -throttlePedalUpState = scalar, S32, 1180, "", 1, 0 -mightResetPid = bits, U32, 1184, [0:0] -shouldResetPid = bits, U32, 1184, [1:1] -wasResetPid = bits, U32, 1184, [2:2] -mustResetPid = bits, U32, 1184, [3:3] -isCranking = bits, U32, 1184, [4:4] -useIacTableForCoasting = bits, U32, 1184, [5:5] -notIdling = bits, U32, 1184, [6:6] -needReset = bits, U32, 1184, [7:7] -isInDeadZone = bits, U32, 1184, [8:8] -isBlipping = bits, U32, 1184, [9:9] -useClosedLoop = bits, U32, 1184, [10:10] -badTps = bits, U32, 1184, [11:11] -looksLikeRunning = bits, U32, 1184, [12:12] -looksLikeCoasting = bits, U32, 1184, [13:13] -looksLikeCrankToIdle = bits, U32, 1184, [14:14] -isVerboseIAC = bits, U32, 1184, [15:15] -isIdleCoasting = bits, U32, 1184, [16:16] -unusedBit_22_17 = bits, U32, 1184, [17:17] -unusedBit_22_18 = bits, U32, 1184, [18:18] -unusedBit_22_19 = bits, U32, 1184, [19:19] -unusedBit_22_20 = bits, U32, 1184, [20:20] -unusedBit_22_21 = bits, U32, 1184, [21:21] -unusedBit_22_22 = bits, U32, 1184, [22:22] -unusedBit_22_23 = bits, U32, 1184, [23:23] -unusedBit_22_24 = bits, U32, 1184, [24:24] -unusedBit_22_25 = bits, U32, 1184, [25:25] -unusedBit_22_26 = bits, U32, 1184, [26:26] -unusedBit_22_27 = bits, U32, 1184, [27:27] -unusedBit_22_28 = bits, U32, 1184, [28:28] -unusedBit_22_29 = bits, U32, 1184, [29:29] -unusedBit_22_30 = bits, U32, 1184, [30:30] -unusedBit_22_31 = bits, U32, 1184, [31:31] -targetRpmByClt = scalar, S32, 1188, "", 1, 0 -targetRpmAcBump = scalar, S32, 1192, "", 1, 0 -iacByRpmTaper = scalar, F32, 1196 -luaAdd = scalar, F32, 1200 -; total TS size = 1204 -baseDwell = scalar, F32, 1204, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 1208, "", 1, 0 -luaTimingAdd = scalar, F32, 1212, "", 1, 0 -luaTimingMult = scalar, F32, 1216, "", 1, 0 -; total TS size = 1220 -idlePosition = scalar, F32, 1220, "", 1, 0 -trim = scalar, F32, 1224, "", 1, 0 -luaAdjustment = scalar, F32, 1228, "", 1, 0 -etbFeedForward = scalar, F32, 1232 -etbIntegralError = scalar, F32, 1236, "", 1, 0 -etbCurrentTarget = scalar, F32, 1240, "%", 1, 0 -etbRevLimitActive = bits, U32, 1244, [0:0] -unusedBit_7_1 = bits, U32, 1244, [1:1] -unusedBit_7_2 = bits, U32, 1244, [2:2] -unusedBit_7_3 = bits, U32, 1244, [3:3] -unusedBit_7_4 = bits, U32, 1244, [4:4] -unusedBit_7_5 = bits, U32, 1244, [5:5] -unusedBit_7_6 = bits, U32, 1244, [6:6] -unusedBit_7_7 = bits, U32, 1244, [7:7] -unusedBit_7_8 = bits, U32, 1244, [8:8] -unusedBit_7_9 = bits, U32, 1244, [9:9] -unusedBit_7_10 = bits, U32, 1244, [10:10] -unusedBit_7_11 = bits, U32, 1244, [11:11] -unusedBit_7_12 = bits, U32, 1244, [12:12] -unusedBit_7_13 = bits, U32, 1244, [13:13] -unusedBit_7_14 = bits, U32, 1244, [14:14] -unusedBit_7_15 = bits, U32, 1244, [15:15] -unusedBit_7_16 = bits, U32, 1244, [16:16] -unusedBit_7_17 = bits, U32, 1244, [17:17] -unusedBit_7_18 = bits, U32, 1244, [18:18] -unusedBit_7_19 = bits, U32, 1244, [19:19] -unusedBit_7_20 = bits, U32, 1244, [20:20] -unusedBit_7_21 = bits, U32, 1244, [21:21] -unusedBit_7_22 = bits, U32, 1244, [22:22] -unusedBit_7_23 = bits, U32, 1244, [23:23] -unusedBit_7_24 = bits, U32, 1244, [24:24] -unusedBit_7_25 = bits, U32, 1244, [25:25] -unusedBit_7_26 = bits, U32, 1244, [26:26] -unusedBit_7_27 = bits, U32, 1244, [27:27] -unusedBit_7_28 = bits, U32, 1244, [28:28] -unusedBit_7_29 = bits, U32, 1244, [29:29] -unusedBit_7_30 = bits, U32, 1244, [30:30] -unusedBit_7_31 = bits, U32, 1244, [31:31] -; total TS size = 1248 -faultCode = scalar, U08, 1248, "", 1, 0 -heaterDuty = scalar, U08, 1249, "%", 1, 0 -pumpDuty = scalar, U08, 1250, "%", 1, 0 -tempC = scalar, U16, 1252, "C", 1, 0 -nernstVoltage = scalar, U16, 1254, "V", 0.001, 0 -esr = scalar, U16, 1256, "", 1, 0 -; total TS size = 1260 +m_hasSynchronizedPhase = bits, U32, 1156, [0:0] +unusedBit_1_1 = bits, U32, 1156, [1:1] +unusedBit_1_2 = bits, U32, 1156, [2:2] +unusedBit_1_3 = bits, U32, 1156, [3:3] +unusedBit_1_4 = bits, U32, 1156, [4:4] +unusedBit_1_5 = bits, U32, 1156, [5:5] +unusedBit_1_6 = bits, U32, 1156, [6:6] +unusedBit_1_7 = bits, U32, 1156, [7:7] +unusedBit_1_8 = bits, U32, 1156, [8:8] +unusedBit_1_9 = bits, U32, 1156, [9:9] +unusedBit_1_10 = bits, U32, 1156, [10:10] +unusedBit_1_11 = bits, U32, 1156, [11:11] +unusedBit_1_12 = bits, U32, 1156, [12:12] +unusedBit_1_13 = bits, U32, 1156, [13:13] +unusedBit_1_14 = bits, U32, 1156, [14:14] +unusedBit_1_15 = bits, U32, 1156, [15:15] +unusedBit_1_16 = bits, U32, 1156, [16:16] +unusedBit_1_17 = bits, U32, 1156, [17:17] +unusedBit_1_18 = bits, U32, 1156, [18:18] +unusedBit_1_19 = bits, U32, 1156, [19:19] +unusedBit_1_20 = bits, U32, 1156, [20:20] +unusedBit_1_21 = bits, U32, 1156, [21:21] +unusedBit_1_22 = bits, U32, 1156, [22:22] +unusedBit_1_23 = bits, U32, 1156, [23:23] +unusedBit_1_24 = bits, U32, 1156, [24:24] +unusedBit_1_25 = bits, U32, 1156, [25:25] +unusedBit_1_26 = bits, U32, 1156, [26:26] +unusedBit_1_27 = bits, U32, 1156, [27:27] +unusedBit_1_28 = bits, U32, 1156, [28:28] +unusedBit_1_29 = bits, U32, 1156, [29:29] +unusedBit_1_30 = bits, U32, 1156, [30:30] +unusedBit_1_31 = bits, U32, 1156, [31:31] +; total TS size = 1160 +wallFuelCorrection = scalar, F32, 1160, "", 1, 0 +wallFuel = scalar, F32, 1164, "", 1, 0 +; total TS size = 1168 +idleState = bits, S32, 1168, [0:2], "not important" +currentIdlePosition = scalar, F32, 1172 +baseIdlePosition = scalar, F32, 1176 +iacByTpsTaper = scalar, F32, 1180 +throttlePedalUpState = scalar, S32, 1184, "", 1, 0 +mightResetPid = bits, U32, 1188, [0:0] +shouldResetPid = bits, U32, 1188, [1:1] +wasResetPid = bits, U32, 1188, [2:2] +mustResetPid = bits, U32, 1188, [3:3] +isCranking = bits, U32, 1188, [4:4] +useIacTableForCoasting = bits, U32, 1188, [5:5] +notIdling = bits, U32, 1188, [6:6] +needReset = bits, U32, 1188, [7:7] +isInDeadZone = bits, U32, 1188, [8:8] +isBlipping = bits, U32, 1188, [9:9] +useClosedLoop = bits, U32, 1188, [10:10] +badTps = bits, U32, 1188, [11:11] +looksLikeRunning = bits, U32, 1188, [12:12] +looksLikeCoasting = bits, U32, 1188, [13:13] +looksLikeCrankToIdle = bits, U32, 1188, [14:14] +isVerboseIAC = bits, U32, 1188, [15:15] +isIdleCoasting = bits, U32, 1188, [16:16] +unusedBit_22_17 = bits, U32, 1188, [17:17] +unusedBit_22_18 = bits, U32, 1188, [18:18] +unusedBit_22_19 = bits, U32, 1188, [19:19] +unusedBit_22_20 = bits, U32, 1188, [20:20] +unusedBit_22_21 = bits, U32, 1188, [21:21] +unusedBit_22_22 = bits, U32, 1188, [22:22] +unusedBit_22_23 = bits, U32, 1188, [23:23] +unusedBit_22_24 = bits, U32, 1188, [24:24] +unusedBit_22_25 = bits, U32, 1188, [25:25] +unusedBit_22_26 = bits, U32, 1188, [26:26] +unusedBit_22_27 = bits, U32, 1188, [27:27] +unusedBit_22_28 = bits, U32, 1188, [28:28] +unusedBit_22_29 = bits, U32, 1188, [29:29] +unusedBit_22_30 = bits, U32, 1188, [30:30] +unusedBit_22_31 = bits, U32, 1188, [31:31] +targetRpmByClt = scalar, S32, 1192, "", 1, 0 +targetRpmAcBump = scalar, S32, 1196, "", 1, 0 +iacByRpmTaper = scalar, F32, 1200 +luaAdd = scalar, F32, 1204 +; total TS size = 1208 +baseDwell = scalar, F32, 1208, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 1212, "", 1, 0 +luaTimingAdd = scalar, F32, 1216, "", 1, 0 +luaTimingMult = scalar, F32, 1220, "", 1, 0 +; total TS size = 1224 +idlePosition = scalar, F32, 1224, "", 1, 0 +trim = scalar, F32, 1228, "", 1, 0 +luaAdjustment = scalar, F32, 1232, "", 1, 0 +etbFeedForward = scalar, F32, 1236 +etbIntegralError = scalar, F32, 1240, "", 1, 0 +etbCurrentTarget = scalar, F32, 1244, "%", 1, 0 +etbRevLimitActive = bits, U32, 1248, [0:0] +unusedBit_7_1 = bits, U32, 1248, [1:1] +unusedBit_7_2 = bits, U32, 1248, [2:2] +unusedBit_7_3 = bits, U32, 1248, [3:3] +unusedBit_7_4 = bits, U32, 1248, [4:4] +unusedBit_7_5 = bits, U32, 1248, [5:5] +unusedBit_7_6 = bits, U32, 1248, [6:6] +unusedBit_7_7 = bits, U32, 1248, [7:7] +unusedBit_7_8 = bits, U32, 1248, [8:8] +unusedBit_7_9 = bits, U32, 1248, [9:9] +unusedBit_7_10 = bits, U32, 1248, [10:10] +unusedBit_7_11 = bits, U32, 1248, [11:11] +unusedBit_7_12 = bits, U32, 1248, [12:12] +unusedBit_7_13 = bits, U32, 1248, [13:13] +unusedBit_7_14 = bits, U32, 1248, [14:14] +unusedBit_7_15 = bits, U32, 1248, [15:15] +unusedBit_7_16 = bits, U32, 1248, [16:16] +unusedBit_7_17 = bits, U32, 1248, [17:17] +unusedBit_7_18 = bits, U32, 1248, [18:18] +unusedBit_7_19 = bits, U32, 1248, [19:19] +unusedBit_7_20 = bits, U32, 1248, [20:20] +unusedBit_7_21 = bits, U32, 1248, [21:21] +unusedBit_7_22 = bits, U32, 1248, [22:22] +unusedBit_7_23 = bits, U32, 1248, [23:23] +unusedBit_7_24 = bits, U32, 1248, [24:24] +unusedBit_7_25 = bits, U32, 1248, [25:25] +unusedBit_7_26 = bits, U32, 1248, [26:26] +unusedBit_7_27 = bits, U32, 1248, [27:27] +unusedBit_7_28 = bits, U32, 1248, [28:28] +unusedBit_7_29 = bits, U32, 1248, [29:29] +unusedBit_7_30 = bits, U32, 1248, [30:30] +unusedBit_7_31 = bits, U32, 1248, [31:31] +; total TS size = 1252 +faultCode = scalar, U08, 1252, "", 1, 0 +heaterDuty = scalar, U08, 1253, "%", 1, 0 +pumpDuty = scalar, U08, 1254, "%", 1, 0 +tempC = scalar, U16, 1256, "C", 1, 0 +nernstVoltage = scalar, U16, 1258, "V", 0.001, 0 +esr = scalar, U16, 1260, "", 1, 0 +; total TS size = 1264 time = { timeNow } @@ -4993,6 +4994,7 @@ entry = mapVvt_MAP_AT_DIFF, "mapVvt_MAP_AT_DIFF", float, "%.3f" entry = mapVvt_MAP_AT_CYCLE_COUNT, "mapVvt_MAP_AT_CYCLE_COUNT", int, "%d" entry = mapVvt_map_peak, "mapVvt_map_peak", int, "%d" entry = currentEngineDecodedPhase, "Engine Phase", float, "%.3f" +entry = triggerToothAngleError, "triggerToothAngleError", float, "%.3f" entry = crankSynchronizationCounter, "Crank sync counter", int, "%d" entry = vvtSyncGapRatio, "vvtSyncGapRatio", float, "%.3f" entry = vvtCurrentPosition, "vvtCurrentPosition", float, "%.3f" @@ -5780,6 +5782,8 @@ dialog = trigger_centralDialog, "trigger_central" graphLine = mapVvt_MAP_AT_CYCLE_COUNT graphLine = mapVvt_map_peak graphLine = currentEngineDecodedPhase + liveGraph = trigger_central_4_Graph, "Graph", South + graphLine = triggerToothAngleError dialog = trigger_stateDialog, "trigger_state" diff --git a/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini b/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini index c068d3fa5e..f0af61f34b 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.09.24.hellen154hyundai.1859896613" + signature = "rusEFI 2022.09.24.hellen154hyundai.1773535548" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.09.24.hellen154hyundai.1859896613" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.09.24.hellen154hyundai.1773535548" ; 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 Fri Sep 23 23:16:03 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Sep 24 04:28:38 UTC 2022 pageSize = 22048 page = 1 @@ -2140,7 +2140,7 @@ ignBlends4_blendValues = array, U08, 22038, [8], "%", 0.5, 0, 0, 100, 1 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1260 + ochBlockSize = 1264 ; ; see TunerStudioOutputChannels struct @@ -3141,146 +3141,147 @@ mapVvt_MAP_AT_DIFF = scalar, F32, 1116, "", 1, 0 mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1120, "", 1, 0 mapVvt_map_peak = scalar, U08, 1121, "", 1, 0 currentEngineDecodedPhase = scalar, F32, 1124, "deg", 1, 0 -; total TS size = 1128 -crankSynchronizationCounter = scalar, U32, 1128, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1132, "", 1, 0 -vvtCurrentPosition = scalar, F32, 1136, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1140, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 1144, "", 1, 0 -triggerStateIndex = scalar, U08, 1148, "", 1, 0 -vvtCounter = scalar, U08, 1149, "", 1, 0 -camResyncCounter = scalar, U08, 1150, "", 1, 0 -vvtStateIndex = scalar, U08, 1151, "", 1, 0 -; total TS size = 1152 -m_hasSynchronizedPhase = bits, U32, 1152, [0:0] -unusedBit_1_1 = bits, U32, 1152, [1:1] -unusedBit_1_2 = bits, U32, 1152, [2:2] -unusedBit_1_3 = bits, U32, 1152, [3:3] -unusedBit_1_4 = bits, U32, 1152, [4:4] -unusedBit_1_5 = bits, U32, 1152, [5:5] -unusedBit_1_6 = bits, U32, 1152, [6:6] -unusedBit_1_7 = bits, U32, 1152, [7:7] -unusedBit_1_8 = bits, U32, 1152, [8:8] -unusedBit_1_9 = bits, U32, 1152, [9:9] -unusedBit_1_10 = bits, U32, 1152, [10:10] -unusedBit_1_11 = bits, U32, 1152, [11:11] -unusedBit_1_12 = bits, U32, 1152, [12:12] -unusedBit_1_13 = bits, U32, 1152, [13:13] -unusedBit_1_14 = bits, U32, 1152, [14:14] -unusedBit_1_15 = bits, U32, 1152, [15:15] -unusedBit_1_16 = bits, U32, 1152, [16:16] -unusedBit_1_17 = bits, U32, 1152, [17:17] -unusedBit_1_18 = bits, U32, 1152, [18:18] -unusedBit_1_19 = bits, U32, 1152, [19:19] -unusedBit_1_20 = bits, U32, 1152, [20:20] -unusedBit_1_21 = bits, U32, 1152, [21:21] -unusedBit_1_22 = bits, U32, 1152, [22:22] -unusedBit_1_23 = bits, U32, 1152, [23:23] -unusedBit_1_24 = bits, U32, 1152, [24:24] -unusedBit_1_25 = bits, U32, 1152, [25:25] -unusedBit_1_26 = bits, U32, 1152, [26:26] -unusedBit_1_27 = bits, U32, 1152, [27:27] -unusedBit_1_28 = bits, U32, 1152, [28:28] -unusedBit_1_29 = bits, U32, 1152, [29:29] -unusedBit_1_30 = bits, U32, 1152, [30:30] -unusedBit_1_31 = bits, U32, 1152, [31:31] +triggerToothAngleError = scalar, F32, 1128, "deg", 1, 0 +; total TS size = 1132 +crankSynchronizationCounter = scalar, U32, 1132, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1136, "", 1, 0 +vvtCurrentPosition = scalar, F32, 1140, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1144, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 1148, "", 1, 0 +triggerStateIndex = scalar, U08, 1152, "", 1, 0 +vvtCounter = scalar, U08, 1153, "", 1, 0 +camResyncCounter = scalar, U08, 1154, "", 1, 0 +vvtStateIndex = scalar, U08, 1155, "", 1, 0 ; total TS size = 1156 -wallFuelCorrection = scalar, F32, 1156, "", 1, 0 -wallFuel = scalar, F32, 1160, "", 1, 0 -; total TS size = 1164 -idleState = bits, S32, 1164, [0:2], "not important" -currentIdlePosition = scalar, F32, 1168 -baseIdlePosition = scalar, F32, 1172 -iacByTpsTaper = scalar, F32, 1176 -throttlePedalUpState = scalar, S32, 1180, "", 1, 0 -mightResetPid = bits, U32, 1184, [0:0] -shouldResetPid = bits, U32, 1184, [1:1] -wasResetPid = bits, U32, 1184, [2:2] -mustResetPid = bits, U32, 1184, [3:3] -isCranking = bits, U32, 1184, [4:4] -useIacTableForCoasting = bits, U32, 1184, [5:5] -notIdling = bits, U32, 1184, [6:6] -needReset = bits, U32, 1184, [7:7] -isInDeadZone = bits, U32, 1184, [8:8] -isBlipping = bits, U32, 1184, [9:9] -useClosedLoop = bits, U32, 1184, [10:10] -badTps = bits, U32, 1184, [11:11] -looksLikeRunning = bits, U32, 1184, [12:12] -looksLikeCoasting = bits, U32, 1184, [13:13] -looksLikeCrankToIdle = bits, U32, 1184, [14:14] -isVerboseIAC = bits, U32, 1184, [15:15] -isIdleCoasting = bits, U32, 1184, [16:16] -unusedBit_22_17 = bits, U32, 1184, [17:17] -unusedBit_22_18 = bits, U32, 1184, [18:18] -unusedBit_22_19 = bits, U32, 1184, [19:19] -unusedBit_22_20 = bits, U32, 1184, [20:20] -unusedBit_22_21 = bits, U32, 1184, [21:21] -unusedBit_22_22 = bits, U32, 1184, [22:22] -unusedBit_22_23 = bits, U32, 1184, [23:23] -unusedBit_22_24 = bits, U32, 1184, [24:24] -unusedBit_22_25 = bits, U32, 1184, [25:25] -unusedBit_22_26 = bits, U32, 1184, [26:26] -unusedBit_22_27 = bits, U32, 1184, [27:27] -unusedBit_22_28 = bits, U32, 1184, [28:28] -unusedBit_22_29 = bits, U32, 1184, [29:29] -unusedBit_22_30 = bits, U32, 1184, [30:30] -unusedBit_22_31 = bits, U32, 1184, [31:31] -targetRpmByClt = scalar, S32, 1188, "", 1, 0 -targetRpmAcBump = scalar, S32, 1192, "", 1, 0 -iacByRpmTaper = scalar, F32, 1196 -luaAdd = scalar, F32, 1200 -; total TS size = 1204 -baseDwell = scalar, F32, 1204, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 1208, "", 1, 0 -luaTimingAdd = scalar, F32, 1212, "", 1, 0 -luaTimingMult = scalar, F32, 1216, "", 1, 0 -; total TS size = 1220 -idlePosition = scalar, F32, 1220, "", 1, 0 -trim = scalar, F32, 1224, "", 1, 0 -luaAdjustment = scalar, F32, 1228, "", 1, 0 -etbFeedForward = scalar, F32, 1232 -etbIntegralError = scalar, F32, 1236, "", 1, 0 -etbCurrentTarget = scalar, F32, 1240, "%", 1, 0 -etbRevLimitActive = bits, U32, 1244, [0:0] -unusedBit_7_1 = bits, U32, 1244, [1:1] -unusedBit_7_2 = bits, U32, 1244, [2:2] -unusedBit_7_3 = bits, U32, 1244, [3:3] -unusedBit_7_4 = bits, U32, 1244, [4:4] -unusedBit_7_5 = bits, U32, 1244, [5:5] -unusedBit_7_6 = bits, U32, 1244, [6:6] -unusedBit_7_7 = bits, U32, 1244, [7:7] -unusedBit_7_8 = bits, U32, 1244, [8:8] -unusedBit_7_9 = bits, U32, 1244, [9:9] -unusedBit_7_10 = bits, U32, 1244, [10:10] -unusedBit_7_11 = bits, U32, 1244, [11:11] -unusedBit_7_12 = bits, U32, 1244, [12:12] -unusedBit_7_13 = bits, U32, 1244, [13:13] -unusedBit_7_14 = bits, U32, 1244, [14:14] -unusedBit_7_15 = bits, U32, 1244, [15:15] -unusedBit_7_16 = bits, U32, 1244, [16:16] -unusedBit_7_17 = bits, U32, 1244, [17:17] -unusedBit_7_18 = bits, U32, 1244, [18:18] -unusedBit_7_19 = bits, U32, 1244, [19:19] -unusedBit_7_20 = bits, U32, 1244, [20:20] -unusedBit_7_21 = bits, U32, 1244, [21:21] -unusedBit_7_22 = bits, U32, 1244, [22:22] -unusedBit_7_23 = bits, U32, 1244, [23:23] -unusedBit_7_24 = bits, U32, 1244, [24:24] -unusedBit_7_25 = bits, U32, 1244, [25:25] -unusedBit_7_26 = bits, U32, 1244, [26:26] -unusedBit_7_27 = bits, U32, 1244, [27:27] -unusedBit_7_28 = bits, U32, 1244, [28:28] -unusedBit_7_29 = bits, U32, 1244, [29:29] -unusedBit_7_30 = bits, U32, 1244, [30:30] -unusedBit_7_31 = bits, U32, 1244, [31:31] -; total TS size = 1248 -faultCode = scalar, U08, 1248, "", 1, 0 -heaterDuty = scalar, U08, 1249, "%", 1, 0 -pumpDuty = scalar, U08, 1250, "%", 1, 0 -tempC = scalar, U16, 1252, "C", 1, 0 -nernstVoltage = scalar, U16, 1254, "V", 0.001, 0 -esr = scalar, U16, 1256, "", 1, 0 -; total TS size = 1260 +m_hasSynchronizedPhase = bits, U32, 1156, [0:0] +unusedBit_1_1 = bits, U32, 1156, [1:1] +unusedBit_1_2 = bits, U32, 1156, [2:2] +unusedBit_1_3 = bits, U32, 1156, [3:3] +unusedBit_1_4 = bits, U32, 1156, [4:4] +unusedBit_1_5 = bits, U32, 1156, [5:5] +unusedBit_1_6 = bits, U32, 1156, [6:6] +unusedBit_1_7 = bits, U32, 1156, [7:7] +unusedBit_1_8 = bits, U32, 1156, [8:8] +unusedBit_1_9 = bits, U32, 1156, [9:9] +unusedBit_1_10 = bits, U32, 1156, [10:10] +unusedBit_1_11 = bits, U32, 1156, [11:11] +unusedBit_1_12 = bits, U32, 1156, [12:12] +unusedBit_1_13 = bits, U32, 1156, [13:13] +unusedBit_1_14 = bits, U32, 1156, [14:14] +unusedBit_1_15 = bits, U32, 1156, [15:15] +unusedBit_1_16 = bits, U32, 1156, [16:16] +unusedBit_1_17 = bits, U32, 1156, [17:17] +unusedBit_1_18 = bits, U32, 1156, [18:18] +unusedBit_1_19 = bits, U32, 1156, [19:19] +unusedBit_1_20 = bits, U32, 1156, [20:20] +unusedBit_1_21 = bits, U32, 1156, [21:21] +unusedBit_1_22 = bits, U32, 1156, [22:22] +unusedBit_1_23 = bits, U32, 1156, [23:23] +unusedBit_1_24 = bits, U32, 1156, [24:24] +unusedBit_1_25 = bits, U32, 1156, [25:25] +unusedBit_1_26 = bits, U32, 1156, [26:26] +unusedBit_1_27 = bits, U32, 1156, [27:27] +unusedBit_1_28 = bits, U32, 1156, [28:28] +unusedBit_1_29 = bits, U32, 1156, [29:29] +unusedBit_1_30 = bits, U32, 1156, [30:30] +unusedBit_1_31 = bits, U32, 1156, [31:31] +; total TS size = 1160 +wallFuelCorrection = scalar, F32, 1160, "", 1, 0 +wallFuel = scalar, F32, 1164, "", 1, 0 +; total TS size = 1168 +idleState = bits, S32, 1168, [0:2], "not important" +currentIdlePosition = scalar, F32, 1172 +baseIdlePosition = scalar, F32, 1176 +iacByTpsTaper = scalar, F32, 1180 +throttlePedalUpState = scalar, S32, 1184, "", 1, 0 +mightResetPid = bits, U32, 1188, [0:0] +shouldResetPid = bits, U32, 1188, [1:1] +wasResetPid = bits, U32, 1188, [2:2] +mustResetPid = bits, U32, 1188, [3:3] +isCranking = bits, U32, 1188, [4:4] +useIacTableForCoasting = bits, U32, 1188, [5:5] +notIdling = bits, U32, 1188, [6:6] +needReset = bits, U32, 1188, [7:7] +isInDeadZone = bits, U32, 1188, [8:8] +isBlipping = bits, U32, 1188, [9:9] +useClosedLoop = bits, U32, 1188, [10:10] +badTps = bits, U32, 1188, [11:11] +looksLikeRunning = bits, U32, 1188, [12:12] +looksLikeCoasting = bits, U32, 1188, [13:13] +looksLikeCrankToIdle = bits, U32, 1188, [14:14] +isVerboseIAC = bits, U32, 1188, [15:15] +isIdleCoasting = bits, U32, 1188, [16:16] +unusedBit_22_17 = bits, U32, 1188, [17:17] +unusedBit_22_18 = bits, U32, 1188, [18:18] +unusedBit_22_19 = bits, U32, 1188, [19:19] +unusedBit_22_20 = bits, U32, 1188, [20:20] +unusedBit_22_21 = bits, U32, 1188, [21:21] +unusedBit_22_22 = bits, U32, 1188, [22:22] +unusedBit_22_23 = bits, U32, 1188, [23:23] +unusedBit_22_24 = bits, U32, 1188, [24:24] +unusedBit_22_25 = bits, U32, 1188, [25:25] +unusedBit_22_26 = bits, U32, 1188, [26:26] +unusedBit_22_27 = bits, U32, 1188, [27:27] +unusedBit_22_28 = bits, U32, 1188, [28:28] +unusedBit_22_29 = bits, U32, 1188, [29:29] +unusedBit_22_30 = bits, U32, 1188, [30:30] +unusedBit_22_31 = bits, U32, 1188, [31:31] +targetRpmByClt = scalar, S32, 1192, "", 1, 0 +targetRpmAcBump = scalar, S32, 1196, "", 1, 0 +iacByRpmTaper = scalar, F32, 1200 +luaAdd = scalar, F32, 1204 +; total TS size = 1208 +baseDwell = scalar, F32, 1208, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 1212, "", 1, 0 +luaTimingAdd = scalar, F32, 1216, "", 1, 0 +luaTimingMult = scalar, F32, 1220, "", 1, 0 +; total TS size = 1224 +idlePosition = scalar, F32, 1224, "", 1, 0 +trim = scalar, F32, 1228, "", 1, 0 +luaAdjustment = scalar, F32, 1232, "", 1, 0 +etbFeedForward = scalar, F32, 1236 +etbIntegralError = scalar, F32, 1240, "", 1, 0 +etbCurrentTarget = scalar, F32, 1244, "%", 1, 0 +etbRevLimitActive = bits, U32, 1248, [0:0] +unusedBit_7_1 = bits, U32, 1248, [1:1] +unusedBit_7_2 = bits, U32, 1248, [2:2] +unusedBit_7_3 = bits, U32, 1248, [3:3] +unusedBit_7_4 = bits, U32, 1248, [4:4] +unusedBit_7_5 = bits, U32, 1248, [5:5] +unusedBit_7_6 = bits, U32, 1248, [6:6] +unusedBit_7_7 = bits, U32, 1248, [7:7] +unusedBit_7_8 = bits, U32, 1248, [8:8] +unusedBit_7_9 = bits, U32, 1248, [9:9] +unusedBit_7_10 = bits, U32, 1248, [10:10] +unusedBit_7_11 = bits, U32, 1248, [11:11] +unusedBit_7_12 = bits, U32, 1248, [12:12] +unusedBit_7_13 = bits, U32, 1248, [13:13] +unusedBit_7_14 = bits, U32, 1248, [14:14] +unusedBit_7_15 = bits, U32, 1248, [15:15] +unusedBit_7_16 = bits, U32, 1248, [16:16] +unusedBit_7_17 = bits, U32, 1248, [17:17] +unusedBit_7_18 = bits, U32, 1248, [18:18] +unusedBit_7_19 = bits, U32, 1248, [19:19] +unusedBit_7_20 = bits, U32, 1248, [20:20] +unusedBit_7_21 = bits, U32, 1248, [21:21] +unusedBit_7_22 = bits, U32, 1248, [22:22] +unusedBit_7_23 = bits, U32, 1248, [23:23] +unusedBit_7_24 = bits, U32, 1248, [24:24] +unusedBit_7_25 = bits, U32, 1248, [25:25] +unusedBit_7_26 = bits, U32, 1248, [26:26] +unusedBit_7_27 = bits, U32, 1248, [27:27] +unusedBit_7_28 = bits, U32, 1248, [28:28] +unusedBit_7_29 = bits, U32, 1248, [29:29] +unusedBit_7_30 = bits, U32, 1248, [30:30] +unusedBit_7_31 = bits, U32, 1248, [31:31] +; total TS size = 1252 +faultCode = scalar, U08, 1252, "", 1, 0 +heaterDuty = scalar, U08, 1253, "%", 1, 0 +pumpDuty = scalar, U08, 1254, "%", 1, 0 +tempC = scalar, U16, 1256, "C", 1, 0 +nernstVoltage = scalar, U16, 1258, "V", 0.001, 0 +esr = scalar, U16, 1260, "", 1, 0 +; total TS size = 1264 time = { timeNow } @@ -4993,6 +4994,7 @@ entry = mapVvt_MAP_AT_DIFF, "mapVvt_MAP_AT_DIFF", float, "%.3f" entry = mapVvt_MAP_AT_CYCLE_COUNT, "mapVvt_MAP_AT_CYCLE_COUNT", int, "%d" entry = mapVvt_map_peak, "mapVvt_map_peak", int, "%d" entry = currentEngineDecodedPhase, "Engine Phase", float, "%.3f" +entry = triggerToothAngleError, "triggerToothAngleError", float, "%.3f" entry = crankSynchronizationCounter, "Crank sync counter", int, "%d" entry = vvtSyncGapRatio, "vvtSyncGapRatio", float, "%.3f" entry = vvtCurrentPosition, "vvtCurrentPosition", float, "%.3f" @@ -5780,6 +5782,8 @@ dialog = trigger_centralDialog, "trigger_central" graphLine = mapVvt_MAP_AT_CYCLE_COUNT graphLine = mapVvt_map_peak graphLine = currentEngineDecodedPhase + liveGraph = trigger_central_4_Graph, "Graph", South + graphLine = triggerToothAngleError dialog = trigger_stateDialog, "trigger_state" diff --git a/firmware/tunerstudio/generated/rusefi_hellen72.ini b/firmware/tunerstudio/generated/rusefi_hellen72.ini index d2029a634c..a444a61161 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.09.24.hellen72.78356133" + signature = "rusEFI 2022.09.24.hellen72.63331004" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.09.24.hellen72.78356133" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.09.24.hellen72.63331004" ; 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 Fri Sep 23 23:16:07 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Sep 24 04:28:41 UTC 2022 pageSize = 22048 page = 1 @@ -2140,7 +2140,7 @@ ignBlends4_blendValues = array, U08, 22038, [8], "%", 0.5, 0, 0, 100, 1 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1260 + ochBlockSize = 1264 ; ; see TunerStudioOutputChannels struct @@ -3141,146 +3141,147 @@ mapVvt_MAP_AT_DIFF = scalar, F32, 1116, "", 1, 0 mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1120, "", 1, 0 mapVvt_map_peak = scalar, U08, 1121, "", 1, 0 currentEngineDecodedPhase = scalar, F32, 1124, "deg", 1, 0 -; total TS size = 1128 -crankSynchronizationCounter = scalar, U32, 1128, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1132, "", 1, 0 -vvtCurrentPosition = scalar, F32, 1136, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1140, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 1144, "", 1, 0 -triggerStateIndex = scalar, U08, 1148, "", 1, 0 -vvtCounter = scalar, U08, 1149, "", 1, 0 -camResyncCounter = scalar, U08, 1150, "", 1, 0 -vvtStateIndex = scalar, U08, 1151, "", 1, 0 -; total TS size = 1152 -m_hasSynchronizedPhase = bits, U32, 1152, [0:0] -unusedBit_1_1 = bits, U32, 1152, [1:1] -unusedBit_1_2 = bits, U32, 1152, [2:2] -unusedBit_1_3 = bits, U32, 1152, [3:3] -unusedBit_1_4 = bits, U32, 1152, [4:4] -unusedBit_1_5 = bits, U32, 1152, [5:5] -unusedBit_1_6 = bits, U32, 1152, [6:6] -unusedBit_1_7 = bits, U32, 1152, [7:7] -unusedBit_1_8 = bits, U32, 1152, [8:8] -unusedBit_1_9 = bits, U32, 1152, [9:9] -unusedBit_1_10 = bits, U32, 1152, [10:10] -unusedBit_1_11 = bits, U32, 1152, [11:11] -unusedBit_1_12 = bits, U32, 1152, [12:12] -unusedBit_1_13 = bits, U32, 1152, [13:13] -unusedBit_1_14 = bits, U32, 1152, [14:14] -unusedBit_1_15 = bits, U32, 1152, [15:15] -unusedBit_1_16 = bits, U32, 1152, [16:16] -unusedBit_1_17 = bits, U32, 1152, [17:17] -unusedBit_1_18 = bits, U32, 1152, [18:18] -unusedBit_1_19 = bits, U32, 1152, [19:19] -unusedBit_1_20 = bits, U32, 1152, [20:20] -unusedBit_1_21 = bits, U32, 1152, [21:21] -unusedBit_1_22 = bits, U32, 1152, [22:22] -unusedBit_1_23 = bits, U32, 1152, [23:23] -unusedBit_1_24 = bits, U32, 1152, [24:24] -unusedBit_1_25 = bits, U32, 1152, [25:25] -unusedBit_1_26 = bits, U32, 1152, [26:26] -unusedBit_1_27 = bits, U32, 1152, [27:27] -unusedBit_1_28 = bits, U32, 1152, [28:28] -unusedBit_1_29 = bits, U32, 1152, [29:29] -unusedBit_1_30 = bits, U32, 1152, [30:30] -unusedBit_1_31 = bits, U32, 1152, [31:31] +triggerToothAngleError = scalar, F32, 1128, "deg", 1, 0 +; total TS size = 1132 +crankSynchronizationCounter = scalar, U32, 1132, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1136, "", 1, 0 +vvtCurrentPosition = scalar, F32, 1140, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1144, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 1148, "", 1, 0 +triggerStateIndex = scalar, U08, 1152, "", 1, 0 +vvtCounter = scalar, U08, 1153, "", 1, 0 +camResyncCounter = scalar, U08, 1154, "", 1, 0 +vvtStateIndex = scalar, U08, 1155, "", 1, 0 ; total TS size = 1156 -wallFuelCorrection = scalar, F32, 1156, "", 1, 0 -wallFuel = scalar, F32, 1160, "", 1, 0 -; total TS size = 1164 -idleState = bits, S32, 1164, [0:2], "not important" -currentIdlePosition = scalar, F32, 1168 -baseIdlePosition = scalar, F32, 1172 -iacByTpsTaper = scalar, F32, 1176 -throttlePedalUpState = scalar, S32, 1180, "", 1, 0 -mightResetPid = bits, U32, 1184, [0:0] -shouldResetPid = bits, U32, 1184, [1:1] -wasResetPid = bits, U32, 1184, [2:2] -mustResetPid = bits, U32, 1184, [3:3] -isCranking = bits, U32, 1184, [4:4] -useIacTableForCoasting = bits, U32, 1184, [5:5] -notIdling = bits, U32, 1184, [6:6] -needReset = bits, U32, 1184, [7:7] -isInDeadZone = bits, U32, 1184, [8:8] -isBlipping = bits, U32, 1184, [9:9] -useClosedLoop = bits, U32, 1184, [10:10] -badTps = bits, U32, 1184, [11:11] -looksLikeRunning = bits, U32, 1184, [12:12] -looksLikeCoasting = bits, U32, 1184, [13:13] -looksLikeCrankToIdle = bits, U32, 1184, [14:14] -isVerboseIAC = bits, U32, 1184, [15:15] -isIdleCoasting = bits, U32, 1184, [16:16] -unusedBit_22_17 = bits, U32, 1184, [17:17] -unusedBit_22_18 = bits, U32, 1184, [18:18] -unusedBit_22_19 = bits, U32, 1184, [19:19] -unusedBit_22_20 = bits, U32, 1184, [20:20] -unusedBit_22_21 = bits, U32, 1184, [21:21] -unusedBit_22_22 = bits, U32, 1184, [22:22] -unusedBit_22_23 = bits, U32, 1184, [23:23] -unusedBit_22_24 = bits, U32, 1184, [24:24] -unusedBit_22_25 = bits, U32, 1184, [25:25] -unusedBit_22_26 = bits, U32, 1184, [26:26] -unusedBit_22_27 = bits, U32, 1184, [27:27] -unusedBit_22_28 = bits, U32, 1184, [28:28] -unusedBit_22_29 = bits, U32, 1184, [29:29] -unusedBit_22_30 = bits, U32, 1184, [30:30] -unusedBit_22_31 = bits, U32, 1184, [31:31] -targetRpmByClt = scalar, S32, 1188, "", 1, 0 -targetRpmAcBump = scalar, S32, 1192, "", 1, 0 -iacByRpmTaper = scalar, F32, 1196 -luaAdd = scalar, F32, 1200 -; total TS size = 1204 -baseDwell = scalar, F32, 1204, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 1208, "", 1, 0 -luaTimingAdd = scalar, F32, 1212, "", 1, 0 -luaTimingMult = scalar, F32, 1216, "", 1, 0 -; total TS size = 1220 -idlePosition = scalar, F32, 1220, "", 1, 0 -trim = scalar, F32, 1224, "", 1, 0 -luaAdjustment = scalar, F32, 1228, "", 1, 0 -etbFeedForward = scalar, F32, 1232 -etbIntegralError = scalar, F32, 1236, "", 1, 0 -etbCurrentTarget = scalar, F32, 1240, "%", 1, 0 -etbRevLimitActive = bits, U32, 1244, [0:0] -unusedBit_7_1 = bits, U32, 1244, [1:1] -unusedBit_7_2 = bits, U32, 1244, [2:2] -unusedBit_7_3 = bits, U32, 1244, [3:3] -unusedBit_7_4 = bits, U32, 1244, [4:4] -unusedBit_7_5 = bits, U32, 1244, [5:5] -unusedBit_7_6 = bits, U32, 1244, [6:6] -unusedBit_7_7 = bits, U32, 1244, [7:7] -unusedBit_7_8 = bits, U32, 1244, [8:8] -unusedBit_7_9 = bits, U32, 1244, [9:9] -unusedBit_7_10 = bits, U32, 1244, [10:10] -unusedBit_7_11 = bits, U32, 1244, [11:11] -unusedBit_7_12 = bits, U32, 1244, [12:12] -unusedBit_7_13 = bits, U32, 1244, [13:13] -unusedBit_7_14 = bits, U32, 1244, [14:14] -unusedBit_7_15 = bits, U32, 1244, [15:15] -unusedBit_7_16 = bits, U32, 1244, [16:16] -unusedBit_7_17 = bits, U32, 1244, [17:17] -unusedBit_7_18 = bits, U32, 1244, [18:18] -unusedBit_7_19 = bits, U32, 1244, [19:19] -unusedBit_7_20 = bits, U32, 1244, [20:20] -unusedBit_7_21 = bits, U32, 1244, [21:21] -unusedBit_7_22 = bits, U32, 1244, [22:22] -unusedBit_7_23 = bits, U32, 1244, [23:23] -unusedBit_7_24 = bits, U32, 1244, [24:24] -unusedBit_7_25 = bits, U32, 1244, [25:25] -unusedBit_7_26 = bits, U32, 1244, [26:26] -unusedBit_7_27 = bits, U32, 1244, [27:27] -unusedBit_7_28 = bits, U32, 1244, [28:28] -unusedBit_7_29 = bits, U32, 1244, [29:29] -unusedBit_7_30 = bits, U32, 1244, [30:30] -unusedBit_7_31 = bits, U32, 1244, [31:31] -; total TS size = 1248 -faultCode = scalar, U08, 1248, "", 1, 0 -heaterDuty = scalar, U08, 1249, "%", 1, 0 -pumpDuty = scalar, U08, 1250, "%", 1, 0 -tempC = scalar, U16, 1252, "C", 1, 0 -nernstVoltage = scalar, U16, 1254, "V", 0.001, 0 -esr = scalar, U16, 1256, "", 1, 0 -; total TS size = 1260 +m_hasSynchronizedPhase = bits, U32, 1156, [0:0] +unusedBit_1_1 = bits, U32, 1156, [1:1] +unusedBit_1_2 = bits, U32, 1156, [2:2] +unusedBit_1_3 = bits, U32, 1156, [3:3] +unusedBit_1_4 = bits, U32, 1156, [4:4] +unusedBit_1_5 = bits, U32, 1156, [5:5] +unusedBit_1_6 = bits, U32, 1156, [6:6] +unusedBit_1_7 = bits, U32, 1156, [7:7] +unusedBit_1_8 = bits, U32, 1156, [8:8] +unusedBit_1_9 = bits, U32, 1156, [9:9] +unusedBit_1_10 = bits, U32, 1156, [10:10] +unusedBit_1_11 = bits, U32, 1156, [11:11] +unusedBit_1_12 = bits, U32, 1156, [12:12] +unusedBit_1_13 = bits, U32, 1156, [13:13] +unusedBit_1_14 = bits, U32, 1156, [14:14] +unusedBit_1_15 = bits, U32, 1156, [15:15] +unusedBit_1_16 = bits, U32, 1156, [16:16] +unusedBit_1_17 = bits, U32, 1156, [17:17] +unusedBit_1_18 = bits, U32, 1156, [18:18] +unusedBit_1_19 = bits, U32, 1156, [19:19] +unusedBit_1_20 = bits, U32, 1156, [20:20] +unusedBit_1_21 = bits, U32, 1156, [21:21] +unusedBit_1_22 = bits, U32, 1156, [22:22] +unusedBit_1_23 = bits, U32, 1156, [23:23] +unusedBit_1_24 = bits, U32, 1156, [24:24] +unusedBit_1_25 = bits, U32, 1156, [25:25] +unusedBit_1_26 = bits, U32, 1156, [26:26] +unusedBit_1_27 = bits, U32, 1156, [27:27] +unusedBit_1_28 = bits, U32, 1156, [28:28] +unusedBit_1_29 = bits, U32, 1156, [29:29] +unusedBit_1_30 = bits, U32, 1156, [30:30] +unusedBit_1_31 = bits, U32, 1156, [31:31] +; total TS size = 1160 +wallFuelCorrection = scalar, F32, 1160, "", 1, 0 +wallFuel = scalar, F32, 1164, "", 1, 0 +; total TS size = 1168 +idleState = bits, S32, 1168, [0:2], "not important" +currentIdlePosition = scalar, F32, 1172 +baseIdlePosition = scalar, F32, 1176 +iacByTpsTaper = scalar, F32, 1180 +throttlePedalUpState = scalar, S32, 1184, "", 1, 0 +mightResetPid = bits, U32, 1188, [0:0] +shouldResetPid = bits, U32, 1188, [1:1] +wasResetPid = bits, U32, 1188, [2:2] +mustResetPid = bits, U32, 1188, [3:3] +isCranking = bits, U32, 1188, [4:4] +useIacTableForCoasting = bits, U32, 1188, [5:5] +notIdling = bits, U32, 1188, [6:6] +needReset = bits, U32, 1188, [7:7] +isInDeadZone = bits, U32, 1188, [8:8] +isBlipping = bits, U32, 1188, [9:9] +useClosedLoop = bits, U32, 1188, [10:10] +badTps = bits, U32, 1188, [11:11] +looksLikeRunning = bits, U32, 1188, [12:12] +looksLikeCoasting = bits, U32, 1188, [13:13] +looksLikeCrankToIdle = bits, U32, 1188, [14:14] +isVerboseIAC = bits, U32, 1188, [15:15] +isIdleCoasting = bits, U32, 1188, [16:16] +unusedBit_22_17 = bits, U32, 1188, [17:17] +unusedBit_22_18 = bits, U32, 1188, [18:18] +unusedBit_22_19 = bits, U32, 1188, [19:19] +unusedBit_22_20 = bits, U32, 1188, [20:20] +unusedBit_22_21 = bits, U32, 1188, [21:21] +unusedBit_22_22 = bits, U32, 1188, [22:22] +unusedBit_22_23 = bits, U32, 1188, [23:23] +unusedBit_22_24 = bits, U32, 1188, [24:24] +unusedBit_22_25 = bits, U32, 1188, [25:25] +unusedBit_22_26 = bits, U32, 1188, [26:26] +unusedBit_22_27 = bits, U32, 1188, [27:27] +unusedBit_22_28 = bits, U32, 1188, [28:28] +unusedBit_22_29 = bits, U32, 1188, [29:29] +unusedBit_22_30 = bits, U32, 1188, [30:30] +unusedBit_22_31 = bits, U32, 1188, [31:31] +targetRpmByClt = scalar, S32, 1192, "", 1, 0 +targetRpmAcBump = scalar, S32, 1196, "", 1, 0 +iacByRpmTaper = scalar, F32, 1200 +luaAdd = scalar, F32, 1204 +; total TS size = 1208 +baseDwell = scalar, F32, 1208, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 1212, "", 1, 0 +luaTimingAdd = scalar, F32, 1216, "", 1, 0 +luaTimingMult = scalar, F32, 1220, "", 1, 0 +; total TS size = 1224 +idlePosition = scalar, F32, 1224, "", 1, 0 +trim = scalar, F32, 1228, "", 1, 0 +luaAdjustment = scalar, F32, 1232, "", 1, 0 +etbFeedForward = scalar, F32, 1236 +etbIntegralError = scalar, F32, 1240, "", 1, 0 +etbCurrentTarget = scalar, F32, 1244, "%", 1, 0 +etbRevLimitActive = bits, U32, 1248, [0:0] +unusedBit_7_1 = bits, U32, 1248, [1:1] +unusedBit_7_2 = bits, U32, 1248, [2:2] +unusedBit_7_3 = bits, U32, 1248, [3:3] +unusedBit_7_4 = bits, U32, 1248, [4:4] +unusedBit_7_5 = bits, U32, 1248, [5:5] +unusedBit_7_6 = bits, U32, 1248, [6:6] +unusedBit_7_7 = bits, U32, 1248, [7:7] +unusedBit_7_8 = bits, U32, 1248, [8:8] +unusedBit_7_9 = bits, U32, 1248, [9:9] +unusedBit_7_10 = bits, U32, 1248, [10:10] +unusedBit_7_11 = bits, U32, 1248, [11:11] +unusedBit_7_12 = bits, U32, 1248, [12:12] +unusedBit_7_13 = bits, U32, 1248, [13:13] +unusedBit_7_14 = bits, U32, 1248, [14:14] +unusedBit_7_15 = bits, U32, 1248, [15:15] +unusedBit_7_16 = bits, U32, 1248, [16:16] +unusedBit_7_17 = bits, U32, 1248, [17:17] +unusedBit_7_18 = bits, U32, 1248, [18:18] +unusedBit_7_19 = bits, U32, 1248, [19:19] +unusedBit_7_20 = bits, U32, 1248, [20:20] +unusedBit_7_21 = bits, U32, 1248, [21:21] +unusedBit_7_22 = bits, U32, 1248, [22:22] +unusedBit_7_23 = bits, U32, 1248, [23:23] +unusedBit_7_24 = bits, U32, 1248, [24:24] +unusedBit_7_25 = bits, U32, 1248, [25:25] +unusedBit_7_26 = bits, U32, 1248, [26:26] +unusedBit_7_27 = bits, U32, 1248, [27:27] +unusedBit_7_28 = bits, U32, 1248, [28:28] +unusedBit_7_29 = bits, U32, 1248, [29:29] +unusedBit_7_30 = bits, U32, 1248, [30:30] +unusedBit_7_31 = bits, U32, 1248, [31:31] +; total TS size = 1252 +faultCode = scalar, U08, 1252, "", 1, 0 +heaterDuty = scalar, U08, 1253, "%", 1, 0 +pumpDuty = scalar, U08, 1254, "%", 1, 0 +tempC = scalar, U16, 1256, "C", 1, 0 +nernstVoltage = scalar, U16, 1258, "V", 0.001, 0 +esr = scalar, U16, 1260, "", 1, 0 +; total TS size = 1264 time = { timeNow } @@ -4993,6 +4994,7 @@ entry = mapVvt_MAP_AT_DIFF, "mapVvt_MAP_AT_DIFF", float, "%.3f" entry = mapVvt_MAP_AT_CYCLE_COUNT, "mapVvt_MAP_AT_CYCLE_COUNT", int, "%d" entry = mapVvt_map_peak, "mapVvt_map_peak", int, "%d" entry = currentEngineDecodedPhase, "Engine Phase", float, "%.3f" +entry = triggerToothAngleError, "triggerToothAngleError", float, "%.3f" entry = crankSynchronizationCounter, "Crank sync counter", int, "%d" entry = vvtSyncGapRatio, "vvtSyncGapRatio", float, "%.3f" entry = vvtCurrentPosition, "vvtCurrentPosition", float, "%.3f" @@ -5780,6 +5782,8 @@ dialog = trigger_centralDialog, "trigger_central" graphLine = mapVvt_MAP_AT_CYCLE_COUNT graphLine = mapVvt_map_peak graphLine = currentEngineDecodedPhase + liveGraph = trigger_central_4_Graph, "Graph", South + graphLine = triggerToothAngleError dialog = trigger_stateDialog, "trigger_state" diff --git a/firmware/tunerstudio/generated/rusefi_hellen81.ini b/firmware/tunerstudio/generated/rusefi_hellen81.ini index adaf595875..8cd1b49798 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.09.24.hellen81.3558961067" + signature = "rusEFI 2022.09.24.hellen81.3545017266" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.09.24.hellen81.3558961067" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.09.24.hellen81.3545017266" ; 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 Fri Sep 23 23:16:09 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Sep 24 04:28:43 UTC 2022 pageSize = 22048 page = 1 @@ -2140,7 +2140,7 @@ ignBlends4_blendValues = array, U08, 22038, [8], "%", 0.5, 0, 0, 100, 1 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1260 + ochBlockSize = 1264 ; ; see TunerStudioOutputChannels struct @@ -3141,146 +3141,147 @@ mapVvt_MAP_AT_DIFF = scalar, F32, 1116, "", 1, 0 mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1120, "", 1, 0 mapVvt_map_peak = scalar, U08, 1121, "", 1, 0 currentEngineDecodedPhase = scalar, F32, 1124, "deg", 1, 0 -; total TS size = 1128 -crankSynchronizationCounter = scalar, U32, 1128, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1132, "", 1, 0 -vvtCurrentPosition = scalar, F32, 1136, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1140, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 1144, "", 1, 0 -triggerStateIndex = scalar, U08, 1148, "", 1, 0 -vvtCounter = scalar, U08, 1149, "", 1, 0 -camResyncCounter = scalar, U08, 1150, "", 1, 0 -vvtStateIndex = scalar, U08, 1151, "", 1, 0 -; total TS size = 1152 -m_hasSynchronizedPhase = bits, U32, 1152, [0:0] -unusedBit_1_1 = bits, U32, 1152, [1:1] -unusedBit_1_2 = bits, U32, 1152, [2:2] -unusedBit_1_3 = bits, U32, 1152, [3:3] -unusedBit_1_4 = bits, U32, 1152, [4:4] -unusedBit_1_5 = bits, U32, 1152, [5:5] -unusedBit_1_6 = bits, U32, 1152, [6:6] -unusedBit_1_7 = bits, U32, 1152, [7:7] -unusedBit_1_8 = bits, U32, 1152, [8:8] -unusedBit_1_9 = bits, U32, 1152, [9:9] -unusedBit_1_10 = bits, U32, 1152, [10:10] -unusedBit_1_11 = bits, U32, 1152, [11:11] -unusedBit_1_12 = bits, U32, 1152, [12:12] -unusedBit_1_13 = bits, U32, 1152, [13:13] -unusedBit_1_14 = bits, U32, 1152, [14:14] -unusedBit_1_15 = bits, U32, 1152, [15:15] -unusedBit_1_16 = bits, U32, 1152, [16:16] -unusedBit_1_17 = bits, U32, 1152, [17:17] -unusedBit_1_18 = bits, U32, 1152, [18:18] -unusedBit_1_19 = bits, U32, 1152, [19:19] -unusedBit_1_20 = bits, U32, 1152, [20:20] -unusedBit_1_21 = bits, U32, 1152, [21:21] -unusedBit_1_22 = bits, U32, 1152, [22:22] -unusedBit_1_23 = bits, U32, 1152, [23:23] -unusedBit_1_24 = bits, U32, 1152, [24:24] -unusedBit_1_25 = bits, U32, 1152, [25:25] -unusedBit_1_26 = bits, U32, 1152, [26:26] -unusedBit_1_27 = bits, U32, 1152, [27:27] -unusedBit_1_28 = bits, U32, 1152, [28:28] -unusedBit_1_29 = bits, U32, 1152, [29:29] -unusedBit_1_30 = bits, U32, 1152, [30:30] -unusedBit_1_31 = bits, U32, 1152, [31:31] +triggerToothAngleError = scalar, F32, 1128, "deg", 1, 0 +; total TS size = 1132 +crankSynchronizationCounter = scalar, U32, 1132, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1136, "", 1, 0 +vvtCurrentPosition = scalar, F32, 1140, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1144, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 1148, "", 1, 0 +triggerStateIndex = scalar, U08, 1152, "", 1, 0 +vvtCounter = scalar, U08, 1153, "", 1, 0 +camResyncCounter = scalar, U08, 1154, "", 1, 0 +vvtStateIndex = scalar, U08, 1155, "", 1, 0 ; total TS size = 1156 -wallFuelCorrection = scalar, F32, 1156, "", 1, 0 -wallFuel = scalar, F32, 1160, "", 1, 0 -; total TS size = 1164 -idleState = bits, S32, 1164, [0:2], "not important" -currentIdlePosition = scalar, F32, 1168 -baseIdlePosition = scalar, F32, 1172 -iacByTpsTaper = scalar, F32, 1176 -throttlePedalUpState = scalar, S32, 1180, "", 1, 0 -mightResetPid = bits, U32, 1184, [0:0] -shouldResetPid = bits, U32, 1184, [1:1] -wasResetPid = bits, U32, 1184, [2:2] -mustResetPid = bits, U32, 1184, [3:3] -isCranking = bits, U32, 1184, [4:4] -useIacTableForCoasting = bits, U32, 1184, [5:5] -notIdling = bits, U32, 1184, [6:6] -needReset = bits, U32, 1184, [7:7] -isInDeadZone = bits, U32, 1184, [8:8] -isBlipping = bits, U32, 1184, [9:9] -useClosedLoop = bits, U32, 1184, [10:10] -badTps = bits, U32, 1184, [11:11] -looksLikeRunning = bits, U32, 1184, [12:12] -looksLikeCoasting = bits, U32, 1184, [13:13] -looksLikeCrankToIdle = bits, U32, 1184, [14:14] -isVerboseIAC = bits, U32, 1184, [15:15] -isIdleCoasting = bits, U32, 1184, [16:16] -unusedBit_22_17 = bits, U32, 1184, [17:17] -unusedBit_22_18 = bits, U32, 1184, [18:18] -unusedBit_22_19 = bits, U32, 1184, [19:19] -unusedBit_22_20 = bits, U32, 1184, [20:20] -unusedBit_22_21 = bits, U32, 1184, [21:21] -unusedBit_22_22 = bits, U32, 1184, [22:22] -unusedBit_22_23 = bits, U32, 1184, [23:23] -unusedBit_22_24 = bits, U32, 1184, [24:24] -unusedBit_22_25 = bits, U32, 1184, [25:25] -unusedBit_22_26 = bits, U32, 1184, [26:26] -unusedBit_22_27 = bits, U32, 1184, [27:27] -unusedBit_22_28 = bits, U32, 1184, [28:28] -unusedBit_22_29 = bits, U32, 1184, [29:29] -unusedBit_22_30 = bits, U32, 1184, [30:30] -unusedBit_22_31 = bits, U32, 1184, [31:31] -targetRpmByClt = scalar, S32, 1188, "", 1, 0 -targetRpmAcBump = scalar, S32, 1192, "", 1, 0 -iacByRpmTaper = scalar, F32, 1196 -luaAdd = scalar, F32, 1200 -; total TS size = 1204 -baseDwell = scalar, F32, 1204, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 1208, "", 1, 0 -luaTimingAdd = scalar, F32, 1212, "", 1, 0 -luaTimingMult = scalar, F32, 1216, "", 1, 0 -; total TS size = 1220 -idlePosition = scalar, F32, 1220, "", 1, 0 -trim = scalar, F32, 1224, "", 1, 0 -luaAdjustment = scalar, F32, 1228, "", 1, 0 -etbFeedForward = scalar, F32, 1232 -etbIntegralError = scalar, F32, 1236, "", 1, 0 -etbCurrentTarget = scalar, F32, 1240, "%", 1, 0 -etbRevLimitActive = bits, U32, 1244, [0:0] -unusedBit_7_1 = bits, U32, 1244, [1:1] -unusedBit_7_2 = bits, U32, 1244, [2:2] -unusedBit_7_3 = bits, U32, 1244, [3:3] -unusedBit_7_4 = bits, U32, 1244, [4:4] -unusedBit_7_5 = bits, U32, 1244, [5:5] -unusedBit_7_6 = bits, U32, 1244, [6:6] -unusedBit_7_7 = bits, U32, 1244, [7:7] -unusedBit_7_8 = bits, U32, 1244, [8:8] -unusedBit_7_9 = bits, U32, 1244, [9:9] -unusedBit_7_10 = bits, U32, 1244, [10:10] -unusedBit_7_11 = bits, U32, 1244, [11:11] -unusedBit_7_12 = bits, U32, 1244, [12:12] -unusedBit_7_13 = bits, U32, 1244, [13:13] -unusedBit_7_14 = bits, U32, 1244, [14:14] -unusedBit_7_15 = bits, U32, 1244, [15:15] -unusedBit_7_16 = bits, U32, 1244, [16:16] -unusedBit_7_17 = bits, U32, 1244, [17:17] -unusedBit_7_18 = bits, U32, 1244, [18:18] -unusedBit_7_19 = bits, U32, 1244, [19:19] -unusedBit_7_20 = bits, U32, 1244, [20:20] -unusedBit_7_21 = bits, U32, 1244, [21:21] -unusedBit_7_22 = bits, U32, 1244, [22:22] -unusedBit_7_23 = bits, U32, 1244, [23:23] -unusedBit_7_24 = bits, U32, 1244, [24:24] -unusedBit_7_25 = bits, U32, 1244, [25:25] -unusedBit_7_26 = bits, U32, 1244, [26:26] -unusedBit_7_27 = bits, U32, 1244, [27:27] -unusedBit_7_28 = bits, U32, 1244, [28:28] -unusedBit_7_29 = bits, U32, 1244, [29:29] -unusedBit_7_30 = bits, U32, 1244, [30:30] -unusedBit_7_31 = bits, U32, 1244, [31:31] -; total TS size = 1248 -faultCode = scalar, U08, 1248, "", 1, 0 -heaterDuty = scalar, U08, 1249, "%", 1, 0 -pumpDuty = scalar, U08, 1250, "%", 1, 0 -tempC = scalar, U16, 1252, "C", 1, 0 -nernstVoltage = scalar, U16, 1254, "V", 0.001, 0 -esr = scalar, U16, 1256, "", 1, 0 -; total TS size = 1260 +m_hasSynchronizedPhase = bits, U32, 1156, [0:0] +unusedBit_1_1 = bits, U32, 1156, [1:1] +unusedBit_1_2 = bits, U32, 1156, [2:2] +unusedBit_1_3 = bits, U32, 1156, [3:3] +unusedBit_1_4 = bits, U32, 1156, [4:4] +unusedBit_1_5 = bits, U32, 1156, [5:5] +unusedBit_1_6 = bits, U32, 1156, [6:6] +unusedBit_1_7 = bits, U32, 1156, [7:7] +unusedBit_1_8 = bits, U32, 1156, [8:8] +unusedBit_1_9 = bits, U32, 1156, [9:9] +unusedBit_1_10 = bits, U32, 1156, [10:10] +unusedBit_1_11 = bits, U32, 1156, [11:11] +unusedBit_1_12 = bits, U32, 1156, [12:12] +unusedBit_1_13 = bits, U32, 1156, [13:13] +unusedBit_1_14 = bits, U32, 1156, [14:14] +unusedBit_1_15 = bits, U32, 1156, [15:15] +unusedBit_1_16 = bits, U32, 1156, [16:16] +unusedBit_1_17 = bits, U32, 1156, [17:17] +unusedBit_1_18 = bits, U32, 1156, [18:18] +unusedBit_1_19 = bits, U32, 1156, [19:19] +unusedBit_1_20 = bits, U32, 1156, [20:20] +unusedBit_1_21 = bits, U32, 1156, [21:21] +unusedBit_1_22 = bits, U32, 1156, [22:22] +unusedBit_1_23 = bits, U32, 1156, [23:23] +unusedBit_1_24 = bits, U32, 1156, [24:24] +unusedBit_1_25 = bits, U32, 1156, [25:25] +unusedBit_1_26 = bits, U32, 1156, [26:26] +unusedBit_1_27 = bits, U32, 1156, [27:27] +unusedBit_1_28 = bits, U32, 1156, [28:28] +unusedBit_1_29 = bits, U32, 1156, [29:29] +unusedBit_1_30 = bits, U32, 1156, [30:30] +unusedBit_1_31 = bits, U32, 1156, [31:31] +; total TS size = 1160 +wallFuelCorrection = scalar, F32, 1160, "", 1, 0 +wallFuel = scalar, F32, 1164, "", 1, 0 +; total TS size = 1168 +idleState = bits, S32, 1168, [0:2], "not important" +currentIdlePosition = scalar, F32, 1172 +baseIdlePosition = scalar, F32, 1176 +iacByTpsTaper = scalar, F32, 1180 +throttlePedalUpState = scalar, S32, 1184, "", 1, 0 +mightResetPid = bits, U32, 1188, [0:0] +shouldResetPid = bits, U32, 1188, [1:1] +wasResetPid = bits, U32, 1188, [2:2] +mustResetPid = bits, U32, 1188, [3:3] +isCranking = bits, U32, 1188, [4:4] +useIacTableForCoasting = bits, U32, 1188, [5:5] +notIdling = bits, U32, 1188, [6:6] +needReset = bits, U32, 1188, [7:7] +isInDeadZone = bits, U32, 1188, [8:8] +isBlipping = bits, U32, 1188, [9:9] +useClosedLoop = bits, U32, 1188, [10:10] +badTps = bits, U32, 1188, [11:11] +looksLikeRunning = bits, U32, 1188, [12:12] +looksLikeCoasting = bits, U32, 1188, [13:13] +looksLikeCrankToIdle = bits, U32, 1188, [14:14] +isVerboseIAC = bits, U32, 1188, [15:15] +isIdleCoasting = bits, U32, 1188, [16:16] +unusedBit_22_17 = bits, U32, 1188, [17:17] +unusedBit_22_18 = bits, U32, 1188, [18:18] +unusedBit_22_19 = bits, U32, 1188, [19:19] +unusedBit_22_20 = bits, U32, 1188, [20:20] +unusedBit_22_21 = bits, U32, 1188, [21:21] +unusedBit_22_22 = bits, U32, 1188, [22:22] +unusedBit_22_23 = bits, U32, 1188, [23:23] +unusedBit_22_24 = bits, U32, 1188, [24:24] +unusedBit_22_25 = bits, U32, 1188, [25:25] +unusedBit_22_26 = bits, U32, 1188, [26:26] +unusedBit_22_27 = bits, U32, 1188, [27:27] +unusedBit_22_28 = bits, U32, 1188, [28:28] +unusedBit_22_29 = bits, U32, 1188, [29:29] +unusedBit_22_30 = bits, U32, 1188, [30:30] +unusedBit_22_31 = bits, U32, 1188, [31:31] +targetRpmByClt = scalar, S32, 1192, "", 1, 0 +targetRpmAcBump = scalar, S32, 1196, "", 1, 0 +iacByRpmTaper = scalar, F32, 1200 +luaAdd = scalar, F32, 1204 +; total TS size = 1208 +baseDwell = scalar, F32, 1208, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 1212, "", 1, 0 +luaTimingAdd = scalar, F32, 1216, "", 1, 0 +luaTimingMult = scalar, F32, 1220, "", 1, 0 +; total TS size = 1224 +idlePosition = scalar, F32, 1224, "", 1, 0 +trim = scalar, F32, 1228, "", 1, 0 +luaAdjustment = scalar, F32, 1232, "", 1, 0 +etbFeedForward = scalar, F32, 1236 +etbIntegralError = scalar, F32, 1240, "", 1, 0 +etbCurrentTarget = scalar, F32, 1244, "%", 1, 0 +etbRevLimitActive = bits, U32, 1248, [0:0] +unusedBit_7_1 = bits, U32, 1248, [1:1] +unusedBit_7_2 = bits, U32, 1248, [2:2] +unusedBit_7_3 = bits, U32, 1248, [3:3] +unusedBit_7_4 = bits, U32, 1248, [4:4] +unusedBit_7_5 = bits, U32, 1248, [5:5] +unusedBit_7_6 = bits, U32, 1248, [6:6] +unusedBit_7_7 = bits, U32, 1248, [7:7] +unusedBit_7_8 = bits, U32, 1248, [8:8] +unusedBit_7_9 = bits, U32, 1248, [9:9] +unusedBit_7_10 = bits, U32, 1248, [10:10] +unusedBit_7_11 = bits, U32, 1248, [11:11] +unusedBit_7_12 = bits, U32, 1248, [12:12] +unusedBit_7_13 = bits, U32, 1248, [13:13] +unusedBit_7_14 = bits, U32, 1248, [14:14] +unusedBit_7_15 = bits, U32, 1248, [15:15] +unusedBit_7_16 = bits, U32, 1248, [16:16] +unusedBit_7_17 = bits, U32, 1248, [17:17] +unusedBit_7_18 = bits, U32, 1248, [18:18] +unusedBit_7_19 = bits, U32, 1248, [19:19] +unusedBit_7_20 = bits, U32, 1248, [20:20] +unusedBit_7_21 = bits, U32, 1248, [21:21] +unusedBit_7_22 = bits, U32, 1248, [22:22] +unusedBit_7_23 = bits, U32, 1248, [23:23] +unusedBit_7_24 = bits, U32, 1248, [24:24] +unusedBit_7_25 = bits, U32, 1248, [25:25] +unusedBit_7_26 = bits, U32, 1248, [26:26] +unusedBit_7_27 = bits, U32, 1248, [27:27] +unusedBit_7_28 = bits, U32, 1248, [28:28] +unusedBit_7_29 = bits, U32, 1248, [29:29] +unusedBit_7_30 = bits, U32, 1248, [30:30] +unusedBit_7_31 = bits, U32, 1248, [31:31] +; total TS size = 1252 +faultCode = scalar, U08, 1252, "", 1, 0 +heaterDuty = scalar, U08, 1253, "%", 1, 0 +pumpDuty = scalar, U08, 1254, "%", 1, 0 +tempC = scalar, U16, 1256, "C", 1, 0 +nernstVoltage = scalar, U16, 1258, "V", 0.001, 0 +esr = scalar, U16, 1260, "", 1, 0 +; total TS size = 1264 time = { timeNow } @@ -4993,6 +4994,7 @@ entry = mapVvt_MAP_AT_DIFF, "mapVvt_MAP_AT_DIFF", float, "%.3f" entry = mapVvt_MAP_AT_CYCLE_COUNT, "mapVvt_MAP_AT_CYCLE_COUNT", int, "%d" entry = mapVvt_map_peak, "mapVvt_map_peak", int, "%d" entry = currentEngineDecodedPhase, "Engine Phase", float, "%.3f" +entry = triggerToothAngleError, "triggerToothAngleError", float, "%.3f" entry = crankSynchronizationCounter, "Crank sync counter", int, "%d" entry = vvtSyncGapRatio, "vvtSyncGapRatio", float, "%.3f" entry = vvtCurrentPosition, "vvtCurrentPosition", float, "%.3f" @@ -5778,6 +5780,8 @@ dialog = trigger_centralDialog, "trigger_central" graphLine = mapVvt_MAP_AT_CYCLE_COUNT graphLine = mapVvt_map_peak graphLine = currentEngineDecodedPhase + liveGraph = trigger_central_4_Graph, "Graph", South + graphLine = triggerToothAngleError dialog = trigger_stateDialog, "trigger_state" diff --git a/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini b/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini index 9b97a8530c..f4dca092a8 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.09.24.hellen88bmw.3814827117" + signature = "rusEFI 2022.09.24.hellen88bmw.3826016372" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.09.24.hellen88bmw.3814827117" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.09.24.hellen88bmw.3826016372" ; 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 Fri Sep 23 23:16:05 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Sep 24 04:28:40 UTC 2022 pageSize = 22048 page = 1 @@ -2140,7 +2140,7 @@ ignBlends4_blendValues = array, U08, 22038, [8], "%", 0.5, 0, 0, 100, 1 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1260 + ochBlockSize = 1264 ; ; see TunerStudioOutputChannels struct @@ -3141,146 +3141,147 @@ mapVvt_MAP_AT_DIFF = scalar, F32, 1116, "", 1, 0 mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1120, "", 1, 0 mapVvt_map_peak = scalar, U08, 1121, "", 1, 0 currentEngineDecodedPhase = scalar, F32, 1124, "deg", 1, 0 -; total TS size = 1128 -crankSynchronizationCounter = scalar, U32, 1128, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1132, "", 1, 0 -vvtCurrentPosition = scalar, F32, 1136, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1140, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 1144, "", 1, 0 -triggerStateIndex = scalar, U08, 1148, "", 1, 0 -vvtCounter = scalar, U08, 1149, "", 1, 0 -camResyncCounter = scalar, U08, 1150, "", 1, 0 -vvtStateIndex = scalar, U08, 1151, "", 1, 0 -; total TS size = 1152 -m_hasSynchronizedPhase = bits, U32, 1152, [0:0] -unusedBit_1_1 = bits, U32, 1152, [1:1] -unusedBit_1_2 = bits, U32, 1152, [2:2] -unusedBit_1_3 = bits, U32, 1152, [3:3] -unusedBit_1_4 = bits, U32, 1152, [4:4] -unusedBit_1_5 = bits, U32, 1152, [5:5] -unusedBit_1_6 = bits, U32, 1152, [6:6] -unusedBit_1_7 = bits, U32, 1152, [7:7] -unusedBit_1_8 = bits, U32, 1152, [8:8] -unusedBit_1_9 = bits, U32, 1152, [9:9] -unusedBit_1_10 = bits, U32, 1152, [10:10] -unusedBit_1_11 = bits, U32, 1152, [11:11] -unusedBit_1_12 = bits, U32, 1152, [12:12] -unusedBit_1_13 = bits, U32, 1152, [13:13] -unusedBit_1_14 = bits, U32, 1152, [14:14] -unusedBit_1_15 = bits, U32, 1152, [15:15] -unusedBit_1_16 = bits, U32, 1152, [16:16] -unusedBit_1_17 = bits, U32, 1152, [17:17] -unusedBit_1_18 = bits, U32, 1152, [18:18] -unusedBit_1_19 = bits, U32, 1152, [19:19] -unusedBit_1_20 = bits, U32, 1152, [20:20] -unusedBit_1_21 = bits, U32, 1152, [21:21] -unusedBit_1_22 = bits, U32, 1152, [22:22] -unusedBit_1_23 = bits, U32, 1152, [23:23] -unusedBit_1_24 = bits, U32, 1152, [24:24] -unusedBit_1_25 = bits, U32, 1152, [25:25] -unusedBit_1_26 = bits, U32, 1152, [26:26] -unusedBit_1_27 = bits, U32, 1152, [27:27] -unusedBit_1_28 = bits, U32, 1152, [28:28] -unusedBit_1_29 = bits, U32, 1152, [29:29] -unusedBit_1_30 = bits, U32, 1152, [30:30] -unusedBit_1_31 = bits, U32, 1152, [31:31] +triggerToothAngleError = scalar, F32, 1128, "deg", 1, 0 +; total TS size = 1132 +crankSynchronizationCounter = scalar, U32, 1132, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1136, "", 1, 0 +vvtCurrentPosition = scalar, F32, 1140, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1144, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 1148, "", 1, 0 +triggerStateIndex = scalar, U08, 1152, "", 1, 0 +vvtCounter = scalar, U08, 1153, "", 1, 0 +camResyncCounter = scalar, U08, 1154, "", 1, 0 +vvtStateIndex = scalar, U08, 1155, "", 1, 0 ; total TS size = 1156 -wallFuelCorrection = scalar, F32, 1156, "", 1, 0 -wallFuel = scalar, F32, 1160, "", 1, 0 -; total TS size = 1164 -idleState = bits, S32, 1164, [0:2], "not important" -currentIdlePosition = scalar, F32, 1168 -baseIdlePosition = scalar, F32, 1172 -iacByTpsTaper = scalar, F32, 1176 -throttlePedalUpState = scalar, S32, 1180, "", 1, 0 -mightResetPid = bits, U32, 1184, [0:0] -shouldResetPid = bits, U32, 1184, [1:1] -wasResetPid = bits, U32, 1184, [2:2] -mustResetPid = bits, U32, 1184, [3:3] -isCranking = bits, U32, 1184, [4:4] -useIacTableForCoasting = bits, U32, 1184, [5:5] -notIdling = bits, U32, 1184, [6:6] -needReset = bits, U32, 1184, [7:7] -isInDeadZone = bits, U32, 1184, [8:8] -isBlipping = bits, U32, 1184, [9:9] -useClosedLoop = bits, U32, 1184, [10:10] -badTps = bits, U32, 1184, [11:11] -looksLikeRunning = bits, U32, 1184, [12:12] -looksLikeCoasting = bits, U32, 1184, [13:13] -looksLikeCrankToIdle = bits, U32, 1184, [14:14] -isVerboseIAC = bits, U32, 1184, [15:15] -isIdleCoasting = bits, U32, 1184, [16:16] -unusedBit_22_17 = bits, U32, 1184, [17:17] -unusedBit_22_18 = bits, U32, 1184, [18:18] -unusedBit_22_19 = bits, U32, 1184, [19:19] -unusedBit_22_20 = bits, U32, 1184, [20:20] -unusedBit_22_21 = bits, U32, 1184, [21:21] -unusedBit_22_22 = bits, U32, 1184, [22:22] -unusedBit_22_23 = bits, U32, 1184, [23:23] -unusedBit_22_24 = bits, U32, 1184, [24:24] -unusedBit_22_25 = bits, U32, 1184, [25:25] -unusedBit_22_26 = bits, U32, 1184, [26:26] -unusedBit_22_27 = bits, U32, 1184, [27:27] -unusedBit_22_28 = bits, U32, 1184, [28:28] -unusedBit_22_29 = bits, U32, 1184, [29:29] -unusedBit_22_30 = bits, U32, 1184, [30:30] -unusedBit_22_31 = bits, U32, 1184, [31:31] -targetRpmByClt = scalar, S32, 1188, "", 1, 0 -targetRpmAcBump = scalar, S32, 1192, "", 1, 0 -iacByRpmTaper = scalar, F32, 1196 -luaAdd = scalar, F32, 1200 -; total TS size = 1204 -baseDwell = scalar, F32, 1204, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 1208, "", 1, 0 -luaTimingAdd = scalar, F32, 1212, "", 1, 0 -luaTimingMult = scalar, F32, 1216, "", 1, 0 -; total TS size = 1220 -idlePosition = scalar, F32, 1220, "", 1, 0 -trim = scalar, F32, 1224, "", 1, 0 -luaAdjustment = scalar, F32, 1228, "", 1, 0 -etbFeedForward = scalar, F32, 1232 -etbIntegralError = scalar, F32, 1236, "", 1, 0 -etbCurrentTarget = scalar, F32, 1240, "%", 1, 0 -etbRevLimitActive = bits, U32, 1244, [0:0] -unusedBit_7_1 = bits, U32, 1244, [1:1] -unusedBit_7_2 = bits, U32, 1244, [2:2] -unusedBit_7_3 = bits, U32, 1244, [3:3] -unusedBit_7_4 = bits, U32, 1244, [4:4] -unusedBit_7_5 = bits, U32, 1244, [5:5] -unusedBit_7_6 = bits, U32, 1244, [6:6] -unusedBit_7_7 = bits, U32, 1244, [7:7] -unusedBit_7_8 = bits, U32, 1244, [8:8] -unusedBit_7_9 = bits, U32, 1244, [9:9] -unusedBit_7_10 = bits, U32, 1244, [10:10] -unusedBit_7_11 = bits, U32, 1244, [11:11] -unusedBit_7_12 = bits, U32, 1244, [12:12] -unusedBit_7_13 = bits, U32, 1244, [13:13] -unusedBit_7_14 = bits, U32, 1244, [14:14] -unusedBit_7_15 = bits, U32, 1244, [15:15] -unusedBit_7_16 = bits, U32, 1244, [16:16] -unusedBit_7_17 = bits, U32, 1244, [17:17] -unusedBit_7_18 = bits, U32, 1244, [18:18] -unusedBit_7_19 = bits, U32, 1244, [19:19] -unusedBit_7_20 = bits, U32, 1244, [20:20] -unusedBit_7_21 = bits, U32, 1244, [21:21] -unusedBit_7_22 = bits, U32, 1244, [22:22] -unusedBit_7_23 = bits, U32, 1244, [23:23] -unusedBit_7_24 = bits, U32, 1244, [24:24] -unusedBit_7_25 = bits, U32, 1244, [25:25] -unusedBit_7_26 = bits, U32, 1244, [26:26] -unusedBit_7_27 = bits, U32, 1244, [27:27] -unusedBit_7_28 = bits, U32, 1244, [28:28] -unusedBit_7_29 = bits, U32, 1244, [29:29] -unusedBit_7_30 = bits, U32, 1244, [30:30] -unusedBit_7_31 = bits, U32, 1244, [31:31] -; total TS size = 1248 -faultCode = scalar, U08, 1248, "", 1, 0 -heaterDuty = scalar, U08, 1249, "%", 1, 0 -pumpDuty = scalar, U08, 1250, "%", 1, 0 -tempC = scalar, U16, 1252, "C", 1, 0 -nernstVoltage = scalar, U16, 1254, "V", 0.001, 0 -esr = scalar, U16, 1256, "", 1, 0 -; total TS size = 1260 +m_hasSynchronizedPhase = bits, U32, 1156, [0:0] +unusedBit_1_1 = bits, U32, 1156, [1:1] +unusedBit_1_2 = bits, U32, 1156, [2:2] +unusedBit_1_3 = bits, U32, 1156, [3:3] +unusedBit_1_4 = bits, U32, 1156, [4:4] +unusedBit_1_5 = bits, U32, 1156, [5:5] +unusedBit_1_6 = bits, U32, 1156, [6:6] +unusedBit_1_7 = bits, U32, 1156, [7:7] +unusedBit_1_8 = bits, U32, 1156, [8:8] +unusedBit_1_9 = bits, U32, 1156, [9:9] +unusedBit_1_10 = bits, U32, 1156, [10:10] +unusedBit_1_11 = bits, U32, 1156, [11:11] +unusedBit_1_12 = bits, U32, 1156, [12:12] +unusedBit_1_13 = bits, U32, 1156, [13:13] +unusedBit_1_14 = bits, U32, 1156, [14:14] +unusedBit_1_15 = bits, U32, 1156, [15:15] +unusedBit_1_16 = bits, U32, 1156, [16:16] +unusedBit_1_17 = bits, U32, 1156, [17:17] +unusedBit_1_18 = bits, U32, 1156, [18:18] +unusedBit_1_19 = bits, U32, 1156, [19:19] +unusedBit_1_20 = bits, U32, 1156, [20:20] +unusedBit_1_21 = bits, U32, 1156, [21:21] +unusedBit_1_22 = bits, U32, 1156, [22:22] +unusedBit_1_23 = bits, U32, 1156, [23:23] +unusedBit_1_24 = bits, U32, 1156, [24:24] +unusedBit_1_25 = bits, U32, 1156, [25:25] +unusedBit_1_26 = bits, U32, 1156, [26:26] +unusedBit_1_27 = bits, U32, 1156, [27:27] +unusedBit_1_28 = bits, U32, 1156, [28:28] +unusedBit_1_29 = bits, U32, 1156, [29:29] +unusedBit_1_30 = bits, U32, 1156, [30:30] +unusedBit_1_31 = bits, U32, 1156, [31:31] +; total TS size = 1160 +wallFuelCorrection = scalar, F32, 1160, "", 1, 0 +wallFuel = scalar, F32, 1164, "", 1, 0 +; total TS size = 1168 +idleState = bits, S32, 1168, [0:2], "not important" +currentIdlePosition = scalar, F32, 1172 +baseIdlePosition = scalar, F32, 1176 +iacByTpsTaper = scalar, F32, 1180 +throttlePedalUpState = scalar, S32, 1184, "", 1, 0 +mightResetPid = bits, U32, 1188, [0:0] +shouldResetPid = bits, U32, 1188, [1:1] +wasResetPid = bits, U32, 1188, [2:2] +mustResetPid = bits, U32, 1188, [3:3] +isCranking = bits, U32, 1188, [4:4] +useIacTableForCoasting = bits, U32, 1188, [5:5] +notIdling = bits, U32, 1188, [6:6] +needReset = bits, U32, 1188, [7:7] +isInDeadZone = bits, U32, 1188, [8:8] +isBlipping = bits, U32, 1188, [9:9] +useClosedLoop = bits, U32, 1188, [10:10] +badTps = bits, U32, 1188, [11:11] +looksLikeRunning = bits, U32, 1188, [12:12] +looksLikeCoasting = bits, U32, 1188, [13:13] +looksLikeCrankToIdle = bits, U32, 1188, [14:14] +isVerboseIAC = bits, U32, 1188, [15:15] +isIdleCoasting = bits, U32, 1188, [16:16] +unusedBit_22_17 = bits, U32, 1188, [17:17] +unusedBit_22_18 = bits, U32, 1188, [18:18] +unusedBit_22_19 = bits, U32, 1188, [19:19] +unusedBit_22_20 = bits, U32, 1188, [20:20] +unusedBit_22_21 = bits, U32, 1188, [21:21] +unusedBit_22_22 = bits, U32, 1188, [22:22] +unusedBit_22_23 = bits, U32, 1188, [23:23] +unusedBit_22_24 = bits, U32, 1188, [24:24] +unusedBit_22_25 = bits, U32, 1188, [25:25] +unusedBit_22_26 = bits, U32, 1188, [26:26] +unusedBit_22_27 = bits, U32, 1188, [27:27] +unusedBit_22_28 = bits, U32, 1188, [28:28] +unusedBit_22_29 = bits, U32, 1188, [29:29] +unusedBit_22_30 = bits, U32, 1188, [30:30] +unusedBit_22_31 = bits, U32, 1188, [31:31] +targetRpmByClt = scalar, S32, 1192, "", 1, 0 +targetRpmAcBump = scalar, S32, 1196, "", 1, 0 +iacByRpmTaper = scalar, F32, 1200 +luaAdd = scalar, F32, 1204 +; total TS size = 1208 +baseDwell = scalar, F32, 1208, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 1212, "", 1, 0 +luaTimingAdd = scalar, F32, 1216, "", 1, 0 +luaTimingMult = scalar, F32, 1220, "", 1, 0 +; total TS size = 1224 +idlePosition = scalar, F32, 1224, "", 1, 0 +trim = scalar, F32, 1228, "", 1, 0 +luaAdjustment = scalar, F32, 1232, "", 1, 0 +etbFeedForward = scalar, F32, 1236 +etbIntegralError = scalar, F32, 1240, "", 1, 0 +etbCurrentTarget = scalar, F32, 1244, "%", 1, 0 +etbRevLimitActive = bits, U32, 1248, [0:0] +unusedBit_7_1 = bits, U32, 1248, [1:1] +unusedBit_7_2 = bits, U32, 1248, [2:2] +unusedBit_7_3 = bits, U32, 1248, [3:3] +unusedBit_7_4 = bits, U32, 1248, [4:4] +unusedBit_7_5 = bits, U32, 1248, [5:5] +unusedBit_7_6 = bits, U32, 1248, [6:6] +unusedBit_7_7 = bits, U32, 1248, [7:7] +unusedBit_7_8 = bits, U32, 1248, [8:8] +unusedBit_7_9 = bits, U32, 1248, [9:9] +unusedBit_7_10 = bits, U32, 1248, [10:10] +unusedBit_7_11 = bits, U32, 1248, [11:11] +unusedBit_7_12 = bits, U32, 1248, [12:12] +unusedBit_7_13 = bits, U32, 1248, [13:13] +unusedBit_7_14 = bits, U32, 1248, [14:14] +unusedBit_7_15 = bits, U32, 1248, [15:15] +unusedBit_7_16 = bits, U32, 1248, [16:16] +unusedBit_7_17 = bits, U32, 1248, [17:17] +unusedBit_7_18 = bits, U32, 1248, [18:18] +unusedBit_7_19 = bits, U32, 1248, [19:19] +unusedBit_7_20 = bits, U32, 1248, [20:20] +unusedBit_7_21 = bits, U32, 1248, [21:21] +unusedBit_7_22 = bits, U32, 1248, [22:22] +unusedBit_7_23 = bits, U32, 1248, [23:23] +unusedBit_7_24 = bits, U32, 1248, [24:24] +unusedBit_7_25 = bits, U32, 1248, [25:25] +unusedBit_7_26 = bits, U32, 1248, [26:26] +unusedBit_7_27 = bits, U32, 1248, [27:27] +unusedBit_7_28 = bits, U32, 1248, [28:28] +unusedBit_7_29 = bits, U32, 1248, [29:29] +unusedBit_7_30 = bits, U32, 1248, [30:30] +unusedBit_7_31 = bits, U32, 1248, [31:31] +; total TS size = 1252 +faultCode = scalar, U08, 1252, "", 1, 0 +heaterDuty = scalar, U08, 1253, "%", 1, 0 +pumpDuty = scalar, U08, 1254, "%", 1, 0 +tempC = scalar, U16, 1256, "C", 1, 0 +nernstVoltage = scalar, U16, 1258, "V", 0.001, 0 +esr = scalar, U16, 1260, "", 1, 0 +; total TS size = 1264 time = { timeNow } @@ -4993,6 +4994,7 @@ entry = mapVvt_MAP_AT_DIFF, "mapVvt_MAP_AT_DIFF", float, "%.3f" entry = mapVvt_MAP_AT_CYCLE_COUNT, "mapVvt_MAP_AT_CYCLE_COUNT", int, "%d" entry = mapVvt_map_peak, "mapVvt_map_peak", int, "%d" entry = currentEngineDecodedPhase, "Engine Phase", float, "%.3f" +entry = triggerToothAngleError, "triggerToothAngleError", float, "%.3f" entry = crankSynchronizationCounter, "Crank sync counter", int, "%d" entry = vvtSyncGapRatio, "vvtSyncGapRatio", float, "%.3f" entry = vvtCurrentPosition, "vvtCurrentPosition", float, "%.3f" @@ -5780,6 +5782,8 @@ dialog = trigger_centralDialog, "trigger_central" graphLine = mapVvt_MAP_AT_CYCLE_COUNT graphLine = mapVvt_map_peak graphLine = currentEngineDecodedPhase + liveGraph = trigger_central_4_Graph, "Graph", South + graphLine = triggerToothAngleError dialog = trigger_stateDialog, "trigger_state" diff --git a/firmware/tunerstudio/generated/rusefi_hellenNA6.ini b/firmware/tunerstudio/generated/rusefi_hellenNA6.ini index afda9da57a..c9d0a51b5c 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.09.24.hellenNA6.2832729750" + signature = "rusEFI 2022.09.24.hellenNA6.2947924623" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.09.24.hellenNA6.2832729750" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.09.24.hellenNA6.2947924623" ; 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 Fri Sep 23 23:16:14 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Sep 24 04:28:49 UTC 2022 pageSize = 22048 page = 1 @@ -2140,7 +2140,7 @@ ignBlends4_blendValues = array, U08, 22038, [8], "%", 0.5, 0, 0, 100, 1 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1260 + ochBlockSize = 1264 ; ; see TunerStudioOutputChannels struct @@ -3141,146 +3141,147 @@ mapVvt_MAP_AT_DIFF = scalar, F32, 1116, "", 1, 0 mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1120, "", 1, 0 mapVvt_map_peak = scalar, U08, 1121, "", 1, 0 currentEngineDecodedPhase = scalar, F32, 1124, "deg", 1, 0 -; total TS size = 1128 -crankSynchronizationCounter = scalar, U32, 1128, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1132, "", 1, 0 -vvtCurrentPosition = scalar, F32, 1136, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1140, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 1144, "", 1, 0 -triggerStateIndex = scalar, U08, 1148, "", 1, 0 -vvtCounter = scalar, U08, 1149, "", 1, 0 -camResyncCounter = scalar, U08, 1150, "", 1, 0 -vvtStateIndex = scalar, U08, 1151, "", 1, 0 -; total TS size = 1152 -m_hasSynchronizedPhase = bits, U32, 1152, [0:0] -unusedBit_1_1 = bits, U32, 1152, [1:1] -unusedBit_1_2 = bits, U32, 1152, [2:2] -unusedBit_1_3 = bits, U32, 1152, [3:3] -unusedBit_1_4 = bits, U32, 1152, [4:4] -unusedBit_1_5 = bits, U32, 1152, [5:5] -unusedBit_1_6 = bits, U32, 1152, [6:6] -unusedBit_1_7 = bits, U32, 1152, [7:7] -unusedBit_1_8 = bits, U32, 1152, [8:8] -unusedBit_1_9 = bits, U32, 1152, [9:9] -unusedBit_1_10 = bits, U32, 1152, [10:10] -unusedBit_1_11 = bits, U32, 1152, [11:11] -unusedBit_1_12 = bits, U32, 1152, [12:12] -unusedBit_1_13 = bits, U32, 1152, [13:13] -unusedBit_1_14 = bits, U32, 1152, [14:14] -unusedBit_1_15 = bits, U32, 1152, [15:15] -unusedBit_1_16 = bits, U32, 1152, [16:16] -unusedBit_1_17 = bits, U32, 1152, [17:17] -unusedBit_1_18 = bits, U32, 1152, [18:18] -unusedBit_1_19 = bits, U32, 1152, [19:19] -unusedBit_1_20 = bits, U32, 1152, [20:20] -unusedBit_1_21 = bits, U32, 1152, [21:21] -unusedBit_1_22 = bits, U32, 1152, [22:22] -unusedBit_1_23 = bits, U32, 1152, [23:23] -unusedBit_1_24 = bits, U32, 1152, [24:24] -unusedBit_1_25 = bits, U32, 1152, [25:25] -unusedBit_1_26 = bits, U32, 1152, [26:26] -unusedBit_1_27 = bits, U32, 1152, [27:27] -unusedBit_1_28 = bits, U32, 1152, [28:28] -unusedBit_1_29 = bits, U32, 1152, [29:29] -unusedBit_1_30 = bits, U32, 1152, [30:30] -unusedBit_1_31 = bits, U32, 1152, [31:31] +triggerToothAngleError = scalar, F32, 1128, "deg", 1, 0 +; total TS size = 1132 +crankSynchronizationCounter = scalar, U32, 1132, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1136, "", 1, 0 +vvtCurrentPosition = scalar, F32, 1140, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1144, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 1148, "", 1, 0 +triggerStateIndex = scalar, U08, 1152, "", 1, 0 +vvtCounter = scalar, U08, 1153, "", 1, 0 +camResyncCounter = scalar, U08, 1154, "", 1, 0 +vvtStateIndex = scalar, U08, 1155, "", 1, 0 ; total TS size = 1156 -wallFuelCorrection = scalar, F32, 1156, "", 1, 0 -wallFuel = scalar, F32, 1160, "", 1, 0 -; total TS size = 1164 -idleState = bits, S32, 1164, [0:2], "not important" -currentIdlePosition = scalar, F32, 1168 -baseIdlePosition = scalar, F32, 1172 -iacByTpsTaper = scalar, F32, 1176 -throttlePedalUpState = scalar, S32, 1180, "", 1, 0 -mightResetPid = bits, U32, 1184, [0:0] -shouldResetPid = bits, U32, 1184, [1:1] -wasResetPid = bits, U32, 1184, [2:2] -mustResetPid = bits, U32, 1184, [3:3] -isCranking = bits, U32, 1184, [4:4] -useIacTableForCoasting = bits, U32, 1184, [5:5] -notIdling = bits, U32, 1184, [6:6] -needReset = bits, U32, 1184, [7:7] -isInDeadZone = bits, U32, 1184, [8:8] -isBlipping = bits, U32, 1184, [9:9] -useClosedLoop = bits, U32, 1184, [10:10] -badTps = bits, U32, 1184, [11:11] -looksLikeRunning = bits, U32, 1184, [12:12] -looksLikeCoasting = bits, U32, 1184, [13:13] -looksLikeCrankToIdle = bits, U32, 1184, [14:14] -isVerboseIAC = bits, U32, 1184, [15:15] -isIdleCoasting = bits, U32, 1184, [16:16] -unusedBit_22_17 = bits, U32, 1184, [17:17] -unusedBit_22_18 = bits, U32, 1184, [18:18] -unusedBit_22_19 = bits, U32, 1184, [19:19] -unusedBit_22_20 = bits, U32, 1184, [20:20] -unusedBit_22_21 = bits, U32, 1184, [21:21] -unusedBit_22_22 = bits, U32, 1184, [22:22] -unusedBit_22_23 = bits, U32, 1184, [23:23] -unusedBit_22_24 = bits, U32, 1184, [24:24] -unusedBit_22_25 = bits, U32, 1184, [25:25] -unusedBit_22_26 = bits, U32, 1184, [26:26] -unusedBit_22_27 = bits, U32, 1184, [27:27] -unusedBit_22_28 = bits, U32, 1184, [28:28] -unusedBit_22_29 = bits, U32, 1184, [29:29] -unusedBit_22_30 = bits, U32, 1184, [30:30] -unusedBit_22_31 = bits, U32, 1184, [31:31] -targetRpmByClt = scalar, S32, 1188, "", 1, 0 -targetRpmAcBump = scalar, S32, 1192, "", 1, 0 -iacByRpmTaper = scalar, F32, 1196 -luaAdd = scalar, F32, 1200 -; total TS size = 1204 -baseDwell = scalar, F32, 1204, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 1208, "", 1, 0 -luaTimingAdd = scalar, F32, 1212, "", 1, 0 -luaTimingMult = scalar, F32, 1216, "", 1, 0 -; total TS size = 1220 -idlePosition = scalar, F32, 1220, "", 1, 0 -trim = scalar, F32, 1224, "", 1, 0 -luaAdjustment = scalar, F32, 1228, "", 1, 0 -etbFeedForward = scalar, F32, 1232 -etbIntegralError = scalar, F32, 1236, "", 1, 0 -etbCurrentTarget = scalar, F32, 1240, "%", 1, 0 -etbRevLimitActive = bits, U32, 1244, [0:0] -unusedBit_7_1 = bits, U32, 1244, [1:1] -unusedBit_7_2 = bits, U32, 1244, [2:2] -unusedBit_7_3 = bits, U32, 1244, [3:3] -unusedBit_7_4 = bits, U32, 1244, [4:4] -unusedBit_7_5 = bits, U32, 1244, [5:5] -unusedBit_7_6 = bits, U32, 1244, [6:6] -unusedBit_7_7 = bits, U32, 1244, [7:7] -unusedBit_7_8 = bits, U32, 1244, [8:8] -unusedBit_7_9 = bits, U32, 1244, [9:9] -unusedBit_7_10 = bits, U32, 1244, [10:10] -unusedBit_7_11 = bits, U32, 1244, [11:11] -unusedBit_7_12 = bits, U32, 1244, [12:12] -unusedBit_7_13 = bits, U32, 1244, [13:13] -unusedBit_7_14 = bits, U32, 1244, [14:14] -unusedBit_7_15 = bits, U32, 1244, [15:15] -unusedBit_7_16 = bits, U32, 1244, [16:16] -unusedBit_7_17 = bits, U32, 1244, [17:17] -unusedBit_7_18 = bits, U32, 1244, [18:18] -unusedBit_7_19 = bits, U32, 1244, [19:19] -unusedBit_7_20 = bits, U32, 1244, [20:20] -unusedBit_7_21 = bits, U32, 1244, [21:21] -unusedBit_7_22 = bits, U32, 1244, [22:22] -unusedBit_7_23 = bits, U32, 1244, [23:23] -unusedBit_7_24 = bits, U32, 1244, [24:24] -unusedBit_7_25 = bits, U32, 1244, [25:25] -unusedBit_7_26 = bits, U32, 1244, [26:26] -unusedBit_7_27 = bits, U32, 1244, [27:27] -unusedBit_7_28 = bits, U32, 1244, [28:28] -unusedBit_7_29 = bits, U32, 1244, [29:29] -unusedBit_7_30 = bits, U32, 1244, [30:30] -unusedBit_7_31 = bits, U32, 1244, [31:31] -; total TS size = 1248 -faultCode = scalar, U08, 1248, "", 1, 0 -heaterDuty = scalar, U08, 1249, "%", 1, 0 -pumpDuty = scalar, U08, 1250, "%", 1, 0 -tempC = scalar, U16, 1252, "C", 1, 0 -nernstVoltage = scalar, U16, 1254, "V", 0.001, 0 -esr = scalar, U16, 1256, "", 1, 0 -; total TS size = 1260 +m_hasSynchronizedPhase = bits, U32, 1156, [0:0] +unusedBit_1_1 = bits, U32, 1156, [1:1] +unusedBit_1_2 = bits, U32, 1156, [2:2] +unusedBit_1_3 = bits, U32, 1156, [3:3] +unusedBit_1_4 = bits, U32, 1156, [4:4] +unusedBit_1_5 = bits, U32, 1156, [5:5] +unusedBit_1_6 = bits, U32, 1156, [6:6] +unusedBit_1_7 = bits, U32, 1156, [7:7] +unusedBit_1_8 = bits, U32, 1156, [8:8] +unusedBit_1_9 = bits, U32, 1156, [9:9] +unusedBit_1_10 = bits, U32, 1156, [10:10] +unusedBit_1_11 = bits, U32, 1156, [11:11] +unusedBit_1_12 = bits, U32, 1156, [12:12] +unusedBit_1_13 = bits, U32, 1156, [13:13] +unusedBit_1_14 = bits, U32, 1156, [14:14] +unusedBit_1_15 = bits, U32, 1156, [15:15] +unusedBit_1_16 = bits, U32, 1156, [16:16] +unusedBit_1_17 = bits, U32, 1156, [17:17] +unusedBit_1_18 = bits, U32, 1156, [18:18] +unusedBit_1_19 = bits, U32, 1156, [19:19] +unusedBit_1_20 = bits, U32, 1156, [20:20] +unusedBit_1_21 = bits, U32, 1156, [21:21] +unusedBit_1_22 = bits, U32, 1156, [22:22] +unusedBit_1_23 = bits, U32, 1156, [23:23] +unusedBit_1_24 = bits, U32, 1156, [24:24] +unusedBit_1_25 = bits, U32, 1156, [25:25] +unusedBit_1_26 = bits, U32, 1156, [26:26] +unusedBit_1_27 = bits, U32, 1156, [27:27] +unusedBit_1_28 = bits, U32, 1156, [28:28] +unusedBit_1_29 = bits, U32, 1156, [29:29] +unusedBit_1_30 = bits, U32, 1156, [30:30] +unusedBit_1_31 = bits, U32, 1156, [31:31] +; total TS size = 1160 +wallFuelCorrection = scalar, F32, 1160, "", 1, 0 +wallFuel = scalar, F32, 1164, "", 1, 0 +; total TS size = 1168 +idleState = bits, S32, 1168, [0:2], "not important" +currentIdlePosition = scalar, F32, 1172 +baseIdlePosition = scalar, F32, 1176 +iacByTpsTaper = scalar, F32, 1180 +throttlePedalUpState = scalar, S32, 1184, "", 1, 0 +mightResetPid = bits, U32, 1188, [0:0] +shouldResetPid = bits, U32, 1188, [1:1] +wasResetPid = bits, U32, 1188, [2:2] +mustResetPid = bits, U32, 1188, [3:3] +isCranking = bits, U32, 1188, [4:4] +useIacTableForCoasting = bits, U32, 1188, [5:5] +notIdling = bits, U32, 1188, [6:6] +needReset = bits, U32, 1188, [7:7] +isInDeadZone = bits, U32, 1188, [8:8] +isBlipping = bits, U32, 1188, [9:9] +useClosedLoop = bits, U32, 1188, [10:10] +badTps = bits, U32, 1188, [11:11] +looksLikeRunning = bits, U32, 1188, [12:12] +looksLikeCoasting = bits, U32, 1188, [13:13] +looksLikeCrankToIdle = bits, U32, 1188, [14:14] +isVerboseIAC = bits, U32, 1188, [15:15] +isIdleCoasting = bits, U32, 1188, [16:16] +unusedBit_22_17 = bits, U32, 1188, [17:17] +unusedBit_22_18 = bits, U32, 1188, [18:18] +unusedBit_22_19 = bits, U32, 1188, [19:19] +unusedBit_22_20 = bits, U32, 1188, [20:20] +unusedBit_22_21 = bits, U32, 1188, [21:21] +unusedBit_22_22 = bits, U32, 1188, [22:22] +unusedBit_22_23 = bits, U32, 1188, [23:23] +unusedBit_22_24 = bits, U32, 1188, [24:24] +unusedBit_22_25 = bits, U32, 1188, [25:25] +unusedBit_22_26 = bits, U32, 1188, [26:26] +unusedBit_22_27 = bits, U32, 1188, [27:27] +unusedBit_22_28 = bits, U32, 1188, [28:28] +unusedBit_22_29 = bits, U32, 1188, [29:29] +unusedBit_22_30 = bits, U32, 1188, [30:30] +unusedBit_22_31 = bits, U32, 1188, [31:31] +targetRpmByClt = scalar, S32, 1192, "", 1, 0 +targetRpmAcBump = scalar, S32, 1196, "", 1, 0 +iacByRpmTaper = scalar, F32, 1200 +luaAdd = scalar, F32, 1204 +; total TS size = 1208 +baseDwell = scalar, F32, 1208, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 1212, "", 1, 0 +luaTimingAdd = scalar, F32, 1216, "", 1, 0 +luaTimingMult = scalar, F32, 1220, "", 1, 0 +; total TS size = 1224 +idlePosition = scalar, F32, 1224, "", 1, 0 +trim = scalar, F32, 1228, "", 1, 0 +luaAdjustment = scalar, F32, 1232, "", 1, 0 +etbFeedForward = scalar, F32, 1236 +etbIntegralError = scalar, F32, 1240, "", 1, 0 +etbCurrentTarget = scalar, F32, 1244, "%", 1, 0 +etbRevLimitActive = bits, U32, 1248, [0:0] +unusedBit_7_1 = bits, U32, 1248, [1:1] +unusedBit_7_2 = bits, U32, 1248, [2:2] +unusedBit_7_3 = bits, U32, 1248, [3:3] +unusedBit_7_4 = bits, U32, 1248, [4:4] +unusedBit_7_5 = bits, U32, 1248, [5:5] +unusedBit_7_6 = bits, U32, 1248, [6:6] +unusedBit_7_7 = bits, U32, 1248, [7:7] +unusedBit_7_8 = bits, U32, 1248, [8:8] +unusedBit_7_9 = bits, U32, 1248, [9:9] +unusedBit_7_10 = bits, U32, 1248, [10:10] +unusedBit_7_11 = bits, U32, 1248, [11:11] +unusedBit_7_12 = bits, U32, 1248, [12:12] +unusedBit_7_13 = bits, U32, 1248, [13:13] +unusedBit_7_14 = bits, U32, 1248, [14:14] +unusedBit_7_15 = bits, U32, 1248, [15:15] +unusedBit_7_16 = bits, U32, 1248, [16:16] +unusedBit_7_17 = bits, U32, 1248, [17:17] +unusedBit_7_18 = bits, U32, 1248, [18:18] +unusedBit_7_19 = bits, U32, 1248, [19:19] +unusedBit_7_20 = bits, U32, 1248, [20:20] +unusedBit_7_21 = bits, U32, 1248, [21:21] +unusedBit_7_22 = bits, U32, 1248, [22:22] +unusedBit_7_23 = bits, U32, 1248, [23:23] +unusedBit_7_24 = bits, U32, 1248, [24:24] +unusedBit_7_25 = bits, U32, 1248, [25:25] +unusedBit_7_26 = bits, U32, 1248, [26:26] +unusedBit_7_27 = bits, U32, 1248, [27:27] +unusedBit_7_28 = bits, U32, 1248, [28:28] +unusedBit_7_29 = bits, U32, 1248, [29:29] +unusedBit_7_30 = bits, U32, 1248, [30:30] +unusedBit_7_31 = bits, U32, 1248, [31:31] +; total TS size = 1252 +faultCode = scalar, U08, 1252, "", 1, 0 +heaterDuty = scalar, U08, 1253, "%", 1, 0 +pumpDuty = scalar, U08, 1254, "%", 1, 0 +tempC = scalar, U16, 1256, "C", 1, 0 +nernstVoltage = scalar, U16, 1258, "V", 0.001, 0 +esr = scalar, U16, 1260, "", 1, 0 +; total TS size = 1264 time = { timeNow } @@ -4993,6 +4994,7 @@ entry = mapVvt_MAP_AT_DIFF, "mapVvt_MAP_AT_DIFF", float, "%.3f" entry = mapVvt_MAP_AT_CYCLE_COUNT, "mapVvt_MAP_AT_CYCLE_COUNT", int, "%d" entry = mapVvt_map_peak, "mapVvt_map_peak", int, "%d" entry = currentEngineDecodedPhase, "Engine Phase", float, "%.3f" +entry = triggerToothAngleError, "triggerToothAngleError", float, "%.3f" entry = crankSynchronizationCounter, "Crank sync counter", int, "%d" entry = vvtSyncGapRatio, "vvtSyncGapRatio", float, "%.3f" entry = vvtCurrentPosition, "vvtCurrentPosition", float, "%.3f" @@ -5780,6 +5782,8 @@ dialog = trigger_centralDialog, "trigger_central" graphLine = mapVvt_MAP_AT_CYCLE_COUNT graphLine = mapVvt_map_peak graphLine = currentEngineDecodedPhase + liveGraph = trigger_central_4_Graph, "Graph", South + graphLine = triggerToothAngleError dialog = trigger_stateDialog, "trigger_state" diff --git a/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini b/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini index e43a12b14e..be0521da35 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.09.24.hellenNA8_96.1453131337" + signature = "rusEFI 2022.09.24.hellenNA8_96.1374732880" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.09.24.hellenNA8_96.1453131337" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.09.24.hellenNA8_96.1374732880" ; 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 Fri Sep 23 23:16:16 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Sep 24 04:28:51 UTC 2022 pageSize = 22048 page = 1 @@ -2140,7 +2140,7 @@ ignBlends4_blendValues = array, U08, 22038, [8], "%", 0.5, 0, 0, 100, 1 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1260 + ochBlockSize = 1264 ; ; see TunerStudioOutputChannels struct @@ -3141,146 +3141,147 @@ mapVvt_MAP_AT_DIFF = scalar, F32, 1116, "", 1, 0 mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1120, "", 1, 0 mapVvt_map_peak = scalar, U08, 1121, "", 1, 0 currentEngineDecodedPhase = scalar, F32, 1124, "deg", 1, 0 -; total TS size = 1128 -crankSynchronizationCounter = scalar, U32, 1128, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1132, "", 1, 0 -vvtCurrentPosition = scalar, F32, 1136, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1140, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 1144, "", 1, 0 -triggerStateIndex = scalar, U08, 1148, "", 1, 0 -vvtCounter = scalar, U08, 1149, "", 1, 0 -camResyncCounter = scalar, U08, 1150, "", 1, 0 -vvtStateIndex = scalar, U08, 1151, "", 1, 0 -; total TS size = 1152 -m_hasSynchronizedPhase = bits, U32, 1152, [0:0] -unusedBit_1_1 = bits, U32, 1152, [1:1] -unusedBit_1_2 = bits, U32, 1152, [2:2] -unusedBit_1_3 = bits, U32, 1152, [3:3] -unusedBit_1_4 = bits, U32, 1152, [4:4] -unusedBit_1_5 = bits, U32, 1152, [5:5] -unusedBit_1_6 = bits, U32, 1152, [6:6] -unusedBit_1_7 = bits, U32, 1152, [7:7] -unusedBit_1_8 = bits, U32, 1152, [8:8] -unusedBit_1_9 = bits, U32, 1152, [9:9] -unusedBit_1_10 = bits, U32, 1152, [10:10] -unusedBit_1_11 = bits, U32, 1152, [11:11] -unusedBit_1_12 = bits, U32, 1152, [12:12] -unusedBit_1_13 = bits, U32, 1152, [13:13] -unusedBit_1_14 = bits, U32, 1152, [14:14] -unusedBit_1_15 = bits, U32, 1152, [15:15] -unusedBit_1_16 = bits, U32, 1152, [16:16] -unusedBit_1_17 = bits, U32, 1152, [17:17] -unusedBit_1_18 = bits, U32, 1152, [18:18] -unusedBit_1_19 = bits, U32, 1152, [19:19] -unusedBit_1_20 = bits, U32, 1152, [20:20] -unusedBit_1_21 = bits, U32, 1152, [21:21] -unusedBit_1_22 = bits, U32, 1152, [22:22] -unusedBit_1_23 = bits, U32, 1152, [23:23] -unusedBit_1_24 = bits, U32, 1152, [24:24] -unusedBit_1_25 = bits, U32, 1152, [25:25] -unusedBit_1_26 = bits, U32, 1152, [26:26] -unusedBit_1_27 = bits, U32, 1152, [27:27] -unusedBit_1_28 = bits, U32, 1152, [28:28] -unusedBit_1_29 = bits, U32, 1152, [29:29] -unusedBit_1_30 = bits, U32, 1152, [30:30] -unusedBit_1_31 = bits, U32, 1152, [31:31] +triggerToothAngleError = scalar, F32, 1128, "deg", 1, 0 +; total TS size = 1132 +crankSynchronizationCounter = scalar, U32, 1132, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1136, "", 1, 0 +vvtCurrentPosition = scalar, F32, 1140, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1144, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 1148, "", 1, 0 +triggerStateIndex = scalar, U08, 1152, "", 1, 0 +vvtCounter = scalar, U08, 1153, "", 1, 0 +camResyncCounter = scalar, U08, 1154, "", 1, 0 +vvtStateIndex = scalar, U08, 1155, "", 1, 0 ; total TS size = 1156 -wallFuelCorrection = scalar, F32, 1156, "", 1, 0 -wallFuel = scalar, F32, 1160, "", 1, 0 -; total TS size = 1164 -idleState = bits, S32, 1164, [0:2], "not important" -currentIdlePosition = scalar, F32, 1168 -baseIdlePosition = scalar, F32, 1172 -iacByTpsTaper = scalar, F32, 1176 -throttlePedalUpState = scalar, S32, 1180, "", 1, 0 -mightResetPid = bits, U32, 1184, [0:0] -shouldResetPid = bits, U32, 1184, [1:1] -wasResetPid = bits, U32, 1184, [2:2] -mustResetPid = bits, U32, 1184, [3:3] -isCranking = bits, U32, 1184, [4:4] -useIacTableForCoasting = bits, U32, 1184, [5:5] -notIdling = bits, U32, 1184, [6:6] -needReset = bits, U32, 1184, [7:7] -isInDeadZone = bits, U32, 1184, [8:8] -isBlipping = bits, U32, 1184, [9:9] -useClosedLoop = bits, U32, 1184, [10:10] -badTps = bits, U32, 1184, [11:11] -looksLikeRunning = bits, U32, 1184, [12:12] -looksLikeCoasting = bits, U32, 1184, [13:13] -looksLikeCrankToIdle = bits, U32, 1184, [14:14] -isVerboseIAC = bits, U32, 1184, [15:15] -isIdleCoasting = bits, U32, 1184, [16:16] -unusedBit_22_17 = bits, U32, 1184, [17:17] -unusedBit_22_18 = bits, U32, 1184, [18:18] -unusedBit_22_19 = bits, U32, 1184, [19:19] -unusedBit_22_20 = bits, U32, 1184, [20:20] -unusedBit_22_21 = bits, U32, 1184, [21:21] -unusedBit_22_22 = bits, U32, 1184, [22:22] -unusedBit_22_23 = bits, U32, 1184, [23:23] -unusedBit_22_24 = bits, U32, 1184, [24:24] -unusedBit_22_25 = bits, U32, 1184, [25:25] -unusedBit_22_26 = bits, U32, 1184, [26:26] -unusedBit_22_27 = bits, U32, 1184, [27:27] -unusedBit_22_28 = bits, U32, 1184, [28:28] -unusedBit_22_29 = bits, U32, 1184, [29:29] -unusedBit_22_30 = bits, U32, 1184, [30:30] -unusedBit_22_31 = bits, U32, 1184, [31:31] -targetRpmByClt = scalar, S32, 1188, "", 1, 0 -targetRpmAcBump = scalar, S32, 1192, "", 1, 0 -iacByRpmTaper = scalar, F32, 1196 -luaAdd = scalar, F32, 1200 -; total TS size = 1204 -baseDwell = scalar, F32, 1204, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 1208, "", 1, 0 -luaTimingAdd = scalar, F32, 1212, "", 1, 0 -luaTimingMult = scalar, F32, 1216, "", 1, 0 -; total TS size = 1220 -idlePosition = scalar, F32, 1220, "", 1, 0 -trim = scalar, F32, 1224, "", 1, 0 -luaAdjustment = scalar, F32, 1228, "", 1, 0 -etbFeedForward = scalar, F32, 1232 -etbIntegralError = scalar, F32, 1236, "", 1, 0 -etbCurrentTarget = scalar, F32, 1240, "%", 1, 0 -etbRevLimitActive = bits, U32, 1244, [0:0] -unusedBit_7_1 = bits, U32, 1244, [1:1] -unusedBit_7_2 = bits, U32, 1244, [2:2] -unusedBit_7_3 = bits, U32, 1244, [3:3] -unusedBit_7_4 = bits, U32, 1244, [4:4] -unusedBit_7_5 = bits, U32, 1244, [5:5] -unusedBit_7_6 = bits, U32, 1244, [6:6] -unusedBit_7_7 = bits, U32, 1244, [7:7] -unusedBit_7_8 = bits, U32, 1244, [8:8] -unusedBit_7_9 = bits, U32, 1244, [9:9] -unusedBit_7_10 = bits, U32, 1244, [10:10] -unusedBit_7_11 = bits, U32, 1244, [11:11] -unusedBit_7_12 = bits, U32, 1244, [12:12] -unusedBit_7_13 = bits, U32, 1244, [13:13] -unusedBit_7_14 = bits, U32, 1244, [14:14] -unusedBit_7_15 = bits, U32, 1244, [15:15] -unusedBit_7_16 = bits, U32, 1244, [16:16] -unusedBit_7_17 = bits, U32, 1244, [17:17] -unusedBit_7_18 = bits, U32, 1244, [18:18] -unusedBit_7_19 = bits, U32, 1244, [19:19] -unusedBit_7_20 = bits, U32, 1244, [20:20] -unusedBit_7_21 = bits, U32, 1244, [21:21] -unusedBit_7_22 = bits, U32, 1244, [22:22] -unusedBit_7_23 = bits, U32, 1244, [23:23] -unusedBit_7_24 = bits, U32, 1244, [24:24] -unusedBit_7_25 = bits, U32, 1244, [25:25] -unusedBit_7_26 = bits, U32, 1244, [26:26] -unusedBit_7_27 = bits, U32, 1244, [27:27] -unusedBit_7_28 = bits, U32, 1244, [28:28] -unusedBit_7_29 = bits, U32, 1244, [29:29] -unusedBit_7_30 = bits, U32, 1244, [30:30] -unusedBit_7_31 = bits, U32, 1244, [31:31] -; total TS size = 1248 -faultCode = scalar, U08, 1248, "", 1, 0 -heaterDuty = scalar, U08, 1249, "%", 1, 0 -pumpDuty = scalar, U08, 1250, "%", 1, 0 -tempC = scalar, U16, 1252, "C", 1, 0 -nernstVoltage = scalar, U16, 1254, "V", 0.001, 0 -esr = scalar, U16, 1256, "", 1, 0 -; total TS size = 1260 +m_hasSynchronizedPhase = bits, U32, 1156, [0:0] +unusedBit_1_1 = bits, U32, 1156, [1:1] +unusedBit_1_2 = bits, U32, 1156, [2:2] +unusedBit_1_3 = bits, U32, 1156, [3:3] +unusedBit_1_4 = bits, U32, 1156, [4:4] +unusedBit_1_5 = bits, U32, 1156, [5:5] +unusedBit_1_6 = bits, U32, 1156, [6:6] +unusedBit_1_7 = bits, U32, 1156, [7:7] +unusedBit_1_8 = bits, U32, 1156, [8:8] +unusedBit_1_9 = bits, U32, 1156, [9:9] +unusedBit_1_10 = bits, U32, 1156, [10:10] +unusedBit_1_11 = bits, U32, 1156, [11:11] +unusedBit_1_12 = bits, U32, 1156, [12:12] +unusedBit_1_13 = bits, U32, 1156, [13:13] +unusedBit_1_14 = bits, U32, 1156, [14:14] +unusedBit_1_15 = bits, U32, 1156, [15:15] +unusedBit_1_16 = bits, U32, 1156, [16:16] +unusedBit_1_17 = bits, U32, 1156, [17:17] +unusedBit_1_18 = bits, U32, 1156, [18:18] +unusedBit_1_19 = bits, U32, 1156, [19:19] +unusedBit_1_20 = bits, U32, 1156, [20:20] +unusedBit_1_21 = bits, U32, 1156, [21:21] +unusedBit_1_22 = bits, U32, 1156, [22:22] +unusedBit_1_23 = bits, U32, 1156, [23:23] +unusedBit_1_24 = bits, U32, 1156, [24:24] +unusedBit_1_25 = bits, U32, 1156, [25:25] +unusedBit_1_26 = bits, U32, 1156, [26:26] +unusedBit_1_27 = bits, U32, 1156, [27:27] +unusedBit_1_28 = bits, U32, 1156, [28:28] +unusedBit_1_29 = bits, U32, 1156, [29:29] +unusedBit_1_30 = bits, U32, 1156, [30:30] +unusedBit_1_31 = bits, U32, 1156, [31:31] +; total TS size = 1160 +wallFuelCorrection = scalar, F32, 1160, "", 1, 0 +wallFuel = scalar, F32, 1164, "", 1, 0 +; total TS size = 1168 +idleState = bits, S32, 1168, [0:2], "not important" +currentIdlePosition = scalar, F32, 1172 +baseIdlePosition = scalar, F32, 1176 +iacByTpsTaper = scalar, F32, 1180 +throttlePedalUpState = scalar, S32, 1184, "", 1, 0 +mightResetPid = bits, U32, 1188, [0:0] +shouldResetPid = bits, U32, 1188, [1:1] +wasResetPid = bits, U32, 1188, [2:2] +mustResetPid = bits, U32, 1188, [3:3] +isCranking = bits, U32, 1188, [4:4] +useIacTableForCoasting = bits, U32, 1188, [5:5] +notIdling = bits, U32, 1188, [6:6] +needReset = bits, U32, 1188, [7:7] +isInDeadZone = bits, U32, 1188, [8:8] +isBlipping = bits, U32, 1188, [9:9] +useClosedLoop = bits, U32, 1188, [10:10] +badTps = bits, U32, 1188, [11:11] +looksLikeRunning = bits, U32, 1188, [12:12] +looksLikeCoasting = bits, U32, 1188, [13:13] +looksLikeCrankToIdle = bits, U32, 1188, [14:14] +isVerboseIAC = bits, U32, 1188, [15:15] +isIdleCoasting = bits, U32, 1188, [16:16] +unusedBit_22_17 = bits, U32, 1188, [17:17] +unusedBit_22_18 = bits, U32, 1188, [18:18] +unusedBit_22_19 = bits, U32, 1188, [19:19] +unusedBit_22_20 = bits, U32, 1188, [20:20] +unusedBit_22_21 = bits, U32, 1188, [21:21] +unusedBit_22_22 = bits, U32, 1188, [22:22] +unusedBit_22_23 = bits, U32, 1188, [23:23] +unusedBit_22_24 = bits, U32, 1188, [24:24] +unusedBit_22_25 = bits, U32, 1188, [25:25] +unusedBit_22_26 = bits, U32, 1188, [26:26] +unusedBit_22_27 = bits, U32, 1188, [27:27] +unusedBit_22_28 = bits, U32, 1188, [28:28] +unusedBit_22_29 = bits, U32, 1188, [29:29] +unusedBit_22_30 = bits, U32, 1188, [30:30] +unusedBit_22_31 = bits, U32, 1188, [31:31] +targetRpmByClt = scalar, S32, 1192, "", 1, 0 +targetRpmAcBump = scalar, S32, 1196, "", 1, 0 +iacByRpmTaper = scalar, F32, 1200 +luaAdd = scalar, F32, 1204 +; total TS size = 1208 +baseDwell = scalar, F32, 1208, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 1212, "", 1, 0 +luaTimingAdd = scalar, F32, 1216, "", 1, 0 +luaTimingMult = scalar, F32, 1220, "", 1, 0 +; total TS size = 1224 +idlePosition = scalar, F32, 1224, "", 1, 0 +trim = scalar, F32, 1228, "", 1, 0 +luaAdjustment = scalar, F32, 1232, "", 1, 0 +etbFeedForward = scalar, F32, 1236 +etbIntegralError = scalar, F32, 1240, "", 1, 0 +etbCurrentTarget = scalar, F32, 1244, "%", 1, 0 +etbRevLimitActive = bits, U32, 1248, [0:0] +unusedBit_7_1 = bits, U32, 1248, [1:1] +unusedBit_7_2 = bits, U32, 1248, [2:2] +unusedBit_7_3 = bits, U32, 1248, [3:3] +unusedBit_7_4 = bits, U32, 1248, [4:4] +unusedBit_7_5 = bits, U32, 1248, [5:5] +unusedBit_7_6 = bits, U32, 1248, [6:6] +unusedBit_7_7 = bits, U32, 1248, [7:7] +unusedBit_7_8 = bits, U32, 1248, [8:8] +unusedBit_7_9 = bits, U32, 1248, [9:9] +unusedBit_7_10 = bits, U32, 1248, [10:10] +unusedBit_7_11 = bits, U32, 1248, [11:11] +unusedBit_7_12 = bits, U32, 1248, [12:12] +unusedBit_7_13 = bits, U32, 1248, [13:13] +unusedBit_7_14 = bits, U32, 1248, [14:14] +unusedBit_7_15 = bits, U32, 1248, [15:15] +unusedBit_7_16 = bits, U32, 1248, [16:16] +unusedBit_7_17 = bits, U32, 1248, [17:17] +unusedBit_7_18 = bits, U32, 1248, [18:18] +unusedBit_7_19 = bits, U32, 1248, [19:19] +unusedBit_7_20 = bits, U32, 1248, [20:20] +unusedBit_7_21 = bits, U32, 1248, [21:21] +unusedBit_7_22 = bits, U32, 1248, [22:22] +unusedBit_7_23 = bits, U32, 1248, [23:23] +unusedBit_7_24 = bits, U32, 1248, [24:24] +unusedBit_7_25 = bits, U32, 1248, [25:25] +unusedBit_7_26 = bits, U32, 1248, [26:26] +unusedBit_7_27 = bits, U32, 1248, [27:27] +unusedBit_7_28 = bits, U32, 1248, [28:28] +unusedBit_7_29 = bits, U32, 1248, [29:29] +unusedBit_7_30 = bits, U32, 1248, [30:30] +unusedBit_7_31 = bits, U32, 1248, [31:31] +; total TS size = 1252 +faultCode = scalar, U08, 1252, "", 1, 0 +heaterDuty = scalar, U08, 1253, "%", 1, 0 +pumpDuty = scalar, U08, 1254, "%", 1, 0 +tempC = scalar, U16, 1256, "C", 1, 0 +nernstVoltage = scalar, U16, 1258, "V", 0.001, 0 +esr = scalar, U16, 1260, "", 1, 0 +; total TS size = 1264 time = { timeNow } @@ -4993,6 +4994,7 @@ entry = mapVvt_MAP_AT_DIFF, "mapVvt_MAP_AT_DIFF", float, "%.3f" entry = mapVvt_MAP_AT_CYCLE_COUNT, "mapVvt_MAP_AT_CYCLE_COUNT", int, "%d" entry = mapVvt_map_peak, "mapVvt_map_peak", int, "%d" entry = currentEngineDecodedPhase, "Engine Phase", float, "%.3f" +entry = triggerToothAngleError, "triggerToothAngleError", float, "%.3f" entry = crankSynchronizationCounter, "Crank sync counter", int, "%d" entry = vvtSyncGapRatio, "vvtSyncGapRatio", float, "%.3f" entry = vvtCurrentPosition, "vvtCurrentPosition", float, "%.3f" @@ -5780,6 +5782,8 @@ dialog = trigger_centralDialog, "trigger_central" graphLine = mapVvt_MAP_AT_CYCLE_COUNT graphLine = mapVvt_map_peak graphLine = currentEngineDecodedPhase + liveGraph = trigger_central_4_Graph, "Graph", South + graphLine = triggerToothAngleError dialog = trigger_stateDialog, "trigger_state" diff --git a/firmware/tunerstudio/generated/rusefi_kin.ini b/firmware/tunerstudio/generated/rusefi_kin.ini index 4284931c61..c13dde47ba 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.09.24.kin.2655196525" + signature = "rusEFI 2022.09.24.kin.2569982324" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.09.24.kin.2655196525" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.09.24.kin.2569982324" ; 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 Fri Sep 23 23:15:46 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Sat Sep 24 04:28:20 UTC 2022 pageSize = 22048 page = 1 @@ -2140,7 +2140,7 @@ ignBlends4_blendValues = array, U08, 22038, [8], "%", 0.5, 0, 0, 100, 1 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1260 + ochBlockSize = 1264 ; ; see TunerStudioOutputChannels struct @@ -3141,146 +3141,147 @@ mapVvt_MAP_AT_DIFF = scalar, F32, 1116, "", 1, 0 mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1120, "", 1, 0 mapVvt_map_peak = scalar, U08, 1121, "", 1, 0 currentEngineDecodedPhase = scalar, F32, 1124, "deg", 1, 0 -; total TS size = 1128 -crankSynchronizationCounter = scalar, U32, 1128, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1132, "", 1, 0 -vvtCurrentPosition = scalar, F32, 1136, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1140, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 1144, "", 1, 0 -triggerStateIndex = scalar, U08, 1148, "", 1, 0 -vvtCounter = scalar, U08, 1149, "", 1, 0 -camResyncCounter = scalar, U08, 1150, "", 1, 0 -vvtStateIndex = scalar, U08, 1151, "", 1, 0 -; total TS size = 1152 -m_hasSynchronizedPhase = bits, U32, 1152, [0:0] -unusedBit_1_1 = bits, U32, 1152, [1:1] -unusedBit_1_2 = bits, U32, 1152, [2:2] -unusedBit_1_3 = bits, U32, 1152, [3:3] -unusedBit_1_4 = bits, U32, 1152, [4:4] -unusedBit_1_5 = bits, U32, 1152, [5:5] -unusedBit_1_6 = bits, U32, 1152, [6:6] -unusedBit_1_7 = bits, U32, 1152, [7:7] -unusedBit_1_8 = bits, U32, 1152, [8:8] -unusedBit_1_9 = bits, U32, 1152, [9:9] -unusedBit_1_10 = bits, U32, 1152, [10:10] -unusedBit_1_11 = bits, U32, 1152, [11:11] -unusedBit_1_12 = bits, U32, 1152, [12:12] -unusedBit_1_13 = bits, U32, 1152, [13:13] -unusedBit_1_14 = bits, U32, 1152, [14:14] -unusedBit_1_15 = bits, U32, 1152, [15:15] -unusedBit_1_16 = bits, U32, 1152, [16:16] -unusedBit_1_17 = bits, U32, 1152, [17:17] -unusedBit_1_18 = bits, U32, 1152, [18:18] -unusedBit_1_19 = bits, U32, 1152, [19:19] -unusedBit_1_20 = bits, U32, 1152, [20:20] -unusedBit_1_21 = bits, U32, 1152, [21:21] -unusedBit_1_22 = bits, U32, 1152, [22:22] -unusedBit_1_23 = bits, U32, 1152, [23:23] -unusedBit_1_24 = bits, U32, 1152, [24:24] -unusedBit_1_25 = bits, U32, 1152, [25:25] -unusedBit_1_26 = bits, U32, 1152, [26:26] -unusedBit_1_27 = bits, U32, 1152, [27:27] -unusedBit_1_28 = bits, U32, 1152, [28:28] -unusedBit_1_29 = bits, U32, 1152, [29:29] -unusedBit_1_30 = bits, U32, 1152, [30:30] -unusedBit_1_31 = bits, U32, 1152, [31:31] +triggerToothAngleError = scalar, F32, 1128, "deg", 1, 0 +; total TS size = 1132 +crankSynchronizationCounter = scalar, U32, 1132, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1136, "", 1, 0 +vvtCurrentPosition = scalar, F32, 1140, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1144, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 1148, "", 1, 0 +triggerStateIndex = scalar, U08, 1152, "", 1, 0 +vvtCounter = scalar, U08, 1153, "", 1, 0 +camResyncCounter = scalar, U08, 1154, "", 1, 0 +vvtStateIndex = scalar, U08, 1155, "", 1, 0 ; total TS size = 1156 -wallFuelCorrection = scalar, F32, 1156, "", 1, 0 -wallFuel = scalar, F32, 1160, "", 1, 0 -; total TS size = 1164 -idleState = bits, S32, 1164, [0:2], "not important" -currentIdlePosition = scalar, F32, 1168 -baseIdlePosition = scalar, F32, 1172 -iacByTpsTaper = scalar, F32, 1176 -throttlePedalUpState = scalar, S32, 1180, "", 1, 0 -mightResetPid = bits, U32, 1184, [0:0] -shouldResetPid = bits, U32, 1184, [1:1] -wasResetPid = bits, U32, 1184, [2:2] -mustResetPid = bits, U32, 1184, [3:3] -isCranking = bits, U32, 1184, [4:4] -useIacTableForCoasting = bits, U32, 1184, [5:5] -notIdling = bits, U32, 1184, [6:6] -needReset = bits, U32, 1184, [7:7] -isInDeadZone = bits, U32, 1184, [8:8] -isBlipping = bits, U32, 1184, [9:9] -useClosedLoop = bits, U32, 1184, [10:10] -badTps = bits, U32, 1184, [11:11] -looksLikeRunning = bits, U32, 1184, [12:12] -looksLikeCoasting = bits, U32, 1184, [13:13] -looksLikeCrankToIdle = bits, U32, 1184, [14:14] -isVerboseIAC = bits, U32, 1184, [15:15] -isIdleCoasting = bits, U32, 1184, [16:16] -unusedBit_22_17 = bits, U32, 1184, [17:17] -unusedBit_22_18 = bits, U32, 1184, [18:18] -unusedBit_22_19 = bits, U32, 1184, [19:19] -unusedBit_22_20 = bits, U32, 1184, [20:20] -unusedBit_22_21 = bits, U32, 1184, [21:21] -unusedBit_22_22 = bits, U32, 1184, [22:22] -unusedBit_22_23 = bits, U32, 1184, [23:23] -unusedBit_22_24 = bits, U32, 1184, [24:24] -unusedBit_22_25 = bits, U32, 1184, [25:25] -unusedBit_22_26 = bits, U32, 1184, [26:26] -unusedBit_22_27 = bits, U32, 1184, [27:27] -unusedBit_22_28 = bits, U32, 1184, [28:28] -unusedBit_22_29 = bits, U32, 1184, [29:29] -unusedBit_22_30 = bits, U32, 1184, [30:30] -unusedBit_22_31 = bits, U32, 1184, [31:31] -targetRpmByClt = scalar, S32, 1188, "", 1, 0 -targetRpmAcBump = scalar, S32, 1192, "", 1, 0 -iacByRpmTaper = scalar, F32, 1196 -luaAdd = scalar, F32, 1200 -; total TS size = 1204 -baseDwell = scalar, F32, 1204, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 1208, "", 1, 0 -luaTimingAdd = scalar, F32, 1212, "", 1, 0 -luaTimingMult = scalar, F32, 1216, "", 1, 0 -; total TS size = 1220 -idlePosition = scalar, F32, 1220, "", 1, 0 -trim = scalar, F32, 1224, "", 1, 0 -luaAdjustment = scalar, F32, 1228, "", 1, 0 -etbFeedForward = scalar, F32, 1232 -etbIntegralError = scalar, F32, 1236, "", 1, 0 -etbCurrentTarget = scalar, F32, 1240, "%", 1, 0 -etbRevLimitActive = bits, U32, 1244, [0:0] -unusedBit_7_1 = bits, U32, 1244, [1:1] -unusedBit_7_2 = bits, U32, 1244, [2:2] -unusedBit_7_3 = bits, U32, 1244, [3:3] -unusedBit_7_4 = bits, U32, 1244, [4:4] -unusedBit_7_5 = bits, U32, 1244, [5:5] -unusedBit_7_6 = bits, U32, 1244, [6:6] -unusedBit_7_7 = bits, U32, 1244, [7:7] -unusedBit_7_8 = bits, U32, 1244, [8:8] -unusedBit_7_9 = bits, U32, 1244, [9:9] -unusedBit_7_10 = bits, U32, 1244, [10:10] -unusedBit_7_11 = bits, U32, 1244, [11:11] -unusedBit_7_12 = bits, U32, 1244, [12:12] -unusedBit_7_13 = bits, U32, 1244, [13:13] -unusedBit_7_14 = bits, U32, 1244, [14:14] -unusedBit_7_15 = bits, U32, 1244, [15:15] -unusedBit_7_16 = bits, U32, 1244, [16:16] -unusedBit_7_17 = bits, U32, 1244, [17:17] -unusedBit_7_18 = bits, U32, 1244, [18:18] -unusedBit_7_19 = bits, U32, 1244, [19:19] -unusedBit_7_20 = bits, U32, 1244, [20:20] -unusedBit_7_21 = bits, U32, 1244, [21:21] -unusedBit_7_22 = bits, U32, 1244, [22:22] -unusedBit_7_23 = bits, U32, 1244, [23:23] -unusedBit_7_24 = bits, U32, 1244, [24:24] -unusedBit_7_25 = bits, U32, 1244, [25:25] -unusedBit_7_26 = bits, U32, 1244, [26:26] -unusedBit_7_27 = bits, U32, 1244, [27:27] -unusedBit_7_28 = bits, U32, 1244, [28:28] -unusedBit_7_29 = bits, U32, 1244, [29:29] -unusedBit_7_30 = bits, U32, 1244, [30:30] -unusedBit_7_31 = bits, U32, 1244, [31:31] -; total TS size = 1248 -faultCode = scalar, U08, 1248, "", 1, 0 -heaterDuty = scalar, U08, 1249, "%", 1, 0 -pumpDuty = scalar, U08, 1250, "%", 1, 0 -tempC = scalar, U16, 1252, "C", 1, 0 -nernstVoltage = scalar, U16, 1254, "V", 0.001, 0 -esr = scalar, U16, 1256, "", 1, 0 -; total TS size = 1260 +m_hasSynchronizedPhase = bits, U32, 1156, [0:0] +unusedBit_1_1 = bits, U32, 1156, [1:1] +unusedBit_1_2 = bits, U32, 1156, [2:2] +unusedBit_1_3 = bits, U32, 1156, [3:3] +unusedBit_1_4 = bits, U32, 1156, [4:4] +unusedBit_1_5 = bits, U32, 1156, [5:5] +unusedBit_1_6 = bits, U32, 1156, [6:6] +unusedBit_1_7 = bits, U32, 1156, [7:7] +unusedBit_1_8 = bits, U32, 1156, [8:8] +unusedBit_1_9 = bits, U32, 1156, [9:9] +unusedBit_1_10 = bits, U32, 1156, [10:10] +unusedBit_1_11 = bits, U32, 1156, [11:11] +unusedBit_1_12 = bits, U32, 1156, [12:12] +unusedBit_1_13 = bits, U32, 1156, [13:13] +unusedBit_1_14 = bits, U32, 1156, [14:14] +unusedBit_1_15 = bits, U32, 1156, [15:15] +unusedBit_1_16 = bits, U32, 1156, [16:16] +unusedBit_1_17 = bits, U32, 1156, [17:17] +unusedBit_1_18 = bits, U32, 1156, [18:18] +unusedBit_1_19 = bits, U32, 1156, [19:19] +unusedBit_1_20 = bits, U32, 1156, [20:20] +unusedBit_1_21 = bits, U32, 1156, [21:21] +unusedBit_1_22 = bits, U32, 1156, [22:22] +unusedBit_1_23 = bits, U32, 1156, [23:23] +unusedBit_1_24 = bits, U32, 1156, [24:24] +unusedBit_1_25 = bits, U32, 1156, [25:25] +unusedBit_1_26 = bits, U32, 1156, [26:26] +unusedBit_1_27 = bits, U32, 1156, [27:27] +unusedBit_1_28 = bits, U32, 1156, [28:28] +unusedBit_1_29 = bits, U32, 1156, [29:29] +unusedBit_1_30 = bits, U32, 1156, [30:30] +unusedBit_1_31 = bits, U32, 1156, [31:31] +; total TS size = 1160 +wallFuelCorrection = scalar, F32, 1160, "", 1, 0 +wallFuel = scalar, F32, 1164, "", 1, 0 +; total TS size = 1168 +idleState = bits, S32, 1168, [0:2], "not important" +currentIdlePosition = scalar, F32, 1172 +baseIdlePosition = scalar, F32, 1176 +iacByTpsTaper = scalar, F32, 1180 +throttlePedalUpState = scalar, S32, 1184, "", 1, 0 +mightResetPid = bits, U32, 1188, [0:0] +shouldResetPid = bits, U32, 1188, [1:1] +wasResetPid = bits, U32, 1188, [2:2] +mustResetPid = bits, U32, 1188, [3:3] +isCranking = bits, U32, 1188, [4:4] +useIacTableForCoasting = bits, U32, 1188, [5:5] +notIdling = bits, U32, 1188, [6:6] +needReset = bits, U32, 1188, [7:7] +isInDeadZone = bits, U32, 1188, [8:8] +isBlipping = bits, U32, 1188, [9:9] +useClosedLoop = bits, U32, 1188, [10:10] +badTps = bits, U32, 1188, [11:11] +looksLikeRunning = bits, U32, 1188, [12:12] +looksLikeCoasting = bits, U32, 1188, [13:13] +looksLikeCrankToIdle = bits, U32, 1188, [14:14] +isVerboseIAC = bits, U32, 1188, [15:15] +isIdleCoasting = bits, U32, 1188, [16:16] +unusedBit_22_17 = bits, U32, 1188, [17:17] +unusedBit_22_18 = bits, U32, 1188, [18:18] +unusedBit_22_19 = bits, U32, 1188, [19:19] +unusedBit_22_20 = bits, U32, 1188, [20:20] +unusedBit_22_21 = bits, U32, 1188, [21:21] +unusedBit_22_22 = bits, U32, 1188, [22:22] +unusedBit_22_23 = bits, U32, 1188, [23:23] +unusedBit_22_24 = bits, U32, 1188, [24:24] +unusedBit_22_25 = bits, U32, 1188, [25:25] +unusedBit_22_26 = bits, U32, 1188, [26:26] +unusedBit_22_27 = bits, U32, 1188, [27:27] +unusedBit_22_28 = bits, U32, 1188, [28:28] +unusedBit_22_29 = bits, U32, 1188, [29:29] +unusedBit_22_30 = bits, U32, 1188, [30:30] +unusedBit_22_31 = bits, U32, 1188, [31:31] +targetRpmByClt = scalar, S32, 1192, "", 1, 0 +targetRpmAcBump = scalar, S32, 1196, "", 1, 0 +iacByRpmTaper = scalar, F32, 1200 +luaAdd = scalar, F32, 1204 +; total TS size = 1208 +baseDwell = scalar, F32, 1208, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 1212, "", 1, 0 +luaTimingAdd = scalar, F32, 1216, "", 1, 0 +luaTimingMult = scalar, F32, 1220, "", 1, 0 +; total TS size = 1224 +idlePosition = scalar, F32, 1224, "", 1, 0 +trim = scalar, F32, 1228, "", 1, 0 +luaAdjustment = scalar, F32, 1232, "", 1, 0 +etbFeedForward = scalar, F32, 1236 +etbIntegralError = scalar, F32, 1240, "", 1, 0 +etbCurrentTarget = scalar, F32, 1244, "%", 1, 0 +etbRevLimitActive = bits, U32, 1248, [0:0] +unusedBit_7_1 = bits, U32, 1248, [1:1] +unusedBit_7_2 = bits, U32, 1248, [2:2] +unusedBit_7_3 = bits, U32, 1248, [3:3] +unusedBit_7_4 = bits, U32, 1248, [4:4] +unusedBit_7_5 = bits, U32, 1248, [5:5] +unusedBit_7_6 = bits, U32, 1248, [6:6] +unusedBit_7_7 = bits, U32, 1248, [7:7] +unusedBit_7_8 = bits, U32, 1248, [8:8] +unusedBit_7_9 = bits, U32, 1248, [9:9] +unusedBit_7_10 = bits, U32, 1248, [10:10] +unusedBit_7_11 = bits, U32, 1248, [11:11] +unusedBit_7_12 = bits, U32, 1248, [12:12] +unusedBit_7_13 = bits, U32, 1248, [13:13] +unusedBit_7_14 = bits, U32, 1248, [14:14] +unusedBit_7_15 = bits, U32, 1248, [15:15] +unusedBit_7_16 = bits, U32, 1248, [16:16] +unusedBit_7_17 = bits, U32, 1248, [17:17] +unusedBit_7_18 = bits, U32, 1248, [18:18] +unusedBit_7_19 = bits, U32, 1248, [19:19] +unusedBit_7_20 = bits, U32, 1248, [20:20] +unusedBit_7_21 = bits, U32, 1248, [21:21] +unusedBit_7_22 = bits, U32, 1248, [22:22] +unusedBit_7_23 = bits, U32, 1248, [23:23] +unusedBit_7_24 = bits, U32, 1248, [24:24] +unusedBit_7_25 = bits, U32, 1248, [25:25] +unusedBit_7_26 = bits, U32, 1248, [26:26] +unusedBit_7_27 = bits, U32, 1248, [27:27] +unusedBit_7_28 = bits, U32, 1248, [28:28] +unusedBit_7_29 = bits, U32, 1248, [29:29] +unusedBit_7_30 = bits, U32, 1248, [30:30] +unusedBit_7_31 = bits, U32, 1248, [31:31] +; total TS size = 1252 +faultCode = scalar, U08, 1252, "", 1, 0 +heaterDuty = scalar, U08, 1253, "%", 1, 0 +pumpDuty = scalar, U08, 1254, "%", 1, 0 +tempC = scalar, U16, 1256, "C", 1, 0 +nernstVoltage = scalar, U16, 1258, "V", 0.001, 0 +esr = scalar, U16, 1260, "", 1, 0 +; total TS size = 1264 time = { timeNow } @@ -4993,6 +4994,7 @@ entry = mapVvt_MAP_AT_DIFF, "mapVvt_MAP_AT_DIFF", float, "%.3f" entry = mapVvt_MAP_AT_CYCLE_COUNT, "mapVvt_MAP_AT_CYCLE_COUNT", int, "%d" entry = mapVvt_map_peak, "mapVvt_map_peak", int, "%d" entry = currentEngineDecodedPhase, "Engine Phase", float, "%.3f" +entry = triggerToothAngleError, "triggerToothAngleError", float, "%.3f" entry = crankSynchronizationCounter, "Crank sync counter", int, "%d" entry = vvtSyncGapRatio, "vvtSyncGapRatio", float, "%.3f" entry = vvtCurrentPosition, "vvtCurrentPosition", float, "%.3f" @@ -5783,6 +5785,8 @@ dialog = trigger_centralDialog, "trigger_central" graphLine = mapVvt_MAP_AT_CYCLE_COUNT graphLine = mapVvt_map_peak graphLine = currentEngineDecodedPhase + liveGraph = trigger_central_4_Graph, "Graph", South + graphLine = triggerToothAngleError dialog = trigger_stateDialog, "trigger_state" diff --git a/firmware/tunerstudio/generated/rusefi_mre_f4.ini b/firmware/tunerstudio/generated/rusefi_mre_f4.ini index 2daac58839..ab83a40b17 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.09.24.mre_f4.2848348590" + signature = "rusEFI 2022.09.24.mre_f4.2930482615" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.09.24.mre_f4.2848348590" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.09.24.mre_f4.2930482615" ; 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 Fri Sep 23 23:16:20 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Sep 24 04:28:55 UTC 2022 pageSize = 22048 page = 1 @@ -2140,7 +2140,7 @@ ignBlends4_blendValues = array, U08, 22038, [8], "%", 0.5, 0, 0, 100, 1 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1260 + ochBlockSize = 1264 ; ; see TunerStudioOutputChannels struct @@ -3141,146 +3141,147 @@ mapVvt_MAP_AT_DIFF = scalar, F32, 1116, "", 1, 0 mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1120, "", 1, 0 mapVvt_map_peak = scalar, U08, 1121, "", 1, 0 currentEngineDecodedPhase = scalar, F32, 1124, "deg", 1, 0 -; total TS size = 1128 -crankSynchronizationCounter = scalar, U32, 1128, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1132, "", 1, 0 -vvtCurrentPosition = scalar, F32, 1136, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1140, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 1144, "", 1, 0 -triggerStateIndex = scalar, U08, 1148, "", 1, 0 -vvtCounter = scalar, U08, 1149, "", 1, 0 -camResyncCounter = scalar, U08, 1150, "", 1, 0 -vvtStateIndex = scalar, U08, 1151, "", 1, 0 -; total TS size = 1152 -m_hasSynchronizedPhase = bits, U32, 1152, [0:0] -unusedBit_1_1 = bits, U32, 1152, [1:1] -unusedBit_1_2 = bits, U32, 1152, [2:2] -unusedBit_1_3 = bits, U32, 1152, [3:3] -unusedBit_1_4 = bits, U32, 1152, [4:4] -unusedBit_1_5 = bits, U32, 1152, [5:5] -unusedBit_1_6 = bits, U32, 1152, [6:6] -unusedBit_1_7 = bits, U32, 1152, [7:7] -unusedBit_1_8 = bits, U32, 1152, [8:8] -unusedBit_1_9 = bits, U32, 1152, [9:9] -unusedBit_1_10 = bits, U32, 1152, [10:10] -unusedBit_1_11 = bits, U32, 1152, [11:11] -unusedBit_1_12 = bits, U32, 1152, [12:12] -unusedBit_1_13 = bits, U32, 1152, [13:13] -unusedBit_1_14 = bits, U32, 1152, [14:14] -unusedBit_1_15 = bits, U32, 1152, [15:15] -unusedBit_1_16 = bits, U32, 1152, [16:16] -unusedBit_1_17 = bits, U32, 1152, [17:17] -unusedBit_1_18 = bits, U32, 1152, [18:18] -unusedBit_1_19 = bits, U32, 1152, [19:19] -unusedBit_1_20 = bits, U32, 1152, [20:20] -unusedBit_1_21 = bits, U32, 1152, [21:21] -unusedBit_1_22 = bits, U32, 1152, [22:22] -unusedBit_1_23 = bits, U32, 1152, [23:23] -unusedBit_1_24 = bits, U32, 1152, [24:24] -unusedBit_1_25 = bits, U32, 1152, [25:25] -unusedBit_1_26 = bits, U32, 1152, [26:26] -unusedBit_1_27 = bits, U32, 1152, [27:27] -unusedBit_1_28 = bits, U32, 1152, [28:28] -unusedBit_1_29 = bits, U32, 1152, [29:29] -unusedBit_1_30 = bits, U32, 1152, [30:30] -unusedBit_1_31 = bits, U32, 1152, [31:31] +triggerToothAngleError = scalar, F32, 1128, "deg", 1, 0 +; total TS size = 1132 +crankSynchronizationCounter = scalar, U32, 1132, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1136, "", 1, 0 +vvtCurrentPosition = scalar, F32, 1140, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1144, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 1148, "", 1, 0 +triggerStateIndex = scalar, U08, 1152, "", 1, 0 +vvtCounter = scalar, U08, 1153, "", 1, 0 +camResyncCounter = scalar, U08, 1154, "", 1, 0 +vvtStateIndex = scalar, U08, 1155, "", 1, 0 ; total TS size = 1156 -wallFuelCorrection = scalar, F32, 1156, "", 1, 0 -wallFuel = scalar, F32, 1160, "", 1, 0 -; total TS size = 1164 -idleState = bits, S32, 1164, [0:2], "not important" -currentIdlePosition = scalar, F32, 1168 -baseIdlePosition = scalar, F32, 1172 -iacByTpsTaper = scalar, F32, 1176 -throttlePedalUpState = scalar, S32, 1180, "", 1, 0 -mightResetPid = bits, U32, 1184, [0:0] -shouldResetPid = bits, U32, 1184, [1:1] -wasResetPid = bits, U32, 1184, [2:2] -mustResetPid = bits, U32, 1184, [3:3] -isCranking = bits, U32, 1184, [4:4] -useIacTableForCoasting = bits, U32, 1184, [5:5] -notIdling = bits, U32, 1184, [6:6] -needReset = bits, U32, 1184, [7:7] -isInDeadZone = bits, U32, 1184, [8:8] -isBlipping = bits, U32, 1184, [9:9] -useClosedLoop = bits, U32, 1184, [10:10] -badTps = bits, U32, 1184, [11:11] -looksLikeRunning = bits, U32, 1184, [12:12] -looksLikeCoasting = bits, U32, 1184, [13:13] -looksLikeCrankToIdle = bits, U32, 1184, [14:14] -isVerboseIAC = bits, U32, 1184, [15:15] -isIdleCoasting = bits, U32, 1184, [16:16] -unusedBit_22_17 = bits, U32, 1184, [17:17] -unusedBit_22_18 = bits, U32, 1184, [18:18] -unusedBit_22_19 = bits, U32, 1184, [19:19] -unusedBit_22_20 = bits, U32, 1184, [20:20] -unusedBit_22_21 = bits, U32, 1184, [21:21] -unusedBit_22_22 = bits, U32, 1184, [22:22] -unusedBit_22_23 = bits, U32, 1184, [23:23] -unusedBit_22_24 = bits, U32, 1184, [24:24] -unusedBit_22_25 = bits, U32, 1184, [25:25] -unusedBit_22_26 = bits, U32, 1184, [26:26] -unusedBit_22_27 = bits, U32, 1184, [27:27] -unusedBit_22_28 = bits, U32, 1184, [28:28] -unusedBit_22_29 = bits, U32, 1184, [29:29] -unusedBit_22_30 = bits, U32, 1184, [30:30] -unusedBit_22_31 = bits, U32, 1184, [31:31] -targetRpmByClt = scalar, S32, 1188, "", 1, 0 -targetRpmAcBump = scalar, S32, 1192, "", 1, 0 -iacByRpmTaper = scalar, F32, 1196 -luaAdd = scalar, F32, 1200 -; total TS size = 1204 -baseDwell = scalar, F32, 1204, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 1208, "", 1, 0 -luaTimingAdd = scalar, F32, 1212, "", 1, 0 -luaTimingMult = scalar, F32, 1216, "", 1, 0 -; total TS size = 1220 -idlePosition = scalar, F32, 1220, "", 1, 0 -trim = scalar, F32, 1224, "", 1, 0 -luaAdjustment = scalar, F32, 1228, "", 1, 0 -etbFeedForward = scalar, F32, 1232 -etbIntegralError = scalar, F32, 1236, "", 1, 0 -etbCurrentTarget = scalar, F32, 1240, "%", 1, 0 -etbRevLimitActive = bits, U32, 1244, [0:0] -unusedBit_7_1 = bits, U32, 1244, [1:1] -unusedBit_7_2 = bits, U32, 1244, [2:2] -unusedBit_7_3 = bits, U32, 1244, [3:3] -unusedBit_7_4 = bits, U32, 1244, [4:4] -unusedBit_7_5 = bits, U32, 1244, [5:5] -unusedBit_7_6 = bits, U32, 1244, [6:6] -unusedBit_7_7 = bits, U32, 1244, [7:7] -unusedBit_7_8 = bits, U32, 1244, [8:8] -unusedBit_7_9 = bits, U32, 1244, [9:9] -unusedBit_7_10 = bits, U32, 1244, [10:10] -unusedBit_7_11 = bits, U32, 1244, [11:11] -unusedBit_7_12 = bits, U32, 1244, [12:12] -unusedBit_7_13 = bits, U32, 1244, [13:13] -unusedBit_7_14 = bits, U32, 1244, [14:14] -unusedBit_7_15 = bits, U32, 1244, [15:15] -unusedBit_7_16 = bits, U32, 1244, [16:16] -unusedBit_7_17 = bits, U32, 1244, [17:17] -unusedBit_7_18 = bits, U32, 1244, [18:18] -unusedBit_7_19 = bits, U32, 1244, [19:19] -unusedBit_7_20 = bits, U32, 1244, [20:20] -unusedBit_7_21 = bits, U32, 1244, [21:21] -unusedBit_7_22 = bits, U32, 1244, [22:22] -unusedBit_7_23 = bits, U32, 1244, [23:23] -unusedBit_7_24 = bits, U32, 1244, [24:24] -unusedBit_7_25 = bits, U32, 1244, [25:25] -unusedBit_7_26 = bits, U32, 1244, [26:26] -unusedBit_7_27 = bits, U32, 1244, [27:27] -unusedBit_7_28 = bits, U32, 1244, [28:28] -unusedBit_7_29 = bits, U32, 1244, [29:29] -unusedBit_7_30 = bits, U32, 1244, [30:30] -unusedBit_7_31 = bits, U32, 1244, [31:31] -; total TS size = 1248 -faultCode = scalar, U08, 1248, "", 1, 0 -heaterDuty = scalar, U08, 1249, "%", 1, 0 -pumpDuty = scalar, U08, 1250, "%", 1, 0 -tempC = scalar, U16, 1252, "C", 1, 0 -nernstVoltage = scalar, U16, 1254, "V", 0.001, 0 -esr = scalar, U16, 1256, "", 1, 0 -; total TS size = 1260 +m_hasSynchronizedPhase = bits, U32, 1156, [0:0] +unusedBit_1_1 = bits, U32, 1156, [1:1] +unusedBit_1_2 = bits, U32, 1156, [2:2] +unusedBit_1_3 = bits, U32, 1156, [3:3] +unusedBit_1_4 = bits, U32, 1156, [4:4] +unusedBit_1_5 = bits, U32, 1156, [5:5] +unusedBit_1_6 = bits, U32, 1156, [6:6] +unusedBit_1_7 = bits, U32, 1156, [7:7] +unusedBit_1_8 = bits, U32, 1156, [8:8] +unusedBit_1_9 = bits, U32, 1156, [9:9] +unusedBit_1_10 = bits, U32, 1156, [10:10] +unusedBit_1_11 = bits, U32, 1156, [11:11] +unusedBit_1_12 = bits, U32, 1156, [12:12] +unusedBit_1_13 = bits, U32, 1156, [13:13] +unusedBit_1_14 = bits, U32, 1156, [14:14] +unusedBit_1_15 = bits, U32, 1156, [15:15] +unusedBit_1_16 = bits, U32, 1156, [16:16] +unusedBit_1_17 = bits, U32, 1156, [17:17] +unusedBit_1_18 = bits, U32, 1156, [18:18] +unusedBit_1_19 = bits, U32, 1156, [19:19] +unusedBit_1_20 = bits, U32, 1156, [20:20] +unusedBit_1_21 = bits, U32, 1156, [21:21] +unusedBit_1_22 = bits, U32, 1156, [22:22] +unusedBit_1_23 = bits, U32, 1156, [23:23] +unusedBit_1_24 = bits, U32, 1156, [24:24] +unusedBit_1_25 = bits, U32, 1156, [25:25] +unusedBit_1_26 = bits, U32, 1156, [26:26] +unusedBit_1_27 = bits, U32, 1156, [27:27] +unusedBit_1_28 = bits, U32, 1156, [28:28] +unusedBit_1_29 = bits, U32, 1156, [29:29] +unusedBit_1_30 = bits, U32, 1156, [30:30] +unusedBit_1_31 = bits, U32, 1156, [31:31] +; total TS size = 1160 +wallFuelCorrection = scalar, F32, 1160, "", 1, 0 +wallFuel = scalar, F32, 1164, "", 1, 0 +; total TS size = 1168 +idleState = bits, S32, 1168, [0:2], "not important" +currentIdlePosition = scalar, F32, 1172 +baseIdlePosition = scalar, F32, 1176 +iacByTpsTaper = scalar, F32, 1180 +throttlePedalUpState = scalar, S32, 1184, "", 1, 0 +mightResetPid = bits, U32, 1188, [0:0] +shouldResetPid = bits, U32, 1188, [1:1] +wasResetPid = bits, U32, 1188, [2:2] +mustResetPid = bits, U32, 1188, [3:3] +isCranking = bits, U32, 1188, [4:4] +useIacTableForCoasting = bits, U32, 1188, [5:5] +notIdling = bits, U32, 1188, [6:6] +needReset = bits, U32, 1188, [7:7] +isInDeadZone = bits, U32, 1188, [8:8] +isBlipping = bits, U32, 1188, [9:9] +useClosedLoop = bits, U32, 1188, [10:10] +badTps = bits, U32, 1188, [11:11] +looksLikeRunning = bits, U32, 1188, [12:12] +looksLikeCoasting = bits, U32, 1188, [13:13] +looksLikeCrankToIdle = bits, U32, 1188, [14:14] +isVerboseIAC = bits, U32, 1188, [15:15] +isIdleCoasting = bits, U32, 1188, [16:16] +unusedBit_22_17 = bits, U32, 1188, [17:17] +unusedBit_22_18 = bits, U32, 1188, [18:18] +unusedBit_22_19 = bits, U32, 1188, [19:19] +unusedBit_22_20 = bits, U32, 1188, [20:20] +unusedBit_22_21 = bits, U32, 1188, [21:21] +unusedBit_22_22 = bits, U32, 1188, [22:22] +unusedBit_22_23 = bits, U32, 1188, [23:23] +unusedBit_22_24 = bits, U32, 1188, [24:24] +unusedBit_22_25 = bits, U32, 1188, [25:25] +unusedBit_22_26 = bits, U32, 1188, [26:26] +unusedBit_22_27 = bits, U32, 1188, [27:27] +unusedBit_22_28 = bits, U32, 1188, [28:28] +unusedBit_22_29 = bits, U32, 1188, [29:29] +unusedBit_22_30 = bits, U32, 1188, [30:30] +unusedBit_22_31 = bits, U32, 1188, [31:31] +targetRpmByClt = scalar, S32, 1192, "", 1, 0 +targetRpmAcBump = scalar, S32, 1196, "", 1, 0 +iacByRpmTaper = scalar, F32, 1200 +luaAdd = scalar, F32, 1204 +; total TS size = 1208 +baseDwell = scalar, F32, 1208, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 1212, "", 1, 0 +luaTimingAdd = scalar, F32, 1216, "", 1, 0 +luaTimingMult = scalar, F32, 1220, "", 1, 0 +; total TS size = 1224 +idlePosition = scalar, F32, 1224, "", 1, 0 +trim = scalar, F32, 1228, "", 1, 0 +luaAdjustment = scalar, F32, 1232, "", 1, 0 +etbFeedForward = scalar, F32, 1236 +etbIntegralError = scalar, F32, 1240, "", 1, 0 +etbCurrentTarget = scalar, F32, 1244, "%", 1, 0 +etbRevLimitActive = bits, U32, 1248, [0:0] +unusedBit_7_1 = bits, U32, 1248, [1:1] +unusedBit_7_2 = bits, U32, 1248, [2:2] +unusedBit_7_3 = bits, U32, 1248, [3:3] +unusedBit_7_4 = bits, U32, 1248, [4:4] +unusedBit_7_5 = bits, U32, 1248, [5:5] +unusedBit_7_6 = bits, U32, 1248, [6:6] +unusedBit_7_7 = bits, U32, 1248, [7:7] +unusedBit_7_8 = bits, U32, 1248, [8:8] +unusedBit_7_9 = bits, U32, 1248, [9:9] +unusedBit_7_10 = bits, U32, 1248, [10:10] +unusedBit_7_11 = bits, U32, 1248, [11:11] +unusedBit_7_12 = bits, U32, 1248, [12:12] +unusedBit_7_13 = bits, U32, 1248, [13:13] +unusedBit_7_14 = bits, U32, 1248, [14:14] +unusedBit_7_15 = bits, U32, 1248, [15:15] +unusedBit_7_16 = bits, U32, 1248, [16:16] +unusedBit_7_17 = bits, U32, 1248, [17:17] +unusedBit_7_18 = bits, U32, 1248, [18:18] +unusedBit_7_19 = bits, U32, 1248, [19:19] +unusedBit_7_20 = bits, U32, 1248, [20:20] +unusedBit_7_21 = bits, U32, 1248, [21:21] +unusedBit_7_22 = bits, U32, 1248, [22:22] +unusedBit_7_23 = bits, U32, 1248, [23:23] +unusedBit_7_24 = bits, U32, 1248, [24:24] +unusedBit_7_25 = bits, U32, 1248, [25:25] +unusedBit_7_26 = bits, U32, 1248, [26:26] +unusedBit_7_27 = bits, U32, 1248, [27:27] +unusedBit_7_28 = bits, U32, 1248, [28:28] +unusedBit_7_29 = bits, U32, 1248, [29:29] +unusedBit_7_30 = bits, U32, 1248, [30:30] +unusedBit_7_31 = bits, U32, 1248, [31:31] +; total TS size = 1252 +faultCode = scalar, U08, 1252, "", 1, 0 +heaterDuty = scalar, U08, 1253, "%", 1, 0 +pumpDuty = scalar, U08, 1254, "%", 1, 0 +tempC = scalar, U16, 1256, "C", 1, 0 +nernstVoltage = scalar, U16, 1258, "V", 0.001, 0 +esr = scalar, U16, 1260, "", 1, 0 +; total TS size = 1264 time = { timeNow } @@ -4993,6 +4994,7 @@ entry = mapVvt_MAP_AT_DIFF, "mapVvt_MAP_AT_DIFF", float, "%.3f" entry = mapVvt_MAP_AT_CYCLE_COUNT, "mapVvt_MAP_AT_CYCLE_COUNT", int, "%d" entry = mapVvt_map_peak, "mapVvt_map_peak", int, "%d" entry = currentEngineDecodedPhase, "Engine Phase", float, "%.3f" +entry = triggerToothAngleError, "triggerToothAngleError", float, "%.3f" entry = crankSynchronizationCounter, "Crank sync counter", int, "%d" entry = vvtSyncGapRatio, "vvtSyncGapRatio", float, "%.3f" entry = vvtCurrentPosition, "vvtCurrentPosition", float, "%.3f" @@ -5781,6 +5783,8 @@ dialog = trigger_centralDialog, "trigger_central" graphLine = mapVvt_MAP_AT_CYCLE_COUNT graphLine = mapVvt_map_peak graphLine = currentEngineDecodedPhase + liveGraph = trigger_central_4_Graph, "Graph", South + graphLine = triggerToothAngleError dialog = trigger_stateDialog, "trigger_state" diff --git a/firmware/tunerstudio/generated/rusefi_mre_f7.ini b/firmware/tunerstudio/generated/rusefi_mre_f7.ini index d3440f1d52..a3cc003e28 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.09.24.mre_f7.2848348590" + signature = "rusEFI 2022.09.24.mre_f7.2930482615" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.09.24.mre_f7.2848348590" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.09.24.mre_f7.2930482615" ; 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 Fri Sep 23 23:16:18 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Sep 24 04:28:53 UTC 2022 pageSize = 22048 page = 1 @@ -2140,7 +2140,7 @@ ignBlends4_blendValues = array, U08, 22038, [8], "%", 0.5, 0, 0, 100, 1 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1260 + ochBlockSize = 1264 ; ; see TunerStudioOutputChannels struct @@ -3141,146 +3141,147 @@ mapVvt_MAP_AT_DIFF = scalar, F32, 1116, "", 1, 0 mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1120, "", 1, 0 mapVvt_map_peak = scalar, U08, 1121, "", 1, 0 currentEngineDecodedPhase = scalar, F32, 1124, "deg", 1, 0 -; total TS size = 1128 -crankSynchronizationCounter = scalar, U32, 1128, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1132, "", 1, 0 -vvtCurrentPosition = scalar, F32, 1136, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1140, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 1144, "", 1, 0 -triggerStateIndex = scalar, U08, 1148, "", 1, 0 -vvtCounter = scalar, U08, 1149, "", 1, 0 -camResyncCounter = scalar, U08, 1150, "", 1, 0 -vvtStateIndex = scalar, U08, 1151, "", 1, 0 -; total TS size = 1152 -m_hasSynchronizedPhase = bits, U32, 1152, [0:0] -unusedBit_1_1 = bits, U32, 1152, [1:1] -unusedBit_1_2 = bits, U32, 1152, [2:2] -unusedBit_1_3 = bits, U32, 1152, [3:3] -unusedBit_1_4 = bits, U32, 1152, [4:4] -unusedBit_1_5 = bits, U32, 1152, [5:5] -unusedBit_1_6 = bits, U32, 1152, [6:6] -unusedBit_1_7 = bits, U32, 1152, [7:7] -unusedBit_1_8 = bits, U32, 1152, [8:8] -unusedBit_1_9 = bits, U32, 1152, [9:9] -unusedBit_1_10 = bits, U32, 1152, [10:10] -unusedBit_1_11 = bits, U32, 1152, [11:11] -unusedBit_1_12 = bits, U32, 1152, [12:12] -unusedBit_1_13 = bits, U32, 1152, [13:13] -unusedBit_1_14 = bits, U32, 1152, [14:14] -unusedBit_1_15 = bits, U32, 1152, [15:15] -unusedBit_1_16 = bits, U32, 1152, [16:16] -unusedBit_1_17 = bits, U32, 1152, [17:17] -unusedBit_1_18 = bits, U32, 1152, [18:18] -unusedBit_1_19 = bits, U32, 1152, [19:19] -unusedBit_1_20 = bits, U32, 1152, [20:20] -unusedBit_1_21 = bits, U32, 1152, [21:21] -unusedBit_1_22 = bits, U32, 1152, [22:22] -unusedBit_1_23 = bits, U32, 1152, [23:23] -unusedBit_1_24 = bits, U32, 1152, [24:24] -unusedBit_1_25 = bits, U32, 1152, [25:25] -unusedBit_1_26 = bits, U32, 1152, [26:26] -unusedBit_1_27 = bits, U32, 1152, [27:27] -unusedBit_1_28 = bits, U32, 1152, [28:28] -unusedBit_1_29 = bits, U32, 1152, [29:29] -unusedBit_1_30 = bits, U32, 1152, [30:30] -unusedBit_1_31 = bits, U32, 1152, [31:31] +triggerToothAngleError = scalar, F32, 1128, "deg", 1, 0 +; total TS size = 1132 +crankSynchronizationCounter = scalar, U32, 1132, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1136, "", 1, 0 +vvtCurrentPosition = scalar, F32, 1140, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1144, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 1148, "", 1, 0 +triggerStateIndex = scalar, U08, 1152, "", 1, 0 +vvtCounter = scalar, U08, 1153, "", 1, 0 +camResyncCounter = scalar, U08, 1154, "", 1, 0 +vvtStateIndex = scalar, U08, 1155, "", 1, 0 ; total TS size = 1156 -wallFuelCorrection = scalar, F32, 1156, "", 1, 0 -wallFuel = scalar, F32, 1160, "", 1, 0 -; total TS size = 1164 -idleState = bits, S32, 1164, [0:2], "not important" -currentIdlePosition = scalar, F32, 1168 -baseIdlePosition = scalar, F32, 1172 -iacByTpsTaper = scalar, F32, 1176 -throttlePedalUpState = scalar, S32, 1180, "", 1, 0 -mightResetPid = bits, U32, 1184, [0:0] -shouldResetPid = bits, U32, 1184, [1:1] -wasResetPid = bits, U32, 1184, [2:2] -mustResetPid = bits, U32, 1184, [3:3] -isCranking = bits, U32, 1184, [4:4] -useIacTableForCoasting = bits, U32, 1184, [5:5] -notIdling = bits, U32, 1184, [6:6] -needReset = bits, U32, 1184, [7:7] -isInDeadZone = bits, U32, 1184, [8:8] -isBlipping = bits, U32, 1184, [9:9] -useClosedLoop = bits, U32, 1184, [10:10] -badTps = bits, U32, 1184, [11:11] -looksLikeRunning = bits, U32, 1184, [12:12] -looksLikeCoasting = bits, U32, 1184, [13:13] -looksLikeCrankToIdle = bits, U32, 1184, [14:14] -isVerboseIAC = bits, U32, 1184, [15:15] -isIdleCoasting = bits, U32, 1184, [16:16] -unusedBit_22_17 = bits, U32, 1184, [17:17] -unusedBit_22_18 = bits, U32, 1184, [18:18] -unusedBit_22_19 = bits, U32, 1184, [19:19] -unusedBit_22_20 = bits, U32, 1184, [20:20] -unusedBit_22_21 = bits, U32, 1184, [21:21] -unusedBit_22_22 = bits, U32, 1184, [22:22] -unusedBit_22_23 = bits, U32, 1184, [23:23] -unusedBit_22_24 = bits, U32, 1184, [24:24] -unusedBit_22_25 = bits, U32, 1184, [25:25] -unusedBit_22_26 = bits, U32, 1184, [26:26] -unusedBit_22_27 = bits, U32, 1184, [27:27] -unusedBit_22_28 = bits, U32, 1184, [28:28] -unusedBit_22_29 = bits, U32, 1184, [29:29] -unusedBit_22_30 = bits, U32, 1184, [30:30] -unusedBit_22_31 = bits, U32, 1184, [31:31] -targetRpmByClt = scalar, S32, 1188, "", 1, 0 -targetRpmAcBump = scalar, S32, 1192, "", 1, 0 -iacByRpmTaper = scalar, F32, 1196 -luaAdd = scalar, F32, 1200 -; total TS size = 1204 -baseDwell = scalar, F32, 1204, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 1208, "", 1, 0 -luaTimingAdd = scalar, F32, 1212, "", 1, 0 -luaTimingMult = scalar, F32, 1216, "", 1, 0 -; total TS size = 1220 -idlePosition = scalar, F32, 1220, "", 1, 0 -trim = scalar, F32, 1224, "", 1, 0 -luaAdjustment = scalar, F32, 1228, "", 1, 0 -etbFeedForward = scalar, F32, 1232 -etbIntegralError = scalar, F32, 1236, "", 1, 0 -etbCurrentTarget = scalar, F32, 1240, "%", 1, 0 -etbRevLimitActive = bits, U32, 1244, [0:0] -unusedBit_7_1 = bits, U32, 1244, [1:1] -unusedBit_7_2 = bits, U32, 1244, [2:2] -unusedBit_7_3 = bits, U32, 1244, [3:3] -unusedBit_7_4 = bits, U32, 1244, [4:4] -unusedBit_7_5 = bits, U32, 1244, [5:5] -unusedBit_7_6 = bits, U32, 1244, [6:6] -unusedBit_7_7 = bits, U32, 1244, [7:7] -unusedBit_7_8 = bits, U32, 1244, [8:8] -unusedBit_7_9 = bits, U32, 1244, [9:9] -unusedBit_7_10 = bits, U32, 1244, [10:10] -unusedBit_7_11 = bits, U32, 1244, [11:11] -unusedBit_7_12 = bits, U32, 1244, [12:12] -unusedBit_7_13 = bits, U32, 1244, [13:13] -unusedBit_7_14 = bits, U32, 1244, [14:14] -unusedBit_7_15 = bits, U32, 1244, [15:15] -unusedBit_7_16 = bits, U32, 1244, [16:16] -unusedBit_7_17 = bits, U32, 1244, [17:17] -unusedBit_7_18 = bits, U32, 1244, [18:18] -unusedBit_7_19 = bits, U32, 1244, [19:19] -unusedBit_7_20 = bits, U32, 1244, [20:20] -unusedBit_7_21 = bits, U32, 1244, [21:21] -unusedBit_7_22 = bits, U32, 1244, [22:22] -unusedBit_7_23 = bits, U32, 1244, [23:23] -unusedBit_7_24 = bits, U32, 1244, [24:24] -unusedBit_7_25 = bits, U32, 1244, [25:25] -unusedBit_7_26 = bits, U32, 1244, [26:26] -unusedBit_7_27 = bits, U32, 1244, [27:27] -unusedBit_7_28 = bits, U32, 1244, [28:28] -unusedBit_7_29 = bits, U32, 1244, [29:29] -unusedBit_7_30 = bits, U32, 1244, [30:30] -unusedBit_7_31 = bits, U32, 1244, [31:31] -; total TS size = 1248 -faultCode = scalar, U08, 1248, "", 1, 0 -heaterDuty = scalar, U08, 1249, "%", 1, 0 -pumpDuty = scalar, U08, 1250, "%", 1, 0 -tempC = scalar, U16, 1252, "C", 1, 0 -nernstVoltage = scalar, U16, 1254, "V", 0.001, 0 -esr = scalar, U16, 1256, "", 1, 0 -; total TS size = 1260 +m_hasSynchronizedPhase = bits, U32, 1156, [0:0] +unusedBit_1_1 = bits, U32, 1156, [1:1] +unusedBit_1_2 = bits, U32, 1156, [2:2] +unusedBit_1_3 = bits, U32, 1156, [3:3] +unusedBit_1_4 = bits, U32, 1156, [4:4] +unusedBit_1_5 = bits, U32, 1156, [5:5] +unusedBit_1_6 = bits, U32, 1156, [6:6] +unusedBit_1_7 = bits, U32, 1156, [7:7] +unusedBit_1_8 = bits, U32, 1156, [8:8] +unusedBit_1_9 = bits, U32, 1156, [9:9] +unusedBit_1_10 = bits, U32, 1156, [10:10] +unusedBit_1_11 = bits, U32, 1156, [11:11] +unusedBit_1_12 = bits, U32, 1156, [12:12] +unusedBit_1_13 = bits, U32, 1156, [13:13] +unusedBit_1_14 = bits, U32, 1156, [14:14] +unusedBit_1_15 = bits, U32, 1156, [15:15] +unusedBit_1_16 = bits, U32, 1156, [16:16] +unusedBit_1_17 = bits, U32, 1156, [17:17] +unusedBit_1_18 = bits, U32, 1156, [18:18] +unusedBit_1_19 = bits, U32, 1156, [19:19] +unusedBit_1_20 = bits, U32, 1156, [20:20] +unusedBit_1_21 = bits, U32, 1156, [21:21] +unusedBit_1_22 = bits, U32, 1156, [22:22] +unusedBit_1_23 = bits, U32, 1156, [23:23] +unusedBit_1_24 = bits, U32, 1156, [24:24] +unusedBit_1_25 = bits, U32, 1156, [25:25] +unusedBit_1_26 = bits, U32, 1156, [26:26] +unusedBit_1_27 = bits, U32, 1156, [27:27] +unusedBit_1_28 = bits, U32, 1156, [28:28] +unusedBit_1_29 = bits, U32, 1156, [29:29] +unusedBit_1_30 = bits, U32, 1156, [30:30] +unusedBit_1_31 = bits, U32, 1156, [31:31] +; total TS size = 1160 +wallFuelCorrection = scalar, F32, 1160, "", 1, 0 +wallFuel = scalar, F32, 1164, "", 1, 0 +; total TS size = 1168 +idleState = bits, S32, 1168, [0:2], "not important" +currentIdlePosition = scalar, F32, 1172 +baseIdlePosition = scalar, F32, 1176 +iacByTpsTaper = scalar, F32, 1180 +throttlePedalUpState = scalar, S32, 1184, "", 1, 0 +mightResetPid = bits, U32, 1188, [0:0] +shouldResetPid = bits, U32, 1188, [1:1] +wasResetPid = bits, U32, 1188, [2:2] +mustResetPid = bits, U32, 1188, [3:3] +isCranking = bits, U32, 1188, [4:4] +useIacTableForCoasting = bits, U32, 1188, [5:5] +notIdling = bits, U32, 1188, [6:6] +needReset = bits, U32, 1188, [7:7] +isInDeadZone = bits, U32, 1188, [8:8] +isBlipping = bits, U32, 1188, [9:9] +useClosedLoop = bits, U32, 1188, [10:10] +badTps = bits, U32, 1188, [11:11] +looksLikeRunning = bits, U32, 1188, [12:12] +looksLikeCoasting = bits, U32, 1188, [13:13] +looksLikeCrankToIdle = bits, U32, 1188, [14:14] +isVerboseIAC = bits, U32, 1188, [15:15] +isIdleCoasting = bits, U32, 1188, [16:16] +unusedBit_22_17 = bits, U32, 1188, [17:17] +unusedBit_22_18 = bits, U32, 1188, [18:18] +unusedBit_22_19 = bits, U32, 1188, [19:19] +unusedBit_22_20 = bits, U32, 1188, [20:20] +unusedBit_22_21 = bits, U32, 1188, [21:21] +unusedBit_22_22 = bits, U32, 1188, [22:22] +unusedBit_22_23 = bits, U32, 1188, [23:23] +unusedBit_22_24 = bits, U32, 1188, [24:24] +unusedBit_22_25 = bits, U32, 1188, [25:25] +unusedBit_22_26 = bits, U32, 1188, [26:26] +unusedBit_22_27 = bits, U32, 1188, [27:27] +unusedBit_22_28 = bits, U32, 1188, [28:28] +unusedBit_22_29 = bits, U32, 1188, [29:29] +unusedBit_22_30 = bits, U32, 1188, [30:30] +unusedBit_22_31 = bits, U32, 1188, [31:31] +targetRpmByClt = scalar, S32, 1192, "", 1, 0 +targetRpmAcBump = scalar, S32, 1196, "", 1, 0 +iacByRpmTaper = scalar, F32, 1200 +luaAdd = scalar, F32, 1204 +; total TS size = 1208 +baseDwell = scalar, F32, 1208, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 1212, "", 1, 0 +luaTimingAdd = scalar, F32, 1216, "", 1, 0 +luaTimingMult = scalar, F32, 1220, "", 1, 0 +; total TS size = 1224 +idlePosition = scalar, F32, 1224, "", 1, 0 +trim = scalar, F32, 1228, "", 1, 0 +luaAdjustment = scalar, F32, 1232, "", 1, 0 +etbFeedForward = scalar, F32, 1236 +etbIntegralError = scalar, F32, 1240, "", 1, 0 +etbCurrentTarget = scalar, F32, 1244, "%", 1, 0 +etbRevLimitActive = bits, U32, 1248, [0:0] +unusedBit_7_1 = bits, U32, 1248, [1:1] +unusedBit_7_2 = bits, U32, 1248, [2:2] +unusedBit_7_3 = bits, U32, 1248, [3:3] +unusedBit_7_4 = bits, U32, 1248, [4:4] +unusedBit_7_5 = bits, U32, 1248, [5:5] +unusedBit_7_6 = bits, U32, 1248, [6:6] +unusedBit_7_7 = bits, U32, 1248, [7:7] +unusedBit_7_8 = bits, U32, 1248, [8:8] +unusedBit_7_9 = bits, U32, 1248, [9:9] +unusedBit_7_10 = bits, U32, 1248, [10:10] +unusedBit_7_11 = bits, U32, 1248, [11:11] +unusedBit_7_12 = bits, U32, 1248, [12:12] +unusedBit_7_13 = bits, U32, 1248, [13:13] +unusedBit_7_14 = bits, U32, 1248, [14:14] +unusedBit_7_15 = bits, U32, 1248, [15:15] +unusedBit_7_16 = bits, U32, 1248, [16:16] +unusedBit_7_17 = bits, U32, 1248, [17:17] +unusedBit_7_18 = bits, U32, 1248, [18:18] +unusedBit_7_19 = bits, U32, 1248, [19:19] +unusedBit_7_20 = bits, U32, 1248, [20:20] +unusedBit_7_21 = bits, U32, 1248, [21:21] +unusedBit_7_22 = bits, U32, 1248, [22:22] +unusedBit_7_23 = bits, U32, 1248, [23:23] +unusedBit_7_24 = bits, U32, 1248, [24:24] +unusedBit_7_25 = bits, U32, 1248, [25:25] +unusedBit_7_26 = bits, U32, 1248, [26:26] +unusedBit_7_27 = bits, U32, 1248, [27:27] +unusedBit_7_28 = bits, U32, 1248, [28:28] +unusedBit_7_29 = bits, U32, 1248, [29:29] +unusedBit_7_30 = bits, U32, 1248, [30:30] +unusedBit_7_31 = bits, U32, 1248, [31:31] +; total TS size = 1252 +faultCode = scalar, U08, 1252, "", 1, 0 +heaterDuty = scalar, U08, 1253, "%", 1, 0 +pumpDuty = scalar, U08, 1254, "%", 1, 0 +tempC = scalar, U16, 1256, "C", 1, 0 +nernstVoltage = scalar, U16, 1258, "V", 0.001, 0 +esr = scalar, U16, 1260, "", 1, 0 +; total TS size = 1264 time = { timeNow } @@ -4993,6 +4994,7 @@ entry = mapVvt_MAP_AT_DIFF, "mapVvt_MAP_AT_DIFF", float, "%.3f" entry = mapVvt_MAP_AT_CYCLE_COUNT, "mapVvt_MAP_AT_CYCLE_COUNT", int, "%d" entry = mapVvt_map_peak, "mapVvt_map_peak", int, "%d" entry = currentEngineDecodedPhase, "Engine Phase", float, "%.3f" +entry = triggerToothAngleError, "triggerToothAngleError", float, "%.3f" entry = crankSynchronizationCounter, "Crank sync counter", int, "%d" entry = vvtSyncGapRatio, "vvtSyncGapRatio", float, "%.3f" entry = vvtCurrentPosition, "vvtCurrentPosition", float, "%.3f" @@ -5781,6 +5783,8 @@ dialog = trigger_centralDialog, "trigger_central" graphLine = mapVvt_MAP_AT_CYCLE_COUNT graphLine = mapVvt_map_peak graphLine = currentEngineDecodedPhase + liveGraph = trigger_central_4_Graph, "Graph", South + graphLine = triggerToothAngleError dialog = trigger_stateDialog, "trigger_state" diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_405.ini b/firmware/tunerstudio/generated/rusefi_prometheus_405.ini index 194298cf9d..23f82ecaa3 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.09.24.prometheus_405.2793303623" + signature = "rusEFI 2022.09.24.prometheus_405.2702420574" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.09.24.prometheus_405.2793303623" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.09.24.prometheus_405.2702420574" ; 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 Fri Sep 23 23:16:29 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Sep 24 04:29:04 UTC 2022 pageSize = 22048 page = 1 @@ -2140,7 +2140,7 @@ ignBlends4_blendValues = array, U08, 22038, [8], "%", 0.5, 0, 0, 100, 1 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1260 + ochBlockSize = 1264 ; ; see TunerStudioOutputChannels struct @@ -3141,146 +3141,147 @@ mapVvt_MAP_AT_DIFF = scalar, F32, 1116, "", 1, 0 mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1120, "", 1, 0 mapVvt_map_peak = scalar, U08, 1121, "", 1, 0 currentEngineDecodedPhase = scalar, F32, 1124, "deg", 1, 0 -; total TS size = 1128 -crankSynchronizationCounter = scalar, U32, 1128, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1132, "", 1, 0 -vvtCurrentPosition = scalar, F32, 1136, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1140, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 1144, "", 1, 0 -triggerStateIndex = scalar, U08, 1148, "", 1, 0 -vvtCounter = scalar, U08, 1149, "", 1, 0 -camResyncCounter = scalar, U08, 1150, "", 1, 0 -vvtStateIndex = scalar, U08, 1151, "", 1, 0 -; total TS size = 1152 -m_hasSynchronizedPhase = bits, U32, 1152, [0:0] -unusedBit_1_1 = bits, U32, 1152, [1:1] -unusedBit_1_2 = bits, U32, 1152, [2:2] -unusedBit_1_3 = bits, U32, 1152, [3:3] -unusedBit_1_4 = bits, U32, 1152, [4:4] -unusedBit_1_5 = bits, U32, 1152, [5:5] -unusedBit_1_6 = bits, U32, 1152, [6:6] -unusedBit_1_7 = bits, U32, 1152, [7:7] -unusedBit_1_8 = bits, U32, 1152, [8:8] -unusedBit_1_9 = bits, U32, 1152, [9:9] -unusedBit_1_10 = bits, U32, 1152, [10:10] -unusedBit_1_11 = bits, U32, 1152, [11:11] -unusedBit_1_12 = bits, U32, 1152, [12:12] -unusedBit_1_13 = bits, U32, 1152, [13:13] -unusedBit_1_14 = bits, U32, 1152, [14:14] -unusedBit_1_15 = bits, U32, 1152, [15:15] -unusedBit_1_16 = bits, U32, 1152, [16:16] -unusedBit_1_17 = bits, U32, 1152, [17:17] -unusedBit_1_18 = bits, U32, 1152, [18:18] -unusedBit_1_19 = bits, U32, 1152, [19:19] -unusedBit_1_20 = bits, U32, 1152, [20:20] -unusedBit_1_21 = bits, U32, 1152, [21:21] -unusedBit_1_22 = bits, U32, 1152, [22:22] -unusedBit_1_23 = bits, U32, 1152, [23:23] -unusedBit_1_24 = bits, U32, 1152, [24:24] -unusedBit_1_25 = bits, U32, 1152, [25:25] -unusedBit_1_26 = bits, U32, 1152, [26:26] -unusedBit_1_27 = bits, U32, 1152, [27:27] -unusedBit_1_28 = bits, U32, 1152, [28:28] -unusedBit_1_29 = bits, U32, 1152, [29:29] -unusedBit_1_30 = bits, U32, 1152, [30:30] -unusedBit_1_31 = bits, U32, 1152, [31:31] +triggerToothAngleError = scalar, F32, 1128, "deg", 1, 0 +; total TS size = 1132 +crankSynchronizationCounter = scalar, U32, 1132, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1136, "", 1, 0 +vvtCurrentPosition = scalar, F32, 1140, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1144, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 1148, "", 1, 0 +triggerStateIndex = scalar, U08, 1152, "", 1, 0 +vvtCounter = scalar, U08, 1153, "", 1, 0 +camResyncCounter = scalar, U08, 1154, "", 1, 0 +vvtStateIndex = scalar, U08, 1155, "", 1, 0 ; total TS size = 1156 -wallFuelCorrection = scalar, F32, 1156, "", 1, 0 -wallFuel = scalar, F32, 1160, "", 1, 0 -; total TS size = 1164 -idleState = bits, S32, 1164, [0:2], "not important" -currentIdlePosition = scalar, F32, 1168 -baseIdlePosition = scalar, F32, 1172 -iacByTpsTaper = scalar, F32, 1176 -throttlePedalUpState = scalar, S32, 1180, "", 1, 0 -mightResetPid = bits, U32, 1184, [0:0] -shouldResetPid = bits, U32, 1184, [1:1] -wasResetPid = bits, U32, 1184, [2:2] -mustResetPid = bits, U32, 1184, [3:3] -isCranking = bits, U32, 1184, [4:4] -useIacTableForCoasting = bits, U32, 1184, [5:5] -notIdling = bits, U32, 1184, [6:6] -needReset = bits, U32, 1184, [7:7] -isInDeadZone = bits, U32, 1184, [8:8] -isBlipping = bits, U32, 1184, [9:9] -useClosedLoop = bits, U32, 1184, [10:10] -badTps = bits, U32, 1184, [11:11] -looksLikeRunning = bits, U32, 1184, [12:12] -looksLikeCoasting = bits, U32, 1184, [13:13] -looksLikeCrankToIdle = bits, U32, 1184, [14:14] -isVerboseIAC = bits, U32, 1184, [15:15] -isIdleCoasting = bits, U32, 1184, [16:16] -unusedBit_22_17 = bits, U32, 1184, [17:17] -unusedBit_22_18 = bits, U32, 1184, [18:18] -unusedBit_22_19 = bits, U32, 1184, [19:19] -unusedBit_22_20 = bits, U32, 1184, [20:20] -unusedBit_22_21 = bits, U32, 1184, [21:21] -unusedBit_22_22 = bits, U32, 1184, [22:22] -unusedBit_22_23 = bits, U32, 1184, [23:23] -unusedBit_22_24 = bits, U32, 1184, [24:24] -unusedBit_22_25 = bits, U32, 1184, [25:25] -unusedBit_22_26 = bits, U32, 1184, [26:26] -unusedBit_22_27 = bits, U32, 1184, [27:27] -unusedBit_22_28 = bits, U32, 1184, [28:28] -unusedBit_22_29 = bits, U32, 1184, [29:29] -unusedBit_22_30 = bits, U32, 1184, [30:30] -unusedBit_22_31 = bits, U32, 1184, [31:31] -targetRpmByClt = scalar, S32, 1188, "", 1, 0 -targetRpmAcBump = scalar, S32, 1192, "", 1, 0 -iacByRpmTaper = scalar, F32, 1196 -luaAdd = scalar, F32, 1200 -; total TS size = 1204 -baseDwell = scalar, F32, 1204, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 1208, "", 1, 0 -luaTimingAdd = scalar, F32, 1212, "", 1, 0 -luaTimingMult = scalar, F32, 1216, "", 1, 0 -; total TS size = 1220 -idlePosition = scalar, F32, 1220, "", 1, 0 -trim = scalar, F32, 1224, "", 1, 0 -luaAdjustment = scalar, F32, 1228, "", 1, 0 -etbFeedForward = scalar, F32, 1232 -etbIntegralError = scalar, F32, 1236, "", 1, 0 -etbCurrentTarget = scalar, F32, 1240, "%", 1, 0 -etbRevLimitActive = bits, U32, 1244, [0:0] -unusedBit_7_1 = bits, U32, 1244, [1:1] -unusedBit_7_2 = bits, U32, 1244, [2:2] -unusedBit_7_3 = bits, U32, 1244, [3:3] -unusedBit_7_4 = bits, U32, 1244, [4:4] -unusedBit_7_5 = bits, U32, 1244, [5:5] -unusedBit_7_6 = bits, U32, 1244, [6:6] -unusedBit_7_7 = bits, U32, 1244, [7:7] -unusedBit_7_8 = bits, U32, 1244, [8:8] -unusedBit_7_9 = bits, U32, 1244, [9:9] -unusedBit_7_10 = bits, U32, 1244, [10:10] -unusedBit_7_11 = bits, U32, 1244, [11:11] -unusedBit_7_12 = bits, U32, 1244, [12:12] -unusedBit_7_13 = bits, U32, 1244, [13:13] -unusedBit_7_14 = bits, U32, 1244, [14:14] -unusedBit_7_15 = bits, U32, 1244, [15:15] -unusedBit_7_16 = bits, U32, 1244, [16:16] -unusedBit_7_17 = bits, U32, 1244, [17:17] -unusedBit_7_18 = bits, U32, 1244, [18:18] -unusedBit_7_19 = bits, U32, 1244, [19:19] -unusedBit_7_20 = bits, U32, 1244, [20:20] -unusedBit_7_21 = bits, U32, 1244, [21:21] -unusedBit_7_22 = bits, U32, 1244, [22:22] -unusedBit_7_23 = bits, U32, 1244, [23:23] -unusedBit_7_24 = bits, U32, 1244, [24:24] -unusedBit_7_25 = bits, U32, 1244, [25:25] -unusedBit_7_26 = bits, U32, 1244, [26:26] -unusedBit_7_27 = bits, U32, 1244, [27:27] -unusedBit_7_28 = bits, U32, 1244, [28:28] -unusedBit_7_29 = bits, U32, 1244, [29:29] -unusedBit_7_30 = bits, U32, 1244, [30:30] -unusedBit_7_31 = bits, U32, 1244, [31:31] -; total TS size = 1248 -faultCode = scalar, U08, 1248, "", 1, 0 -heaterDuty = scalar, U08, 1249, "%", 1, 0 -pumpDuty = scalar, U08, 1250, "%", 1, 0 -tempC = scalar, U16, 1252, "C", 1, 0 -nernstVoltage = scalar, U16, 1254, "V", 0.001, 0 -esr = scalar, U16, 1256, "", 1, 0 -; total TS size = 1260 +m_hasSynchronizedPhase = bits, U32, 1156, [0:0] +unusedBit_1_1 = bits, U32, 1156, [1:1] +unusedBit_1_2 = bits, U32, 1156, [2:2] +unusedBit_1_3 = bits, U32, 1156, [3:3] +unusedBit_1_4 = bits, U32, 1156, [4:4] +unusedBit_1_5 = bits, U32, 1156, [5:5] +unusedBit_1_6 = bits, U32, 1156, [6:6] +unusedBit_1_7 = bits, U32, 1156, [7:7] +unusedBit_1_8 = bits, U32, 1156, [8:8] +unusedBit_1_9 = bits, U32, 1156, [9:9] +unusedBit_1_10 = bits, U32, 1156, [10:10] +unusedBit_1_11 = bits, U32, 1156, [11:11] +unusedBit_1_12 = bits, U32, 1156, [12:12] +unusedBit_1_13 = bits, U32, 1156, [13:13] +unusedBit_1_14 = bits, U32, 1156, [14:14] +unusedBit_1_15 = bits, U32, 1156, [15:15] +unusedBit_1_16 = bits, U32, 1156, [16:16] +unusedBit_1_17 = bits, U32, 1156, [17:17] +unusedBit_1_18 = bits, U32, 1156, [18:18] +unusedBit_1_19 = bits, U32, 1156, [19:19] +unusedBit_1_20 = bits, U32, 1156, [20:20] +unusedBit_1_21 = bits, U32, 1156, [21:21] +unusedBit_1_22 = bits, U32, 1156, [22:22] +unusedBit_1_23 = bits, U32, 1156, [23:23] +unusedBit_1_24 = bits, U32, 1156, [24:24] +unusedBit_1_25 = bits, U32, 1156, [25:25] +unusedBit_1_26 = bits, U32, 1156, [26:26] +unusedBit_1_27 = bits, U32, 1156, [27:27] +unusedBit_1_28 = bits, U32, 1156, [28:28] +unusedBit_1_29 = bits, U32, 1156, [29:29] +unusedBit_1_30 = bits, U32, 1156, [30:30] +unusedBit_1_31 = bits, U32, 1156, [31:31] +; total TS size = 1160 +wallFuelCorrection = scalar, F32, 1160, "", 1, 0 +wallFuel = scalar, F32, 1164, "", 1, 0 +; total TS size = 1168 +idleState = bits, S32, 1168, [0:2], "not important" +currentIdlePosition = scalar, F32, 1172 +baseIdlePosition = scalar, F32, 1176 +iacByTpsTaper = scalar, F32, 1180 +throttlePedalUpState = scalar, S32, 1184, "", 1, 0 +mightResetPid = bits, U32, 1188, [0:0] +shouldResetPid = bits, U32, 1188, [1:1] +wasResetPid = bits, U32, 1188, [2:2] +mustResetPid = bits, U32, 1188, [3:3] +isCranking = bits, U32, 1188, [4:4] +useIacTableForCoasting = bits, U32, 1188, [5:5] +notIdling = bits, U32, 1188, [6:6] +needReset = bits, U32, 1188, [7:7] +isInDeadZone = bits, U32, 1188, [8:8] +isBlipping = bits, U32, 1188, [9:9] +useClosedLoop = bits, U32, 1188, [10:10] +badTps = bits, U32, 1188, [11:11] +looksLikeRunning = bits, U32, 1188, [12:12] +looksLikeCoasting = bits, U32, 1188, [13:13] +looksLikeCrankToIdle = bits, U32, 1188, [14:14] +isVerboseIAC = bits, U32, 1188, [15:15] +isIdleCoasting = bits, U32, 1188, [16:16] +unusedBit_22_17 = bits, U32, 1188, [17:17] +unusedBit_22_18 = bits, U32, 1188, [18:18] +unusedBit_22_19 = bits, U32, 1188, [19:19] +unusedBit_22_20 = bits, U32, 1188, [20:20] +unusedBit_22_21 = bits, U32, 1188, [21:21] +unusedBit_22_22 = bits, U32, 1188, [22:22] +unusedBit_22_23 = bits, U32, 1188, [23:23] +unusedBit_22_24 = bits, U32, 1188, [24:24] +unusedBit_22_25 = bits, U32, 1188, [25:25] +unusedBit_22_26 = bits, U32, 1188, [26:26] +unusedBit_22_27 = bits, U32, 1188, [27:27] +unusedBit_22_28 = bits, U32, 1188, [28:28] +unusedBit_22_29 = bits, U32, 1188, [29:29] +unusedBit_22_30 = bits, U32, 1188, [30:30] +unusedBit_22_31 = bits, U32, 1188, [31:31] +targetRpmByClt = scalar, S32, 1192, "", 1, 0 +targetRpmAcBump = scalar, S32, 1196, "", 1, 0 +iacByRpmTaper = scalar, F32, 1200 +luaAdd = scalar, F32, 1204 +; total TS size = 1208 +baseDwell = scalar, F32, 1208, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 1212, "", 1, 0 +luaTimingAdd = scalar, F32, 1216, "", 1, 0 +luaTimingMult = scalar, F32, 1220, "", 1, 0 +; total TS size = 1224 +idlePosition = scalar, F32, 1224, "", 1, 0 +trim = scalar, F32, 1228, "", 1, 0 +luaAdjustment = scalar, F32, 1232, "", 1, 0 +etbFeedForward = scalar, F32, 1236 +etbIntegralError = scalar, F32, 1240, "", 1, 0 +etbCurrentTarget = scalar, F32, 1244, "%", 1, 0 +etbRevLimitActive = bits, U32, 1248, [0:0] +unusedBit_7_1 = bits, U32, 1248, [1:1] +unusedBit_7_2 = bits, U32, 1248, [2:2] +unusedBit_7_3 = bits, U32, 1248, [3:3] +unusedBit_7_4 = bits, U32, 1248, [4:4] +unusedBit_7_5 = bits, U32, 1248, [5:5] +unusedBit_7_6 = bits, U32, 1248, [6:6] +unusedBit_7_7 = bits, U32, 1248, [7:7] +unusedBit_7_8 = bits, U32, 1248, [8:8] +unusedBit_7_9 = bits, U32, 1248, [9:9] +unusedBit_7_10 = bits, U32, 1248, [10:10] +unusedBit_7_11 = bits, U32, 1248, [11:11] +unusedBit_7_12 = bits, U32, 1248, [12:12] +unusedBit_7_13 = bits, U32, 1248, [13:13] +unusedBit_7_14 = bits, U32, 1248, [14:14] +unusedBit_7_15 = bits, U32, 1248, [15:15] +unusedBit_7_16 = bits, U32, 1248, [16:16] +unusedBit_7_17 = bits, U32, 1248, [17:17] +unusedBit_7_18 = bits, U32, 1248, [18:18] +unusedBit_7_19 = bits, U32, 1248, [19:19] +unusedBit_7_20 = bits, U32, 1248, [20:20] +unusedBit_7_21 = bits, U32, 1248, [21:21] +unusedBit_7_22 = bits, U32, 1248, [22:22] +unusedBit_7_23 = bits, U32, 1248, [23:23] +unusedBit_7_24 = bits, U32, 1248, [24:24] +unusedBit_7_25 = bits, U32, 1248, [25:25] +unusedBit_7_26 = bits, U32, 1248, [26:26] +unusedBit_7_27 = bits, U32, 1248, [27:27] +unusedBit_7_28 = bits, U32, 1248, [28:28] +unusedBit_7_29 = bits, U32, 1248, [29:29] +unusedBit_7_30 = bits, U32, 1248, [30:30] +unusedBit_7_31 = bits, U32, 1248, [31:31] +; total TS size = 1252 +faultCode = scalar, U08, 1252, "", 1, 0 +heaterDuty = scalar, U08, 1253, "%", 1, 0 +pumpDuty = scalar, U08, 1254, "%", 1, 0 +tempC = scalar, U16, 1256, "C", 1, 0 +nernstVoltage = scalar, U16, 1258, "V", 0.001, 0 +esr = scalar, U16, 1260, "", 1, 0 +; total TS size = 1264 time = { timeNow } @@ -4993,6 +4994,7 @@ entry = mapVvt_MAP_AT_DIFF, "mapVvt_MAP_AT_DIFF", float, "%.3f" entry = mapVvt_MAP_AT_CYCLE_COUNT, "mapVvt_MAP_AT_CYCLE_COUNT", int, "%d" entry = mapVvt_map_peak, "mapVvt_map_peak", int, "%d" entry = currentEngineDecodedPhase, "Engine Phase", float, "%.3f" +entry = triggerToothAngleError, "triggerToothAngleError", float, "%.3f" entry = crankSynchronizationCounter, "Crank sync counter", int, "%d" entry = vvtSyncGapRatio, "vvtSyncGapRatio", float, "%.3f" entry = vvtCurrentPosition, "vvtCurrentPosition", float, "%.3f" @@ -5777,6 +5779,8 @@ dialog = trigger_centralDialog, "trigger_central" graphLine = mapVvt_MAP_AT_CYCLE_COUNT graphLine = mapVvt_map_peak graphLine = currentEngineDecodedPhase + liveGraph = trigger_central_4_Graph, "Graph", South + graphLine = triggerToothAngleError dialog = trigger_stateDialog, "trigger_state" diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_469.ini b/firmware/tunerstudio/generated/rusefi_prometheus_469.ini index 715ab55ea9..0b47eff7cf 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.09.24.prometheus_469.2793303623" + signature = "rusEFI 2022.09.24.prometheus_469.2702420574" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.09.24.prometheus_469.2793303623" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.09.24.prometheus_469.2702420574" ; 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 Fri Sep 23 23:16:28 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Sep 24 04:29:03 UTC 2022 pageSize = 22048 page = 1 @@ -2140,7 +2140,7 @@ ignBlends4_blendValues = array, U08, 22038, [8], "%", 0.5, 0, 0, 100, 1 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1260 + ochBlockSize = 1264 ; ; see TunerStudioOutputChannels struct @@ -3141,146 +3141,147 @@ mapVvt_MAP_AT_DIFF = scalar, F32, 1116, "", 1, 0 mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1120, "", 1, 0 mapVvt_map_peak = scalar, U08, 1121, "", 1, 0 currentEngineDecodedPhase = scalar, F32, 1124, "deg", 1, 0 -; total TS size = 1128 -crankSynchronizationCounter = scalar, U32, 1128, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1132, "", 1, 0 -vvtCurrentPosition = scalar, F32, 1136, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1140, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 1144, "", 1, 0 -triggerStateIndex = scalar, U08, 1148, "", 1, 0 -vvtCounter = scalar, U08, 1149, "", 1, 0 -camResyncCounter = scalar, U08, 1150, "", 1, 0 -vvtStateIndex = scalar, U08, 1151, "", 1, 0 -; total TS size = 1152 -m_hasSynchronizedPhase = bits, U32, 1152, [0:0] -unusedBit_1_1 = bits, U32, 1152, [1:1] -unusedBit_1_2 = bits, U32, 1152, [2:2] -unusedBit_1_3 = bits, U32, 1152, [3:3] -unusedBit_1_4 = bits, U32, 1152, [4:4] -unusedBit_1_5 = bits, U32, 1152, [5:5] -unusedBit_1_6 = bits, U32, 1152, [6:6] -unusedBit_1_7 = bits, U32, 1152, [7:7] -unusedBit_1_8 = bits, U32, 1152, [8:8] -unusedBit_1_9 = bits, U32, 1152, [9:9] -unusedBit_1_10 = bits, U32, 1152, [10:10] -unusedBit_1_11 = bits, U32, 1152, [11:11] -unusedBit_1_12 = bits, U32, 1152, [12:12] -unusedBit_1_13 = bits, U32, 1152, [13:13] -unusedBit_1_14 = bits, U32, 1152, [14:14] -unusedBit_1_15 = bits, U32, 1152, [15:15] -unusedBit_1_16 = bits, U32, 1152, [16:16] -unusedBit_1_17 = bits, U32, 1152, [17:17] -unusedBit_1_18 = bits, U32, 1152, [18:18] -unusedBit_1_19 = bits, U32, 1152, [19:19] -unusedBit_1_20 = bits, U32, 1152, [20:20] -unusedBit_1_21 = bits, U32, 1152, [21:21] -unusedBit_1_22 = bits, U32, 1152, [22:22] -unusedBit_1_23 = bits, U32, 1152, [23:23] -unusedBit_1_24 = bits, U32, 1152, [24:24] -unusedBit_1_25 = bits, U32, 1152, [25:25] -unusedBit_1_26 = bits, U32, 1152, [26:26] -unusedBit_1_27 = bits, U32, 1152, [27:27] -unusedBit_1_28 = bits, U32, 1152, [28:28] -unusedBit_1_29 = bits, U32, 1152, [29:29] -unusedBit_1_30 = bits, U32, 1152, [30:30] -unusedBit_1_31 = bits, U32, 1152, [31:31] +triggerToothAngleError = scalar, F32, 1128, "deg", 1, 0 +; total TS size = 1132 +crankSynchronizationCounter = scalar, U32, 1132, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1136, "", 1, 0 +vvtCurrentPosition = scalar, F32, 1140, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1144, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 1148, "", 1, 0 +triggerStateIndex = scalar, U08, 1152, "", 1, 0 +vvtCounter = scalar, U08, 1153, "", 1, 0 +camResyncCounter = scalar, U08, 1154, "", 1, 0 +vvtStateIndex = scalar, U08, 1155, "", 1, 0 ; total TS size = 1156 -wallFuelCorrection = scalar, F32, 1156, "", 1, 0 -wallFuel = scalar, F32, 1160, "", 1, 0 -; total TS size = 1164 -idleState = bits, S32, 1164, [0:2], "not important" -currentIdlePosition = scalar, F32, 1168 -baseIdlePosition = scalar, F32, 1172 -iacByTpsTaper = scalar, F32, 1176 -throttlePedalUpState = scalar, S32, 1180, "", 1, 0 -mightResetPid = bits, U32, 1184, [0:0] -shouldResetPid = bits, U32, 1184, [1:1] -wasResetPid = bits, U32, 1184, [2:2] -mustResetPid = bits, U32, 1184, [3:3] -isCranking = bits, U32, 1184, [4:4] -useIacTableForCoasting = bits, U32, 1184, [5:5] -notIdling = bits, U32, 1184, [6:6] -needReset = bits, U32, 1184, [7:7] -isInDeadZone = bits, U32, 1184, [8:8] -isBlipping = bits, U32, 1184, [9:9] -useClosedLoop = bits, U32, 1184, [10:10] -badTps = bits, U32, 1184, [11:11] -looksLikeRunning = bits, U32, 1184, [12:12] -looksLikeCoasting = bits, U32, 1184, [13:13] -looksLikeCrankToIdle = bits, U32, 1184, [14:14] -isVerboseIAC = bits, U32, 1184, [15:15] -isIdleCoasting = bits, U32, 1184, [16:16] -unusedBit_22_17 = bits, U32, 1184, [17:17] -unusedBit_22_18 = bits, U32, 1184, [18:18] -unusedBit_22_19 = bits, U32, 1184, [19:19] -unusedBit_22_20 = bits, U32, 1184, [20:20] -unusedBit_22_21 = bits, U32, 1184, [21:21] -unusedBit_22_22 = bits, U32, 1184, [22:22] -unusedBit_22_23 = bits, U32, 1184, [23:23] -unusedBit_22_24 = bits, U32, 1184, [24:24] -unusedBit_22_25 = bits, U32, 1184, [25:25] -unusedBit_22_26 = bits, U32, 1184, [26:26] -unusedBit_22_27 = bits, U32, 1184, [27:27] -unusedBit_22_28 = bits, U32, 1184, [28:28] -unusedBit_22_29 = bits, U32, 1184, [29:29] -unusedBit_22_30 = bits, U32, 1184, [30:30] -unusedBit_22_31 = bits, U32, 1184, [31:31] -targetRpmByClt = scalar, S32, 1188, "", 1, 0 -targetRpmAcBump = scalar, S32, 1192, "", 1, 0 -iacByRpmTaper = scalar, F32, 1196 -luaAdd = scalar, F32, 1200 -; total TS size = 1204 -baseDwell = scalar, F32, 1204, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 1208, "", 1, 0 -luaTimingAdd = scalar, F32, 1212, "", 1, 0 -luaTimingMult = scalar, F32, 1216, "", 1, 0 -; total TS size = 1220 -idlePosition = scalar, F32, 1220, "", 1, 0 -trim = scalar, F32, 1224, "", 1, 0 -luaAdjustment = scalar, F32, 1228, "", 1, 0 -etbFeedForward = scalar, F32, 1232 -etbIntegralError = scalar, F32, 1236, "", 1, 0 -etbCurrentTarget = scalar, F32, 1240, "%", 1, 0 -etbRevLimitActive = bits, U32, 1244, [0:0] -unusedBit_7_1 = bits, U32, 1244, [1:1] -unusedBit_7_2 = bits, U32, 1244, [2:2] -unusedBit_7_3 = bits, U32, 1244, [3:3] -unusedBit_7_4 = bits, U32, 1244, [4:4] -unusedBit_7_5 = bits, U32, 1244, [5:5] -unusedBit_7_6 = bits, U32, 1244, [6:6] -unusedBit_7_7 = bits, U32, 1244, [7:7] -unusedBit_7_8 = bits, U32, 1244, [8:8] -unusedBit_7_9 = bits, U32, 1244, [9:9] -unusedBit_7_10 = bits, U32, 1244, [10:10] -unusedBit_7_11 = bits, U32, 1244, [11:11] -unusedBit_7_12 = bits, U32, 1244, [12:12] -unusedBit_7_13 = bits, U32, 1244, [13:13] -unusedBit_7_14 = bits, U32, 1244, [14:14] -unusedBit_7_15 = bits, U32, 1244, [15:15] -unusedBit_7_16 = bits, U32, 1244, [16:16] -unusedBit_7_17 = bits, U32, 1244, [17:17] -unusedBit_7_18 = bits, U32, 1244, [18:18] -unusedBit_7_19 = bits, U32, 1244, [19:19] -unusedBit_7_20 = bits, U32, 1244, [20:20] -unusedBit_7_21 = bits, U32, 1244, [21:21] -unusedBit_7_22 = bits, U32, 1244, [22:22] -unusedBit_7_23 = bits, U32, 1244, [23:23] -unusedBit_7_24 = bits, U32, 1244, [24:24] -unusedBit_7_25 = bits, U32, 1244, [25:25] -unusedBit_7_26 = bits, U32, 1244, [26:26] -unusedBit_7_27 = bits, U32, 1244, [27:27] -unusedBit_7_28 = bits, U32, 1244, [28:28] -unusedBit_7_29 = bits, U32, 1244, [29:29] -unusedBit_7_30 = bits, U32, 1244, [30:30] -unusedBit_7_31 = bits, U32, 1244, [31:31] -; total TS size = 1248 -faultCode = scalar, U08, 1248, "", 1, 0 -heaterDuty = scalar, U08, 1249, "%", 1, 0 -pumpDuty = scalar, U08, 1250, "%", 1, 0 -tempC = scalar, U16, 1252, "C", 1, 0 -nernstVoltage = scalar, U16, 1254, "V", 0.001, 0 -esr = scalar, U16, 1256, "", 1, 0 -; total TS size = 1260 +m_hasSynchronizedPhase = bits, U32, 1156, [0:0] +unusedBit_1_1 = bits, U32, 1156, [1:1] +unusedBit_1_2 = bits, U32, 1156, [2:2] +unusedBit_1_3 = bits, U32, 1156, [3:3] +unusedBit_1_4 = bits, U32, 1156, [4:4] +unusedBit_1_5 = bits, U32, 1156, [5:5] +unusedBit_1_6 = bits, U32, 1156, [6:6] +unusedBit_1_7 = bits, U32, 1156, [7:7] +unusedBit_1_8 = bits, U32, 1156, [8:8] +unusedBit_1_9 = bits, U32, 1156, [9:9] +unusedBit_1_10 = bits, U32, 1156, [10:10] +unusedBit_1_11 = bits, U32, 1156, [11:11] +unusedBit_1_12 = bits, U32, 1156, [12:12] +unusedBit_1_13 = bits, U32, 1156, [13:13] +unusedBit_1_14 = bits, U32, 1156, [14:14] +unusedBit_1_15 = bits, U32, 1156, [15:15] +unusedBit_1_16 = bits, U32, 1156, [16:16] +unusedBit_1_17 = bits, U32, 1156, [17:17] +unusedBit_1_18 = bits, U32, 1156, [18:18] +unusedBit_1_19 = bits, U32, 1156, [19:19] +unusedBit_1_20 = bits, U32, 1156, [20:20] +unusedBit_1_21 = bits, U32, 1156, [21:21] +unusedBit_1_22 = bits, U32, 1156, [22:22] +unusedBit_1_23 = bits, U32, 1156, [23:23] +unusedBit_1_24 = bits, U32, 1156, [24:24] +unusedBit_1_25 = bits, U32, 1156, [25:25] +unusedBit_1_26 = bits, U32, 1156, [26:26] +unusedBit_1_27 = bits, U32, 1156, [27:27] +unusedBit_1_28 = bits, U32, 1156, [28:28] +unusedBit_1_29 = bits, U32, 1156, [29:29] +unusedBit_1_30 = bits, U32, 1156, [30:30] +unusedBit_1_31 = bits, U32, 1156, [31:31] +; total TS size = 1160 +wallFuelCorrection = scalar, F32, 1160, "", 1, 0 +wallFuel = scalar, F32, 1164, "", 1, 0 +; total TS size = 1168 +idleState = bits, S32, 1168, [0:2], "not important" +currentIdlePosition = scalar, F32, 1172 +baseIdlePosition = scalar, F32, 1176 +iacByTpsTaper = scalar, F32, 1180 +throttlePedalUpState = scalar, S32, 1184, "", 1, 0 +mightResetPid = bits, U32, 1188, [0:0] +shouldResetPid = bits, U32, 1188, [1:1] +wasResetPid = bits, U32, 1188, [2:2] +mustResetPid = bits, U32, 1188, [3:3] +isCranking = bits, U32, 1188, [4:4] +useIacTableForCoasting = bits, U32, 1188, [5:5] +notIdling = bits, U32, 1188, [6:6] +needReset = bits, U32, 1188, [7:7] +isInDeadZone = bits, U32, 1188, [8:8] +isBlipping = bits, U32, 1188, [9:9] +useClosedLoop = bits, U32, 1188, [10:10] +badTps = bits, U32, 1188, [11:11] +looksLikeRunning = bits, U32, 1188, [12:12] +looksLikeCoasting = bits, U32, 1188, [13:13] +looksLikeCrankToIdle = bits, U32, 1188, [14:14] +isVerboseIAC = bits, U32, 1188, [15:15] +isIdleCoasting = bits, U32, 1188, [16:16] +unusedBit_22_17 = bits, U32, 1188, [17:17] +unusedBit_22_18 = bits, U32, 1188, [18:18] +unusedBit_22_19 = bits, U32, 1188, [19:19] +unusedBit_22_20 = bits, U32, 1188, [20:20] +unusedBit_22_21 = bits, U32, 1188, [21:21] +unusedBit_22_22 = bits, U32, 1188, [22:22] +unusedBit_22_23 = bits, U32, 1188, [23:23] +unusedBit_22_24 = bits, U32, 1188, [24:24] +unusedBit_22_25 = bits, U32, 1188, [25:25] +unusedBit_22_26 = bits, U32, 1188, [26:26] +unusedBit_22_27 = bits, U32, 1188, [27:27] +unusedBit_22_28 = bits, U32, 1188, [28:28] +unusedBit_22_29 = bits, U32, 1188, [29:29] +unusedBit_22_30 = bits, U32, 1188, [30:30] +unusedBit_22_31 = bits, U32, 1188, [31:31] +targetRpmByClt = scalar, S32, 1192, "", 1, 0 +targetRpmAcBump = scalar, S32, 1196, "", 1, 0 +iacByRpmTaper = scalar, F32, 1200 +luaAdd = scalar, F32, 1204 +; total TS size = 1208 +baseDwell = scalar, F32, 1208, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 1212, "", 1, 0 +luaTimingAdd = scalar, F32, 1216, "", 1, 0 +luaTimingMult = scalar, F32, 1220, "", 1, 0 +; total TS size = 1224 +idlePosition = scalar, F32, 1224, "", 1, 0 +trim = scalar, F32, 1228, "", 1, 0 +luaAdjustment = scalar, F32, 1232, "", 1, 0 +etbFeedForward = scalar, F32, 1236 +etbIntegralError = scalar, F32, 1240, "", 1, 0 +etbCurrentTarget = scalar, F32, 1244, "%", 1, 0 +etbRevLimitActive = bits, U32, 1248, [0:0] +unusedBit_7_1 = bits, U32, 1248, [1:1] +unusedBit_7_2 = bits, U32, 1248, [2:2] +unusedBit_7_3 = bits, U32, 1248, [3:3] +unusedBit_7_4 = bits, U32, 1248, [4:4] +unusedBit_7_5 = bits, U32, 1248, [5:5] +unusedBit_7_6 = bits, U32, 1248, [6:6] +unusedBit_7_7 = bits, U32, 1248, [7:7] +unusedBit_7_8 = bits, U32, 1248, [8:8] +unusedBit_7_9 = bits, U32, 1248, [9:9] +unusedBit_7_10 = bits, U32, 1248, [10:10] +unusedBit_7_11 = bits, U32, 1248, [11:11] +unusedBit_7_12 = bits, U32, 1248, [12:12] +unusedBit_7_13 = bits, U32, 1248, [13:13] +unusedBit_7_14 = bits, U32, 1248, [14:14] +unusedBit_7_15 = bits, U32, 1248, [15:15] +unusedBit_7_16 = bits, U32, 1248, [16:16] +unusedBit_7_17 = bits, U32, 1248, [17:17] +unusedBit_7_18 = bits, U32, 1248, [18:18] +unusedBit_7_19 = bits, U32, 1248, [19:19] +unusedBit_7_20 = bits, U32, 1248, [20:20] +unusedBit_7_21 = bits, U32, 1248, [21:21] +unusedBit_7_22 = bits, U32, 1248, [22:22] +unusedBit_7_23 = bits, U32, 1248, [23:23] +unusedBit_7_24 = bits, U32, 1248, [24:24] +unusedBit_7_25 = bits, U32, 1248, [25:25] +unusedBit_7_26 = bits, U32, 1248, [26:26] +unusedBit_7_27 = bits, U32, 1248, [27:27] +unusedBit_7_28 = bits, U32, 1248, [28:28] +unusedBit_7_29 = bits, U32, 1248, [29:29] +unusedBit_7_30 = bits, U32, 1248, [30:30] +unusedBit_7_31 = bits, U32, 1248, [31:31] +; total TS size = 1252 +faultCode = scalar, U08, 1252, "", 1, 0 +heaterDuty = scalar, U08, 1253, "%", 1, 0 +pumpDuty = scalar, U08, 1254, "%", 1, 0 +tempC = scalar, U16, 1256, "C", 1, 0 +nernstVoltage = scalar, U16, 1258, "V", 0.001, 0 +esr = scalar, U16, 1260, "", 1, 0 +; total TS size = 1264 time = { timeNow } @@ -4993,6 +4994,7 @@ entry = mapVvt_MAP_AT_DIFF, "mapVvt_MAP_AT_DIFF", float, "%.3f" entry = mapVvt_MAP_AT_CYCLE_COUNT, "mapVvt_MAP_AT_CYCLE_COUNT", int, "%d" entry = mapVvt_map_peak, "mapVvt_map_peak", int, "%d" entry = currentEngineDecodedPhase, "Engine Phase", float, "%.3f" +entry = triggerToothAngleError, "triggerToothAngleError", float, "%.3f" entry = crankSynchronizationCounter, "Crank sync counter", int, "%d" entry = vvtSyncGapRatio, "vvtSyncGapRatio", float, "%.3f" entry = vvtCurrentPosition, "vvtCurrentPosition", float, "%.3f" @@ -5777,6 +5779,8 @@ dialog = trigger_centralDialog, "trigger_central" graphLine = mapVvt_MAP_AT_CYCLE_COUNT graphLine = mapVvt_map_peak graphLine = currentEngineDecodedPhase + liveGraph = trigger_central_4_Graph, "Graph", South + graphLine = triggerToothAngleError dialog = trigger_stateDialog, "trigger_state" diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f4.ini b/firmware/tunerstudio/generated/rusefi_proteus_f4.ini index ec78b7a3d5..eb3b660bb3 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.09.24.proteus_f4.1398370519" + signature = "rusEFI 2022.09.24.proteus_f4.1412740302" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.09.24.proteus_f4.1398370519" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.09.24.proteus_f4.1412740302" ; 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 Fri Sep 23 23:16:33 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Sep 24 04:29:08 UTC 2022 pageSize = 22048 page = 1 @@ -2140,7 +2140,7 @@ ignBlends4_blendValues = array, U08, 22038, [8], "%", 0.5, 0, 0, 100, 1 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1260 + ochBlockSize = 1264 ; ; see TunerStudioOutputChannels struct @@ -3141,146 +3141,147 @@ mapVvt_MAP_AT_DIFF = scalar, F32, 1116, "", 1, 0 mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1120, "", 1, 0 mapVvt_map_peak = scalar, U08, 1121, "", 1, 0 currentEngineDecodedPhase = scalar, F32, 1124, "deg", 1, 0 -; total TS size = 1128 -crankSynchronizationCounter = scalar, U32, 1128, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1132, "", 1, 0 -vvtCurrentPosition = scalar, F32, 1136, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1140, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 1144, "", 1, 0 -triggerStateIndex = scalar, U08, 1148, "", 1, 0 -vvtCounter = scalar, U08, 1149, "", 1, 0 -camResyncCounter = scalar, U08, 1150, "", 1, 0 -vvtStateIndex = scalar, U08, 1151, "", 1, 0 -; total TS size = 1152 -m_hasSynchronizedPhase = bits, U32, 1152, [0:0] -unusedBit_1_1 = bits, U32, 1152, [1:1] -unusedBit_1_2 = bits, U32, 1152, [2:2] -unusedBit_1_3 = bits, U32, 1152, [3:3] -unusedBit_1_4 = bits, U32, 1152, [4:4] -unusedBit_1_5 = bits, U32, 1152, [5:5] -unusedBit_1_6 = bits, U32, 1152, [6:6] -unusedBit_1_7 = bits, U32, 1152, [7:7] -unusedBit_1_8 = bits, U32, 1152, [8:8] -unusedBit_1_9 = bits, U32, 1152, [9:9] -unusedBit_1_10 = bits, U32, 1152, [10:10] -unusedBit_1_11 = bits, U32, 1152, [11:11] -unusedBit_1_12 = bits, U32, 1152, [12:12] -unusedBit_1_13 = bits, U32, 1152, [13:13] -unusedBit_1_14 = bits, U32, 1152, [14:14] -unusedBit_1_15 = bits, U32, 1152, [15:15] -unusedBit_1_16 = bits, U32, 1152, [16:16] -unusedBit_1_17 = bits, U32, 1152, [17:17] -unusedBit_1_18 = bits, U32, 1152, [18:18] -unusedBit_1_19 = bits, U32, 1152, [19:19] -unusedBit_1_20 = bits, U32, 1152, [20:20] -unusedBit_1_21 = bits, U32, 1152, [21:21] -unusedBit_1_22 = bits, U32, 1152, [22:22] -unusedBit_1_23 = bits, U32, 1152, [23:23] -unusedBit_1_24 = bits, U32, 1152, [24:24] -unusedBit_1_25 = bits, U32, 1152, [25:25] -unusedBit_1_26 = bits, U32, 1152, [26:26] -unusedBit_1_27 = bits, U32, 1152, [27:27] -unusedBit_1_28 = bits, U32, 1152, [28:28] -unusedBit_1_29 = bits, U32, 1152, [29:29] -unusedBit_1_30 = bits, U32, 1152, [30:30] -unusedBit_1_31 = bits, U32, 1152, [31:31] +triggerToothAngleError = scalar, F32, 1128, "deg", 1, 0 +; total TS size = 1132 +crankSynchronizationCounter = scalar, U32, 1132, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1136, "", 1, 0 +vvtCurrentPosition = scalar, F32, 1140, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1144, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 1148, "", 1, 0 +triggerStateIndex = scalar, U08, 1152, "", 1, 0 +vvtCounter = scalar, U08, 1153, "", 1, 0 +camResyncCounter = scalar, U08, 1154, "", 1, 0 +vvtStateIndex = scalar, U08, 1155, "", 1, 0 ; total TS size = 1156 -wallFuelCorrection = scalar, F32, 1156, "", 1, 0 -wallFuel = scalar, F32, 1160, "", 1, 0 -; total TS size = 1164 -idleState = bits, S32, 1164, [0:2], "not important" -currentIdlePosition = scalar, F32, 1168 -baseIdlePosition = scalar, F32, 1172 -iacByTpsTaper = scalar, F32, 1176 -throttlePedalUpState = scalar, S32, 1180, "", 1, 0 -mightResetPid = bits, U32, 1184, [0:0] -shouldResetPid = bits, U32, 1184, [1:1] -wasResetPid = bits, U32, 1184, [2:2] -mustResetPid = bits, U32, 1184, [3:3] -isCranking = bits, U32, 1184, [4:4] -useIacTableForCoasting = bits, U32, 1184, [5:5] -notIdling = bits, U32, 1184, [6:6] -needReset = bits, U32, 1184, [7:7] -isInDeadZone = bits, U32, 1184, [8:8] -isBlipping = bits, U32, 1184, [9:9] -useClosedLoop = bits, U32, 1184, [10:10] -badTps = bits, U32, 1184, [11:11] -looksLikeRunning = bits, U32, 1184, [12:12] -looksLikeCoasting = bits, U32, 1184, [13:13] -looksLikeCrankToIdle = bits, U32, 1184, [14:14] -isVerboseIAC = bits, U32, 1184, [15:15] -isIdleCoasting = bits, U32, 1184, [16:16] -unusedBit_22_17 = bits, U32, 1184, [17:17] -unusedBit_22_18 = bits, U32, 1184, [18:18] -unusedBit_22_19 = bits, U32, 1184, [19:19] -unusedBit_22_20 = bits, U32, 1184, [20:20] -unusedBit_22_21 = bits, U32, 1184, [21:21] -unusedBit_22_22 = bits, U32, 1184, [22:22] -unusedBit_22_23 = bits, U32, 1184, [23:23] -unusedBit_22_24 = bits, U32, 1184, [24:24] -unusedBit_22_25 = bits, U32, 1184, [25:25] -unusedBit_22_26 = bits, U32, 1184, [26:26] -unusedBit_22_27 = bits, U32, 1184, [27:27] -unusedBit_22_28 = bits, U32, 1184, [28:28] -unusedBit_22_29 = bits, U32, 1184, [29:29] -unusedBit_22_30 = bits, U32, 1184, [30:30] -unusedBit_22_31 = bits, U32, 1184, [31:31] -targetRpmByClt = scalar, S32, 1188, "", 1, 0 -targetRpmAcBump = scalar, S32, 1192, "", 1, 0 -iacByRpmTaper = scalar, F32, 1196 -luaAdd = scalar, F32, 1200 -; total TS size = 1204 -baseDwell = scalar, F32, 1204, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 1208, "", 1, 0 -luaTimingAdd = scalar, F32, 1212, "", 1, 0 -luaTimingMult = scalar, F32, 1216, "", 1, 0 -; total TS size = 1220 -idlePosition = scalar, F32, 1220, "", 1, 0 -trim = scalar, F32, 1224, "", 1, 0 -luaAdjustment = scalar, F32, 1228, "", 1, 0 -etbFeedForward = scalar, F32, 1232 -etbIntegralError = scalar, F32, 1236, "", 1, 0 -etbCurrentTarget = scalar, F32, 1240, "%", 1, 0 -etbRevLimitActive = bits, U32, 1244, [0:0] -unusedBit_7_1 = bits, U32, 1244, [1:1] -unusedBit_7_2 = bits, U32, 1244, [2:2] -unusedBit_7_3 = bits, U32, 1244, [3:3] -unusedBit_7_4 = bits, U32, 1244, [4:4] -unusedBit_7_5 = bits, U32, 1244, [5:5] -unusedBit_7_6 = bits, U32, 1244, [6:6] -unusedBit_7_7 = bits, U32, 1244, [7:7] -unusedBit_7_8 = bits, U32, 1244, [8:8] -unusedBit_7_9 = bits, U32, 1244, [9:9] -unusedBit_7_10 = bits, U32, 1244, [10:10] -unusedBit_7_11 = bits, U32, 1244, [11:11] -unusedBit_7_12 = bits, U32, 1244, [12:12] -unusedBit_7_13 = bits, U32, 1244, [13:13] -unusedBit_7_14 = bits, U32, 1244, [14:14] -unusedBit_7_15 = bits, U32, 1244, [15:15] -unusedBit_7_16 = bits, U32, 1244, [16:16] -unusedBit_7_17 = bits, U32, 1244, [17:17] -unusedBit_7_18 = bits, U32, 1244, [18:18] -unusedBit_7_19 = bits, U32, 1244, [19:19] -unusedBit_7_20 = bits, U32, 1244, [20:20] -unusedBit_7_21 = bits, U32, 1244, [21:21] -unusedBit_7_22 = bits, U32, 1244, [22:22] -unusedBit_7_23 = bits, U32, 1244, [23:23] -unusedBit_7_24 = bits, U32, 1244, [24:24] -unusedBit_7_25 = bits, U32, 1244, [25:25] -unusedBit_7_26 = bits, U32, 1244, [26:26] -unusedBit_7_27 = bits, U32, 1244, [27:27] -unusedBit_7_28 = bits, U32, 1244, [28:28] -unusedBit_7_29 = bits, U32, 1244, [29:29] -unusedBit_7_30 = bits, U32, 1244, [30:30] -unusedBit_7_31 = bits, U32, 1244, [31:31] -; total TS size = 1248 -faultCode = scalar, U08, 1248, "", 1, 0 -heaterDuty = scalar, U08, 1249, "%", 1, 0 -pumpDuty = scalar, U08, 1250, "%", 1, 0 -tempC = scalar, U16, 1252, "C", 1, 0 -nernstVoltage = scalar, U16, 1254, "V", 0.001, 0 -esr = scalar, U16, 1256, "", 1, 0 -; total TS size = 1260 +m_hasSynchronizedPhase = bits, U32, 1156, [0:0] +unusedBit_1_1 = bits, U32, 1156, [1:1] +unusedBit_1_2 = bits, U32, 1156, [2:2] +unusedBit_1_3 = bits, U32, 1156, [3:3] +unusedBit_1_4 = bits, U32, 1156, [4:4] +unusedBit_1_5 = bits, U32, 1156, [5:5] +unusedBit_1_6 = bits, U32, 1156, [6:6] +unusedBit_1_7 = bits, U32, 1156, [7:7] +unusedBit_1_8 = bits, U32, 1156, [8:8] +unusedBit_1_9 = bits, U32, 1156, [9:9] +unusedBit_1_10 = bits, U32, 1156, [10:10] +unusedBit_1_11 = bits, U32, 1156, [11:11] +unusedBit_1_12 = bits, U32, 1156, [12:12] +unusedBit_1_13 = bits, U32, 1156, [13:13] +unusedBit_1_14 = bits, U32, 1156, [14:14] +unusedBit_1_15 = bits, U32, 1156, [15:15] +unusedBit_1_16 = bits, U32, 1156, [16:16] +unusedBit_1_17 = bits, U32, 1156, [17:17] +unusedBit_1_18 = bits, U32, 1156, [18:18] +unusedBit_1_19 = bits, U32, 1156, [19:19] +unusedBit_1_20 = bits, U32, 1156, [20:20] +unusedBit_1_21 = bits, U32, 1156, [21:21] +unusedBit_1_22 = bits, U32, 1156, [22:22] +unusedBit_1_23 = bits, U32, 1156, [23:23] +unusedBit_1_24 = bits, U32, 1156, [24:24] +unusedBit_1_25 = bits, U32, 1156, [25:25] +unusedBit_1_26 = bits, U32, 1156, [26:26] +unusedBit_1_27 = bits, U32, 1156, [27:27] +unusedBit_1_28 = bits, U32, 1156, [28:28] +unusedBit_1_29 = bits, U32, 1156, [29:29] +unusedBit_1_30 = bits, U32, 1156, [30:30] +unusedBit_1_31 = bits, U32, 1156, [31:31] +; total TS size = 1160 +wallFuelCorrection = scalar, F32, 1160, "", 1, 0 +wallFuel = scalar, F32, 1164, "", 1, 0 +; total TS size = 1168 +idleState = bits, S32, 1168, [0:2], "not important" +currentIdlePosition = scalar, F32, 1172 +baseIdlePosition = scalar, F32, 1176 +iacByTpsTaper = scalar, F32, 1180 +throttlePedalUpState = scalar, S32, 1184, "", 1, 0 +mightResetPid = bits, U32, 1188, [0:0] +shouldResetPid = bits, U32, 1188, [1:1] +wasResetPid = bits, U32, 1188, [2:2] +mustResetPid = bits, U32, 1188, [3:3] +isCranking = bits, U32, 1188, [4:4] +useIacTableForCoasting = bits, U32, 1188, [5:5] +notIdling = bits, U32, 1188, [6:6] +needReset = bits, U32, 1188, [7:7] +isInDeadZone = bits, U32, 1188, [8:8] +isBlipping = bits, U32, 1188, [9:9] +useClosedLoop = bits, U32, 1188, [10:10] +badTps = bits, U32, 1188, [11:11] +looksLikeRunning = bits, U32, 1188, [12:12] +looksLikeCoasting = bits, U32, 1188, [13:13] +looksLikeCrankToIdle = bits, U32, 1188, [14:14] +isVerboseIAC = bits, U32, 1188, [15:15] +isIdleCoasting = bits, U32, 1188, [16:16] +unusedBit_22_17 = bits, U32, 1188, [17:17] +unusedBit_22_18 = bits, U32, 1188, [18:18] +unusedBit_22_19 = bits, U32, 1188, [19:19] +unusedBit_22_20 = bits, U32, 1188, [20:20] +unusedBit_22_21 = bits, U32, 1188, [21:21] +unusedBit_22_22 = bits, U32, 1188, [22:22] +unusedBit_22_23 = bits, U32, 1188, [23:23] +unusedBit_22_24 = bits, U32, 1188, [24:24] +unusedBit_22_25 = bits, U32, 1188, [25:25] +unusedBit_22_26 = bits, U32, 1188, [26:26] +unusedBit_22_27 = bits, U32, 1188, [27:27] +unusedBit_22_28 = bits, U32, 1188, [28:28] +unusedBit_22_29 = bits, U32, 1188, [29:29] +unusedBit_22_30 = bits, U32, 1188, [30:30] +unusedBit_22_31 = bits, U32, 1188, [31:31] +targetRpmByClt = scalar, S32, 1192, "", 1, 0 +targetRpmAcBump = scalar, S32, 1196, "", 1, 0 +iacByRpmTaper = scalar, F32, 1200 +luaAdd = scalar, F32, 1204 +; total TS size = 1208 +baseDwell = scalar, F32, 1208, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 1212, "", 1, 0 +luaTimingAdd = scalar, F32, 1216, "", 1, 0 +luaTimingMult = scalar, F32, 1220, "", 1, 0 +; total TS size = 1224 +idlePosition = scalar, F32, 1224, "", 1, 0 +trim = scalar, F32, 1228, "", 1, 0 +luaAdjustment = scalar, F32, 1232, "", 1, 0 +etbFeedForward = scalar, F32, 1236 +etbIntegralError = scalar, F32, 1240, "", 1, 0 +etbCurrentTarget = scalar, F32, 1244, "%", 1, 0 +etbRevLimitActive = bits, U32, 1248, [0:0] +unusedBit_7_1 = bits, U32, 1248, [1:1] +unusedBit_7_2 = bits, U32, 1248, [2:2] +unusedBit_7_3 = bits, U32, 1248, [3:3] +unusedBit_7_4 = bits, U32, 1248, [4:4] +unusedBit_7_5 = bits, U32, 1248, [5:5] +unusedBit_7_6 = bits, U32, 1248, [6:6] +unusedBit_7_7 = bits, U32, 1248, [7:7] +unusedBit_7_8 = bits, U32, 1248, [8:8] +unusedBit_7_9 = bits, U32, 1248, [9:9] +unusedBit_7_10 = bits, U32, 1248, [10:10] +unusedBit_7_11 = bits, U32, 1248, [11:11] +unusedBit_7_12 = bits, U32, 1248, [12:12] +unusedBit_7_13 = bits, U32, 1248, [13:13] +unusedBit_7_14 = bits, U32, 1248, [14:14] +unusedBit_7_15 = bits, U32, 1248, [15:15] +unusedBit_7_16 = bits, U32, 1248, [16:16] +unusedBit_7_17 = bits, U32, 1248, [17:17] +unusedBit_7_18 = bits, U32, 1248, [18:18] +unusedBit_7_19 = bits, U32, 1248, [19:19] +unusedBit_7_20 = bits, U32, 1248, [20:20] +unusedBit_7_21 = bits, U32, 1248, [21:21] +unusedBit_7_22 = bits, U32, 1248, [22:22] +unusedBit_7_23 = bits, U32, 1248, [23:23] +unusedBit_7_24 = bits, U32, 1248, [24:24] +unusedBit_7_25 = bits, U32, 1248, [25:25] +unusedBit_7_26 = bits, U32, 1248, [26:26] +unusedBit_7_27 = bits, U32, 1248, [27:27] +unusedBit_7_28 = bits, U32, 1248, [28:28] +unusedBit_7_29 = bits, U32, 1248, [29:29] +unusedBit_7_30 = bits, U32, 1248, [30:30] +unusedBit_7_31 = bits, U32, 1248, [31:31] +; total TS size = 1252 +faultCode = scalar, U08, 1252, "", 1, 0 +heaterDuty = scalar, U08, 1253, "%", 1, 0 +pumpDuty = scalar, U08, 1254, "%", 1, 0 +tempC = scalar, U16, 1256, "C", 1, 0 +nernstVoltage = scalar, U16, 1258, "V", 0.001, 0 +esr = scalar, U16, 1260, "", 1, 0 +; total TS size = 1264 time = { timeNow } @@ -4993,6 +4994,7 @@ entry = mapVvt_MAP_AT_DIFF, "mapVvt_MAP_AT_DIFF", float, "%.3f" entry = mapVvt_MAP_AT_CYCLE_COUNT, "mapVvt_MAP_AT_CYCLE_COUNT", int, "%d" entry = mapVvt_map_peak, "mapVvt_map_peak", int, "%d" entry = currentEngineDecodedPhase, "Engine Phase", float, "%.3f" +entry = triggerToothAngleError, "triggerToothAngleError", float, "%.3f" entry = crankSynchronizationCounter, "Crank sync counter", int, "%d" entry = vvtSyncGapRatio, "vvtSyncGapRatio", float, "%.3f" entry = vvtCurrentPosition, "vvtCurrentPosition", float, "%.3f" @@ -5777,6 +5779,8 @@ dialog = trigger_centralDialog, "trigger_central" graphLine = mapVvt_MAP_AT_CYCLE_COUNT graphLine = mapVvt_map_peak graphLine = currentEngineDecodedPhase + liveGraph = trigger_central_4_Graph, "Graph", South + graphLine = triggerToothAngleError dialog = trigger_stateDialog, "trigger_state" diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f7.ini b/firmware/tunerstudio/generated/rusefi_proteus_f7.ini index 90edf37522..76fc99243e 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.09.24.proteus_f7.1398370519" + signature = "rusEFI 2022.09.24.proteus_f7.1412740302" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.09.24.proteus_f7.1398370519" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.09.24.proteus_f7.1412740302" ; 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 Fri Sep 23 23:16:31 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Sep 24 04:29:06 UTC 2022 pageSize = 22048 page = 1 @@ -2140,7 +2140,7 @@ ignBlends4_blendValues = array, U08, 22038, [8], "%", 0.5, 0, 0, 100, 1 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1260 + ochBlockSize = 1264 ; ; see TunerStudioOutputChannels struct @@ -3141,146 +3141,147 @@ mapVvt_MAP_AT_DIFF = scalar, F32, 1116, "", 1, 0 mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1120, "", 1, 0 mapVvt_map_peak = scalar, U08, 1121, "", 1, 0 currentEngineDecodedPhase = scalar, F32, 1124, "deg", 1, 0 -; total TS size = 1128 -crankSynchronizationCounter = scalar, U32, 1128, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1132, "", 1, 0 -vvtCurrentPosition = scalar, F32, 1136, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1140, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 1144, "", 1, 0 -triggerStateIndex = scalar, U08, 1148, "", 1, 0 -vvtCounter = scalar, U08, 1149, "", 1, 0 -camResyncCounter = scalar, U08, 1150, "", 1, 0 -vvtStateIndex = scalar, U08, 1151, "", 1, 0 -; total TS size = 1152 -m_hasSynchronizedPhase = bits, U32, 1152, [0:0] -unusedBit_1_1 = bits, U32, 1152, [1:1] -unusedBit_1_2 = bits, U32, 1152, [2:2] -unusedBit_1_3 = bits, U32, 1152, [3:3] -unusedBit_1_4 = bits, U32, 1152, [4:4] -unusedBit_1_5 = bits, U32, 1152, [5:5] -unusedBit_1_6 = bits, U32, 1152, [6:6] -unusedBit_1_7 = bits, U32, 1152, [7:7] -unusedBit_1_8 = bits, U32, 1152, [8:8] -unusedBit_1_9 = bits, U32, 1152, [9:9] -unusedBit_1_10 = bits, U32, 1152, [10:10] -unusedBit_1_11 = bits, U32, 1152, [11:11] -unusedBit_1_12 = bits, U32, 1152, [12:12] -unusedBit_1_13 = bits, U32, 1152, [13:13] -unusedBit_1_14 = bits, U32, 1152, [14:14] -unusedBit_1_15 = bits, U32, 1152, [15:15] -unusedBit_1_16 = bits, U32, 1152, [16:16] -unusedBit_1_17 = bits, U32, 1152, [17:17] -unusedBit_1_18 = bits, U32, 1152, [18:18] -unusedBit_1_19 = bits, U32, 1152, [19:19] -unusedBit_1_20 = bits, U32, 1152, [20:20] -unusedBit_1_21 = bits, U32, 1152, [21:21] -unusedBit_1_22 = bits, U32, 1152, [22:22] -unusedBit_1_23 = bits, U32, 1152, [23:23] -unusedBit_1_24 = bits, U32, 1152, [24:24] -unusedBit_1_25 = bits, U32, 1152, [25:25] -unusedBit_1_26 = bits, U32, 1152, [26:26] -unusedBit_1_27 = bits, U32, 1152, [27:27] -unusedBit_1_28 = bits, U32, 1152, [28:28] -unusedBit_1_29 = bits, U32, 1152, [29:29] -unusedBit_1_30 = bits, U32, 1152, [30:30] -unusedBit_1_31 = bits, U32, 1152, [31:31] +triggerToothAngleError = scalar, F32, 1128, "deg", 1, 0 +; total TS size = 1132 +crankSynchronizationCounter = scalar, U32, 1132, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1136, "", 1, 0 +vvtCurrentPosition = scalar, F32, 1140, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1144, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 1148, "", 1, 0 +triggerStateIndex = scalar, U08, 1152, "", 1, 0 +vvtCounter = scalar, U08, 1153, "", 1, 0 +camResyncCounter = scalar, U08, 1154, "", 1, 0 +vvtStateIndex = scalar, U08, 1155, "", 1, 0 ; total TS size = 1156 -wallFuelCorrection = scalar, F32, 1156, "", 1, 0 -wallFuel = scalar, F32, 1160, "", 1, 0 -; total TS size = 1164 -idleState = bits, S32, 1164, [0:2], "not important" -currentIdlePosition = scalar, F32, 1168 -baseIdlePosition = scalar, F32, 1172 -iacByTpsTaper = scalar, F32, 1176 -throttlePedalUpState = scalar, S32, 1180, "", 1, 0 -mightResetPid = bits, U32, 1184, [0:0] -shouldResetPid = bits, U32, 1184, [1:1] -wasResetPid = bits, U32, 1184, [2:2] -mustResetPid = bits, U32, 1184, [3:3] -isCranking = bits, U32, 1184, [4:4] -useIacTableForCoasting = bits, U32, 1184, [5:5] -notIdling = bits, U32, 1184, [6:6] -needReset = bits, U32, 1184, [7:7] -isInDeadZone = bits, U32, 1184, [8:8] -isBlipping = bits, U32, 1184, [9:9] -useClosedLoop = bits, U32, 1184, [10:10] -badTps = bits, U32, 1184, [11:11] -looksLikeRunning = bits, U32, 1184, [12:12] -looksLikeCoasting = bits, U32, 1184, [13:13] -looksLikeCrankToIdle = bits, U32, 1184, [14:14] -isVerboseIAC = bits, U32, 1184, [15:15] -isIdleCoasting = bits, U32, 1184, [16:16] -unusedBit_22_17 = bits, U32, 1184, [17:17] -unusedBit_22_18 = bits, U32, 1184, [18:18] -unusedBit_22_19 = bits, U32, 1184, [19:19] -unusedBit_22_20 = bits, U32, 1184, [20:20] -unusedBit_22_21 = bits, U32, 1184, [21:21] -unusedBit_22_22 = bits, U32, 1184, [22:22] -unusedBit_22_23 = bits, U32, 1184, [23:23] -unusedBit_22_24 = bits, U32, 1184, [24:24] -unusedBit_22_25 = bits, U32, 1184, [25:25] -unusedBit_22_26 = bits, U32, 1184, [26:26] -unusedBit_22_27 = bits, U32, 1184, [27:27] -unusedBit_22_28 = bits, U32, 1184, [28:28] -unusedBit_22_29 = bits, U32, 1184, [29:29] -unusedBit_22_30 = bits, U32, 1184, [30:30] -unusedBit_22_31 = bits, U32, 1184, [31:31] -targetRpmByClt = scalar, S32, 1188, "", 1, 0 -targetRpmAcBump = scalar, S32, 1192, "", 1, 0 -iacByRpmTaper = scalar, F32, 1196 -luaAdd = scalar, F32, 1200 -; total TS size = 1204 -baseDwell = scalar, F32, 1204, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 1208, "", 1, 0 -luaTimingAdd = scalar, F32, 1212, "", 1, 0 -luaTimingMult = scalar, F32, 1216, "", 1, 0 -; total TS size = 1220 -idlePosition = scalar, F32, 1220, "", 1, 0 -trim = scalar, F32, 1224, "", 1, 0 -luaAdjustment = scalar, F32, 1228, "", 1, 0 -etbFeedForward = scalar, F32, 1232 -etbIntegralError = scalar, F32, 1236, "", 1, 0 -etbCurrentTarget = scalar, F32, 1240, "%", 1, 0 -etbRevLimitActive = bits, U32, 1244, [0:0] -unusedBit_7_1 = bits, U32, 1244, [1:1] -unusedBit_7_2 = bits, U32, 1244, [2:2] -unusedBit_7_3 = bits, U32, 1244, [3:3] -unusedBit_7_4 = bits, U32, 1244, [4:4] -unusedBit_7_5 = bits, U32, 1244, [5:5] -unusedBit_7_6 = bits, U32, 1244, [6:6] -unusedBit_7_7 = bits, U32, 1244, [7:7] -unusedBit_7_8 = bits, U32, 1244, [8:8] -unusedBit_7_9 = bits, U32, 1244, [9:9] -unusedBit_7_10 = bits, U32, 1244, [10:10] -unusedBit_7_11 = bits, U32, 1244, [11:11] -unusedBit_7_12 = bits, U32, 1244, [12:12] -unusedBit_7_13 = bits, U32, 1244, [13:13] -unusedBit_7_14 = bits, U32, 1244, [14:14] -unusedBit_7_15 = bits, U32, 1244, [15:15] -unusedBit_7_16 = bits, U32, 1244, [16:16] -unusedBit_7_17 = bits, U32, 1244, [17:17] -unusedBit_7_18 = bits, U32, 1244, [18:18] -unusedBit_7_19 = bits, U32, 1244, [19:19] -unusedBit_7_20 = bits, U32, 1244, [20:20] -unusedBit_7_21 = bits, U32, 1244, [21:21] -unusedBit_7_22 = bits, U32, 1244, [22:22] -unusedBit_7_23 = bits, U32, 1244, [23:23] -unusedBit_7_24 = bits, U32, 1244, [24:24] -unusedBit_7_25 = bits, U32, 1244, [25:25] -unusedBit_7_26 = bits, U32, 1244, [26:26] -unusedBit_7_27 = bits, U32, 1244, [27:27] -unusedBit_7_28 = bits, U32, 1244, [28:28] -unusedBit_7_29 = bits, U32, 1244, [29:29] -unusedBit_7_30 = bits, U32, 1244, [30:30] -unusedBit_7_31 = bits, U32, 1244, [31:31] -; total TS size = 1248 -faultCode = scalar, U08, 1248, "", 1, 0 -heaterDuty = scalar, U08, 1249, "%", 1, 0 -pumpDuty = scalar, U08, 1250, "%", 1, 0 -tempC = scalar, U16, 1252, "C", 1, 0 -nernstVoltage = scalar, U16, 1254, "V", 0.001, 0 -esr = scalar, U16, 1256, "", 1, 0 -; total TS size = 1260 +m_hasSynchronizedPhase = bits, U32, 1156, [0:0] +unusedBit_1_1 = bits, U32, 1156, [1:1] +unusedBit_1_2 = bits, U32, 1156, [2:2] +unusedBit_1_3 = bits, U32, 1156, [3:3] +unusedBit_1_4 = bits, U32, 1156, [4:4] +unusedBit_1_5 = bits, U32, 1156, [5:5] +unusedBit_1_6 = bits, U32, 1156, [6:6] +unusedBit_1_7 = bits, U32, 1156, [7:7] +unusedBit_1_8 = bits, U32, 1156, [8:8] +unusedBit_1_9 = bits, U32, 1156, [9:9] +unusedBit_1_10 = bits, U32, 1156, [10:10] +unusedBit_1_11 = bits, U32, 1156, [11:11] +unusedBit_1_12 = bits, U32, 1156, [12:12] +unusedBit_1_13 = bits, U32, 1156, [13:13] +unusedBit_1_14 = bits, U32, 1156, [14:14] +unusedBit_1_15 = bits, U32, 1156, [15:15] +unusedBit_1_16 = bits, U32, 1156, [16:16] +unusedBit_1_17 = bits, U32, 1156, [17:17] +unusedBit_1_18 = bits, U32, 1156, [18:18] +unusedBit_1_19 = bits, U32, 1156, [19:19] +unusedBit_1_20 = bits, U32, 1156, [20:20] +unusedBit_1_21 = bits, U32, 1156, [21:21] +unusedBit_1_22 = bits, U32, 1156, [22:22] +unusedBit_1_23 = bits, U32, 1156, [23:23] +unusedBit_1_24 = bits, U32, 1156, [24:24] +unusedBit_1_25 = bits, U32, 1156, [25:25] +unusedBit_1_26 = bits, U32, 1156, [26:26] +unusedBit_1_27 = bits, U32, 1156, [27:27] +unusedBit_1_28 = bits, U32, 1156, [28:28] +unusedBit_1_29 = bits, U32, 1156, [29:29] +unusedBit_1_30 = bits, U32, 1156, [30:30] +unusedBit_1_31 = bits, U32, 1156, [31:31] +; total TS size = 1160 +wallFuelCorrection = scalar, F32, 1160, "", 1, 0 +wallFuel = scalar, F32, 1164, "", 1, 0 +; total TS size = 1168 +idleState = bits, S32, 1168, [0:2], "not important" +currentIdlePosition = scalar, F32, 1172 +baseIdlePosition = scalar, F32, 1176 +iacByTpsTaper = scalar, F32, 1180 +throttlePedalUpState = scalar, S32, 1184, "", 1, 0 +mightResetPid = bits, U32, 1188, [0:0] +shouldResetPid = bits, U32, 1188, [1:1] +wasResetPid = bits, U32, 1188, [2:2] +mustResetPid = bits, U32, 1188, [3:3] +isCranking = bits, U32, 1188, [4:4] +useIacTableForCoasting = bits, U32, 1188, [5:5] +notIdling = bits, U32, 1188, [6:6] +needReset = bits, U32, 1188, [7:7] +isInDeadZone = bits, U32, 1188, [8:8] +isBlipping = bits, U32, 1188, [9:9] +useClosedLoop = bits, U32, 1188, [10:10] +badTps = bits, U32, 1188, [11:11] +looksLikeRunning = bits, U32, 1188, [12:12] +looksLikeCoasting = bits, U32, 1188, [13:13] +looksLikeCrankToIdle = bits, U32, 1188, [14:14] +isVerboseIAC = bits, U32, 1188, [15:15] +isIdleCoasting = bits, U32, 1188, [16:16] +unusedBit_22_17 = bits, U32, 1188, [17:17] +unusedBit_22_18 = bits, U32, 1188, [18:18] +unusedBit_22_19 = bits, U32, 1188, [19:19] +unusedBit_22_20 = bits, U32, 1188, [20:20] +unusedBit_22_21 = bits, U32, 1188, [21:21] +unusedBit_22_22 = bits, U32, 1188, [22:22] +unusedBit_22_23 = bits, U32, 1188, [23:23] +unusedBit_22_24 = bits, U32, 1188, [24:24] +unusedBit_22_25 = bits, U32, 1188, [25:25] +unusedBit_22_26 = bits, U32, 1188, [26:26] +unusedBit_22_27 = bits, U32, 1188, [27:27] +unusedBit_22_28 = bits, U32, 1188, [28:28] +unusedBit_22_29 = bits, U32, 1188, [29:29] +unusedBit_22_30 = bits, U32, 1188, [30:30] +unusedBit_22_31 = bits, U32, 1188, [31:31] +targetRpmByClt = scalar, S32, 1192, "", 1, 0 +targetRpmAcBump = scalar, S32, 1196, "", 1, 0 +iacByRpmTaper = scalar, F32, 1200 +luaAdd = scalar, F32, 1204 +; total TS size = 1208 +baseDwell = scalar, F32, 1208, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 1212, "", 1, 0 +luaTimingAdd = scalar, F32, 1216, "", 1, 0 +luaTimingMult = scalar, F32, 1220, "", 1, 0 +; total TS size = 1224 +idlePosition = scalar, F32, 1224, "", 1, 0 +trim = scalar, F32, 1228, "", 1, 0 +luaAdjustment = scalar, F32, 1232, "", 1, 0 +etbFeedForward = scalar, F32, 1236 +etbIntegralError = scalar, F32, 1240, "", 1, 0 +etbCurrentTarget = scalar, F32, 1244, "%", 1, 0 +etbRevLimitActive = bits, U32, 1248, [0:0] +unusedBit_7_1 = bits, U32, 1248, [1:1] +unusedBit_7_2 = bits, U32, 1248, [2:2] +unusedBit_7_3 = bits, U32, 1248, [3:3] +unusedBit_7_4 = bits, U32, 1248, [4:4] +unusedBit_7_5 = bits, U32, 1248, [5:5] +unusedBit_7_6 = bits, U32, 1248, [6:6] +unusedBit_7_7 = bits, U32, 1248, [7:7] +unusedBit_7_8 = bits, U32, 1248, [8:8] +unusedBit_7_9 = bits, U32, 1248, [9:9] +unusedBit_7_10 = bits, U32, 1248, [10:10] +unusedBit_7_11 = bits, U32, 1248, [11:11] +unusedBit_7_12 = bits, U32, 1248, [12:12] +unusedBit_7_13 = bits, U32, 1248, [13:13] +unusedBit_7_14 = bits, U32, 1248, [14:14] +unusedBit_7_15 = bits, U32, 1248, [15:15] +unusedBit_7_16 = bits, U32, 1248, [16:16] +unusedBit_7_17 = bits, U32, 1248, [17:17] +unusedBit_7_18 = bits, U32, 1248, [18:18] +unusedBit_7_19 = bits, U32, 1248, [19:19] +unusedBit_7_20 = bits, U32, 1248, [20:20] +unusedBit_7_21 = bits, U32, 1248, [21:21] +unusedBit_7_22 = bits, U32, 1248, [22:22] +unusedBit_7_23 = bits, U32, 1248, [23:23] +unusedBit_7_24 = bits, U32, 1248, [24:24] +unusedBit_7_25 = bits, U32, 1248, [25:25] +unusedBit_7_26 = bits, U32, 1248, [26:26] +unusedBit_7_27 = bits, U32, 1248, [27:27] +unusedBit_7_28 = bits, U32, 1248, [28:28] +unusedBit_7_29 = bits, U32, 1248, [29:29] +unusedBit_7_30 = bits, U32, 1248, [30:30] +unusedBit_7_31 = bits, U32, 1248, [31:31] +; total TS size = 1252 +faultCode = scalar, U08, 1252, "", 1, 0 +heaterDuty = scalar, U08, 1253, "%", 1, 0 +pumpDuty = scalar, U08, 1254, "%", 1, 0 +tempC = scalar, U16, 1256, "C", 1, 0 +nernstVoltage = scalar, U16, 1258, "V", 0.001, 0 +esr = scalar, U16, 1260, "", 1, 0 +; total TS size = 1264 time = { timeNow } @@ -4993,6 +4994,7 @@ entry = mapVvt_MAP_AT_DIFF, "mapVvt_MAP_AT_DIFF", float, "%.3f" entry = mapVvt_MAP_AT_CYCLE_COUNT, "mapVvt_MAP_AT_CYCLE_COUNT", int, "%d" entry = mapVvt_map_peak, "mapVvt_map_peak", int, "%d" entry = currentEngineDecodedPhase, "Engine Phase", float, "%.3f" +entry = triggerToothAngleError, "triggerToothAngleError", float, "%.3f" entry = crankSynchronizationCounter, "Crank sync counter", int, "%d" entry = vvtSyncGapRatio, "vvtSyncGapRatio", float, "%.3f" entry = vvtCurrentPosition, "vvtCurrentPosition", float, "%.3f" @@ -5777,6 +5779,8 @@ dialog = trigger_centralDialog, "trigger_central" graphLine = mapVvt_MAP_AT_CYCLE_COUNT graphLine = mapVvt_map_peak graphLine = currentEngineDecodedPhase + liveGraph = trigger_central_4_Graph, "Graph", South + graphLine = triggerToothAngleError dialog = trigger_stateDialog, "trigger_state" diff --git a/firmware/tunerstudio/generated/rusefi_proteus_h7.ini b/firmware/tunerstudio/generated/rusefi_proteus_h7.ini index 781bcebc0a..d2ecc0dfda 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.09.24.proteus_h7.1398370519" + signature = "rusEFI 2022.09.24.proteus_h7.1412740302" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.09.24.proteus_h7.1398370519" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.09.24.proteus_h7.1412740302" ; 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 Fri Sep 23 23:16:35 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Sep 24 04:29:10 UTC 2022 pageSize = 22048 page = 1 @@ -2140,7 +2140,7 @@ ignBlends4_blendValues = array, U08, 22038, [8], "%", 0.5, 0, 0, 100, 1 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1260 + ochBlockSize = 1264 ; ; see TunerStudioOutputChannels struct @@ -3141,146 +3141,147 @@ mapVvt_MAP_AT_DIFF = scalar, F32, 1116, "", 1, 0 mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1120, "", 1, 0 mapVvt_map_peak = scalar, U08, 1121, "", 1, 0 currentEngineDecodedPhase = scalar, F32, 1124, "deg", 1, 0 -; total TS size = 1128 -crankSynchronizationCounter = scalar, U32, 1128, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1132, "", 1, 0 -vvtCurrentPosition = scalar, F32, 1136, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1140, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 1144, "", 1, 0 -triggerStateIndex = scalar, U08, 1148, "", 1, 0 -vvtCounter = scalar, U08, 1149, "", 1, 0 -camResyncCounter = scalar, U08, 1150, "", 1, 0 -vvtStateIndex = scalar, U08, 1151, "", 1, 0 -; total TS size = 1152 -m_hasSynchronizedPhase = bits, U32, 1152, [0:0] -unusedBit_1_1 = bits, U32, 1152, [1:1] -unusedBit_1_2 = bits, U32, 1152, [2:2] -unusedBit_1_3 = bits, U32, 1152, [3:3] -unusedBit_1_4 = bits, U32, 1152, [4:4] -unusedBit_1_5 = bits, U32, 1152, [5:5] -unusedBit_1_6 = bits, U32, 1152, [6:6] -unusedBit_1_7 = bits, U32, 1152, [7:7] -unusedBit_1_8 = bits, U32, 1152, [8:8] -unusedBit_1_9 = bits, U32, 1152, [9:9] -unusedBit_1_10 = bits, U32, 1152, [10:10] -unusedBit_1_11 = bits, U32, 1152, [11:11] -unusedBit_1_12 = bits, U32, 1152, [12:12] -unusedBit_1_13 = bits, U32, 1152, [13:13] -unusedBit_1_14 = bits, U32, 1152, [14:14] -unusedBit_1_15 = bits, U32, 1152, [15:15] -unusedBit_1_16 = bits, U32, 1152, [16:16] -unusedBit_1_17 = bits, U32, 1152, [17:17] -unusedBit_1_18 = bits, U32, 1152, [18:18] -unusedBit_1_19 = bits, U32, 1152, [19:19] -unusedBit_1_20 = bits, U32, 1152, [20:20] -unusedBit_1_21 = bits, U32, 1152, [21:21] -unusedBit_1_22 = bits, U32, 1152, [22:22] -unusedBit_1_23 = bits, U32, 1152, [23:23] -unusedBit_1_24 = bits, U32, 1152, [24:24] -unusedBit_1_25 = bits, U32, 1152, [25:25] -unusedBit_1_26 = bits, U32, 1152, [26:26] -unusedBit_1_27 = bits, U32, 1152, [27:27] -unusedBit_1_28 = bits, U32, 1152, [28:28] -unusedBit_1_29 = bits, U32, 1152, [29:29] -unusedBit_1_30 = bits, U32, 1152, [30:30] -unusedBit_1_31 = bits, U32, 1152, [31:31] +triggerToothAngleError = scalar, F32, 1128, "deg", 1, 0 +; total TS size = 1132 +crankSynchronizationCounter = scalar, U32, 1132, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1136, "", 1, 0 +vvtCurrentPosition = scalar, F32, 1140, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1144, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 1148, "", 1, 0 +triggerStateIndex = scalar, U08, 1152, "", 1, 0 +vvtCounter = scalar, U08, 1153, "", 1, 0 +camResyncCounter = scalar, U08, 1154, "", 1, 0 +vvtStateIndex = scalar, U08, 1155, "", 1, 0 ; total TS size = 1156 -wallFuelCorrection = scalar, F32, 1156, "", 1, 0 -wallFuel = scalar, F32, 1160, "", 1, 0 -; total TS size = 1164 -idleState = bits, S32, 1164, [0:2], "not important" -currentIdlePosition = scalar, F32, 1168 -baseIdlePosition = scalar, F32, 1172 -iacByTpsTaper = scalar, F32, 1176 -throttlePedalUpState = scalar, S32, 1180, "", 1, 0 -mightResetPid = bits, U32, 1184, [0:0] -shouldResetPid = bits, U32, 1184, [1:1] -wasResetPid = bits, U32, 1184, [2:2] -mustResetPid = bits, U32, 1184, [3:3] -isCranking = bits, U32, 1184, [4:4] -useIacTableForCoasting = bits, U32, 1184, [5:5] -notIdling = bits, U32, 1184, [6:6] -needReset = bits, U32, 1184, [7:7] -isInDeadZone = bits, U32, 1184, [8:8] -isBlipping = bits, U32, 1184, [9:9] -useClosedLoop = bits, U32, 1184, [10:10] -badTps = bits, U32, 1184, [11:11] -looksLikeRunning = bits, U32, 1184, [12:12] -looksLikeCoasting = bits, U32, 1184, [13:13] -looksLikeCrankToIdle = bits, U32, 1184, [14:14] -isVerboseIAC = bits, U32, 1184, [15:15] -isIdleCoasting = bits, U32, 1184, [16:16] -unusedBit_22_17 = bits, U32, 1184, [17:17] -unusedBit_22_18 = bits, U32, 1184, [18:18] -unusedBit_22_19 = bits, U32, 1184, [19:19] -unusedBit_22_20 = bits, U32, 1184, [20:20] -unusedBit_22_21 = bits, U32, 1184, [21:21] -unusedBit_22_22 = bits, U32, 1184, [22:22] -unusedBit_22_23 = bits, U32, 1184, [23:23] -unusedBit_22_24 = bits, U32, 1184, [24:24] -unusedBit_22_25 = bits, U32, 1184, [25:25] -unusedBit_22_26 = bits, U32, 1184, [26:26] -unusedBit_22_27 = bits, U32, 1184, [27:27] -unusedBit_22_28 = bits, U32, 1184, [28:28] -unusedBit_22_29 = bits, U32, 1184, [29:29] -unusedBit_22_30 = bits, U32, 1184, [30:30] -unusedBit_22_31 = bits, U32, 1184, [31:31] -targetRpmByClt = scalar, S32, 1188, "", 1, 0 -targetRpmAcBump = scalar, S32, 1192, "", 1, 0 -iacByRpmTaper = scalar, F32, 1196 -luaAdd = scalar, F32, 1200 -; total TS size = 1204 -baseDwell = scalar, F32, 1204, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 1208, "", 1, 0 -luaTimingAdd = scalar, F32, 1212, "", 1, 0 -luaTimingMult = scalar, F32, 1216, "", 1, 0 -; total TS size = 1220 -idlePosition = scalar, F32, 1220, "", 1, 0 -trim = scalar, F32, 1224, "", 1, 0 -luaAdjustment = scalar, F32, 1228, "", 1, 0 -etbFeedForward = scalar, F32, 1232 -etbIntegralError = scalar, F32, 1236, "", 1, 0 -etbCurrentTarget = scalar, F32, 1240, "%", 1, 0 -etbRevLimitActive = bits, U32, 1244, [0:0] -unusedBit_7_1 = bits, U32, 1244, [1:1] -unusedBit_7_2 = bits, U32, 1244, [2:2] -unusedBit_7_3 = bits, U32, 1244, [3:3] -unusedBit_7_4 = bits, U32, 1244, [4:4] -unusedBit_7_5 = bits, U32, 1244, [5:5] -unusedBit_7_6 = bits, U32, 1244, [6:6] -unusedBit_7_7 = bits, U32, 1244, [7:7] -unusedBit_7_8 = bits, U32, 1244, [8:8] -unusedBit_7_9 = bits, U32, 1244, [9:9] -unusedBit_7_10 = bits, U32, 1244, [10:10] -unusedBit_7_11 = bits, U32, 1244, [11:11] -unusedBit_7_12 = bits, U32, 1244, [12:12] -unusedBit_7_13 = bits, U32, 1244, [13:13] -unusedBit_7_14 = bits, U32, 1244, [14:14] -unusedBit_7_15 = bits, U32, 1244, [15:15] -unusedBit_7_16 = bits, U32, 1244, [16:16] -unusedBit_7_17 = bits, U32, 1244, [17:17] -unusedBit_7_18 = bits, U32, 1244, [18:18] -unusedBit_7_19 = bits, U32, 1244, [19:19] -unusedBit_7_20 = bits, U32, 1244, [20:20] -unusedBit_7_21 = bits, U32, 1244, [21:21] -unusedBit_7_22 = bits, U32, 1244, [22:22] -unusedBit_7_23 = bits, U32, 1244, [23:23] -unusedBit_7_24 = bits, U32, 1244, [24:24] -unusedBit_7_25 = bits, U32, 1244, [25:25] -unusedBit_7_26 = bits, U32, 1244, [26:26] -unusedBit_7_27 = bits, U32, 1244, [27:27] -unusedBit_7_28 = bits, U32, 1244, [28:28] -unusedBit_7_29 = bits, U32, 1244, [29:29] -unusedBit_7_30 = bits, U32, 1244, [30:30] -unusedBit_7_31 = bits, U32, 1244, [31:31] -; total TS size = 1248 -faultCode = scalar, U08, 1248, "", 1, 0 -heaterDuty = scalar, U08, 1249, "%", 1, 0 -pumpDuty = scalar, U08, 1250, "%", 1, 0 -tempC = scalar, U16, 1252, "C", 1, 0 -nernstVoltage = scalar, U16, 1254, "V", 0.001, 0 -esr = scalar, U16, 1256, "", 1, 0 -; total TS size = 1260 +m_hasSynchronizedPhase = bits, U32, 1156, [0:0] +unusedBit_1_1 = bits, U32, 1156, [1:1] +unusedBit_1_2 = bits, U32, 1156, [2:2] +unusedBit_1_3 = bits, U32, 1156, [3:3] +unusedBit_1_4 = bits, U32, 1156, [4:4] +unusedBit_1_5 = bits, U32, 1156, [5:5] +unusedBit_1_6 = bits, U32, 1156, [6:6] +unusedBit_1_7 = bits, U32, 1156, [7:7] +unusedBit_1_8 = bits, U32, 1156, [8:8] +unusedBit_1_9 = bits, U32, 1156, [9:9] +unusedBit_1_10 = bits, U32, 1156, [10:10] +unusedBit_1_11 = bits, U32, 1156, [11:11] +unusedBit_1_12 = bits, U32, 1156, [12:12] +unusedBit_1_13 = bits, U32, 1156, [13:13] +unusedBit_1_14 = bits, U32, 1156, [14:14] +unusedBit_1_15 = bits, U32, 1156, [15:15] +unusedBit_1_16 = bits, U32, 1156, [16:16] +unusedBit_1_17 = bits, U32, 1156, [17:17] +unusedBit_1_18 = bits, U32, 1156, [18:18] +unusedBit_1_19 = bits, U32, 1156, [19:19] +unusedBit_1_20 = bits, U32, 1156, [20:20] +unusedBit_1_21 = bits, U32, 1156, [21:21] +unusedBit_1_22 = bits, U32, 1156, [22:22] +unusedBit_1_23 = bits, U32, 1156, [23:23] +unusedBit_1_24 = bits, U32, 1156, [24:24] +unusedBit_1_25 = bits, U32, 1156, [25:25] +unusedBit_1_26 = bits, U32, 1156, [26:26] +unusedBit_1_27 = bits, U32, 1156, [27:27] +unusedBit_1_28 = bits, U32, 1156, [28:28] +unusedBit_1_29 = bits, U32, 1156, [29:29] +unusedBit_1_30 = bits, U32, 1156, [30:30] +unusedBit_1_31 = bits, U32, 1156, [31:31] +; total TS size = 1160 +wallFuelCorrection = scalar, F32, 1160, "", 1, 0 +wallFuel = scalar, F32, 1164, "", 1, 0 +; total TS size = 1168 +idleState = bits, S32, 1168, [0:2], "not important" +currentIdlePosition = scalar, F32, 1172 +baseIdlePosition = scalar, F32, 1176 +iacByTpsTaper = scalar, F32, 1180 +throttlePedalUpState = scalar, S32, 1184, "", 1, 0 +mightResetPid = bits, U32, 1188, [0:0] +shouldResetPid = bits, U32, 1188, [1:1] +wasResetPid = bits, U32, 1188, [2:2] +mustResetPid = bits, U32, 1188, [3:3] +isCranking = bits, U32, 1188, [4:4] +useIacTableForCoasting = bits, U32, 1188, [5:5] +notIdling = bits, U32, 1188, [6:6] +needReset = bits, U32, 1188, [7:7] +isInDeadZone = bits, U32, 1188, [8:8] +isBlipping = bits, U32, 1188, [9:9] +useClosedLoop = bits, U32, 1188, [10:10] +badTps = bits, U32, 1188, [11:11] +looksLikeRunning = bits, U32, 1188, [12:12] +looksLikeCoasting = bits, U32, 1188, [13:13] +looksLikeCrankToIdle = bits, U32, 1188, [14:14] +isVerboseIAC = bits, U32, 1188, [15:15] +isIdleCoasting = bits, U32, 1188, [16:16] +unusedBit_22_17 = bits, U32, 1188, [17:17] +unusedBit_22_18 = bits, U32, 1188, [18:18] +unusedBit_22_19 = bits, U32, 1188, [19:19] +unusedBit_22_20 = bits, U32, 1188, [20:20] +unusedBit_22_21 = bits, U32, 1188, [21:21] +unusedBit_22_22 = bits, U32, 1188, [22:22] +unusedBit_22_23 = bits, U32, 1188, [23:23] +unusedBit_22_24 = bits, U32, 1188, [24:24] +unusedBit_22_25 = bits, U32, 1188, [25:25] +unusedBit_22_26 = bits, U32, 1188, [26:26] +unusedBit_22_27 = bits, U32, 1188, [27:27] +unusedBit_22_28 = bits, U32, 1188, [28:28] +unusedBit_22_29 = bits, U32, 1188, [29:29] +unusedBit_22_30 = bits, U32, 1188, [30:30] +unusedBit_22_31 = bits, U32, 1188, [31:31] +targetRpmByClt = scalar, S32, 1192, "", 1, 0 +targetRpmAcBump = scalar, S32, 1196, "", 1, 0 +iacByRpmTaper = scalar, F32, 1200 +luaAdd = scalar, F32, 1204 +; total TS size = 1208 +baseDwell = scalar, F32, 1208, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 1212, "", 1, 0 +luaTimingAdd = scalar, F32, 1216, "", 1, 0 +luaTimingMult = scalar, F32, 1220, "", 1, 0 +; total TS size = 1224 +idlePosition = scalar, F32, 1224, "", 1, 0 +trim = scalar, F32, 1228, "", 1, 0 +luaAdjustment = scalar, F32, 1232, "", 1, 0 +etbFeedForward = scalar, F32, 1236 +etbIntegralError = scalar, F32, 1240, "", 1, 0 +etbCurrentTarget = scalar, F32, 1244, "%", 1, 0 +etbRevLimitActive = bits, U32, 1248, [0:0] +unusedBit_7_1 = bits, U32, 1248, [1:1] +unusedBit_7_2 = bits, U32, 1248, [2:2] +unusedBit_7_3 = bits, U32, 1248, [3:3] +unusedBit_7_4 = bits, U32, 1248, [4:4] +unusedBit_7_5 = bits, U32, 1248, [5:5] +unusedBit_7_6 = bits, U32, 1248, [6:6] +unusedBit_7_7 = bits, U32, 1248, [7:7] +unusedBit_7_8 = bits, U32, 1248, [8:8] +unusedBit_7_9 = bits, U32, 1248, [9:9] +unusedBit_7_10 = bits, U32, 1248, [10:10] +unusedBit_7_11 = bits, U32, 1248, [11:11] +unusedBit_7_12 = bits, U32, 1248, [12:12] +unusedBit_7_13 = bits, U32, 1248, [13:13] +unusedBit_7_14 = bits, U32, 1248, [14:14] +unusedBit_7_15 = bits, U32, 1248, [15:15] +unusedBit_7_16 = bits, U32, 1248, [16:16] +unusedBit_7_17 = bits, U32, 1248, [17:17] +unusedBit_7_18 = bits, U32, 1248, [18:18] +unusedBit_7_19 = bits, U32, 1248, [19:19] +unusedBit_7_20 = bits, U32, 1248, [20:20] +unusedBit_7_21 = bits, U32, 1248, [21:21] +unusedBit_7_22 = bits, U32, 1248, [22:22] +unusedBit_7_23 = bits, U32, 1248, [23:23] +unusedBit_7_24 = bits, U32, 1248, [24:24] +unusedBit_7_25 = bits, U32, 1248, [25:25] +unusedBit_7_26 = bits, U32, 1248, [26:26] +unusedBit_7_27 = bits, U32, 1248, [27:27] +unusedBit_7_28 = bits, U32, 1248, [28:28] +unusedBit_7_29 = bits, U32, 1248, [29:29] +unusedBit_7_30 = bits, U32, 1248, [30:30] +unusedBit_7_31 = bits, U32, 1248, [31:31] +; total TS size = 1252 +faultCode = scalar, U08, 1252, "", 1, 0 +heaterDuty = scalar, U08, 1253, "%", 1, 0 +pumpDuty = scalar, U08, 1254, "%", 1, 0 +tempC = scalar, U16, 1256, "C", 1, 0 +nernstVoltage = scalar, U16, 1258, "V", 0.001, 0 +esr = scalar, U16, 1260, "", 1, 0 +; total TS size = 1264 time = { timeNow } @@ -4993,6 +4994,7 @@ entry = mapVvt_MAP_AT_DIFF, "mapVvt_MAP_AT_DIFF", float, "%.3f" entry = mapVvt_MAP_AT_CYCLE_COUNT, "mapVvt_MAP_AT_CYCLE_COUNT", int, "%d" entry = mapVvt_map_peak, "mapVvt_map_peak", int, "%d" entry = currentEngineDecodedPhase, "Engine Phase", float, "%.3f" +entry = triggerToothAngleError, "triggerToothAngleError", float, "%.3f" entry = crankSynchronizationCounter, "Crank sync counter", int, "%d" entry = vvtSyncGapRatio, "vvtSyncGapRatio", float, "%.3f" entry = vvtCurrentPosition, "vvtCurrentPosition", float, "%.3f" @@ -5777,6 +5779,8 @@ dialog = trigger_centralDialog, "trigger_central" graphLine = mapVvt_MAP_AT_CYCLE_COUNT graphLine = mapVvt_map_peak graphLine = currentEngineDecodedPhase + liveGraph = trigger_central_4_Graph, "Graph", South + graphLine = triggerToothAngleError dialog = trigger_stateDialog, "trigger_state" diff --git a/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini b/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini index 4bfb96a9af..49e2818041 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.09.24.subaru_eg33_f7.2408214139" + signature = "rusEFI 2022.09.24.subaru_eg33_f7.2296883810" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.09.24.subaru_eg33_f7.2408214139" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.09.24.subaru_eg33_f7.2296883810" ; 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 Fri Sep 23 23:15:50 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 Sat Sep 24 04:28:24 UTC 2022 pageSize = 22048 page = 1 @@ -2140,7 +2140,7 @@ ignBlends4_blendValues = array, U08, 22038, [8], "%", 0.5, 0, 0, 100, 1 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1260 + ochBlockSize = 1264 ; ; see TunerStudioOutputChannels struct @@ -3141,146 +3141,147 @@ mapVvt_MAP_AT_DIFF = scalar, F32, 1116, "", 1, 0 mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1120, "", 1, 0 mapVvt_map_peak = scalar, U08, 1121, "", 1, 0 currentEngineDecodedPhase = scalar, F32, 1124, "deg", 1, 0 -; total TS size = 1128 -crankSynchronizationCounter = scalar, U32, 1128, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1132, "", 1, 0 -vvtCurrentPosition = scalar, F32, 1136, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1140, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 1144, "", 1, 0 -triggerStateIndex = scalar, U08, 1148, "", 1, 0 -vvtCounter = scalar, U08, 1149, "", 1, 0 -camResyncCounter = scalar, U08, 1150, "", 1, 0 -vvtStateIndex = scalar, U08, 1151, "", 1, 0 -; total TS size = 1152 -m_hasSynchronizedPhase = bits, U32, 1152, [0:0] -unusedBit_1_1 = bits, U32, 1152, [1:1] -unusedBit_1_2 = bits, U32, 1152, [2:2] -unusedBit_1_3 = bits, U32, 1152, [3:3] -unusedBit_1_4 = bits, U32, 1152, [4:4] -unusedBit_1_5 = bits, U32, 1152, [5:5] -unusedBit_1_6 = bits, U32, 1152, [6:6] -unusedBit_1_7 = bits, U32, 1152, [7:7] -unusedBit_1_8 = bits, U32, 1152, [8:8] -unusedBit_1_9 = bits, U32, 1152, [9:9] -unusedBit_1_10 = bits, U32, 1152, [10:10] -unusedBit_1_11 = bits, U32, 1152, [11:11] -unusedBit_1_12 = bits, U32, 1152, [12:12] -unusedBit_1_13 = bits, U32, 1152, [13:13] -unusedBit_1_14 = bits, U32, 1152, [14:14] -unusedBit_1_15 = bits, U32, 1152, [15:15] -unusedBit_1_16 = bits, U32, 1152, [16:16] -unusedBit_1_17 = bits, U32, 1152, [17:17] -unusedBit_1_18 = bits, U32, 1152, [18:18] -unusedBit_1_19 = bits, U32, 1152, [19:19] -unusedBit_1_20 = bits, U32, 1152, [20:20] -unusedBit_1_21 = bits, U32, 1152, [21:21] -unusedBit_1_22 = bits, U32, 1152, [22:22] -unusedBit_1_23 = bits, U32, 1152, [23:23] -unusedBit_1_24 = bits, U32, 1152, [24:24] -unusedBit_1_25 = bits, U32, 1152, [25:25] -unusedBit_1_26 = bits, U32, 1152, [26:26] -unusedBit_1_27 = bits, U32, 1152, [27:27] -unusedBit_1_28 = bits, U32, 1152, [28:28] -unusedBit_1_29 = bits, U32, 1152, [29:29] -unusedBit_1_30 = bits, U32, 1152, [30:30] -unusedBit_1_31 = bits, U32, 1152, [31:31] +triggerToothAngleError = scalar, F32, 1128, "deg", 1, 0 +; total TS size = 1132 +crankSynchronizationCounter = scalar, U32, 1132, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1136, "", 1, 0 +vvtCurrentPosition = scalar, F32, 1140, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1144, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 1148, "", 1, 0 +triggerStateIndex = scalar, U08, 1152, "", 1, 0 +vvtCounter = scalar, U08, 1153, "", 1, 0 +camResyncCounter = scalar, U08, 1154, "", 1, 0 +vvtStateIndex = scalar, U08, 1155, "", 1, 0 ; total TS size = 1156 -wallFuelCorrection = scalar, F32, 1156, "", 1, 0 -wallFuel = scalar, F32, 1160, "", 1, 0 -; total TS size = 1164 -idleState = bits, S32, 1164, [0:2], "not important" -currentIdlePosition = scalar, F32, 1168 -baseIdlePosition = scalar, F32, 1172 -iacByTpsTaper = scalar, F32, 1176 -throttlePedalUpState = scalar, S32, 1180, "", 1, 0 -mightResetPid = bits, U32, 1184, [0:0] -shouldResetPid = bits, U32, 1184, [1:1] -wasResetPid = bits, U32, 1184, [2:2] -mustResetPid = bits, U32, 1184, [3:3] -isCranking = bits, U32, 1184, [4:4] -useIacTableForCoasting = bits, U32, 1184, [5:5] -notIdling = bits, U32, 1184, [6:6] -needReset = bits, U32, 1184, [7:7] -isInDeadZone = bits, U32, 1184, [8:8] -isBlipping = bits, U32, 1184, [9:9] -useClosedLoop = bits, U32, 1184, [10:10] -badTps = bits, U32, 1184, [11:11] -looksLikeRunning = bits, U32, 1184, [12:12] -looksLikeCoasting = bits, U32, 1184, [13:13] -looksLikeCrankToIdle = bits, U32, 1184, [14:14] -isVerboseIAC = bits, U32, 1184, [15:15] -isIdleCoasting = bits, U32, 1184, [16:16] -unusedBit_22_17 = bits, U32, 1184, [17:17] -unusedBit_22_18 = bits, U32, 1184, [18:18] -unusedBit_22_19 = bits, U32, 1184, [19:19] -unusedBit_22_20 = bits, U32, 1184, [20:20] -unusedBit_22_21 = bits, U32, 1184, [21:21] -unusedBit_22_22 = bits, U32, 1184, [22:22] -unusedBit_22_23 = bits, U32, 1184, [23:23] -unusedBit_22_24 = bits, U32, 1184, [24:24] -unusedBit_22_25 = bits, U32, 1184, [25:25] -unusedBit_22_26 = bits, U32, 1184, [26:26] -unusedBit_22_27 = bits, U32, 1184, [27:27] -unusedBit_22_28 = bits, U32, 1184, [28:28] -unusedBit_22_29 = bits, U32, 1184, [29:29] -unusedBit_22_30 = bits, U32, 1184, [30:30] -unusedBit_22_31 = bits, U32, 1184, [31:31] -targetRpmByClt = scalar, S32, 1188, "", 1, 0 -targetRpmAcBump = scalar, S32, 1192, "", 1, 0 -iacByRpmTaper = scalar, F32, 1196 -luaAdd = scalar, F32, 1200 -; total TS size = 1204 -baseDwell = scalar, F32, 1204, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 1208, "", 1, 0 -luaTimingAdd = scalar, F32, 1212, "", 1, 0 -luaTimingMult = scalar, F32, 1216, "", 1, 0 -; total TS size = 1220 -idlePosition = scalar, F32, 1220, "", 1, 0 -trim = scalar, F32, 1224, "", 1, 0 -luaAdjustment = scalar, F32, 1228, "", 1, 0 -etbFeedForward = scalar, F32, 1232 -etbIntegralError = scalar, F32, 1236, "", 1, 0 -etbCurrentTarget = scalar, F32, 1240, "%", 1, 0 -etbRevLimitActive = bits, U32, 1244, [0:0] -unusedBit_7_1 = bits, U32, 1244, [1:1] -unusedBit_7_2 = bits, U32, 1244, [2:2] -unusedBit_7_3 = bits, U32, 1244, [3:3] -unusedBit_7_4 = bits, U32, 1244, [4:4] -unusedBit_7_5 = bits, U32, 1244, [5:5] -unusedBit_7_6 = bits, U32, 1244, [6:6] -unusedBit_7_7 = bits, U32, 1244, [7:7] -unusedBit_7_8 = bits, U32, 1244, [8:8] -unusedBit_7_9 = bits, U32, 1244, [9:9] -unusedBit_7_10 = bits, U32, 1244, [10:10] -unusedBit_7_11 = bits, U32, 1244, [11:11] -unusedBit_7_12 = bits, U32, 1244, [12:12] -unusedBit_7_13 = bits, U32, 1244, [13:13] -unusedBit_7_14 = bits, U32, 1244, [14:14] -unusedBit_7_15 = bits, U32, 1244, [15:15] -unusedBit_7_16 = bits, U32, 1244, [16:16] -unusedBit_7_17 = bits, U32, 1244, [17:17] -unusedBit_7_18 = bits, U32, 1244, [18:18] -unusedBit_7_19 = bits, U32, 1244, [19:19] -unusedBit_7_20 = bits, U32, 1244, [20:20] -unusedBit_7_21 = bits, U32, 1244, [21:21] -unusedBit_7_22 = bits, U32, 1244, [22:22] -unusedBit_7_23 = bits, U32, 1244, [23:23] -unusedBit_7_24 = bits, U32, 1244, [24:24] -unusedBit_7_25 = bits, U32, 1244, [25:25] -unusedBit_7_26 = bits, U32, 1244, [26:26] -unusedBit_7_27 = bits, U32, 1244, [27:27] -unusedBit_7_28 = bits, U32, 1244, [28:28] -unusedBit_7_29 = bits, U32, 1244, [29:29] -unusedBit_7_30 = bits, U32, 1244, [30:30] -unusedBit_7_31 = bits, U32, 1244, [31:31] -; total TS size = 1248 -faultCode = scalar, U08, 1248, "", 1, 0 -heaterDuty = scalar, U08, 1249, "%", 1, 0 -pumpDuty = scalar, U08, 1250, "%", 1, 0 -tempC = scalar, U16, 1252, "C", 1, 0 -nernstVoltage = scalar, U16, 1254, "V", 0.001, 0 -esr = scalar, U16, 1256, "", 1, 0 -; total TS size = 1260 +m_hasSynchronizedPhase = bits, U32, 1156, [0:0] +unusedBit_1_1 = bits, U32, 1156, [1:1] +unusedBit_1_2 = bits, U32, 1156, [2:2] +unusedBit_1_3 = bits, U32, 1156, [3:3] +unusedBit_1_4 = bits, U32, 1156, [4:4] +unusedBit_1_5 = bits, U32, 1156, [5:5] +unusedBit_1_6 = bits, U32, 1156, [6:6] +unusedBit_1_7 = bits, U32, 1156, [7:7] +unusedBit_1_8 = bits, U32, 1156, [8:8] +unusedBit_1_9 = bits, U32, 1156, [9:9] +unusedBit_1_10 = bits, U32, 1156, [10:10] +unusedBit_1_11 = bits, U32, 1156, [11:11] +unusedBit_1_12 = bits, U32, 1156, [12:12] +unusedBit_1_13 = bits, U32, 1156, [13:13] +unusedBit_1_14 = bits, U32, 1156, [14:14] +unusedBit_1_15 = bits, U32, 1156, [15:15] +unusedBit_1_16 = bits, U32, 1156, [16:16] +unusedBit_1_17 = bits, U32, 1156, [17:17] +unusedBit_1_18 = bits, U32, 1156, [18:18] +unusedBit_1_19 = bits, U32, 1156, [19:19] +unusedBit_1_20 = bits, U32, 1156, [20:20] +unusedBit_1_21 = bits, U32, 1156, [21:21] +unusedBit_1_22 = bits, U32, 1156, [22:22] +unusedBit_1_23 = bits, U32, 1156, [23:23] +unusedBit_1_24 = bits, U32, 1156, [24:24] +unusedBit_1_25 = bits, U32, 1156, [25:25] +unusedBit_1_26 = bits, U32, 1156, [26:26] +unusedBit_1_27 = bits, U32, 1156, [27:27] +unusedBit_1_28 = bits, U32, 1156, [28:28] +unusedBit_1_29 = bits, U32, 1156, [29:29] +unusedBit_1_30 = bits, U32, 1156, [30:30] +unusedBit_1_31 = bits, U32, 1156, [31:31] +; total TS size = 1160 +wallFuelCorrection = scalar, F32, 1160, "", 1, 0 +wallFuel = scalar, F32, 1164, "", 1, 0 +; total TS size = 1168 +idleState = bits, S32, 1168, [0:2], "not important" +currentIdlePosition = scalar, F32, 1172 +baseIdlePosition = scalar, F32, 1176 +iacByTpsTaper = scalar, F32, 1180 +throttlePedalUpState = scalar, S32, 1184, "", 1, 0 +mightResetPid = bits, U32, 1188, [0:0] +shouldResetPid = bits, U32, 1188, [1:1] +wasResetPid = bits, U32, 1188, [2:2] +mustResetPid = bits, U32, 1188, [3:3] +isCranking = bits, U32, 1188, [4:4] +useIacTableForCoasting = bits, U32, 1188, [5:5] +notIdling = bits, U32, 1188, [6:6] +needReset = bits, U32, 1188, [7:7] +isInDeadZone = bits, U32, 1188, [8:8] +isBlipping = bits, U32, 1188, [9:9] +useClosedLoop = bits, U32, 1188, [10:10] +badTps = bits, U32, 1188, [11:11] +looksLikeRunning = bits, U32, 1188, [12:12] +looksLikeCoasting = bits, U32, 1188, [13:13] +looksLikeCrankToIdle = bits, U32, 1188, [14:14] +isVerboseIAC = bits, U32, 1188, [15:15] +isIdleCoasting = bits, U32, 1188, [16:16] +unusedBit_22_17 = bits, U32, 1188, [17:17] +unusedBit_22_18 = bits, U32, 1188, [18:18] +unusedBit_22_19 = bits, U32, 1188, [19:19] +unusedBit_22_20 = bits, U32, 1188, [20:20] +unusedBit_22_21 = bits, U32, 1188, [21:21] +unusedBit_22_22 = bits, U32, 1188, [22:22] +unusedBit_22_23 = bits, U32, 1188, [23:23] +unusedBit_22_24 = bits, U32, 1188, [24:24] +unusedBit_22_25 = bits, U32, 1188, [25:25] +unusedBit_22_26 = bits, U32, 1188, [26:26] +unusedBit_22_27 = bits, U32, 1188, [27:27] +unusedBit_22_28 = bits, U32, 1188, [28:28] +unusedBit_22_29 = bits, U32, 1188, [29:29] +unusedBit_22_30 = bits, U32, 1188, [30:30] +unusedBit_22_31 = bits, U32, 1188, [31:31] +targetRpmByClt = scalar, S32, 1192, "", 1, 0 +targetRpmAcBump = scalar, S32, 1196, "", 1, 0 +iacByRpmTaper = scalar, F32, 1200 +luaAdd = scalar, F32, 1204 +; total TS size = 1208 +baseDwell = scalar, F32, 1208, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 1212, "", 1, 0 +luaTimingAdd = scalar, F32, 1216, "", 1, 0 +luaTimingMult = scalar, F32, 1220, "", 1, 0 +; total TS size = 1224 +idlePosition = scalar, F32, 1224, "", 1, 0 +trim = scalar, F32, 1228, "", 1, 0 +luaAdjustment = scalar, F32, 1232, "", 1, 0 +etbFeedForward = scalar, F32, 1236 +etbIntegralError = scalar, F32, 1240, "", 1, 0 +etbCurrentTarget = scalar, F32, 1244, "%", 1, 0 +etbRevLimitActive = bits, U32, 1248, [0:0] +unusedBit_7_1 = bits, U32, 1248, [1:1] +unusedBit_7_2 = bits, U32, 1248, [2:2] +unusedBit_7_3 = bits, U32, 1248, [3:3] +unusedBit_7_4 = bits, U32, 1248, [4:4] +unusedBit_7_5 = bits, U32, 1248, [5:5] +unusedBit_7_6 = bits, U32, 1248, [6:6] +unusedBit_7_7 = bits, U32, 1248, [7:7] +unusedBit_7_8 = bits, U32, 1248, [8:8] +unusedBit_7_9 = bits, U32, 1248, [9:9] +unusedBit_7_10 = bits, U32, 1248, [10:10] +unusedBit_7_11 = bits, U32, 1248, [11:11] +unusedBit_7_12 = bits, U32, 1248, [12:12] +unusedBit_7_13 = bits, U32, 1248, [13:13] +unusedBit_7_14 = bits, U32, 1248, [14:14] +unusedBit_7_15 = bits, U32, 1248, [15:15] +unusedBit_7_16 = bits, U32, 1248, [16:16] +unusedBit_7_17 = bits, U32, 1248, [17:17] +unusedBit_7_18 = bits, U32, 1248, [18:18] +unusedBit_7_19 = bits, U32, 1248, [19:19] +unusedBit_7_20 = bits, U32, 1248, [20:20] +unusedBit_7_21 = bits, U32, 1248, [21:21] +unusedBit_7_22 = bits, U32, 1248, [22:22] +unusedBit_7_23 = bits, U32, 1248, [23:23] +unusedBit_7_24 = bits, U32, 1248, [24:24] +unusedBit_7_25 = bits, U32, 1248, [25:25] +unusedBit_7_26 = bits, U32, 1248, [26:26] +unusedBit_7_27 = bits, U32, 1248, [27:27] +unusedBit_7_28 = bits, U32, 1248, [28:28] +unusedBit_7_29 = bits, U32, 1248, [29:29] +unusedBit_7_30 = bits, U32, 1248, [30:30] +unusedBit_7_31 = bits, U32, 1248, [31:31] +; total TS size = 1252 +faultCode = scalar, U08, 1252, "", 1, 0 +heaterDuty = scalar, U08, 1253, "%", 1, 0 +pumpDuty = scalar, U08, 1254, "%", 1, 0 +tempC = scalar, U16, 1256, "C", 1, 0 +nernstVoltage = scalar, U16, 1258, "V", 0.001, 0 +esr = scalar, U16, 1260, "", 1, 0 +; total TS size = 1264 time = { timeNow } @@ -4993,6 +4994,7 @@ entry = mapVvt_MAP_AT_DIFF, "mapVvt_MAP_AT_DIFF", float, "%.3f" entry = mapVvt_MAP_AT_CYCLE_COUNT, "mapVvt_MAP_AT_CYCLE_COUNT", int, "%d" entry = mapVvt_map_peak, "mapVvt_map_peak", int, "%d" entry = currentEngineDecodedPhase, "Engine Phase", float, "%.3f" +entry = triggerToothAngleError, "triggerToothAngleError", float, "%.3f" entry = crankSynchronizationCounter, "Crank sync counter", int, "%d" entry = vvtSyncGapRatio, "vvtSyncGapRatio", float, "%.3f" entry = vvtCurrentPosition, "vvtCurrentPosition", float, "%.3f" @@ -5779,6 +5781,8 @@ dialog = trigger_centralDialog, "trigger_central" graphLine = mapVvt_MAP_AT_CYCLE_COUNT graphLine = mapVvt_map_peak graphLine = currentEngineDecodedPhase + liveGraph = trigger_central_4_Graph, "Graph", South + graphLine = triggerToothAngleError dialog = trigger_stateDialog, "trigger_state" diff --git a/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini b/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini index ab9a381cdf..a12d04c6d5 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.09.24.tdg-pdm8.1553758709" + signature = "rusEFI 2022.09.24.tdg-pdm8.1542569452" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.09.24.tdg-pdm8.1553758709" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.09.24.tdg-pdm8.1542569452" ; 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 Fri Sep 23 23:16:43 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Sep 24 04:29:18 UTC 2022 pageSize = 22048 page = 1 @@ -2140,7 +2140,7 @@ ignBlends4_blendValues = array, U08, 22038, [8], "%", 0.5, 0, 0, 100, 1 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1260 + ochBlockSize = 1264 ; ; see TunerStudioOutputChannels struct @@ -3141,146 +3141,147 @@ mapVvt_MAP_AT_DIFF = scalar, F32, 1116, "", 1, 0 mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1120, "", 1, 0 mapVvt_map_peak = scalar, U08, 1121, "", 1, 0 currentEngineDecodedPhase = scalar, F32, 1124, "deg", 1, 0 -; total TS size = 1128 -crankSynchronizationCounter = scalar, U32, 1128, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1132, "", 1, 0 -vvtCurrentPosition = scalar, F32, 1136, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1140, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 1144, "", 1, 0 -triggerStateIndex = scalar, U08, 1148, "", 1, 0 -vvtCounter = scalar, U08, 1149, "", 1, 0 -camResyncCounter = scalar, U08, 1150, "", 1, 0 -vvtStateIndex = scalar, U08, 1151, "", 1, 0 -; total TS size = 1152 -m_hasSynchronizedPhase = bits, U32, 1152, [0:0] -unusedBit_1_1 = bits, U32, 1152, [1:1] -unusedBit_1_2 = bits, U32, 1152, [2:2] -unusedBit_1_3 = bits, U32, 1152, [3:3] -unusedBit_1_4 = bits, U32, 1152, [4:4] -unusedBit_1_5 = bits, U32, 1152, [5:5] -unusedBit_1_6 = bits, U32, 1152, [6:6] -unusedBit_1_7 = bits, U32, 1152, [7:7] -unusedBit_1_8 = bits, U32, 1152, [8:8] -unusedBit_1_9 = bits, U32, 1152, [9:9] -unusedBit_1_10 = bits, U32, 1152, [10:10] -unusedBit_1_11 = bits, U32, 1152, [11:11] -unusedBit_1_12 = bits, U32, 1152, [12:12] -unusedBit_1_13 = bits, U32, 1152, [13:13] -unusedBit_1_14 = bits, U32, 1152, [14:14] -unusedBit_1_15 = bits, U32, 1152, [15:15] -unusedBit_1_16 = bits, U32, 1152, [16:16] -unusedBit_1_17 = bits, U32, 1152, [17:17] -unusedBit_1_18 = bits, U32, 1152, [18:18] -unusedBit_1_19 = bits, U32, 1152, [19:19] -unusedBit_1_20 = bits, U32, 1152, [20:20] -unusedBit_1_21 = bits, U32, 1152, [21:21] -unusedBit_1_22 = bits, U32, 1152, [22:22] -unusedBit_1_23 = bits, U32, 1152, [23:23] -unusedBit_1_24 = bits, U32, 1152, [24:24] -unusedBit_1_25 = bits, U32, 1152, [25:25] -unusedBit_1_26 = bits, U32, 1152, [26:26] -unusedBit_1_27 = bits, U32, 1152, [27:27] -unusedBit_1_28 = bits, U32, 1152, [28:28] -unusedBit_1_29 = bits, U32, 1152, [29:29] -unusedBit_1_30 = bits, U32, 1152, [30:30] -unusedBit_1_31 = bits, U32, 1152, [31:31] +triggerToothAngleError = scalar, F32, 1128, "deg", 1, 0 +; total TS size = 1132 +crankSynchronizationCounter = scalar, U32, 1132, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1136, "", 1, 0 +vvtCurrentPosition = scalar, F32, 1140, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1144, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 1148, "", 1, 0 +triggerStateIndex = scalar, U08, 1152, "", 1, 0 +vvtCounter = scalar, U08, 1153, "", 1, 0 +camResyncCounter = scalar, U08, 1154, "", 1, 0 +vvtStateIndex = scalar, U08, 1155, "", 1, 0 ; total TS size = 1156 -wallFuelCorrection = scalar, F32, 1156, "", 1, 0 -wallFuel = scalar, F32, 1160, "", 1, 0 -; total TS size = 1164 -idleState = bits, S32, 1164, [0:2], "not important" -currentIdlePosition = scalar, F32, 1168 -baseIdlePosition = scalar, F32, 1172 -iacByTpsTaper = scalar, F32, 1176 -throttlePedalUpState = scalar, S32, 1180, "", 1, 0 -mightResetPid = bits, U32, 1184, [0:0] -shouldResetPid = bits, U32, 1184, [1:1] -wasResetPid = bits, U32, 1184, [2:2] -mustResetPid = bits, U32, 1184, [3:3] -isCranking = bits, U32, 1184, [4:4] -useIacTableForCoasting = bits, U32, 1184, [5:5] -notIdling = bits, U32, 1184, [6:6] -needReset = bits, U32, 1184, [7:7] -isInDeadZone = bits, U32, 1184, [8:8] -isBlipping = bits, U32, 1184, [9:9] -useClosedLoop = bits, U32, 1184, [10:10] -badTps = bits, U32, 1184, [11:11] -looksLikeRunning = bits, U32, 1184, [12:12] -looksLikeCoasting = bits, U32, 1184, [13:13] -looksLikeCrankToIdle = bits, U32, 1184, [14:14] -isVerboseIAC = bits, U32, 1184, [15:15] -isIdleCoasting = bits, U32, 1184, [16:16] -unusedBit_22_17 = bits, U32, 1184, [17:17] -unusedBit_22_18 = bits, U32, 1184, [18:18] -unusedBit_22_19 = bits, U32, 1184, [19:19] -unusedBit_22_20 = bits, U32, 1184, [20:20] -unusedBit_22_21 = bits, U32, 1184, [21:21] -unusedBit_22_22 = bits, U32, 1184, [22:22] -unusedBit_22_23 = bits, U32, 1184, [23:23] -unusedBit_22_24 = bits, U32, 1184, [24:24] -unusedBit_22_25 = bits, U32, 1184, [25:25] -unusedBit_22_26 = bits, U32, 1184, [26:26] -unusedBit_22_27 = bits, U32, 1184, [27:27] -unusedBit_22_28 = bits, U32, 1184, [28:28] -unusedBit_22_29 = bits, U32, 1184, [29:29] -unusedBit_22_30 = bits, U32, 1184, [30:30] -unusedBit_22_31 = bits, U32, 1184, [31:31] -targetRpmByClt = scalar, S32, 1188, "", 1, 0 -targetRpmAcBump = scalar, S32, 1192, "", 1, 0 -iacByRpmTaper = scalar, F32, 1196 -luaAdd = scalar, F32, 1200 -; total TS size = 1204 -baseDwell = scalar, F32, 1204, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 1208, "", 1, 0 -luaTimingAdd = scalar, F32, 1212, "", 1, 0 -luaTimingMult = scalar, F32, 1216, "", 1, 0 -; total TS size = 1220 -idlePosition = scalar, F32, 1220, "", 1, 0 -trim = scalar, F32, 1224, "", 1, 0 -luaAdjustment = scalar, F32, 1228, "", 1, 0 -etbFeedForward = scalar, F32, 1232 -etbIntegralError = scalar, F32, 1236, "", 1, 0 -etbCurrentTarget = scalar, F32, 1240, "%", 1, 0 -etbRevLimitActive = bits, U32, 1244, [0:0] -unusedBit_7_1 = bits, U32, 1244, [1:1] -unusedBit_7_2 = bits, U32, 1244, [2:2] -unusedBit_7_3 = bits, U32, 1244, [3:3] -unusedBit_7_4 = bits, U32, 1244, [4:4] -unusedBit_7_5 = bits, U32, 1244, [5:5] -unusedBit_7_6 = bits, U32, 1244, [6:6] -unusedBit_7_7 = bits, U32, 1244, [7:7] -unusedBit_7_8 = bits, U32, 1244, [8:8] -unusedBit_7_9 = bits, U32, 1244, [9:9] -unusedBit_7_10 = bits, U32, 1244, [10:10] -unusedBit_7_11 = bits, U32, 1244, [11:11] -unusedBit_7_12 = bits, U32, 1244, [12:12] -unusedBit_7_13 = bits, U32, 1244, [13:13] -unusedBit_7_14 = bits, U32, 1244, [14:14] -unusedBit_7_15 = bits, U32, 1244, [15:15] -unusedBit_7_16 = bits, U32, 1244, [16:16] -unusedBit_7_17 = bits, U32, 1244, [17:17] -unusedBit_7_18 = bits, U32, 1244, [18:18] -unusedBit_7_19 = bits, U32, 1244, [19:19] -unusedBit_7_20 = bits, U32, 1244, [20:20] -unusedBit_7_21 = bits, U32, 1244, [21:21] -unusedBit_7_22 = bits, U32, 1244, [22:22] -unusedBit_7_23 = bits, U32, 1244, [23:23] -unusedBit_7_24 = bits, U32, 1244, [24:24] -unusedBit_7_25 = bits, U32, 1244, [25:25] -unusedBit_7_26 = bits, U32, 1244, [26:26] -unusedBit_7_27 = bits, U32, 1244, [27:27] -unusedBit_7_28 = bits, U32, 1244, [28:28] -unusedBit_7_29 = bits, U32, 1244, [29:29] -unusedBit_7_30 = bits, U32, 1244, [30:30] -unusedBit_7_31 = bits, U32, 1244, [31:31] -; total TS size = 1248 -faultCode = scalar, U08, 1248, "", 1, 0 -heaterDuty = scalar, U08, 1249, "%", 1, 0 -pumpDuty = scalar, U08, 1250, "%", 1, 0 -tempC = scalar, U16, 1252, "C", 1, 0 -nernstVoltage = scalar, U16, 1254, "V", 0.001, 0 -esr = scalar, U16, 1256, "", 1, 0 -; total TS size = 1260 +m_hasSynchronizedPhase = bits, U32, 1156, [0:0] +unusedBit_1_1 = bits, U32, 1156, [1:1] +unusedBit_1_2 = bits, U32, 1156, [2:2] +unusedBit_1_3 = bits, U32, 1156, [3:3] +unusedBit_1_4 = bits, U32, 1156, [4:4] +unusedBit_1_5 = bits, U32, 1156, [5:5] +unusedBit_1_6 = bits, U32, 1156, [6:6] +unusedBit_1_7 = bits, U32, 1156, [7:7] +unusedBit_1_8 = bits, U32, 1156, [8:8] +unusedBit_1_9 = bits, U32, 1156, [9:9] +unusedBit_1_10 = bits, U32, 1156, [10:10] +unusedBit_1_11 = bits, U32, 1156, [11:11] +unusedBit_1_12 = bits, U32, 1156, [12:12] +unusedBit_1_13 = bits, U32, 1156, [13:13] +unusedBit_1_14 = bits, U32, 1156, [14:14] +unusedBit_1_15 = bits, U32, 1156, [15:15] +unusedBit_1_16 = bits, U32, 1156, [16:16] +unusedBit_1_17 = bits, U32, 1156, [17:17] +unusedBit_1_18 = bits, U32, 1156, [18:18] +unusedBit_1_19 = bits, U32, 1156, [19:19] +unusedBit_1_20 = bits, U32, 1156, [20:20] +unusedBit_1_21 = bits, U32, 1156, [21:21] +unusedBit_1_22 = bits, U32, 1156, [22:22] +unusedBit_1_23 = bits, U32, 1156, [23:23] +unusedBit_1_24 = bits, U32, 1156, [24:24] +unusedBit_1_25 = bits, U32, 1156, [25:25] +unusedBit_1_26 = bits, U32, 1156, [26:26] +unusedBit_1_27 = bits, U32, 1156, [27:27] +unusedBit_1_28 = bits, U32, 1156, [28:28] +unusedBit_1_29 = bits, U32, 1156, [29:29] +unusedBit_1_30 = bits, U32, 1156, [30:30] +unusedBit_1_31 = bits, U32, 1156, [31:31] +; total TS size = 1160 +wallFuelCorrection = scalar, F32, 1160, "", 1, 0 +wallFuel = scalar, F32, 1164, "", 1, 0 +; total TS size = 1168 +idleState = bits, S32, 1168, [0:2], "not important" +currentIdlePosition = scalar, F32, 1172 +baseIdlePosition = scalar, F32, 1176 +iacByTpsTaper = scalar, F32, 1180 +throttlePedalUpState = scalar, S32, 1184, "", 1, 0 +mightResetPid = bits, U32, 1188, [0:0] +shouldResetPid = bits, U32, 1188, [1:1] +wasResetPid = bits, U32, 1188, [2:2] +mustResetPid = bits, U32, 1188, [3:3] +isCranking = bits, U32, 1188, [4:4] +useIacTableForCoasting = bits, U32, 1188, [5:5] +notIdling = bits, U32, 1188, [6:6] +needReset = bits, U32, 1188, [7:7] +isInDeadZone = bits, U32, 1188, [8:8] +isBlipping = bits, U32, 1188, [9:9] +useClosedLoop = bits, U32, 1188, [10:10] +badTps = bits, U32, 1188, [11:11] +looksLikeRunning = bits, U32, 1188, [12:12] +looksLikeCoasting = bits, U32, 1188, [13:13] +looksLikeCrankToIdle = bits, U32, 1188, [14:14] +isVerboseIAC = bits, U32, 1188, [15:15] +isIdleCoasting = bits, U32, 1188, [16:16] +unusedBit_22_17 = bits, U32, 1188, [17:17] +unusedBit_22_18 = bits, U32, 1188, [18:18] +unusedBit_22_19 = bits, U32, 1188, [19:19] +unusedBit_22_20 = bits, U32, 1188, [20:20] +unusedBit_22_21 = bits, U32, 1188, [21:21] +unusedBit_22_22 = bits, U32, 1188, [22:22] +unusedBit_22_23 = bits, U32, 1188, [23:23] +unusedBit_22_24 = bits, U32, 1188, [24:24] +unusedBit_22_25 = bits, U32, 1188, [25:25] +unusedBit_22_26 = bits, U32, 1188, [26:26] +unusedBit_22_27 = bits, U32, 1188, [27:27] +unusedBit_22_28 = bits, U32, 1188, [28:28] +unusedBit_22_29 = bits, U32, 1188, [29:29] +unusedBit_22_30 = bits, U32, 1188, [30:30] +unusedBit_22_31 = bits, U32, 1188, [31:31] +targetRpmByClt = scalar, S32, 1192, "", 1, 0 +targetRpmAcBump = scalar, S32, 1196, "", 1, 0 +iacByRpmTaper = scalar, F32, 1200 +luaAdd = scalar, F32, 1204 +; total TS size = 1208 +baseDwell = scalar, F32, 1208, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 1212, "", 1, 0 +luaTimingAdd = scalar, F32, 1216, "", 1, 0 +luaTimingMult = scalar, F32, 1220, "", 1, 0 +; total TS size = 1224 +idlePosition = scalar, F32, 1224, "", 1, 0 +trim = scalar, F32, 1228, "", 1, 0 +luaAdjustment = scalar, F32, 1232, "", 1, 0 +etbFeedForward = scalar, F32, 1236 +etbIntegralError = scalar, F32, 1240, "", 1, 0 +etbCurrentTarget = scalar, F32, 1244, "%", 1, 0 +etbRevLimitActive = bits, U32, 1248, [0:0] +unusedBit_7_1 = bits, U32, 1248, [1:1] +unusedBit_7_2 = bits, U32, 1248, [2:2] +unusedBit_7_3 = bits, U32, 1248, [3:3] +unusedBit_7_4 = bits, U32, 1248, [4:4] +unusedBit_7_5 = bits, U32, 1248, [5:5] +unusedBit_7_6 = bits, U32, 1248, [6:6] +unusedBit_7_7 = bits, U32, 1248, [7:7] +unusedBit_7_8 = bits, U32, 1248, [8:8] +unusedBit_7_9 = bits, U32, 1248, [9:9] +unusedBit_7_10 = bits, U32, 1248, [10:10] +unusedBit_7_11 = bits, U32, 1248, [11:11] +unusedBit_7_12 = bits, U32, 1248, [12:12] +unusedBit_7_13 = bits, U32, 1248, [13:13] +unusedBit_7_14 = bits, U32, 1248, [14:14] +unusedBit_7_15 = bits, U32, 1248, [15:15] +unusedBit_7_16 = bits, U32, 1248, [16:16] +unusedBit_7_17 = bits, U32, 1248, [17:17] +unusedBit_7_18 = bits, U32, 1248, [18:18] +unusedBit_7_19 = bits, U32, 1248, [19:19] +unusedBit_7_20 = bits, U32, 1248, [20:20] +unusedBit_7_21 = bits, U32, 1248, [21:21] +unusedBit_7_22 = bits, U32, 1248, [22:22] +unusedBit_7_23 = bits, U32, 1248, [23:23] +unusedBit_7_24 = bits, U32, 1248, [24:24] +unusedBit_7_25 = bits, U32, 1248, [25:25] +unusedBit_7_26 = bits, U32, 1248, [26:26] +unusedBit_7_27 = bits, U32, 1248, [27:27] +unusedBit_7_28 = bits, U32, 1248, [28:28] +unusedBit_7_29 = bits, U32, 1248, [29:29] +unusedBit_7_30 = bits, U32, 1248, [30:30] +unusedBit_7_31 = bits, U32, 1248, [31:31] +; total TS size = 1252 +faultCode = scalar, U08, 1252, "", 1, 0 +heaterDuty = scalar, U08, 1253, "%", 1, 0 +pumpDuty = scalar, U08, 1254, "%", 1, 0 +tempC = scalar, U16, 1256, "C", 1, 0 +nernstVoltage = scalar, U16, 1258, "V", 0.001, 0 +esr = scalar, U16, 1260, "", 1, 0 +; total TS size = 1264 time = { timeNow } @@ -4993,6 +4994,7 @@ entry = mapVvt_MAP_AT_DIFF, "mapVvt_MAP_AT_DIFF", float, "%.3f" entry = mapVvt_MAP_AT_CYCLE_COUNT, "mapVvt_MAP_AT_CYCLE_COUNT", int, "%d" entry = mapVvt_map_peak, "mapVvt_map_peak", int, "%d" entry = currentEngineDecodedPhase, "Engine Phase", float, "%.3f" +entry = triggerToothAngleError, "triggerToothAngleError", float, "%.3f" entry = crankSynchronizationCounter, "Crank sync counter", int, "%d" entry = vvtSyncGapRatio, "vvtSyncGapRatio", float, "%.3f" entry = vvtCurrentPosition, "vvtCurrentPosition", float, "%.3f" @@ -5783,6 +5785,8 @@ dialog = trigger_centralDialog, "trigger_central" graphLine = mapVvt_MAP_AT_CYCLE_COUNT graphLine = mapVvt_map_peak graphLine = currentEngineDecodedPhase + liveGraph = trigger_central_4_Graph, "Graph", South + graphLine = triggerToothAngleError dialog = trigger_stateDialog, "trigger_state" 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 e7cc1b21ea..dd261896a0 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 Sat Sep 24 00:19:27 UTC 2022 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Sep 24 04:29:23 UTC 2022 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -2408,10 +2408,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.09.24.all.4136941473"; + public static final String TS_SIGNATURE = "rusEFI 2022.09.24.all.4059657144"; 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 = 1260; + public static final int TS_TOTAL_OUTPUT_SIZE = 1264; public static final int TsCalMode_EtbKd = 5; public static final int TsCalMode_EtbKi = 4; public static final int TsCalMode_EtbKp = 3; diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/TriggerCentral.java b/java_console/models/src/main/java/com/rusefi/config/generated/TriggerCentral.java index dd897fc0e1..e60b4968a2 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/TriggerCentral.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/TriggerCentral.java @@ -1,6 +1,6 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/trigger/trigger_central.txt Thu Sep 01 05:32:54 UTC 2022 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/trigger/trigger_central.txt Sat Sep 24 04:28:19 UTC 2022 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -20,6 +20,7 @@ public class TriggerCentral { public static final Field MAPVVT_MAP_PEAK = Field.create("MAPVVT_MAP_PEAK", 37, FieldType.INT8).setScale(1.0); public static final Field ALIGNMENTFILL_AT_38 = Field.create("ALIGNMENTFILL_AT_38", 38, FieldType.INT8).setScale(1.0); public static final Field CURRENTENGINEDECODEDPHASE = Field.create("CURRENTENGINEDECODEDPHASE", 40, FieldType.FLOAT); + public static final Field TRIGGERTOOTHANGLEERROR = Field.create("TRIGGERTOOTHANGLEERROR", 44, FieldType.FLOAT); public static final Field[] VALUES = { HWEVENTCOUNTERS1, HWEVENTCOUNTERS2, @@ -34,5 +35,6 @@ public class TriggerCentral { MAPVVT_MAP_PEAK, ALIGNMENTFILL_AT_38, CURRENTENGINEDECODEDPHASE, + TRIGGERTOOTHANGLEERROR, }; }