From b712732dff0e0c116b4fbdfb3826673b58922c36 Mon Sep 17 00:00:00 2001 From: GitHub gen-configs Action Date: Thu, 1 Sep 2022 05:33:56 +0000 Subject: [PATCH] Auto-generated configs and docs --- .../controllers/algo/rusefi_generated.h | 6 +- .../controllers/algo/rusefi_generated.h | 6 +- .../controllers/algo/rusefi_generated.h | 6 +- .../console/binary/generated/data_logs.ini | 2 +- .../binary/generated/output_channels.ini | 280 ++++++++--------- .../console/binary/generated/sensors.java | 79 ++--- .../generated/total_live_data_generated.h | 2 +- .../controllers/generated/rusefi_generated.h | 6 +- .../controllers/generated/signature_48way.h | 4 +- .../controllers/generated/signature_all.h | 4 +- .../generated/signature_alphax-2chan.h | 4 +- .../generated/signature_alphax-4chan.h | 4 +- .../controllers/generated/signature_atlas.h | 4 +- .../controllers/generated/signature_core8.h | 4 +- .../controllers/generated/signature_cypress.h | 4 +- .../generated/signature_f407-discovery.h | 4 +- .../generated/signature_f429-discovery.h | 4 +- .../generated/signature_frankenso_na6.h | 4 +- .../generated/signature_harley81.h | 4 +- .../generated/signature_hellen-gm-e67.h | 4 +- .../generated/signature_hellen-nb1.h | 4 +- .../generated/signature_hellen121nissan.h | 4 +- .../generated/signature_hellen121vag.h | 4 +- .../generated/signature_hellen128.h | 4 +- .../generated/signature_hellen154hyundai.h | 4 +- .../generated/signature_hellen72.h | 4 +- .../generated/signature_hellen81.h | 4 +- .../generated/signature_hellen88bmw.h | 4 +- .../generated/signature_hellenNA6.h | 4 +- .../generated/signature_hellenNA8_96.h | 4 +- .../controllers/generated/signature_kin.h | 4 +- .../controllers/generated/signature_mre_f4.h | 4 +- .../controllers/generated/signature_mre_f7.h | 4 +- .../generated/signature_prometheus_405.h | 4 +- .../generated/signature_prometheus_469.h | 4 +- .../generated/signature_proteus_f4.h | 4 +- .../generated/signature_proteus_f7.h | 4 +- .../generated/signature_proteus_h7.h | 4 +- .../generated/signature_subaru_eg33_f7.h | 4 +- .../generated/signature_tdg-pdm8.h | 4 +- .../trigger/trigger_central_generated.h | 18 +- firmware/tunerstudio/generated/rusefi.ini | 290 +++++++++--------- .../tunerstudio/generated/rusefi_48way.ini | 290 +++++++++--------- .../generated/rusefi_alphax-2chan.ini | 290 +++++++++--------- .../generated/rusefi_alphax-4chan.ini | 290 +++++++++--------- .../tunerstudio/generated/rusefi_atlas.ini | 290 +++++++++--------- .../tunerstudio/generated/rusefi_core8.ini | 290 +++++++++--------- .../tunerstudio/generated/rusefi_cypress.ini | 290 +++++++++--------- .../generated/rusefi_f407-discovery.ini | 290 +++++++++--------- .../generated/rusefi_f429-discovery.ini | 290 +++++++++--------- .../generated/rusefi_frankenso_na6.ini | 290 +++++++++--------- .../tunerstudio/generated/rusefi_harley81.ini | 290 +++++++++--------- .../generated/rusefi_hellen-gm-e67.ini | 290 +++++++++--------- .../generated/rusefi_hellen-nb1.ini | 290 +++++++++--------- .../generated/rusefi_hellen121nissan.ini | 290 +++++++++--------- .../generated/rusefi_hellen121vag.ini | 290 +++++++++--------- .../generated/rusefi_hellen128mercedes.ini | 290 +++++++++--------- .../generated/rusefi_hellen154hyundai.ini | 290 +++++++++--------- .../tunerstudio/generated/rusefi_hellen72.ini | 290 +++++++++--------- .../tunerstudio/generated/rusefi_hellen81.ini | 290 +++++++++--------- .../generated/rusefi_hellen88bmw.ini | 290 +++++++++--------- .../generated/rusefi_hellenNA6.ini | 290 +++++++++--------- .../generated/rusefi_hellenNA8_96.ini | 290 +++++++++--------- firmware/tunerstudio/generated/rusefi_kin.ini | 290 +++++++++--------- .../tunerstudio/generated/rusefi_mre_f4.ini | 290 +++++++++--------- .../tunerstudio/generated/rusefi_mre_f7.ini | 290 +++++++++--------- .../generated/rusefi_prometheus_405.ini | 290 +++++++++--------- .../generated/rusefi_prometheus_469.ini | 290 +++++++++--------- .../generated/rusefi_proteus_f4.ini | 290 +++++++++--------- .../generated/rusefi_proteus_f7.ini | 290 +++++++++--------- .../generated/rusefi_proteus_h7.ini | 290 +++++++++--------- .../generated/rusefi_subaru_eg33_f7.ini | 290 +++++++++--------- .../tunerstudio/generated/rusefi_tdg-pdm8.ini | 290 +++++++++--------- .../com/rusefi/config/generated/Fields.java | 6 +- .../config/generated/TriggerCentral.java | 6 +- 75 files changed, 4917 insertions(+), 4908 deletions(-) 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 51e92c50e7..21286a9136 100644 --- a/firmware/config/boards/cypress/config/controllers/algo/rusefi_generated.h +++ b/firmware/config/boards/cypress/config/controllers/algo/rusefi_generated.h @@ -1938,7 +1938,7 @@ #define show_Frankenso_presets true #define show_test_presets true #define showHumanReadableWarning_offset 960 -#define SIGNATURE_HASH 3757698725 +#define SIGNATURE_HASH 3633588924 #define silentTriggerError_offset 1360 #define skippedWheelOnCam_offset 1360 #define slowAdcAlpha_offset 1600 @@ -2498,12 +2498,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.01.cypress.3757698725" +#define TS_SIGNATURE "rusEFI 2022.09.01.cypress.3633588924" #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 1240 +#define TS_TOTAL_OUTPUT_SIZE 1244 #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 57938f13e1..ba1e15b173 100644 --- a/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h +++ b/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h @@ -1938,7 +1938,7 @@ #define show_Frankenso_presets true #define show_test_presets true #define showHumanReadableWarning_offset 960 -#define SIGNATURE_HASH 3073264745 +#define SIGNATURE_HASH 2957215856 #define silentTriggerError_offset 1360 #define skippedWheelOnCam_offset 1360 #define slowAdcAlpha_offset 1600 @@ -2498,12 +2498,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.01.kin.3073264745" +#define TS_SIGNATURE "rusEFI 2022.09.01.kin.2957215856" #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 1240 +#define TS_TOTAL_OUTPUT_SIZE 1244 #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 31f4ae4781..80c1e7774a 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 @@ -1904,7 +1904,7 @@ #define show_Proteus_presets false #define show_test_presets false #define showHumanReadableWarning_offset 960 -#define SIGNATURE_HASH 2800170879 +#define SIGNATURE_HASH 2710238054 #define silentTriggerError_offset 1360 #define skippedWheelOnCam_offset 1360 #define slowAdcAlpha_offset 1600 @@ -2465,12 +2465,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.01.subaru_eg33_f7.2800170879" +#define TS_SIGNATURE "rusEFI 2022.09.01.subaru_eg33_f7.2710238054" #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 1240 +#define TS_TOTAL_OUTPUT_SIZE 1244 #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 7bfdf8c07d..4596063603 100644 --- a/firmware/console/binary/generated/data_logs.ini +++ b/firmware/console/binary/generated/data_logs.ini @@ -404,7 +404,7 @@ entry = mapVvt_MAP_AT_SPECIAL_POINT, "mapVvt_MAP_AT_SPECIAL_POINT", float, "%.3 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 Phase2", int, "%d" +entry = currentEngineDecodedPhase, "Engine Phase2", float, "%.3f" entry = totalRevolutionCounter, "Crank revolution counter", int, "%d" entry = vvtSyncGapRatio, "vvtSyncGapRatio", float, "%.3f" entry = vvtCurrentPosition, "vvtCurrentPosition", float, "%.3f" diff --git a/firmware/console/binary/generated/output_channels.ini b/firmware/console/binary/generated/output_channels.ini index c060753cf9..07835ecf6d 100644 --- a/firmware/console/binary/generated/output_channels.ini +++ b/firmware/console/binary/generated/output_channels.ini @@ -964,144 +964,144 @@ mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1096, "", 1, 0 mapVvt_MAP_AT_DIFF = scalar, F32, 1100, "", 1, 0 mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1104, "", 1, 0 mapVvt_map_peak = scalar, U08, 1105, "", 1, 0 -currentEngineDecodedPhase = scalar, U16, 1106, "deg", 1, 0 -; total TS size = 1108 -totalRevolutionCounter = scalar, U32, 1108, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1112, "", 1, 0 -vvtCurrentPosition = scalar, F32, 1116, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1120, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 1124, "", 1, 0 -triggerStateIndex = scalar, U08, 1128, "", 1, 0 -vvtCounter = scalar, U08, 1129, "", 1, 0 -camResyncCounter = scalar, U08, 1130, "", 1, 0 -vvtStateIndex = scalar, U08, 1131, "", 1, 0 -; total TS size = 1132 -m_hasSynchronizedPhase = bits, U32, 1132, [0:0] -unusedBit_1_1 = bits, U32, 1132, [1:1] -unusedBit_1_2 = bits, U32, 1132, [2:2] -unusedBit_1_3 = bits, U32, 1132, [3:3] -unusedBit_1_4 = bits, U32, 1132, [4:4] -unusedBit_1_5 = bits, U32, 1132, [5:5] -unusedBit_1_6 = bits, U32, 1132, [6:6] -unusedBit_1_7 = bits, U32, 1132, [7:7] -unusedBit_1_8 = bits, U32, 1132, [8:8] -unusedBit_1_9 = bits, U32, 1132, [9:9] -unusedBit_1_10 = bits, U32, 1132, [10:10] -unusedBit_1_11 = bits, U32, 1132, [11:11] -unusedBit_1_12 = bits, U32, 1132, [12:12] -unusedBit_1_13 = bits, U32, 1132, [13:13] -unusedBit_1_14 = bits, U32, 1132, [14:14] -unusedBit_1_15 = bits, U32, 1132, [15:15] -unusedBit_1_16 = bits, U32, 1132, [16:16] -unusedBit_1_17 = bits, U32, 1132, [17:17] -unusedBit_1_18 = bits, U32, 1132, [18:18] -unusedBit_1_19 = bits, U32, 1132, [19:19] -unusedBit_1_20 = bits, U32, 1132, [20:20] -unusedBit_1_21 = bits, U32, 1132, [21:21] -unusedBit_1_22 = bits, U32, 1132, [22:22] -unusedBit_1_23 = bits, U32, 1132, [23:23] -unusedBit_1_24 = bits, U32, 1132, [24:24] -unusedBit_1_25 = bits, U32, 1132, [25:25] -unusedBit_1_26 = bits, U32, 1132, [26:26] -unusedBit_1_27 = bits, U32, 1132, [27:27] -unusedBit_1_28 = bits, U32, 1132, [28:28] -unusedBit_1_29 = bits, U32, 1132, [29:29] -unusedBit_1_30 = bits, U32, 1132, [30:30] -unusedBit_1_31 = bits, U32, 1132, [31:31] +currentEngineDecodedPhase = scalar, F32, 1108, "deg", 1, 0 +; total TS size = 1112 +totalRevolutionCounter = scalar, U32, 1112, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1116, "", 1, 0 +vvtCurrentPosition = scalar, F32, 1120, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1124, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 1128, "", 1, 0 +triggerStateIndex = scalar, U08, 1132, "", 1, 0 +vvtCounter = scalar, U08, 1133, "", 1, 0 +camResyncCounter = scalar, U08, 1134, "", 1, 0 +vvtStateIndex = scalar, U08, 1135, "", 1, 0 ; total TS size = 1136 -wallFuelCorrection = scalar, F32, 1136, "", 1, 0 -wallFuel = scalar, F32, 1140, "", 1, 0 -; total TS size = 1144 -idleState = bits, S32, 1144, [0:2], "not important" -currentIdlePosition = scalar, F32, 1148 -baseIdlePosition = scalar, F32, 1152 -iacByTpsTaper = scalar, F32, 1156 -throttlePedalUpState = scalar, S32, 1160, "", 1, 0 -mightResetPid = bits, U32, 1164, [0:0] -shouldResetPid = bits, U32, 1164, [1:1] -wasResetPid = bits, U32, 1164, [2:2] -mustResetPid = bits, U32, 1164, [3:3] -isCranking = bits, U32, 1164, [4:4] -useIacTableForCoasting = bits, U32, 1164, [5:5] -notIdling = bits, U32, 1164, [6:6] -needReset = bits, U32, 1164, [7:7] -isInDeadZone = bits, U32, 1164, [8:8] -isBlipping = bits, U32, 1164, [9:9] -useClosedLoop = bits, U32, 1164, [10:10] -badTps = bits, U32, 1164, [11:11] -looksLikeRunning = bits, U32, 1164, [12:12] -looksLikeCoasting = bits, U32, 1164, [13:13] -looksLikeCrankToIdle = bits, U32, 1164, [14:14] -isVerboseIAC = bits, U32, 1164, [15:15] -isIdleCoasting = bits, U32, 1164, [16:16] -unusedBit_22_17 = bits, U32, 1164, [17:17] -unusedBit_22_18 = bits, U32, 1164, [18:18] -unusedBit_22_19 = bits, U32, 1164, [19:19] -unusedBit_22_20 = bits, U32, 1164, [20:20] -unusedBit_22_21 = bits, U32, 1164, [21:21] -unusedBit_22_22 = bits, U32, 1164, [22:22] -unusedBit_22_23 = bits, U32, 1164, [23:23] -unusedBit_22_24 = bits, U32, 1164, [24:24] -unusedBit_22_25 = bits, U32, 1164, [25:25] -unusedBit_22_26 = bits, U32, 1164, [26:26] -unusedBit_22_27 = bits, U32, 1164, [27:27] -unusedBit_22_28 = bits, U32, 1164, [28:28] -unusedBit_22_29 = bits, U32, 1164, [29:29] -unusedBit_22_30 = bits, U32, 1164, [30:30] -unusedBit_22_31 = bits, U32, 1164, [31:31] -targetRpmByClt = scalar, S32, 1168, "", 1, 0 -targetRpmAcBump = scalar, S32, 1172, "", 1, 0 -iacByRpmTaper = scalar, F32, 1176 -luaAdd = scalar, F32, 1180 -; total TS size = 1184 -baseDwell = scalar, F32, 1184, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 1188, "", 1, 0 -luaTimingAdd = scalar, F32, 1192, "", 1, 0 -luaTimingMult = scalar, F32, 1196, "", 1, 0 -; total TS size = 1200 -idlePosition = scalar, F32, 1200, "", 1, 0 -trim = scalar, F32, 1204, "", 1, 0 -luaAdjustment = scalar, F32, 1208, "", 1, 0 -etbFeedForward = scalar, F32, 1212 -etbIntegralError = scalar, F32, 1216, "", 1, 0 -etbCurrentTarget = scalar, F32, 1220, "%", 1, 0 -etbRevLimitActive = bits, U32, 1224, [0:0] -unusedBit_7_1 = bits, U32, 1224, [1:1] -unusedBit_7_2 = bits, U32, 1224, [2:2] -unusedBit_7_3 = bits, U32, 1224, [3:3] -unusedBit_7_4 = bits, U32, 1224, [4:4] -unusedBit_7_5 = bits, U32, 1224, [5:5] -unusedBit_7_6 = bits, U32, 1224, [6:6] -unusedBit_7_7 = bits, U32, 1224, [7:7] -unusedBit_7_8 = bits, U32, 1224, [8:8] -unusedBit_7_9 = bits, U32, 1224, [9:9] -unusedBit_7_10 = bits, U32, 1224, [10:10] -unusedBit_7_11 = bits, U32, 1224, [11:11] -unusedBit_7_12 = bits, U32, 1224, [12:12] -unusedBit_7_13 = bits, U32, 1224, [13:13] -unusedBit_7_14 = bits, U32, 1224, [14:14] -unusedBit_7_15 = bits, U32, 1224, [15:15] -unusedBit_7_16 = bits, U32, 1224, [16:16] -unusedBit_7_17 = bits, U32, 1224, [17:17] -unusedBit_7_18 = bits, U32, 1224, [18:18] -unusedBit_7_19 = bits, U32, 1224, [19:19] -unusedBit_7_20 = bits, U32, 1224, [20:20] -unusedBit_7_21 = bits, U32, 1224, [21:21] -unusedBit_7_22 = bits, U32, 1224, [22:22] -unusedBit_7_23 = bits, U32, 1224, [23:23] -unusedBit_7_24 = bits, U32, 1224, [24:24] -unusedBit_7_25 = bits, U32, 1224, [25:25] -unusedBit_7_26 = bits, U32, 1224, [26:26] -unusedBit_7_27 = bits, U32, 1224, [27:27] -unusedBit_7_28 = bits, U32, 1224, [28:28] -unusedBit_7_29 = bits, U32, 1224, [29:29] -unusedBit_7_30 = bits, U32, 1224, [30:30] -unusedBit_7_31 = bits, U32, 1224, [31:31] -; total TS size = 1228 -faultCode = scalar, U08, 1228, "", 1, 0 -heaterDuty = scalar, U08, 1229, "%", 1, 0 -pumpDuty = scalar, U08, 1230, "%", 1, 0 -tempC = scalar, U16, 1232, "C", 1, 0 -nernstVoltage = scalar, U16, 1234, "V", 0.001, 0 -esr = scalar, U16, 1236, "", 1, 0 -; total TS size = 1240 +m_hasSynchronizedPhase = bits, U32, 1136, [0:0] +unusedBit_1_1 = bits, U32, 1136, [1:1] +unusedBit_1_2 = bits, U32, 1136, [2:2] +unusedBit_1_3 = bits, U32, 1136, [3:3] +unusedBit_1_4 = bits, U32, 1136, [4:4] +unusedBit_1_5 = bits, U32, 1136, [5:5] +unusedBit_1_6 = bits, U32, 1136, [6:6] +unusedBit_1_7 = bits, U32, 1136, [7:7] +unusedBit_1_8 = bits, U32, 1136, [8:8] +unusedBit_1_9 = bits, U32, 1136, [9:9] +unusedBit_1_10 = bits, U32, 1136, [10:10] +unusedBit_1_11 = bits, U32, 1136, [11:11] +unusedBit_1_12 = bits, U32, 1136, [12:12] +unusedBit_1_13 = bits, U32, 1136, [13:13] +unusedBit_1_14 = bits, U32, 1136, [14:14] +unusedBit_1_15 = bits, U32, 1136, [15:15] +unusedBit_1_16 = bits, U32, 1136, [16:16] +unusedBit_1_17 = bits, U32, 1136, [17:17] +unusedBit_1_18 = bits, U32, 1136, [18:18] +unusedBit_1_19 = bits, U32, 1136, [19:19] +unusedBit_1_20 = bits, U32, 1136, [20:20] +unusedBit_1_21 = bits, U32, 1136, [21:21] +unusedBit_1_22 = bits, U32, 1136, [22:22] +unusedBit_1_23 = bits, U32, 1136, [23:23] +unusedBit_1_24 = bits, U32, 1136, [24:24] +unusedBit_1_25 = bits, U32, 1136, [25:25] +unusedBit_1_26 = bits, U32, 1136, [26:26] +unusedBit_1_27 = bits, U32, 1136, [27:27] +unusedBit_1_28 = bits, U32, 1136, [28:28] +unusedBit_1_29 = bits, U32, 1136, [29:29] +unusedBit_1_30 = bits, U32, 1136, [30:30] +unusedBit_1_31 = bits, U32, 1136, [31:31] +; total TS size = 1140 +wallFuelCorrection = scalar, F32, 1140, "", 1, 0 +wallFuel = scalar, F32, 1144, "", 1, 0 +; total TS size = 1148 +idleState = bits, S32, 1148, [0:2], "not important" +currentIdlePosition = scalar, F32, 1152 +baseIdlePosition = scalar, F32, 1156 +iacByTpsTaper = scalar, F32, 1160 +throttlePedalUpState = scalar, S32, 1164, "", 1, 0 +mightResetPid = bits, U32, 1168, [0:0] +shouldResetPid = bits, U32, 1168, [1:1] +wasResetPid = bits, U32, 1168, [2:2] +mustResetPid = bits, U32, 1168, [3:3] +isCranking = bits, U32, 1168, [4:4] +useIacTableForCoasting = bits, U32, 1168, [5:5] +notIdling = bits, U32, 1168, [6:6] +needReset = bits, U32, 1168, [7:7] +isInDeadZone = bits, U32, 1168, [8:8] +isBlipping = bits, U32, 1168, [9:9] +useClosedLoop = bits, U32, 1168, [10:10] +badTps = bits, U32, 1168, [11:11] +looksLikeRunning = bits, U32, 1168, [12:12] +looksLikeCoasting = bits, U32, 1168, [13:13] +looksLikeCrankToIdle = bits, U32, 1168, [14:14] +isVerboseIAC = bits, U32, 1168, [15:15] +isIdleCoasting = bits, U32, 1168, [16:16] +unusedBit_22_17 = bits, U32, 1168, [17:17] +unusedBit_22_18 = bits, U32, 1168, [18:18] +unusedBit_22_19 = bits, U32, 1168, [19:19] +unusedBit_22_20 = bits, U32, 1168, [20:20] +unusedBit_22_21 = bits, U32, 1168, [21:21] +unusedBit_22_22 = bits, U32, 1168, [22:22] +unusedBit_22_23 = bits, U32, 1168, [23:23] +unusedBit_22_24 = bits, U32, 1168, [24:24] +unusedBit_22_25 = bits, U32, 1168, [25:25] +unusedBit_22_26 = bits, U32, 1168, [26:26] +unusedBit_22_27 = bits, U32, 1168, [27:27] +unusedBit_22_28 = bits, U32, 1168, [28:28] +unusedBit_22_29 = bits, U32, 1168, [29:29] +unusedBit_22_30 = bits, U32, 1168, [30:30] +unusedBit_22_31 = bits, U32, 1168, [31:31] +targetRpmByClt = scalar, S32, 1172, "", 1, 0 +targetRpmAcBump = scalar, S32, 1176, "", 1, 0 +iacByRpmTaper = scalar, F32, 1180 +luaAdd = scalar, F32, 1184 +; total TS size = 1188 +baseDwell = scalar, F32, 1188, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 1192, "", 1, 0 +luaTimingAdd = scalar, F32, 1196, "", 1, 0 +luaTimingMult = scalar, F32, 1200, "", 1, 0 +; total TS size = 1204 +idlePosition = scalar, F32, 1204, "", 1, 0 +trim = scalar, F32, 1208, "", 1, 0 +luaAdjustment = scalar, F32, 1212, "", 1, 0 +etbFeedForward = scalar, F32, 1216 +etbIntegralError = scalar, F32, 1220, "", 1, 0 +etbCurrentTarget = scalar, F32, 1224, "%", 1, 0 +etbRevLimitActive = bits, U32, 1228, [0:0] +unusedBit_7_1 = bits, U32, 1228, [1:1] +unusedBit_7_2 = bits, U32, 1228, [2:2] +unusedBit_7_3 = bits, U32, 1228, [3:3] +unusedBit_7_4 = bits, U32, 1228, [4:4] +unusedBit_7_5 = bits, U32, 1228, [5:5] +unusedBit_7_6 = bits, U32, 1228, [6:6] +unusedBit_7_7 = bits, U32, 1228, [7:7] +unusedBit_7_8 = bits, U32, 1228, [8:8] +unusedBit_7_9 = bits, U32, 1228, [9:9] +unusedBit_7_10 = bits, U32, 1228, [10:10] +unusedBit_7_11 = bits, U32, 1228, [11:11] +unusedBit_7_12 = bits, U32, 1228, [12:12] +unusedBit_7_13 = bits, U32, 1228, [13:13] +unusedBit_7_14 = bits, U32, 1228, [14:14] +unusedBit_7_15 = bits, U32, 1228, [15:15] +unusedBit_7_16 = bits, U32, 1228, [16:16] +unusedBit_7_17 = bits, U32, 1228, [17:17] +unusedBit_7_18 = bits, U32, 1228, [18:18] +unusedBit_7_19 = bits, U32, 1228, [19:19] +unusedBit_7_20 = bits, U32, 1228, [20:20] +unusedBit_7_21 = bits, U32, 1228, [21:21] +unusedBit_7_22 = bits, U32, 1228, [22:22] +unusedBit_7_23 = bits, U32, 1228, [23:23] +unusedBit_7_24 = bits, U32, 1228, [24:24] +unusedBit_7_25 = bits, U32, 1228, [25:25] +unusedBit_7_26 = bits, U32, 1228, [26:26] +unusedBit_7_27 = bits, U32, 1228, [27:27] +unusedBit_7_28 = bits, U32, 1228, [28:28] +unusedBit_7_29 = bits, U32, 1228, [29:29] +unusedBit_7_30 = bits, U32, 1228, [30:30] +unusedBit_7_31 = bits, U32, 1228, [31:31] +; total TS size = 1232 +faultCode = scalar, U08, 1232, "", 1, 0 +heaterDuty = scalar, U08, 1233, "%", 1, 0 +pumpDuty = scalar, U08, 1234, "%", 1, 0 +tempC = scalar, U16, 1236, "C", 1, 0 +nernstVoltage = scalar, U16, 1238, "V", 0.001, 0 +esr = scalar, U16, 1240, "", 1, 0 +; total TS size = 1244 diff --git a/firmware/console/binary/generated/sensors.java b/firmware/console/binary/generated/sensors.java index c7794fb7d1..9ae3e49596 100644 --- a/firmware/console/binary/generated/sensors.java +++ b/firmware/console/binary/generated/sensors.java @@ -453,42 +453,43 @@ mapVvt_MAP_AT_SPECIAL_POINT("mapVvt_MAP_AT_SPECIAL_POINT", SensorCategory.SENSOR mapVvt_MAP_AT_DIFF("mapVvt_MAP_AT_DIFF", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1100, 1.0, -10000.0, 10000.0, ""), mapVvt_MAP_AT_CYCLE_COUNT("mapVvt_MAP_AT_CYCLE_COUNT", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1104, 1.0, -10000.0, 10000.0, ""), mapVvt_map_peak("mapVvt_map_peak", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1105, 1.0, -10000.0, 10000.0, ""), -currentEngineDecodedPhase("Engine Phase2", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1106, 1.0, 0.0, 0.0, "deg"), -totalRevolutionCounter("Crank revolution counter", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1108, 1.0, -1.0, -1.0, ""), -vvtSyncGapRatio("vvtSyncGapRatio", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1112, 1.0, -10000.0, 10000.0, ""), -vvtCurrentPosition("vvtCurrentPosition", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1116, 1.0, -10000.0, 10000.0, ""), -triggerSyncGapRatio("Trigger Sync Latest Ratio", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1120, 1.0, -10000.0, 10000.0, ""), -triggerActualSyncGapRatio("trigger: unused field?", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1124, 1.0, -1.0, -1.0, ""), -triggerStateIndex("triggerStateIndex", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1128, 1.0, -1.0, -1.0, ""), -vvtCounter("vvtCounter", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1129, 1.0, -1.0, -1.0, ""), -camResyncCounter("camResyncCounter", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1130, 1.0, -1.0, -1.0, ""), -vvtStateIndex("vvtStateIndex", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1131, 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, 1136, 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, 1140, 1.0, -1.0, -1.0, ""), -idleState("idleState", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1144, 1.0, -1.0, -1.0, ""), -currentIdlePosition("idle: current position\nthat's current position with CLT and IAT corrections", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1148, 1.0, -1.0, -1.0, ""), -baseIdlePosition("idle: base value\ncurrent position without adjustments (iacByTpsTaper, afterCrankingIACtaperDuration)", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1152, 1.0, -1.0, -1.0, ""), -iacByTpsTaper("idle: iacByTpsTaper portion of idle", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1156, 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, 1160, 1.0, -1.0, -1.0, ""), -targetRpmByClt("idle: target by CLT", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1168, 1.0, -1.0, -1.0, ""), -targetRpmAcBump("idle: A/C bump", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1172, 1.0, -1.0, -1.0, ""), -iacByRpmTaper("idle: iacByRpmTaper portion of idle", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1176, 1.0, -1.0, -1.0, ""), -luaAdd("idle: Lua Adder", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1180, 1.0, -1.0, -1.0, ""), -baseDwell("baseDwell", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1184, 1.0, -1.0, -1.0, ""), -dwellVoltageCorrection("dwellVoltageCorrection", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1188, 1.0, -1.0, -1.0, ""), -luaTimingAdd("luaTimingAdd", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1192, 1.0, -1.0, -1.0, ""), -luaTimingMult("luaTimingMult", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1196, 1.0, -1.0, -1.0, ""), -idlePosition("idlePosition", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1200, 1.0, -1.0, -1.0, ""), -trim("trim", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1204, 1.0, -1.0, -1.0, ""), -luaAdjustment("luaAdjustment", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1208, 1.0, -1.0, -1.0, ""), -etbFeedForward("etbFeedForward", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1212, 1.0, -1.0, -1.0, ""), -etbIntegralError("etbIntegralError", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1216, 1.0, -10000.0, 10000.0, ""), -etbCurrentTarget("etbCurrentTarget", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1220, 1.0, -10000.0, 10000.0, "%"), -faultCode("faultCode", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1228, 1.0, -1.0, -1.0, ""), -heaterDuty("heaterDuty", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1229, 1.0, 0.0, 100.0, "%"), -pumpDuty("pumpDuty", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1230, 1.0, 0.0, 100.0, "%"), -alignmentFill_at_3("need 4 byte alignment", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1231, 1.0, -20.0, 100.0, "units"), -tempC("tempC", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1232, 1.0, 500.0, 1000.0, "C"), -nernstVoltage("nernstVoltage", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1234, 0.001, 0.0, 1.0, "V"), -esr("esr", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1236, 1.0, -1.0, -1.0, ""), -alignmentFill_at_10("need 4 byte alignment", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1238, 1.0, -20.0, 100.0, "units"), +alignmentFill_at_38("need 4 byte alignment", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1106, 1.0, -20.0, 100.0, "units"), +currentEngineDecodedPhase("Engine Phase2", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1108, 1.0, 0.0, 0.0, "deg"), +totalRevolutionCounter("Crank revolution counter", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1112, 1.0, -1.0, -1.0, ""), +vvtSyncGapRatio("vvtSyncGapRatio", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1116, 1.0, -10000.0, 10000.0, ""), +vvtCurrentPosition("vvtCurrentPosition", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1120, 1.0, -10000.0, 10000.0, ""), +triggerSyncGapRatio("Trigger Sync Latest Ratio", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1124, 1.0, -10000.0, 10000.0, ""), +triggerActualSyncGapRatio("trigger: unused field?", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1128, 1.0, -1.0, -1.0, ""), +triggerStateIndex("triggerStateIndex", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1132, 1.0, -1.0, -1.0, ""), +vvtCounter("vvtCounter", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1133, 1.0, -1.0, -1.0, ""), +camResyncCounter("camResyncCounter", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1134, 1.0, -1.0, -1.0, ""), +vvtStateIndex("vvtStateIndex", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1135, 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, 1140, 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, 1144, 1.0, -1.0, -1.0, ""), +idleState("idleState", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1148, 1.0, -1.0, -1.0, ""), +currentIdlePosition("idle: current position\nthat's current position with CLT and IAT corrections", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1152, 1.0, -1.0, -1.0, ""), +baseIdlePosition("idle: base value\ncurrent position without adjustments (iacByTpsTaper, afterCrankingIACtaperDuration)", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1156, 1.0, -1.0, -1.0, ""), +iacByTpsTaper("idle: iacByTpsTaper portion of idle", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1160, 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, 1164, 1.0, -1.0, -1.0, ""), +targetRpmByClt("idle: target by CLT", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1172, 1.0, -1.0, -1.0, ""), +targetRpmAcBump("idle: A/C bump", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1176, 1.0, -1.0, -1.0, ""), +iacByRpmTaper("idle: iacByRpmTaper portion of idle", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1180, 1.0, -1.0, -1.0, ""), +luaAdd("idle: Lua Adder", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1184, 1.0, -1.0, -1.0, ""), +baseDwell("baseDwell", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1188, 1.0, -1.0, -1.0, ""), +dwellVoltageCorrection("dwellVoltageCorrection", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1192, 1.0, -1.0, -1.0, ""), +luaTimingAdd("luaTimingAdd", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1196, 1.0, -1.0, -1.0, ""), +luaTimingMult("luaTimingMult", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1200, 1.0, -1.0, -1.0, ""), +idlePosition("idlePosition", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1204, 1.0, -1.0, -1.0, ""), +trim("trim", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1208, 1.0, -1.0, -1.0, ""), +luaAdjustment("luaAdjustment", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1212, 1.0, -1.0, -1.0, ""), +etbFeedForward("etbFeedForward", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1216, 1.0, -1.0, -1.0, ""), +etbIntegralError("etbIntegralError", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1220, 1.0, -10000.0, 10000.0, ""), +etbCurrentTarget("etbCurrentTarget", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1224, 1.0, -10000.0, 10000.0, "%"), +faultCode("faultCode", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1232, 1.0, -1.0, -1.0, ""), +heaterDuty("heaterDuty", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1233, 1.0, 0.0, 100.0, "%"), +pumpDuty("pumpDuty", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1234, 1.0, 0.0, 100.0, "%"), +alignmentFill_at_3("need 4 byte alignment", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1235, 1.0, -20.0, 100.0, "units"), +tempC("tempC", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1236, 1.0, 500.0, 1000.0, "C"), +nernstVoltage("nernstVoltage", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1238, 0.001, 0.0, 1.0, "V"), +esr("esr", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1240, 1.0, -1.0, -1.0, ""), +alignmentFill_at_10("need 4 byte alignment", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1242, 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 cb208d8930..a79c3e233d 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 1240 \ No newline at end of file +#define TS_TOTAL_OUTPUT_SIZE 1244 \ No newline at end of file diff --git a/firmware/controllers/generated/rusefi_generated.h b/firmware/controllers/generated/rusefi_generated.h index c326de182f..4476a8cef9 100644 --- a/firmware/controllers/generated/rusefi_generated.h +++ b/firmware/controllers/generated/rusefi_generated.h @@ -1938,7 +1938,7 @@ #define show_Frankenso_presets true #define show_test_presets true #define showHumanReadableWarning_offset 960 -#define SIGNATURE_HASH 3757698725 +#define SIGNATURE_HASH 3633588924 #define silentTriggerError_offset 1360 #define skippedWheelOnCam_offset 1360 #define slowAdcAlpha_offset 1600 @@ -2498,12 +2498,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.01.all.3757698725" +#define TS_SIGNATURE "rusEFI 2022.09.01.all.3633588924" #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 1240 +#define TS_TOTAL_OUTPUT_SIZE 1244 #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 e1dfbb5c2e..418434c4d5 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 3370051306 -#define TS_SIGNATURE "rusEFI 2022.09.01.48way.3370051306" +#define SIGNATURE_HASH 3484623603 +#define TS_SIGNATURE "rusEFI 2022.09.01.48way.3484623603" diff --git a/firmware/controllers/generated/signature_all.h b/firmware/controllers/generated/signature_all.h index 2ce1907ca4..f18a9b669a 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 3757698725 -#define TS_SIGNATURE "rusEFI 2022.09.01.all.3757698725" +#define SIGNATURE_HASH 3633588924 +#define TS_SIGNATURE "rusEFI 2022.09.01.all.3633588924" diff --git a/firmware/controllers/generated/signature_alphax-2chan.h b/firmware/controllers/generated/signature_alphax-2chan.h index fcc4f5a1cf..c53f3c3cbc 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 3991630793 -#define TS_SIGNATURE "rusEFI 2022.09.01.alphax-2chan.3991630793" +#define SIGNATURE_HASH 3934697424 +#define TS_SIGNATURE "rusEFI 2022.09.01.alphax-2chan.3934697424" diff --git a/firmware/controllers/generated/signature_alphax-4chan.h b/firmware/controllers/generated/signature_alphax-4chan.h index bff83cf80a..d86ae388e8 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 1424305450 -#define TS_SIGNATURE "rusEFI 2022.09.01.alphax-4chan.1424305450" +#define SIGNATURE_HASH 1401481523 +#define TS_SIGNATURE "rusEFI 2022.09.01.alphax-4chan.1401481523" diff --git a/firmware/controllers/generated/signature_atlas.h b/firmware/controllers/generated/signature_atlas.h index 6bbecb4f69..bdf0a5e23b 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 3274906498 -#define TS_SIGNATURE "rusEFI 2022.09.01.atlas.3274906498" +#define SIGNATURE_HASH 3294551963 +#define TS_SIGNATURE "rusEFI 2022.09.01.atlas.3294551963" diff --git a/firmware/controllers/generated/signature_core8.h b/firmware/controllers/generated/signature_core8.h index 4568bfef60..ec53d339bd 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 689291100 -#define TS_SIGNATURE "rusEFI 2022.09.01.core8.689291100" +#define SIGNATURE_HASH 779647813 +#define TS_SIGNATURE "rusEFI 2022.09.01.core8.779647813" diff --git a/firmware/controllers/generated/signature_cypress.h b/firmware/controllers/generated/signature_cypress.h index 5059991ef2..1f90847035 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 3757698725 -#define TS_SIGNATURE "rusEFI 2022.09.01.cypress.3757698725" +#define SIGNATURE_HASH 3633588924 +#define TS_SIGNATURE "rusEFI 2022.09.01.cypress.3633588924" diff --git a/firmware/controllers/generated/signature_f407-discovery.h b/firmware/controllers/generated/signature_f407-discovery.h index 3a0aafe7c9..11942adc6e 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 3757698725 -#define TS_SIGNATURE "rusEFI 2022.09.01.f407-discovery.3757698725" +#define SIGNATURE_HASH 3633588924 +#define TS_SIGNATURE "rusEFI 2022.09.01.f407-discovery.3633588924" diff --git a/firmware/controllers/generated/signature_f429-discovery.h b/firmware/controllers/generated/signature_f429-discovery.h index 96439927b0..5e72583c18 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 3757698725 -#define TS_SIGNATURE "rusEFI 2022.09.01.f429-discovery.3757698725" +#define SIGNATURE_HASH 3633588924 +#define TS_SIGNATURE "rusEFI 2022.09.01.f429-discovery.3633588924" diff --git a/firmware/controllers/generated/signature_frankenso_na6.h b/firmware/controllers/generated/signature_frankenso_na6.h index 7c7062f71a..e42fc8c816 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 2643792481 -#define TS_SIGNATURE "rusEFI 2022.09.01.frankenso_na6.2643792481" +#define SIGNATURE_HASH 2599999096 +#define TS_SIGNATURE "rusEFI 2022.09.01.frankenso_na6.2599999096" diff --git a/firmware/controllers/generated/signature_harley81.h b/firmware/controllers/generated/signature_harley81.h index de3cc2dcd2..a6df84c0a0 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 788851594 -#define TS_SIGNATURE "rusEFI 2022.09.01.harley81.788851594" +#define SIGNATURE_HASH 677982099 +#define TS_SIGNATURE "rusEFI 2022.09.01.harley81.677982099" diff --git a/firmware/controllers/generated/signature_hellen-gm-e67.h b/firmware/controllers/generated/signature_hellen-gm-e67.h index 9966a50762..22089fd2a0 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 1805544211 -#define TS_SIGNATURE "rusEFI 2022.09.01.hellen-gm-e67.1805544211" +#define SIGNATURE_HASH 1827909386 +#define TS_SIGNATURE "rusEFI 2022.09.01.hellen-gm-e67.1827909386" diff --git a/firmware/controllers/generated/signature_hellen-nb1.h b/firmware/controllers/generated/signature_hellen-nb1.h index 4ba2b686f6..faee89c6a3 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 108191593 -#define TS_SIGNATURE "rusEFI 2022.09.01.hellen-nb1.108191593" +#define SIGNATURE_HASH 18815856 +#define TS_SIGNATURE "rusEFI 2022.09.01.hellen-nb1.18815856" diff --git a/firmware/controllers/generated/signature_hellen121nissan.h b/firmware/controllers/generated/signature_hellen121nissan.h index ae9cd3df29..cea6bb4044 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 1462195791 -#define TS_SIGNATURE "rusEFI 2022.09.01.hellen121nissan.1462195791" +#define SIGNATURE_HASH 1347064406 +#define TS_SIGNATURE "rusEFI 2022.09.01.hellen121nissan.1347064406" diff --git a/firmware/controllers/generated/signature_hellen121vag.h b/firmware/controllers/generated/signature_hellen121vag.h index fcc6d87e0d..7fcd1580d3 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 2950180319 -#define TS_SIGNATURE "rusEFI 2022.09.01.hellen121vag.2950180319" +#define SIGNATURE_HASH 2830494150 +#define TS_SIGNATURE "rusEFI 2022.09.01.hellen121vag.2830494150" diff --git a/firmware/controllers/generated/signature_hellen128.h b/firmware/controllers/generated/signature_hellen128.h index 80823ccee6..dcc1d277dc 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 554161051 -#define TS_SIGNATURE "rusEFI 2022.09.01.hellen128.554161051" +#define SIGNATURE_HASH 644487042 +#define TS_SIGNATURE "rusEFI 2022.09.01.hellen128.644487042" diff --git a/firmware/controllers/generated/signature_hellen154hyundai.h b/firmware/controllers/generated/signature_hellen154hyundai.h index 1b0babac55..6ae67a39b8 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 1203149857 -#define TS_SIGNATURE "rusEFI 2022.09.01.hellen154hyundai.1203149857" +#define SIGNATURE_HASH 1088116792 +#define TS_SIGNATURE "rusEFI 2022.09.01.hellen154hyundai.1088116792" diff --git a/firmware/controllers/generated/signature_hellen72.h b/firmware/controllers/generated/signature_hellen72.h index 46afd92273..ea97de0493 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 768001953 -#define TS_SIGNATURE "rusEFI 2022.09.01.hellen72.768001953" +#define SIGNATURE_HASH 715850680 +#define TS_SIGNATURE "rusEFI 2022.09.01.hellen72.715850680" diff --git a/firmware/controllers/generated/signature_hellen81.h b/firmware/controllers/generated/signature_hellen81.h index 72a8d287f5..d8195f7b3a 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 4249630383 -#define TS_SIGNATURE "rusEFI 2022.09.01.hellen81.4249630383" +#define SIGNATURE_HASH 4196528822 +#define TS_SIGNATURE "rusEFI 2022.09.01.hellen81.4196528822" diff --git a/firmware/controllers/generated/signature_hellen88bmw.h b/firmware/controllers/generated/signature_hellen88bmw.h index 15fd8000ea..25d9914f90 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 3389848937 -#define TS_SIGNATURE "rusEFI 2022.09.01.hellen88bmw.3389848937" +#define SIGNATURE_HASH 3445700976 +#define TS_SIGNATURE "rusEFI 2022.09.01.hellen88bmw.3445700976" diff --git a/firmware/controllers/generated/signature_hellenNA6.h b/firmware/controllers/generated/signature_hellenNA6.h index 911f99f1fd..97d4c37bad 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 436973607 -#define TS_SIGNATURE "rusEFI 2022.09.01.hellenNA6.436973607" +#define SIGNATURE_HASH 493253694 +#define TS_SIGNATURE "rusEFI 2022.09.01.hellenNA6.493253694" diff --git a/firmware/controllers/generated/signature_hellenNA8_96.h b/firmware/controllers/generated/signature_hellenNA8_96.h index a21e06e397..cbb94b86ef 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 2146459469 -#define TS_SIGNATURE "rusEFI 2022.09.01.hellenNA8_96.2146459469" +#define SIGNATURE_HASH 2023594836 +#define TS_SIGNATURE "rusEFI 2022.09.01.hellenNA8_96.2023594836" diff --git a/firmware/controllers/generated/signature_kin.h b/firmware/controllers/generated/signature_kin.h index 06d07f2689..58f930335d 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 3073264745 -#define TS_SIGNATURE "rusEFI 2022.09.01.kin.3073264745" +#define SIGNATURE_HASH 2957215856 +#define TS_SIGNATURE "rusEFI 2022.09.01.kin.2957215856" diff --git a/firmware/controllers/generated/signature_mre_f4.h b/firmware/controllers/generated/signature_mre_f4.h index 5e93de220b..8d656b47be 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 271540819 -#define TS_SIGNATURE "rusEFI 2022.09.01.mre_f4.271540819" +#define SIGNATURE_HASH 390243914 +#define TS_SIGNATURE "rusEFI 2022.09.01.mre_f4.390243914" diff --git a/firmware/controllers/generated/signature_mre_f7.h b/firmware/controllers/generated/signature_mre_f7.h index a9bf9872f5..7caba35f09 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 271540819 -#define TS_SIGNATURE "rusEFI 2022.09.01.mre_f7.271540819" +#define SIGNATURE_HASH 390243914 +#define TS_SIGNATURE "rusEFI 2022.09.01.mre_f7.390243914" diff --git a/firmware/controllers/generated/signature_prometheus_405.h b/firmware/controllers/generated/signature_prometheus_405.h index a080bad1fc..30541d37c6 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 2400401219 -#define TS_SIGNATURE "rusEFI 2022.09.01.prometheus_405.2400401219" +#define SIGNATURE_HASH 2290021210 +#define TS_SIGNATURE "rusEFI 2022.09.01.prometheus_405.2290021210" diff --git a/firmware/controllers/generated/signature_prometheus_469.h b/firmware/controllers/generated/signature_prometheus_469.h index 9e92991569..1f6a00a633 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 2400401219 -#define TS_SIGNATURE "rusEFI 2022.09.01.prometheus_469.2400401219" +#define SIGNATURE_HASH 2290021210 +#define TS_SIGNATURE "rusEFI 2022.09.01.prometheus_469.2290021210" diff --git a/firmware/controllers/generated/signature_proteus_f4.h b/firmware/controllers/generated/signature_proteus_f4.h index 88bf98f99c..c0b2ef9eea 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 2050238931 -#define TS_SIGNATURE "rusEFI 2022.09.01.proteus_f4.2050238931" +#define SIGNATURE_HASH 2103045578 +#define TS_SIGNATURE "rusEFI 2022.09.01.proteus_f4.2103045578" diff --git a/firmware/controllers/generated/signature_proteus_f7.h b/firmware/controllers/generated/signature_proteus_f7.h index bb8ae10cf6..f5c1e025aa 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 2050238931 -#define TS_SIGNATURE "rusEFI 2022.09.01.proteus_f7.2050238931" +#define SIGNATURE_HASH 2103045578 +#define TS_SIGNATURE "rusEFI 2022.09.01.proteus_f7.2103045578" diff --git a/firmware/controllers/generated/signature_proteus_h7.h b/firmware/controllers/generated/signature_proteus_h7.h index 3d3ea26c0d..d6c42ebe99 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 2050238931 -#define TS_SIGNATURE "rusEFI 2022.09.01.proteus_h7.2050238931" +#define SIGNATURE_HASH 2103045578 +#define TS_SIGNATURE "rusEFI 2022.09.01.proteus_h7.2103045578" diff --git a/firmware/controllers/generated/signature_subaru_eg33_f7.h b/firmware/controllers/generated/signature_subaru_eg33_f7.h index 2304f6ad24..7c6b939011 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 2800170879 -#define TS_SIGNATURE "rusEFI 2022.09.01.subaru_eg33_f7.2800170879" +#define SIGNATURE_HASH 2710238054 +#define TS_SIGNATURE "rusEFI 2022.09.01.subaru_eg33_f7.2710238054" diff --git a/firmware/controllers/generated/signature_tdg-pdm8.h b/firmware/controllers/generated/signature_tdg-pdm8.h index 46432051b1..55fb333e4d 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 1978736881 -#define TS_SIGNATURE "rusEFI 2022.09.01.tdg-pdm8.1978736881" +#define SIGNATURE_HASH 1922884840 +#define TS_SIGNATURE "rusEFI 2022.09.01.tdg-pdm8.1922884840" diff --git a/firmware/controllers/trigger/trigger_central_generated.h b/firmware/controllers/trigger/trigger_central_generated.h index 60f7901ba5..cdd94dc0a2 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 04:52:03 UTC 2022 +// this section 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 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -32,13 +32,19 @@ struct trigger_central_s { */ uint8_t mapVvt_map_peak = (uint8_t)0; /** - * Engine Phase2 - deg + * need 4 byte alignment + units * offset 38 */ - scaled_channel currentEngineDecodedPhase = (uint16_t)0; + uint8_t alignmentFill_at_38[2]; + /** + * Engine Phase2 + deg + * offset 40 + */ + scaled_channel currentEngineDecodedPhase = (float)0; }; -static_assert(sizeof(trigger_central_s) == 40); +static_assert(sizeof(trigger_central_s) == 44); // end -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/trigger/trigger_central.txt Thu Sep 01 04:52:03 UTC 2022 +// this section 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 diff --git a/firmware/tunerstudio/generated/rusefi.ini b/firmware/tunerstudio/generated/rusefi.ini index ad23518065..38b3f16c35 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.01.all.3757698725" + signature = "rusEFI 2022.09.01.all.3633588924" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.09.01.all.3757698725" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.09.01.all.3633588924" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Sep 01 04:52:53 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Sep 01 05:33:45 UTC 2022 pageSize = 21300 page = 1 @@ -2118,7 +2118,7 @@ maxKnockRetardRpmBins = array, U08, 21294, [6], "RPM", 100.0, 0, 0, 25000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1240 + ochBlockSize = 1244 ; ; see TunerStudioOutputChannels struct @@ -3090,147 +3090,147 @@ mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1096, "", 1, 0 mapVvt_MAP_AT_DIFF = scalar, F32, 1100, "", 1, 0 mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1104, "", 1, 0 mapVvt_map_peak = scalar, U08, 1105, "", 1, 0 -currentEngineDecodedPhase = scalar, U16, 1106, "deg", 1, 0 -; total TS size = 1108 -totalRevolutionCounter = scalar, U32, 1108, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1112, "", 1, 0 -vvtCurrentPosition = scalar, F32, 1116, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1120, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 1124, "", 1, 0 -triggerStateIndex = scalar, U08, 1128, "", 1, 0 -vvtCounter = scalar, U08, 1129, "", 1, 0 -camResyncCounter = scalar, U08, 1130, "", 1, 0 -vvtStateIndex = scalar, U08, 1131, "", 1, 0 -; total TS size = 1132 -m_hasSynchronizedPhase = bits, U32, 1132, [0:0] -unusedBit_1_1 = bits, U32, 1132, [1:1] -unusedBit_1_2 = bits, U32, 1132, [2:2] -unusedBit_1_3 = bits, U32, 1132, [3:3] -unusedBit_1_4 = bits, U32, 1132, [4:4] -unusedBit_1_5 = bits, U32, 1132, [5:5] -unusedBit_1_6 = bits, U32, 1132, [6:6] -unusedBit_1_7 = bits, U32, 1132, [7:7] -unusedBit_1_8 = bits, U32, 1132, [8:8] -unusedBit_1_9 = bits, U32, 1132, [9:9] -unusedBit_1_10 = bits, U32, 1132, [10:10] -unusedBit_1_11 = bits, U32, 1132, [11:11] -unusedBit_1_12 = bits, U32, 1132, [12:12] -unusedBit_1_13 = bits, U32, 1132, [13:13] -unusedBit_1_14 = bits, U32, 1132, [14:14] -unusedBit_1_15 = bits, U32, 1132, [15:15] -unusedBit_1_16 = bits, U32, 1132, [16:16] -unusedBit_1_17 = bits, U32, 1132, [17:17] -unusedBit_1_18 = bits, U32, 1132, [18:18] -unusedBit_1_19 = bits, U32, 1132, [19:19] -unusedBit_1_20 = bits, U32, 1132, [20:20] -unusedBit_1_21 = bits, U32, 1132, [21:21] -unusedBit_1_22 = bits, U32, 1132, [22:22] -unusedBit_1_23 = bits, U32, 1132, [23:23] -unusedBit_1_24 = bits, U32, 1132, [24:24] -unusedBit_1_25 = bits, U32, 1132, [25:25] -unusedBit_1_26 = bits, U32, 1132, [26:26] -unusedBit_1_27 = bits, U32, 1132, [27:27] -unusedBit_1_28 = bits, U32, 1132, [28:28] -unusedBit_1_29 = bits, U32, 1132, [29:29] -unusedBit_1_30 = bits, U32, 1132, [30:30] -unusedBit_1_31 = bits, U32, 1132, [31:31] +currentEngineDecodedPhase = scalar, F32, 1108, "deg", 1, 0 +; total TS size = 1112 +totalRevolutionCounter = scalar, U32, 1112, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1116, "", 1, 0 +vvtCurrentPosition = scalar, F32, 1120, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1124, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 1128, "", 1, 0 +triggerStateIndex = scalar, U08, 1132, "", 1, 0 +vvtCounter = scalar, U08, 1133, "", 1, 0 +camResyncCounter = scalar, U08, 1134, "", 1, 0 +vvtStateIndex = scalar, U08, 1135, "", 1, 0 ; total TS size = 1136 -wallFuelCorrection = scalar, F32, 1136, "", 1, 0 -wallFuel = scalar, F32, 1140, "", 1, 0 -; total TS size = 1144 -idleState = bits, S32, 1144, [0:2], "not important" -currentIdlePosition = scalar, F32, 1148 -baseIdlePosition = scalar, F32, 1152 -iacByTpsTaper = scalar, F32, 1156 -throttlePedalUpState = scalar, S32, 1160, "", 1, 0 -mightResetPid = bits, U32, 1164, [0:0] -shouldResetPid = bits, U32, 1164, [1:1] -wasResetPid = bits, U32, 1164, [2:2] -mustResetPid = bits, U32, 1164, [3:3] -isCranking = bits, U32, 1164, [4:4] -useIacTableForCoasting = bits, U32, 1164, [5:5] -notIdling = bits, U32, 1164, [6:6] -needReset = bits, U32, 1164, [7:7] -isInDeadZone = bits, U32, 1164, [8:8] -isBlipping = bits, U32, 1164, [9:9] -useClosedLoop = bits, U32, 1164, [10:10] -badTps = bits, U32, 1164, [11:11] -looksLikeRunning = bits, U32, 1164, [12:12] -looksLikeCoasting = bits, U32, 1164, [13:13] -looksLikeCrankToIdle = bits, U32, 1164, [14:14] -isVerboseIAC = bits, U32, 1164, [15:15] -isIdleCoasting = bits, U32, 1164, [16:16] -unusedBit_22_17 = bits, U32, 1164, [17:17] -unusedBit_22_18 = bits, U32, 1164, [18:18] -unusedBit_22_19 = bits, U32, 1164, [19:19] -unusedBit_22_20 = bits, U32, 1164, [20:20] -unusedBit_22_21 = bits, U32, 1164, [21:21] -unusedBit_22_22 = bits, U32, 1164, [22:22] -unusedBit_22_23 = bits, U32, 1164, [23:23] -unusedBit_22_24 = bits, U32, 1164, [24:24] -unusedBit_22_25 = bits, U32, 1164, [25:25] -unusedBit_22_26 = bits, U32, 1164, [26:26] -unusedBit_22_27 = bits, U32, 1164, [27:27] -unusedBit_22_28 = bits, U32, 1164, [28:28] -unusedBit_22_29 = bits, U32, 1164, [29:29] -unusedBit_22_30 = bits, U32, 1164, [30:30] -unusedBit_22_31 = bits, U32, 1164, [31:31] -targetRpmByClt = scalar, S32, 1168, "", 1, 0 -targetRpmAcBump = scalar, S32, 1172, "", 1, 0 -iacByRpmTaper = scalar, F32, 1176 -luaAdd = scalar, F32, 1180 -; total TS size = 1184 -baseDwell = scalar, F32, 1184, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 1188, "", 1, 0 -luaTimingAdd = scalar, F32, 1192, "", 1, 0 -luaTimingMult = scalar, F32, 1196, "", 1, 0 -; total TS size = 1200 -idlePosition = scalar, F32, 1200, "", 1, 0 -trim = scalar, F32, 1204, "", 1, 0 -luaAdjustment = scalar, F32, 1208, "", 1, 0 -etbFeedForward = scalar, F32, 1212 -etbIntegralError = scalar, F32, 1216, "", 1, 0 -etbCurrentTarget = scalar, F32, 1220, "%", 1, 0 -etbRevLimitActive = bits, U32, 1224, [0:0] -unusedBit_7_1 = bits, U32, 1224, [1:1] -unusedBit_7_2 = bits, U32, 1224, [2:2] -unusedBit_7_3 = bits, U32, 1224, [3:3] -unusedBit_7_4 = bits, U32, 1224, [4:4] -unusedBit_7_5 = bits, U32, 1224, [5:5] -unusedBit_7_6 = bits, U32, 1224, [6:6] -unusedBit_7_7 = bits, U32, 1224, [7:7] -unusedBit_7_8 = bits, U32, 1224, [8:8] -unusedBit_7_9 = bits, U32, 1224, [9:9] -unusedBit_7_10 = bits, U32, 1224, [10:10] -unusedBit_7_11 = bits, U32, 1224, [11:11] -unusedBit_7_12 = bits, U32, 1224, [12:12] -unusedBit_7_13 = bits, U32, 1224, [13:13] -unusedBit_7_14 = bits, U32, 1224, [14:14] -unusedBit_7_15 = bits, U32, 1224, [15:15] -unusedBit_7_16 = bits, U32, 1224, [16:16] -unusedBit_7_17 = bits, U32, 1224, [17:17] -unusedBit_7_18 = bits, U32, 1224, [18:18] -unusedBit_7_19 = bits, U32, 1224, [19:19] -unusedBit_7_20 = bits, U32, 1224, [20:20] -unusedBit_7_21 = bits, U32, 1224, [21:21] -unusedBit_7_22 = bits, U32, 1224, [22:22] -unusedBit_7_23 = bits, U32, 1224, [23:23] -unusedBit_7_24 = bits, U32, 1224, [24:24] -unusedBit_7_25 = bits, U32, 1224, [25:25] -unusedBit_7_26 = bits, U32, 1224, [26:26] -unusedBit_7_27 = bits, U32, 1224, [27:27] -unusedBit_7_28 = bits, U32, 1224, [28:28] -unusedBit_7_29 = bits, U32, 1224, [29:29] -unusedBit_7_30 = bits, U32, 1224, [30:30] -unusedBit_7_31 = bits, U32, 1224, [31:31] -; total TS size = 1228 -faultCode = scalar, U08, 1228, "", 1, 0 -heaterDuty = scalar, U08, 1229, "%", 1, 0 -pumpDuty = scalar, U08, 1230, "%", 1, 0 -tempC = scalar, U16, 1232, "C", 1, 0 -nernstVoltage = scalar, U16, 1234, "V", 0.001, 0 -esr = scalar, U16, 1236, "", 1, 0 -; total TS size = 1240 +m_hasSynchronizedPhase = bits, U32, 1136, [0:0] +unusedBit_1_1 = bits, U32, 1136, [1:1] +unusedBit_1_2 = bits, U32, 1136, [2:2] +unusedBit_1_3 = bits, U32, 1136, [3:3] +unusedBit_1_4 = bits, U32, 1136, [4:4] +unusedBit_1_5 = bits, U32, 1136, [5:5] +unusedBit_1_6 = bits, U32, 1136, [6:6] +unusedBit_1_7 = bits, U32, 1136, [7:7] +unusedBit_1_8 = bits, U32, 1136, [8:8] +unusedBit_1_9 = bits, U32, 1136, [9:9] +unusedBit_1_10 = bits, U32, 1136, [10:10] +unusedBit_1_11 = bits, U32, 1136, [11:11] +unusedBit_1_12 = bits, U32, 1136, [12:12] +unusedBit_1_13 = bits, U32, 1136, [13:13] +unusedBit_1_14 = bits, U32, 1136, [14:14] +unusedBit_1_15 = bits, U32, 1136, [15:15] +unusedBit_1_16 = bits, U32, 1136, [16:16] +unusedBit_1_17 = bits, U32, 1136, [17:17] +unusedBit_1_18 = bits, U32, 1136, [18:18] +unusedBit_1_19 = bits, U32, 1136, [19:19] +unusedBit_1_20 = bits, U32, 1136, [20:20] +unusedBit_1_21 = bits, U32, 1136, [21:21] +unusedBit_1_22 = bits, U32, 1136, [22:22] +unusedBit_1_23 = bits, U32, 1136, [23:23] +unusedBit_1_24 = bits, U32, 1136, [24:24] +unusedBit_1_25 = bits, U32, 1136, [25:25] +unusedBit_1_26 = bits, U32, 1136, [26:26] +unusedBit_1_27 = bits, U32, 1136, [27:27] +unusedBit_1_28 = bits, U32, 1136, [28:28] +unusedBit_1_29 = bits, U32, 1136, [29:29] +unusedBit_1_30 = bits, U32, 1136, [30:30] +unusedBit_1_31 = bits, U32, 1136, [31:31] +; total TS size = 1140 +wallFuelCorrection = scalar, F32, 1140, "", 1, 0 +wallFuel = scalar, F32, 1144, "", 1, 0 +; total TS size = 1148 +idleState = bits, S32, 1148, [0:2], "not important" +currentIdlePosition = scalar, F32, 1152 +baseIdlePosition = scalar, F32, 1156 +iacByTpsTaper = scalar, F32, 1160 +throttlePedalUpState = scalar, S32, 1164, "", 1, 0 +mightResetPid = bits, U32, 1168, [0:0] +shouldResetPid = bits, U32, 1168, [1:1] +wasResetPid = bits, U32, 1168, [2:2] +mustResetPid = bits, U32, 1168, [3:3] +isCranking = bits, U32, 1168, [4:4] +useIacTableForCoasting = bits, U32, 1168, [5:5] +notIdling = bits, U32, 1168, [6:6] +needReset = bits, U32, 1168, [7:7] +isInDeadZone = bits, U32, 1168, [8:8] +isBlipping = bits, U32, 1168, [9:9] +useClosedLoop = bits, U32, 1168, [10:10] +badTps = bits, U32, 1168, [11:11] +looksLikeRunning = bits, U32, 1168, [12:12] +looksLikeCoasting = bits, U32, 1168, [13:13] +looksLikeCrankToIdle = bits, U32, 1168, [14:14] +isVerboseIAC = bits, U32, 1168, [15:15] +isIdleCoasting = bits, U32, 1168, [16:16] +unusedBit_22_17 = bits, U32, 1168, [17:17] +unusedBit_22_18 = bits, U32, 1168, [18:18] +unusedBit_22_19 = bits, U32, 1168, [19:19] +unusedBit_22_20 = bits, U32, 1168, [20:20] +unusedBit_22_21 = bits, U32, 1168, [21:21] +unusedBit_22_22 = bits, U32, 1168, [22:22] +unusedBit_22_23 = bits, U32, 1168, [23:23] +unusedBit_22_24 = bits, U32, 1168, [24:24] +unusedBit_22_25 = bits, U32, 1168, [25:25] +unusedBit_22_26 = bits, U32, 1168, [26:26] +unusedBit_22_27 = bits, U32, 1168, [27:27] +unusedBit_22_28 = bits, U32, 1168, [28:28] +unusedBit_22_29 = bits, U32, 1168, [29:29] +unusedBit_22_30 = bits, U32, 1168, [30:30] +unusedBit_22_31 = bits, U32, 1168, [31:31] +targetRpmByClt = scalar, S32, 1172, "", 1, 0 +targetRpmAcBump = scalar, S32, 1176, "", 1, 0 +iacByRpmTaper = scalar, F32, 1180 +luaAdd = scalar, F32, 1184 +; total TS size = 1188 +baseDwell = scalar, F32, 1188, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 1192, "", 1, 0 +luaTimingAdd = scalar, F32, 1196, "", 1, 0 +luaTimingMult = scalar, F32, 1200, "", 1, 0 +; total TS size = 1204 +idlePosition = scalar, F32, 1204, "", 1, 0 +trim = scalar, F32, 1208, "", 1, 0 +luaAdjustment = scalar, F32, 1212, "", 1, 0 +etbFeedForward = scalar, F32, 1216 +etbIntegralError = scalar, F32, 1220, "", 1, 0 +etbCurrentTarget = scalar, F32, 1224, "%", 1, 0 +etbRevLimitActive = bits, U32, 1228, [0:0] +unusedBit_7_1 = bits, U32, 1228, [1:1] +unusedBit_7_2 = bits, U32, 1228, [2:2] +unusedBit_7_3 = bits, U32, 1228, [3:3] +unusedBit_7_4 = bits, U32, 1228, [4:4] +unusedBit_7_5 = bits, U32, 1228, [5:5] +unusedBit_7_6 = bits, U32, 1228, [6:6] +unusedBit_7_7 = bits, U32, 1228, [7:7] +unusedBit_7_8 = bits, U32, 1228, [8:8] +unusedBit_7_9 = bits, U32, 1228, [9:9] +unusedBit_7_10 = bits, U32, 1228, [10:10] +unusedBit_7_11 = bits, U32, 1228, [11:11] +unusedBit_7_12 = bits, U32, 1228, [12:12] +unusedBit_7_13 = bits, U32, 1228, [13:13] +unusedBit_7_14 = bits, U32, 1228, [14:14] +unusedBit_7_15 = bits, U32, 1228, [15:15] +unusedBit_7_16 = bits, U32, 1228, [16:16] +unusedBit_7_17 = bits, U32, 1228, [17:17] +unusedBit_7_18 = bits, U32, 1228, [18:18] +unusedBit_7_19 = bits, U32, 1228, [19:19] +unusedBit_7_20 = bits, U32, 1228, [20:20] +unusedBit_7_21 = bits, U32, 1228, [21:21] +unusedBit_7_22 = bits, U32, 1228, [22:22] +unusedBit_7_23 = bits, U32, 1228, [23:23] +unusedBit_7_24 = bits, U32, 1228, [24:24] +unusedBit_7_25 = bits, U32, 1228, [25:25] +unusedBit_7_26 = bits, U32, 1228, [26:26] +unusedBit_7_27 = bits, U32, 1228, [27:27] +unusedBit_7_28 = bits, U32, 1228, [28:28] +unusedBit_7_29 = bits, U32, 1228, [29:29] +unusedBit_7_30 = bits, U32, 1228, [30:30] +unusedBit_7_31 = bits, U32, 1228, [31:31] +; total TS size = 1232 +faultCode = scalar, U08, 1232, "", 1, 0 +heaterDuty = scalar, U08, 1233, "%", 1, 0 +pumpDuty = scalar, U08, 1234, "%", 1, 0 +tempC = scalar, U16, 1236, "C", 1, 0 +nernstVoltage = scalar, U16, 1238, "V", 0.001, 0 +esr = scalar, U16, 1240, "", 1, 0 +; total TS size = 1244 time = { timeNow } @@ -4847,7 +4847,7 @@ entry = mapVvt_MAP_AT_SPECIAL_POINT, "mapVvt_MAP_AT_SPECIAL_POINT", float, "%.3 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 Phase2", int, "%d" +entry = currentEngineDecodedPhase, "Engine Phase2", float, "%.3f" entry = totalRevolutionCounter, "Crank revolution counter", int, "%d" entry = vvtSyncGapRatio, "vvtSyncGapRatio", float, "%.3f" entry = vvtCurrentPosition, "vvtCurrentPosition", float, "%.3f" diff --git a/firmware/tunerstudio/generated/rusefi_48way.ini b/firmware/tunerstudio/generated/rusefi_48way.ini index 9b19b98a93..aa11e495f5 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.01.48way.3370051306" + signature = "rusEFI 2022.09.01.48way.3484623603" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.09.01.48way.3370051306" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.09.01.48way.3484623603" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Sep 01 04:52:36 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Sep 01 05:33:27 UTC 2022 pageSize = 21300 page = 1 @@ -2118,7 +2118,7 @@ maxKnockRetardRpmBins = array, U08, 21294, [6], "RPM", 100.0, 0, 0, 25000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1240 + ochBlockSize = 1244 ; ; see TunerStudioOutputChannels struct @@ -3090,147 +3090,147 @@ mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1096, "", 1, 0 mapVvt_MAP_AT_DIFF = scalar, F32, 1100, "", 1, 0 mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1104, "", 1, 0 mapVvt_map_peak = scalar, U08, 1105, "", 1, 0 -currentEngineDecodedPhase = scalar, U16, 1106, "deg", 1, 0 -; total TS size = 1108 -totalRevolutionCounter = scalar, U32, 1108, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1112, "", 1, 0 -vvtCurrentPosition = scalar, F32, 1116, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1120, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 1124, "", 1, 0 -triggerStateIndex = scalar, U08, 1128, "", 1, 0 -vvtCounter = scalar, U08, 1129, "", 1, 0 -camResyncCounter = scalar, U08, 1130, "", 1, 0 -vvtStateIndex = scalar, U08, 1131, "", 1, 0 -; total TS size = 1132 -m_hasSynchronizedPhase = bits, U32, 1132, [0:0] -unusedBit_1_1 = bits, U32, 1132, [1:1] -unusedBit_1_2 = bits, U32, 1132, [2:2] -unusedBit_1_3 = bits, U32, 1132, [3:3] -unusedBit_1_4 = bits, U32, 1132, [4:4] -unusedBit_1_5 = bits, U32, 1132, [5:5] -unusedBit_1_6 = bits, U32, 1132, [6:6] -unusedBit_1_7 = bits, U32, 1132, [7:7] -unusedBit_1_8 = bits, U32, 1132, [8:8] -unusedBit_1_9 = bits, U32, 1132, [9:9] -unusedBit_1_10 = bits, U32, 1132, [10:10] -unusedBit_1_11 = bits, U32, 1132, [11:11] -unusedBit_1_12 = bits, U32, 1132, [12:12] -unusedBit_1_13 = bits, U32, 1132, [13:13] -unusedBit_1_14 = bits, U32, 1132, [14:14] -unusedBit_1_15 = bits, U32, 1132, [15:15] -unusedBit_1_16 = bits, U32, 1132, [16:16] -unusedBit_1_17 = bits, U32, 1132, [17:17] -unusedBit_1_18 = bits, U32, 1132, [18:18] -unusedBit_1_19 = bits, U32, 1132, [19:19] -unusedBit_1_20 = bits, U32, 1132, [20:20] -unusedBit_1_21 = bits, U32, 1132, [21:21] -unusedBit_1_22 = bits, U32, 1132, [22:22] -unusedBit_1_23 = bits, U32, 1132, [23:23] -unusedBit_1_24 = bits, U32, 1132, [24:24] -unusedBit_1_25 = bits, U32, 1132, [25:25] -unusedBit_1_26 = bits, U32, 1132, [26:26] -unusedBit_1_27 = bits, U32, 1132, [27:27] -unusedBit_1_28 = bits, U32, 1132, [28:28] -unusedBit_1_29 = bits, U32, 1132, [29:29] -unusedBit_1_30 = bits, U32, 1132, [30:30] -unusedBit_1_31 = bits, U32, 1132, [31:31] +currentEngineDecodedPhase = scalar, F32, 1108, "deg", 1, 0 +; total TS size = 1112 +totalRevolutionCounter = scalar, U32, 1112, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1116, "", 1, 0 +vvtCurrentPosition = scalar, F32, 1120, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1124, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 1128, "", 1, 0 +triggerStateIndex = scalar, U08, 1132, "", 1, 0 +vvtCounter = scalar, U08, 1133, "", 1, 0 +camResyncCounter = scalar, U08, 1134, "", 1, 0 +vvtStateIndex = scalar, U08, 1135, "", 1, 0 ; total TS size = 1136 -wallFuelCorrection = scalar, F32, 1136, "", 1, 0 -wallFuel = scalar, F32, 1140, "", 1, 0 -; total TS size = 1144 -idleState = bits, S32, 1144, [0:2], "not important" -currentIdlePosition = scalar, F32, 1148 -baseIdlePosition = scalar, F32, 1152 -iacByTpsTaper = scalar, F32, 1156 -throttlePedalUpState = scalar, S32, 1160, "", 1, 0 -mightResetPid = bits, U32, 1164, [0:0] -shouldResetPid = bits, U32, 1164, [1:1] -wasResetPid = bits, U32, 1164, [2:2] -mustResetPid = bits, U32, 1164, [3:3] -isCranking = bits, U32, 1164, [4:4] -useIacTableForCoasting = bits, U32, 1164, [5:5] -notIdling = bits, U32, 1164, [6:6] -needReset = bits, U32, 1164, [7:7] -isInDeadZone = bits, U32, 1164, [8:8] -isBlipping = bits, U32, 1164, [9:9] -useClosedLoop = bits, U32, 1164, [10:10] -badTps = bits, U32, 1164, [11:11] -looksLikeRunning = bits, U32, 1164, [12:12] -looksLikeCoasting = bits, U32, 1164, [13:13] -looksLikeCrankToIdle = bits, U32, 1164, [14:14] -isVerboseIAC = bits, U32, 1164, [15:15] -isIdleCoasting = bits, U32, 1164, [16:16] -unusedBit_22_17 = bits, U32, 1164, [17:17] -unusedBit_22_18 = bits, U32, 1164, [18:18] -unusedBit_22_19 = bits, U32, 1164, [19:19] -unusedBit_22_20 = bits, U32, 1164, [20:20] -unusedBit_22_21 = bits, U32, 1164, [21:21] -unusedBit_22_22 = bits, U32, 1164, [22:22] -unusedBit_22_23 = bits, U32, 1164, [23:23] -unusedBit_22_24 = bits, U32, 1164, [24:24] -unusedBit_22_25 = bits, U32, 1164, [25:25] -unusedBit_22_26 = bits, U32, 1164, [26:26] -unusedBit_22_27 = bits, U32, 1164, [27:27] -unusedBit_22_28 = bits, U32, 1164, [28:28] -unusedBit_22_29 = bits, U32, 1164, [29:29] -unusedBit_22_30 = bits, U32, 1164, [30:30] -unusedBit_22_31 = bits, U32, 1164, [31:31] -targetRpmByClt = scalar, S32, 1168, "", 1, 0 -targetRpmAcBump = scalar, S32, 1172, "", 1, 0 -iacByRpmTaper = scalar, F32, 1176 -luaAdd = scalar, F32, 1180 -; total TS size = 1184 -baseDwell = scalar, F32, 1184, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 1188, "", 1, 0 -luaTimingAdd = scalar, F32, 1192, "", 1, 0 -luaTimingMult = scalar, F32, 1196, "", 1, 0 -; total TS size = 1200 -idlePosition = scalar, F32, 1200, "", 1, 0 -trim = scalar, F32, 1204, "", 1, 0 -luaAdjustment = scalar, F32, 1208, "", 1, 0 -etbFeedForward = scalar, F32, 1212 -etbIntegralError = scalar, F32, 1216, "", 1, 0 -etbCurrentTarget = scalar, F32, 1220, "%", 1, 0 -etbRevLimitActive = bits, U32, 1224, [0:0] -unusedBit_7_1 = bits, U32, 1224, [1:1] -unusedBit_7_2 = bits, U32, 1224, [2:2] -unusedBit_7_3 = bits, U32, 1224, [3:3] -unusedBit_7_4 = bits, U32, 1224, [4:4] -unusedBit_7_5 = bits, U32, 1224, [5:5] -unusedBit_7_6 = bits, U32, 1224, [6:6] -unusedBit_7_7 = bits, U32, 1224, [7:7] -unusedBit_7_8 = bits, U32, 1224, [8:8] -unusedBit_7_9 = bits, U32, 1224, [9:9] -unusedBit_7_10 = bits, U32, 1224, [10:10] -unusedBit_7_11 = bits, U32, 1224, [11:11] -unusedBit_7_12 = bits, U32, 1224, [12:12] -unusedBit_7_13 = bits, U32, 1224, [13:13] -unusedBit_7_14 = bits, U32, 1224, [14:14] -unusedBit_7_15 = bits, U32, 1224, [15:15] -unusedBit_7_16 = bits, U32, 1224, [16:16] -unusedBit_7_17 = bits, U32, 1224, [17:17] -unusedBit_7_18 = bits, U32, 1224, [18:18] -unusedBit_7_19 = bits, U32, 1224, [19:19] -unusedBit_7_20 = bits, U32, 1224, [20:20] -unusedBit_7_21 = bits, U32, 1224, [21:21] -unusedBit_7_22 = bits, U32, 1224, [22:22] -unusedBit_7_23 = bits, U32, 1224, [23:23] -unusedBit_7_24 = bits, U32, 1224, [24:24] -unusedBit_7_25 = bits, U32, 1224, [25:25] -unusedBit_7_26 = bits, U32, 1224, [26:26] -unusedBit_7_27 = bits, U32, 1224, [27:27] -unusedBit_7_28 = bits, U32, 1224, [28:28] -unusedBit_7_29 = bits, U32, 1224, [29:29] -unusedBit_7_30 = bits, U32, 1224, [30:30] -unusedBit_7_31 = bits, U32, 1224, [31:31] -; total TS size = 1228 -faultCode = scalar, U08, 1228, "", 1, 0 -heaterDuty = scalar, U08, 1229, "%", 1, 0 -pumpDuty = scalar, U08, 1230, "%", 1, 0 -tempC = scalar, U16, 1232, "C", 1, 0 -nernstVoltage = scalar, U16, 1234, "V", 0.001, 0 -esr = scalar, U16, 1236, "", 1, 0 -; total TS size = 1240 +m_hasSynchronizedPhase = bits, U32, 1136, [0:0] +unusedBit_1_1 = bits, U32, 1136, [1:1] +unusedBit_1_2 = bits, U32, 1136, [2:2] +unusedBit_1_3 = bits, U32, 1136, [3:3] +unusedBit_1_4 = bits, U32, 1136, [4:4] +unusedBit_1_5 = bits, U32, 1136, [5:5] +unusedBit_1_6 = bits, U32, 1136, [6:6] +unusedBit_1_7 = bits, U32, 1136, [7:7] +unusedBit_1_8 = bits, U32, 1136, [8:8] +unusedBit_1_9 = bits, U32, 1136, [9:9] +unusedBit_1_10 = bits, U32, 1136, [10:10] +unusedBit_1_11 = bits, U32, 1136, [11:11] +unusedBit_1_12 = bits, U32, 1136, [12:12] +unusedBit_1_13 = bits, U32, 1136, [13:13] +unusedBit_1_14 = bits, U32, 1136, [14:14] +unusedBit_1_15 = bits, U32, 1136, [15:15] +unusedBit_1_16 = bits, U32, 1136, [16:16] +unusedBit_1_17 = bits, U32, 1136, [17:17] +unusedBit_1_18 = bits, U32, 1136, [18:18] +unusedBit_1_19 = bits, U32, 1136, [19:19] +unusedBit_1_20 = bits, U32, 1136, [20:20] +unusedBit_1_21 = bits, U32, 1136, [21:21] +unusedBit_1_22 = bits, U32, 1136, [22:22] +unusedBit_1_23 = bits, U32, 1136, [23:23] +unusedBit_1_24 = bits, U32, 1136, [24:24] +unusedBit_1_25 = bits, U32, 1136, [25:25] +unusedBit_1_26 = bits, U32, 1136, [26:26] +unusedBit_1_27 = bits, U32, 1136, [27:27] +unusedBit_1_28 = bits, U32, 1136, [28:28] +unusedBit_1_29 = bits, U32, 1136, [29:29] +unusedBit_1_30 = bits, U32, 1136, [30:30] +unusedBit_1_31 = bits, U32, 1136, [31:31] +; total TS size = 1140 +wallFuelCorrection = scalar, F32, 1140, "", 1, 0 +wallFuel = scalar, F32, 1144, "", 1, 0 +; total TS size = 1148 +idleState = bits, S32, 1148, [0:2], "not important" +currentIdlePosition = scalar, F32, 1152 +baseIdlePosition = scalar, F32, 1156 +iacByTpsTaper = scalar, F32, 1160 +throttlePedalUpState = scalar, S32, 1164, "", 1, 0 +mightResetPid = bits, U32, 1168, [0:0] +shouldResetPid = bits, U32, 1168, [1:1] +wasResetPid = bits, U32, 1168, [2:2] +mustResetPid = bits, U32, 1168, [3:3] +isCranking = bits, U32, 1168, [4:4] +useIacTableForCoasting = bits, U32, 1168, [5:5] +notIdling = bits, U32, 1168, [6:6] +needReset = bits, U32, 1168, [7:7] +isInDeadZone = bits, U32, 1168, [8:8] +isBlipping = bits, U32, 1168, [9:9] +useClosedLoop = bits, U32, 1168, [10:10] +badTps = bits, U32, 1168, [11:11] +looksLikeRunning = bits, U32, 1168, [12:12] +looksLikeCoasting = bits, U32, 1168, [13:13] +looksLikeCrankToIdle = bits, U32, 1168, [14:14] +isVerboseIAC = bits, U32, 1168, [15:15] +isIdleCoasting = bits, U32, 1168, [16:16] +unusedBit_22_17 = bits, U32, 1168, [17:17] +unusedBit_22_18 = bits, U32, 1168, [18:18] +unusedBit_22_19 = bits, U32, 1168, [19:19] +unusedBit_22_20 = bits, U32, 1168, [20:20] +unusedBit_22_21 = bits, U32, 1168, [21:21] +unusedBit_22_22 = bits, U32, 1168, [22:22] +unusedBit_22_23 = bits, U32, 1168, [23:23] +unusedBit_22_24 = bits, U32, 1168, [24:24] +unusedBit_22_25 = bits, U32, 1168, [25:25] +unusedBit_22_26 = bits, U32, 1168, [26:26] +unusedBit_22_27 = bits, U32, 1168, [27:27] +unusedBit_22_28 = bits, U32, 1168, [28:28] +unusedBit_22_29 = bits, U32, 1168, [29:29] +unusedBit_22_30 = bits, U32, 1168, [30:30] +unusedBit_22_31 = bits, U32, 1168, [31:31] +targetRpmByClt = scalar, S32, 1172, "", 1, 0 +targetRpmAcBump = scalar, S32, 1176, "", 1, 0 +iacByRpmTaper = scalar, F32, 1180 +luaAdd = scalar, F32, 1184 +; total TS size = 1188 +baseDwell = scalar, F32, 1188, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 1192, "", 1, 0 +luaTimingAdd = scalar, F32, 1196, "", 1, 0 +luaTimingMult = scalar, F32, 1200, "", 1, 0 +; total TS size = 1204 +idlePosition = scalar, F32, 1204, "", 1, 0 +trim = scalar, F32, 1208, "", 1, 0 +luaAdjustment = scalar, F32, 1212, "", 1, 0 +etbFeedForward = scalar, F32, 1216 +etbIntegralError = scalar, F32, 1220, "", 1, 0 +etbCurrentTarget = scalar, F32, 1224, "%", 1, 0 +etbRevLimitActive = bits, U32, 1228, [0:0] +unusedBit_7_1 = bits, U32, 1228, [1:1] +unusedBit_7_2 = bits, U32, 1228, [2:2] +unusedBit_7_3 = bits, U32, 1228, [3:3] +unusedBit_7_4 = bits, U32, 1228, [4:4] +unusedBit_7_5 = bits, U32, 1228, [5:5] +unusedBit_7_6 = bits, U32, 1228, [6:6] +unusedBit_7_7 = bits, U32, 1228, [7:7] +unusedBit_7_8 = bits, U32, 1228, [8:8] +unusedBit_7_9 = bits, U32, 1228, [9:9] +unusedBit_7_10 = bits, U32, 1228, [10:10] +unusedBit_7_11 = bits, U32, 1228, [11:11] +unusedBit_7_12 = bits, U32, 1228, [12:12] +unusedBit_7_13 = bits, U32, 1228, [13:13] +unusedBit_7_14 = bits, U32, 1228, [14:14] +unusedBit_7_15 = bits, U32, 1228, [15:15] +unusedBit_7_16 = bits, U32, 1228, [16:16] +unusedBit_7_17 = bits, U32, 1228, [17:17] +unusedBit_7_18 = bits, U32, 1228, [18:18] +unusedBit_7_19 = bits, U32, 1228, [19:19] +unusedBit_7_20 = bits, U32, 1228, [20:20] +unusedBit_7_21 = bits, U32, 1228, [21:21] +unusedBit_7_22 = bits, U32, 1228, [22:22] +unusedBit_7_23 = bits, U32, 1228, [23:23] +unusedBit_7_24 = bits, U32, 1228, [24:24] +unusedBit_7_25 = bits, U32, 1228, [25:25] +unusedBit_7_26 = bits, U32, 1228, [26:26] +unusedBit_7_27 = bits, U32, 1228, [27:27] +unusedBit_7_28 = bits, U32, 1228, [28:28] +unusedBit_7_29 = bits, U32, 1228, [29:29] +unusedBit_7_30 = bits, U32, 1228, [30:30] +unusedBit_7_31 = bits, U32, 1228, [31:31] +; total TS size = 1232 +faultCode = scalar, U08, 1232, "", 1, 0 +heaterDuty = scalar, U08, 1233, "%", 1, 0 +pumpDuty = scalar, U08, 1234, "%", 1, 0 +tempC = scalar, U16, 1236, "C", 1, 0 +nernstVoltage = scalar, U16, 1238, "V", 0.001, 0 +esr = scalar, U16, 1240, "", 1, 0 +; total TS size = 1244 time = { timeNow } @@ -4847,7 +4847,7 @@ entry = mapVvt_MAP_AT_SPECIAL_POINT, "mapVvt_MAP_AT_SPECIAL_POINT", float, "%.3 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 Phase2", int, "%d" +entry = currentEngineDecodedPhase, "Engine Phase2", float, "%.3f" entry = totalRevolutionCounter, "Crank revolution counter", int, "%d" entry = vvtSyncGapRatio, "vvtSyncGapRatio", float, "%.3f" entry = vvtCurrentPosition, "vvtCurrentPosition", float, "%.3f" diff --git a/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini b/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini index 1e73531ca9..82deb2edb1 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.01.alphax-2chan.3991630793" + signature = "rusEFI 2022.09.01.alphax-2chan.3934697424" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.09.01.alphax-2chan.3991630793" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.09.01.alphax-2chan.3934697424" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Sep 01 04:52:09 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Sep 01 05:32:59 UTC 2022 pageSize = 21300 page = 1 @@ -2118,7 +2118,7 @@ maxKnockRetardRpmBins = array, U08, 21294, [6], "RPM", 100.0, 0, 0, 25000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1240 + ochBlockSize = 1244 ; ; see TunerStudioOutputChannels struct @@ -3090,147 +3090,147 @@ mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1096, "", 1, 0 mapVvt_MAP_AT_DIFF = scalar, F32, 1100, "", 1, 0 mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1104, "", 1, 0 mapVvt_map_peak = scalar, U08, 1105, "", 1, 0 -currentEngineDecodedPhase = scalar, U16, 1106, "deg", 1, 0 -; total TS size = 1108 -totalRevolutionCounter = scalar, U32, 1108, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1112, "", 1, 0 -vvtCurrentPosition = scalar, F32, 1116, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1120, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 1124, "", 1, 0 -triggerStateIndex = scalar, U08, 1128, "", 1, 0 -vvtCounter = scalar, U08, 1129, "", 1, 0 -camResyncCounter = scalar, U08, 1130, "", 1, 0 -vvtStateIndex = scalar, U08, 1131, "", 1, 0 -; total TS size = 1132 -m_hasSynchronizedPhase = bits, U32, 1132, [0:0] -unusedBit_1_1 = bits, U32, 1132, [1:1] -unusedBit_1_2 = bits, U32, 1132, [2:2] -unusedBit_1_3 = bits, U32, 1132, [3:3] -unusedBit_1_4 = bits, U32, 1132, [4:4] -unusedBit_1_5 = bits, U32, 1132, [5:5] -unusedBit_1_6 = bits, U32, 1132, [6:6] -unusedBit_1_7 = bits, U32, 1132, [7:7] -unusedBit_1_8 = bits, U32, 1132, [8:8] -unusedBit_1_9 = bits, U32, 1132, [9:9] -unusedBit_1_10 = bits, U32, 1132, [10:10] -unusedBit_1_11 = bits, U32, 1132, [11:11] -unusedBit_1_12 = bits, U32, 1132, [12:12] -unusedBit_1_13 = bits, U32, 1132, [13:13] -unusedBit_1_14 = bits, U32, 1132, [14:14] -unusedBit_1_15 = bits, U32, 1132, [15:15] -unusedBit_1_16 = bits, U32, 1132, [16:16] -unusedBit_1_17 = bits, U32, 1132, [17:17] -unusedBit_1_18 = bits, U32, 1132, [18:18] -unusedBit_1_19 = bits, U32, 1132, [19:19] -unusedBit_1_20 = bits, U32, 1132, [20:20] -unusedBit_1_21 = bits, U32, 1132, [21:21] -unusedBit_1_22 = bits, U32, 1132, [22:22] -unusedBit_1_23 = bits, U32, 1132, [23:23] -unusedBit_1_24 = bits, U32, 1132, [24:24] -unusedBit_1_25 = bits, U32, 1132, [25:25] -unusedBit_1_26 = bits, U32, 1132, [26:26] -unusedBit_1_27 = bits, U32, 1132, [27:27] -unusedBit_1_28 = bits, U32, 1132, [28:28] -unusedBit_1_29 = bits, U32, 1132, [29:29] -unusedBit_1_30 = bits, U32, 1132, [30:30] -unusedBit_1_31 = bits, U32, 1132, [31:31] +currentEngineDecodedPhase = scalar, F32, 1108, "deg", 1, 0 +; total TS size = 1112 +totalRevolutionCounter = scalar, U32, 1112, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1116, "", 1, 0 +vvtCurrentPosition = scalar, F32, 1120, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1124, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 1128, "", 1, 0 +triggerStateIndex = scalar, U08, 1132, "", 1, 0 +vvtCounter = scalar, U08, 1133, "", 1, 0 +camResyncCounter = scalar, U08, 1134, "", 1, 0 +vvtStateIndex = scalar, U08, 1135, "", 1, 0 ; total TS size = 1136 -wallFuelCorrection = scalar, F32, 1136, "", 1, 0 -wallFuel = scalar, F32, 1140, "", 1, 0 -; total TS size = 1144 -idleState = bits, S32, 1144, [0:2], "not important" -currentIdlePosition = scalar, F32, 1148 -baseIdlePosition = scalar, F32, 1152 -iacByTpsTaper = scalar, F32, 1156 -throttlePedalUpState = scalar, S32, 1160, "", 1, 0 -mightResetPid = bits, U32, 1164, [0:0] -shouldResetPid = bits, U32, 1164, [1:1] -wasResetPid = bits, U32, 1164, [2:2] -mustResetPid = bits, U32, 1164, [3:3] -isCranking = bits, U32, 1164, [4:4] -useIacTableForCoasting = bits, U32, 1164, [5:5] -notIdling = bits, U32, 1164, [6:6] -needReset = bits, U32, 1164, [7:7] -isInDeadZone = bits, U32, 1164, [8:8] -isBlipping = bits, U32, 1164, [9:9] -useClosedLoop = bits, U32, 1164, [10:10] -badTps = bits, U32, 1164, [11:11] -looksLikeRunning = bits, U32, 1164, [12:12] -looksLikeCoasting = bits, U32, 1164, [13:13] -looksLikeCrankToIdle = bits, U32, 1164, [14:14] -isVerboseIAC = bits, U32, 1164, [15:15] -isIdleCoasting = bits, U32, 1164, [16:16] -unusedBit_22_17 = bits, U32, 1164, [17:17] -unusedBit_22_18 = bits, U32, 1164, [18:18] -unusedBit_22_19 = bits, U32, 1164, [19:19] -unusedBit_22_20 = bits, U32, 1164, [20:20] -unusedBit_22_21 = bits, U32, 1164, [21:21] -unusedBit_22_22 = bits, U32, 1164, [22:22] -unusedBit_22_23 = bits, U32, 1164, [23:23] -unusedBit_22_24 = bits, U32, 1164, [24:24] -unusedBit_22_25 = bits, U32, 1164, [25:25] -unusedBit_22_26 = bits, U32, 1164, [26:26] -unusedBit_22_27 = bits, U32, 1164, [27:27] -unusedBit_22_28 = bits, U32, 1164, [28:28] -unusedBit_22_29 = bits, U32, 1164, [29:29] -unusedBit_22_30 = bits, U32, 1164, [30:30] -unusedBit_22_31 = bits, U32, 1164, [31:31] -targetRpmByClt = scalar, S32, 1168, "", 1, 0 -targetRpmAcBump = scalar, S32, 1172, "", 1, 0 -iacByRpmTaper = scalar, F32, 1176 -luaAdd = scalar, F32, 1180 -; total TS size = 1184 -baseDwell = scalar, F32, 1184, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 1188, "", 1, 0 -luaTimingAdd = scalar, F32, 1192, "", 1, 0 -luaTimingMult = scalar, F32, 1196, "", 1, 0 -; total TS size = 1200 -idlePosition = scalar, F32, 1200, "", 1, 0 -trim = scalar, F32, 1204, "", 1, 0 -luaAdjustment = scalar, F32, 1208, "", 1, 0 -etbFeedForward = scalar, F32, 1212 -etbIntegralError = scalar, F32, 1216, "", 1, 0 -etbCurrentTarget = scalar, F32, 1220, "%", 1, 0 -etbRevLimitActive = bits, U32, 1224, [0:0] -unusedBit_7_1 = bits, U32, 1224, [1:1] -unusedBit_7_2 = bits, U32, 1224, [2:2] -unusedBit_7_3 = bits, U32, 1224, [3:3] -unusedBit_7_4 = bits, U32, 1224, [4:4] -unusedBit_7_5 = bits, U32, 1224, [5:5] -unusedBit_7_6 = bits, U32, 1224, [6:6] -unusedBit_7_7 = bits, U32, 1224, [7:7] -unusedBit_7_8 = bits, U32, 1224, [8:8] -unusedBit_7_9 = bits, U32, 1224, [9:9] -unusedBit_7_10 = bits, U32, 1224, [10:10] -unusedBit_7_11 = bits, U32, 1224, [11:11] -unusedBit_7_12 = bits, U32, 1224, [12:12] -unusedBit_7_13 = bits, U32, 1224, [13:13] -unusedBit_7_14 = bits, U32, 1224, [14:14] -unusedBit_7_15 = bits, U32, 1224, [15:15] -unusedBit_7_16 = bits, U32, 1224, [16:16] -unusedBit_7_17 = bits, U32, 1224, [17:17] -unusedBit_7_18 = bits, U32, 1224, [18:18] -unusedBit_7_19 = bits, U32, 1224, [19:19] -unusedBit_7_20 = bits, U32, 1224, [20:20] -unusedBit_7_21 = bits, U32, 1224, [21:21] -unusedBit_7_22 = bits, U32, 1224, [22:22] -unusedBit_7_23 = bits, U32, 1224, [23:23] -unusedBit_7_24 = bits, U32, 1224, [24:24] -unusedBit_7_25 = bits, U32, 1224, [25:25] -unusedBit_7_26 = bits, U32, 1224, [26:26] -unusedBit_7_27 = bits, U32, 1224, [27:27] -unusedBit_7_28 = bits, U32, 1224, [28:28] -unusedBit_7_29 = bits, U32, 1224, [29:29] -unusedBit_7_30 = bits, U32, 1224, [30:30] -unusedBit_7_31 = bits, U32, 1224, [31:31] -; total TS size = 1228 -faultCode = scalar, U08, 1228, "", 1, 0 -heaterDuty = scalar, U08, 1229, "%", 1, 0 -pumpDuty = scalar, U08, 1230, "%", 1, 0 -tempC = scalar, U16, 1232, "C", 1, 0 -nernstVoltage = scalar, U16, 1234, "V", 0.001, 0 -esr = scalar, U16, 1236, "", 1, 0 -; total TS size = 1240 +m_hasSynchronizedPhase = bits, U32, 1136, [0:0] +unusedBit_1_1 = bits, U32, 1136, [1:1] +unusedBit_1_2 = bits, U32, 1136, [2:2] +unusedBit_1_3 = bits, U32, 1136, [3:3] +unusedBit_1_4 = bits, U32, 1136, [4:4] +unusedBit_1_5 = bits, U32, 1136, [5:5] +unusedBit_1_6 = bits, U32, 1136, [6:6] +unusedBit_1_7 = bits, U32, 1136, [7:7] +unusedBit_1_8 = bits, U32, 1136, [8:8] +unusedBit_1_9 = bits, U32, 1136, [9:9] +unusedBit_1_10 = bits, U32, 1136, [10:10] +unusedBit_1_11 = bits, U32, 1136, [11:11] +unusedBit_1_12 = bits, U32, 1136, [12:12] +unusedBit_1_13 = bits, U32, 1136, [13:13] +unusedBit_1_14 = bits, U32, 1136, [14:14] +unusedBit_1_15 = bits, U32, 1136, [15:15] +unusedBit_1_16 = bits, U32, 1136, [16:16] +unusedBit_1_17 = bits, U32, 1136, [17:17] +unusedBit_1_18 = bits, U32, 1136, [18:18] +unusedBit_1_19 = bits, U32, 1136, [19:19] +unusedBit_1_20 = bits, U32, 1136, [20:20] +unusedBit_1_21 = bits, U32, 1136, [21:21] +unusedBit_1_22 = bits, U32, 1136, [22:22] +unusedBit_1_23 = bits, U32, 1136, [23:23] +unusedBit_1_24 = bits, U32, 1136, [24:24] +unusedBit_1_25 = bits, U32, 1136, [25:25] +unusedBit_1_26 = bits, U32, 1136, [26:26] +unusedBit_1_27 = bits, U32, 1136, [27:27] +unusedBit_1_28 = bits, U32, 1136, [28:28] +unusedBit_1_29 = bits, U32, 1136, [29:29] +unusedBit_1_30 = bits, U32, 1136, [30:30] +unusedBit_1_31 = bits, U32, 1136, [31:31] +; total TS size = 1140 +wallFuelCorrection = scalar, F32, 1140, "", 1, 0 +wallFuel = scalar, F32, 1144, "", 1, 0 +; total TS size = 1148 +idleState = bits, S32, 1148, [0:2], "not important" +currentIdlePosition = scalar, F32, 1152 +baseIdlePosition = scalar, F32, 1156 +iacByTpsTaper = scalar, F32, 1160 +throttlePedalUpState = scalar, S32, 1164, "", 1, 0 +mightResetPid = bits, U32, 1168, [0:0] +shouldResetPid = bits, U32, 1168, [1:1] +wasResetPid = bits, U32, 1168, [2:2] +mustResetPid = bits, U32, 1168, [3:3] +isCranking = bits, U32, 1168, [4:4] +useIacTableForCoasting = bits, U32, 1168, [5:5] +notIdling = bits, U32, 1168, [6:6] +needReset = bits, U32, 1168, [7:7] +isInDeadZone = bits, U32, 1168, [8:8] +isBlipping = bits, U32, 1168, [9:9] +useClosedLoop = bits, U32, 1168, [10:10] +badTps = bits, U32, 1168, [11:11] +looksLikeRunning = bits, U32, 1168, [12:12] +looksLikeCoasting = bits, U32, 1168, [13:13] +looksLikeCrankToIdle = bits, U32, 1168, [14:14] +isVerboseIAC = bits, U32, 1168, [15:15] +isIdleCoasting = bits, U32, 1168, [16:16] +unusedBit_22_17 = bits, U32, 1168, [17:17] +unusedBit_22_18 = bits, U32, 1168, [18:18] +unusedBit_22_19 = bits, U32, 1168, [19:19] +unusedBit_22_20 = bits, U32, 1168, [20:20] +unusedBit_22_21 = bits, U32, 1168, [21:21] +unusedBit_22_22 = bits, U32, 1168, [22:22] +unusedBit_22_23 = bits, U32, 1168, [23:23] +unusedBit_22_24 = bits, U32, 1168, [24:24] +unusedBit_22_25 = bits, U32, 1168, [25:25] +unusedBit_22_26 = bits, U32, 1168, [26:26] +unusedBit_22_27 = bits, U32, 1168, [27:27] +unusedBit_22_28 = bits, U32, 1168, [28:28] +unusedBit_22_29 = bits, U32, 1168, [29:29] +unusedBit_22_30 = bits, U32, 1168, [30:30] +unusedBit_22_31 = bits, U32, 1168, [31:31] +targetRpmByClt = scalar, S32, 1172, "", 1, 0 +targetRpmAcBump = scalar, S32, 1176, "", 1, 0 +iacByRpmTaper = scalar, F32, 1180 +luaAdd = scalar, F32, 1184 +; total TS size = 1188 +baseDwell = scalar, F32, 1188, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 1192, "", 1, 0 +luaTimingAdd = scalar, F32, 1196, "", 1, 0 +luaTimingMult = scalar, F32, 1200, "", 1, 0 +; total TS size = 1204 +idlePosition = scalar, F32, 1204, "", 1, 0 +trim = scalar, F32, 1208, "", 1, 0 +luaAdjustment = scalar, F32, 1212, "", 1, 0 +etbFeedForward = scalar, F32, 1216 +etbIntegralError = scalar, F32, 1220, "", 1, 0 +etbCurrentTarget = scalar, F32, 1224, "%", 1, 0 +etbRevLimitActive = bits, U32, 1228, [0:0] +unusedBit_7_1 = bits, U32, 1228, [1:1] +unusedBit_7_2 = bits, U32, 1228, [2:2] +unusedBit_7_3 = bits, U32, 1228, [3:3] +unusedBit_7_4 = bits, U32, 1228, [4:4] +unusedBit_7_5 = bits, U32, 1228, [5:5] +unusedBit_7_6 = bits, U32, 1228, [6:6] +unusedBit_7_7 = bits, U32, 1228, [7:7] +unusedBit_7_8 = bits, U32, 1228, [8:8] +unusedBit_7_9 = bits, U32, 1228, [9:9] +unusedBit_7_10 = bits, U32, 1228, [10:10] +unusedBit_7_11 = bits, U32, 1228, [11:11] +unusedBit_7_12 = bits, U32, 1228, [12:12] +unusedBit_7_13 = bits, U32, 1228, [13:13] +unusedBit_7_14 = bits, U32, 1228, [14:14] +unusedBit_7_15 = bits, U32, 1228, [15:15] +unusedBit_7_16 = bits, U32, 1228, [16:16] +unusedBit_7_17 = bits, U32, 1228, [17:17] +unusedBit_7_18 = bits, U32, 1228, [18:18] +unusedBit_7_19 = bits, U32, 1228, [19:19] +unusedBit_7_20 = bits, U32, 1228, [20:20] +unusedBit_7_21 = bits, U32, 1228, [21:21] +unusedBit_7_22 = bits, U32, 1228, [22:22] +unusedBit_7_23 = bits, U32, 1228, [23:23] +unusedBit_7_24 = bits, U32, 1228, [24:24] +unusedBit_7_25 = bits, U32, 1228, [25:25] +unusedBit_7_26 = bits, U32, 1228, [26:26] +unusedBit_7_27 = bits, U32, 1228, [27:27] +unusedBit_7_28 = bits, U32, 1228, [28:28] +unusedBit_7_29 = bits, U32, 1228, [29:29] +unusedBit_7_30 = bits, U32, 1228, [30:30] +unusedBit_7_31 = bits, U32, 1228, [31:31] +; total TS size = 1232 +faultCode = scalar, U08, 1232, "", 1, 0 +heaterDuty = scalar, U08, 1233, "%", 1, 0 +pumpDuty = scalar, U08, 1234, "%", 1, 0 +tempC = scalar, U16, 1236, "C", 1, 0 +nernstVoltage = scalar, U16, 1238, "V", 0.001, 0 +esr = scalar, U16, 1240, "", 1, 0 +; total TS size = 1244 time = { timeNow } @@ -4847,7 +4847,7 @@ entry = mapVvt_MAP_AT_SPECIAL_POINT, "mapVvt_MAP_AT_SPECIAL_POINT", float, "%.3 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 Phase2", int, "%d" +entry = currentEngineDecodedPhase, "Engine Phase2", float, "%.3f" entry = totalRevolutionCounter, "Crank revolution counter", int, "%d" entry = vvtSyncGapRatio, "vvtSyncGapRatio", float, "%.3f" entry = vvtCurrentPosition, "vvtCurrentPosition", float, "%.3f" diff --git a/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini b/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini index 6ff22176f7..f45f487fd7 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.01.alphax-4chan.1424305450" + signature = "rusEFI 2022.09.01.alphax-4chan.1401481523" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.09.01.alphax-4chan.1424305450" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.09.01.alphax-4chan.1401481523" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Sep 01 04:52:10 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Sep 01 05:33:01 UTC 2022 pageSize = 21300 page = 1 @@ -2118,7 +2118,7 @@ maxKnockRetardRpmBins = array, U08, 21294, [6], "RPM", 100.0, 0, 0, 25000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1240 + ochBlockSize = 1244 ; ; see TunerStudioOutputChannels struct @@ -3090,147 +3090,147 @@ mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1096, "", 1, 0 mapVvt_MAP_AT_DIFF = scalar, F32, 1100, "", 1, 0 mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1104, "", 1, 0 mapVvt_map_peak = scalar, U08, 1105, "", 1, 0 -currentEngineDecodedPhase = scalar, U16, 1106, "deg", 1, 0 -; total TS size = 1108 -totalRevolutionCounter = scalar, U32, 1108, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1112, "", 1, 0 -vvtCurrentPosition = scalar, F32, 1116, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1120, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 1124, "", 1, 0 -triggerStateIndex = scalar, U08, 1128, "", 1, 0 -vvtCounter = scalar, U08, 1129, "", 1, 0 -camResyncCounter = scalar, U08, 1130, "", 1, 0 -vvtStateIndex = scalar, U08, 1131, "", 1, 0 -; total TS size = 1132 -m_hasSynchronizedPhase = bits, U32, 1132, [0:0] -unusedBit_1_1 = bits, U32, 1132, [1:1] -unusedBit_1_2 = bits, U32, 1132, [2:2] -unusedBit_1_3 = bits, U32, 1132, [3:3] -unusedBit_1_4 = bits, U32, 1132, [4:4] -unusedBit_1_5 = bits, U32, 1132, [5:5] -unusedBit_1_6 = bits, U32, 1132, [6:6] -unusedBit_1_7 = bits, U32, 1132, [7:7] -unusedBit_1_8 = bits, U32, 1132, [8:8] -unusedBit_1_9 = bits, U32, 1132, [9:9] -unusedBit_1_10 = bits, U32, 1132, [10:10] -unusedBit_1_11 = bits, U32, 1132, [11:11] -unusedBit_1_12 = bits, U32, 1132, [12:12] -unusedBit_1_13 = bits, U32, 1132, [13:13] -unusedBit_1_14 = bits, U32, 1132, [14:14] -unusedBit_1_15 = bits, U32, 1132, [15:15] -unusedBit_1_16 = bits, U32, 1132, [16:16] -unusedBit_1_17 = bits, U32, 1132, [17:17] -unusedBit_1_18 = bits, U32, 1132, [18:18] -unusedBit_1_19 = bits, U32, 1132, [19:19] -unusedBit_1_20 = bits, U32, 1132, [20:20] -unusedBit_1_21 = bits, U32, 1132, [21:21] -unusedBit_1_22 = bits, U32, 1132, [22:22] -unusedBit_1_23 = bits, U32, 1132, [23:23] -unusedBit_1_24 = bits, U32, 1132, [24:24] -unusedBit_1_25 = bits, U32, 1132, [25:25] -unusedBit_1_26 = bits, U32, 1132, [26:26] -unusedBit_1_27 = bits, U32, 1132, [27:27] -unusedBit_1_28 = bits, U32, 1132, [28:28] -unusedBit_1_29 = bits, U32, 1132, [29:29] -unusedBit_1_30 = bits, U32, 1132, [30:30] -unusedBit_1_31 = bits, U32, 1132, [31:31] +currentEngineDecodedPhase = scalar, F32, 1108, "deg", 1, 0 +; total TS size = 1112 +totalRevolutionCounter = scalar, U32, 1112, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1116, "", 1, 0 +vvtCurrentPosition = scalar, F32, 1120, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1124, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 1128, "", 1, 0 +triggerStateIndex = scalar, U08, 1132, "", 1, 0 +vvtCounter = scalar, U08, 1133, "", 1, 0 +camResyncCounter = scalar, U08, 1134, "", 1, 0 +vvtStateIndex = scalar, U08, 1135, "", 1, 0 ; total TS size = 1136 -wallFuelCorrection = scalar, F32, 1136, "", 1, 0 -wallFuel = scalar, F32, 1140, "", 1, 0 -; total TS size = 1144 -idleState = bits, S32, 1144, [0:2], "not important" -currentIdlePosition = scalar, F32, 1148 -baseIdlePosition = scalar, F32, 1152 -iacByTpsTaper = scalar, F32, 1156 -throttlePedalUpState = scalar, S32, 1160, "", 1, 0 -mightResetPid = bits, U32, 1164, [0:0] -shouldResetPid = bits, U32, 1164, [1:1] -wasResetPid = bits, U32, 1164, [2:2] -mustResetPid = bits, U32, 1164, [3:3] -isCranking = bits, U32, 1164, [4:4] -useIacTableForCoasting = bits, U32, 1164, [5:5] -notIdling = bits, U32, 1164, [6:6] -needReset = bits, U32, 1164, [7:7] -isInDeadZone = bits, U32, 1164, [8:8] -isBlipping = bits, U32, 1164, [9:9] -useClosedLoop = bits, U32, 1164, [10:10] -badTps = bits, U32, 1164, [11:11] -looksLikeRunning = bits, U32, 1164, [12:12] -looksLikeCoasting = bits, U32, 1164, [13:13] -looksLikeCrankToIdle = bits, U32, 1164, [14:14] -isVerboseIAC = bits, U32, 1164, [15:15] -isIdleCoasting = bits, U32, 1164, [16:16] -unusedBit_22_17 = bits, U32, 1164, [17:17] -unusedBit_22_18 = bits, U32, 1164, [18:18] -unusedBit_22_19 = bits, U32, 1164, [19:19] -unusedBit_22_20 = bits, U32, 1164, [20:20] -unusedBit_22_21 = bits, U32, 1164, [21:21] -unusedBit_22_22 = bits, U32, 1164, [22:22] -unusedBit_22_23 = bits, U32, 1164, [23:23] -unusedBit_22_24 = bits, U32, 1164, [24:24] -unusedBit_22_25 = bits, U32, 1164, [25:25] -unusedBit_22_26 = bits, U32, 1164, [26:26] -unusedBit_22_27 = bits, U32, 1164, [27:27] -unusedBit_22_28 = bits, U32, 1164, [28:28] -unusedBit_22_29 = bits, U32, 1164, [29:29] -unusedBit_22_30 = bits, U32, 1164, [30:30] -unusedBit_22_31 = bits, U32, 1164, [31:31] -targetRpmByClt = scalar, S32, 1168, "", 1, 0 -targetRpmAcBump = scalar, S32, 1172, "", 1, 0 -iacByRpmTaper = scalar, F32, 1176 -luaAdd = scalar, F32, 1180 -; total TS size = 1184 -baseDwell = scalar, F32, 1184, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 1188, "", 1, 0 -luaTimingAdd = scalar, F32, 1192, "", 1, 0 -luaTimingMult = scalar, F32, 1196, "", 1, 0 -; total TS size = 1200 -idlePosition = scalar, F32, 1200, "", 1, 0 -trim = scalar, F32, 1204, "", 1, 0 -luaAdjustment = scalar, F32, 1208, "", 1, 0 -etbFeedForward = scalar, F32, 1212 -etbIntegralError = scalar, F32, 1216, "", 1, 0 -etbCurrentTarget = scalar, F32, 1220, "%", 1, 0 -etbRevLimitActive = bits, U32, 1224, [0:0] -unusedBit_7_1 = bits, U32, 1224, [1:1] -unusedBit_7_2 = bits, U32, 1224, [2:2] -unusedBit_7_3 = bits, U32, 1224, [3:3] -unusedBit_7_4 = bits, U32, 1224, [4:4] -unusedBit_7_5 = bits, U32, 1224, [5:5] -unusedBit_7_6 = bits, U32, 1224, [6:6] -unusedBit_7_7 = bits, U32, 1224, [7:7] -unusedBit_7_8 = bits, U32, 1224, [8:8] -unusedBit_7_9 = bits, U32, 1224, [9:9] -unusedBit_7_10 = bits, U32, 1224, [10:10] -unusedBit_7_11 = bits, U32, 1224, [11:11] -unusedBit_7_12 = bits, U32, 1224, [12:12] -unusedBit_7_13 = bits, U32, 1224, [13:13] -unusedBit_7_14 = bits, U32, 1224, [14:14] -unusedBit_7_15 = bits, U32, 1224, [15:15] -unusedBit_7_16 = bits, U32, 1224, [16:16] -unusedBit_7_17 = bits, U32, 1224, [17:17] -unusedBit_7_18 = bits, U32, 1224, [18:18] -unusedBit_7_19 = bits, U32, 1224, [19:19] -unusedBit_7_20 = bits, U32, 1224, [20:20] -unusedBit_7_21 = bits, U32, 1224, [21:21] -unusedBit_7_22 = bits, U32, 1224, [22:22] -unusedBit_7_23 = bits, U32, 1224, [23:23] -unusedBit_7_24 = bits, U32, 1224, [24:24] -unusedBit_7_25 = bits, U32, 1224, [25:25] -unusedBit_7_26 = bits, U32, 1224, [26:26] -unusedBit_7_27 = bits, U32, 1224, [27:27] -unusedBit_7_28 = bits, U32, 1224, [28:28] -unusedBit_7_29 = bits, U32, 1224, [29:29] -unusedBit_7_30 = bits, U32, 1224, [30:30] -unusedBit_7_31 = bits, U32, 1224, [31:31] -; total TS size = 1228 -faultCode = scalar, U08, 1228, "", 1, 0 -heaterDuty = scalar, U08, 1229, "%", 1, 0 -pumpDuty = scalar, U08, 1230, "%", 1, 0 -tempC = scalar, U16, 1232, "C", 1, 0 -nernstVoltage = scalar, U16, 1234, "V", 0.001, 0 -esr = scalar, U16, 1236, "", 1, 0 -; total TS size = 1240 +m_hasSynchronizedPhase = bits, U32, 1136, [0:0] +unusedBit_1_1 = bits, U32, 1136, [1:1] +unusedBit_1_2 = bits, U32, 1136, [2:2] +unusedBit_1_3 = bits, U32, 1136, [3:3] +unusedBit_1_4 = bits, U32, 1136, [4:4] +unusedBit_1_5 = bits, U32, 1136, [5:5] +unusedBit_1_6 = bits, U32, 1136, [6:6] +unusedBit_1_7 = bits, U32, 1136, [7:7] +unusedBit_1_8 = bits, U32, 1136, [8:8] +unusedBit_1_9 = bits, U32, 1136, [9:9] +unusedBit_1_10 = bits, U32, 1136, [10:10] +unusedBit_1_11 = bits, U32, 1136, [11:11] +unusedBit_1_12 = bits, U32, 1136, [12:12] +unusedBit_1_13 = bits, U32, 1136, [13:13] +unusedBit_1_14 = bits, U32, 1136, [14:14] +unusedBit_1_15 = bits, U32, 1136, [15:15] +unusedBit_1_16 = bits, U32, 1136, [16:16] +unusedBit_1_17 = bits, U32, 1136, [17:17] +unusedBit_1_18 = bits, U32, 1136, [18:18] +unusedBit_1_19 = bits, U32, 1136, [19:19] +unusedBit_1_20 = bits, U32, 1136, [20:20] +unusedBit_1_21 = bits, U32, 1136, [21:21] +unusedBit_1_22 = bits, U32, 1136, [22:22] +unusedBit_1_23 = bits, U32, 1136, [23:23] +unusedBit_1_24 = bits, U32, 1136, [24:24] +unusedBit_1_25 = bits, U32, 1136, [25:25] +unusedBit_1_26 = bits, U32, 1136, [26:26] +unusedBit_1_27 = bits, U32, 1136, [27:27] +unusedBit_1_28 = bits, U32, 1136, [28:28] +unusedBit_1_29 = bits, U32, 1136, [29:29] +unusedBit_1_30 = bits, U32, 1136, [30:30] +unusedBit_1_31 = bits, U32, 1136, [31:31] +; total TS size = 1140 +wallFuelCorrection = scalar, F32, 1140, "", 1, 0 +wallFuel = scalar, F32, 1144, "", 1, 0 +; total TS size = 1148 +idleState = bits, S32, 1148, [0:2], "not important" +currentIdlePosition = scalar, F32, 1152 +baseIdlePosition = scalar, F32, 1156 +iacByTpsTaper = scalar, F32, 1160 +throttlePedalUpState = scalar, S32, 1164, "", 1, 0 +mightResetPid = bits, U32, 1168, [0:0] +shouldResetPid = bits, U32, 1168, [1:1] +wasResetPid = bits, U32, 1168, [2:2] +mustResetPid = bits, U32, 1168, [3:3] +isCranking = bits, U32, 1168, [4:4] +useIacTableForCoasting = bits, U32, 1168, [5:5] +notIdling = bits, U32, 1168, [6:6] +needReset = bits, U32, 1168, [7:7] +isInDeadZone = bits, U32, 1168, [8:8] +isBlipping = bits, U32, 1168, [9:9] +useClosedLoop = bits, U32, 1168, [10:10] +badTps = bits, U32, 1168, [11:11] +looksLikeRunning = bits, U32, 1168, [12:12] +looksLikeCoasting = bits, U32, 1168, [13:13] +looksLikeCrankToIdle = bits, U32, 1168, [14:14] +isVerboseIAC = bits, U32, 1168, [15:15] +isIdleCoasting = bits, U32, 1168, [16:16] +unusedBit_22_17 = bits, U32, 1168, [17:17] +unusedBit_22_18 = bits, U32, 1168, [18:18] +unusedBit_22_19 = bits, U32, 1168, [19:19] +unusedBit_22_20 = bits, U32, 1168, [20:20] +unusedBit_22_21 = bits, U32, 1168, [21:21] +unusedBit_22_22 = bits, U32, 1168, [22:22] +unusedBit_22_23 = bits, U32, 1168, [23:23] +unusedBit_22_24 = bits, U32, 1168, [24:24] +unusedBit_22_25 = bits, U32, 1168, [25:25] +unusedBit_22_26 = bits, U32, 1168, [26:26] +unusedBit_22_27 = bits, U32, 1168, [27:27] +unusedBit_22_28 = bits, U32, 1168, [28:28] +unusedBit_22_29 = bits, U32, 1168, [29:29] +unusedBit_22_30 = bits, U32, 1168, [30:30] +unusedBit_22_31 = bits, U32, 1168, [31:31] +targetRpmByClt = scalar, S32, 1172, "", 1, 0 +targetRpmAcBump = scalar, S32, 1176, "", 1, 0 +iacByRpmTaper = scalar, F32, 1180 +luaAdd = scalar, F32, 1184 +; total TS size = 1188 +baseDwell = scalar, F32, 1188, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 1192, "", 1, 0 +luaTimingAdd = scalar, F32, 1196, "", 1, 0 +luaTimingMult = scalar, F32, 1200, "", 1, 0 +; total TS size = 1204 +idlePosition = scalar, F32, 1204, "", 1, 0 +trim = scalar, F32, 1208, "", 1, 0 +luaAdjustment = scalar, F32, 1212, "", 1, 0 +etbFeedForward = scalar, F32, 1216 +etbIntegralError = scalar, F32, 1220, "", 1, 0 +etbCurrentTarget = scalar, F32, 1224, "%", 1, 0 +etbRevLimitActive = bits, U32, 1228, [0:0] +unusedBit_7_1 = bits, U32, 1228, [1:1] +unusedBit_7_2 = bits, U32, 1228, [2:2] +unusedBit_7_3 = bits, U32, 1228, [3:3] +unusedBit_7_4 = bits, U32, 1228, [4:4] +unusedBit_7_5 = bits, U32, 1228, [5:5] +unusedBit_7_6 = bits, U32, 1228, [6:6] +unusedBit_7_7 = bits, U32, 1228, [7:7] +unusedBit_7_8 = bits, U32, 1228, [8:8] +unusedBit_7_9 = bits, U32, 1228, [9:9] +unusedBit_7_10 = bits, U32, 1228, [10:10] +unusedBit_7_11 = bits, U32, 1228, [11:11] +unusedBit_7_12 = bits, U32, 1228, [12:12] +unusedBit_7_13 = bits, U32, 1228, [13:13] +unusedBit_7_14 = bits, U32, 1228, [14:14] +unusedBit_7_15 = bits, U32, 1228, [15:15] +unusedBit_7_16 = bits, U32, 1228, [16:16] +unusedBit_7_17 = bits, U32, 1228, [17:17] +unusedBit_7_18 = bits, U32, 1228, [18:18] +unusedBit_7_19 = bits, U32, 1228, [19:19] +unusedBit_7_20 = bits, U32, 1228, [20:20] +unusedBit_7_21 = bits, U32, 1228, [21:21] +unusedBit_7_22 = bits, U32, 1228, [22:22] +unusedBit_7_23 = bits, U32, 1228, [23:23] +unusedBit_7_24 = bits, U32, 1228, [24:24] +unusedBit_7_25 = bits, U32, 1228, [25:25] +unusedBit_7_26 = bits, U32, 1228, [26:26] +unusedBit_7_27 = bits, U32, 1228, [27:27] +unusedBit_7_28 = bits, U32, 1228, [28:28] +unusedBit_7_29 = bits, U32, 1228, [29:29] +unusedBit_7_30 = bits, U32, 1228, [30:30] +unusedBit_7_31 = bits, U32, 1228, [31:31] +; total TS size = 1232 +faultCode = scalar, U08, 1232, "", 1, 0 +heaterDuty = scalar, U08, 1233, "%", 1, 0 +pumpDuty = scalar, U08, 1234, "%", 1, 0 +tempC = scalar, U16, 1236, "C", 1, 0 +nernstVoltage = scalar, U16, 1238, "V", 0.001, 0 +esr = scalar, U16, 1240, "", 1, 0 +; total TS size = 1244 time = { timeNow } @@ -4847,7 +4847,7 @@ entry = mapVvt_MAP_AT_SPECIAL_POINT, "mapVvt_MAP_AT_SPECIAL_POINT", float, "%.3 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 Phase2", int, "%d" +entry = currentEngineDecodedPhase, "Engine Phase2", float, "%.3f" entry = totalRevolutionCounter, "Crank revolution counter", int, "%d" entry = vvtSyncGapRatio, "vvtSyncGapRatio", float, "%.3f" entry = vvtCurrentPosition, "vvtCurrentPosition", float, "%.3f" diff --git a/firmware/tunerstudio/generated/rusefi_atlas.ini b/firmware/tunerstudio/generated/rusefi_atlas.ini index 5acfe27dbd..fbac50388b 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.01.atlas.3274906498" + signature = "rusEFI 2022.09.01.atlas.3294551963" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.09.01.atlas.3274906498" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.09.01.atlas.3294551963" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Sep 01 04:52:50 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Sep 01 05:33:41 UTC 2022 pageSize = 21300 page = 1 @@ -2118,7 +2118,7 @@ maxKnockRetardRpmBins = array, U08, 21294, [6], "RPM", 100.0, 0, 0, 25000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1240 + ochBlockSize = 1244 ; ; see TunerStudioOutputChannels struct @@ -3090,147 +3090,147 @@ mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1096, "", 1, 0 mapVvt_MAP_AT_DIFF = scalar, F32, 1100, "", 1, 0 mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1104, "", 1, 0 mapVvt_map_peak = scalar, U08, 1105, "", 1, 0 -currentEngineDecodedPhase = scalar, U16, 1106, "deg", 1, 0 -; total TS size = 1108 -totalRevolutionCounter = scalar, U32, 1108, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1112, "", 1, 0 -vvtCurrentPosition = scalar, F32, 1116, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1120, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 1124, "", 1, 0 -triggerStateIndex = scalar, U08, 1128, "", 1, 0 -vvtCounter = scalar, U08, 1129, "", 1, 0 -camResyncCounter = scalar, U08, 1130, "", 1, 0 -vvtStateIndex = scalar, U08, 1131, "", 1, 0 -; total TS size = 1132 -m_hasSynchronizedPhase = bits, U32, 1132, [0:0] -unusedBit_1_1 = bits, U32, 1132, [1:1] -unusedBit_1_2 = bits, U32, 1132, [2:2] -unusedBit_1_3 = bits, U32, 1132, [3:3] -unusedBit_1_4 = bits, U32, 1132, [4:4] -unusedBit_1_5 = bits, U32, 1132, [5:5] -unusedBit_1_6 = bits, U32, 1132, [6:6] -unusedBit_1_7 = bits, U32, 1132, [7:7] -unusedBit_1_8 = bits, U32, 1132, [8:8] -unusedBit_1_9 = bits, U32, 1132, [9:9] -unusedBit_1_10 = bits, U32, 1132, [10:10] -unusedBit_1_11 = bits, U32, 1132, [11:11] -unusedBit_1_12 = bits, U32, 1132, [12:12] -unusedBit_1_13 = bits, U32, 1132, [13:13] -unusedBit_1_14 = bits, U32, 1132, [14:14] -unusedBit_1_15 = bits, U32, 1132, [15:15] -unusedBit_1_16 = bits, U32, 1132, [16:16] -unusedBit_1_17 = bits, U32, 1132, [17:17] -unusedBit_1_18 = bits, U32, 1132, [18:18] -unusedBit_1_19 = bits, U32, 1132, [19:19] -unusedBit_1_20 = bits, U32, 1132, [20:20] -unusedBit_1_21 = bits, U32, 1132, [21:21] -unusedBit_1_22 = bits, U32, 1132, [22:22] -unusedBit_1_23 = bits, U32, 1132, [23:23] -unusedBit_1_24 = bits, U32, 1132, [24:24] -unusedBit_1_25 = bits, U32, 1132, [25:25] -unusedBit_1_26 = bits, U32, 1132, [26:26] -unusedBit_1_27 = bits, U32, 1132, [27:27] -unusedBit_1_28 = bits, U32, 1132, [28:28] -unusedBit_1_29 = bits, U32, 1132, [29:29] -unusedBit_1_30 = bits, U32, 1132, [30:30] -unusedBit_1_31 = bits, U32, 1132, [31:31] +currentEngineDecodedPhase = scalar, F32, 1108, "deg", 1, 0 +; total TS size = 1112 +totalRevolutionCounter = scalar, U32, 1112, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1116, "", 1, 0 +vvtCurrentPosition = scalar, F32, 1120, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1124, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 1128, "", 1, 0 +triggerStateIndex = scalar, U08, 1132, "", 1, 0 +vvtCounter = scalar, U08, 1133, "", 1, 0 +camResyncCounter = scalar, U08, 1134, "", 1, 0 +vvtStateIndex = scalar, U08, 1135, "", 1, 0 ; total TS size = 1136 -wallFuelCorrection = scalar, F32, 1136, "", 1, 0 -wallFuel = scalar, F32, 1140, "", 1, 0 -; total TS size = 1144 -idleState = bits, S32, 1144, [0:2], "not important" -currentIdlePosition = scalar, F32, 1148 -baseIdlePosition = scalar, F32, 1152 -iacByTpsTaper = scalar, F32, 1156 -throttlePedalUpState = scalar, S32, 1160, "", 1, 0 -mightResetPid = bits, U32, 1164, [0:0] -shouldResetPid = bits, U32, 1164, [1:1] -wasResetPid = bits, U32, 1164, [2:2] -mustResetPid = bits, U32, 1164, [3:3] -isCranking = bits, U32, 1164, [4:4] -useIacTableForCoasting = bits, U32, 1164, [5:5] -notIdling = bits, U32, 1164, [6:6] -needReset = bits, U32, 1164, [7:7] -isInDeadZone = bits, U32, 1164, [8:8] -isBlipping = bits, U32, 1164, [9:9] -useClosedLoop = bits, U32, 1164, [10:10] -badTps = bits, U32, 1164, [11:11] -looksLikeRunning = bits, U32, 1164, [12:12] -looksLikeCoasting = bits, U32, 1164, [13:13] -looksLikeCrankToIdle = bits, U32, 1164, [14:14] -isVerboseIAC = bits, U32, 1164, [15:15] -isIdleCoasting = bits, U32, 1164, [16:16] -unusedBit_22_17 = bits, U32, 1164, [17:17] -unusedBit_22_18 = bits, U32, 1164, [18:18] -unusedBit_22_19 = bits, U32, 1164, [19:19] -unusedBit_22_20 = bits, U32, 1164, [20:20] -unusedBit_22_21 = bits, U32, 1164, [21:21] -unusedBit_22_22 = bits, U32, 1164, [22:22] -unusedBit_22_23 = bits, U32, 1164, [23:23] -unusedBit_22_24 = bits, U32, 1164, [24:24] -unusedBit_22_25 = bits, U32, 1164, [25:25] -unusedBit_22_26 = bits, U32, 1164, [26:26] -unusedBit_22_27 = bits, U32, 1164, [27:27] -unusedBit_22_28 = bits, U32, 1164, [28:28] -unusedBit_22_29 = bits, U32, 1164, [29:29] -unusedBit_22_30 = bits, U32, 1164, [30:30] -unusedBit_22_31 = bits, U32, 1164, [31:31] -targetRpmByClt = scalar, S32, 1168, "", 1, 0 -targetRpmAcBump = scalar, S32, 1172, "", 1, 0 -iacByRpmTaper = scalar, F32, 1176 -luaAdd = scalar, F32, 1180 -; total TS size = 1184 -baseDwell = scalar, F32, 1184, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 1188, "", 1, 0 -luaTimingAdd = scalar, F32, 1192, "", 1, 0 -luaTimingMult = scalar, F32, 1196, "", 1, 0 -; total TS size = 1200 -idlePosition = scalar, F32, 1200, "", 1, 0 -trim = scalar, F32, 1204, "", 1, 0 -luaAdjustment = scalar, F32, 1208, "", 1, 0 -etbFeedForward = scalar, F32, 1212 -etbIntegralError = scalar, F32, 1216, "", 1, 0 -etbCurrentTarget = scalar, F32, 1220, "%", 1, 0 -etbRevLimitActive = bits, U32, 1224, [0:0] -unusedBit_7_1 = bits, U32, 1224, [1:1] -unusedBit_7_2 = bits, U32, 1224, [2:2] -unusedBit_7_3 = bits, U32, 1224, [3:3] -unusedBit_7_4 = bits, U32, 1224, [4:4] -unusedBit_7_5 = bits, U32, 1224, [5:5] -unusedBit_7_6 = bits, U32, 1224, [6:6] -unusedBit_7_7 = bits, U32, 1224, [7:7] -unusedBit_7_8 = bits, U32, 1224, [8:8] -unusedBit_7_9 = bits, U32, 1224, [9:9] -unusedBit_7_10 = bits, U32, 1224, [10:10] -unusedBit_7_11 = bits, U32, 1224, [11:11] -unusedBit_7_12 = bits, U32, 1224, [12:12] -unusedBit_7_13 = bits, U32, 1224, [13:13] -unusedBit_7_14 = bits, U32, 1224, [14:14] -unusedBit_7_15 = bits, U32, 1224, [15:15] -unusedBit_7_16 = bits, U32, 1224, [16:16] -unusedBit_7_17 = bits, U32, 1224, [17:17] -unusedBit_7_18 = bits, U32, 1224, [18:18] -unusedBit_7_19 = bits, U32, 1224, [19:19] -unusedBit_7_20 = bits, U32, 1224, [20:20] -unusedBit_7_21 = bits, U32, 1224, [21:21] -unusedBit_7_22 = bits, U32, 1224, [22:22] -unusedBit_7_23 = bits, U32, 1224, [23:23] -unusedBit_7_24 = bits, U32, 1224, [24:24] -unusedBit_7_25 = bits, U32, 1224, [25:25] -unusedBit_7_26 = bits, U32, 1224, [26:26] -unusedBit_7_27 = bits, U32, 1224, [27:27] -unusedBit_7_28 = bits, U32, 1224, [28:28] -unusedBit_7_29 = bits, U32, 1224, [29:29] -unusedBit_7_30 = bits, U32, 1224, [30:30] -unusedBit_7_31 = bits, U32, 1224, [31:31] -; total TS size = 1228 -faultCode = scalar, U08, 1228, "", 1, 0 -heaterDuty = scalar, U08, 1229, "%", 1, 0 -pumpDuty = scalar, U08, 1230, "%", 1, 0 -tempC = scalar, U16, 1232, "C", 1, 0 -nernstVoltage = scalar, U16, 1234, "V", 0.001, 0 -esr = scalar, U16, 1236, "", 1, 0 -; total TS size = 1240 +m_hasSynchronizedPhase = bits, U32, 1136, [0:0] +unusedBit_1_1 = bits, U32, 1136, [1:1] +unusedBit_1_2 = bits, U32, 1136, [2:2] +unusedBit_1_3 = bits, U32, 1136, [3:3] +unusedBit_1_4 = bits, U32, 1136, [4:4] +unusedBit_1_5 = bits, U32, 1136, [5:5] +unusedBit_1_6 = bits, U32, 1136, [6:6] +unusedBit_1_7 = bits, U32, 1136, [7:7] +unusedBit_1_8 = bits, U32, 1136, [8:8] +unusedBit_1_9 = bits, U32, 1136, [9:9] +unusedBit_1_10 = bits, U32, 1136, [10:10] +unusedBit_1_11 = bits, U32, 1136, [11:11] +unusedBit_1_12 = bits, U32, 1136, [12:12] +unusedBit_1_13 = bits, U32, 1136, [13:13] +unusedBit_1_14 = bits, U32, 1136, [14:14] +unusedBit_1_15 = bits, U32, 1136, [15:15] +unusedBit_1_16 = bits, U32, 1136, [16:16] +unusedBit_1_17 = bits, U32, 1136, [17:17] +unusedBit_1_18 = bits, U32, 1136, [18:18] +unusedBit_1_19 = bits, U32, 1136, [19:19] +unusedBit_1_20 = bits, U32, 1136, [20:20] +unusedBit_1_21 = bits, U32, 1136, [21:21] +unusedBit_1_22 = bits, U32, 1136, [22:22] +unusedBit_1_23 = bits, U32, 1136, [23:23] +unusedBit_1_24 = bits, U32, 1136, [24:24] +unusedBit_1_25 = bits, U32, 1136, [25:25] +unusedBit_1_26 = bits, U32, 1136, [26:26] +unusedBit_1_27 = bits, U32, 1136, [27:27] +unusedBit_1_28 = bits, U32, 1136, [28:28] +unusedBit_1_29 = bits, U32, 1136, [29:29] +unusedBit_1_30 = bits, U32, 1136, [30:30] +unusedBit_1_31 = bits, U32, 1136, [31:31] +; total TS size = 1140 +wallFuelCorrection = scalar, F32, 1140, "", 1, 0 +wallFuel = scalar, F32, 1144, "", 1, 0 +; total TS size = 1148 +idleState = bits, S32, 1148, [0:2], "not important" +currentIdlePosition = scalar, F32, 1152 +baseIdlePosition = scalar, F32, 1156 +iacByTpsTaper = scalar, F32, 1160 +throttlePedalUpState = scalar, S32, 1164, "", 1, 0 +mightResetPid = bits, U32, 1168, [0:0] +shouldResetPid = bits, U32, 1168, [1:1] +wasResetPid = bits, U32, 1168, [2:2] +mustResetPid = bits, U32, 1168, [3:3] +isCranking = bits, U32, 1168, [4:4] +useIacTableForCoasting = bits, U32, 1168, [5:5] +notIdling = bits, U32, 1168, [6:6] +needReset = bits, U32, 1168, [7:7] +isInDeadZone = bits, U32, 1168, [8:8] +isBlipping = bits, U32, 1168, [9:9] +useClosedLoop = bits, U32, 1168, [10:10] +badTps = bits, U32, 1168, [11:11] +looksLikeRunning = bits, U32, 1168, [12:12] +looksLikeCoasting = bits, U32, 1168, [13:13] +looksLikeCrankToIdle = bits, U32, 1168, [14:14] +isVerboseIAC = bits, U32, 1168, [15:15] +isIdleCoasting = bits, U32, 1168, [16:16] +unusedBit_22_17 = bits, U32, 1168, [17:17] +unusedBit_22_18 = bits, U32, 1168, [18:18] +unusedBit_22_19 = bits, U32, 1168, [19:19] +unusedBit_22_20 = bits, U32, 1168, [20:20] +unusedBit_22_21 = bits, U32, 1168, [21:21] +unusedBit_22_22 = bits, U32, 1168, [22:22] +unusedBit_22_23 = bits, U32, 1168, [23:23] +unusedBit_22_24 = bits, U32, 1168, [24:24] +unusedBit_22_25 = bits, U32, 1168, [25:25] +unusedBit_22_26 = bits, U32, 1168, [26:26] +unusedBit_22_27 = bits, U32, 1168, [27:27] +unusedBit_22_28 = bits, U32, 1168, [28:28] +unusedBit_22_29 = bits, U32, 1168, [29:29] +unusedBit_22_30 = bits, U32, 1168, [30:30] +unusedBit_22_31 = bits, U32, 1168, [31:31] +targetRpmByClt = scalar, S32, 1172, "", 1, 0 +targetRpmAcBump = scalar, S32, 1176, "", 1, 0 +iacByRpmTaper = scalar, F32, 1180 +luaAdd = scalar, F32, 1184 +; total TS size = 1188 +baseDwell = scalar, F32, 1188, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 1192, "", 1, 0 +luaTimingAdd = scalar, F32, 1196, "", 1, 0 +luaTimingMult = scalar, F32, 1200, "", 1, 0 +; total TS size = 1204 +idlePosition = scalar, F32, 1204, "", 1, 0 +trim = scalar, F32, 1208, "", 1, 0 +luaAdjustment = scalar, F32, 1212, "", 1, 0 +etbFeedForward = scalar, F32, 1216 +etbIntegralError = scalar, F32, 1220, "", 1, 0 +etbCurrentTarget = scalar, F32, 1224, "%", 1, 0 +etbRevLimitActive = bits, U32, 1228, [0:0] +unusedBit_7_1 = bits, U32, 1228, [1:1] +unusedBit_7_2 = bits, U32, 1228, [2:2] +unusedBit_7_3 = bits, U32, 1228, [3:3] +unusedBit_7_4 = bits, U32, 1228, [4:4] +unusedBit_7_5 = bits, U32, 1228, [5:5] +unusedBit_7_6 = bits, U32, 1228, [6:6] +unusedBit_7_7 = bits, U32, 1228, [7:7] +unusedBit_7_8 = bits, U32, 1228, [8:8] +unusedBit_7_9 = bits, U32, 1228, [9:9] +unusedBit_7_10 = bits, U32, 1228, [10:10] +unusedBit_7_11 = bits, U32, 1228, [11:11] +unusedBit_7_12 = bits, U32, 1228, [12:12] +unusedBit_7_13 = bits, U32, 1228, [13:13] +unusedBit_7_14 = bits, U32, 1228, [14:14] +unusedBit_7_15 = bits, U32, 1228, [15:15] +unusedBit_7_16 = bits, U32, 1228, [16:16] +unusedBit_7_17 = bits, U32, 1228, [17:17] +unusedBit_7_18 = bits, U32, 1228, [18:18] +unusedBit_7_19 = bits, U32, 1228, [19:19] +unusedBit_7_20 = bits, U32, 1228, [20:20] +unusedBit_7_21 = bits, U32, 1228, [21:21] +unusedBit_7_22 = bits, U32, 1228, [22:22] +unusedBit_7_23 = bits, U32, 1228, [23:23] +unusedBit_7_24 = bits, U32, 1228, [24:24] +unusedBit_7_25 = bits, U32, 1228, [25:25] +unusedBit_7_26 = bits, U32, 1228, [26:26] +unusedBit_7_27 = bits, U32, 1228, [27:27] +unusedBit_7_28 = bits, U32, 1228, [28:28] +unusedBit_7_29 = bits, U32, 1228, [29:29] +unusedBit_7_30 = bits, U32, 1228, [30:30] +unusedBit_7_31 = bits, U32, 1228, [31:31] +; total TS size = 1232 +faultCode = scalar, U08, 1232, "", 1, 0 +heaterDuty = scalar, U08, 1233, "%", 1, 0 +pumpDuty = scalar, U08, 1234, "%", 1, 0 +tempC = scalar, U16, 1236, "C", 1, 0 +nernstVoltage = scalar, U16, 1238, "V", 0.001, 0 +esr = scalar, U16, 1240, "", 1, 0 +; total TS size = 1244 time = { timeNow } @@ -4847,7 +4847,7 @@ entry = mapVvt_MAP_AT_SPECIAL_POINT, "mapVvt_MAP_AT_SPECIAL_POINT", float, "%.3 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 Phase2", int, "%d" +entry = currentEngineDecodedPhase, "Engine Phase2", float, "%.3f" entry = totalRevolutionCounter, "Crank revolution counter", int, "%d" entry = vvtSyncGapRatio, "vvtSyncGapRatio", float, "%.3f" entry = vvtCurrentPosition, "vvtCurrentPosition", float, "%.3f" diff --git a/firmware/tunerstudio/generated/rusefi_core8.ini b/firmware/tunerstudio/generated/rusefi_core8.ini index 7f3c37a818..db831fee67 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.01.core8.689291100" + signature = "rusEFI 2022.09.01.core8.779647813" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.09.01.core8.689291100" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.09.01.core8.779647813" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Sep 01 04:52:35 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Sep 01 05:33:25 UTC 2022 pageSize = 21300 page = 1 @@ -2118,7 +2118,7 @@ maxKnockRetardRpmBins = array, U08, 21294, [6], "RPM", 100.0, 0, 0, 25000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1240 + ochBlockSize = 1244 ; ; see TunerStudioOutputChannels struct @@ -3090,147 +3090,147 @@ mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1096, "", 1, 0 mapVvt_MAP_AT_DIFF = scalar, F32, 1100, "", 1, 0 mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1104, "", 1, 0 mapVvt_map_peak = scalar, U08, 1105, "", 1, 0 -currentEngineDecodedPhase = scalar, U16, 1106, "deg", 1, 0 -; total TS size = 1108 -totalRevolutionCounter = scalar, U32, 1108, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1112, "", 1, 0 -vvtCurrentPosition = scalar, F32, 1116, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1120, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 1124, "", 1, 0 -triggerStateIndex = scalar, U08, 1128, "", 1, 0 -vvtCounter = scalar, U08, 1129, "", 1, 0 -camResyncCounter = scalar, U08, 1130, "", 1, 0 -vvtStateIndex = scalar, U08, 1131, "", 1, 0 -; total TS size = 1132 -m_hasSynchronizedPhase = bits, U32, 1132, [0:0] -unusedBit_1_1 = bits, U32, 1132, [1:1] -unusedBit_1_2 = bits, U32, 1132, [2:2] -unusedBit_1_3 = bits, U32, 1132, [3:3] -unusedBit_1_4 = bits, U32, 1132, [4:4] -unusedBit_1_5 = bits, U32, 1132, [5:5] -unusedBit_1_6 = bits, U32, 1132, [6:6] -unusedBit_1_7 = bits, U32, 1132, [7:7] -unusedBit_1_8 = bits, U32, 1132, [8:8] -unusedBit_1_9 = bits, U32, 1132, [9:9] -unusedBit_1_10 = bits, U32, 1132, [10:10] -unusedBit_1_11 = bits, U32, 1132, [11:11] -unusedBit_1_12 = bits, U32, 1132, [12:12] -unusedBit_1_13 = bits, U32, 1132, [13:13] -unusedBit_1_14 = bits, U32, 1132, [14:14] -unusedBit_1_15 = bits, U32, 1132, [15:15] -unusedBit_1_16 = bits, U32, 1132, [16:16] -unusedBit_1_17 = bits, U32, 1132, [17:17] -unusedBit_1_18 = bits, U32, 1132, [18:18] -unusedBit_1_19 = bits, U32, 1132, [19:19] -unusedBit_1_20 = bits, U32, 1132, [20:20] -unusedBit_1_21 = bits, U32, 1132, [21:21] -unusedBit_1_22 = bits, U32, 1132, [22:22] -unusedBit_1_23 = bits, U32, 1132, [23:23] -unusedBit_1_24 = bits, U32, 1132, [24:24] -unusedBit_1_25 = bits, U32, 1132, [25:25] -unusedBit_1_26 = bits, U32, 1132, [26:26] -unusedBit_1_27 = bits, U32, 1132, [27:27] -unusedBit_1_28 = bits, U32, 1132, [28:28] -unusedBit_1_29 = bits, U32, 1132, [29:29] -unusedBit_1_30 = bits, U32, 1132, [30:30] -unusedBit_1_31 = bits, U32, 1132, [31:31] +currentEngineDecodedPhase = scalar, F32, 1108, "deg", 1, 0 +; total TS size = 1112 +totalRevolutionCounter = scalar, U32, 1112, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1116, "", 1, 0 +vvtCurrentPosition = scalar, F32, 1120, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1124, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 1128, "", 1, 0 +triggerStateIndex = scalar, U08, 1132, "", 1, 0 +vvtCounter = scalar, U08, 1133, "", 1, 0 +camResyncCounter = scalar, U08, 1134, "", 1, 0 +vvtStateIndex = scalar, U08, 1135, "", 1, 0 ; total TS size = 1136 -wallFuelCorrection = scalar, F32, 1136, "", 1, 0 -wallFuel = scalar, F32, 1140, "", 1, 0 -; total TS size = 1144 -idleState = bits, S32, 1144, [0:2], "not important" -currentIdlePosition = scalar, F32, 1148 -baseIdlePosition = scalar, F32, 1152 -iacByTpsTaper = scalar, F32, 1156 -throttlePedalUpState = scalar, S32, 1160, "", 1, 0 -mightResetPid = bits, U32, 1164, [0:0] -shouldResetPid = bits, U32, 1164, [1:1] -wasResetPid = bits, U32, 1164, [2:2] -mustResetPid = bits, U32, 1164, [3:3] -isCranking = bits, U32, 1164, [4:4] -useIacTableForCoasting = bits, U32, 1164, [5:5] -notIdling = bits, U32, 1164, [6:6] -needReset = bits, U32, 1164, [7:7] -isInDeadZone = bits, U32, 1164, [8:8] -isBlipping = bits, U32, 1164, [9:9] -useClosedLoop = bits, U32, 1164, [10:10] -badTps = bits, U32, 1164, [11:11] -looksLikeRunning = bits, U32, 1164, [12:12] -looksLikeCoasting = bits, U32, 1164, [13:13] -looksLikeCrankToIdle = bits, U32, 1164, [14:14] -isVerboseIAC = bits, U32, 1164, [15:15] -isIdleCoasting = bits, U32, 1164, [16:16] -unusedBit_22_17 = bits, U32, 1164, [17:17] -unusedBit_22_18 = bits, U32, 1164, [18:18] -unusedBit_22_19 = bits, U32, 1164, [19:19] -unusedBit_22_20 = bits, U32, 1164, [20:20] -unusedBit_22_21 = bits, U32, 1164, [21:21] -unusedBit_22_22 = bits, U32, 1164, [22:22] -unusedBit_22_23 = bits, U32, 1164, [23:23] -unusedBit_22_24 = bits, U32, 1164, [24:24] -unusedBit_22_25 = bits, U32, 1164, [25:25] -unusedBit_22_26 = bits, U32, 1164, [26:26] -unusedBit_22_27 = bits, U32, 1164, [27:27] -unusedBit_22_28 = bits, U32, 1164, [28:28] -unusedBit_22_29 = bits, U32, 1164, [29:29] -unusedBit_22_30 = bits, U32, 1164, [30:30] -unusedBit_22_31 = bits, U32, 1164, [31:31] -targetRpmByClt = scalar, S32, 1168, "", 1, 0 -targetRpmAcBump = scalar, S32, 1172, "", 1, 0 -iacByRpmTaper = scalar, F32, 1176 -luaAdd = scalar, F32, 1180 -; total TS size = 1184 -baseDwell = scalar, F32, 1184, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 1188, "", 1, 0 -luaTimingAdd = scalar, F32, 1192, "", 1, 0 -luaTimingMult = scalar, F32, 1196, "", 1, 0 -; total TS size = 1200 -idlePosition = scalar, F32, 1200, "", 1, 0 -trim = scalar, F32, 1204, "", 1, 0 -luaAdjustment = scalar, F32, 1208, "", 1, 0 -etbFeedForward = scalar, F32, 1212 -etbIntegralError = scalar, F32, 1216, "", 1, 0 -etbCurrentTarget = scalar, F32, 1220, "%", 1, 0 -etbRevLimitActive = bits, U32, 1224, [0:0] -unusedBit_7_1 = bits, U32, 1224, [1:1] -unusedBit_7_2 = bits, U32, 1224, [2:2] -unusedBit_7_3 = bits, U32, 1224, [3:3] -unusedBit_7_4 = bits, U32, 1224, [4:4] -unusedBit_7_5 = bits, U32, 1224, [5:5] -unusedBit_7_6 = bits, U32, 1224, [6:6] -unusedBit_7_7 = bits, U32, 1224, [7:7] -unusedBit_7_8 = bits, U32, 1224, [8:8] -unusedBit_7_9 = bits, U32, 1224, [9:9] -unusedBit_7_10 = bits, U32, 1224, [10:10] -unusedBit_7_11 = bits, U32, 1224, [11:11] -unusedBit_7_12 = bits, U32, 1224, [12:12] -unusedBit_7_13 = bits, U32, 1224, [13:13] -unusedBit_7_14 = bits, U32, 1224, [14:14] -unusedBit_7_15 = bits, U32, 1224, [15:15] -unusedBit_7_16 = bits, U32, 1224, [16:16] -unusedBit_7_17 = bits, U32, 1224, [17:17] -unusedBit_7_18 = bits, U32, 1224, [18:18] -unusedBit_7_19 = bits, U32, 1224, [19:19] -unusedBit_7_20 = bits, U32, 1224, [20:20] -unusedBit_7_21 = bits, U32, 1224, [21:21] -unusedBit_7_22 = bits, U32, 1224, [22:22] -unusedBit_7_23 = bits, U32, 1224, [23:23] -unusedBit_7_24 = bits, U32, 1224, [24:24] -unusedBit_7_25 = bits, U32, 1224, [25:25] -unusedBit_7_26 = bits, U32, 1224, [26:26] -unusedBit_7_27 = bits, U32, 1224, [27:27] -unusedBit_7_28 = bits, U32, 1224, [28:28] -unusedBit_7_29 = bits, U32, 1224, [29:29] -unusedBit_7_30 = bits, U32, 1224, [30:30] -unusedBit_7_31 = bits, U32, 1224, [31:31] -; total TS size = 1228 -faultCode = scalar, U08, 1228, "", 1, 0 -heaterDuty = scalar, U08, 1229, "%", 1, 0 -pumpDuty = scalar, U08, 1230, "%", 1, 0 -tempC = scalar, U16, 1232, "C", 1, 0 -nernstVoltage = scalar, U16, 1234, "V", 0.001, 0 -esr = scalar, U16, 1236, "", 1, 0 -; total TS size = 1240 +m_hasSynchronizedPhase = bits, U32, 1136, [0:0] +unusedBit_1_1 = bits, U32, 1136, [1:1] +unusedBit_1_2 = bits, U32, 1136, [2:2] +unusedBit_1_3 = bits, U32, 1136, [3:3] +unusedBit_1_4 = bits, U32, 1136, [4:4] +unusedBit_1_5 = bits, U32, 1136, [5:5] +unusedBit_1_6 = bits, U32, 1136, [6:6] +unusedBit_1_7 = bits, U32, 1136, [7:7] +unusedBit_1_8 = bits, U32, 1136, [8:8] +unusedBit_1_9 = bits, U32, 1136, [9:9] +unusedBit_1_10 = bits, U32, 1136, [10:10] +unusedBit_1_11 = bits, U32, 1136, [11:11] +unusedBit_1_12 = bits, U32, 1136, [12:12] +unusedBit_1_13 = bits, U32, 1136, [13:13] +unusedBit_1_14 = bits, U32, 1136, [14:14] +unusedBit_1_15 = bits, U32, 1136, [15:15] +unusedBit_1_16 = bits, U32, 1136, [16:16] +unusedBit_1_17 = bits, U32, 1136, [17:17] +unusedBit_1_18 = bits, U32, 1136, [18:18] +unusedBit_1_19 = bits, U32, 1136, [19:19] +unusedBit_1_20 = bits, U32, 1136, [20:20] +unusedBit_1_21 = bits, U32, 1136, [21:21] +unusedBit_1_22 = bits, U32, 1136, [22:22] +unusedBit_1_23 = bits, U32, 1136, [23:23] +unusedBit_1_24 = bits, U32, 1136, [24:24] +unusedBit_1_25 = bits, U32, 1136, [25:25] +unusedBit_1_26 = bits, U32, 1136, [26:26] +unusedBit_1_27 = bits, U32, 1136, [27:27] +unusedBit_1_28 = bits, U32, 1136, [28:28] +unusedBit_1_29 = bits, U32, 1136, [29:29] +unusedBit_1_30 = bits, U32, 1136, [30:30] +unusedBit_1_31 = bits, U32, 1136, [31:31] +; total TS size = 1140 +wallFuelCorrection = scalar, F32, 1140, "", 1, 0 +wallFuel = scalar, F32, 1144, "", 1, 0 +; total TS size = 1148 +idleState = bits, S32, 1148, [0:2], "not important" +currentIdlePosition = scalar, F32, 1152 +baseIdlePosition = scalar, F32, 1156 +iacByTpsTaper = scalar, F32, 1160 +throttlePedalUpState = scalar, S32, 1164, "", 1, 0 +mightResetPid = bits, U32, 1168, [0:0] +shouldResetPid = bits, U32, 1168, [1:1] +wasResetPid = bits, U32, 1168, [2:2] +mustResetPid = bits, U32, 1168, [3:3] +isCranking = bits, U32, 1168, [4:4] +useIacTableForCoasting = bits, U32, 1168, [5:5] +notIdling = bits, U32, 1168, [6:6] +needReset = bits, U32, 1168, [7:7] +isInDeadZone = bits, U32, 1168, [8:8] +isBlipping = bits, U32, 1168, [9:9] +useClosedLoop = bits, U32, 1168, [10:10] +badTps = bits, U32, 1168, [11:11] +looksLikeRunning = bits, U32, 1168, [12:12] +looksLikeCoasting = bits, U32, 1168, [13:13] +looksLikeCrankToIdle = bits, U32, 1168, [14:14] +isVerboseIAC = bits, U32, 1168, [15:15] +isIdleCoasting = bits, U32, 1168, [16:16] +unusedBit_22_17 = bits, U32, 1168, [17:17] +unusedBit_22_18 = bits, U32, 1168, [18:18] +unusedBit_22_19 = bits, U32, 1168, [19:19] +unusedBit_22_20 = bits, U32, 1168, [20:20] +unusedBit_22_21 = bits, U32, 1168, [21:21] +unusedBit_22_22 = bits, U32, 1168, [22:22] +unusedBit_22_23 = bits, U32, 1168, [23:23] +unusedBit_22_24 = bits, U32, 1168, [24:24] +unusedBit_22_25 = bits, U32, 1168, [25:25] +unusedBit_22_26 = bits, U32, 1168, [26:26] +unusedBit_22_27 = bits, U32, 1168, [27:27] +unusedBit_22_28 = bits, U32, 1168, [28:28] +unusedBit_22_29 = bits, U32, 1168, [29:29] +unusedBit_22_30 = bits, U32, 1168, [30:30] +unusedBit_22_31 = bits, U32, 1168, [31:31] +targetRpmByClt = scalar, S32, 1172, "", 1, 0 +targetRpmAcBump = scalar, S32, 1176, "", 1, 0 +iacByRpmTaper = scalar, F32, 1180 +luaAdd = scalar, F32, 1184 +; total TS size = 1188 +baseDwell = scalar, F32, 1188, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 1192, "", 1, 0 +luaTimingAdd = scalar, F32, 1196, "", 1, 0 +luaTimingMult = scalar, F32, 1200, "", 1, 0 +; total TS size = 1204 +idlePosition = scalar, F32, 1204, "", 1, 0 +trim = scalar, F32, 1208, "", 1, 0 +luaAdjustment = scalar, F32, 1212, "", 1, 0 +etbFeedForward = scalar, F32, 1216 +etbIntegralError = scalar, F32, 1220, "", 1, 0 +etbCurrentTarget = scalar, F32, 1224, "%", 1, 0 +etbRevLimitActive = bits, U32, 1228, [0:0] +unusedBit_7_1 = bits, U32, 1228, [1:1] +unusedBit_7_2 = bits, U32, 1228, [2:2] +unusedBit_7_3 = bits, U32, 1228, [3:3] +unusedBit_7_4 = bits, U32, 1228, [4:4] +unusedBit_7_5 = bits, U32, 1228, [5:5] +unusedBit_7_6 = bits, U32, 1228, [6:6] +unusedBit_7_7 = bits, U32, 1228, [7:7] +unusedBit_7_8 = bits, U32, 1228, [8:8] +unusedBit_7_9 = bits, U32, 1228, [9:9] +unusedBit_7_10 = bits, U32, 1228, [10:10] +unusedBit_7_11 = bits, U32, 1228, [11:11] +unusedBit_7_12 = bits, U32, 1228, [12:12] +unusedBit_7_13 = bits, U32, 1228, [13:13] +unusedBit_7_14 = bits, U32, 1228, [14:14] +unusedBit_7_15 = bits, U32, 1228, [15:15] +unusedBit_7_16 = bits, U32, 1228, [16:16] +unusedBit_7_17 = bits, U32, 1228, [17:17] +unusedBit_7_18 = bits, U32, 1228, [18:18] +unusedBit_7_19 = bits, U32, 1228, [19:19] +unusedBit_7_20 = bits, U32, 1228, [20:20] +unusedBit_7_21 = bits, U32, 1228, [21:21] +unusedBit_7_22 = bits, U32, 1228, [22:22] +unusedBit_7_23 = bits, U32, 1228, [23:23] +unusedBit_7_24 = bits, U32, 1228, [24:24] +unusedBit_7_25 = bits, U32, 1228, [25:25] +unusedBit_7_26 = bits, U32, 1228, [26:26] +unusedBit_7_27 = bits, U32, 1228, [27:27] +unusedBit_7_28 = bits, U32, 1228, [28:28] +unusedBit_7_29 = bits, U32, 1228, [29:29] +unusedBit_7_30 = bits, U32, 1228, [30:30] +unusedBit_7_31 = bits, U32, 1228, [31:31] +; total TS size = 1232 +faultCode = scalar, U08, 1232, "", 1, 0 +heaterDuty = scalar, U08, 1233, "%", 1, 0 +pumpDuty = scalar, U08, 1234, "%", 1, 0 +tempC = scalar, U16, 1236, "C", 1, 0 +nernstVoltage = scalar, U16, 1238, "V", 0.001, 0 +esr = scalar, U16, 1240, "", 1, 0 +; total TS size = 1244 time = { timeNow } @@ -4847,7 +4847,7 @@ entry = mapVvt_MAP_AT_SPECIAL_POINT, "mapVvt_MAP_AT_SPECIAL_POINT", float, "%.3 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 Phase2", int, "%d" +entry = currentEngineDecodedPhase, "Engine Phase2", float, "%.3f" entry = totalRevolutionCounter, "Crank revolution counter", int, "%d" entry = vvtSyncGapRatio, "vvtSyncGapRatio", float, "%.3f" entry = vvtCurrentPosition, "vvtCurrentPosition", float, "%.3f" diff --git a/firmware/tunerstudio/generated/rusefi_cypress.ini b/firmware/tunerstudio/generated/rusefi_cypress.ini index 3bbb0ae944..fcaec3f977 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.01.cypress.3757698725" + signature = "rusEFI 2022.09.01.cypress.3633588924" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.09.01.cypress.3757698725" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.09.01.cypress.3633588924" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Thu Sep 01 04:52:06 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Thu Sep 01 05:32:56 UTC 2022 pageSize = 21300 page = 1 @@ -2118,7 +2118,7 @@ maxKnockRetardRpmBins = array, U08, 21294, [6], "RPM", 100.0, 0, 0, 25000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1240 + ochBlockSize = 1244 ; ; see TunerStudioOutputChannels struct @@ -3090,147 +3090,147 @@ mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1096, "", 1, 0 mapVvt_MAP_AT_DIFF = scalar, F32, 1100, "", 1, 0 mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1104, "", 1, 0 mapVvt_map_peak = scalar, U08, 1105, "", 1, 0 -currentEngineDecodedPhase = scalar, U16, 1106, "deg", 1, 0 -; total TS size = 1108 -totalRevolutionCounter = scalar, U32, 1108, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1112, "", 1, 0 -vvtCurrentPosition = scalar, F32, 1116, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1120, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 1124, "", 1, 0 -triggerStateIndex = scalar, U08, 1128, "", 1, 0 -vvtCounter = scalar, U08, 1129, "", 1, 0 -camResyncCounter = scalar, U08, 1130, "", 1, 0 -vvtStateIndex = scalar, U08, 1131, "", 1, 0 -; total TS size = 1132 -m_hasSynchronizedPhase = bits, U32, 1132, [0:0] -unusedBit_1_1 = bits, U32, 1132, [1:1] -unusedBit_1_2 = bits, U32, 1132, [2:2] -unusedBit_1_3 = bits, U32, 1132, [3:3] -unusedBit_1_4 = bits, U32, 1132, [4:4] -unusedBit_1_5 = bits, U32, 1132, [5:5] -unusedBit_1_6 = bits, U32, 1132, [6:6] -unusedBit_1_7 = bits, U32, 1132, [7:7] -unusedBit_1_8 = bits, U32, 1132, [8:8] -unusedBit_1_9 = bits, U32, 1132, [9:9] -unusedBit_1_10 = bits, U32, 1132, [10:10] -unusedBit_1_11 = bits, U32, 1132, [11:11] -unusedBit_1_12 = bits, U32, 1132, [12:12] -unusedBit_1_13 = bits, U32, 1132, [13:13] -unusedBit_1_14 = bits, U32, 1132, [14:14] -unusedBit_1_15 = bits, U32, 1132, [15:15] -unusedBit_1_16 = bits, U32, 1132, [16:16] -unusedBit_1_17 = bits, U32, 1132, [17:17] -unusedBit_1_18 = bits, U32, 1132, [18:18] -unusedBit_1_19 = bits, U32, 1132, [19:19] -unusedBit_1_20 = bits, U32, 1132, [20:20] -unusedBit_1_21 = bits, U32, 1132, [21:21] -unusedBit_1_22 = bits, U32, 1132, [22:22] -unusedBit_1_23 = bits, U32, 1132, [23:23] -unusedBit_1_24 = bits, U32, 1132, [24:24] -unusedBit_1_25 = bits, U32, 1132, [25:25] -unusedBit_1_26 = bits, U32, 1132, [26:26] -unusedBit_1_27 = bits, U32, 1132, [27:27] -unusedBit_1_28 = bits, U32, 1132, [28:28] -unusedBit_1_29 = bits, U32, 1132, [29:29] -unusedBit_1_30 = bits, U32, 1132, [30:30] -unusedBit_1_31 = bits, U32, 1132, [31:31] +currentEngineDecodedPhase = scalar, F32, 1108, "deg", 1, 0 +; total TS size = 1112 +totalRevolutionCounter = scalar, U32, 1112, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1116, "", 1, 0 +vvtCurrentPosition = scalar, F32, 1120, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1124, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 1128, "", 1, 0 +triggerStateIndex = scalar, U08, 1132, "", 1, 0 +vvtCounter = scalar, U08, 1133, "", 1, 0 +camResyncCounter = scalar, U08, 1134, "", 1, 0 +vvtStateIndex = scalar, U08, 1135, "", 1, 0 ; total TS size = 1136 -wallFuelCorrection = scalar, F32, 1136, "", 1, 0 -wallFuel = scalar, F32, 1140, "", 1, 0 -; total TS size = 1144 -idleState = bits, S32, 1144, [0:2], "not important" -currentIdlePosition = scalar, F32, 1148 -baseIdlePosition = scalar, F32, 1152 -iacByTpsTaper = scalar, F32, 1156 -throttlePedalUpState = scalar, S32, 1160, "", 1, 0 -mightResetPid = bits, U32, 1164, [0:0] -shouldResetPid = bits, U32, 1164, [1:1] -wasResetPid = bits, U32, 1164, [2:2] -mustResetPid = bits, U32, 1164, [3:3] -isCranking = bits, U32, 1164, [4:4] -useIacTableForCoasting = bits, U32, 1164, [5:5] -notIdling = bits, U32, 1164, [6:6] -needReset = bits, U32, 1164, [7:7] -isInDeadZone = bits, U32, 1164, [8:8] -isBlipping = bits, U32, 1164, [9:9] -useClosedLoop = bits, U32, 1164, [10:10] -badTps = bits, U32, 1164, [11:11] -looksLikeRunning = bits, U32, 1164, [12:12] -looksLikeCoasting = bits, U32, 1164, [13:13] -looksLikeCrankToIdle = bits, U32, 1164, [14:14] -isVerboseIAC = bits, U32, 1164, [15:15] -isIdleCoasting = bits, U32, 1164, [16:16] -unusedBit_22_17 = bits, U32, 1164, [17:17] -unusedBit_22_18 = bits, U32, 1164, [18:18] -unusedBit_22_19 = bits, U32, 1164, [19:19] -unusedBit_22_20 = bits, U32, 1164, [20:20] -unusedBit_22_21 = bits, U32, 1164, [21:21] -unusedBit_22_22 = bits, U32, 1164, [22:22] -unusedBit_22_23 = bits, U32, 1164, [23:23] -unusedBit_22_24 = bits, U32, 1164, [24:24] -unusedBit_22_25 = bits, U32, 1164, [25:25] -unusedBit_22_26 = bits, U32, 1164, [26:26] -unusedBit_22_27 = bits, U32, 1164, [27:27] -unusedBit_22_28 = bits, U32, 1164, [28:28] -unusedBit_22_29 = bits, U32, 1164, [29:29] -unusedBit_22_30 = bits, U32, 1164, [30:30] -unusedBit_22_31 = bits, U32, 1164, [31:31] -targetRpmByClt = scalar, S32, 1168, "", 1, 0 -targetRpmAcBump = scalar, S32, 1172, "", 1, 0 -iacByRpmTaper = scalar, F32, 1176 -luaAdd = scalar, F32, 1180 -; total TS size = 1184 -baseDwell = scalar, F32, 1184, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 1188, "", 1, 0 -luaTimingAdd = scalar, F32, 1192, "", 1, 0 -luaTimingMult = scalar, F32, 1196, "", 1, 0 -; total TS size = 1200 -idlePosition = scalar, F32, 1200, "", 1, 0 -trim = scalar, F32, 1204, "", 1, 0 -luaAdjustment = scalar, F32, 1208, "", 1, 0 -etbFeedForward = scalar, F32, 1212 -etbIntegralError = scalar, F32, 1216, "", 1, 0 -etbCurrentTarget = scalar, F32, 1220, "%", 1, 0 -etbRevLimitActive = bits, U32, 1224, [0:0] -unusedBit_7_1 = bits, U32, 1224, [1:1] -unusedBit_7_2 = bits, U32, 1224, [2:2] -unusedBit_7_3 = bits, U32, 1224, [3:3] -unusedBit_7_4 = bits, U32, 1224, [4:4] -unusedBit_7_5 = bits, U32, 1224, [5:5] -unusedBit_7_6 = bits, U32, 1224, [6:6] -unusedBit_7_7 = bits, U32, 1224, [7:7] -unusedBit_7_8 = bits, U32, 1224, [8:8] -unusedBit_7_9 = bits, U32, 1224, [9:9] -unusedBit_7_10 = bits, U32, 1224, [10:10] -unusedBit_7_11 = bits, U32, 1224, [11:11] -unusedBit_7_12 = bits, U32, 1224, [12:12] -unusedBit_7_13 = bits, U32, 1224, [13:13] -unusedBit_7_14 = bits, U32, 1224, [14:14] -unusedBit_7_15 = bits, U32, 1224, [15:15] -unusedBit_7_16 = bits, U32, 1224, [16:16] -unusedBit_7_17 = bits, U32, 1224, [17:17] -unusedBit_7_18 = bits, U32, 1224, [18:18] -unusedBit_7_19 = bits, U32, 1224, [19:19] -unusedBit_7_20 = bits, U32, 1224, [20:20] -unusedBit_7_21 = bits, U32, 1224, [21:21] -unusedBit_7_22 = bits, U32, 1224, [22:22] -unusedBit_7_23 = bits, U32, 1224, [23:23] -unusedBit_7_24 = bits, U32, 1224, [24:24] -unusedBit_7_25 = bits, U32, 1224, [25:25] -unusedBit_7_26 = bits, U32, 1224, [26:26] -unusedBit_7_27 = bits, U32, 1224, [27:27] -unusedBit_7_28 = bits, U32, 1224, [28:28] -unusedBit_7_29 = bits, U32, 1224, [29:29] -unusedBit_7_30 = bits, U32, 1224, [30:30] -unusedBit_7_31 = bits, U32, 1224, [31:31] -; total TS size = 1228 -faultCode = scalar, U08, 1228, "", 1, 0 -heaterDuty = scalar, U08, 1229, "%", 1, 0 -pumpDuty = scalar, U08, 1230, "%", 1, 0 -tempC = scalar, U16, 1232, "C", 1, 0 -nernstVoltage = scalar, U16, 1234, "V", 0.001, 0 -esr = scalar, U16, 1236, "", 1, 0 -; total TS size = 1240 +m_hasSynchronizedPhase = bits, U32, 1136, [0:0] +unusedBit_1_1 = bits, U32, 1136, [1:1] +unusedBit_1_2 = bits, U32, 1136, [2:2] +unusedBit_1_3 = bits, U32, 1136, [3:3] +unusedBit_1_4 = bits, U32, 1136, [4:4] +unusedBit_1_5 = bits, U32, 1136, [5:5] +unusedBit_1_6 = bits, U32, 1136, [6:6] +unusedBit_1_7 = bits, U32, 1136, [7:7] +unusedBit_1_8 = bits, U32, 1136, [8:8] +unusedBit_1_9 = bits, U32, 1136, [9:9] +unusedBit_1_10 = bits, U32, 1136, [10:10] +unusedBit_1_11 = bits, U32, 1136, [11:11] +unusedBit_1_12 = bits, U32, 1136, [12:12] +unusedBit_1_13 = bits, U32, 1136, [13:13] +unusedBit_1_14 = bits, U32, 1136, [14:14] +unusedBit_1_15 = bits, U32, 1136, [15:15] +unusedBit_1_16 = bits, U32, 1136, [16:16] +unusedBit_1_17 = bits, U32, 1136, [17:17] +unusedBit_1_18 = bits, U32, 1136, [18:18] +unusedBit_1_19 = bits, U32, 1136, [19:19] +unusedBit_1_20 = bits, U32, 1136, [20:20] +unusedBit_1_21 = bits, U32, 1136, [21:21] +unusedBit_1_22 = bits, U32, 1136, [22:22] +unusedBit_1_23 = bits, U32, 1136, [23:23] +unusedBit_1_24 = bits, U32, 1136, [24:24] +unusedBit_1_25 = bits, U32, 1136, [25:25] +unusedBit_1_26 = bits, U32, 1136, [26:26] +unusedBit_1_27 = bits, U32, 1136, [27:27] +unusedBit_1_28 = bits, U32, 1136, [28:28] +unusedBit_1_29 = bits, U32, 1136, [29:29] +unusedBit_1_30 = bits, U32, 1136, [30:30] +unusedBit_1_31 = bits, U32, 1136, [31:31] +; total TS size = 1140 +wallFuelCorrection = scalar, F32, 1140, "", 1, 0 +wallFuel = scalar, F32, 1144, "", 1, 0 +; total TS size = 1148 +idleState = bits, S32, 1148, [0:2], "not important" +currentIdlePosition = scalar, F32, 1152 +baseIdlePosition = scalar, F32, 1156 +iacByTpsTaper = scalar, F32, 1160 +throttlePedalUpState = scalar, S32, 1164, "", 1, 0 +mightResetPid = bits, U32, 1168, [0:0] +shouldResetPid = bits, U32, 1168, [1:1] +wasResetPid = bits, U32, 1168, [2:2] +mustResetPid = bits, U32, 1168, [3:3] +isCranking = bits, U32, 1168, [4:4] +useIacTableForCoasting = bits, U32, 1168, [5:5] +notIdling = bits, U32, 1168, [6:6] +needReset = bits, U32, 1168, [7:7] +isInDeadZone = bits, U32, 1168, [8:8] +isBlipping = bits, U32, 1168, [9:9] +useClosedLoop = bits, U32, 1168, [10:10] +badTps = bits, U32, 1168, [11:11] +looksLikeRunning = bits, U32, 1168, [12:12] +looksLikeCoasting = bits, U32, 1168, [13:13] +looksLikeCrankToIdle = bits, U32, 1168, [14:14] +isVerboseIAC = bits, U32, 1168, [15:15] +isIdleCoasting = bits, U32, 1168, [16:16] +unusedBit_22_17 = bits, U32, 1168, [17:17] +unusedBit_22_18 = bits, U32, 1168, [18:18] +unusedBit_22_19 = bits, U32, 1168, [19:19] +unusedBit_22_20 = bits, U32, 1168, [20:20] +unusedBit_22_21 = bits, U32, 1168, [21:21] +unusedBit_22_22 = bits, U32, 1168, [22:22] +unusedBit_22_23 = bits, U32, 1168, [23:23] +unusedBit_22_24 = bits, U32, 1168, [24:24] +unusedBit_22_25 = bits, U32, 1168, [25:25] +unusedBit_22_26 = bits, U32, 1168, [26:26] +unusedBit_22_27 = bits, U32, 1168, [27:27] +unusedBit_22_28 = bits, U32, 1168, [28:28] +unusedBit_22_29 = bits, U32, 1168, [29:29] +unusedBit_22_30 = bits, U32, 1168, [30:30] +unusedBit_22_31 = bits, U32, 1168, [31:31] +targetRpmByClt = scalar, S32, 1172, "", 1, 0 +targetRpmAcBump = scalar, S32, 1176, "", 1, 0 +iacByRpmTaper = scalar, F32, 1180 +luaAdd = scalar, F32, 1184 +; total TS size = 1188 +baseDwell = scalar, F32, 1188, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 1192, "", 1, 0 +luaTimingAdd = scalar, F32, 1196, "", 1, 0 +luaTimingMult = scalar, F32, 1200, "", 1, 0 +; total TS size = 1204 +idlePosition = scalar, F32, 1204, "", 1, 0 +trim = scalar, F32, 1208, "", 1, 0 +luaAdjustment = scalar, F32, 1212, "", 1, 0 +etbFeedForward = scalar, F32, 1216 +etbIntegralError = scalar, F32, 1220, "", 1, 0 +etbCurrentTarget = scalar, F32, 1224, "%", 1, 0 +etbRevLimitActive = bits, U32, 1228, [0:0] +unusedBit_7_1 = bits, U32, 1228, [1:1] +unusedBit_7_2 = bits, U32, 1228, [2:2] +unusedBit_7_3 = bits, U32, 1228, [3:3] +unusedBit_7_4 = bits, U32, 1228, [4:4] +unusedBit_7_5 = bits, U32, 1228, [5:5] +unusedBit_7_6 = bits, U32, 1228, [6:6] +unusedBit_7_7 = bits, U32, 1228, [7:7] +unusedBit_7_8 = bits, U32, 1228, [8:8] +unusedBit_7_9 = bits, U32, 1228, [9:9] +unusedBit_7_10 = bits, U32, 1228, [10:10] +unusedBit_7_11 = bits, U32, 1228, [11:11] +unusedBit_7_12 = bits, U32, 1228, [12:12] +unusedBit_7_13 = bits, U32, 1228, [13:13] +unusedBit_7_14 = bits, U32, 1228, [14:14] +unusedBit_7_15 = bits, U32, 1228, [15:15] +unusedBit_7_16 = bits, U32, 1228, [16:16] +unusedBit_7_17 = bits, U32, 1228, [17:17] +unusedBit_7_18 = bits, U32, 1228, [18:18] +unusedBit_7_19 = bits, U32, 1228, [19:19] +unusedBit_7_20 = bits, U32, 1228, [20:20] +unusedBit_7_21 = bits, U32, 1228, [21:21] +unusedBit_7_22 = bits, U32, 1228, [22:22] +unusedBit_7_23 = bits, U32, 1228, [23:23] +unusedBit_7_24 = bits, U32, 1228, [24:24] +unusedBit_7_25 = bits, U32, 1228, [25:25] +unusedBit_7_26 = bits, U32, 1228, [26:26] +unusedBit_7_27 = bits, U32, 1228, [27:27] +unusedBit_7_28 = bits, U32, 1228, [28:28] +unusedBit_7_29 = bits, U32, 1228, [29:29] +unusedBit_7_30 = bits, U32, 1228, [30:30] +unusedBit_7_31 = bits, U32, 1228, [31:31] +; total TS size = 1232 +faultCode = scalar, U08, 1232, "", 1, 0 +heaterDuty = scalar, U08, 1233, "%", 1, 0 +pumpDuty = scalar, U08, 1234, "%", 1, 0 +tempC = scalar, U16, 1236, "C", 1, 0 +nernstVoltage = scalar, U16, 1238, "V", 0.001, 0 +esr = scalar, U16, 1240, "", 1, 0 +; total TS size = 1244 time = { timeNow } @@ -4847,7 +4847,7 @@ entry = mapVvt_MAP_AT_SPECIAL_POINT, "mapVvt_MAP_AT_SPECIAL_POINT", float, "%.3 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 Phase2", int, "%d" +entry = currentEngineDecodedPhase, "Engine Phase2", float, "%.3f" entry = totalRevolutionCounter, "Crank revolution counter", int, "%d" entry = vvtSyncGapRatio, "vvtSyncGapRatio", float, "%.3f" entry = vvtCurrentPosition, "vvtCurrentPosition", float, "%.3f" diff --git a/firmware/tunerstudio/generated/rusefi_f407-discovery.ini b/firmware/tunerstudio/generated/rusefi_f407-discovery.ini index 5267242ee4..bfef70df06 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.01.f407-discovery.3757698725" + signature = "rusEFI 2022.09.01.f407-discovery.3633588924" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.09.01.f407-discovery.3757698725" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.09.01.f407-discovery.3633588924" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Sep 01 04:52:47 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Sep 01 05:33:38 UTC 2022 pageSize = 21300 page = 1 @@ -2118,7 +2118,7 @@ maxKnockRetardRpmBins = array, U08, 21294, [6], "RPM", 100.0, 0, 0, 25000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1240 + ochBlockSize = 1244 ; ; see TunerStudioOutputChannels struct @@ -3090,147 +3090,147 @@ mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1096, "", 1, 0 mapVvt_MAP_AT_DIFF = scalar, F32, 1100, "", 1, 0 mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1104, "", 1, 0 mapVvt_map_peak = scalar, U08, 1105, "", 1, 0 -currentEngineDecodedPhase = scalar, U16, 1106, "deg", 1, 0 -; total TS size = 1108 -totalRevolutionCounter = scalar, U32, 1108, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1112, "", 1, 0 -vvtCurrentPosition = scalar, F32, 1116, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1120, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 1124, "", 1, 0 -triggerStateIndex = scalar, U08, 1128, "", 1, 0 -vvtCounter = scalar, U08, 1129, "", 1, 0 -camResyncCounter = scalar, U08, 1130, "", 1, 0 -vvtStateIndex = scalar, U08, 1131, "", 1, 0 -; total TS size = 1132 -m_hasSynchronizedPhase = bits, U32, 1132, [0:0] -unusedBit_1_1 = bits, U32, 1132, [1:1] -unusedBit_1_2 = bits, U32, 1132, [2:2] -unusedBit_1_3 = bits, U32, 1132, [3:3] -unusedBit_1_4 = bits, U32, 1132, [4:4] -unusedBit_1_5 = bits, U32, 1132, [5:5] -unusedBit_1_6 = bits, U32, 1132, [6:6] -unusedBit_1_7 = bits, U32, 1132, [7:7] -unusedBit_1_8 = bits, U32, 1132, [8:8] -unusedBit_1_9 = bits, U32, 1132, [9:9] -unusedBit_1_10 = bits, U32, 1132, [10:10] -unusedBit_1_11 = bits, U32, 1132, [11:11] -unusedBit_1_12 = bits, U32, 1132, [12:12] -unusedBit_1_13 = bits, U32, 1132, [13:13] -unusedBit_1_14 = bits, U32, 1132, [14:14] -unusedBit_1_15 = bits, U32, 1132, [15:15] -unusedBit_1_16 = bits, U32, 1132, [16:16] -unusedBit_1_17 = bits, U32, 1132, [17:17] -unusedBit_1_18 = bits, U32, 1132, [18:18] -unusedBit_1_19 = bits, U32, 1132, [19:19] -unusedBit_1_20 = bits, U32, 1132, [20:20] -unusedBit_1_21 = bits, U32, 1132, [21:21] -unusedBit_1_22 = bits, U32, 1132, [22:22] -unusedBit_1_23 = bits, U32, 1132, [23:23] -unusedBit_1_24 = bits, U32, 1132, [24:24] -unusedBit_1_25 = bits, U32, 1132, [25:25] -unusedBit_1_26 = bits, U32, 1132, [26:26] -unusedBit_1_27 = bits, U32, 1132, [27:27] -unusedBit_1_28 = bits, U32, 1132, [28:28] -unusedBit_1_29 = bits, U32, 1132, [29:29] -unusedBit_1_30 = bits, U32, 1132, [30:30] -unusedBit_1_31 = bits, U32, 1132, [31:31] +currentEngineDecodedPhase = scalar, F32, 1108, "deg", 1, 0 +; total TS size = 1112 +totalRevolutionCounter = scalar, U32, 1112, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1116, "", 1, 0 +vvtCurrentPosition = scalar, F32, 1120, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1124, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 1128, "", 1, 0 +triggerStateIndex = scalar, U08, 1132, "", 1, 0 +vvtCounter = scalar, U08, 1133, "", 1, 0 +camResyncCounter = scalar, U08, 1134, "", 1, 0 +vvtStateIndex = scalar, U08, 1135, "", 1, 0 ; total TS size = 1136 -wallFuelCorrection = scalar, F32, 1136, "", 1, 0 -wallFuel = scalar, F32, 1140, "", 1, 0 -; total TS size = 1144 -idleState = bits, S32, 1144, [0:2], "not important" -currentIdlePosition = scalar, F32, 1148 -baseIdlePosition = scalar, F32, 1152 -iacByTpsTaper = scalar, F32, 1156 -throttlePedalUpState = scalar, S32, 1160, "", 1, 0 -mightResetPid = bits, U32, 1164, [0:0] -shouldResetPid = bits, U32, 1164, [1:1] -wasResetPid = bits, U32, 1164, [2:2] -mustResetPid = bits, U32, 1164, [3:3] -isCranking = bits, U32, 1164, [4:4] -useIacTableForCoasting = bits, U32, 1164, [5:5] -notIdling = bits, U32, 1164, [6:6] -needReset = bits, U32, 1164, [7:7] -isInDeadZone = bits, U32, 1164, [8:8] -isBlipping = bits, U32, 1164, [9:9] -useClosedLoop = bits, U32, 1164, [10:10] -badTps = bits, U32, 1164, [11:11] -looksLikeRunning = bits, U32, 1164, [12:12] -looksLikeCoasting = bits, U32, 1164, [13:13] -looksLikeCrankToIdle = bits, U32, 1164, [14:14] -isVerboseIAC = bits, U32, 1164, [15:15] -isIdleCoasting = bits, U32, 1164, [16:16] -unusedBit_22_17 = bits, U32, 1164, [17:17] -unusedBit_22_18 = bits, U32, 1164, [18:18] -unusedBit_22_19 = bits, U32, 1164, [19:19] -unusedBit_22_20 = bits, U32, 1164, [20:20] -unusedBit_22_21 = bits, U32, 1164, [21:21] -unusedBit_22_22 = bits, U32, 1164, [22:22] -unusedBit_22_23 = bits, U32, 1164, [23:23] -unusedBit_22_24 = bits, U32, 1164, [24:24] -unusedBit_22_25 = bits, U32, 1164, [25:25] -unusedBit_22_26 = bits, U32, 1164, [26:26] -unusedBit_22_27 = bits, U32, 1164, [27:27] -unusedBit_22_28 = bits, U32, 1164, [28:28] -unusedBit_22_29 = bits, U32, 1164, [29:29] -unusedBit_22_30 = bits, U32, 1164, [30:30] -unusedBit_22_31 = bits, U32, 1164, [31:31] -targetRpmByClt = scalar, S32, 1168, "", 1, 0 -targetRpmAcBump = scalar, S32, 1172, "", 1, 0 -iacByRpmTaper = scalar, F32, 1176 -luaAdd = scalar, F32, 1180 -; total TS size = 1184 -baseDwell = scalar, F32, 1184, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 1188, "", 1, 0 -luaTimingAdd = scalar, F32, 1192, "", 1, 0 -luaTimingMult = scalar, F32, 1196, "", 1, 0 -; total TS size = 1200 -idlePosition = scalar, F32, 1200, "", 1, 0 -trim = scalar, F32, 1204, "", 1, 0 -luaAdjustment = scalar, F32, 1208, "", 1, 0 -etbFeedForward = scalar, F32, 1212 -etbIntegralError = scalar, F32, 1216, "", 1, 0 -etbCurrentTarget = scalar, F32, 1220, "%", 1, 0 -etbRevLimitActive = bits, U32, 1224, [0:0] -unusedBit_7_1 = bits, U32, 1224, [1:1] -unusedBit_7_2 = bits, U32, 1224, [2:2] -unusedBit_7_3 = bits, U32, 1224, [3:3] -unusedBit_7_4 = bits, U32, 1224, [4:4] -unusedBit_7_5 = bits, U32, 1224, [5:5] -unusedBit_7_6 = bits, U32, 1224, [6:6] -unusedBit_7_7 = bits, U32, 1224, [7:7] -unusedBit_7_8 = bits, U32, 1224, [8:8] -unusedBit_7_9 = bits, U32, 1224, [9:9] -unusedBit_7_10 = bits, U32, 1224, [10:10] -unusedBit_7_11 = bits, U32, 1224, [11:11] -unusedBit_7_12 = bits, U32, 1224, [12:12] -unusedBit_7_13 = bits, U32, 1224, [13:13] -unusedBit_7_14 = bits, U32, 1224, [14:14] -unusedBit_7_15 = bits, U32, 1224, [15:15] -unusedBit_7_16 = bits, U32, 1224, [16:16] -unusedBit_7_17 = bits, U32, 1224, [17:17] -unusedBit_7_18 = bits, U32, 1224, [18:18] -unusedBit_7_19 = bits, U32, 1224, [19:19] -unusedBit_7_20 = bits, U32, 1224, [20:20] -unusedBit_7_21 = bits, U32, 1224, [21:21] -unusedBit_7_22 = bits, U32, 1224, [22:22] -unusedBit_7_23 = bits, U32, 1224, [23:23] -unusedBit_7_24 = bits, U32, 1224, [24:24] -unusedBit_7_25 = bits, U32, 1224, [25:25] -unusedBit_7_26 = bits, U32, 1224, [26:26] -unusedBit_7_27 = bits, U32, 1224, [27:27] -unusedBit_7_28 = bits, U32, 1224, [28:28] -unusedBit_7_29 = bits, U32, 1224, [29:29] -unusedBit_7_30 = bits, U32, 1224, [30:30] -unusedBit_7_31 = bits, U32, 1224, [31:31] -; total TS size = 1228 -faultCode = scalar, U08, 1228, "", 1, 0 -heaterDuty = scalar, U08, 1229, "%", 1, 0 -pumpDuty = scalar, U08, 1230, "%", 1, 0 -tempC = scalar, U16, 1232, "C", 1, 0 -nernstVoltage = scalar, U16, 1234, "V", 0.001, 0 -esr = scalar, U16, 1236, "", 1, 0 -; total TS size = 1240 +m_hasSynchronizedPhase = bits, U32, 1136, [0:0] +unusedBit_1_1 = bits, U32, 1136, [1:1] +unusedBit_1_2 = bits, U32, 1136, [2:2] +unusedBit_1_3 = bits, U32, 1136, [3:3] +unusedBit_1_4 = bits, U32, 1136, [4:4] +unusedBit_1_5 = bits, U32, 1136, [5:5] +unusedBit_1_6 = bits, U32, 1136, [6:6] +unusedBit_1_7 = bits, U32, 1136, [7:7] +unusedBit_1_8 = bits, U32, 1136, [8:8] +unusedBit_1_9 = bits, U32, 1136, [9:9] +unusedBit_1_10 = bits, U32, 1136, [10:10] +unusedBit_1_11 = bits, U32, 1136, [11:11] +unusedBit_1_12 = bits, U32, 1136, [12:12] +unusedBit_1_13 = bits, U32, 1136, [13:13] +unusedBit_1_14 = bits, U32, 1136, [14:14] +unusedBit_1_15 = bits, U32, 1136, [15:15] +unusedBit_1_16 = bits, U32, 1136, [16:16] +unusedBit_1_17 = bits, U32, 1136, [17:17] +unusedBit_1_18 = bits, U32, 1136, [18:18] +unusedBit_1_19 = bits, U32, 1136, [19:19] +unusedBit_1_20 = bits, U32, 1136, [20:20] +unusedBit_1_21 = bits, U32, 1136, [21:21] +unusedBit_1_22 = bits, U32, 1136, [22:22] +unusedBit_1_23 = bits, U32, 1136, [23:23] +unusedBit_1_24 = bits, U32, 1136, [24:24] +unusedBit_1_25 = bits, U32, 1136, [25:25] +unusedBit_1_26 = bits, U32, 1136, [26:26] +unusedBit_1_27 = bits, U32, 1136, [27:27] +unusedBit_1_28 = bits, U32, 1136, [28:28] +unusedBit_1_29 = bits, U32, 1136, [29:29] +unusedBit_1_30 = bits, U32, 1136, [30:30] +unusedBit_1_31 = bits, U32, 1136, [31:31] +; total TS size = 1140 +wallFuelCorrection = scalar, F32, 1140, "", 1, 0 +wallFuel = scalar, F32, 1144, "", 1, 0 +; total TS size = 1148 +idleState = bits, S32, 1148, [0:2], "not important" +currentIdlePosition = scalar, F32, 1152 +baseIdlePosition = scalar, F32, 1156 +iacByTpsTaper = scalar, F32, 1160 +throttlePedalUpState = scalar, S32, 1164, "", 1, 0 +mightResetPid = bits, U32, 1168, [0:0] +shouldResetPid = bits, U32, 1168, [1:1] +wasResetPid = bits, U32, 1168, [2:2] +mustResetPid = bits, U32, 1168, [3:3] +isCranking = bits, U32, 1168, [4:4] +useIacTableForCoasting = bits, U32, 1168, [5:5] +notIdling = bits, U32, 1168, [6:6] +needReset = bits, U32, 1168, [7:7] +isInDeadZone = bits, U32, 1168, [8:8] +isBlipping = bits, U32, 1168, [9:9] +useClosedLoop = bits, U32, 1168, [10:10] +badTps = bits, U32, 1168, [11:11] +looksLikeRunning = bits, U32, 1168, [12:12] +looksLikeCoasting = bits, U32, 1168, [13:13] +looksLikeCrankToIdle = bits, U32, 1168, [14:14] +isVerboseIAC = bits, U32, 1168, [15:15] +isIdleCoasting = bits, U32, 1168, [16:16] +unusedBit_22_17 = bits, U32, 1168, [17:17] +unusedBit_22_18 = bits, U32, 1168, [18:18] +unusedBit_22_19 = bits, U32, 1168, [19:19] +unusedBit_22_20 = bits, U32, 1168, [20:20] +unusedBit_22_21 = bits, U32, 1168, [21:21] +unusedBit_22_22 = bits, U32, 1168, [22:22] +unusedBit_22_23 = bits, U32, 1168, [23:23] +unusedBit_22_24 = bits, U32, 1168, [24:24] +unusedBit_22_25 = bits, U32, 1168, [25:25] +unusedBit_22_26 = bits, U32, 1168, [26:26] +unusedBit_22_27 = bits, U32, 1168, [27:27] +unusedBit_22_28 = bits, U32, 1168, [28:28] +unusedBit_22_29 = bits, U32, 1168, [29:29] +unusedBit_22_30 = bits, U32, 1168, [30:30] +unusedBit_22_31 = bits, U32, 1168, [31:31] +targetRpmByClt = scalar, S32, 1172, "", 1, 0 +targetRpmAcBump = scalar, S32, 1176, "", 1, 0 +iacByRpmTaper = scalar, F32, 1180 +luaAdd = scalar, F32, 1184 +; total TS size = 1188 +baseDwell = scalar, F32, 1188, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 1192, "", 1, 0 +luaTimingAdd = scalar, F32, 1196, "", 1, 0 +luaTimingMult = scalar, F32, 1200, "", 1, 0 +; total TS size = 1204 +idlePosition = scalar, F32, 1204, "", 1, 0 +trim = scalar, F32, 1208, "", 1, 0 +luaAdjustment = scalar, F32, 1212, "", 1, 0 +etbFeedForward = scalar, F32, 1216 +etbIntegralError = scalar, F32, 1220, "", 1, 0 +etbCurrentTarget = scalar, F32, 1224, "%", 1, 0 +etbRevLimitActive = bits, U32, 1228, [0:0] +unusedBit_7_1 = bits, U32, 1228, [1:1] +unusedBit_7_2 = bits, U32, 1228, [2:2] +unusedBit_7_3 = bits, U32, 1228, [3:3] +unusedBit_7_4 = bits, U32, 1228, [4:4] +unusedBit_7_5 = bits, U32, 1228, [5:5] +unusedBit_7_6 = bits, U32, 1228, [6:6] +unusedBit_7_7 = bits, U32, 1228, [7:7] +unusedBit_7_8 = bits, U32, 1228, [8:8] +unusedBit_7_9 = bits, U32, 1228, [9:9] +unusedBit_7_10 = bits, U32, 1228, [10:10] +unusedBit_7_11 = bits, U32, 1228, [11:11] +unusedBit_7_12 = bits, U32, 1228, [12:12] +unusedBit_7_13 = bits, U32, 1228, [13:13] +unusedBit_7_14 = bits, U32, 1228, [14:14] +unusedBit_7_15 = bits, U32, 1228, [15:15] +unusedBit_7_16 = bits, U32, 1228, [16:16] +unusedBit_7_17 = bits, U32, 1228, [17:17] +unusedBit_7_18 = bits, U32, 1228, [18:18] +unusedBit_7_19 = bits, U32, 1228, [19:19] +unusedBit_7_20 = bits, U32, 1228, [20:20] +unusedBit_7_21 = bits, U32, 1228, [21:21] +unusedBit_7_22 = bits, U32, 1228, [22:22] +unusedBit_7_23 = bits, U32, 1228, [23:23] +unusedBit_7_24 = bits, U32, 1228, [24:24] +unusedBit_7_25 = bits, U32, 1228, [25:25] +unusedBit_7_26 = bits, U32, 1228, [26:26] +unusedBit_7_27 = bits, U32, 1228, [27:27] +unusedBit_7_28 = bits, U32, 1228, [28:28] +unusedBit_7_29 = bits, U32, 1228, [29:29] +unusedBit_7_30 = bits, U32, 1228, [30:30] +unusedBit_7_31 = bits, U32, 1228, [31:31] +; total TS size = 1232 +faultCode = scalar, U08, 1232, "", 1, 0 +heaterDuty = scalar, U08, 1233, "%", 1, 0 +pumpDuty = scalar, U08, 1234, "%", 1, 0 +tempC = scalar, U16, 1236, "C", 1, 0 +nernstVoltage = scalar, U16, 1238, "V", 0.001, 0 +esr = scalar, U16, 1240, "", 1, 0 +; total TS size = 1244 time = { timeNow } @@ -4847,7 +4847,7 @@ entry = mapVvt_MAP_AT_SPECIAL_POINT, "mapVvt_MAP_AT_SPECIAL_POINT", float, "%.3 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 Phase2", int, "%d" +entry = currentEngineDecodedPhase, "Engine Phase2", float, "%.3f" entry = totalRevolutionCounter, "Crank revolution counter", int, "%d" entry = vvtSyncGapRatio, "vvtSyncGapRatio", float, "%.3f" entry = vvtCurrentPosition, "vvtCurrentPosition", float, "%.3f" diff --git a/firmware/tunerstudio/generated/rusefi_f429-discovery.ini b/firmware/tunerstudio/generated/rusefi_f429-discovery.ini index 54394fab18..8229d984ff 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.01.f429-discovery.3757698725" + signature = "rusEFI 2022.09.01.f429-discovery.3633588924" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.09.01.f429-discovery.3757698725" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.09.01.f429-discovery.3633588924" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Sep 01 04:52:49 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Sep 01 05:33:40 UTC 2022 pageSize = 21300 page = 1 @@ -2118,7 +2118,7 @@ maxKnockRetardRpmBins = array, U08, 21294, [6], "RPM", 100.0, 0, 0, 25000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1240 + ochBlockSize = 1244 ; ; see TunerStudioOutputChannels struct @@ -3090,147 +3090,147 @@ mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1096, "", 1, 0 mapVvt_MAP_AT_DIFF = scalar, F32, 1100, "", 1, 0 mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1104, "", 1, 0 mapVvt_map_peak = scalar, U08, 1105, "", 1, 0 -currentEngineDecodedPhase = scalar, U16, 1106, "deg", 1, 0 -; total TS size = 1108 -totalRevolutionCounter = scalar, U32, 1108, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1112, "", 1, 0 -vvtCurrentPosition = scalar, F32, 1116, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1120, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 1124, "", 1, 0 -triggerStateIndex = scalar, U08, 1128, "", 1, 0 -vvtCounter = scalar, U08, 1129, "", 1, 0 -camResyncCounter = scalar, U08, 1130, "", 1, 0 -vvtStateIndex = scalar, U08, 1131, "", 1, 0 -; total TS size = 1132 -m_hasSynchronizedPhase = bits, U32, 1132, [0:0] -unusedBit_1_1 = bits, U32, 1132, [1:1] -unusedBit_1_2 = bits, U32, 1132, [2:2] -unusedBit_1_3 = bits, U32, 1132, [3:3] -unusedBit_1_4 = bits, U32, 1132, [4:4] -unusedBit_1_5 = bits, U32, 1132, [5:5] -unusedBit_1_6 = bits, U32, 1132, [6:6] -unusedBit_1_7 = bits, U32, 1132, [7:7] -unusedBit_1_8 = bits, U32, 1132, [8:8] -unusedBit_1_9 = bits, U32, 1132, [9:9] -unusedBit_1_10 = bits, U32, 1132, [10:10] -unusedBit_1_11 = bits, U32, 1132, [11:11] -unusedBit_1_12 = bits, U32, 1132, [12:12] -unusedBit_1_13 = bits, U32, 1132, [13:13] -unusedBit_1_14 = bits, U32, 1132, [14:14] -unusedBit_1_15 = bits, U32, 1132, [15:15] -unusedBit_1_16 = bits, U32, 1132, [16:16] -unusedBit_1_17 = bits, U32, 1132, [17:17] -unusedBit_1_18 = bits, U32, 1132, [18:18] -unusedBit_1_19 = bits, U32, 1132, [19:19] -unusedBit_1_20 = bits, U32, 1132, [20:20] -unusedBit_1_21 = bits, U32, 1132, [21:21] -unusedBit_1_22 = bits, U32, 1132, [22:22] -unusedBit_1_23 = bits, U32, 1132, [23:23] -unusedBit_1_24 = bits, U32, 1132, [24:24] -unusedBit_1_25 = bits, U32, 1132, [25:25] -unusedBit_1_26 = bits, U32, 1132, [26:26] -unusedBit_1_27 = bits, U32, 1132, [27:27] -unusedBit_1_28 = bits, U32, 1132, [28:28] -unusedBit_1_29 = bits, U32, 1132, [29:29] -unusedBit_1_30 = bits, U32, 1132, [30:30] -unusedBit_1_31 = bits, U32, 1132, [31:31] +currentEngineDecodedPhase = scalar, F32, 1108, "deg", 1, 0 +; total TS size = 1112 +totalRevolutionCounter = scalar, U32, 1112, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1116, "", 1, 0 +vvtCurrentPosition = scalar, F32, 1120, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1124, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 1128, "", 1, 0 +triggerStateIndex = scalar, U08, 1132, "", 1, 0 +vvtCounter = scalar, U08, 1133, "", 1, 0 +camResyncCounter = scalar, U08, 1134, "", 1, 0 +vvtStateIndex = scalar, U08, 1135, "", 1, 0 ; total TS size = 1136 -wallFuelCorrection = scalar, F32, 1136, "", 1, 0 -wallFuel = scalar, F32, 1140, "", 1, 0 -; total TS size = 1144 -idleState = bits, S32, 1144, [0:2], "not important" -currentIdlePosition = scalar, F32, 1148 -baseIdlePosition = scalar, F32, 1152 -iacByTpsTaper = scalar, F32, 1156 -throttlePedalUpState = scalar, S32, 1160, "", 1, 0 -mightResetPid = bits, U32, 1164, [0:0] -shouldResetPid = bits, U32, 1164, [1:1] -wasResetPid = bits, U32, 1164, [2:2] -mustResetPid = bits, U32, 1164, [3:3] -isCranking = bits, U32, 1164, [4:4] -useIacTableForCoasting = bits, U32, 1164, [5:5] -notIdling = bits, U32, 1164, [6:6] -needReset = bits, U32, 1164, [7:7] -isInDeadZone = bits, U32, 1164, [8:8] -isBlipping = bits, U32, 1164, [9:9] -useClosedLoop = bits, U32, 1164, [10:10] -badTps = bits, U32, 1164, [11:11] -looksLikeRunning = bits, U32, 1164, [12:12] -looksLikeCoasting = bits, U32, 1164, [13:13] -looksLikeCrankToIdle = bits, U32, 1164, [14:14] -isVerboseIAC = bits, U32, 1164, [15:15] -isIdleCoasting = bits, U32, 1164, [16:16] -unusedBit_22_17 = bits, U32, 1164, [17:17] -unusedBit_22_18 = bits, U32, 1164, [18:18] -unusedBit_22_19 = bits, U32, 1164, [19:19] -unusedBit_22_20 = bits, U32, 1164, [20:20] -unusedBit_22_21 = bits, U32, 1164, [21:21] -unusedBit_22_22 = bits, U32, 1164, [22:22] -unusedBit_22_23 = bits, U32, 1164, [23:23] -unusedBit_22_24 = bits, U32, 1164, [24:24] -unusedBit_22_25 = bits, U32, 1164, [25:25] -unusedBit_22_26 = bits, U32, 1164, [26:26] -unusedBit_22_27 = bits, U32, 1164, [27:27] -unusedBit_22_28 = bits, U32, 1164, [28:28] -unusedBit_22_29 = bits, U32, 1164, [29:29] -unusedBit_22_30 = bits, U32, 1164, [30:30] -unusedBit_22_31 = bits, U32, 1164, [31:31] -targetRpmByClt = scalar, S32, 1168, "", 1, 0 -targetRpmAcBump = scalar, S32, 1172, "", 1, 0 -iacByRpmTaper = scalar, F32, 1176 -luaAdd = scalar, F32, 1180 -; total TS size = 1184 -baseDwell = scalar, F32, 1184, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 1188, "", 1, 0 -luaTimingAdd = scalar, F32, 1192, "", 1, 0 -luaTimingMult = scalar, F32, 1196, "", 1, 0 -; total TS size = 1200 -idlePosition = scalar, F32, 1200, "", 1, 0 -trim = scalar, F32, 1204, "", 1, 0 -luaAdjustment = scalar, F32, 1208, "", 1, 0 -etbFeedForward = scalar, F32, 1212 -etbIntegralError = scalar, F32, 1216, "", 1, 0 -etbCurrentTarget = scalar, F32, 1220, "%", 1, 0 -etbRevLimitActive = bits, U32, 1224, [0:0] -unusedBit_7_1 = bits, U32, 1224, [1:1] -unusedBit_7_2 = bits, U32, 1224, [2:2] -unusedBit_7_3 = bits, U32, 1224, [3:3] -unusedBit_7_4 = bits, U32, 1224, [4:4] -unusedBit_7_5 = bits, U32, 1224, [5:5] -unusedBit_7_6 = bits, U32, 1224, [6:6] -unusedBit_7_7 = bits, U32, 1224, [7:7] -unusedBit_7_8 = bits, U32, 1224, [8:8] -unusedBit_7_9 = bits, U32, 1224, [9:9] -unusedBit_7_10 = bits, U32, 1224, [10:10] -unusedBit_7_11 = bits, U32, 1224, [11:11] -unusedBit_7_12 = bits, U32, 1224, [12:12] -unusedBit_7_13 = bits, U32, 1224, [13:13] -unusedBit_7_14 = bits, U32, 1224, [14:14] -unusedBit_7_15 = bits, U32, 1224, [15:15] -unusedBit_7_16 = bits, U32, 1224, [16:16] -unusedBit_7_17 = bits, U32, 1224, [17:17] -unusedBit_7_18 = bits, U32, 1224, [18:18] -unusedBit_7_19 = bits, U32, 1224, [19:19] -unusedBit_7_20 = bits, U32, 1224, [20:20] -unusedBit_7_21 = bits, U32, 1224, [21:21] -unusedBit_7_22 = bits, U32, 1224, [22:22] -unusedBit_7_23 = bits, U32, 1224, [23:23] -unusedBit_7_24 = bits, U32, 1224, [24:24] -unusedBit_7_25 = bits, U32, 1224, [25:25] -unusedBit_7_26 = bits, U32, 1224, [26:26] -unusedBit_7_27 = bits, U32, 1224, [27:27] -unusedBit_7_28 = bits, U32, 1224, [28:28] -unusedBit_7_29 = bits, U32, 1224, [29:29] -unusedBit_7_30 = bits, U32, 1224, [30:30] -unusedBit_7_31 = bits, U32, 1224, [31:31] -; total TS size = 1228 -faultCode = scalar, U08, 1228, "", 1, 0 -heaterDuty = scalar, U08, 1229, "%", 1, 0 -pumpDuty = scalar, U08, 1230, "%", 1, 0 -tempC = scalar, U16, 1232, "C", 1, 0 -nernstVoltage = scalar, U16, 1234, "V", 0.001, 0 -esr = scalar, U16, 1236, "", 1, 0 -; total TS size = 1240 +m_hasSynchronizedPhase = bits, U32, 1136, [0:0] +unusedBit_1_1 = bits, U32, 1136, [1:1] +unusedBit_1_2 = bits, U32, 1136, [2:2] +unusedBit_1_3 = bits, U32, 1136, [3:3] +unusedBit_1_4 = bits, U32, 1136, [4:4] +unusedBit_1_5 = bits, U32, 1136, [5:5] +unusedBit_1_6 = bits, U32, 1136, [6:6] +unusedBit_1_7 = bits, U32, 1136, [7:7] +unusedBit_1_8 = bits, U32, 1136, [8:8] +unusedBit_1_9 = bits, U32, 1136, [9:9] +unusedBit_1_10 = bits, U32, 1136, [10:10] +unusedBit_1_11 = bits, U32, 1136, [11:11] +unusedBit_1_12 = bits, U32, 1136, [12:12] +unusedBit_1_13 = bits, U32, 1136, [13:13] +unusedBit_1_14 = bits, U32, 1136, [14:14] +unusedBit_1_15 = bits, U32, 1136, [15:15] +unusedBit_1_16 = bits, U32, 1136, [16:16] +unusedBit_1_17 = bits, U32, 1136, [17:17] +unusedBit_1_18 = bits, U32, 1136, [18:18] +unusedBit_1_19 = bits, U32, 1136, [19:19] +unusedBit_1_20 = bits, U32, 1136, [20:20] +unusedBit_1_21 = bits, U32, 1136, [21:21] +unusedBit_1_22 = bits, U32, 1136, [22:22] +unusedBit_1_23 = bits, U32, 1136, [23:23] +unusedBit_1_24 = bits, U32, 1136, [24:24] +unusedBit_1_25 = bits, U32, 1136, [25:25] +unusedBit_1_26 = bits, U32, 1136, [26:26] +unusedBit_1_27 = bits, U32, 1136, [27:27] +unusedBit_1_28 = bits, U32, 1136, [28:28] +unusedBit_1_29 = bits, U32, 1136, [29:29] +unusedBit_1_30 = bits, U32, 1136, [30:30] +unusedBit_1_31 = bits, U32, 1136, [31:31] +; total TS size = 1140 +wallFuelCorrection = scalar, F32, 1140, "", 1, 0 +wallFuel = scalar, F32, 1144, "", 1, 0 +; total TS size = 1148 +idleState = bits, S32, 1148, [0:2], "not important" +currentIdlePosition = scalar, F32, 1152 +baseIdlePosition = scalar, F32, 1156 +iacByTpsTaper = scalar, F32, 1160 +throttlePedalUpState = scalar, S32, 1164, "", 1, 0 +mightResetPid = bits, U32, 1168, [0:0] +shouldResetPid = bits, U32, 1168, [1:1] +wasResetPid = bits, U32, 1168, [2:2] +mustResetPid = bits, U32, 1168, [3:3] +isCranking = bits, U32, 1168, [4:4] +useIacTableForCoasting = bits, U32, 1168, [5:5] +notIdling = bits, U32, 1168, [6:6] +needReset = bits, U32, 1168, [7:7] +isInDeadZone = bits, U32, 1168, [8:8] +isBlipping = bits, U32, 1168, [9:9] +useClosedLoop = bits, U32, 1168, [10:10] +badTps = bits, U32, 1168, [11:11] +looksLikeRunning = bits, U32, 1168, [12:12] +looksLikeCoasting = bits, U32, 1168, [13:13] +looksLikeCrankToIdle = bits, U32, 1168, [14:14] +isVerboseIAC = bits, U32, 1168, [15:15] +isIdleCoasting = bits, U32, 1168, [16:16] +unusedBit_22_17 = bits, U32, 1168, [17:17] +unusedBit_22_18 = bits, U32, 1168, [18:18] +unusedBit_22_19 = bits, U32, 1168, [19:19] +unusedBit_22_20 = bits, U32, 1168, [20:20] +unusedBit_22_21 = bits, U32, 1168, [21:21] +unusedBit_22_22 = bits, U32, 1168, [22:22] +unusedBit_22_23 = bits, U32, 1168, [23:23] +unusedBit_22_24 = bits, U32, 1168, [24:24] +unusedBit_22_25 = bits, U32, 1168, [25:25] +unusedBit_22_26 = bits, U32, 1168, [26:26] +unusedBit_22_27 = bits, U32, 1168, [27:27] +unusedBit_22_28 = bits, U32, 1168, [28:28] +unusedBit_22_29 = bits, U32, 1168, [29:29] +unusedBit_22_30 = bits, U32, 1168, [30:30] +unusedBit_22_31 = bits, U32, 1168, [31:31] +targetRpmByClt = scalar, S32, 1172, "", 1, 0 +targetRpmAcBump = scalar, S32, 1176, "", 1, 0 +iacByRpmTaper = scalar, F32, 1180 +luaAdd = scalar, F32, 1184 +; total TS size = 1188 +baseDwell = scalar, F32, 1188, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 1192, "", 1, 0 +luaTimingAdd = scalar, F32, 1196, "", 1, 0 +luaTimingMult = scalar, F32, 1200, "", 1, 0 +; total TS size = 1204 +idlePosition = scalar, F32, 1204, "", 1, 0 +trim = scalar, F32, 1208, "", 1, 0 +luaAdjustment = scalar, F32, 1212, "", 1, 0 +etbFeedForward = scalar, F32, 1216 +etbIntegralError = scalar, F32, 1220, "", 1, 0 +etbCurrentTarget = scalar, F32, 1224, "%", 1, 0 +etbRevLimitActive = bits, U32, 1228, [0:0] +unusedBit_7_1 = bits, U32, 1228, [1:1] +unusedBit_7_2 = bits, U32, 1228, [2:2] +unusedBit_7_3 = bits, U32, 1228, [3:3] +unusedBit_7_4 = bits, U32, 1228, [4:4] +unusedBit_7_5 = bits, U32, 1228, [5:5] +unusedBit_7_6 = bits, U32, 1228, [6:6] +unusedBit_7_7 = bits, U32, 1228, [7:7] +unusedBit_7_8 = bits, U32, 1228, [8:8] +unusedBit_7_9 = bits, U32, 1228, [9:9] +unusedBit_7_10 = bits, U32, 1228, [10:10] +unusedBit_7_11 = bits, U32, 1228, [11:11] +unusedBit_7_12 = bits, U32, 1228, [12:12] +unusedBit_7_13 = bits, U32, 1228, [13:13] +unusedBit_7_14 = bits, U32, 1228, [14:14] +unusedBit_7_15 = bits, U32, 1228, [15:15] +unusedBit_7_16 = bits, U32, 1228, [16:16] +unusedBit_7_17 = bits, U32, 1228, [17:17] +unusedBit_7_18 = bits, U32, 1228, [18:18] +unusedBit_7_19 = bits, U32, 1228, [19:19] +unusedBit_7_20 = bits, U32, 1228, [20:20] +unusedBit_7_21 = bits, U32, 1228, [21:21] +unusedBit_7_22 = bits, U32, 1228, [22:22] +unusedBit_7_23 = bits, U32, 1228, [23:23] +unusedBit_7_24 = bits, U32, 1228, [24:24] +unusedBit_7_25 = bits, U32, 1228, [25:25] +unusedBit_7_26 = bits, U32, 1228, [26:26] +unusedBit_7_27 = bits, U32, 1228, [27:27] +unusedBit_7_28 = bits, U32, 1228, [28:28] +unusedBit_7_29 = bits, U32, 1228, [29:29] +unusedBit_7_30 = bits, U32, 1228, [30:30] +unusedBit_7_31 = bits, U32, 1228, [31:31] +; total TS size = 1232 +faultCode = scalar, U08, 1232, "", 1, 0 +heaterDuty = scalar, U08, 1233, "%", 1, 0 +pumpDuty = scalar, U08, 1234, "%", 1, 0 +tempC = scalar, U16, 1236, "C", 1, 0 +nernstVoltage = scalar, U16, 1238, "V", 0.001, 0 +esr = scalar, U16, 1240, "", 1, 0 +; total TS size = 1244 time = { timeNow } @@ -4847,7 +4847,7 @@ entry = mapVvt_MAP_AT_SPECIAL_POINT, "mapVvt_MAP_AT_SPECIAL_POINT", float, "%.3 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 Phase2", int, "%d" +entry = currentEngineDecodedPhase, "Engine Phase2", float, "%.3f" entry = totalRevolutionCounter, "Crank revolution counter", int, "%d" entry = vvtSyncGapRatio, "vvtSyncGapRatio", float, "%.3f" entry = vvtCurrentPosition, "vvtCurrentPosition", float, "%.3f" diff --git a/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini b/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini index 8fe1ae86e4..8723aa0b30 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.01.frankenso_na6.2643792481" + signature = "rusEFI 2022.09.01.frankenso_na6.2599999096" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.09.01.frankenso_na6.2643792481" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.09.01.frankenso_na6.2599999096" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Sep 01 04:52:38 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Sep 01 05:33:28 UTC 2022 pageSize = 21300 page = 1 @@ -2118,7 +2118,7 @@ maxKnockRetardRpmBins = array, U08, 21294, [6], "RPM", 100.0, 0, 0, 25000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1240 + ochBlockSize = 1244 ; ; see TunerStudioOutputChannels struct @@ -3090,147 +3090,147 @@ mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1096, "", 1, 0 mapVvt_MAP_AT_DIFF = scalar, F32, 1100, "", 1, 0 mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1104, "", 1, 0 mapVvt_map_peak = scalar, U08, 1105, "", 1, 0 -currentEngineDecodedPhase = scalar, U16, 1106, "deg", 1, 0 -; total TS size = 1108 -totalRevolutionCounter = scalar, U32, 1108, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1112, "", 1, 0 -vvtCurrentPosition = scalar, F32, 1116, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1120, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 1124, "", 1, 0 -triggerStateIndex = scalar, U08, 1128, "", 1, 0 -vvtCounter = scalar, U08, 1129, "", 1, 0 -camResyncCounter = scalar, U08, 1130, "", 1, 0 -vvtStateIndex = scalar, U08, 1131, "", 1, 0 -; total TS size = 1132 -m_hasSynchronizedPhase = bits, U32, 1132, [0:0] -unusedBit_1_1 = bits, U32, 1132, [1:1] -unusedBit_1_2 = bits, U32, 1132, [2:2] -unusedBit_1_3 = bits, U32, 1132, [3:3] -unusedBit_1_4 = bits, U32, 1132, [4:4] -unusedBit_1_5 = bits, U32, 1132, [5:5] -unusedBit_1_6 = bits, U32, 1132, [6:6] -unusedBit_1_7 = bits, U32, 1132, [7:7] -unusedBit_1_8 = bits, U32, 1132, [8:8] -unusedBit_1_9 = bits, U32, 1132, [9:9] -unusedBit_1_10 = bits, U32, 1132, [10:10] -unusedBit_1_11 = bits, U32, 1132, [11:11] -unusedBit_1_12 = bits, U32, 1132, [12:12] -unusedBit_1_13 = bits, U32, 1132, [13:13] -unusedBit_1_14 = bits, U32, 1132, [14:14] -unusedBit_1_15 = bits, U32, 1132, [15:15] -unusedBit_1_16 = bits, U32, 1132, [16:16] -unusedBit_1_17 = bits, U32, 1132, [17:17] -unusedBit_1_18 = bits, U32, 1132, [18:18] -unusedBit_1_19 = bits, U32, 1132, [19:19] -unusedBit_1_20 = bits, U32, 1132, [20:20] -unusedBit_1_21 = bits, U32, 1132, [21:21] -unusedBit_1_22 = bits, U32, 1132, [22:22] -unusedBit_1_23 = bits, U32, 1132, [23:23] -unusedBit_1_24 = bits, U32, 1132, [24:24] -unusedBit_1_25 = bits, U32, 1132, [25:25] -unusedBit_1_26 = bits, U32, 1132, [26:26] -unusedBit_1_27 = bits, U32, 1132, [27:27] -unusedBit_1_28 = bits, U32, 1132, [28:28] -unusedBit_1_29 = bits, U32, 1132, [29:29] -unusedBit_1_30 = bits, U32, 1132, [30:30] -unusedBit_1_31 = bits, U32, 1132, [31:31] +currentEngineDecodedPhase = scalar, F32, 1108, "deg", 1, 0 +; total TS size = 1112 +totalRevolutionCounter = scalar, U32, 1112, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1116, "", 1, 0 +vvtCurrentPosition = scalar, F32, 1120, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1124, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 1128, "", 1, 0 +triggerStateIndex = scalar, U08, 1132, "", 1, 0 +vvtCounter = scalar, U08, 1133, "", 1, 0 +camResyncCounter = scalar, U08, 1134, "", 1, 0 +vvtStateIndex = scalar, U08, 1135, "", 1, 0 ; total TS size = 1136 -wallFuelCorrection = scalar, F32, 1136, "", 1, 0 -wallFuel = scalar, F32, 1140, "", 1, 0 -; total TS size = 1144 -idleState = bits, S32, 1144, [0:2], "not important" -currentIdlePosition = scalar, F32, 1148 -baseIdlePosition = scalar, F32, 1152 -iacByTpsTaper = scalar, F32, 1156 -throttlePedalUpState = scalar, S32, 1160, "", 1, 0 -mightResetPid = bits, U32, 1164, [0:0] -shouldResetPid = bits, U32, 1164, [1:1] -wasResetPid = bits, U32, 1164, [2:2] -mustResetPid = bits, U32, 1164, [3:3] -isCranking = bits, U32, 1164, [4:4] -useIacTableForCoasting = bits, U32, 1164, [5:5] -notIdling = bits, U32, 1164, [6:6] -needReset = bits, U32, 1164, [7:7] -isInDeadZone = bits, U32, 1164, [8:8] -isBlipping = bits, U32, 1164, [9:9] -useClosedLoop = bits, U32, 1164, [10:10] -badTps = bits, U32, 1164, [11:11] -looksLikeRunning = bits, U32, 1164, [12:12] -looksLikeCoasting = bits, U32, 1164, [13:13] -looksLikeCrankToIdle = bits, U32, 1164, [14:14] -isVerboseIAC = bits, U32, 1164, [15:15] -isIdleCoasting = bits, U32, 1164, [16:16] -unusedBit_22_17 = bits, U32, 1164, [17:17] -unusedBit_22_18 = bits, U32, 1164, [18:18] -unusedBit_22_19 = bits, U32, 1164, [19:19] -unusedBit_22_20 = bits, U32, 1164, [20:20] -unusedBit_22_21 = bits, U32, 1164, [21:21] -unusedBit_22_22 = bits, U32, 1164, [22:22] -unusedBit_22_23 = bits, U32, 1164, [23:23] -unusedBit_22_24 = bits, U32, 1164, [24:24] -unusedBit_22_25 = bits, U32, 1164, [25:25] -unusedBit_22_26 = bits, U32, 1164, [26:26] -unusedBit_22_27 = bits, U32, 1164, [27:27] -unusedBit_22_28 = bits, U32, 1164, [28:28] -unusedBit_22_29 = bits, U32, 1164, [29:29] -unusedBit_22_30 = bits, U32, 1164, [30:30] -unusedBit_22_31 = bits, U32, 1164, [31:31] -targetRpmByClt = scalar, S32, 1168, "", 1, 0 -targetRpmAcBump = scalar, S32, 1172, "", 1, 0 -iacByRpmTaper = scalar, F32, 1176 -luaAdd = scalar, F32, 1180 -; total TS size = 1184 -baseDwell = scalar, F32, 1184, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 1188, "", 1, 0 -luaTimingAdd = scalar, F32, 1192, "", 1, 0 -luaTimingMult = scalar, F32, 1196, "", 1, 0 -; total TS size = 1200 -idlePosition = scalar, F32, 1200, "", 1, 0 -trim = scalar, F32, 1204, "", 1, 0 -luaAdjustment = scalar, F32, 1208, "", 1, 0 -etbFeedForward = scalar, F32, 1212 -etbIntegralError = scalar, F32, 1216, "", 1, 0 -etbCurrentTarget = scalar, F32, 1220, "%", 1, 0 -etbRevLimitActive = bits, U32, 1224, [0:0] -unusedBit_7_1 = bits, U32, 1224, [1:1] -unusedBit_7_2 = bits, U32, 1224, [2:2] -unusedBit_7_3 = bits, U32, 1224, [3:3] -unusedBit_7_4 = bits, U32, 1224, [4:4] -unusedBit_7_5 = bits, U32, 1224, [5:5] -unusedBit_7_6 = bits, U32, 1224, [6:6] -unusedBit_7_7 = bits, U32, 1224, [7:7] -unusedBit_7_8 = bits, U32, 1224, [8:8] -unusedBit_7_9 = bits, U32, 1224, [9:9] -unusedBit_7_10 = bits, U32, 1224, [10:10] -unusedBit_7_11 = bits, U32, 1224, [11:11] -unusedBit_7_12 = bits, U32, 1224, [12:12] -unusedBit_7_13 = bits, U32, 1224, [13:13] -unusedBit_7_14 = bits, U32, 1224, [14:14] -unusedBit_7_15 = bits, U32, 1224, [15:15] -unusedBit_7_16 = bits, U32, 1224, [16:16] -unusedBit_7_17 = bits, U32, 1224, [17:17] -unusedBit_7_18 = bits, U32, 1224, [18:18] -unusedBit_7_19 = bits, U32, 1224, [19:19] -unusedBit_7_20 = bits, U32, 1224, [20:20] -unusedBit_7_21 = bits, U32, 1224, [21:21] -unusedBit_7_22 = bits, U32, 1224, [22:22] -unusedBit_7_23 = bits, U32, 1224, [23:23] -unusedBit_7_24 = bits, U32, 1224, [24:24] -unusedBit_7_25 = bits, U32, 1224, [25:25] -unusedBit_7_26 = bits, U32, 1224, [26:26] -unusedBit_7_27 = bits, U32, 1224, [27:27] -unusedBit_7_28 = bits, U32, 1224, [28:28] -unusedBit_7_29 = bits, U32, 1224, [29:29] -unusedBit_7_30 = bits, U32, 1224, [30:30] -unusedBit_7_31 = bits, U32, 1224, [31:31] -; total TS size = 1228 -faultCode = scalar, U08, 1228, "", 1, 0 -heaterDuty = scalar, U08, 1229, "%", 1, 0 -pumpDuty = scalar, U08, 1230, "%", 1, 0 -tempC = scalar, U16, 1232, "C", 1, 0 -nernstVoltage = scalar, U16, 1234, "V", 0.001, 0 -esr = scalar, U16, 1236, "", 1, 0 -; total TS size = 1240 +m_hasSynchronizedPhase = bits, U32, 1136, [0:0] +unusedBit_1_1 = bits, U32, 1136, [1:1] +unusedBit_1_2 = bits, U32, 1136, [2:2] +unusedBit_1_3 = bits, U32, 1136, [3:3] +unusedBit_1_4 = bits, U32, 1136, [4:4] +unusedBit_1_5 = bits, U32, 1136, [5:5] +unusedBit_1_6 = bits, U32, 1136, [6:6] +unusedBit_1_7 = bits, U32, 1136, [7:7] +unusedBit_1_8 = bits, U32, 1136, [8:8] +unusedBit_1_9 = bits, U32, 1136, [9:9] +unusedBit_1_10 = bits, U32, 1136, [10:10] +unusedBit_1_11 = bits, U32, 1136, [11:11] +unusedBit_1_12 = bits, U32, 1136, [12:12] +unusedBit_1_13 = bits, U32, 1136, [13:13] +unusedBit_1_14 = bits, U32, 1136, [14:14] +unusedBit_1_15 = bits, U32, 1136, [15:15] +unusedBit_1_16 = bits, U32, 1136, [16:16] +unusedBit_1_17 = bits, U32, 1136, [17:17] +unusedBit_1_18 = bits, U32, 1136, [18:18] +unusedBit_1_19 = bits, U32, 1136, [19:19] +unusedBit_1_20 = bits, U32, 1136, [20:20] +unusedBit_1_21 = bits, U32, 1136, [21:21] +unusedBit_1_22 = bits, U32, 1136, [22:22] +unusedBit_1_23 = bits, U32, 1136, [23:23] +unusedBit_1_24 = bits, U32, 1136, [24:24] +unusedBit_1_25 = bits, U32, 1136, [25:25] +unusedBit_1_26 = bits, U32, 1136, [26:26] +unusedBit_1_27 = bits, U32, 1136, [27:27] +unusedBit_1_28 = bits, U32, 1136, [28:28] +unusedBit_1_29 = bits, U32, 1136, [29:29] +unusedBit_1_30 = bits, U32, 1136, [30:30] +unusedBit_1_31 = bits, U32, 1136, [31:31] +; total TS size = 1140 +wallFuelCorrection = scalar, F32, 1140, "", 1, 0 +wallFuel = scalar, F32, 1144, "", 1, 0 +; total TS size = 1148 +idleState = bits, S32, 1148, [0:2], "not important" +currentIdlePosition = scalar, F32, 1152 +baseIdlePosition = scalar, F32, 1156 +iacByTpsTaper = scalar, F32, 1160 +throttlePedalUpState = scalar, S32, 1164, "", 1, 0 +mightResetPid = bits, U32, 1168, [0:0] +shouldResetPid = bits, U32, 1168, [1:1] +wasResetPid = bits, U32, 1168, [2:2] +mustResetPid = bits, U32, 1168, [3:3] +isCranking = bits, U32, 1168, [4:4] +useIacTableForCoasting = bits, U32, 1168, [5:5] +notIdling = bits, U32, 1168, [6:6] +needReset = bits, U32, 1168, [7:7] +isInDeadZone = bits, U32, 1168, [8:8] +isBlipping = bits, U32, 1168, [9:9] +useClosedLoop = bits, U32, 1168, [10:10] +badTps = bits, U32, 1168, [11:11] +looksLikeRunning = bits, U32, 1168, [12:12] +looksLikeCoasting = bits, U32, 1168, [13:13] +looksLikeCrankToIdle = bits, U32, 1168, [14:14] +isVerboseIAC = bits, U32, 1168, [15:15] +isIdleCoasting = bits, U32, 1168, [16:16] +unusedBit_22_17 = bits, U32, 1168, [17:17] +unusedBit_22_18 = bits, U32, 1168, [18:18] +unusedBit_22_19 = bits, U32, 1168, [19:19] +unusedBit_22_20 = bits, U32, 1168, [20:20] +unusedBit_22_21 = bits, U32, 1168, [21:21] +unusedBit_22_22 = bits, U32, 1168, [22:22] +unusedBit_22_23 = bits, U32, 1168, [23:23] +unusedBit_22_24 = bits, U32, 1168, [24:24] +unusedBit_22_25 = bits, U32, 1168, [25:25] +unusedBit_22_26 = bits, U32, 1168, [26:26] +unusedBit_22_27 = bits, U32, 1168, [27:27] +unusedBit_22_28 = bits, U32, 1168, [28:28] +unusedBit_22_29 = bits, U32, 1168, [29:29] +unusedBit_22_30 = bits, U32, 1168, [30:30] +unusedBit_22_31 = bits, U32, 1168, [31:31] +targetRpmByClt = scalar, S32, 1172, "", 1, 0 +targetRpmAcBump = scalar, S32, 1176, "", 1, 0 +iacByRpmTaper = scalar, F32, 1180 +luaAdd = scalar, F32, 1184 +; total TS size = 1188 +baseDwell = scalar, F32, 1188, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 1192, "", 1, 0 +luaTimingAdd = scalar, F32, 1196, "", 1, 0 +luaTimingMult = scalar, F32, 1200, "", 1, 0 +; total TS size = 1204 +idlePosition = scalar, F32, 1204, "", 1, 0 +trim = scalar, F32, 1208, "", 1, 0 +luaAdjustment = scalar, F32, 1212, "", 1, 0 +etbFeedForward = scalar, F32, 1216 +etbIntegralError = scalar, F32, 1220, "", 1, 0 +etbCurrentTarget = scalar, F32, 1224, "%", 1, 0 +etbRevLimitActive = bits, U32, 1228, [0:0] +unusedBit_7_1 = bits, U32, 1228, [1:1] +unusedBit_7_2 = bits, U32, 1228, [2:2] +unusedBit_7_3 = bits, U32, 1228, [3:3] +unusedBit_7_4 = bits, U32, 1228, [4:4] +unusedBit_7_5 = bits, U32, 1228, [5:5] +unusedBit_7_6 = bits, U32, 1228, [6:6] +unusedBit_7_7 = bits, U32, 1228, [7:7] +unusedBit_7_8 = bits, U32, 1228, [8:8] +unusedBit_7_9 = bits, U32, 1228, [9:9] +unusedBit_7_10 = bits, U32, 1228, [10:10] +unusedBit_7_11 = bits, U32, 1228, [11:11] +unusedBit_7_12 = bits, U32, 1228, [12:12] +unusedBit_7_13 = bits, U32, 1228, [13:13] +unusedBit_7_14 = bits, U32, 1228, [14:14] +unusedBit_7_15 = bits, U32, 1228, [15:15] +unusedBit_7_16 = bits, U32, 1228, [16:16] +unusedBit_7_17 = bits, U32, 1228, [17:17] +unusedBit_7_18 = bits, U32, 1228, [18:18] +unusedBit_7_19 = bits, U32, 1228, [19:19] +unusedBit_7_20 = bits, U32, 1228, [20:20] +unusedBit_7_21 = bits, U32, 1228, [21:21] +unusedBit_7_22 = bits, U32, 1228, [22:22] +unusedBit_7_23 = bits, U32, 1228, [23:23] +unusedBit_7_24 = bits, U32, 1228, [24:24] +unusedBit_7_25 = bits, U32, 1228, [25:25] +unusedBit_7_26 = bits, U32, 1228, [26:26] +unusedBit_7_27 = bits, U32, 1228, [27:27] +unusedBit_7_28 = bits, U32, 1228, [28:28] +unusedBit_7_29 = bits, U32, 1228, [29:29] +unusedBit_7_30 = bits, U32, 1228, [30:30] +unusedBit_7_31 = bits, U32, 1228, [31:31] +; total TS size = 1232 +faultCode = scalar, U08, 1232, "", 1, 0 +heaterDuty = scalar, U08, 1233, "%", 1, 0 +pumpDuty = scalar, U08, 1234, "%", 1, 0 +tempC = scalar, U16, 1236, "C", 1, 0 +nernstVoltage = scalar, U16, 1238, "V", 0.001, 0 +esr = scalar, U16, 1240, "", 1, 0 +; total TS size = 1244 time = { timeNow } @@ -4847,7 +4847,7 @@ entry = mapVvt_MAP_AT_SPECIAL_POINT, "mapVvt_MAP_AT_SPECIAL_POINT", float, "%.3 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 Phase2", int, "%d" +entry = currentEngineDecodedPhase, "Engine Phase2", float, "%.3f" entry = totalRevolutionCounter, "Crank revolution counter", int, "%d" entry = vvtSyncGapRatio, "vvtSyncGapRatio", float, "%.3f" entry = vvtCurrentPosition, "vvtCurrentPosition", float, "%.3f" diff --git a/firmware/tunerstudio/generated/rusefi_harley81.ini b/firmware/tunerstudio/generated/rusefi_harley81.ini index 2ab97163ff..e8a14d8684 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.01.harley81.788851594" + signature = "rusEFI 2022.09.01.harley81.677982099" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.09.01.harley81.788851594" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.09.01.harley81.677982099" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Sep 01 04:52:12 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Sep 01 05:33:02 UTC 2022 pageSize = 21300 page = 1 @@ -2118,7 +2118,7 @@ maxKnockRetardRpmBins = array, U08, 21294, [6], "RPM", 100.0, 0, 0, 25000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1240 + ochBlockSize = 1244 ; ; see TunerStudioOutputChannels struct @@ -3090,147 +3090,147 @@ mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1096, "", 1, 0 mapVvt_MAP_AT_DIFF = scalar, F32, 1100, "", 1, 0 mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1104, "", 1, 0 mapVvt_map_peak = scalar, U08, 1105, "", 1, 0 -currentEngineDecodedPhase = scalar, U16, 1106, "deg", 1, 0 -; total TS size = 1108 -totalRevolutionCounter = scalar, U32, 1108, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1112, "", 1, 0 -vvtCurrentPosition = scalar, F32, 1116, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1120, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 1124, "", 1, 0 -triggerStateIndex = scalar, U08, 1128, "", 1, 0 -vvtCounter = scalar, U08, 1129, "", 1, 0 -camResyncCounter = scalar, U08, 1130, "", 1, 0 -vvtStateIndex = scalar, U08, 1131, "", 1, 0 -; total TS size = 1132 -m_hasSynchronizedPhase = bits, U32, 1132, [0:0] -unusedBit_1_1 = bits, U32, 1132, [1:1] -unusedBit_1_2 = bits, U32, 1132, [2:2] -unusedBit_1_3 = bits, U32, 1132, [3:3] -unusedBit_1_4 = bits, U32, 1132, [4:4] -unusedBit_1_5 = bits, U32, 1132, [5:5] -unusedBit_1_6 = bits, U32, 1132, [6:6] -unusedBit_1_7 = bits, U32, 1132, [7:7] -unusedBit_1_8 = bits, U32, 1132, [8:8] -unusedBit_1_9 = bits, U32, 1132, [9:9] -unusedBit_1_10 = bits, U32, 1132, [10:10] -unusedBit_1_11 = bits, U32, 1132, [11:11] -unusedBit_1_12 = bits, U32, 1132, [12:12] -unusedBit_1_13 = bits, U32, 1132, [13:13] -unusedBit_1_14 = bits, U32, 1132, [14:14] -unusedBit_1_15 = bits, U32, 1132, [15:15] -unusedBit_1_16 = bits, U32, 1132, [16:16] -unusedBit_1_17 = bits, U32, 1132, [17:17] -unusedBit_1_18 = bits, U32, 1132, [18:18] -unusedBit_1_19 = bits, U32, 1132, [19:19] -unusedBit_1_20 = bits, U32, 1132, [20:20] -unusedBit_1_21 = bits, U32, 1132, [21:21] -unusedBit_1_22 = bits, U32, 1132, [22:22] -unusedBit_1_23 = bits, U32, 1132, [23:23] -unusedBit_1_24 = bits, U32, 1132, [24:24] -unusedBit_1_25 = bits, U32, 1132, [25:25] -unusedBit_1_26 = bits, U32, 1132, [26:26] -unusedBit_1_27 = bits, U32, 1132, [27:27] -unusedBit_1_28 = bits, U32, 1132, [28:28] -unusedBit_1_29 = bits, U32, 1132, [29:29] -unusedBit_1_30 = bits, U32, 1132, [30:30] -unusedBit_1_31 = bits, U32, 1132, [31:31] +currentEngineDecodedPhase = scalar, F32, 1108, "deg", 1, 0 +; total TS size = 1112 +totalRevolutionCounter = scalar, U32, 1112, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1116, "", 1, 0 +vvtCurrentPosition = scalar, F32, 1120, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1124, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 1128, "", 1, 0 +triggerStateIndex = scalar, U08, 1132, "", 1, 0 +vvtCounter = scalar, U08, 1133, "", 1, 0 +camResyncCounter = scalar, U08, 1134, "", 1, 0 +vvtStateIndex = scalar, U08, 1135, "", 1, 0 ; total TS size = 1136 -wallFuelCorrection = scalar, F32, 1136, "", 1, 0 -wallFuel = scalar, F32, 1140, "", 1, 0 -; total TS size = 1144 -idleState = bits, S32, 1144, [0:2], "not important" -currentIdlePosition = scalar, F32, 1148 -baseIdlePosition = scalar, F32, 1152 -iacByTpsTaper = scalar, F32, 1156 -throttlePedalUpState = scalar, S32, 1160, "", 1, 0 -mightResetPid = bits, U32, 1164, [0:0] -shouldResetPid = bits, U32, 1164, [1:1] -wasResetPid = bits, U32, 1164, [2:2] -mustResetPid = bits, U32, 1164, [3:3] -isCranking = bits, U32, 1164, [4:4] -useIacTableForCoasting = bits, U32, 1164, [5:5] -notIdling = bits, U32, 1164, [6:6] -needReset = bits, U32, 1164, [7:7] -isInDeadZone = bits, U32, 1164, [8:8] -isBlipping = bits, U32, 1164, [9:9] -useClosedLoop = bits, U32, 1164, [10:10] -badTps = bits, U32, 1164, [11:11] -looksLikeRunning = bits, U32, 1164, [12:12] -looksLikeCoasting = bits, U32, 1164, [13:13] -looksLikeCrankToIdle = bits, U32, 1164, [14:14] -isVerboseIAC = bits, U32, 1164, [15:15] -isIdleCoasting = bits, U32, 1164, [16:16] -unusedBit_22_17 = bits, U32, 1164, [17:17] -unusedBit_22_18 = bits, U32, 1164, [18:18] -unusedBit_22_19 = bits, U32, 1164, [19:19] -unusedBit_22_20 = bits, U32, 1164, [20:20] -unusedBit_22_21 = bits, U32, 1164, [21:21] -unusedBit_22_22 = bits, U32, 1164, [22:22] -unusedBit_22_23 = bits, U32, 1164, [23:23] -unusedBit_22_24 = bits, U32, 1164, [24:24] -unusedBit_22_25 = bits, U32, 1164, [25:25] -unusedBit_22_26 = bits, U32, 1164, [26:26] -unusedBit_22_27 = bits, U32, 1164, [27:27] -unusedBit_22_28 = bits, U32, 1164, [28:28] -unusedBit_22_29 = bits, U32, 1164, [29:29] -unusedBit_22_30 = bits, U32, 1164, [30:30] -unusedBit_22_31 = bits, U32, 1164, [31:31] -targetRpmByClt = scalar, S32, 1168, "", 1, 0 -targetRpmAcBump = scalar, S32, 1172, "", 1, 0 -iacByRpmTaper = scalar, F32, 1176 -luaAdd = scalar, F32, 1180 -; total TS size = 1184 -baseDwell = scalar, F32, 1184, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 1188, "", 1, 0 -luaTimingAdd = scalar, F32, 1192, "", 1, 0 -luaTimingMult = scalar, F32, 1196, "", 1, 0 -; total TS size = 1200 -idlePosition = scalar, F32, 1200, "", 1, 0 -trim = scalar, F32, 1204, "", 1, 0 -luaAdjustment = scalar, F32, 1208, "", 1, 0 -etbFeedForward = scalar, F32, 1212 -etbIntegralError = scalar, F32, 1216, "", 1, 0 -etbCurrentTarget = scalar, F32, 1220, "%", 1, 0 -etbRevLimitActive = bits, U32, 1224, [0:0] -unusedBit_7_1 = bits, U32, 1224, [1:1] -unusedBit_7_2 = bits, U32, 1224, [2:2] -unusedBit_7_3 = bits, U32, 1224, [3:3] -unusedBit_7_4 = bits, U32, 1224, [4:4] -unusedBit_7_5 = bits, U32, 1224, [5:5] -unusedBit_7_6 = bits, U32, 1224, [6:6] -unusedBit_7_7 = bits, U32, 1224, [7:7] -unusedBit_7_8 = bits, U32, 1224, [8:8] -unusedBit_7_9 = bits, U32, 1224, [9:9] -unusedBit_7_10 = bits, U32, 1224, [10:10] -unusedBit_7_11 = bits, U32, 1224, [11:11] -unusedBit_7_12 = bits, U32, 1224, [12:12] -unusedBit_7_13 = bits, U32, 1224, [13:13] -unusedBit_7_14 = bits, U32, 1224, [14:14] -unusedBit_7_15 = bits, U32, 1224, [15:15] -unusedBit_7_16 = bits, U32, 1224, [16:16] -unusedBit_7_17 = bits, U32, 1224, [17:17] -unusedBit_7_18 = bits, U32, 1224, [18:18] -unusedBit_7_19 = bits, U32, 1224, [19:19] -unusedBit_7_20 = bits, U32, 1224, [20:20] -unusedBit_7_21 = bits, U32, 1224, [21:21] -unusedBit_7_22 = bits, U32, 1224, [22:22] -unusedBit_7_23 = bits, U32, 1224, [23:23] -unusedBit_7_24 = bits, U32, 1224, [24:24] -unusedBit_7_25 = bits, U32, 1224, [25:25] -unusedBit_7_26 = bits, U32, 1224, [26:26] -unusedBit_7_27 = bits, U32, 1224, [27:27] -unusedBit_7_28 = bits, U32, 1224, [28:28] -unusedBit_7_29 = bits, U32, 1224, [29:29] -unusedBit_7_30 = bits, U32, 1224, [30:30] -unusedBit_7_31 = bits, U32, 1224, [31:31] -; total TS size = 1228 -faultCode = scalar, U08, 1228, "", 1, 0 -heaterDuty = scalar, U08, 1229, "%", 1, 0 -pumpDuty = scalar, U08, 1230, "%", 1, 0 -tempC = scalar, U16, 1232, "C", 1, 0 -nernstVoltage = scalar, U16, 1234, "V", 0.001, 0 -esr = scalar, U16, 1236, "", 1, 0 -; total TS size = 1240 +m_hasSynchronizedPhase = bits, U32, 1136, [0:0] +unusedBit_1_1 = bits, U32, 1136, [1:1] +unusedBit_1_2 = bits, U32, 1136, [2:2] +unusedBit_1_3 = bits, U32, 1136, [3:3] +unusedBit_1_4 = bits, U32, 1136, [4:4] +unusedBit_1_5 = bits, U32, 1136, [5:5] +unusedBit_1_6 = bits, U32, 1136, [6:6] +unusedBit_1_7 = bits, U32, 1136, [7:7] +unusedBit_1_8 = bits, U32, 1136, [8:8] +unusedBit_1_9 = bits, U32, 1136, [9:9] +unusedBit_1_10 = bits, U32, 1136, [10:10] +unusedBit_1_11 = bits, U32, 1136, [11:11] +unusedBit_1_12 = bits, U32, 1136, [12:12] +unusedBit_1_13 = bits, U32, 1136, [13:13] +unusedBit_1_14 = bits, U32, 1136, [14:14] +unusedBit_1_15 = bits, U32, 1136, [15:15] +unusedBit_1_16 = bits, U32, 1136, [16:16] +unusedBit_1_17 = bits, U32, 1136, [17:17] +unusedBit_1_18 = bits, U32, 1136, [18:18] +unusedBit_1_19 = bits, U32, 1136, [19:19] +unusedBit_1_20 = bits, U32, 1136, [20:20] +unusedBit_1_21 = bits, U32, 1136, [21:21] +unusedBit_1_22 = bits, U32, 1136, [22:22] +unusedBit_1_23 = bits, U32, 1136, [23:23] +unusedBit_1_24 = bits, U32, 1136, [24:24] +unusedBit_1_25 = bits, U32, 1136, [25:25] +unusedBit_1_26 = bits, U32, 1136, [26:26] +unusedBit_1_27 = bits, U32, 1136, [27:27] +unusedBit_1_28 = bits, U32, 1136, [28:28] +unusedBit_1_29 = bits, U32, 1136, [29:29] +unusedBit_1_30 = bits, U32, 1136, [30:30] +unusedBit_1_31 = bits, U32, 1136, [31:31] +; total TS size = 1140 +wallFuelCorrection = scalar, F32, 1140, "", 1, 0 +wallFuel = scalar, F32, 1144, "", 1, 0 +; total TS size = 1148 +idleState = bits, S32, 1148, [0:2], "not important" +currentIdlePosition = scalar, F32, 1152 +baseIdlePosition = scalar, F32, 1156 +iacByTpsTaper = scalar, F32, 1160 +throttlePedalUpState = scalar, S32, 1164, "", 1, 0 +mightResetPid = bits, U32, 1168, [0:0] +shouldResetPid = bits, U32, 1168, [1:1] +wasResetPid = bits, U32, 1168, [2:2] +mustResetPid = bits, U32, 1168, [3:3] +isCranking = bits, U32, 1168, [4:4] +useIacTableForCoasting = bits, U32, 1168, [5:5] +notIdling = bits, U32, 1168, [6:6] +needReset = bits, U32, 1168, [7:7] +isInDeadZone = bits, U32, 1168, [8:8] +isBlipping = bits, U32, 1168, [9:9] +useClosedLoop = bits, U32, 1168, [10:10] +badTps = bits, U32, 1168, [11:11] +looksLikeRunning = bits, U32, 1168, [12:12] +looksLikeCoasting = bits, U32, 1168, [13:13] +looksLikeCrankToIdle = bits, U32, 1168, [14:14] +isVerboseIAC = bits, U32, 1168, [15:15] +isIdleCoasting = bits, U32, 1168, [16:16] +unusedBit_22_17 = bits, U32, 1168, [17:17] +unusedBit_22_18 = bits, U32, 1168, [18:18] +unusedBit_22_19 = bits, U32, 1168, [19:19] +unusedBit_22_20 = bits, U32, 1168, [20:20] +unusedBit_22_21 = bits, U32, 1168, [21:21] +unusedBit_22_22 = bits, U32, 1168, [22:22] +unusedBit_22_23 = bits, U32, 1168, [23:23] +unusedBit_22_24 = bits, U32, 1168, [24:24] +unusedBit_22_25 = bits, U32, 1168, [25:25] +unusedBit_22_26 = bits, U32, 1168, [26:26] +unusedBit_22_27 = bits, U32, 1168, [27:27] +unusedBit_22_28 = bits, U32, 1168, [28:28] +unusedBit_22_29 = bits, U32, 1168, [29:29] +unusedBit_22_30 = bits, U32, 1168, [30:30] +unusedBit_22_31 = bits, U32, 1168, [31:31] +targetRpmByClt = scalar, S32, 1172, "", 1, 0 +targetRpmAcBump = scalar, S32, 1176, "", 1, 0 +iacByRpmTaper = scalar, F32, 1180 +luaAdd = scalar, F32, 1184 +; total TS size = 1188 +baseDwell = scalar, F32, 1188, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 1192, "", 1, 0 +luaTimingAdd = scalar, F32, 1196, "", 1, 0 +luaTimingMult = scalar, F32, 1200, "", 1, 0 +; total TS size = 1204 +idlePosition = scalar, F32, 1204, "", 1, 0 +trim = scalar, F32, 1208, "", 1, 0 +luaAdjustment = scalar, F32, 1212, "", 1, 0 +etbFeedForward = scalar, F32, 1216 +etbIntegralError = scalar, F32, 1220, "", 1, 0 +etbCurrentTarget = scalar, F32, 1224, "%", 1, 0 +etbRevLimitActive = bits, U32, 1228, [0:0] +unusedBit_7_1 = bits, U32, 1228, [1:1] +unusedBit_7_2 = bits, U32, 1228, [2:2] +unusedBit_7_3 = bits, U32, 1228, [3:3] +unusedBit_7_4 = bits, U32, 1228, [4:4] +unusedBit_7_5 = bits, U32, 1228, [5:5] +unusedBit_7_6 = bits, U32, 1228, [6:6] +unusedBit_7_7 = bits, U32, 1228, [7:7] +unusedBit_7_8 = bits, U32, 1228, [8:8] +unusedBit_7_9 = bits, U32, 1228, [9:9] +unusedBit_7_10 = bits, U32, 1228, [10:10] +unusedBit_7_11 = bits, U32, 1228, [11:11] +unusedBit_7_12 = bits, U32, 1228, [12:12] +unusedBit_7_13 = bits, U32, 1228, [13:13] +unusedBit_7_14 = bits, U32, 1228, [14:14] +unusedBit_7_15 = bits, U32, 1228, [15:15] +unusedBit_7_16 = bits, U32, 1228, [16:16] +unusedBit_7_17 = bits, U32, 1228, [17:17] +unusedBit_7_18 = bits, U32, 1228, [18:18] +unusedBit_7_19 = bits, U32, 1228, [19:19] +unusedBit_7_20 = bits, U32, 1228, [20:20] +unusedBit_7_21 = bits, U32, 1228, [21:21] +unusedBit_7_22 = bits, U32, 1228, [22:22] +unusedBit_7_23 = bits, U32, 1228, [23:23] +unusedBit_7_24 = bits, U32, 1228, [24:24] +unusedBit_7_25 = bits, U32, 1228, [25:25] +unusedBit_7_26 = bits, U32, 1228, [26:26] +unusedBit_7_27 = bits, U32, 1228, [27:27] +unusedBit_7_28 = bits, U32, 1228, [28:28] +unusedBit_7_29 = bits, U32, 1228, [29:29] +unusedBit_7_30 = bits, U32, 1228, [30:30] +unusedBit_7_31 = bits, U32, 1228, [31:31] +; total TS size = 1232 +faultCode = scalar, U08, 1232, "", 1, 0 +heaterDuty = scalar, U08, 1233, "%", 1, 0 +pumpDuty = scalar, U08, 1234, "%", 1, 0 +tempC = scalar, U16, 1236, "C", 1, 0 +nernstVoltage = scalar, U16, 1238, "V", 0.001, 0 +esr = scalar, U16, 1240, "", 1, 0 +; total TS size = 1244 time = { timeNow } @@ -4847,7 +4847,7 @@ entry = mapVvt_MAP_AT_SPECIAL_POINT, "mapVvt_MAP_AT_SPECIAL_POINT", float, "%.3 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 Phase2", int, "%d" +entry = currentEngineDecodedPhase, "Engine Phase2", float, "%.3f" entry = totalRevolutionCounter, "Crank revolution counter", int, "%d" entry = vvtSyncGapRatio, "vvtSyncGapRatio", float, "%.3f" entry = vvtCurrentPosition, "vvtCurrentPosition", float, "%.3f" diff --git a/firmware/tunerstudio/generated/rusefi_hellen-gm-e67.ini b/firmware/tunerstudio/generated/rusefi_hellen-gm-e67.ini index 1ab2d5f9d9..9599d8a993 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.01.hellen-gm-e67.1805544211" + signature = "rusEFI 2022.09.01.hellen-gm-e67.1827909386" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.09.01.hellen-gm-e67.1805544211" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.09.01.hellen-gm-e67.1827909386" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Sep 01 04:52:27 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Sep 01 05:33:17 UTC 2022 pageSize = 21300 page = 1 @@ -2118,7 +2118,7 @@ maxKnockRetardRpmBins = array, U08, 21294, [6], "RPM", 100.0, 0, 0, 25000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1240 + ochBlockSize = 1244 ; ; see TunerStudioOutputChannels struct @@ -3090,147 +3090,147 @@ mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1096, "", 1, 0 mapVvt_MAP_AT_DIFF = scalar, F32, 1100, "", 1, 0 mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1104, "", 1, 0 mapVvt_map_peak = scalar, U08, 1105, "", 1, 0 -currentEngineDecodedPhase = scalar, U16, 1106, "deg", 1, 0 -; total TS size = 1108 -totalRevolutionCounter = scalar, U32, 1108, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1112, "", 1, 0 -vvtCurrentPosition = scalar, F32, 1116, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1120, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 1124, "", 1, 0 -triggerStateIndex = scalar, U08, 1128, "", 1, 0 -vvtCounter = scalar, U08, 1129, "", 1, 0 -camResyncCounter = scalar, U08, 1130, "", 1, 0 -vvtStateIndex = scalar, U08, 1131, "", 1, 0 -; total TS size = 1132 -m_hasSynchronizedPhase = bits, U32, 1132, [0:0] -unusedBit_1_1 = bits, U32, 1132, [1:1] -unusedBit_1_2 = bits, U32, 1132, [2:2] -unusedBit_1_3 = bits, U32, 1132, [3:3] -unusedBit_1_4 = bits, U32, 1132, [4:4] -unusedBit_1_5 = bits, U32, 1132, [5:5] -unusedBit_1_6 = bits, U32, 1132, [6:6] -unusedBit_1_7 = bits, U32, 1132, [7:7] -unusedBit_1_8 = bits, U32, 1132, [8:8] -unusedBit_1_9 = bits, U32, 1132, [9:9] -unusedBit_1_10 = bits, U32, 1132, [10:10] -unusedBit_1_11 = bits, U32, 1132, [11:11] -unusedBit_1_12 = bits, U32, 1132, [12:12] -unusedBit_1_13 = bits, U32, 1132, [13:13] -unusedBit_1_14 = bits, U32, 1132, [14:14] -unusedBit_1_15 = bits, U32, 1132, [15:15] -unusedBit_1_16 = bits, U32, 1132, [16:16] -unusedBit_1_17 = bits, U32, 1132, [17:17] -unusedBit_1_18 = bits, U32, 1132, [18:18] -unusedBit_1_19 = bits, U32, 1132, [19:19] -unusedBit_1_20 = bits, U32, 1132, [20:20] -unusedBit_1_21 = bits, U32, 1132, [21:21] -unusedBit_1_22 = bits, U32, 1132, [22:22] -unusedBit_1_23 = bits, U32, 1132, [23:23] -unusedBit_1_24 = bits, U32, 1132, [24:24] -unusedBit_1_25 = bits, U32, 1132, [25:25] -unusedBit_1_26 = bits, U32, 1132, [26:26] -unusedBit_1_27 = bits, U32, 1132, [27:27] -unusedBit_1_28 = bits, U32, 1132, [28:28] -unusedBit_1_29 = bits, U32, 1132, [29:29] -unusedBit_1_30 = bits, U32, 1132, [30:30] -unusedBit_1_31 = bits, U32, 1132, [31:31] +currentEngineDecodedPhase = scalar, F32, 1108, "deg", 1, 0 +; total TS size = 1112 +totalRevolutionCounter = scalar, U32, 1112, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1116, "", 1, 0 +vvtCurrentPosition = scalar, F32, 1120, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1124, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 1128, "", 1, 0 +triggerStateIndex = scalar, U08, 1132, "", 1, 0 +vvtCounter = scalar, U08, 1133, "", 1, 0 +camResyncCounter = scalar, U08, 1134, "", 1, 0 +vvtStateIndex = scalar, U08, 1135, "", 1, 0 ; total TS size = 1136 -wallFuelCorrection = scalar, F32, 1136, "", 1, 0 -wallFuel = scalar, F32, 1140, "", 1, 0 -; total TS size = 1144 -idleState = bits, S32, 1144, [0:2], "not important" -currentIdlePosition = scalar, F32, 1148 -baseIdlePosition = scalar, F32, 1152 -iacByTpsTaper = scalar, F32, 1156 -throttlePedalUpState = scalar, S32, 1160, "", 1, 0 -mightResetPid = bits, U32, 1164, [0:0] -shouldResetPid = bits, U32, 1164, [1:1] -wasResetPid = bits, U32, 1164, [2:2] -mustResetPid = bits, U32, 1164, [3:3] -isCranking = bits, U32, 1164, [4:4] -useIacTableForCoasting = bits, U32, 1164, [5:5] -notIdling = bits, U32, 1164, [6:6] -needReset = bits, U32, 1164, [7:7] -isInDeadZone = bits, U32, 1164, [8:8] -isBlipping = bits, U32, 1164, [9:9] -useClosedLoop = bits, U32, 1164, [10:10] -badTps = bits, U32, 1164, [11:11] -looksLikeRunning = bits, U32, 1164, [12:12] -looksLikeCoasting = bits, U32, 1164, [13:13] -looksLikeCrankToIdle = bits, U32, 1164, [14:14] -isVerboseIAC = bits, U32, 1164, [15:15] -isIdleCoasting = bits, U32, 1164, [16:16] -unusedBit_22_17 = bits, U32, 1164, [17:17] -unusedBit_22_18 = bits, U32, 1164, [18:18] -unusedBit_22_19 = bits, U32, 1164, [19:19] -unusedBit_22_20 = bits, U32, 1164, [20:20] -unusedBit_22_21 = bits, U32, 1164, [21:21] -unusedBit_22_22 = bits, U32, 1164, [22:22] -unusedBit_22_23 = bits, U32, 1164, [23:23] -unusedBit_22_24 = bits, U32, 1164, [24:24] -unusedBit_22_25 = bits, U32, 1164, [25:25] -unusedBit_22_26 = bits, U32, 1164, [26:26] -unusedBit_22_27 = bits, U32, 1164, [27:27] -unusedBit_22_28 = bits, U32, 1164, [28:28] -unusedBit_22_29 = bits, U32, 1164, [29:29] -unusedBit_22_30 = bits, U32, 1164, [30:30] -unusedBit_22_31 = bits, U32, 1164, [31:31] -targetRpmByClt = scalar, S32, 1168, "", 1, 0 -targetRpmAcBump = scalar, S32, 1172, "", 1, 0 -iacByRpmTaper = scalar, F32, 1176 -luaAdd = scalar, F32, 1180 -; total TS size = 1184 -baseDwell = scalar, F32, 1184, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 1188, "", 1, 0 -luaTimingAdd = scalar, F32, 1192, "", 1, 0 -luaTimingMult = scalar, F32, 1196, "", 1, 0 -; total TS size = 1200 -idlePosition = scalar, F32, 1200, "", 1, 0 -trim = scalar, F32, 1204, "", 1, 0 -luaAdjustment = scalar, F32, 1208, "", 1, 0 -etbFeedForward = scalar, F32, 1212 -etbIntegralError = scalar, F32, 1216, "", 1, 0 -etbCurrentTarget = scalar, F32, 1220, "%", 1, 0 -etbRevLimitActive = bits, U32, 1224, [0:0] -unusedBit_7_1 = bits, U32, 1224, [1:1] -unusedBit_7_2 = bits, U32, 1224, [2:2] -unusedBit_7_3 = bits, U32, 1224, [3:3] -unusedBit_7_4 = bits, U32, 1224, [4:4] -unusedBit_7_5 = bits, U32, 1224, [5:5] -unusedBit_7_6 = bits, U32, 1224, [6:6] -unusedBit_7_7 = bits, U32, 1224, [7:7] -unusedBit_7_8 = bits, U32, 1224, [8:8] -unusedBit_7_9 = bits, U32, 1224, [9:9] -unusedBit_7_10 = bits, U32, 1224, [10:10] -unusedBit_7_11 = bits, U32, 1224, [11:11] -unusedBit_7_12 = bits, U32, 1224, [12:12] -unusedBit_7_13 = bits, U32, 1224, [13:13] -unusedBit_7_14 = bits, U32, 1224, [14:14] -unusedBit_7_15 = bits, U32, 1224, [15:15] -unusedBit_7_16 = bits, U32, 1224, [16:16] -unusedBit_7_17 = bits, U32, 1224, [17:17] -unusedBit_7_18 = bits, U32, 1224, [18:18] -unusedBit_7_19 = bits, U32, 1224, [19:19] -unusedBit_7_20 = bits, U32, 1224, [20:20] -unusedBit_7_21 = bits, U32, 1224, [21:21] -unusedBit_7_22 = bits, U32, 1224, [22:22] -unusedBit_7_23 = bits, U32, 1224, [23:23] -unusedBit_7_24 = bits, U32, 1224, [24:24] -unusedBit_7_25 = bits, U32, 1224, [25:25] -unusedBit_7_26 = bits, U32, 1224, [26:26] -unusedBit_7_27 = bits, U32, 1224, [27:27] -unusedBit_7_28 = bits, U32, 1224, [28:28] -unusedBit_7_29 = bits, U32, 1224, [29:29] -unusedBit_7_30 = bits, U32, 1224, [30:30] -unusedBit_7_31 = bits, U32, 1224, [31:31] -; total TS size = 1228 -faultCode = scalar, U08, 1228, "", 1, 0 -heaterDuty = scalar, U08, 1229, "%", 1, 0 -pumpDuty = scalar, U08, 1230, "%", 1, 0 -tempC = scalar, U16, 1232, "C", 1, 0 -nernstVoltage = scalar, U16, 1234, "V", 0.001, 0 -esr = scalar, U16, 1236, "", 1, 0 -; total TS size = 1240 +m_hasSynchronizedPhase = bits, U32, 1136, [0:0] +unusedBit_1_1 = bits, U32, 1136, [1:1] +unusedBit_1_2 = bits, U32, 1136, [2:2] +unusedBit_1_3 = bits, U32, 1136, [3:3] +unusedBit_1_4 = bits, U32, 1136, [4:4] +unusedBit_1_5 = bits, U32, 1136, [5:5] +unusedBit_1_6 = bits, U32, 1136, [6:6] +unusedBit_1_7 = bits, U32, 1136, [7:7] +unusedBit_1_8 = bits, U32, 1136, [8:8] +unusedBit_1_9 = bits, U32, 1136, [9:9] +unusedBit_1_10 = bits, U32, 1136, [10:10] +unusedBit_1_11 = bits, U32, 1136, [11:11] +unusedBit_1_12 = bits, U32, 1136, [12:12] +unusedBit_1_13 = bits, U32, 1136, [13:13] +unusedBit_1_14 = bits, U32, 1136, [14:14] +unusedBit_1_15 = bits, U32, 1136, [15:15] +unusedBit_1_16 = bits, U32, 1136, [16:16] +unusedBit_1_17 = bits, U32, 1136, [17:17] +unusedBit_1_18 = bits, U32, 1136, [18:18] +unusedBit_1_19 = bits, U32, 1136, [19:19] +unusedBit_1_20 = bits, U32, 1136, [20:20] +unusedBit_1_21 = bits, U32, 1136, [21:21] +unusedBit_1_22 = bits, U32, 1136, [22:22] +unusedBit_1_23 = bits, U32, 1136, [23:23] +unusedBit_1_24 = bits, U32, 1136, [24:24] +unusedBit_1_25 = bits, U32, 1136, [25:25] +unusedBit_1_26 = bits, U32, 1136, [26:26] +unusedBit_1_27 = bits, U32, 1136, [27:27] +unusedBit_1_28 = bits, U32, 1136, [28:28] +unusedBit_1_29 = bits, U32, 1136, [29:29] +unusedBit_1_30 = bits, U32, 1136, [30:30] +unusedBit_1_31 = bits, U32, 1136, [31:31] +; total TS size = 1140 +wallFuelCorrection = scalar, F32, 1140, "", 1, 0 +wallFuel = scalar, F32, 1144, "", 1, 0 +; total TS size = 1148 +idleState = bits, S32, 1148, [0:2], "not important" +currentIdlePosition = scalar, F32, 1152 +baseIdlePosition = scalar, F32, 1156 +iacByTpsTaper = scalar, F32, 1160 +throttlePedalUpState = scalar, S32, 1164, "", 1, 0 +mightResetPid = bits, U32, 1168, [0:0] +shouldResetPid = bits, U32, 1168, [1:1] +wasResetPid = bits, U32, 1168, [2:2] +mustResetPid = bits, U32, 1168, [3:3] +isCranking = bits, U32, 1168, [4:4] +useIacTableForCoasting = bits, U32, 1168, [5:5] +notIdling = bits, U32, 1168, [6:6] +needReset = bits, U32, 1168, [7:7] +isInDeadZone = bits, U32, 1168, [8:8] +isBlipping = bits, U32, 1168, [9:9] +useClosedLoop = bits, U32, 1168, [10:10] +badTps = bits, U32, 1168, [11:11] +looksLikeRunning = bits, U32, 1168, [12:12] +looksLikeCoasting = bits, U32, 1168, [13:13] +looksLikeCrankToIdle = bits, U32, 1168, [14:14] +isVerboseIAC = bits, U32, 1168, [15:15] +isIdleCoasting = bits, U32, 1168, [16:16] +unusedBit_22_17 = bits, U32, 1168, [17:17] +unusedBit_22_18 = bits, U32, 1168, [18:18] +unusedBit_22_19 = bits, U32, 1168, [19:19] +unusedBit_22_20 = bits, U32, 1168, [20:20] +unusedBit_22_21 = bits, U32, 1168, [21:21] +unusedBit_22_22 = bits, U32, 1168, [22:22] +unusedBit_22_23 = bits, U32, 1168, [23:23] +unusedBit_22_24 = bits, U32, 1168, [24:24] +unusedBit_22_25 = bits, U32, 1168, [25:25] +unusedBit_22_26 = bits, U32, 1168, [26:26] +unusedBit_22_27 = bits, U32, 1168, [27:27] +unusedBit_22_28 = bits, U32, 1168, [28:28] +unusedBit_22_29 = bits, U32, 1168, [29:29] +unusedBit_22_30 = bits, U32, 1168, [30:30] +unusedBit_22_31 = bits, U32, 1168, [31:31] +targetRpmByClt = scalar, S32, 1172, "", 1, 0 +targetRpmAcBump = scalar, S32, 1176, "", 1, 0 +iacByRpmTaper = scalar, F32, 1180 +luaAdd = scalar, F32, 1184 +; total TS size = 1188 +baseDwell = scalar, F32, 1188, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 1192, "", 1, 0 +luaTimingAdd = scalar, F32, 1196, "", 1, 0 +luaTimingMult = scalar, F32, 1200, "", 1, 0 +; total TS size = 1204 +idlePosition = scalar, F32, 1204, "", 1, 0 +trim = scalar, F32, 1208, "", 1, 0 +luaAdjustment = scalar, F32, 1212, "", 1, 0 +etbFeedForward = scalar, F32, 1216 +etbIntegralError = scalar, F32, 1220, "", 1, 0 +etbCurrentTarget = scalar, F32, 1224, "%", 1, 0 +etbRevLimitActive = bits, U32, 1228, [0:0] +unusedBit_7_1 = bits, U32, 1228, [1:1] +unusedBit_7_2 = bits, U32, 1228, [2:2] +unusedBit_7_3 = bits, U32, 1228, [3:3] +unusedBit_7_4 = bits, U32, 1228, [4:4] +unusedBit_7_5 = bits, U32, 1228, [5:5] +unusedBit_7_6 = bits, U32, 1228, [6:6] +unusedBit_7_7 = bits, U32, 1228, [7:7] +unusedBit_7_8 = bits, U32, 1228, [8:8] +unusedBit_7_9 = bits, U32, 1228, [9:9] +unusedBit_7_10 = bits, U32, 1228, [10:10] +unusedBit_7_11 = bits, U32, 1228, [11:11] +unusedBit_7_12 = bits, U32, 1228, [12:12] +unusedBit_7_13 = bits, U32, 1228, [13:13] +unusedBit_7_14 = bits, U32, 1228, [14:14] +unusedBit_7_15 = bits, U32, 1228, [15:15] +unusedBit_7_16 = bits, U32, 1228, [16:16] +unusedBit_7_17 = bits, U32, 1228, [17:17] +unusedBit_7_18 = bits, U32, 1228, [18:18] +unusedBit_7_19 = bits, U32, 1228, [19:19] +unusedBit_7_20 = bits, U32, 1228, [20:20] +unusedBit_7_21 = bits, U32, 1228, [21:21] +unusedBit_7_22 = bits, U32, 1228, [22:22] +unusedBit_7_23 = bits, U32, 1228, [23:23] +unusedBit_7_24 = bits, U32, 1228, [24:24] +unusedBit_7_25 = bits, U32, 1228, [25:25] +unusedBit_7_26 = bits, U32, 1228, [26:26] +unusedBit_7_27 = bits, U32, 1228, [27:27] +unusedBit_7_28 = bits, U32, 1228, [28:28] +unusedBit_7_29 = bits, U32, 1228, [29:29] +unusedBit_7_30 = bits, U32, 1228, [30:30] +unusedBit_7_31 = bits, U32, 1228, [31:31] +; total TS size = 1232 +faultCode = scalar, U08, 1232, "", 1, 0 +heaterDuty = scalar, U08, 1233, "%", 1, 0 +pumpDuty = scalar, U08, 1234, "%", 1, 0 +tempC = scalar, U16, 1236, "C", 1, 0 +nernstVoltage = scalar, U16, 1238, "V", 0.001, 0 +esr = scalar, U16, 1240, "", 1, 0 +; total TS size = 1244 time = { timeNow } @@ -4847,7 +4847,7 @@ entry = mapVvt_MAP_AT_SPECIAL_POINT, "mapVvt_MAP_AT_SPECIAL_POINT", float, "%.3 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 Phase2", int, "%d" +entry = currentEngineDecodedPhase, "Engine Phase2", float, "%.3f" entry = totalRevolutionCounter, "Crank revolution counter", int, "%d" entry = vvtSyncGapRatio, "vvtSyncGapRatio", float, "%.3f" entry = vvtCurrentPosition, "vvtCurrentPosition", float, "%.3f" diff --git a/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini b/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini index 735620fe6f..1920b5ff66 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.01.hellen-nb1.108191593" + signature = "rusEFI 2022.09.01.hellen-nb1.18815856" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.09.01.hellen-nb1.108191593" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.09.01.hellen-nb1.18815856" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Sep 01 04:52:25 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Sep 01 05:33:15 UTC 2022 pageSize = 21300 page = 1 @@ -2118,7 +2118,7 @@ maxKnockRetardRpmBins = array, U08, 21294, [6], "RPM", 100.0, 0, 0, 25000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1240 + ochBlockSize = 1244 ; ; see TunerStudioOutputChannels struct @@ -3090,147 +3090,147 @@ mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1096, "", 1, 0 mapVvt_MAP_AT_DIFF = scalar, F32, 1100, "", 1, 0 mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1104, "", 1, 0 mapVvt_map_peak = scalar, U08, 1105, "", 1, 0 -currentEngineDecodedPhase = scalar, U16, 1106, "deg", 1, 0 -; total TS size = 1108 -totalRevolutionCounter = scalar, U32, 1108, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1112, "", 1, 0 -vvtCurrentPosition = scalar, F32, 1116, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1120, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 1124, "", 1, 0 -triggerStateIndex = scalar, U08, 1128, "", 1, 0 -vvtCounter = scalar, U08, 1129, "", 1, 0 -camResyncCounter = scalar, U08, 1130, "", 1, 0 -vvtStateIndex = scalar, U08, 1131, "", 1, 0 -; total TS size = 1132 -m_hasSynchronizedPhase = bits, U32, 1132, [0:0] -unusedBit_1_1 = bits, U32, 1132, [1:1] -unusedBit_1_2 = bits, U32, 1132, [2:2] -unusedBit_1_3 = bits, U32, 1132, [3:3] -unusedBit_1_4 = bits, U32, 1132, [4:4] -unusedBit_1_5 = bits, U32, 1132, [5:5] -unusedBit_1_6 = bits, U32, 1132, [6:6] -unusedBit_1_7 = bits, U32, 1132, [7:7] -unusedBit_1_8 = bits, U32, 1132, [8:8] -unusedBit_1_9 = bits, U32, 1132, [9:9] -unusedBit_1_10 = bits, U32, 1132, [10:10] -unusedBit_1_11 = bits, U32, 1132, [11:11] -unusedBit_1_12 = bits, U32, 1132, [12:12] -unusedBit_1_13 = bits, U32, 1132, [13:13] -unusedBit_1_14 = bits, U32, 1132, [14:14] -unusedBit_1_15 = bits, U32, 1132, [15:15] -unusedBit_1_16 = bits, U32, 1132, [16:16] -unusedBit_1_17 = bits, U32, 1132, [17:17] -unusedBit_1_18 = bits, U32, 1132, [18:18] -unusedBit_1_19 = bits, U32, 1132, [19:19] -unusedBit_1_20 = bits, U32, 1132, [20:20] -unusedBit_1_21 = bits, U32, 1132, [21:21] -unusedBit_1_22 = bits, U32, 1132, [22:22] -unusedBit_1_23 = bits, U32, 1132, [23:23] -unusedBit_1_24 = bits, U32, 1132, [24:24] -unusedBit_1_25 = bits, U32, 1132, [25:25] -unusedBit_1_26 = bits, U32, 1132, [26:26] -unusedBit_1_27 = bits, U32, 1132, [27:27] -unusedBit_1_28 = bits, U32, 1132, [28:28] -unusedBit_1_29 = bits, U32, 1132, [29:29] -unusedBit_1_30 = bits, U32, 1132, [30:30] -unusedBit_1_31 = bits, U32, 1132, [31:31] +currentEngineDecodedPhase = scalar, F32, 1108, "deg", 1, 0 +; total TS size = 1112 +totalRevolutionCounter = scalar, U32, 1112, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1116, "", 1, 0 +vvtCurrentPosition = scalar, F32, 1120, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1124, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 1128, "", 1, 0 +triggerStateIndex = scalar, U08, 1132, "", 1, 0 +vvtCounter = scalar, U08, 1133, "", 1, 0 +camResyncCounter = scalar, U08, 1134, "", 1, 0 +vvtStateIndex = scalar, U08, 1135, "", 1, 0 ; total TS size = 1136 -wallFuelCorrection = scalar, F32, 1136, "", 1, 0 -wallFuel = scalar, F32, 1140, "", 1, 0 -; total TS size = 1144 -idleState = bits, S32, 1144, [0:2], "not important" -currentIdlePosition = scalar, F32, 1148 -baseIdlePosition = scalar, F32, 1152 -iacByTpsTaper = scalar, F32, 1156 -throttlePedalUpState = scalar, S32, 1160, "", 1, 0 -mightResetPid = bits, U32, 1164, [0:0] -shouldResetPid = bits, U32, 1164, [1:1] -wasResetPid = bits, U32, 1164, [2:2] -mustResetPid = bits, U32, 1164, [3:3] -isCranking = bits, U32, 1164, [4:4] -useIacTableForCoasting = bits, U32, 1164, [5:5] -notIdling = bits, U32, 1164, [6:6] -needReset = bits, U32, 1164, [7:7] -isInDeadZone = bits, U32, 1164, [8:8] -isBlipping = bits, U32, 1164, [9:9] -useClosedLoop = bits, U32, 1164, [10:10] -badTps = bits, U32, 1164, [11:11] -looksLikeRunning = bits, U32, 1164, [12:12] -looksLikeCoasting = bits, U32, 1164, [13:13] -looksLikeCrankToIdle = bits, U32, 1164, [14:14] -isVerboseIAC = bits, U32, 1164, [15:15] -isIdleCoasting = bits, U32, 1164, [16:16] -unusedBit_22_17 = bits, U32, 1164, [17:17] -unusedBit_22_18 = bits, U32, 1164, [18:18] -unusedBit_22_19 = bits, U32, 1164, [19:19] -unusedBit_22_20 = bits, U32, 1164, [20:20] -unusedBit_22_21 = bits, U32, 1164, [21:21] -unusedBit_22_22 = bits, U32, 1164, [22:22] -unusedBit_22_23 = bits, U32, 1164, [23:23] -unusedBit_22_24 = bits, U32, 1164, [24:24] -unusedBit_22_25 = bits, U32, 1164, [25:25] -unusedBit_22_26 = bits, U32, 1164, [26:26] -unusedBit_22_27 = bits, U32, 1164, [27:27] -unusedBit_22_28 = bits, U32, 1164, [28:28] -unusedBit_22_29 = bits, U32, 1164, [29:29] -unusedBit_22_30 = bits, U32, 1164, [30:30] -unusedBit_22_31 = bits, U32, 1164, [31:31] -targetRpmByClt = scalar, S32, 1168, "", 1, 0 -targetRpmAcBump = scalar, S32, 1172, "", 1, 0 -iacByRpmTaper = scalar, F32, 1176 -luaAdd = scalar, F32, 1180 -; total TS size = 1184 -baseDwell = scalar, F32, 1184, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 1188, "", 1, 0 -luaTimingAdd = scalar, F32, 1192, "", 1, 0 -luaTimingMult = scalar, F32, 1196, "", 1, 0 -; total TS size = 1200 -idlePosition = scalar, F32, 1200, "", 1, 0 -trim = scalar, F32, 1204, "", 1, 0 -luaAdjustment = scalar, F32, 1208, "", 1, 0 -etbFeedForward = scalar, F32, 1212 -etbIntegralError = scalar, F32, 1216, "", 1, 0 -etbCurrentTarget = scalar, F32, 1220, "%", 1, 0 -etbRevLimitActive = bits, U32, 1224, [0:0] -unusedBit_7_1 = bits, U32, 1224, [1:1] -unusedBit_7_2 = bits, U32, 1224, [2:2] -unusedBit_7_3 = bits, U32, 1224, [3:3] -unusedBit_7_4 = bits, U32, 1224, [4:4] -unusedBit_7_5 = bits, U32, 1224, [5:5] -unusedBit_7_6 = bits, U32, 1224, [6:6] -unusedBit_7_7 = bits, U32, 1224, [7:7] -unusedBit_7_8 = bits, U32, 1224, [8:8] -unusedBit_7_9 = bits, U32, 1224, [9:9] -unusedBit_7_10 = bits, U32, 1224, [10:10] -unusedBit_7_11 = bits, U32, 1224, [11:11] -unusedBit_7_12 = bits, U32, 1224, [12:12] -unusedBit_7_13 = bits, U32, 1224, [13:13] -unusedBit_7_14 = bits, U32, 1224, [14:14] -unusedBit_7_15 = bits, U32, 1224, [15:15] -unusedBit_7_16 = bits, U32, 1224, [16:16] -unusedBit_7_17 = bits, U32, 1224, [17:17] -unusedBit_7_18 = bits, U32, 1224, [18:18] -unusedBit_7_19 = bits, U32, 1224, [19:19] -unusedBit_7_20 = bits, U32, 1224, [20:20] -unusedBit_7_21 = bits, U32, 1224, [21:21] -unusedBit_7_22 = bits, U32, 1224, [22:22] -unusedBit_7_23 = bits, U32, 1224, [23:23] -unusedBit_7_24 = bits, U32, 1224, [24:24] -unusedBit_7_25 = bits, U32, 1224, [25:25] -unusedBit_7_26 = bits, U32, 1224, [26:26] -unusedBit_7_27 = bits, U32, 1224, [27:27] -unusedBit_7_28 = bits, U32, 1224, [28:28] -unusedBit_7_29 = bits, U32, 1224, [29:29] -unusedBit_7_30 = bits, U32, 1224, [30:30] -unusedBit_7_31 = bits, U32, 1224, [31:31] -; total TS size = 1228 -faultCode = scalar, U08, 1228, "", 1, 0 -heaterDuty = scalar, U08, 1229, "%", 1, 0 -pumpDuty = scalar, U08, 1230, "%", 1, 0 -tempC = scalar, U16, 1232, "C", 1, 0 -nernstVoltage = scalar, U16, 1234, "V", 0.001, 0 -esr = scalar, U16, 1236, "", 1, 0 -; total TS size = 1240 +m_hasSynchronizedPhase = bits, U32, 1136, [0:0] +unusedBit_1_1 = bits, U32, 1136, [1:1] +unusedBit_1_2 = bits, U32, 1136, [2:2] +unusedBit_1_3 = bits, U32, 1136, [3:3] +unusedBit_1_4 = bits, U32, 1136, [4:4] +unusedBit_1_5 = bits, U32, 1136, [5:5] +unusedBit_1_6 = bits, U32, 1136, [6:6] +unusedBit_1_7 = bits, U32, 1136, [7:7] +unusedBit_1_8 = bits, U32, 1136, [8:8] +unusedBit_1_9 = bits, U32, 1136, [9:9] +unusedBit_1_10 = bits, U32, 1136, [10:10] +unusedBit_1_11 = bits, U32, 1136, [11:11] +unusedBit_1_12 = bits, U32, 1136, [12:12] +unusedBit_1_13 = bits, U32, 1136, [13:13] +unusedBit_1_14 = bits, U32, 1136, [14:14] +unusedBit_1_15 = bits, U32, 1136, [15:15] +unusedBit_1_16 = bits, U32, 1136, [16:16] +unusedBit_1_17 = bits, U32, 1136, [17:17] +unusedBit_1_18 = bits, U32, 1136, [18:18] +unusedBit_1_19 = bits, U32, 1136, [19:19] +unusedBit_1_20 = bits, U32, 1136, [20:20] +unusedBit_1_21 = bits, U32, 1136, [21:21] +unusedBit_1_22 = bits, U32, 1136, [22:22] +unusedBit_1_23 = bits, U32, 1136, [23:23] +unusedBit_1_24 = bits, U32, 1136, [24:24] +unusedBit_1_25 = bits, U32, 1136, [25:25] +unusedBit_1_26 = bits, U32, 1136, [26:26] +unusedBit_1_27 = bits, U32, 1136, [27:27] +unusedBit_1_28 = bits, U32, 1136, [28:28] +unusedBit_1_29 = bits, U32, 1136, [29:29] +unusedBit_1_30 = bits, U32, 1136, [30:30] +unusedBit_1_31 = bits, U32, 1136, [31:31] +; total TS size = 1140 +wallFuelCorrection = scalar, F32, 1140, "", 1, 0 +wallFuel = scalar, F32, 1144, "", 1, 0 +; total TS size = 1148 +idleState = bits, S32, 1148, [0:2], "not important" +currentIdlePosition = scalar, F32, 1152 +baseIdlePosition = scalar, F32, 1156 +iacByTpsTaper = scalar, F32, 1160 +throttlePedalUpState = scalar, S32, 1164, "", 1, 0 +mightResetPid = bits, U32, 1168, [0:0] +shouldResetPid = bits, U32, 1168, [1:1] +wasResetPid = bits, U32, 1168, [2:2] +mustResetPid = bits, U32, 1168, [3:3] +isCranking = bits, U32, 1168, [4:4] +useIacTableForCoasting = bits, U32, 1168, [5:5] +notIdling = bits, U32, 1168, [6:6] +needReset = bits, U32, 1168, [7:7] +isInDeadZone = bits, U32, 1168, [8:8] +isBlipping = bits, U32, 1168, [9:9] +useClosedLoop = bits, U32, 1168, [10:10] +badTps = bits, U32, 1168, [11:11] +looksLikeRunning = bits, U32, 1168, [12:12] +looksLikeCoasting = bits, U32, 1168, [13:13] +looksLikeCrankToIdle = bits, U32, 1168, [14:14] +isVerboseIAC = bits, U32, 1168, [15:15] +isIdleCoasting = bits, U32, 1168, [16:16] +unusedBit_22_17 = bits, U32, 1168, [17:17] +unusedBit_22_18 = bits, U32, 1168, [18:18] +unusedBit_22_19 = bits, U32, 1168, [19:19] +unusedBit_22_20 = bits, U32, 1168, [20:20] +unusedBit_22_21 = bits, U32, 1168, [21:21] +unusedBit_22_22 = bits, U32, 1168, [22:22] +unusedBit_22_23 = bits, U32, 1168, [23:23] +unusedBit_22_24 = bits, U32, 1168, [24:24] +unusedBit_22_25 = bits, U32, 1168, [25:25] +unusedBit_22_26 = bits, U32, 1168, [26:26] +unusedBit_22_27 = bits, U32, 1168, [27:27] +unusedBit_22_28 = bits, U32, 1168, [28:28] +unusedBit_22_29 = bits, U32, 1168, [29:29] +unusedBit_22_30 = bits, U32, 1168, [30:30] +unusedBit_22_31 = bits, U32, 1168, [31:31] +targetRpmByClt = scalar, S32, 1172, "", 1, 0 +targetRpmAcBump = scalar, S32, 1176, "", 1, 0 +iacByRpmTaper = scalar, F32, 1180 +luaAdd = scalar, F32, 1184 +; total TS size = 1188 +baseDwell = scalar, F32, 1188, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 1192, "", 1, 0 +luaTimingAdd = scalar, F32, 1196, "", 1, 0 +luaTimingMult = scalar, F32, 1200, "", 1, 0 +; total TS size = 1204 +idlePosition = scalar, F32, 1204, "", 1, 0 +trim = scalar, F32, 1208, "", 1, 0 +luaAdjustment = scalar, F32, 1212, "", 1, 0 +etbFeedForward = scalar, F32, 1216 +etbIntegralError = scalar, F32, 1220, "", 1, 0 +etbCurrentTarget = scalar, F32, 1224, "%", 1, 0 +etbRevLimitActive = bits, U32, 1228, [0:0] +unusedBit_7_1 = bits, U32, 1228, [1:1] +unusedBit_7_2 = bits, U32, 1228, [2:2] +unusedBit_7_3 = bits, U32, 1228, [3:3] +unusedBit_7_4 = bits, U32, 1228, [4:4] +unusedBit_7_5 = bits, U32, 1228, [5:5] +unusedBit_7_6 = bits, U32, 1228, [6:6] +unusedBit_7_7 = bits, U32, 1228, [7:7] +unusedBit_7_8 = bits, U32, 1228, [8:8] +unusedBit_7_9 = bits, U32, 1228, [9:9] +unusedBit_7_10 = bits, U32, 1228, [10:10] +unusedBit_7_11 = bits, U32, 1228, [11:11] +unusedBit_7_12 = bits, U32, 1228, [12:12] +unusedBit_7_13 = bits, U32, 1228, [13:13] +unusedBit_7_14 = bits, U32, 1228, [14:14] +unusedBit_7_15 = bits, U32, 1228, [15:15] +unusedBit_7_16 = bits, U32, 1228, [16:16] +unusedBit_7_17 = bits, U32, 1228, [17:17] +unusedBit_7_18 = bits, U32, 1228, [18:18] +unusedBit_7_19 = bits, U32, 1228, [19:19] +unusedBit_7_20 = bits, U32, 1228, [20:20] +unusedBit_7_21 = bits, U32, 1228, [21:21] +unusedBit_7_22 = bits, U32, 1228, [22:22] +unusedBit_7_23 = bits, U32, 1228, [23:23] +unusedBit_7_24 = bits, U32, 1228, [24:24] +unusedBit_7_25 = bits, U32, 1228, [25:25] +unusedBit_7_26 = bits, U32, 1228, [26:26] +unusedBit_7_27 = bits, U32, 1228, [27:27] +unusedBit_7_28 = bits, U32, 1228, [28:28] +unusedBit_7_29 = bits, U32, 1228, [29:29] +unusedBit_7_30 = bits, U32, 1228, [30:30] +unusedBit_7_31 = bits, U32, 1228, [31:31] +; total TS size = 1232 +faultCode = scalar, U08, 1232, "", 1, 0 +heaterDuty = scalar, U08, 1233, "%", 1, 0 +pumpDuty = scalar, U08, 1234, "%", 1, 0 +tempC = scalar, U16, 1236, "C", 1, 0 +nernstVoltage = scalar, U16, 1238, "V", 0.001, 0 +esr = scalar, U16, 1240, "", 1, 0 +; total TS size = 1244 time = { timeNow } @@ -4847,7 +4847,7 @@ entry = mapVvt_MAP_AT_SPECIAL_POINT, "mapVvt_MAP_AT_SPECIAL_POINT", float, "%.3 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 Phase2", int, "%d" +entry = currentEngineDecodedPhase, "Engine Phase2", float, "%.3f" entry = totalRevolutionCounter, "Crank revolution counter", int, "%d" entry = vvtSyncGapRatio, "vvtSyncGapRatio", float, "%.3f" entry = vvtCurrentPosition, "vvtCurrentPosition", float, "%.3f" diff --git a/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini b/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini index fa891e270f..6b6c900541 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.01.hellen121nissan.1462195791" + signature = "rusEFI 2022.09.01.hellen121nissan.1347064406" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.09.01.hellen121nissan.1462195791" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.09.01.hellen121nissan.1347064406" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Sep 01 04:52:17 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Sep 01 05:33:07 UTC 2022 pageSize = 21300 page = 1 @@ -2118,7 +2118,7 @@ maxKnockRetardRpmBins = array, U08, 21294, [6], "RPM", 100.0, 0, 0, 25000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1240 + ochBlockSize = 1244 ; ; see TunerStudioOutputChannels struct @@ -3090,147 +3090,147 @@ mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1096, "", 1, 0 mapVvt_MAP_AT_DIFF = scalar, F32, 1100, "", 1, 0 mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1104, "", 1, 0 mapVvt_map_peak = scalar, U08, 1105, "", 1, 0 -currentEngineDecodedPhase = scalar, U16, 1106, "deg", 1, 0 -; total TS size = 1108 -totalRevolutionCounter = scalar, U32, 1108, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1112, "", 1, 0 -vvtCurrentPosition = scalar, F32, 1116, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1120, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 1124, "", 1, 0 -triggerStateIndex = scalar, U08, 1128, "", 1, 0 -vvtCounter = scalar, U08, 1129, "", 1, 0 -camResyncCounter = scalar, U08, 1130, "", 1, 0 -vvtStateIndex = scalar, U08, 1131, "", 1, 0 -; total TS size = 1132 -m_hasSynchronizedPhase = bits, U32, 1132, [0:0] -unusedBit_1_1 = bits, U32, 1132, [1:1] -unusedBit_1_2 = bits, U32, 1132, [2:2] -unusedBit_1_3 = bits, U32, 1132, [3:3] -unusedBit_1_4 = bits, U32, 1132, [4:4] -unusedBit_1_5 = bits, U32, 1132, [5:5] -unusedBit_1_6 = bits, U32, 1132, [6:6] -unusedBit_1_7 = bits, U32, 1132, [7:7] -unusedBit_1_8 = bits, U32, 1132, [8:8] -unusedBit_1_9 = bits, U32, 1132, [9:9] -unusedBit_1_10 = bits, U32, 1132, [10:10] -unusedBit_1_11 = bits, U32, 1132, [11:11] -unusedBit_1_12 = bits, U32, 1132, [12:12] -unusedBit_1_13 = bits, U32, 1132, [13:13] -unusedBit_1_14 = bits, U32, 1132, [14:14] -unusedBit_1_15 = bits, U32, 1132, [15:15] -unusedBit_1_16 = bits, U32, 1132, [16:16] -unusedBit_1_17 = bits, U32, 1132, [17:17] -unusedBit_1_18 = bits, U32, 1132, [18:18] -unusedBit_1_19 = bits, U32, 1132, [19:19] -unusedBit_1_20 = bits, U32, 1132, [20:20] -unusedBit_1_21 = bits, U32, 1132, [21:21] -unusedBit_1_22 = bits, U32, 1132, [22:22] -unusedBit_1_23 = bits, U32, 1132, [23:23] -unusedBit_1_24 = bits, U32, 1132, [24:24] -unusedBit_1_25 = bits, U32, 1132, [25:25] -unusedBit_1_26 = bits, U32, 1132, [26:26] -unusedBit_1_27 = bits, U32, 1132, [27:27] -unusedBit_1_28 = bits, U32, 1132, [28:28] -unusedBit_1_29 = bits, U32, 1132, [29:29] -unusedBit_1_30 = bits, U32, 1132, [30:30] -unusedBit_1_31 = bits, U32, 1132, [31:31] +currentEngineDecodedPhase = scalar, F32, 1108, "deg", 1, 0 +; total TS size = 1112 +totalRevolutionCounter = scalar, U32, 1112, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1116, "", 1, 0 +vvtCurrentPosition = scalar, F32, 1120, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1124, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 1128, "", 1, 0 +triggerStateIndex = scalar, U08, 1132, "", 1, 0 +vvtCounter = scalar, U08, 1133, "", 1, 0 +camResyncCounter = scalar, U08, 1134, "", 1, 0 +vvtStateIndex = scalar, U08, 1135, "", 1, 0 ; total TS size = 1136 -wallFuelCorrection = scalar, F32, 1136, "", 1, 0 -wallFuel = scalar, F32, 1140, "", 1, 0 -; total TS size = 1144 -idleState = bits, S32, 1144, [0:2], "not important" -currentIdlePosition = scalar, F32, 1148 -baseIdlePosition = scalar, F32, 1152 -iacByTpsTaper = scalar, F32, 1156 -throttlePedalUpState = scalar, S32, 1160, "", 1, 0 -mightResetPid = bits, U32, 1164, [0:0] -shouldResetPid = bits, U32, 1164, [1:1] -wasResetPid = bits, U32, 1164, [2:2] -mustResetPid = bits, U32, 1164, [3:3] -isCranking = bits, U32, 1164, [4:4] -useIacTableForCoasting = bits, U32, 1164, [5:5] -notIdling = bits, U32, 1164, [6:6] -needReset = bits, U32, 1164, [7:7] -isInDeadZone = bits, U32, 1164, [8:8] -isBlipping = bits, U32, 1164, [9:9] -useClosedLoop = bits, U32, 1164, [10:10] -badTps = bits, U32, 1164, [11:11] -looksLikeRunning = bits, U32, 1164, [12:12] -looksLikeCoasting = bits, U32, 1164, [13:13] -looksLikeCrankToIdle = bits, U32, 1164, [14:14] -isVerboseIAC = bits, U32, 1164, [15:15] -isIdleCoasting = bits, U32, 1164, [16:16] -unusedBit_22_17 = bits, U32, 1164, [17:17] -unusedBit_22_18 = bits, U32, 1164, [18:18] -unusedBit_22_19 = bits, U32, 1164, [19:19] -unusedBit_22_20 = bits, U32, 1164, [20:20] -unusedBit_22_21 = bits, U32, 1164, [21:21] -unusedBit_22_22 = bits, U32, 1164, [22:22] -unusedBit_22_23 = bits, U32, 1164, [23:23] -unusedBit_22_24 = bits, U32, 1164, [24:24] -unusedBit_22_25 = bits, U32, 1164, [25:25] -unusedBit_22_26 = bits, U32, 1164, [26:26] -unusedBit_22_27 = bits, U32, 1164, [27:27] -unusedBit_22_28 = bits, U32, 1164, [28:28] -unusedBit_22_29 = bits, U32, 1164, [29:29] -unusedBit_22_30 = bits, U32, 1164, [30:30] -unusedBit_22_31 = bits, U32, 1164, [31:31] -targetRpmByClt = scalar, S32, 1168, "", 1, 0 -targetRpmAcBump = scalar, S32, 1172, "", 1, 0 -iacByRpmTaper = scalar, F32, 1176 -luaAdd = scalar, F32, 1180 -; total TS size = 1184 -baseDwell = scalar, F32, 1184, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 1188, "", 1, 0 -luaTimingAdd = scalar, F32, 1192, "", 1, 0 -luaTimingMult = scalar, F32, 1196, "", 1, 0 -; total TS size = 1200 -idlePosition = scalar, F32, 1200, "", 1, 0 -trim = scalar, F32, 1204, "", 1, 0 -luaAdjustment = scalar, F32, 1208, "", 1, 0 -etbFeedForward = scalar, F32, 1212 -etbIntegralError = scalar, F32, 1216, "", 1, 0 -etbCurrentTarget = scalar, F32, 1220, "%", 1, 0 -etbRevLimitActive = bits, U32, 1224, [0:0] -unusedBit_7_1 = bits, U32, 1224, [1:1] -unusedBit_7_2 = bits, U32, 1224, [2:2] -unusedBit_7_3 = bits, U32, 1224, [3:3] -unusedBit_7_4 = bits, U32, 1224, [4:4] -unusedBit_7_5 = bits, U32, 1224, [5:5] -unusedBit_7_6 = bits, U32, 1224, [6:6] -unusedBit_7_7 = bits, U32, 1224, [7:7] -unusedBit_7_8 = bits, U32, 1224, [8:8] -unusedBit_7_9 = bits, U32, 1224, [9:9] -unusedBit_7_10 = bits, U32, 1224, [10:10] -unusedBit_7_11 = bits, U32, 1224, [11:11] -unusedBit_7_12 = bits, U32, 1224, [12:12] -unusedBit_7_13 = bits, U32, 1224, [13:13] -unusedBit_7_14 = bits, U32, 1224, [14:14] -unusedBit_7_15 = bits, U32, 1224, [15:15] -unusedBit_7_16 = bits, U32, 1224, [16:16] -unusedBit_7_17 = bits, U32, 1224, [17:17] -unusedBit_7_18 = bits, U32, 1224, [18:18] -unusedBit_7_19 = bits, U32, 1224, [19:19] -unusedBit_7_20 = bits, U32, 1224, [20:20] -unusedBit_7_21 = bits, U32, 1224, [21:21] -unusedBit_7_22 = bits, U32, 1224, [22:22] -unusedBit_7_23 = bits, U32, 1224, [23:23] -unusedBit_7_24 = bits, U32, 1224, [24:24] -unusedBit_7_25 = bits, U32, 1224, [25:25] -unusedBit_7_26 = bits, U32, 1224, [26:26] -unusedBit_7_27 = bits, U32, 1224, [27:27] -unusedBit_7_28 = bits, U32, 1224, [28:28] -unusedBit_7_29 = bits, U32, 1224, [29:29] -unusedBit_7_30 = bits, U32, 1224, [30:30] -unusedBit_7_31 = bits, U32, 1224, [31:31] -; total TS size = 1228 -faultCode = scalar, U08, 1228, "", 1, 0 -heaterDuty = scalar, U08, 1229, "%", 1, 0 -pumpDuty = scalar, U08, 1230, "%", 1, 0 -tempC = scalar, U16, 1232, "C", 1, 0 -nernstVoltage = scalar, U16, 1234, "V", 0.001, 0 -esr = scalar, U16, 1236, "", 1, 0 -; total TS size = 1240 +m_hasSynchronizedPhase = bits, U32, 1136, [0:0] +unusedBit_1_1 = bits, U32, 1136, [1:1] +unusedBit_1_2 = bits, U32, 1136, [2:2] +unusedBit_1_3 = bits, U32, 1136, [3:3] +unusedBit_1_4 = bits, U32, 1136, [4:4] +unusedBit_1_5 = bits, U32, 1136, [5:5] +unusedBit_1_6 = bits, U32, 1136, [6:6] +unusedBit_1_7 = bits, U32, 1136, [7:7] +unusedBit_1_8 = bits, U32, 1136, [8:8] +unusedBit_1_9 = bits, U32, 1136, [9:9] +unusedBit_1_10 = bits, U32, 1136, [10:10] +unusedBit_1_11 = bits, U32, 1136, [11:11] +unusedBit_1_12 = bits, U32, 1136, [12:12] +unusedBit_1_13 = bits, U32, 1136, [13:13] +unusedBit_1_14 = bits, U32, 1136, [14:14] +unusedBit_1_15 = bits, U32, 1136, [15:15] +unusedBit_1_16 = bits, U32, 1136, [16:16] +unusedBit_1_17 = bits, U32, 1136, [17:17] +unusedBit_1_18 = bits, U32, 1136, [18:18] +unusedBit_1_19 = bits, U32, 1136, [19:19] +unusedBit_1_20 = bits, U32, 1136, [20:20] +unusedBit_1_21 = bits, U32, 1136, [21:21] +unusedBit_1_22 = bits, U32, 1136, [22:22] +unusedBit_1_23 = bits, U32, 1136, [23:23] +unusedBit_1_24 = bits, U32, 1136, [24:24] +unusedBit_1_25 = bits, U32, 1136, [25:25] +unusedBit_1_26 = bits, U32, 1136, [26:26] +unusedBit_1_27 = bits, U32, 1136, [27:27] +unusedBit_1_28 = bits, U32, 1136, [28:28] +unusedBit_1_29 = bits, U32, 1136, [29:29] +unusedBit_1_30 = bits, U32, 1136, [30:30] +unusedBit_1_31 = bits, U32, 1136, [31:31] +; total TS size = 1140 +wallFuelCorrection = scalar, F32, 1140, "", 1, 0 +wallFuel = scalar, F32, 1144, "", 1, 0 +; total TS size = 1148 +idleState = bits, S32, 1148, [0:2], "not important" +currentIdlePosition = scalar, F32, 1152 +baseIdlePosition = scalar, F32, 1156 +iacByTpsTaper = scalar, F32, 1160 +throttlePedalUpState = scalar, S32, 1164, "", 1, 0 +mightResetPid = bits, U32, 1168, [0:0] +shouldResetPid = bits, U32, 1168, [1:1] +wasResetPid = bits, U32, 1168, [2:2] +mustResetPid = bits, U32, 1168, [3:3] +isCranking = bits, U32, 1168, [4:4] +useIacTableForCoasting = bits, U32, 1168, [5:5] +notIdling = bits, U32, 1168, [6:6] +needReset = bits, U32, 1168, [7:7] +isInDeadZone = bits, U32, 1168, [8:8] +isBlipping = bits, U32, 1168, [9:9] +useClosedLoop = bits, U32, 1168, [10:10] +badTps = bits, U32, 1168, [11:11] +looksLikeRunning = bits, U32, 1168, [12:12] +looksLikeCoasting = bits, U32, 1168, [13:13] +looksLikeCrankToIdle = bits, U32, 1168, [14:14] +isVerboseIAC = bits, U32, 1168, [15:15] +isIdleCoasting = bits, U32, 1168, [16:16] +unusedBit_22_17 = bits, U32, 1168, [17:17] +unusedBit_22_18 = bits, U32, 1168, [18:18] +unusedBit_22_19 = bits, U32, 1168, [19:19] +unusedBit_22_20 = bits, U32, 1168, [20:20] +unusedBit_22_21 = bits, U32, 1168, [21:21] +unusedBit_22_22 = bits, U32, 1168, [22:22] +unusedBit_22_23 = bits, U32, 1168, [23:23] +unusedBit_22_24 = bits, U32, 1168, [24:24] +unusedBit_22_25 = bits, U32, 1168, [25:25] +unusedBit_22_26 = bits, U32, 1168, [26:26] +unusedBit_22_27 = bits, U32, 1168, [27:27] +unusedBit_22_28 = bits, U32, 1168, [28:28] +unusedBit_22_29 = bits, U32, 1168, [29:29] +unusedBit_22_30 = bits, U32, 1168, [30:30] +unusedBit_22_31 = bits, U32, 1168, [31:31] +targetRpmByClt = scalar, S32, 1172, "", 1, 0 +targetRpmAcBump = scalar, S32, 1176, "", 1, 0 +iacByRpmTaper = scalar, F32, 1180 +luaAdd = scalar, F32, 1184 +; total TS size = 1188 +baseDwell = scalar, F32, 1188, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 1192, "", 1, 0 +luaTimingAdd = scalar, F32, 1196, "", 1, 0 +luaTimingMult = scalar, F32, 1200, "", 1, 0 +; total TS size = 1204 +idlePosition = scalar, F32, 1204, "", 1, 0 +trim = scalar, F32, 1208, "", 1, 0 +luaAdjustment = scalar, F32, 1212, "", 1, 0 +etbFeedForward = scalar, F32, 1216 +etbIntegralError = scalar, F32, 1220, "", 1, 0 +etbCurrentTarget = scalar, F32, 1224, "%", 1, 0 +etbRevLimitActive = bits, U32, 1228, [0:0] +unusedBit_7_1 = bits, U32, 1228, [1:1] +unusedBit_7_2 = bits, U32, 1228, [2:2] +unusedBit_7_3 = bits, U32, 1228, [3:3] +unusedBit_7_4 = bits, U32, 1228, [4:4] +unusedBit_7_5 = bits, U32, 1228, [5:5] +unusedBit_7_6 = bits, U32, 1228, [6:6] +unusedBit_7_7 = bits, U32, 1228, [7:7] +unusedBit_7_8 = bits, U32, 1228, [8:8] +unusedBit_7_9 = bits, U32, 1228, [9:9] +unusedBit_7_10 = bits, U32, 1228, [10:10] +unusedBit_7_11 = bits, U32, 1228, [11:11] +unusedBit_7_12 = bits, U32, 1228, [12:12] +unusedBit_7_13 = bits, U32, 1228, [13:13] +unusedBit_7_14 = bits, U32, 1228, [14:14] +unusedBit_7_15 = bits, U32, 1228, [15:15] +unusedBit_7_16 = bits, U32, 1228, [16:16] +unusedBit_7_17 = bits, U32, 1228, [17:17] +unusedBit_7_18 = bits, U32, 1228, [18:18] +unusedBit_7_19 = bits, U32, 1228, [19:19] +unusedBit_7_20 = bits, U32, 1228, [20:20] +unusedBit_7_21 = bits, U32, 1228, [21:21] +unusedBit_7_22 = bits, U32, 1228, [22:22] +unusedBit_7_23 = bits, U32, 1228, [23:23] +unusedBit_7_24 = bits, U32, 1228, [24:24] +unusedBit_7_25 = bits, U32, 1228, [25:25] +unusedBit_7_26 = bits, U32, 1228, [26:26] +unusedBit_7_27 = bits, U32, 1228, [27:27] +unusedBit_7_28 = bits, U32, 1228, [28:28] +unusedBit_7_29 = bits, U32, 1228, [29:29] +unusedBit_7_30 = bits, U32, 1228, [30:30] +unusedBit_7_31 = bits, U32, 1228, [31:31] +; total TS size = 1232 +faultCode = scalar, U08, 1232, "", 1, 0 +heaterDuty = scalar, U08, 1233, "%", 1, 0 +pumpDuty = scalar, U08, 1234, "%", 1, 0 +tempC = scalar, U16, 1236, "C", 1, 0 +nernstVoltage = scalar, U16, 1238, "V", 0.001, 0 +esr = scalar, U16, 1240, "", 1, 0 +; total TS size = 1244 time = { timeNow } @@ -4847,7 +4847,7 @@ entry = mapVvt_MAP_AT_SPECIAL_POINT, "mapVvt_MAP_AT_SPECIAL_POINT", float, "%.3 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 Phase2", int, "%d" +entry = currentEngineDecodedPhase, "Engine Phase2", float, "%.3f" entry = totalRevolutionCounter, "Crank revolution counter", int, "%d" entry = vvtSyncGapRatio, "vvtSyncGapRatio", float, "%.3f" entry = vvtCurrentPosition, "vvtCurrentPosition", float, "%.3f" diff --git a/firmware/tunerstudio/generated/rusefi_hellen121vag.ini b/firmware/tunerstudio/generated/rusefi_hellen121vag.ini index ed25fcb07f..f70ef5d3dd 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.01.hellen121vag.2950180319" + signature = "rusEFI 2022.09.01.hellen121vag.2830494150" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.09.01.hellen121vag.2950180319" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.09.01.hellen121vag.2830494150" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Sep 01 04:52:15 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Sep 01 05:33:06 UTC 2022 pageSize = 21300 page = 1 @@ -2118,7 +2118,7 @@ maxKnockRetardRpmBins = array, U08, 21294, [6], "RPM", 100.0, 0, 0, 25000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1240 + ochBlockSize = 1244 ; ; see TunerStudioOutputChannels struct @@ -3090,147 +3090,147 @@ mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1096, "", 1, 0 mapVvt_MAP_AT_DIFF = scalar, F32, 1100, "", 1, 0 mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1104, "", 1, 0 mapVvt_map_peak = scalar, U08, 1105, "", 1, 0 -currentEngineDecodedPhase = scalar, U16, 1106, "deg", 1, 0 -; total TS size = 1108 -totalRevolutionCounter = scalar, U32, 1108, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1112, "", 1, 0 -vvtCurrentPosition = scalar, F32, 1116, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1120, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 1124, "", 1, 0 -triggerStateIndex = scalar, U08, 1128, "", 1, 0 -vvtCounter = scalar, U08, 1129, "", 1, 0 -camResyncCounter = scalar, U08, 1130, "", 1, 0 -vvtStateIndex = scalar, U08, 1131, "", 1, 0 -; total TS size = 1132 -m_hasSynchronizedPhase = bits, U32, 1132, [0:0] -unusedBit_1_1 = bits, U32, 1132, [1:1] -unusedBit_1_2 = bits, U32, 1132, [2:2] -unusedBit_1_3 = bits, U32, 1132, [3:3] -unusedBit_1_4 = bits, U32, 1132, [4:4] -unusedBit_1_5 = bits, U32, 1132, [5:5] -unusedBit_1_6 = bits, U32, 1132, [6:6] -unusedBit_1_7 = bits, U32, 1132, [7:7] -unusedBit_1_8 = bits, U32, 1132, [8:8] -unusedBit_1_9 = bits, U32, 1132, [9:9] -unusedBit_1_10 = bits, U32, 1132, [10:10] -unusedBit_1_11 = bits, U32, 1132, [11:11] -unusedBit_1_12 = bits, U32, 1132, [12:12] -unusedBit_1_13 = bits, U32, 1132, [13:13] -unusedBit_1_14 = bits, U32, 1132, [14:14] -unusedBit_1_15 = bits, U32, 1132, [15:15] -unusedBit_1_16 = bits, U32, 1132, [16:16] -unusedBit_1_17 = bits, U32, 1132, [17:17] -unusedBit_1_18 = bits, U32, 1132, [18:18] -unusedBit_1_19 = bits, U32, 1132, [19:19] -unusedBit_1_20 = bits, U32, 1132, [20:20] -unusedBit_1_21 = bits, U32, 1132, [21:21] -unusedBit_1_22 = bits, U32, 1132, [22:22] -unusedBit_1_23 = bits, U32, 1132, [23:23] -unusedBit_1_24 = bits, U32, 1132, [24:24] -unusedBit_1_25 = bits, U32, 1132, [25:25] -unusedBit_1_26 = bits, U32, 1132, [26:26] -unusedBit_1_27 = bits, U32, 1132, [27:27] -unusedBit_1_28 = bits, U32, 1132, [28:28] -unusedBit_1_29 = bits, U32, 1132, [29:29] -unusedBit_1_30 = bits, U32, 1132, [30:30] -unusedBit_1_31 = bits, U32, 1132, [31:31] +currentEngineDecodedPhase = scalar, F32, 1108, "deg", 1, 0 +; total TS size = 1112 +totalRevolutionCounter = scalar, U32, 1112, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1116, "", 1, 0 +vvtCurrentPosition = scalar, F32, 1120, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1124, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 1128, "", 1, 0 +triggerStateIndex = scalar, U08, 1132, "", 1, 0 +vvtCounter = scalar, U08, 1133, "", 1, 0 +camResyncCounter = scalar, U08, 1134, "", 1, 0 +vvtStateIndex = scalar, U08, 1135, "", 1, 0 ; total TS size = 1136 -wallFuelCorrection = scalar, F32, 1136, "", 1, 0 -wallFuel = scalar, F32, 1140, "", 1, 0 -; total TS size = 1144 -idleState = bits, S32, 1144, [0:2], "not important" -currentIdlePosition = scalar, F32, 1148 -baseIdlePosition = scalar, F32, 1152 -iacByTpsTaper = scalar, F32, 1156 -throttlePedalUpState = scalar, S32, 1160, "", 1, 0 -mightResetPid = bits, U32, 1164, [0:0] -shouldResetPid = bits, U32, 1164, [1:1] -wasResetPid = bits, U32, 1164, [2:2] -mustResetPid = bits, U32, 1164, [3:3] -isCranking = bits, U32, 1164, [4:4] -useIacTableForCoasting = bits, U32, 1164, [5:5] -notIdling = bits, U32, 1164, [6:6] -needReset = bits, U32, 1164, [7:7] -isInDeadZone = bits, U32, 1164, [8:8] -isBlipping = bits, U32, 1164, [9:9] -useClosedLoop = bits, U32, 1164, [10:10] -badTps = bits, U32, 1164, [11:11] -looksLikeRunning = bits, U32, 1164, [12:12] -looksLikeCoasting = bits, U32, 1164, [13:13] -looksLikeCrankToIdle = bits, U32, 1164, [14:14] -isVerboseIAC = bits, U32, 1164, [15:15] -isIdleCoasting = bits, U32, 1164, [16:16] -unusedBit_22_17 = bits, U32, 1164, [17:17] -unusedBit_22_18 = bits, U32, 1164, [18:18] -unusedBit_22_19 = bits, U32, 1164, [19:19] -unusedBit_22_20 = bits, U32, 1164, [20:20] -unusedBit_22_21 = bits, U32, 1164, [21:21] -unusedBit_22_22 = bits, U32, 1164, [22:22] -unusedBit_22_23 = bits, U32, 1164, [23:23] -unusedBit_22_24 = bits, U32, 1164, [24:24] -unusedBit_22_25 = bits, U32, 1164, [25:25] -unusedBit_22_26 = bits, U32, 1164, [26:26] -unusedBit_22_27 = bits, U32, 1164, [27:27] -unusedBit_22_28 = bits, U32, 1164, [28:28] -unusedBit_22_29 = bits, U32, 1164, [29:29] -unusedBit_22_30 = bits, U32, 1164, [30:30] -unusedBit_22_31 = bits, U32, 1164, [31:31] -targetRpmByClt = scalar, S32, 1168, "", 1, 0 -targetRpmAcBump = scalar, S32, 1172, "", 1, 0 -iacByRpmTaper = scalar, F32, 1176 -luaAdd = scalar, F32, 1180 -; total TS size = 1184 -baseDwell = scalar, F32, 1184, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 1188, "", 1, 0 -luaTimingAdd = scalar, F32, 1192, "", 1, 0 -luaTimingMult = scalar, F32, 1196, "", 1, 0 -; total TS size = 1200 -idlePosition = scalar, F32, 1200, "", 1, 0 -trim = scalar, F32, 1204, "", 1, 0 -luaAdjustment = scalar, F32, 1208, "", 1, 0 -etbFeedForward = scalar, F32, 1212 -etbIntegralError = scalar, F32, 1216, "", 1, 0 -etbCurrentTarget = scalar, F32, 1220, "%", 1, 0 -etbRevLimitActive = bits, U32, 1224, [0:0] -unusedBit_7_1 = bits, U32, 1224, [1:1] -unusedBit_7_2 = bits, U32, 1224, [2:2] -unusedBit_7_3 = bits, U32, 1224, [3:3] -unusedBit_7_4 = bits, U32, 1224, [4:4] -unusedBit_7_5 = bits, U32, 1224, [5:5] -unusedBit_7_6 = bits, U32, 1224, [6:6] -unusedBit_7_7 = bits, U32, 1224, [7:7] -unusedBit_7_8 = bits, U32, 1224, [8:8] -unusedBit_7_9 = bits, U32, 1224, [9:9] -unusedBit_7_10 = bits, U32, 1224, [10:10] -unusedBit_7_11 = bits, U32, 1224, [11:11] -unusedBit_7_12 = bits, U32, 1224, [12:12] -unusedBit_7_13 = bits, U32, 1224, [13:13] -unusedBit_7_14 = bits, U32, 1224, [14:14] -unusedBit_7_15 = bits, U32, 1224, [15:15] -unusedBit_7_16 = bits, U32, 1224, [16:16] -unusedBit_7_17 = bits, U32, 1224, [17:17] -unusedBit_7_18 = bits, U32, 1224, [18:18] -unusedBit_7_19 = bits, U32, 1224, [19:19] -unusedBit_7_20 = bits, U32, 1224, [20:20] -unusedBit_7_21 = bits, U32, 1224, [21:21] -unusedBit_7_22 = bits, U32, 1224, [22:22] -unusedBit_7_23 = bits, U32, 1224, [23:23] -unusedBit_7_24 = bits, U32, 1224, [24:24] -unusedBit_7_25 = bits, U32, 1224, [25:25] -unusedBit_7_26 = bits, U32, 1224, [26:26] -unusedBit_7_27 = bits, U32, 1224, [27:27] -unusedBit_7_28 = bits, U32, 1224, [28:28] -unusedBit_7_29 = bits, U32, 1224, [29:29] -unusedBit_7_30 = bits, U32, 1224, [30:30] -unusedBit_7_31 = bits, U32, 1224, [31:31] -; total TS size = 1228 -faultCode = scalar, U08, 1228, "", 1, 0 -heaterDuty = scalar, U08, 1229, "%", 1, 0 -pumpDuty = scalar, U08, 1230, "%", 1, 0 -tempC = scalar, U16, 1232, "C", 1, 0 -nernstVoltage = scalar, U16, 1234, "V", 0.001, 0 -esr = scalar, U16, 1236, "", 1, 0 -; total TS size = 1240 +m_hasSynchronizedPhase = bits, U32, 1136, [0:0] +unusedBit_1_1 = bits, U32, 1136, [1:1] +unusedBit_1_2 = bits, U32, 1136, [2:2] +unusedBit_1_3 = bits, U32, 1136, [3:3] +unusedBit_1_4 = bits, U32, 1136, [4:4] +unusedBit_1_5 = bits, U32, 1136, [5:5] +unusedBit_1_6 = bits, U32, 1136, [6:6] +unusedBit_1_7 = bits, U32, 1136, [7:7] +unusedBit_1_8 = bits, U32, 1136, [8:8] +unusedBit_1_9 = bits, U32, 1136, [9:9] +unusedBit_1_10 = bits, U32, 1136, [10:10] +unusedBit_1_11 = bits, U32, 1136, [11:11] +unusedBit_1_12 = bits, U32, 1136, [12:12] +unusedBit_1_13 = bits, U32, 1136, [13:13] +unusedBit_1_14 = bits, U32, 1136, [14:14] +unusedBit_1_15 = bits, U32, 1136, [15:15] +unusedBit_1_16 = bits, U32, 1136, [16:16] +unusedBit_1_17 = bits, U32, 1136, [17:17] +unusedBit_1_18 = bits, U32, 1136, [18:18] +unusedBit_1_19 = bits, U32, 1136, [19:19] +unusedBit_1_20 = bits, U32, 1136, [20:20] +unusedBit_1_21 = bits, U32, 1136, [21:21] +unusedBit_1_22 = bits, U32, 1136, [22:22] +unusedBit_1_23 = bits, U32, 1136, [23:23] +unusedBit_1_24 = bits, U32, 1136, [24:24] +unusedBit_1_25 = bits, U32, 1136, [25:25] +unusedBit_1_26 = bits, U32, 1136, [26:26] +unusedBit_1_27 = bits, U32, 1136, [27:27] +unusedBit_1_28 = bits, U32, 1136, [28:28] +unusedBit_1_29 = bits, U32, 1136, [29:29] +unusedBit_1_30 = bits, U32, 1136, [30:30] +unusedBit_1_31 = bits, U32, 1136, [31:31] +; total TS size = 1140 +wallFuelCorrection = scalar, F32, 1140, "", 1, 0 +wallFuel = scalar, F32, 1144, "", 1, 0 +; total TS size = 1148 +idleState = bits, S32, 1148, [0:2], "not important" +currentIdlePosition = scalar, F32, 1152 +baseIdlePosition = scalar, F32, 1156 +iacByTpsTaper = scalar, F32, 1160 +throttlePedalUpState = scalar, S32, 1164, "", 1, 0 +mightResetPid = bits, U32, 1168, [0:0] +shouldResetPid = bits, U32, 1168, [1:1] +wasResetPid = bits, U32, 1168, [2:2] +mustResetPid = bits, U32, 1168, [3:3] +isCranking = bits, U32, 1168, [4:4] +useIacTableForCoasting = bits, U32, 1168, [5:5] +notIdling = bits, U32, 1168, [6:6] +needReset = bits, U32, 1168, [7:7] +isInDeadZone = bits, U32, 1168, [8:8] +isBlipping = bits, U32, 1168, [9:9] +useClosedLoop = bits, U32, 1168, [10:10] +badTps = bits, U32, 1168, [11:11] +looksLikeRunning = bits, U32, 1168, [12:12] +looksLikeCoasting = bits, U32, 1168, [13:13] +looksLikeCrankToIdle = bits, U32, 1168, [14:14] +isVerboseIAC = bits, U32, 1168, [15:15] +isIdleCoasting = bits, U32, 1168, [16:16] +unusedBit_22_17 = bits, U32, 1168, [17:17] +unusedBit_22_18 = bits, U32, 1168, [18:18] +unusedBit_22_19 = bits, U32, 1168, [19:19] +unusedBit_22_20 = bits, U32, 1168, [20:20] +unusedBit_22_21 = bits, U32, 1168, [21:21] +unusedBit_22_22 = bits, U32, 1168, [22:22] +unusedBit_22_23 = bits, U32, 1168, [23:23] +unusedBit_22_24 = bits, U32, 1168, [24:24] +unusedBit_22_25 = bits, U32, 1168, [25:25] +unusedBit_22_26 = bits, U32, 1168, [26:26] +unusedBit_22_27 = bits, U32, 1168, [27:27] +unusedBit_22_28 = bits, U32, 1168, [28:28] +unusedBit_22_29 = bits, U32, 1168, [29:29] +unusedBit_22_30 = bits, U32, 1168, [30:30] +unusedBit_22_31 = bits, U32, 1168, [31:31] +targetRpmByClt = scalar, S32, 1172, "", 1, 0 +targetRpmAcBump = scalar, S32, 1176, "", 1, 0 +iacByRpmTaper = scalar, F32, 1180 +luaAdd = scalar, F32, 1184 +; total TS size = 1188 +baseDwell = scalar, F32, 1188, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 1192, "", 1, 0 +luaTimingAdd = scalar, F32, 1196, "", 1, 0 +luaTimingMult = scalar, F32, 1200, "", 1, 0 +; total TS size = 1204 +idlePosition = scalar, F32, 1204, "", 1, 0 +trim = scalar, F32, 1208, "", 1, 0 +luaAdjustment = scalar, F32, 1212, "", 1, 0 +etbFeedForward = scalar, F32, 1216 +etbIntegralError = scalar, F32, 1220, "", 1, 0 +etbCurrentTarget = scalar, F32, 1224, "%", 1, 0 +etbRevLimitActive = bits, U32, 1228, [0:0] +unusedBit_7_1 = bits, U32, 1228, [1:1] +unusedBit_7_2 = bits, U32, 1228, [2:2] +unusedBit_7_3 = bits, U32, 1228, [3:3] +unusedBit_7_4 = bits, U32, 1228, [4:4] +unusedBit_7_5 = bits, U32, 1228, [5:5] +unusedBit_7_6 = bits, U32, 1228, [6:6] +unusedBit_7_7 = bits, U32, 1228, [7:7] +unusedBit_7_8 = bits, U32, 1228, [8:8] +unusedBit_7_9 = bits, U32, 1228, [9:9] +unusedBit_7_10 = bits, U32, 1228, [10:10] +unusedBit_7_11 = bits, U32, 1228, [11:11] +unusedBit_7_12 = bits, U32, 1228, [12:12] +unusedBit_7_13 = bits, U32, 1228, [13:13] +unusedBit_7_14 = bits, U32, 1228, [14:14] +unusedBit_7_15 = bits, U32, 1228, [15:15] +unusedBit_7_16 = bits, U32, 1228, [16:16] +unusedBit_7_17 = bits, U32, 1228, [17:17] +unusedBit_7_18 = bits, U32, 1228, [18:18] +unusedBit_7_19 = bits, U32, 1228, [19:19] +unusedBit_7_20 = bits, U32, 1228, [20:20] +unusedBit_7_21 = bits, U32, 1228, [21:21] +unusedBit_7_22 = bits, U32, 1228, [22:22] +unusedBit_7_23 = bits, U32, 1228, [23:23] +unusedBit_7_24 = bits, U32, 1228, [24:24] +unusedBit_7_25 = bits, U32, 1228, [25:25] +unusedBit_7_26 = bits, U32, 1228, [26:26] +unusedBit_7_27 = bits, U32, 1228, [27:27] +unusedBit_7_28 = bits, U32, 1228, [28:28] +unusedBit_7_29 = bits, U32, 1228, [29:29] +unusedBit_7_30 = bits, U32, 1228, [30:30] +unusedBit_7_31 = bits, U32, 1228, [31:31] +; total TS size = 1232 +faultCode = scalar, U08, 1232, "", 1, 0 +heaterDuty = scalar, U08, 1233, "%", 1, 0 +pumpDuty = scalar, U08, 1234, "%", 1, 0 +tempC = scalar, U16, 1236, "C", 1, 0 +nernstVoltage = scalar, U16, 1238, "V", 0.001, 0 +esr = scalar, U16, 1240, "", 1, 0 +; total TS size = 1244 time = { timeNow } @@ -4847,7 +4847,7 @@ entry = mapVvt_MAP_AT_SPECIAL_POINT, "mapVvt_MAP_AT_SPECIAL_POINT", float, "%.3 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 Phase2", int, "%d" +entry = currentEngineDecodedPhase, "Engine Phase2", float, "%.3f" entry = totalRevolutionCounter, "Crank revolution counter", int, "%d" entry = vvtSyncGapRatio, "vvtSyncGapRatio", float, "%.3f" entry = vvtCurrentPosition, "vvtCurrentPosition", float, "%.3f" diff --git a/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini b/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini index af1f2f826b..455d8a5f42 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.01.hellen128.554161051" + signature = "rusEFI 2022.09.01.hellen128.644487042" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.09.01.hellen128.554161051" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.09.01.hellen128.644487042" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Sep 01 04:52:14 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Sep 01 05:33:04 UTC 2022 pageSize = 21300 page = 1 @@ -2118,7 +2118,7 @@ maxKnockRetardRpmBins = array, U08, 21294, [6], "RPM", 100.0, 0, 0, 25000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1240 + ochBlockSize = 1244 ; ; see TunerStudioOutputChannels struct @@ -3090,147 +3090,147 @@ mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1096, "", 1, 0 mapVvt_MAP_AT_DIFF = scalar, F32, 1100, "", 1, 0 mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1104, "", 1, 0 mapVvt_map_peak = scalar, U08, 1105, "", 1, 0 -currentEngineDecodedPhase = scalar, U16, 1106, "deg", 1, 0 -; total TS size = 1108 -totalRevolutionCounter = scalar, U32, 1108, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1112, "", 1, 0 -vvtCurrentPosition = scalar, F32, 1116, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1120, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 1124, "", 1, 0 -triggerStateIndex = scalar, U08, 1128, "", 1, 0 -vvtCounter = scalar, U08, 1129, "", 1, 0 -camResyncCounter = scalar, U08, 1130, "", 1, 0 -vvtStateIndex = scalar, U08, 1131, "", 1, 0 -; total TS size = 1132 -m_hasSynchronizedPhase = bits, U32, 1132, [0:0] -unusedBit_1_1 = bits, U32, 1132, [1:1] -unusedBit_1_2 = bits, U32, 1132, [2:2] -unusedBit_1_3 = bits, U32, 1132, [3:3] -unusedBit_1_4 = bits, U32, 1132, [4:4] -unusedBit_1_5 = bits, U32, 1132, [5:5] -unusedBit_1_6 = bits, U32, 1132, [6:6] -unusedBit_1_7 = bits, U32, 1132, [7:7] -unusedBit_1_8 = bits, U32, 1132, [8:8] -unusedBit_1_9 = bits, U32, 1132, [9:9] -unusedBit_1_10 = bits, U32, 1132, [10:10] -unusedBit_1_11 = bits, U32, 1132, [11:11] -unusedBit_1_12 = bits, U32, 1132, [12:12] -unusedBit_1_13 = bits, U32, 1132, [13:13] -unusedBit_1_14 = bits, U32, 1132, [14:14] -unusedBit_1_15 = bits, U32, 1132, [15:15] -unusedBit_1_16 = bits, U32, 1132, [16:16] -unusedBit_1_17 = bits, U32, 1132, [17:17] -unusedBit_1_18 = bits, U32, 1132, [18:18] -unusedBit_1_19 = bits, U32, 1132, [19:19] -unusedBit_1_20 = bits, U32, 1132, [20:20] -unusedBit_1_21 = bits, U32, 1132, [21:21] -unusedBit_1_22 = bits, U32, 1132, [22:22] -unusedBit_1_23 = bits, U32, 1132, [23:23] -unusedBit_1_24 = bits, U32, 1132, [24:24] -unusedBit_1_25 = bits, U32, 1132, [25:25] -unusedBit_1_26 = bits, U32, 1132, [26:26] -unusedBit_1_27 = bits, U32, 1132, [27:27] -unusedBit_1_28 = bits, U32, 1132, [28:28] -unusedBit_1_29 = bits, U32, 1132, [29:29] -unusedBit_1_30 = bits, U32, 1132, [30:30] -unusedBit_1_31 = bits, U32, 1132, [31:31] +currentEngineDecodedPhase = scalar, F32, 1108, "deg", 1, 0 +; total TS size = 1112 +totalRevolutionCounter = scalar, U32, 1112, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1116, "", 1, 0 +vvtCurrentPosition = scalar, F32, 1120, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1124, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 1128, "", 1, 0 +triggerStateIndex = scalar, U08, 1132, "", 1, 0 +vvtCounter = scalar, U08, 1133, "", 1, 0 +camResyncCounter = scalar, U08, 1134, "", 1, 0 +vvtStateIndex = scalar, U08, 1135, "", 1, 0 ; total TS size = 1136 -wallFuelCorrection = scalar, F32, 1136, "", 1, 0 -wallFuel = scalar, F32, 1140, "", 1, 0 -; total TS size = 1144 -idleState = bits, S32, 1144, [0:2], "not important" -currentIdlePosition = scalar, F32, 1148 -baseIdlePosition = scalar, F32, 1152 -iacByTpsTaper = scalar, F32, 1156 -throttlePedalUpState = scalar, S32, 1160, "", 1, 0 -mightResetPid = bits, U32, 1164, [0:0] -shouldResetPid = bits, U32, 1164, [1:1] -wasResetPid = bits, U32, 1164, [2:2] -mustResetPid = bits, U32, 1164, [3:3] -isCranking = bits, U32, 1164, [4:4] -useIacTableForCoasting = bits, U32, 1164, [5:5] -notIdling = bits, U32, 1164, [6:6] -needReset = bits, U32, 1164, [7:7] -isInDeadZone = bits, U32, 1164, [8:8] -isBlipping = bits, U32, 1164, [9:9] -useClosedLoop = bits, U32, 1164, [10:10] -badTps = bits, U32, 1164, [11:11] -looksLikeRunning = bits, U32, 1164, [12:12] -looksLikeCoasting = bits, U32, 1164, [13:13] -looksLikeCrankToIdle = bits, U32, 1164, [14:14] -isVerboseIAC = bits, U32, 1164, [15:15] -isIdleCoasting = bits, U32, 1164, [16:16] -unusedBit_22_17 = bits, U32, 1164, [17:17] -unusedBit_22_18 = bits, U32, 1164, [18:18] -unusedBit_22_19 = bits, U32, 1164, [19:19] -unusedBit_22_20 = bits, U32, 1164, [20:20] -unusedBit_22_21 = bits, U32, 1164, [21:21] -unusedBit_22_22 = bits, U32, 1164, [22:22] -unusedBit_22_23 = bits, U32, 1164, [23:23] -unusedBit_22_24 = bits, U32, 1164, [24:24] -unusedBit_22_25 = bits, U32, 1164, [25:25] -unusedBit_22_26 = bits, U32, 1164, [26:26] -unusedBit_22_27 = bits, U32, 1164, [27:27] -unusedBit_22_28 = bits, U32, 1164, [28:28] -unusedBit_22_29 = bits, U32, 1164, [29:29] -unusedBit_22_30 = bits, U32, 1164, [30:30] -unusedBit_22_31 = bits, U32, 1164, [31:31] -targetRpmByClt = scalar, S32, 1168, "", 1, 0 -targetRpmAcBump = scalar, S32, 1172, "", 1, 0 -iacByRpmTaper = scalar, F32, 1176 -luaAdd = scalar, F32, 1180 -; total TS size = 1184 -baseDwell = scalar, F32, 1184, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 1188, "", 1, 0 -luaTimingAdd = scalar, F32, 1192, "", 1, 0 -luaTimingMult = scalar, F32, 1196, "", 1, 0 -; total TS size = 1200 -idlePosition = scalar, F32, 1200, "", 1, 0 -trim = scalar, F32, 1204, "", 1, 0 -luaAdjustment = scalar, F32, 1208, "", 1, 0 -etbFeedForward = scalar, F32, 1212 -etbIntegralError = scalar, F32, 1216, "", 1, 0 -etbCurrentTarget = scalar, F32, 1220, "%", 1, 0 -etbRevLimitActive = bits, U32, 1224, [0:0] -unusedBit_7_1 = bits, U32, 1224, [1:1] -unusedBit_7_2 = bits, U32, 1224, [2:2] -unusedBit_7_3 = bits, U32, 1224, [3:3] -unusedBit_7_4 = bits, U32, 1224, [4:4] -unusedBit_7_5 = bits, U32, 1224, [5:5] -unusedBit_7_6 = bits, U32, 1224, [6:6] -unusedBit_7_7 = bits, U32, 1224, [7:7] -unusedBit_7_8 = bits, U32, 1224, [8:8] -unusedBit_7_9 = bits, U32, 1224, [9:9] -unusedBit_7_10 = bits, U32, 1224, [10:10] -unusedBit_7_11 = bits, U32, 1224, [11:11] -unusedBit_7_12 = bits, U32, 1224, [12:12] -unusedBit_7_13 = bits, U32, 1224, [13:13] -unusedBit_7_14 = bits, U32, 1224, [14:14] -unusedBit_7_15 = bits, U32, 1224, [15:15] -unusedBit_7_16 = bits, U32, 1224, [16:16] -unusedBit_7_17 = bits, U32, 1224, [17:17] -unusedBit_7_18 = bits, U32, 1224, [18:18] -unusedBit_7_19 = bits, U32, 1224, [19:19] -unusedBit_7_20 = bits, U32, 1224, [20:20] -unusedBit_7_21 = bits, U32, 1224, [21:21] -unusedBit_7_22 = bits, U32, 1224, [22:22] -unusedBit_7_23 = bits, U32, 1224, [23:23] -unusedBit_7_24 = bits, U32, 1224, [24:24] -unusedBit_7_25 = bits, U32, 1224, [25:25] -unusedBit_7_26 = bits, U32, 1224, [26:26] -unusedBit_7_27 = bits, U32, 1224, [27:27] -unusedBit_7_28 = bits, U32, 1224, [28:28] -unusedBit_7_29 = bits, U32, 1224, [29:29] -unusedBit_7_30 = bits, U32, 1224, [30:30] -unusedBit_7_31 = bits, U32, 1224, [31:31] -; total TS size = 1228 -faultCode = scalar, U08, 1228, "", 1, 0 -heaterDuty = scalar, U08, 1229, "%", 1, 0 -pumpDuty = scalar, U08, 1230, "%", 1, 0 -tempC = scalar, U16, 1232, "C", 1, 0 -nernstVoltage = scalar, U16, 1234, "V", 0.001, 0 -esr = scalar, U16, 1236, "", 1, 0 -; total TS size = 1240 +m_hasSynchronizedPhase = bits, U32, 1136, [0:0] +unusedBit_1_1 = bits, U32, 1136, [1:1] +unusedBit_1_2 = bits, U32, 1136, [2:2] +unusedBit_1_3 = bits, U32, 1136, [3:3] +unusedBit_1_4 = bits, U32, 1136, [4:4] +unusedBit_1_5 = bits, U32, 1136, [5:5] +unusedBit_1_6 = bits, U32, 1136, [6:6] +unusedBit_1_7 = bits, U32, 1136, [7:7] +unusedBit_1_8 = bits, U32, 1136, [8:8] +unusedBit_1_9 = bits, U32, 1136, [9:9] +unusedBit_1_10 = bits, U32, 1136, [10:10] +unusedBit_1_11 = bits, U32, 1136, [11:11] +unusedBit_1_12 = bits, U32, 1136, [12:12] +unusedBit_1_13 = bits, U32, 1136, [13:13] +unusedBit_1_14 = bits, U32, 1136, [14:14] +unusedBit_1_15 = bits, U32, 1136, [15:15] +unusedBit_1_16 = bits, U32, 1136, [16:16] +unusedBit_1_17 = bits, U32, 1136, [17:17] +unusedBit_1_18 = bits, U32, 1136, [18:18] +unusedBit_1_19 = bits, U32, 1136, [19:19] +unusedBit_1_20 = bits, U32, 1136, [20:20] +unusedBit_1_21 = bits, U32, 1136, [21:21] +unusedBit_1_22 = bits, U32, 1136, [22:22] +unusedBit_1_23 = bits, U32, 1136, [23:23] +unusedBit_1_24 = bits, U32, 1136, [24:24] +unusedBit_1_25 = bits, U32, 1136, [25:25] +unusedBit_1_26 = bits, U32, 1136, [26:26] +unusedBit_1_27 = bits, U32, 1136, [27:27] +unusedBit_1_28 = bits, U32, 1136, [28:28] +unusedBit_1_29 = bits, U32, 1136, [29:29] +unusedBit_1_30 = bits, U32, 1136, [30:30] +unusedBit_1_31 = bits, U32, 1136, [31:31] +; total TS size = 1140 +wallFuelCorrection = scalar, F32, 1140, "", 1, 0 +wallFuel = scalar, F32, 1144, "", 1, 0 +; total TS size = 1148 +idleState = bits, S32, 1148, [0:2], "not important" +currentIdlePosition = scalar, F32, 1152 +baseIdlePosition = scalar, F32, 1156 +iacByTpsTaper = scalar, F32, 1160 +throttlePedalUpState = scalar, S32, 1164, "", 1, 0 +mightResetPid = bits, U32, 1168, [0:0] +shouldResetPid = bits, U32, 1168, [1:1] +wasResetPid = bits, U32, 1168, [2:2] +mustResetPid = bits, U32, 1168, [3:3] +isCranking = bits, U32, 1168, [4:4] +useIacTableForCoasting = bits, U32, 1168, [5:5] +notIdling = bits, U32, 1168, [6:6] +needReset = bits, U32, 1168, [7:7] +isInDeadZone = bits, U32, 1168, [8:8] +isBlipping = bits, U32, 1168, [9:9] +useClosedLoop = bits, U32, 1168, [10:10] +badTps = bits, U32, 1168, [11:11] +looksLikeRunning = bits, U32, 1168, [12:12] +looksLikeCoasting = bits, U32, 1168, [13:13] +looksLikeCrankToIdle = bits, U32, 1168, [14:14] +isVerboseIAC = bits, U32, 1168, [15:15] +isIdleCoasting = bits, U32, 1168, [16:16] +unusedBit_22_17 = bits, U32, 1168, [17:17] +unusedBit_22_18 = bits, U32, 1168, [18:18] +unusedBit_22_19 = bits, U32, 1168, [19:19] +unusedBit_22_20 = bits, U32, 1168, [20:20] +unusedBit_22_21 = bits, U32, 1168, [21:21] +unusedBit_22_22 = bits, U32, 1168, [22:22] +unusedBit_22_23 = bits, U32, 1168, [23:23] +unusedBit_22_24 = bits, U32, 1168, [24:24] +unusedBit_22_25 = bits, U32, 1168, [25:25] +unusedBit_22_26 = bits, U32, 1168, [26:26] +unusedBit_22_27 = bits, U32, 1168, [27:27] +unusedBit_22_28 = bits, U32, 1168, [28:28] +unusedBit_22_29 = bits, U32, 1168, [29:29] +unusedBit_22_30 = bits, U32, 1168, [30:30] +unusedBit_22_31 = bits, U32, 1168, [31:31] +targetRpmByClt = scalar, S32, 1172, "", 1, 0 +targetRpmAcBump = scalar, S32, 1176, "", 1, 0 +iacByRpmTaper = scalar, F32, 1180 +luaAdd = scalar, F32, 1184 +; total TS size = 1188 +baseDwell = scalar, F32, 1188, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 1192, "", 1, 0 +luaTimingAdd = scalar, F32, 1196, "", 1, 0 +luaTimingMult = scalar, F32, 1200, "", 1, 0 +; total TS size = 1204 +idlePosition = scalar, F32, 1204, "", 1, 0 +trim = scalar, F32, 1208, "", 1, 0 +luaAdjustment = scalar, F32, 1212, "", 1, 0 +etbFeedForward = scalar, F32, 1216 +etbIntegralError = scalar, F32, 1220, "", 1, 0 +etbCurrentTarget = scalar, F32, 1224, "%", 1, 0 +etbRevLimitActive = bits, U32, 1228, [0:0] +unusedBit_7_1 = bits, U32, 1228, [1:1] +unusedBit_7_2 = bits, U32, 1228, [2:2] +unusedBit_7_3 = bits, U32, 1228, [3:3] +unusedBit_7_4 = bits, U32, 1228, [4:4] +unusedBit_7_5 = bits, U32, 1228, [5:5] +unusedBit_7_6 = bits, U32, 1228, [6:6] +unusedBit_7_7 = bits, U32, 1228, [7:7] +unusedBit_7_8 = bits, U32, 1228, [8:8] +unusedBit_7_9 = bits, U32, 1228, [9:9] +unusedBit_7_10 = bits, U32, 1228, [10:10] +unusedBit_7_11 = bits, U32, 1228, [11:11] +unusedBit_7_12 = bits, U32, 1228, [12:12] +unusedBit_7_13 = bits, U32, 1228, [13:13] +unusedBit_7_14 = bits, U32, 1228, [14:14] +unusedBit_7_15 = bits, U32, 1228, [15:15] +unusedBit_7_16 = bits, U32, 1228, [16:16] +unusedBit_7_17 = bits, U32, 1228, [17:17] +unusedBit_7_18 = bits, U32, 1228, [18:18] +unusedBit_7_19 = bits, U32, 1228, [19:19] +unusedBit_7_20 = bits, U32, 1228, [20:20] +unusedBit_7_21 = bits, U32, 1228, [21:21] +unusedBit_7_22 = bits, U32, 1228, [22:22] +unusedBit_7_23 = bits, U32, 1228, [23:23] +unusedBit_7_24 = bits, U32, 1228, [24:24] +unusedBit_7_25 = bits, U32, 1228, [25:25] +unusedBit_7_26 = bits, U32, 1228, [26:26] +unusedBit_7_27 = bits, U32, 1228, [27:27] +unusedBit_7_28 = bits, U32, 1228, [28:28] +unusedBit_7_29 = bits, U32, 1228, [29:29] +unusedBit_7_30 = bits, U32, 1228, [30:30] +unusedBit_7_31 = bits, U32, 1228, [31:31] +; total TS size = 1232 +faultCode = scalar, U08, 1232, "", 1, 0 +heaterDuty = scalar, U08, 1233, "%", 1, 0 +pumpDuty = scalar, U08, 1234, "%", 1, 0 +tempC = scalar, U16, 1236, "C", 1, 0 +nernstVoltage = scalar, U16, 1238, "V", 0.001, 0 +esr = scalar, U16, 1240, "", 1, 0 +; total TS size = 1244 time = { timeNow } @@ -4847,7 +4847,7 @@ entry = mapVvt_MAP_AT_SPECIAL_POINT, "mapVvt_MAP_AT_SPECIAL_POINT", float, "%.3 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 Phase2", int, "%d" +entry = currentEngineDecodedPhase, "Engine Phase2", float, "%.3f" entry = totalRevolutionCounter, "Crank revolution counter", int, "%d" entry = vvtSyncGapRatio, "vvtSyncGapRatio", float, "%.3f" entry = vvtCurrentPosition, "vvtCurrentPosition", float, "%.3f" diff --git a/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini b/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini index 8e35a7ba97..17ce3410dc 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.01.hellen154hyundai.1203149857" + signature = "rusEFI 2022.09.01.hellen154hyundai.1088116792" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.09.01.hellen154hyundai.1203149857" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.09.01.hellen154hyundai.1088116792" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Sep 01 04:52:19 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Sep 01 05:33:09 UTC 2022 pageSize = 21300 page = 1 @@ -2118,7 +2118,7 @@ maxKnockRetardRpmBins = array, U08, 21294, [6], "RPM", 100.0, 0, 0, 25000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1240 + ochBlockSize = 1244 ; ; see TunerStudioOutputChannels struct @@ -3090,147 +3090,147 @@ mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1096, "", 1, 0 mapVvt_MAP_AT_DIFF = scalar, F32, 1100, "", 1, 0 mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1104, "", 1, 0 mapVvt_map_peak = scalar, U08, 1105, "", 1, 0 -currentEngineDecodedPhase = scalar, U16, 1106, "deg", 1, 0 -; total TS size = 1108 -totalRevolutionCounter = scalar, U32, 1108, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1112, "", 1, 0 -vvtCurrentPosition = scalar, F32, 1116, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1120, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 1124, "", 1, 0 -triggerStateIndex = scalar, U08, 1128, "", 1, 0 -vvtCounter = scalar, U08, 1129, "", 1, 0 -camResyncCounter = scalar, U08, 1130, "", 1, 0 -vvtStateIndex = scalar, U08, 1131, "", 1, 0 -; total TS size = 1132 -m_hasSynchronizedPhase = bits, U32, 1132, [0:0] -unusedBit_1_1 = bits, U32, 1132, [1:1] -unusedBit_1_2 = bits, U32, 1132, [2:2] -unusedBit_1_3 = bits, U32, 1132, [3:3] -unusedBit_1_4 = bits, U32, 1132, [4:4] -unusedBit_1_5 = bits, U32, 1132, [5:5] -unusedBit_1_6 = bits, U32, 1132, [6:6] -unusedBit_1_7 = bits, U32, 1132, [7:7] -unusedBit_1_8 = bits, U32, 1132, [8:8] -unusedBit_1_9 = bits, U32, 1132, [9:9] -unusedBit_1_10 = bits, U32, 1132, [10:10] -unusedBit_1_11 = bits, U32, 1132, [11:11] -unusedBit_1_12 = bits, U32, 1132, [12:12] -unusedBit_1_13 = bits, U32, 1132, [13:13] -unusedBit_1_14 = bits, U32, 1132, [14:14] -unusedBit_1_15 = bits, U32, 1132, [15:15] -unusedBit_1_16 = bits, U32, 1132, [16:16] -unusedBit_1_17 = bits, U32, 1132, [17:17] -unusedBit_1_18 = bits, U32, 1132, [18:18] -unusedBit_1_19 = bits, U32, 1132, [19:19] -unusedBit_1_20 = bits, U32, 1132, [20:20] -unusedBit_1_21 = bits, U32, 1132, [21:21] -unusedBit_1_22 = bits, U32, 1132, [22:22] -unusedBit_1_23 = bits, U32, 1132, [23:23] -unusedBit_1_24 = bits, U32, 1132, [24:24] -unusedBit_1_25 = bits, U32, 1132, [25:25] -unusedBit_1_26 = bits, U32, 1132, [26:26] -unusedBit_1_27 = bits, U32, 1132, [27:27] -unusedBit_1_28 = bits, U32, 1132, [28:28] -unusedBit_1_29 = bits, U32, 1132, [29:29] -unusedBit_1_30 = bits, U32, 1132, [30:30] -unusedBit_1_31 = bits, U32, 1132, [31:31] +currentEngineDecodedPhase = scalar, F32, 1108, "deg", 1, 0 +; total TS size = 1112 +totalRevolutionCounter = scalar, U32, 1112, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1116, "", 1, 0 +vvtCurrentPosition = scalar, F32, 1120, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1124, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 1128, "", 1, 0 +triggerStateIndex = scalar, U08, 1132, "", 1, 0 +vvtCounter = scalar, U08, 1133, "", 1, 0 +camResyncCounter = scalar, U08, 1134, "", 1, 0 +vvtStateIndex = scalar, U08, 1135, "", 1, 0 ; total TS size = 1136 -wallFuelCorrection = scalar, F32, 1136, "", 1, 0 -wallFuel = scalar, F32, 1140, "", 1, 0 -; total TS size = 1144 -idleState = bits, S32, 1144, [0:2], "not important" -currentIdlePosition = scalar, F32, 1148 -baseIdlePosition = scalar, F32, 1152 -iacByTpsTaper = scalar, F32, 1156 -throttlePedalUpState = scalar, S32, 1160, "", 1, 0 -mightResetPid = bits, U32, 1164, [0:0] -shouldResetPid = bits, U32, 1164, [1:1] -wasResetPid = bits, U32, 1164, [2:2] -mustResetPid = bits, U32, 1164, [3:3] -isCranking = bits, U32, 1164, [4:4] -useIacTableForCoasting = bits, U32, 1164, [5:5] -notIdling = bits, U32, 1164, [6:6] -needReset = bits, U32, 1164, [7:7] -isInDeadZone = bits, U32, 1164, [8:8] -isBlipping = bits, U32, 1164, [9:9] -useClosedLoop = bits, U32, 1164, [10:10] -badTps = bits, U32, 1164, [11:11] -looksLikeRunning = bits, U32, 1164, [12:12] -looksLikeCoasting = bits, U32, 1164, [13:13] -looksLikeCrankToIdle = bits, U32, 1164, [14:14] -isVerboseIAC = bits, U32, 1164, [15:15] -isIdleCoasting = bits, U32, 1164, [16:16] -unusedBit_22_17 = bits, U32, 1164, [17:17] -unusedBit_22_18 = bits, U32, 1164, [18:18] -unusedBit_22_19 = bits, U32, 1164, [19:19] -unusedBit_22_20 = bits, U32, 1164, [20:20] -unusedBit_22_21 = bits, U32, 1164, [21:21] -unusedBit_22_22 = bits, U32, 1164, [22:22] -unusedBit_22_23 = bits, U32, 1164, [23:23] -unusedBit_22_24 = bits, U32, 1164, [24:24] -unusedBit_22_25 = bits, U32, 1164, [25:25] -unusedBit_22_26 = bits, U32, 1164, [26:26] -unusedBit_22_27 = bits, U32, 1164, [27:27] -unusedBit_22_28 = bits, U32, 1164, [28:28] -unusedBit_22_29 = bits, U32, 1164, [29:29] -unusedBit_22_30 = bits, U32, 1164, [30:30] -unusedBit_22_31 = bits, U32, 1164, [31:31] -targetRpmByClt = scalar, S32, 1168, "", 1, 0 -targetRpmAcBump = scalar, S32, 1172, "", 1, 0 -iacByRpmTaper = scalar, F32, 1176 -luaAdd = scalar, F32, 1180 -; total TS size = 1184 -baseDwell = scalar, F32, 1184, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 1188, "", 1, 0 -luaTimingAdd = scalar, F32, 1192, "", 1, 0 -luaTimingMult = scalar, F32, 1196, "", 1, 0 -; total TS size = 1200 -idlePosition = scalar, F32, 1200, "", 1, 0 -trim = scalar, F32, 1204, "", 1, 0 -luaAdjustment = scalar, F32, 1208, "", 1, 0 -etbFeedForward = scalar, F32, 1212 -etbIntegralError = scalar, F32, 1216, "", 1, 0 -etbCurrentTarget = scalar, F32, 1220, "%", 1, 0 -etbRevLimitActive = bits, U32, 1224, [0:0] -unusedBit_7_1 = bits, U32, 1224, [1:1] -unusedBit_7_2 = bits, U32, 1224, [2:2] -unusedBit_7_3 = bits, U32, 1224, [3:3] -unusedBit_7_4 = bits, U32, 1224, [4:4] -unusedBit_7_5 = bits, U32, 1224, [5:5] -unusedBit_7_6 = bits, U32, 1224, [6:6] -unusedBit_7_7 = bits, U32, 1224, [7:7] -unusedBit_7_8 = bits, U32, 1224, [8:8] -unusedBit_7_9 = bits, U32, 1224, [9:9] -unusedBit_7_10 = bits, U32, 1224, [10:10] -unusedBit_7_11 = bits, U32, 1224, [11:11] -unusedBit_7_12 = bits, U32, 1224, [12:12] -unusedBit_7_13 = bits, U32, 1224, [13:13] -unusedBit_7_14 = bits, U32, 1224, [14:14] -unusedBit_7_15 = bits, U32, 1224, [15:15] -unusedBit_7_16 = bits, U32, 1224, [16:16] -unusedBit_7_17 = bits, U32, 1224, [17:17] -unusedBit_7_18 = bits, U32, 1224, [18:18] -unusedBit_7_19 = bits, U32, 1224, [19:19] -unusedBit_7_20 = bits, U32, 1224, [20:20] -unusedBit_7_21 = bits, U32, 1224, [21:21] -unusedBit_7_22 = bits, U32, 1224, [22:22] -unusedBit_7_23 = bits, U32, 1224, [23:23] -unusedBit_7_24 = bits, U32, 1224, [24:24] -unusedBit_7_25 = bits, U32, 1224, [25:25] -unusedBit_7_26 = bits, U32, 1224, [26:26] -unusedBit_7_27 = bits, U32, 1224, [27:27] -unusedBit_7_28 = bits, U32, 1224, [28:28] -unusedBit_7_29 = bits, U32, 1224, [29:29] -unusedBit_7_30 = bits, U32, 1224, [30:30] -unusedBit_7_31 = bits, U32, 1224, [31:31] -; total TS size = 1228 -faultCode = scalar, U08, 1228, "", 1, 0 -heaterDuty = scalar, U08, 1229, "%", 1, 0 -pumpDuty = scalar, U08, 1230, "%", 1, 0 -tempC = scalar, U16, 1232, "C", 1, 0 -nernstVoltage = scalar, U16, 1234, "V", 0.001, 0 -esr = scalar, U16, 1236, "", 1, 0 -; total TS size = 1240 +m_hasSynchronizedPhase = bits, U32, 1136, [0:0] +unusedBit_1_1 = bits, U32, 1136, [1:1] +unusedBit_1_2 = bits, U32, 1136, [2:2] +unusedBit_1_3 = bits, U32, 1136, [3:3] +unusedBit_1_4 = bits, U32, 1136, [4:4] +unusedBit_1_5 = bits, U32, 1136, [5:5] +unusedBit_1_6 = bits, U32, 1136, [6:6] +unusedBit_1_7 = bits, U32, 1136, [7:7] +unusedBit_1_8 = bits, U32, 1136, [8:8] +unusedBit_1_9 = bits, U32, 1136, [9:9] +unusedBit_1_10 = bits, U32, 1136, [10:10] +unusedBit_1_11 = bits, U32, 1136, [11:11] +unusedBit_1_12 = bits, U32, 1136, [12:12] +unusedBit_1_13 = bits, U32, 1136, [13:13] +unusedBit_1_14 = bits, U32, 1136, [14:14] +unusedBit_1_15 = bits, U32, 1136, [15:15] +unusedBit_1_16 = bits, U32, 1136, [16:16] +unusedBit_1_17 = bits, U32, 1136, [17:17] +unusedBit_1_18 = bits, U32, 1136, [18:18] +unusedBit_1_19 = bits, U32, 1136, [19:19] +unusedBit_1_20 = bits, U32, 1136, [20:20] +unusedBit_1_21 = bits, U32, 1136, [21:21] +unusedBit_1_22 = bits, U32, 1136, [22:22] +unusedBit_1_23 = bits, U32, 1136, [23:23] +unusedBit_1_24 = bits, U32, 1136, [24:24] +unusedBit_1_25 = bits, U32, 1136, [25:25] +unusedBit_1_26 = bits, U32, 1136, [26:26] +unusedBit_1_27 = bits, U32, 1136, [27:27] +unusedBit_1_28 = bits, U32, 1136, [28:28] +unusedBit_1_29 = bits, U32, 1136, [29:29] +unusedBit_1_30 = bits, U32, 1136, [30:30] +unusedBit_1_31 = bits, U32, 1136, [31:31] +; total TS size = 1140 +wallFuelCorrection = scalar, F32, 1140, "", 1, 0 +wallFuel = scalar, F32, 1144, "", 1, 0 +; total TS size = 1148 +idleState = bits, S32, 1148, [0:2], "not important" +currentIdlePosition = scalar, F32, 1152 +baseIdlePosition = scalar, F32, 1156 +iacByTpsTaper = scalar, F32, 1160 +throttlePedalUpState = scalar, S32, 1164, "", 1, 0 +mightResetPid = bits, U32, 1168, [0:0] +shouldResetPid = bits, U32, 1168, [1:1] +wasResetPid = bits, U32, 1168, [2:2] +mustResetPid = bits, U32, 1168, [3:3] +isCranking = bits, U32, 1168, [4:4] +useIacTableForCoasting = bits, U32, 1168, [5:5] +notIdling = bits, U32, 1168, [6:6] +needReset = bits, U32, 1168, [7:7] +isInDeadZone = bits, U32, 1168, [8:8] +isBlipping = bits, U32, 1168, [9:9] +useClosedLoop = bits, U32, 1168, [10:10] +badTps = bits, U32, 1168, [11:11] +looksLikeRunning = bits, U32, 1168, [12:12] +looksLikeCoasting = bits, U32, 1168, [13:13] +looksLikeCrankToIdle = bits, U32, 1168, [14:14] +isVerboseIAC = bits, U32, 1168, [15:15] +isIdleCoasting = bits, U32, 1168, [16:16] +unusedBit_22_17 = bits, U32, 1168, [17:17] +unusedBit_22_18 = bits, U32, 1168, [18:18] +unusedBit_22_19 = bits, U32, 1168, [19:19] +unusedBit_22_20 = bits, U32, 1168, [20:20] +unusedBit_22_21 = bits, U32, 1168, [21:21] +unusedBit_22_22 = bits, U32, 1168, [22:22] +unusedBit_22_23 = bits, U32, 1168, [23:23] +unusedBit_22_24 = bits, U32, 1168, [24:24] +unusedBit_22_25 = bits, U32, 1168, [25:25] +unusedBit_22_26 = bits, U32, 1168, [26:26] +unusedBit_22_27 = bits, U32, 1168, [27:27] +unusedBit_22_28 = bits, U32, 1168, [28:28] +unusedBit_22_29 = bits, U32, 1168, [29:29] +unusedBit_22_30 = bits, U32, 1168, [30:30] +unusedBit_22_31 = bits, U32, 1168, [31:31] +targetRpmByClt = scalar, S32, 1172, "", 1, 0 +targetRpmAcBump = scalar, S32, 1176, "", 1, 0 +iacByRpmTaper = scalar, F32, 1180 +luaAdd = scalar, F32, 1184 +; total TS size = 1188 +baseDwell = scalar, F32, 1188, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 1192, "", 1, 0 +luaTimingAdd = scalar, F32, 1196, "", 1, 0 +luaTimingMult = scalar, F32, 1200, "", 1, 0 +; total TS size = 1204 +idlePosition = scalar, F32, 1204, "", 1, 0 +trim = scalar, F32, 1208, "", 1, 0 +luaAdjustment = scalar, F32, 1212, "", 1, 0 +etbFeedForward = scalar, F32, 1216 +etbIntegralError = scalar, F32, 1220, "", 1, 0 +etbCurrentTarget = scalar, F32, 1224, "%", 1, 0 +etbRevLimitActive = bits, U32, 1228, [0:0] +unusedBit_7_1 = bits, U32, 1228, [1:1] +unusedBit_7_2 = bits, U32, 1228, [2:2] +unusedBit_7_3 = bits, U32, 1228, [3:3] +unusedBit_7_4 = bits, U32, 1228, [4:4] +unusedBit_7_5 = bits, U32, 1228, [5:5] +unusedBit_7_6 = bits, U32, 1228, [6:6] +unusedBit_7_7 = bits, U32, 1228, [7:7] +unusedBit_7_8 = bits, U32, 1228, [8:8] +unusedBit_7_9 = bits, U32, 1228, [9:9] +unusedBit_7_10 = bits, U32, 1228, [10:10] +unusedBit_7_11 = bits, U32, 1228, [11:11] +unusedBit_7_12 = bits, U32, 1228, [12:12] +unusedBit_7_13 = bits, U32, 1228, [13:13] +unusedBit_7_14 = bits, U32, 1228, [14:14] +unusedBit_7_15 = bits, U32, 1228, [15:15] +unusedBit_7_16 = bits, U32, 1228, [16:16] +unusedBit_7_17 = bits, U32, 1228, [17:17] +unusedBit_7_18 = bits, U32, 1228, [18:18] +unusedBit_7_19 = bits, U32, 1228, [19:19] +unusedBit_7_20 = bits, U32, 1228, [20:20] +unusedBit_7_21 = bits, U32, 1228, [21:21] +unusedBit_7_22 = bits, U32, 1228, [22:22] +unusedBit_7_23 = bits, U32, 1228, [23:23] +unusedBit_7_24 = bits, U32, 1228, [24:24] +unusedBit_7_25 = bits, U32, 1228, [25:25] +unusedBit_7_26 = bits, U32, 1228, [26:26] +unusedBit_7_27 = bits, U32, 1228, [27:27] +unusedBit_7_28 = bits, U32, 1228, [28:28] +unusedBit_7_29 = bits, U32, 1228, [29:29] +unusedBit_7_30 = bits, U32, 1228, [30:30] +unusedBit_7_31 = bits, U32, 1228, [31:31] +; total TS size = 1232 +faultCode = scalar, U08, 1232, "", 1, 0 +heaterDuty = scalar, U08, 1233, "%", 1, 0 +pumpDuty = scalar, U08, 1234, "%", 1, 0 +tempC = scalar, U16, 1236, "C", 1, 0 +nernstVoltage = scalar, U16, 1238, "V", 0.001, 0 +esr = scalar, U16, 1240, "", 1, 0 +; total TS size = 1244 time = { timeNow } @@ -4847,7 +4847,7 @@ entry = mapVvt_MAP_AT_SPECIAL_POINT, "mapVvt_MAP_AT_SPECIAL_POINT", float, "%.3 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 Phase2", int, "%d" +entry = currentEngineDecodedPhase, "Engine Phase2", float, "%.3f" entry = totalRevolutionCounter, "Crank revolution counter", int, "%d" entry = vvtSyncGapRatio, "vvtSyncGapRatio", float, "%.3f" entry = vvtCurrentPosition, "vvtCurrentPosition", float, "%.3f" diff --git a/firmware/tunerstudio/generated/rusefi_hellen72.ini b/firmware/tunerstudio/generated/rusefi_hellen72.ini index bd15588e53..9e7a04e3b1 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.01.hellen72.768001953" + signature = "rusEFI 2022.09.01.hellen72.715850680" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.09.01.hellen72.768001953" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.09.01.hellen72.715850680" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Sep 01 04:52:22 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Sep 01 05:33:12 UTC 2022 pageSize = 21300 page = 1 @@ -2118,7 +2118,7 @@ maxKnockRetardRpmBins = array, U08, 21294, [6], "RPM", 100.0, 0, 0, 25000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1240 + ochBlockSize = 1244 ; ; see TunerStudioOutputChannels struct @@ -3090,147 +3090,147 @@ mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1096, "", 1, 0 mapVvt_MAP_AT_DIFF = scalar, F32, 1100, "", 1, 0 mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1104, "", 1, 0 mapVvt_map_peak = scalar, U08, 1105, "", 1, 0 -currentEngineDecodedPhase = scalar, U16, 1106, "deg", 1, 0 -; total TS size = 1108 -totalRevolutionCounter = scalar, U32, 1108, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1112, "", 1, 0 -vvtCurrentPosition = scalar, F32, 1116, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1120, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 1124, "", 1, 0 -triggerStateIndex = scalar, U08, 1128, "", 1, 0 -vvtCounter = scalar, U08, 1129, "", 1, 0 -camResyncCounter = scalar, U08, 1130, "", 1, 0 -vvtStateIndex = scalar, U08, 1131, "", 1, 0 -; total TS size = 1132 -m_hasSynchronizedPhase = bits, U32, 1132, [0:0] -unusedBit_1_1 = bits, U32, 1132, [1:1] -unusedBit_1_2 = bits, U32, 1132, [2:2] -unusedBit_1_3 = bits, U32, 1132, [3:3] -unusedBit_1_4 = bits, U32, 1132, [4:4] -unusedBit_1_5 = bits, U32, 1132, [5:5] -unusedBit_1_6 = bits, U32, 1132, [6:6] -unusedBit_1_7 = bits, U32, 1132, [7:7] -unusedBit_1_8 = bits, U32, 1132, [8:8] -unusedBit_1_9 = bits, U32, 1132, [9:9] -unusedBit_1_10 = bits, U32, 1132, [10:10] -unusedBit_1_11 = bits, U32, 1132, [11:11] -unusedBit_1_12 = bits, U32, 1132, [12:12] -unusedBit_1_13 = bits, U32, 1132, [13:13] -unusedBit_1_14 = bits, U32, 1132, [14:14] -unusedBit_1_15 = bits, U32, 1132, [15:15] -unusedBit_1_16 = bits, U32, 1132, [16:16] -unusedBit_1_17 = bits, U32, 1132, [17:17] -unusedBit_1_18 = bits, U32, 1132, [18:18] -unusedBit_1_19 = bits, U32, 1132, [19:19] -unusedBit_1_20 = bits, U32, 1132, [20:20] -unusedBit_1_21 = bits, U32, 1132, [21:21] -unusedBit_1_22 = bits, U32, 1132, [22:22] -unusedBit_1_23 = bits, U32, 1132, [23:23] -unusedBit_1_24 = bits, U32, 1132, [24:24] -unusedBit_1_25 = bits, U32, 1132, [25:25] -unusedBit_1_26 = bits, U32, 1132, [26:26] -unusedBit_1_27 = bits, U32, 1132, [27:27] -unusedBit_1_28 = bits, U32, 1132, [28:28] -unusedBit_1_29 = bits, U32, 1132, [29:29] -unusedBit_1_30 = bits, U32, 1132, [30:30] -unusedBit_1_31 = bits, U32, 1132, [31:31] +currentEngineDecodedPhase = scalar, F32, 1108, "deg", 1, 0 +; total TS size = 1112 +totalRevolutionCounter = scalar, U32, 1112, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1116, "", 1, 0 +vvtCurrentPosition = scalar, F32, 1120, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1124, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 1128, "", 1, 0 +triggerStateIndex = scalar, U08, 1132, "", 1, 0 +vvtCounter = scalar, U08, 1133, "", 1, 0 +camResyncCounter = scalar, U08, 1134, "", 1, 0 +vvtStateIndex = scalar, U08, 1135, "", 1, 0 ; total TS size = 1136 -wallFuelCorrection = scalar, F32, 1136, "", 1, 0 -wallFuel = scalar, F32, 1140, "", 1, 0 -; total TS size = 1144 -idleState = bits, S32, 1144, [0:2], "not important" -currentIdlePosition = scalar, F32, 1148 -baseIdlePosition = scalar, F32, 1152 -iacByTpsTaper = scalar, F32, 1156 -throttlePedalUpState = scalar, S32, 1160, "", 1, 0 -mightResetPid = bits, U32, 1164, [0:0] -shouldResetPid = bits, U32, 1164, [1:1] -wasResetPid = bits, U32, 1164, [2:2] -mustResetPid = bits, U32, 1164, [3:3] -isCranking = bits, U32, 1164, [4:4] -useIacTableForCoasting = bits, U32, 1164, [5:5] -notIdling = bits, U32, 1164, [6:6] -needReset = bits, U32, 1164, [7:7] -isInDeadZone = bits, U32, 1164, [8:8] -isBlipping = bits, U32, 1164, [9:9] -useClosedLoop = bits, U32, 1164, [10:10] -badTps = bits, U32, 1164, [11:11] -looksLikeRunning = bits, U32, 1164, [12:12] -looksLikeCoasting = bits, U32, 1164, [13:13] -looksLikeCrankToIdle = bits, U32, 1164, [14:14] -isVerboseIAC = bits, U32, 1164, [15:15] -isIdleCoasting = bits, U32, 1164, [16:16] -unusedBit_22_17 = bits, U32, 1164, [17:17] -unusedBit_22_18 = bits, U32, 1164, [18:18] -unusedBit_22_19 = bits, U32, 1164, [19:19] -unusedBit_22_20 = bits, U32, 1164, [20:20] -unusedBit_22_21 = bits, U32, 1164, [21:21] -unusedBit_22_22 = bits, U32, 1164, [22:22] -unusedBit_22_23 = bits, U32, 1164, [23:23] -unusedBit_22_24 = bits, U32, 1164, [24:24] -unusedBit_22_25 = bits, U32, 1164, [25:25] -unusedBit_22_26 = bits, U32, 1164, [26:26] -unusedBit_22_27 = bits, U32, 1164, [27:27] -unusedBit_22_28 = bits, U32, 1164, [28:28] -unusedBit_22_29 = bits, U32, 1164, [29:29] -unusedBit_22_30 = bits, U32, 1164, [30:30] -unusedBit_22_31 = bits, U32, 1164, [31:31] -targetRpmByClt = scalar, S32, 1168, "", 1, 0 -targetRpmAcBump = scalar, S32, 1172, "", 1, 0 -iacByRpmTaper = scalar, F32, 1176 -luaAdd = scalar, F32, 1180 -; total TS size = 1184 -baseDwell = scalar, F32, 1184, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 1188, "", 1, 0 -luaTimingAdd = scalar, F32, 1192, "", 1, 0 -luaTimingMult = scalar, F32, 1196, "", 1, 0 -; total TS size = 1200 -idlePosition = scalar, F32, 1200, "", 1, 0 -trim = scalar, F32, 1204, "", 1, 0 -luaAdjustment = scalar, F32, 1208, "", 1, 0 -etbFeedForward = scalar, F32, 1212 -etbIntegralError = scalar, F32, 1216, "", 1, 0 -etbCurrentTarget = scalar, F32, 1220, "%", 1, 0 -etbRevLimitActive = bits, U32, 1224, [0:0] -unusedBit_7_1 = bits, U32, 1224, [1:1] -unusedBit_7_2 = bits, U32, 1224, [2:2] -unusedBit_7_3 = bits, U32, 1224, [3:3] -unusedBit_7_4 = bits, U32, 1224, [4:4] -unusedBit_7_5 = bits, U32, 1224, [5:5] -unusedBit_7_6 = bits, U32, 1224, [6:6] -unusedBit_7_7 = bits, U32, 1224, [7:7] -unusedBit_7_8 = bits, U32, 1224, [8:8] -unusedBit_7_9 = bits, U32, 1224, [9:9] -unusedBit_7_10 = bits, U32, 1224, [10:10] -unusedBit_7_11 = bits, U32, 1224, [11:11] -unusedBit_7_12 = bits, U32, 1224, [12:12] -unusedBit_7_13 = bits, U32, 1224, [13:13] -unusedBit_7_14 = bits, U32, 1224, [14:14] -unusedBit_7_15 = bits, U32, 1224, [15:15] -unusedBit_7_16 = bits, U32, 1224, [16:16] -unusedBit_7_17 = bits, U32, 1224, [17:17] -unusedBit_7_18 = bits, U32, 1224, [18:18] -unusedBit_7_19 = bits, U32, 1224, [19:19] -unusedBit_7_20 = bits, U32, 1224, [20:20] -unusedBit_7_21 = bits, U32, 1224, [21:21] -unusedBit_7_22 = bits, U32, 1224, [22:22] -unusedBit_7_23 = bits, U32, 1224, [23:23] -unusedBit_7_24 = bits, U32, 1224, [24:24] -unusedBit_7_25 = bits, U32, 1224, [25:25] -unusedBit_7_26 = bits, U32, 1224, [26:26] -unusedBit_7_27 = bits, U32, 1224, [27:27] -unusedBit_7_28 = bits, U32, 1224, [28:28] -unusedBit_7_29 = bits, U32, 1224, [29:29] -unusedBit_7_30 = bits, U32, 1224, [30:30] -unusedBit_7_31 = bits, U32, 1224, [31:31] -; total TS size = 1228 -faultCode = scalar, U08, 1228, "", 1, 0 -heaterDuty = scalar, U08, 1229, "%", 1, 0 -pumpDuty = scalar, U08, 1230, "%", 1, 0 -tempC = scalar, U16, 1232, "C", 1, 0 -nernstVoltage = scalar, U16, 1234, "V", 0.001, 0 -esr = scalar, U16, 1236, "", 1, 0 -; total TS size = 1240 +m_hasSynchronizedPhase = bits, U32, 1136, [0:0] +unusedBit_1_1 = bits, U32, 1136, [1:1] +unusedBit_1_2 = bits, U32, 1136, [2:2] +unusedBit_1_3 = bits, U32, 1136, [3:3] +unusedBit_1_4 = bits, U32, 1136, [4:4] +unusedBit_1_5 = bits, U32, 1136, [5:5] +unusedBit_1_6 = bits, U32, 1136, [6:6] +unusedBit_1_7 = bits, U32, 1136, [7:7] +unusedBit_1_8 = bits, U32, 1136, [8:8] +unusedBit_1_9 = bits, U32, 1136, [9:9] +unusedBit_1_10 = bits, U32, 1136, [10:10] +unusedBit_1_11 = bits, U32, 1136, [11:11] +unusedBit_1_12 = bits, U32, 1136, [12:12] +unusedBit_1_13 = bits, U32, 1136, [13:13] +unusedBit_1_14 = bits, U32, 1136, [14:14] +unusedBit_1_15 = bits, U32, 1136, [15:15] +unusedBit_1_16 = bits, U32, 1136, [16:16] +unusedBit_1_17 = bits, U32, 1136, [17:17] +unusedBit_1_18 = bits, U32, 1136, [18:18] +unusedBit_1_19 = bits, U32, 1136, [19:19] +unusedBit_1_20 = bits, U32, 1136, [20:20] +unusedBit_1_21 = bits, U32, 1136, [21:21] +unusedBit_1_22 = bits, U32, 1136, [22:22] +unusedBit_1_23 = bits, U32, 1136, [23:23] +unusedBit_1_24 = bits, U32, 1136, [24:24] +unusedBit_1_25 = bits, U32, 1136, [25:25] +unusedBit_1_26 = bits, U32, 1136, [26:26] +unusedBit_1_27 = bits, U32, 1136, [27:27] +unusedBit_1_28 = bits, U32, 1136, [28:28] +unusedBit_1_29 = bits, U32, 1136, [29:29] +unusedBit_1_30 = bits, U32, 1136, [30:30] +unusedBit_1_31 = bits, U32, 1136, [31:31] +; total TS size = 1140 +wallFuelCorrection = scalar, F32, 1140, "", 1, 0 +wallFuel = scalar, F32, 1144, "", 1, 0 +; total TS size = 1148 +idleState = bits, S32, 1148, [0:2], "not important" +currentIdlePosition = scalar, F32, 1152 +baseIdlePosition = scalar, F32, 1156 +iacByTpsTaper = scalar, F32, 1160 +throttlePedalUpState = scalar, S32, 1164, "", 1, 0 +mightResetPid = bits, U32, 1168, [0:0] +shouldResetPid = bits, U32, 1168, [1:1] +wasResetPid = bits, U32, 1168, [2:2] +mustResetPid = bits, U32, 1168, [3:3] +isCranking = bits, U32, 1168, [4:4] +useIacTableForCoasting = bits, U32, 1168, [5:5] +notIdling = bits, U32, 1168, [6:6] +needReset = bits, U32, 1168, [7:7] +isInDeadZone = bits, U32, 1168, [8:8] +isBlipping = bits, U32, 1168, [9:9] +useClosedLoop = bits, U32, 1168, [10:10] +badTps = bits, U32, 1168, [11:11] +looksLikeRunning = bits, U32, 1168, [12:12] +looksLikeCoasting = bits, U32, 1168, [13:13] +looksLikeCrankToIdle = bits, U32, 1168, [14:14] +isVerboseIAC = bits, U32, 1168, [15:15] +isIdleCoasting = bits, U32, 1168, [16:16] +unusedBit_22_17 = bits, U32, 1168, [17:17] +unusedBit_22_18 = bits, U32, 1168, [18:18] +unusedBit_22_19 = bits, U32, 1168, [19:19] +unusedBit_22_20 = bits, U32, 1168, [20:20] +unusedBit_22_21 = bits, U32, 1168, [21:21] +unusedBit_22_22 = bits, U32, 1168, [22:22] +unusedBit_22_23 = bits, U32, 1168, [23:23] +unusedBit_22_24 = bits, U32, 1168, [24:24] +unusedBit_22_25 = bits, U32, 1168, [25:25] +unusedBit_22_26 = bits, U32, 1168, [26:26] +unusedBit_22_27 = bits, U32, 1168, [27:27] +unusedBit_22_28 = bits, U32, 1168, [28:28] +unusedBit_22_29 = bits, U32, 1168, [29:29] +unusedBit_22_30 = bits, U32, 1168, [30:30] +unusedBit_22_31 = bits, U32, 1168, [31:31] +targetRpmByClt = scalar, S32, 1172, "", 1, 0 +targetRpmAcBump = scalar, S32, 1176, "", 1, 0 +iacByRpmTaper = scalar, F32, 1180 +luaAdd = scalar, F32, 1184 +; total TS size = 1188 +baseDwell = scalar, F32, 1188, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 1192, "", 1, 0 +luaTimingAdd = scalar, F32, 1196, "", 1, 0 +luaTimingMult = scalar, F32, 1200, "", 1, 0 +; total TS size = 1204 +idlePosition = scalar, F32, 1204, "", 1, 0 +trim = scalar, F32, 1208, "", 1, 0 +luaAdjustment = scalar, F32, 1212, "", 1, 0 +etbFeedForward = scalar, F32, 1216 +etbIntegralError = scalar, F32, 1220, "", 1, 0 +etbCurrentTarget = scalar, F32, 1224, "%", 1, 0 +etbRevLimitActive = bits, U32, 1228, [0:0] +unusedBit_7_1 = bits, U32, 1228, [1:1] +unusedBit_7_2 = bits, U32, 1228, [2:2] +unusedBit_7_3 = bits, U32, 1228, [3:3] +unusedBit_7_4 = bits, U32, 1228, [4:4] +unusedBit_7_5 = bits, U32, 1228, [5:5] +unusedBit_7_6 = bits, U32, 1228, [6:6] +unusedBit_7_7 = bits, U32, 1228, [7:7] +unusedBit_7_8 = bits, U32, 1228, [8:8] +unusedBit_7_9 = bits, U32, 1228, [9:9] +unusedBit_7_10 = bits, U32, 1228, [10:10] +unusedBit_7_11 = bits, U32, 1228, [11:11] +unusedBit_7_12 = bits, U32, 1228, [12:12] +unusedBit_7_13 = bits, U32, 1228, [13:13] +unusedBit_7_14 = bits, U32, 1228, [14:14] +unusedBit_7_15 = bits, U32, 1228, [15:15] +unusedBit_7_16 = bits, U32, 1228, [16:16] +unusedBit_7_17 = bits, U32, 1228, [17:17] +unusedBit_7_18 = bits, U32, 1228, [18:18] +unusedBit_7_19 = bits, U32, 1228, [19:19] +unusedBit_7_20 = bits, U32, 1228, [20:20] +unusedBit_7_21 = bits, U32, 1228, [21:21] +unusedBit_7_22 = bits, U32, 1228, [22:22] +unusedBit_7_23 = bits, U32, 1228, [23:23] +unusedBit_7_24 = bits, U32, 1228, [24:24] +unusedBit_7_25 = bits, U32, 1228, [25:25] +unusedBit_7_26 = bits, U32, 1228, [26:26] +unusedBit_7_27 = bits, U32, 1228, [27:27] +unusedBit_7_28 = bits, U32, 1228, [28:28] +unusedBit_7_29 = bits, U32, 1228, [29:29] +unusedBit_7_30 = bits, U32, 1228, [30:30] +unusedBit_7_31 = bits, U32, 1228, [31:31] +; total TS size = 1232 +faultCode = scalar, U08, 1232, "", 1, 0 +heaterDuty = scalar, U08, 1233, "%", 1, 0 +pumpDuty = scalar, U08, 1234, "%", 1, 0 +tempC = scalar, U16, 1236, "C", 1, 0 +nernstVoltage = scalar, U16, 1238, "V", 0.001, 0 +esr = scalar, U16, 1240, "", 1, 0 +; total TS size = 1244 time = { timeNow } @@ -4847,7 +4847,7 @@ entry = mapVvt_MAP_AT_SPECIAL_POINT, "mapVvt_MAP_AT_SPECIAL_POINT", float, "%.3 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 Phase2", int, "%d" +entry = currentEngineDecodedPhase, "Engine Phase2", float, "%.3f" entry = totalRevolutionCounter, "Crank revolution counter", int, "%d" entry = vvtSyncGapRatio, "vvtSyncGapRatio", float, "%.3f" entry = vvtCurrentPosition, "vvtCurrentPosition", float, "%.3f" diff --git a/firmware/tunerstudio/generated/rusefi_hellen81.ini b/firmware/tunerstudio/generated/rusefi_hellen81.ini index 9f2195d9ab..906def1026 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.01.hellen81.4249630383" + signature = "rusEFI 2022.09.01.hellen81.4196528822" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.09.01.hellen81.4249630383" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.09.01.hellen81.4196528822" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Sep 01 04:52:23 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Sep 01 05:33:14 UTC 2022 pageSize = 21300 page = 1 @@ -2118,7 +2118,7 @@ maxKnockRetardRpmBins = array, U08, 21294, [6], "RPM", 100.0, 0, 0, 25000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1240 + ochBlockSize = 1244 ; ; see TunerStudioOutputChannels struct @@ -3090,147 +3090,147 @@ mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1096, "", 1, 0 mapVvt_MAP_AT_DIFF = scalar, F32, 1100, "", 1, 0 mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1104, "", 1, 0 mapVvt_map_peak = scalar, U08, 1105, "", 1, 0 -currentEngineDecodedPhase = scalar, U16, 1106, "deg", 1, 0 -; total TS size = 1108 -totalRevolutionCounter = scalar, U32, 1108, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1112, "", 1, 0 -vvtCurrentPosition = scalar, F32, 1116, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1120, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 1124, "", 1, 0 -triggerStateIndex = scalar, U08, 1128, "", 1, 0 -vvtCounter = scalar, U08, 1129, "", 1, 0 -camResyncCounter = scalar, U08, 1130, "", 1, 0 -vvtStateIndex = scalar, U08, 1131, "", 1, 0 -; total TS size = 1132 -m_hasSynchronizedPhase = bits, U32, 1132, [0:0] -unusedBit_1_1 = bits, U32, 1132, [1:1] -unusedBit_1_2 = bits, U32, 1132, [2:2] -unusedBit_1_3 = bits, U32, 1132, [3:3] -unusedBit_1_4 = bits, U32, 1132, [4:4] -unusedBit_1_5 = bits, U32, 1132, [5:5] -unusedBit_1_6 = bits, U32, 1132, [6:6] -unusedBit_1_7 = bits, U32, 1132, [7:7] -unusedBit_1_8 = bits, U32, 1132, [8:8] -unusedBit_1_9 = bits, U32, 1132, [9:9] -unusedBit_1_10 = bits, U32, 1132, [10:10] -unusedBit_1_11 = bits, U32, 1132, [11:11] -unusedBit_1_12 = bits, U32, 1132, [12:12] -unusedBit_1_13 = bits, U32, 1132, [13:13] -unusedBit_1_14 = bits, U32, 1132, [14:14] -unusedBit_1_15 = bits, U32, 1132, [15:15] -unusedBit_1_16 = bits, U32, 1132, [16:16] -unusedBit_1_17 = bits, U32, 1132, [17:17] -unusedBit_1_18 = bits, U32, 1132, [18:18] -unusedBit_1_19 = bits, U32, 1132, [19:19] -unusedBit_1_20 = bits, U32, 1132, [20:20] -unusedBit_1_21 = bits, U32, 1132, [21:21] -unusedBit_1_22 = bits, U32, 1132, [22:22] -unusedBit_1_23 = bits, U32, 1132, [23:23] -unusedBit_1_24 = bits, U32, 1132, [24:24] -unusedBit_1_25 = bits, U32, 1132, [25:25] -unusedBit_1_26 = bits, U32, 1132, [26:26] -unusedBit_1_27 = bits, U32, 1132, [27:27] -unusedBit_1_28 = bits, U32, 1132, [28:28] -unusedBit_1_29 = bits, U32, 1132, [29:29] -unusedBit_1_30 = bits, U32, 1132, [30:30] -unusedBit_1_31 = bits, U32, 1132, [31:31] +currentEngineDecodedPhase = scalar, F32, 1108, "deg", 1, 0 +; total TS size = 1112 +totalRevolutionCounter = scalar, U32, 1112, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1116, "", 1, 0 +vvtCurrentPosition = scalar, F32, 1120, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1124, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 1128, "", 1, 0 +triggerStateIndex = scalar, U08, 1132, "", 1, 0 +vvtCounter = scalar, U08, 1133, "", 1, 0 +camResyncCounter = scalar, U08, 1134, "", 1, 0 +vvtStateIndex = scalar, U08, 1135, "", 1, 0 ; total TS size = 1136 -wallFuelCorrection = scalar, F32, 1136, "", 1, 0 -wallFuel = scalar, F32, 1140, "", 1, 0 -; total TS size = 1144 -idleState = bits, S32, 1144, [0:2], "not important" -currentIdlePosition = scalar, F32, 1148 -baseIdlePosition = scalar, F32, 1152 -iacByTpsTaper = scalar, F32, 1156 -throttlePedalUpState = scalar, S32, 1160, "", 1, 0 -mightResetPid = bits, U32, 1164, [0:0] -shouldResetPid = bits, U32, 1164, [1:1] -wasResetPid = bits, U32, 1164, [2:2] -mustResetPid = bits, U32, 1164, [3:3] -isCranking = bits, U32, 1164, [4:4] -useIacTableForCoasting = bits, U32, 1164, [5:5] -notIdling = bits, U32, 1164, [6:6] -needReset = bits, U32, 1164, [7:7] -isInDeadZone = bits, U32, 1164, [8:8] -isBlipping = bits, U32, 1164, [9:9] -useClosedLoop = bits, U32, 1164, [10:10] -badTps = bits, U32, 1164, [11:11] -looksLikeRunning = bits, U32, 1164, [12:12] -looksLikeCoasting = bits, U32, 1164, [13:13] -looksLikeCrankToIdle = bits, U32, 1164, [14:14] -isVerboseIAC = bits, U32, 1164, [15:15] -isIdleCoasting = bits, U32, 1164, [16:16] -unusedBit_22_17 = bits, U32, 1164, [17:17] -unusedBit_22_18 = bits, U32, 1164, [18:18] -unusedBit_22_19 = bits, U32, 1164, [19:19] -unusedBit_22_20 = bits, U32, 1164, [20:20] -unusedBit_22_21 = bits, U32, 1164, [21:21] -unusedBit_22_22 = bits, U32, 1164, [22:22] -unusedBit_22_23 = bits, U32, 1164, [23:23] -unusedBit_22_24 = bits, U32, 1164, [24:24] -unusedBit_22_25 = bits, U32, 1164, [25:25] -unusedBit_22_26 = bits, U32, 1164, [26:26] -unusedBit_22_27 = bits, U32, 1164, [27:27] -unusedBit_22_28 = bits, U32, 1164, [28:28] -unusedBit_22_29 = bits, U32, 1164, [29:29] -unusedBit_22_30 = bits, U32, 1164, [30:30] -unusedBit_22_31 = bits, U32, 1164, [31:31] -targetRpmByClt = scalar, S32, 1168, "", 1, 0 -targetRpmAcBump = scalar, S32, 1172, "", 1, 0 -iacByRpmTaper = scalar, F32, 1176 -luaAdd = scalar, F32, 1180 -; total TS size = 1184 -baseDwell = scalar, F32, 1184, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 1188, "", 1, 0 -luaTimingAdd = scalar, F32, 1192, "", 1, 0 -luaTimingMult = scalar, F32, 1196, "", 1, 0 -; total TS size = 1200 -idlePosition = scalar, F32, 1200, "", 1, 0 -trim = scalar, F32, 1204, "", 1, 0 -luaAdjustment = scalar, F32, 1208, "", 1, 0 -etbFeedForward = scalar, F32, 1212 -etbIntegralError = scalar, F32, 1216, "", 1, 0 -etbCurrentTarget = scalar, F32, 1220, "%", 1, 0 -etbRevLimitActive = bits, U32, 1224, [0:0] -unusedBit_7_1 = bits, U32, 1224, [1:1] -unusedBit_7_2 = bits, U32, 1224, [2:2] -unusedBit_7_3 = bits, U32, 1224, [3:3] -unusedBit_7_4 = bits, U32, 1224, [4:4] -unusedBit_7_5 = bits, U32, 1224, [5:5] -unusedBit_7_6 = bits, U32, 1224, [6:6] -unusedBit_7_7 = bits, U32, 1224, [7:7] -unusedBit_7_8 = bits, U32, 1224, [8:8] -unusedBit_7_9 = bits, U32, 1224, [9:9] -unusedBit_7_10 = bits, U32, 1224, [10:10] -unusedBit_7_11 = bits, U32, 1224, [11:11] -unusedBit_7_12 = bits, U32, 1224, [12:12] -unusedBit_7_13 = bits, U32, 1224, [13:13] -unusedBit_7_14 = bits, U32, 1224, [14:14] -unusedBit_7_15 = bits, U32, 1224, [15:15] -unusedBit_7_16 = bits, U32, 1224, [16:16] -unusedBit_7_17 = bits, U32, 1224, [17:17] -unusedBit_7_18 = bits, U32, 1224, [18:18] -unusedBit_7_19 = bits, U32, 1224, [19:19] -unusedBit_7_20 = bits, U32, 1224, [20:20] -unusedBit_7_21 = bits, U32, 1224, [21:21] -unusedBit_7_22 = bits, U32, 1224, [22:22] -unusedBit_7_23 = bits, U32, 1224, [23:23] -unusedBit_7_24 = bits, U32, 1224, [24:24] -unusedBit_7_25 = bits, U32, 1224, [25:25] -unusedBit_7_26 = bits, U32, 1224, [26:26] -unusedBit_7_27 = bits, U32, 1224, [27:27] -unusedBit_7_28 = bits, U32, 1224, [28:28] -unusedBit_7_29 = bits, U32, 1224, [29:29] -unusedBit_7_30 = bits, U32, 1224, [30:30] -unusedBit_7_31 = bits, U32, 1224, [31:31] -; total TS size = 1228 -faultCode = scalar, U08, 1228, "", 1, 0 -heaterDuty = scalar, U08, 1229, "%", 1, 0 -pumpDuty = scalar, U08, 1230, "%", 1, 0 -tempC = scalar, U16, 1232, "C", 1, 0 -nernstVoltage = scalar, U16, 1234, "V", 0.001, 0 -esr = scalar, U16, 1236, "", 1, 0 -; total TS size = 1240 +m_hasSynchronizedPhase = bits, U32, 1136, [0:0] +unusedBit_1_1 = bits, U32, 1136, [1:1] +unusedBit_1_2 = bits, U32, 1136, [2:2] +unusedBit_1_3 = bits, U32, 1136, [3:3] +unusedBit_1_4 = bits, U32, 1136, [4:4] +unusedBit_1_5 = bits, U32, 1136, [5:5] +unusedBit_1_6 = bits, U32, 1136, [6:6] +unusedBit_1_7 = bits, U32, 1136, [7:7] +unusedBit_1_8 = bits, U32, 1136, [8:8] +unusedBit_1_9 = bits, U32, 1136, [9:9] +unusedBit_1_10 = bits, U32, 1136, [10:10] +unusedBit_1_11 = bits, U32, 1136, [11:11] +unusedBit_1_12 = bits, U32, 1136, [12:12] +unusedBit_1_13 = bits, U32, 1136, [13:13] +unusedBit_1_14 = bits, U32, 1136, [14:14] +unusedBit_1_15 = bits, U32, 1136, [15:15] +unusedBit_1_16 = bits, U32, 1136, [16:16] +unusedBit_1_17 = bits, U32, 1136, [17:17] +unusedBit_1_18 = bits, U32, 1136, [18:18] +unusedBit_1_19 = bits, U32, 1136, [19:19] +unusedBit_1_20 = bits, U32, 1136, [20:20] +unusedBit_1_21 = bits, U32, 1136, [21:21] +unusedBit_1_22 = bits, U32, 1136, [22:22] +unusedBit_1_23 = bits, U32, 1136, [23:23] +unusedBit_1_24 = bits, U32, 1136, [24:24] +unusedBit_1_25 = bits, U32, 1136, [25:25] +unusedBit_1_26 = bits, U32, 1136, [26:26] +unusedBit_1_27 = bits, U32, 1136, [27:27] +unusedBit_1_28 = bits, U32, 1136, [28:28] +unusedBit_1_29 = bits, U32, 1136, [29:29] +unusedBit_1_30 = bits, U32, 1136, [30:30] +unusedBit_1_31 = bits, U32, 1136, [31:31] +; total TS size = 1140 +wallFuelCorrection = scalar, F32, 1140, "", 1, 0 +wallFuel = scalar, F32, 1144, "", 1, 0 +; total TS size = 1148 +idleState = bits, S32, 1148, [0:2], "not important" +currentIdlePosition = scalar, F32, 1152 +baseIdlePosition = scalar, F32, 1156 +iacByTpsTaper = scalar, F32, 1160 +throttlePedalUpState = scalar, S32, 1164, "", 1, 0 +mightResetPid = bits, U32, 1168, [0:0] +shouldResetPid = bits, U32, 1168, [1:1] +wasResetPid = bits, U32, 1168, [2:2] +mustResetPid = bits, U32, 1168, [3:3] +isCranking = bits, U32, 1168, [4:4] +useIacTableForCoasting = bits, U32, 1168, [5:5] +notIdling = bits, U32, 1168, [6:6] +needReset = bits, U32, 1168, [7:7] +isInDeadZone = bits, U32, 1168, [8:8] +isBlipping = bits, U32, 1168, [9:9] +useClosedLoop = bits, U32, 1168, [10:10] +badTps = bits, U32, 1168, [11:11] +looksLikeRunning = bits, U32, 1168, [12:12] +looksLikeCoasting = bits, U32, 1168, [13:13] +looksLikeCrankToIdle = bits, U32, 1168, [14:14] +isVerboseIAC = bits, U32, 1168, [15:15] +isIdleCoasting = bits, U32, 1168, [16:16] +unusedBit_22_17 = bits, U32, 1168, [17:17] +unusedBit_22_18 = bits, U32, 1168, [18:18] +unusedBit_22_19 = bits, U32, 1168, [19:19] +unusedBit_22_20 = bits, U32, 1168, [20:20] +unusedBit_22_21 = bits, U32, 1168, [21:21] +unusedBit_22_22 = bits, U32, 1168, [22:22] +unusedBit_22_23 = bits, U32, 1168, [23:23] +unusedBit_22_24 = bits, U32, 1168, [24:24] +unusedBit_22_25 = bits, U32, 1168, [25:25] +unusedBit_22_26 = bits, U32, 1168, [26:26] +unusedBit_22_27 = bits, U32, 1168, [27:27] +unusedBit_22_28 = bits, U32, 1168, [28:28] +unusedBit_22_29 = bits, U32, 1168, [29:29] +unusedBit_22_30 = bits, U32, 1168, [30:30] +unusedBit_22_31 = bits, U32, 1168, [31:31] +targetRpmByClt = scalar, S32, 1172, "", 1, 0 +targetRpmAcBump = scalar, S32, 1176, "", 1, 0 +iacByRpmTaper = scalar, F32, 1180 +luaAdd = scalar, F32, 1184 +; total TS size = 1188 +baseDwell = scalar, F32, 1188, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 1192, "", 1, 0 +luaTimingAdd = scalar, F32, 1196, "", 1, 0 +luaTimingMult = scalar, F32, 1200, "", 1, 0 +; total TS size = 1204 +idlePosition = scalar, F32, 1204, "", 1, 0 +trim = scalar, F32, 1208, "", 1, 0 +luaAdjustment = scalar, F32, 1212, "", 1, 0 +etbFeedForward = scalar, F32, 1216 +etbIntegralError = scalar, F32, 1220, "", 1, 0 +etbCurrentTarget = scalar, F32, 1224, "%", 1, 0 +etbRevLimitActive = bits, U32, 1228, [0:0] +unusedBit_7_1 = bits, U32, 1228, [1:1] +unusedBit_7_2 = bits, U32, 1228, [2:2] +unusedBit_7_3 = bits, U32, 1228, [3:3] +unusedBit_7_4 = bits, U32, 1228, [4:4] +unusedBit_7_5 = bits, U32, 1228, [5:5] +unusedBit_7_6 = bits, U32, 1228, [6:6] +unusedBit_7_7 = bits, U32, 1228, [7:7] +unusedBit_7_8 = bits, U32, 1228, [8:8] +unusedBit_7_9 = bits, U32, 1228, [9:9] +unusedBit_7_10 = bits, U32, 1228, [10:10] +unusedBit_7_11 = bits, U32, 1228, [11:11] +unusedBit_7_12 = bits, U32, 1228, [12:12] +unusedBit_7_13 = bits, U32, 1228, [13:13] +unusedBit_7_14 = bits, U32, 1228, [14:14] +unusedBit_7_15 = bits, U32, 1228, [15:15] +unusedBit_7_16 = bits, U32, 1228, [16:16] +unusedBit_7_17 = bits, U32, 1228, [17:17] +unusedBit_7_18 = bits, U32, 1228, [18:18] +unusedBit_7_19 = bits, U32, 1228, [19:19] +unusedBit_7_20 = bits, U32, 1228, [20:20] +unusedBit_7_21 = bits, U32, 1228, [21:21] +unusedBit_7_22 = bits, U32, 1228, [22:22] +unusedBit_7_23 = bits, U32, 1228, [23:23] +unusedBit_7_24 = bits, U32, 1228, [24:24] +unusedBit_7_25 = bits, U32, 1228, [25:25] +unusedBit_7_26 = bits, U32, 1228, [26:26] +unusedBit_7_27 = bits, U32, 1228, [27:27] +unusedBit_7_28 = bits, U32, 1228, [28:28] +unusedBit_7_29 = bits, U32, 1228, [29:29] +unusedBit_7_30 = bits, U32, 1228, [30:30] +unusedBit_7_31 = bits, U32, 1228, [31:31] +; total TS size = 1232 +faultCode = scalar, U08, 1232, "", 1, 0 +heaterDuty = scalar, U08, 1233, "%", 1, 0 +pumpDuty = scalar, U08, 1234, "%", 1, 0 +tempC = scalar, U16, 1236, "C", 1, 0 +nernstVoltage = scalar, U16, 1238, "V", 0.001, 0 +esr = scalar, U16, 1240, "", 1, 0 +; total TS size = 1244 time = { timeNow } @@ -4847,7 +4847,7 @@ entry = mapVvt_MAP_AT_SPECIAL_POINT, "mapVvt_MAP_AT_SPECIAL_POINT", float, "%.3 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 Phase2", int, "%d" +entry = currentEngineDecodedPhase, "Engine Phase2", float, "%.3f" entry = totalRevolutionCounter, "Crank revolution counter", int, "%d" entry = vvtSyncGapRatio, "vvtSyncGapRatio", float, "%.3f" entry = vvtCurrentPosition, "vvtCurrentPosition", float, "%.3f" diff --git a/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini b/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini index a1217c1308..5c96240ac8 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.01.hellen88bmw.3389848937" + signature = "rusEFI 2022.09.01.hellen88bmw.3445700976" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.09.01.hellen88bmw.3389848937" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.09.01.hellen88bmw.3445700976" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Sep 01 04:52:20 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Sep 01 05:33:10 UTC 2022 pageSize = 21300 page = 1 @@ -2118,7 +2118,7 @@ maxKnockRetardRpmBins = array, U08, 21294, [6], "RPM", 100.0, 0, 0, 25000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1240 + ochBlockSize = 1244 ; ; see TunerStudioOutputChannels struct @@ -3090,147 +3090,147 @@ mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1096, "", 1, 0 mapVvt_MAP_AT_DIFF = scalar, F32, 1100, "", 1, 0 mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1104, "", 1, 0 mapVvt_map_peak = scalar, U08, 1105, "", 1, 0 -currentEngineDecodedPhase = scalar, U16, 1106, "deg", 1, 0 -; total TS size = 1108 -totalRevolutionCounter = scalar, U32, 1108, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1112, "", 1, 0 -vvtCurrentPosition = scalar, F32, 1116, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1120, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 1124, "", 1, 0 -triggerStateIndex = scalar, U08, 1128, "", 1, 0 -vvtCounter = scalar, U08, 1129, "", 1, 0 -camResyncCounter = scalar, U08, 1130, "", 1, 0 -vvtStateIndex = scalar, U08, 1131, "", 1, 0 -; total TS size = 1132 -m_hasSynchronizedPhase = bits, U32, 1132, [0:0] -unusedBit_1_1 = bits, U32, 1132, [1:1] -unusedBit_1_2 = bits, U32, 1132, [2:2] -unusedBit_1_3 = bits, U32, 1132, [3:3] -unusedBit_1_4 = bits, U32, 1132, [4:4] -unusedBit_1_5 = bits, U32, 1132, [5:5] -unusedBit_1_6 = bits, U32, 1132, [6:6] -unusedBit_1_7 = bits, U32, 1132, [7:7] -unusedBit_1_8 = bits, U32, 1132, [8:8] -unusedBit_1_9 = bits, U32, 1132, [9:9] -unusedBit_1_10 = bits, U32, 1132, [10:10] -unusedBit_1_11 = bits, U32, 1132, [11:11] -unusedBit_1_12 = bits, U32, 1132, [12:12] -unusedBit_1_13 = bits, U32, 1132, [13:13] -unusedBit_1_14 = bits, U32, 1132, [14:14] -unusedBit_1_15 = bits, U32, 1132, [15:15] -unusedBit_1_16 = bits, U32, 1132, [16:16] -unusedBit_1_17 = bits, U32, 1132, [17:17] -unusedBit_1_18 = bits, U32, 1132, [18:18] -unusedBit_1_19 = bits, U32, 1132, [19:19] -unusedBit_1_20 = bits, U32, 1132, [20:20] -unusedBit_1_21 = bits, U32, 1132, [21:21] -unusedBit_1_22 = bits, U32, 1132, [22:22] -unusedBit_1_23 = bits, U32, 1132, [23:23] -unusedBit_1_24 = bits, U32, 1132, [24:24] -unusedBit_1_25 = bits, U32, 1132, [25:25] -unusedBit_1_26 = bits, U32, 1132, [26:26] -unusedBit_1_27 = bits, U32, 1132, [27:27] -unusedBit_1_28 = bits, U32, 1132, [28:28] -unusedBit_1_29 = bits, U32, 1132, [29:29] -unusedBit_1_30 = bits, U32, 1132, [30:30] -unusedBit_1_31 = bits, U32, 1132, [31:31] +currentEngineDecodedPhase = scalar, F32, 1108, "deg", 1, 0 +; total TS size = 1112 +totalRevolutionCounter = scalar, U32, 1112, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1116, "", 1, 0 +vvtCurrentPosition = scalar, F32, 1120, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1124, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 1128, "", 1, 0 +triggerStateIndex = scalar, U08, 1132, "", 1, 0 +vvtCounter = scalar, U08, 1133, "", 1, 0 +camResyncCounter = scalar, U08, 1134, "", 1, 0 +vvtStateIndex = scalar, U08, 1135, "", 1, 0 ; total TS size = 1136 -wallFuelCorrection = scalar, F32, 1136, "", 1, 0 -wallFuel = scalar, F32, 1140, "", 1, 0 -; total TS size = 1144 -idleState = bits, S32, 1144, [0:2], "not important" -currentIdlePosition = scalar, F32, 1148 -baseIdlePosition = scalar, F32, 1152 -iacByTpsTaper = scalar, F32, 1156 -throttlePedalUpState = scalar, S32, 1160, "", 1, 0 -mightResetPid = bits, U32, 1164, [0:0] -shouldResetPid = bits, U32, 1164, [1:1] -wasResetPid = bits, U32, 1164, [2:2] -mustResetPid = bits, U32, 1164, [3:3] -isCranking = bits, U32, 1164, [4:4] -useIacTableForCoasting = bits, U32, 1164, [5:5] -notIdling = bits, U32, 1164, [6:6] -needReset = bits, U32, 1164, [7:7] -isInDeadZone = bits, U32, 1164, [8:8] -isBlipping = bits, U32, 1164, [9:9] -useClosedLoop = bits, U32, 1164, [10:10] -badTps = bits, U32, 1164, [11:11] -looksLikeRunning = bits, U32, 1164, [12:12] -looksLikeCoasting = bits, U32, 1164, [13:13] -looksLikeCrankToIdle = bits, U32, 1164, [14:14] -isVerboseIAC = bits, U32, 1164, [15:15] -isIdleCoasting = bits, U32, 1164, [16:16] -unusedBit_22_17 = bits, U32, 1164, [17:17] -unusedBit_22_18 = bits, U32, 1164, [18:18] -unusedBit_22_19 = bits, U32, 1164, [19:19] -unusedBit_22_20 = bits, U32, 1164, [20:20] -unusedBit_22_21 = bits, U32, 1164, [21:21] -unusedBit_22_22 = bits, U32, 1164, [22:22] -unusedBit_22_23 = bits, U32, 1164, [23:23] -unusedBit_22_24 = bits, U32, 1164, [24:24] -unusedBit_22_25 = bits, U32, 1164, [25:25] -unusedBit_22_26 = bits, U32, 1164, [26:26] -unusedBit_22_27 = bits, U32, 1164, [27:27] -unusedBit_22_28 = bits, U32, 1164, [28:28] -unusedBit_22_29 = bits, U32, 1164, [29:29] -unusedBit_22_30 = bits, U32, 1164, [30:30] -unusedBit_22_31 = bits, U32, 1164, [31:31] -targetRpmByClt = scalar, S32, 1168, "", 1, 0 -targetRpmAcBump = scalar, S32, 1172, "", 1, 0 -iacByRpmTaper = scalar, F32, 1176 -luaAdd = scalar, F32, 1180 -; total TS size = 1184 -baseDwell = scalar, F32, 1184, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 1188, "", 1, 0 -luaTimingAdd = scalar, F32, 1192, "", 1, 0 -luaTimingMult = scalar, F32, 1196, "", 1, 0 -; total TS size = 1200 -idlePosition = scalar, F32, 1200, "", 1, 0 -trim = scalar, F32, 1204, "", 1, 0 -luaAdjustment = scalar, F32, 1208, "", 1, 0 -etbFeedForward = scalar, F32, 1212 -etbIntegralError = scalar, F32, 1216, "", 1, 0 -etbCurrentTarget = scalar, F32, 1220, "%", 1, 0 -etbRevLimitActive = bits, U32, 1224, [0:0] -unusedBit_7_1 = bits, U32, 1224, [1:1] -unusedBit_7_2 = bits, U32, 1224, [2:2] -unusedBit_7_3 = bits, U32, 1224, [3:3] -unusedBit_7_4 = bits, U32, 1224, [4:4] -unusedBit_7_5 = bits, U32, 1224, [5:5] -unusedBit_7_6 = bits, U32, 1224, [6:6] -unusedBit_7_7 = bits, U32, 1224, [7:7] -unusedBit_7_8 = bits, U32, 1224, [8:8] -unusedBit_7_9 = bits, U32, 1224, [9:9] -unusedBit_7_10 = bits, U32, 1224, [10:10] -unusedBit_7_11 = bits, U32, 1224, [11:11] -unusedBit_7_12 = bits, U32, 1224, [12:12] -unusedBit_7_13 = bits, U32, 1224, [13:13] -unusedBit_7_14 = bits, U32, 1224, [14:14] -unusedBit_7_15 = bits, U32, 1224, [15:15] -unusedBit_7_16 = bits, U32, 1224, [16:16] -unusedBit_7_17 = bits, U32, 1224, [17:17] -unusedBit_7_18 = bits, U32, 1224, [18:18] -unusedBit_7_19 = bits, U32, 1224, [19:19] -unusedBit_7_20 = bits, U32, 1224, [20:20] -unusedBit_7_21 = bits, U32, 1224, [21:21] -unusedBit_7_22 = bits, U32, 1224, [22:22] -unusedBit_7_23 = bits, U32, 1224, [23:23] -unusedBit_7_24 = bits, U32, 1224, [24:24] -unusedBit_7_25 = bits, U32, 1224, [25:25] -unusedBit_7_26 = bits, U32, 1224, [26:26] -unusedBit_7_27 = bits, U32, 1224, [27:27] -unusedBit_7_28 = bits, U32, 1224, [28:28] -unusedBit_7_29 = bits, U32, 1224, [29:29] -unusedBit_7_30 = bits, U32, 1224, [30:30] -unusedBit_7_31 = bits, U32, 1224, [31:31] -; total TS size = 1228 -faultCode = scalar, U08, 1228, "", 1, 0 -heaterDuty = scalar, U08, 1229, "%", 1, 0 -pumpDuty = scalar, U08, 1230, "%", 1, 0 -tempC = scalar, U16, 1232, "C", 1, 0 -nernstVoltage = scalar, U16, 1234, "V", 0.001, 0 -esr = scalar, U16, 1236, "", 1, 0 -; total TS size = 1240 +m_hasSynchronizedPhase = bits, U32, 1136, [0:0] +unusedBit_1_1 = bits, U32, 1136, [1:1] +unusedBit_1_2 = bits, U32, 1136, [2:2] +unusedBit_1_3 = bits, U32, 1136, [3:3] +unusedBit_1_4 = bits, U32, 1136, [4:4] +unusedBit_1_5 = bits, U32, 1136, [5:5] +unusedBit_1_6 = bits, U32, 1136, [6:6] +unusedBit_1_7 = bits, U32, 1136, [7:7] +unusedBit_1_8 = bits, U32, 1136, [8:8] +unusedBit_1_9 = bits, U32, 1136, [9:9] +unusedBit_1_10 = bits, U32, 1136, [10:10] +unusedBit_1_11 = bits, U32, 1136, [11:11] +unusedBit_1_12 = bits, U32, 1136, [12:12] +unusedBit_1_13 = bits, U32, 1136, [13:13] +unusedBit_1_14 = bits, U32, 1136, [14:14] +unusedBit_1_15 = bits, U32, 1136, [15:15] +unusedBit_1_16 = bits, U32, 1136, [16:16] +unusedBit_1_17 = bits, U32, 1136, [17:17] +unusedBit_1_18 = bits, U32, 1136, [18:18] +unusedBit_1_19 = bits, U32, 1136, [19:19] +unusedBit_1_20 = bits, U32, 1136, [20:20] +unusedBit_1_21 = bits, U32, 1136, [21:21] +unusedBit_1_22 = bits, U32, 1136, [22:22] +unusedBit_1_23 = bits, U32, 1136, [23:23] +unusedBit_1_24 = bits, U32, 1136, [24:24] +unusedBit_1_25 = bits, U32, 1136, [25:25] +unusedBit_1_26 = bits, U32, 1136, [26:26] +unusedBit_1_27 = bits, U32, 1136, [27:27] +unusedBit_1_28 = bits, U32, 1136, [28:28] +unusedBit_1_29 = bits, U32, 1136, [29:29] +unusedBit_1_30 = bits, U32, 1136, [30:30] +unusedBit_1_31 = bits, U32, 1136, [31:31] +; total TS size = 1140 +wallFuelCorrection = scalar, F32, 1140, "", 1, 0 +wallFuel = scalar, F32, 1144, "", 1, 0 +; total TS size = 1148 +idleState = bits, S32, 1148, [0:2], "not important" +currentIdlePosition = scalar, F32, 1152 +baseIdlePosition = scalar, F32, 1156 +iacByTpsTaper = scalar, F32, 1160 +throttlePedalUpState = scalar, S32, 1164, "", 1, 0 +mightResetPid = bits, U32, 1168, [0:0] +shouldResetPid = bits, U32, 1168, [1:1] +wasResetPid = bits, U32, 1168, [2:2] +mustResetPid = bits, U32, 1168, [3:3] +isCranking = bits, U32, 1168, [4:4] +useIacTableForCoasting = bits, U32, 1168, [5:5] +notIdling = bits, U32, 1168, [6:6] +needReset = bits, U32, 1168, [7:7] +isInDeadZone = bits, U32, 1168, [8:8] +isBlipping = bits, U32, 1168, [9:9] +useClosedLoop = bits, U32, 1168, [10:10] +badTps = bits, U32, 1168, [11:11] +looksLikeRunning = bits, U32, 1168, [12:12] +looksLikeCoasting = bits, U32, 1168, [13:13] +looksLikeCrankToIdle = bits, U32, 1168, [14:14] +isVerboseIAC = bits, U32, 1168, [15:15] +isIdleCoasting = bits, U32, 1168, [16:16] +unusedBit_22_17 = bits, U32, 1168, [17:17] +unusedBit_22_18 = bits, U32, 1168, [18:18] +unusedBit_22_19 = bits, U32, 1168, [19:19] +unusedBit_22_20 = bits, U32, 1168, [20:20] +unusedBit_22_21 = bits, U32, 1168, [21:21] +unusedBit_22_22 = bits, U32, 1168, [22:22] +unusedBit_22_23 = bits, U32, 1168, [23:23] +unusedBit_22_24 = bits, U32, 1168, [24:24] +unusedBit_22_25 = bits, U32, 1168, [25:25] +unusedBit_22_26 = bits, U32, 1168, [26:26] +unusedBit_22_27 = bits, U32, 1168, [27:27] +unusedBit_22_28 = bits, U32, 1168, [28:28] +unusedBit_22_29 = bits, U32, 1168, [29:29] +unusedBit_22_30 = bits, U32, 1168, [30:30] +unusedBit_22_31 = bits, U32, 1168, [31:31] +targetRpmByClt = scalar, S32, 1172, "", 1, 0 +targetRpmAcBump = scalar, S32, 1176, "", 1, 0 +iacByRpmTaper = scalar, F32, 1180 +luaAdd = scalar, F32, 1184 +; total TS size = 1188 +baseDwell = scalar, F32, 1188, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 1192, "", 1, 0 +luaTimingAdd = scalar, F32, 1196, "", 1, 0 +luaTimingMult = scalar, F32, 1200, "", 1, 0 +; total TS size = 1204 +idlePosition = scalar, F32, 1204, "", 1, 0 +trim = scalar, F32, 1208, "", 1, 0 +luaAdjustment = scalar, F32, 1212, "", 1, 0 +etbFeedForward = scalar, F32, 1216 +etbIntegralError = scalar, F32, 1220, "", 1, 0 +etbCurrentTarget = scalar, F32, 1224, "%", 1, 0 +etbRevLimitActive = bits, U32, 1228, [0:0] +unusedBit_7_1 = bits, U32, 1228, [1:1] +unusedBit_7_2 = bits, U32, 1228, [2:2] +unusedBit_7_3 = bits, U32, 1228, [3:3] +unusedBit_7_4 = bits, U32, 1228, [4:4] +unusedBit_7_5 = bits, U32, 1228, [5:5] +unusedBit_7_6 = bits, U32, 1228, [6:6] +unusedBit_7_7 = bits, U32, 1228, [7:7] +unusedBit_7_8 = bits, U32, 1228, [8:8] +unusedBit_7_9 = bits, U32, 1228, [9:9] +unusedBit_7_10 = bits, U32, 1228, [10:10] +unusedBit_7_11 = bits, U32, 1228, [11:11] +unusedBit_7_12 = bits, U32, 1228, [12:12] +unusedBit_7_13 = bits, U32, 1228, [13:13] +unusedBit_7_14 = bits, U32, 1228, [14:14] +unusedBit_7_15 = bits, U32, 1228, [15:15] +unusedBit_7_16 = bits, U32, 1228, [16:16] +unusedBit_7_17 = bits, U32, 1228, [17:17] +unusedBit_7_18 = bits, U32, 1228, [18:18] +unusedBit_7_19 = bits, U32, 1228, [19:19] +unusedBit_7_20 = bits, U32, 1228, [20:20] +unusedBit_7_21 = bits, U32, 1228, [21:21] +unusedBit_7_22 = bits, U32, 1228, [22:22] +unusedBit_7_23 = bits, U32, 1228, [23:23] +unusedBit_7_24 = bits, U32, 1228, [24:24] +unusedBit_7_25 = bits, U32, 1228, [25:25] +unusedBit_7_26 = bits, U32, 1228, [26:26] +unusedBit_7_27 = bits, U32, 1228, [27:27] +unusedBit_7_28 = bits, U32, 1228, [28:28] +unusedBit_7_29 = bits, U32, 1228, [29:29] +unusedBit_7_30 = bits, U32, 1228, [30:30] +unusedBit_7_31 = bits, U32, 1228, [31:31] +; total TS size = 1232 +faultCode = scalar, U08, 1232, "", 1, 0 +heaterDuty = scalar, U08, 1233, "%", 1, 0 +pumpDuty = scalar, U08, 1234, "%", 1, 0 +tempC = scalar, U16, 1236, "C", 1, 0 +nernstVoltage = scalar, U16, 1238, "V", 0.001, 0 +esr = scalar, U16, 1240, "", 1, 0 +; total TS size = 1244 time = { timeNow } @@ -4847,7 +4847,7 @@ entry = mapVvt_MAP_AT_SPECIAL_POINT, "mapVvt_MAP_AT_SPECIAL_POINT", float, "%.3 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 Phase2", int, "%d" +entry = currentEngineDecodedPhase, "Engine Phase2", float, "%.3f" entry = totalRevolutionCounter, "Crank revolution counter", int, "%d" entry = vvtSyncGapRatio, "vvtSyncGapRatio", float, "%.3f" entry = vvtCurrentPosition, "vvtCurrentPosition", float, "%.3f" diff --git a/firmware/tunerstudio/generated/rusefi_hellenNA6.ini b/firmware/tunerstudio/generated/rusefi_hellenNA6.ini index 15de725f09..35281d9ea2 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.01.hellenNA6.436973607" + signature = "rusEFI 2022.09.01.hellenNA6.493253694" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.09.01.hellenNA6.436973607" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.09.01.hellenNA6.493253694" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Sep 01 04:52:28 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Sep 01 05:33:19 UTC 2022 pageSize = 21300 page = 1 @@ -2118,7 +2118,7 @@ maxKnockRetardRpmBins = array, U08, 21294, [6], "RPM", 100.0, 0, 0, 25000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1240 + ochBlockSize = 1244 ; ; see TunerStudioOutputChannels struct @@ -3090,147 +3090,147 @@ mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1096, "", 1, 0 mapVvt_MAP_AT_DIFF = scalar, F32, 1100, "", 1, 0 mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1104, "", 1, 0 mapVvt_map_peak = scalar, U08, 1105, "", 1, 0 -currentEngineDecodedPhase = scalar, U16, 1106, "deg", 1, 0 -; total TS size = 1108 -totalRevolutionCounter = scalar, U32, 1108, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1112, "", 1, 0 -vvtCurrentPosition = scalar, F32, 1116, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1120, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 1124, "", 1, 0 -triggerStateIndex = scalar, U08, 1128, "", 1, 0 -vvtCounter = scalar, U08, 1129, "", 1, 0 -camResyncCounter = scalar, U08, 1130, "", 1, 0 -vvtStateIndex = scalar, U08, 1131, "", 1, 0 -; total TS size = 1132 -m_hasSynchronizedPhase = bits, U32, 1132, [0:0] -unusedBit_1_1 = bits, U32, 1132, [1:1] -unusedBit_1_2 = bits, U32, 1132, [2:2] -unusedBit_1_3 = bits, U32, 1132, [3:3] -unusedBit_1_4 = bits, U32, 1132, [4:4] -unusedBit_1_5 = bits, U32, 1132, [5:5] -unusedBit_1_6 = bits, U32, 1132, [6:6] -unusedBit_1_7 = bits, U32, 1132, [7:7] -unusedBit_1_8 = bits, U32, 1132, [8:8] -unusedBit_1_9 = bits, U32, 1132, [9:9] -unusedBit_1_10 = bits, U32, 1132, [10:10] -unusedBit_1_11 = bits, U32, 1132, [11:11] -unusedBit_1_12 = bits, U32, 1132, [12:12] -unusedBit_1_13 = bits, U32, 1132, [13:13] -unusedBit_1_14 = bits, U32, 1132, [14:14] -unusedBit_1_15 = bits, U32, 1132, [15:15] -unusedBit_1_16 = bits, U32, 1132, [16:16] -unusedBit_1_17 = bits, U32, 1132, [17:17] -unusedBit_1_18 = bits, U32, 1132, [18:18] -unusedBit_1_19 = bits, U32, 1132, [19:19] -unusedBit_1_20 = bits, U32, 1132, [20:20] -unusedBit_1_21 = bits, U32, 1132, [21:21] -unusedBit_1_22 = bits, U32, 1132, [22:22] -unusedBit_1_23 = bits, U32, 1132, [23:23] -unusedBit_1_24 = bits, U32, 1132, [24:24] -unusedBit_1_25 = bits, U32, 1132, [25:25] -unusedBit_1_26 = bits, U32, 1132, [26:26] -unusedBit_1_27 = bits, U32, 1132, [27:27] -unusedBit_1_28 = bits, U32, 1132, [28:28] -unusedBit_1_29 = bits, U32, 1132, [29:29] -unusedBit_1_30 = bits, U32, 1132, [30:30] -unusedBit_1_31 = bits, U32, 1132, [31:31] +currentEngineDecodedPhase = scalar, F32, 1108, "deg", 1, 0 +; total TS size = 1112 +totalRevolutionCounter = scalar, U32, 1112, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1116, "", 1, 0 +vvtCurrentPosition = scalar, F32, 1120, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1124, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 1128, "", 1, 0 +triggerStateIndex = scalar, U08, 1132, "", 1, 0 +vvtCounter = scalar, U08, 1133, "", 1, 0 +camResyncCounter = scalar, U08, 1134, "", 1, 0 +vvtStateIndex = scalar, U08, 1135, "", 1, 0 ; total TS size = 1136 -wallFuelCorrection = scalar, F32, 1136, "", 1, 0 -wallFuel = scalar, F32, 1140, "", 1, 0 -; total TS size = 1144 -idleState = bits, S32, 1144, [0:2], "not important" -currentIdlePosition = scalar, F32, 1148 -baseIdlePosition = scalar, F32, 1152 -iacByTpsTaper = scalar, F32, 1156 -throttlePedalUpState = scalar, S32, 1160, "", 1, 0 -mightResetPid = bits, U32, 1164, [0:0] -shouldResetPid = bits, U32, 1164, [1:1] -wasResetPid = bits, U32, 1164, [2:2] -mustResetPid = bits, U32, 1164, [3:3] -isCranking = bits, U32, 1164, [4:4] -useIacTableForCoasting = bits, U32, 1164, [5:5] -notIdling = bits, U32, 1164, [6:6] -needReset = bits, U32, 1164, [7:7] -isInDeadZone = bits, U32, 1164, [8:8] -isBlipping = bits, U32, 1164, [9:9] -useClosedLoop = bits, U32, 1164, [10:10] -badTps = bits, U32, 1164, [11:11] -looksLikeRunning = bits, U32, 1164, [12:12] -looksLikeCoasting = bits, U32, 1164, [13:13] -looksLikeCrankToIdle = bits, U32, 1164, [14:14] -isVerboseIAC = bits, U32, 1164, [15:15] -isIdleCoasting = bits, U32, 1164, [16:16] -unusedBit_22_17 = bits, U32, 1164, [17:17] -unusedBit_22_18 = bits, U32, 1164, [18:18] -unusedBit_22_19 = bits, U32, 1164, [19:19] -unusedBit_22_20 = bits, U32, 1164, [20:20] -unusedBit_22_21 = bits, U32, 1164, [21:21] -unusedBit_22_22 = bits, U32, 1164, [22:22] -unusedBit_22_23 = bits, U32, 1164, [23:23] -unusedBit_22_24 = bits, U32, 1164, [24:24] -unusedBit_22_25 = bits, U32, 1164, [25:25] -unusedBit_22_26 = bits, U32, 1164, [26:26] -unusedBit_22_27 = bits, U32, 1164, [27:27] -unusedBit_22_28 = bits, U32, 1164, [28:28] -unusedBit_22_29 = bits, U32, 1164, [29:29] -unusedBit_22_30 = bits, U32, 1164, [30:30] -unusedBit_22_31 = bits, U32, 1164, [31:31] -targetRpmByClt = scalar, S32, 1168, "", 1, 0 -targetRpmAcBump = scalar, S32, 1172, "", 1, 0 -iacByRpmTaper = scalar, F32, 1176 -luaAdd = scalar, F32, 1180 -; total TS size = 1184 -baseDwell = scalar, F32, 1184, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 1188, "", 1, 0 -luaTimingAdd = scalar, F32, 1192, "", 1, 0 -luaTimingMult = scalar, F32, 1196, "", 1, 0 -; total TS size = 1200 -idlePosition = scalar, F32, 1200, "", 1, 0 -trim = scalar, F32, 1204, "", 1, 0 -luaAdjustment = scalar, F32, 1208, "", 1, 0 -etbFeedForward = scalar, F32, 1212 -etbIntegralError = scalar, F32, 1216, "", 1, 0 -etbCurrentTarget = scalar, F32, 1220, "%", 1, 0 -etbRevLimitActive = bits, U32, 1224, [0:0] -unusedBit_7_1 = bits, U32, 1224, [1:1] -unusedBit_7_2 = bits, U32, 1224, [2:2] -unusedBit_7_3 = bits, U32, 1224, [3:3] -unusedBit_7_4 = bits, U32, 1224, [4:4] -unusedBit_7_5 = bits, U32, 1224, [5:5] -unusedBit_7_6 = bits, U32, 1224, [6:6] -unusedBit_7_7 = bits, U32, 1224, [7:7] -unusedBit_7_8 = bits, U32, 1224, [8:8] -unusedBit_7_9 = bits, U32, 1224, [9:9] -unusedBit_7_10 = bits, U32, 1224, [10:10] -unusedBit_7_11 = bits, U32, 1224, [11:11] -unusedBit_7_12 = bits, U32, 1224, [12:12] -unusedBit_7_13 = bits, U32, 1224, [13:13] -unusedBit_7_14 = bits, U32, 1224, [14:14] -unusedBit_7_15 = bits, U32, 1224, [15:15] -unusedBit_7_16 = bits, U32, 1224, [16:16] -unusedBit_7_17 = bits, U32, 1224, [17:17] -unusedBit_7_18 = bits, U32, 1224, [18:18] -unusedBit_7_19 = bits, U32, 1224, [19:19] -unusedBit_7_20 = bits, U32, 1224, [20:20] -unusedBit_7_21 = bits, U32, 1224, [21:21] -unusedBit_7_22 = bits, U32, 1224, [22:22] -unusedBit_7_23 = bits, U32, 1224, [23:23] -unusedBit_7_24 = bits, U32, 1224, [24:24] -unusedBit_7_25 = bits, U32, 1224, [25:25] -unusedBit_7_26 = bits, U32, 1224, [26:26] -unusedBit_7_27 = bits, U32, 1224, [27:27] -unusedBit_7_28 = bits, U32, 1224, [28:28] -unusedBit_7_29 = bits, U32, 1224, [29:29] -unusedBit_7_30 = bits, U32, 1224, [30:30] -unusedBit_7_31 = bits, U32, 1224, [31:31] -; total TS size = 1228 -faultCode = scalar, U08, 1228, "", 1, 0 -heaterDuty = scalar, U08, 1229, "%", 1, 0 -pumpDuty = scalar, U08, 1230, "%", 1, 0 -tempC = scalar, U16, 1232, "C", 1, 0 -nernstVoltage = scalar, U16, 1234, "V", 0.001, 0 -esr = scalar, U16, 1236, "", 1, 0 -; total TS size = 1240 +m_hasSynchronizedPhase = bits, U32, 1136, [0:0] +unusedBit_1_1 = bits, U32, 1136, [1:1] +unusedBit_1_2 = bits, U32, 1136, [2:2] +unusedBit_1_3 = bits, U32, 1136, [3:3] +unusedBit_1_4 = bits, U32, 1136, [4:4] +unusedBit_1_5 = bits, U32, 1136, [5:5] +unusedBit_1_6 = bits, U32, 1136, [6:6] +unusedBit_1_7 = bits, U32, 1136, [7:7] +unusedBit_1_8 = bits, U32, 1136, [8:8] +unusedBit_1_9 = bits, U32, 1136, [9:9] +unusedBit_1_10 = bits, U32, 1136, [10:10] +unusedBit_1_11 = bits, U32, 1136, [11:11] +unusedBit_1_12 = bits, U32, 1136, [12:12] +unusedBit_1_13 = bits, U32, 1136, [13:13] +unusedBit_1_14 = bits, U32, 1136, [14:14] +unusedBit_1_15 = bits, U32, 1136, [15:15] +unusedBit_1_16 = bits, U32, 1136, [16:16] +unusedBit_1_17 = bits, U32, 1136, [17:17] +unusedBit_1_18 = bits, U32, 1136, [18:18] +unusedBit_1_19 = bits, U32, 1136, [19:19] +unusedBit_1_20 = bits, U32, 1136, [20:20] +unusedBit_1_21 = bits, U32, 1136, [21:21] +unusedBit_1_22 = bits, U32, 1136, [22:22] +unusedBit_1_23 = bits, U32, 1136, [23:23] +unusedBit_1_24 = bits, U32, 1136, [24:24] +unusedBit_1_25 = bits, U32, 1136, [25:25] +unusedBit_1_26 = bits, U32, 1136, [26:26] +unusedBit_1_27 = bits, U32, 1136, [27:27] +unusedBit_1_28 = bits, U32, 1136, [28:28] +unusedBit_1_29 = bits, U32, 1136, [29:29] +unusedBit_1_30 = bits, U32, 1136, [30:30] +unusedBit_1_31 = bits, U32, 1136, [31:31] +; total TS size = 1140 +wallFuelCorrection = scalar, F32, 1140, "", 1, 0 +wallFuel = scalar, F32, 1144, "", 1, 0 +; total TS size = 1148 +idleState = bits, S32, 1148, [0:2], "not important" +currentIdlePosition = scalar, F32, 1152 +baseIdlePosition = scalar, F32, 1156 +iacByTpsTaper = scalar, F32, 1160 +throttlePedalUpState = scalar, S32, 1164, "", 1, 0 +mightResetPid = bits, U32, 1168, [0:0] +shouldResetPid = bits, U32, 1168, [1:1] +wasResetPid = bits, U32, 1168, [2:2] +mustResetPid = bits, U32, 1168, [3:3] +isCranking = bits, U32, 1168, [4:4] +useIacTableForCoasting = bits, U32, 1168, [5:5] +notIdling = bits, U32, 1168, [6:6] +needReset = bits, U32, 1168, [7:7] +isInDeadZone = bits, U32, 1168, [8:8] +isBlipping = bits, U32, 1168, [9:9] +useClosedLoop = bits, U32, 1168, [10:10] +badTps = bits, U32, 1168, [11:11] +looksLikeRunning = bits, U32, 1168, [12:12] +looksLikeCoasting = bits, U32, 1168, [13:13] +looksLikeCrankToIdle = bits, U32, 1168, [14:14] +isVerboseIAC = bits, U32, 1168, [15:15] +isIdleCoasting = bits, U32, 1168, [16:16] +unusedBit_22_17 = bits, U32, 1168, [17:17] +unusedBit_22_18 = bits, U32, 1168, [18:18] +unusedBit_22_19 = bits, U32, 1168, [19:19] +unusedBit_22_20 = bits, U32, 1168, [20:20] +unusedBit_22_21 = bits, U32, 1168, [21:21] +unusedBit_22_22 = bits, U32, 1168, [22:22] +unusedBit_22_23 = bits, U32, 1168, [23:23] +unusedBit_22_24 = bits, U32, 1168, [24:24] +unusedBit_22_25 = bits, U32, 1168, [25:25] +unusedBit_22_26 = bits, U32, 1168, [26:26] +unusedBit_22_27 = bits, U32, 1168, [27:27] +unusedBit_22_28 = bits, U32, 1168, [28:28] +unusedBit_22_29 = bits, U32, 1168, [29:29] +unusedBit_22_30 = bits, U32, 1168, [30:30] +unusedBit_22_31 = bits, U32, 1168, [31:31] +targetRpmByClt = scalar, S32, 1172, "", 1, 0 +targetRpmAcBump = scalar, S32, 1176, "", 1, 0 +iacByRpmTaper = scalar, F32, 1180 +luaAdd = scalar, F32, 1184 +; total TS size = 1188 +baseDwell = scalar, F32, 1188, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 1192, "", 1, 0 +luaTimingAdd = scalar, F32, 1196, "", 1, 0 +luaTimingMult = scalar, F32, 1200, "", 1, 0 +; total TS size = 1204 +idlePosition = scalar, F32, 1204, "", 1, 0 +trim = scalar, F32, 1208, "", 1, 0 +luaAdjustment = scalar, F32, 1212, "", 1, 0 +etbFeedForward = scalar, F32, 1216 +etbIntegralError = scalar, F32, 1220, "", 1, 0 +etbCurrentTarget = scalar, F32, 1224, "%", 1, 0 +etbRevLimitActive = bits, U32, 1228, [0:0] +unusedBit_7_1 = bits, U32, 1228, [1:1] +unusedBit_7_2 = bits, U32, 1228, [2:2] +unusedBit_7_3 = bits, U32, 1228, [3:3] +unusedBit_7_4 = bits, U32, 1228, [4:4] +unusedBit_7_5 = bits, U32, 1228, [5:5] +unusedBit_7_6 = bits, U32, 1228, [6:6] +unusedBit_7_7 = bits, U32, 1228, [7:7] +unusedBit_7_8 = bits, U32, 1228, [8:8] +unusedBit_7_9 = bits, U32, 1228, [9:9] +unusedBit_7_10 = bits, U32, 1228, [10:10] +unusedBit_7_11 = bits, U32, 1228, [11:11] +unusedBit_7_12 = bits, U32, 1228, [12:12] +unusedBit_7_13 = bits, U32, 1228, [13:13] +unusedBit_7_14 = bits, U32, 1228, [14:14] +unusedBit_7_15 = bits, U32, 1228, [15:15] +unusedBit_7_16 = bits, U32, 1228, [16:16] +unusedBit_7_17 = bits, U32, 1228, [17:17] +unusedBit_7_18 = bits, U32, 1228, [18:18] +unusedBit_7_19 = bits, U32, 1228, [19:19] +unusedBit_7_20 = bits, U32, 1228, [20:20] +unusedBit_7_21 = bits, U32, 1228, [21:21] +unusedBit_7_22 = bits, U32, 1228, [22:22] +unusedBit_7_23 = bits, U32, 1228, [23:23] +unusedBit_7_24 = bits, U32, 1228, [24:24] +unusedBit_7_25 = bits, U32, 1228, [25:25] +unusedBit_7_26 = bits, U32, 1228, [26:26] +unusedBit_7_27 = bits, U32, 1228, [27:27] +unusedBit_7_28 = bits, U32, 1228, [28:28] +unusedBit_7_29 = bits, U32, 1228, [29:29] +unusedBit_7_30 = bits, U32, 1228, [30:30] +unusedBit_7_31 = bits, U32, 1228, [31:31] +; total TS size = 1232 +faultCode = scalar, U08, 1232, "", 1, 0 +heaterDuty = scalar, U08, 1233, "%", 1, 0 +pumpDuty = scalar, U08, 1234, "%", 1, 0 +tempC = scalar, U16, 1236, "C", 1, 0 +nernstVoltage = scalar, U16, 1238, "V", 0.001, 0 +esr = scalar, U16, 1240, "", 1, 0 +; total TS size = 1244 time = { timeNow } @@ -4847,7 +4847,7 @@ entry = mapVvt_MAP_AT_SPECIAL_POINT, "mapVvt_MAP_AT_SPECIAL_POINT", float, "%.3 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 Phase2", int, "%d" +entry = currentEngineDecodedPhase, "Engine Phase2", float, "%.3f" entry = totalRevolutionCounter, "Crank revolution counter", int, "%d" entry = vvtSyncGapRatio, "vvtSyncGapRatio", float, "%.3f" entry = vvtCurrentPosition, "vvtCurrentPosition", float, "%.3f" diff --git a/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini b/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini index 2436e8dc06..1e45b5231e 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.01.hellenNA8_96.2146459469" + signature = "rusEFI 2022.09.01.hellenNA8_96.2023594836" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.09.01.hellenNA8_96.2146459469" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.09.01.hellenNA8_96.2023594836" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Sep 01 04:52:30 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Sep 01 05:33:20 UTC 2022 pageSize = 21300 page = 1 @@ -2118,7 +2118,7 @@ maxKnockRetardRpmBins = array, U08, 21294, [6], "RPM", 100.0, 0, 0, 25000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1240 + ochBlockSize = 1244 ; ; see TunerStudioOutputChannels struct @@ -3090,147 +3090,147 @@ mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1096, "", 1, 0 mapVvt_MAP_AT_DIFF = scalar, F32, 1100, "", 1, 0 mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1104, "", 1, 0 mapVvt_map_peak = scalar, U08, 1105, "", 1, 0 -currentEngineDecodedPhase = scalar, U16, 1106, "deg", 1, 0 -; total TS size = 1108 -totalRevolutionCounter = scalar, U32, 1108, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1112, "", 1, 0 -vvtCurrentPosition = scalar, F32, 1116, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1120, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 1124, "", 1, 0 -triggerStateIndex = scalar, U08, 1128, "", 1, 0 -vvtCounter = scalar, U08, 1129, "", 1, 0 -camResyncCounter = scalar, U08, 1130, "", 1, 0 -vvtStateIndex = scalar, U08, 1131, "", 1, 0 -; total TS size = 1132 -m_hasSynchronizedPhase = bits, U32, 1132, [0:0] -unusedBit_1_1 = bits, U32, 1132, [1:1] -unusedBit_1_2 = bits, U32, 1132, [2:2] -unusedBit_1_3 = bits, U32, 1132, [3:3] -unusedBit_1_4 = bits, U32, 1132, [4:4] -unusedBit_1_5 = bits, U32, 1132, [5:5] -unusedBit_1_6 = bits, U32, 1132, [6:6] -unusedBit_1_7 = bits, U32, 1132, [7:7] -unusedBit_1_8 = bits, U32, 1132, [8:8] -unusedBit_1_9 = bits, U32, 1132, [9:9] -unusedBit_1_10 = bits, U32, 1132, [10:10] -unusedBit_1_11 = bits, U32, 1132, [11:11] -unusedBit_1_12 = bits, U32, 1132, [12:12] -unusedBit_1_13 = bits, U32, 1132, [13:13] -unusedBit_1_14 = bits, U32, 1132, [14:14] -unusedBit_1_15 = bits, U32, 1132, [15:15] -unusedBit_1_16 = bits, U32, 1132, [16:16] -unusedBit_1_17 = bits, U32, 1132, [17:17] -unusedBit_1_18 = bits, U32, 1132, [18:18] -unusedBit_1_19 = bits, U32, 1132, [19:19] -unusedBit_1_20 = bits, U32, 1132, [20:20] -unusedBit_1_21 = bits, U32, 1132, [21:21] -unusedBit_1_22 = bits, U32, 1132, [22:22] -unusedBit_1_23 = bits, U32, 1132, [23:23] -unusedBit_1_24 = bits, U32, 1132, [24:24] -unusedBit_1_25 = bits, U32, 1132, [25:25] -unusedBit_1_26 = bits, U32, 1132, [26:26] -unusedBit_1_27 = bits, U32, 1132, [27:27] -unusedBit_1_28 = bits, U32, 1132, [28:28] -unusedBit_1_29 = bits, U32, 1132, [29:29] -unusedBit_1_30 = bits, U32, 1132, [30:30] -unusedBit_1_31 = bits, U32, 1132, [31:31] +currentEngineDecodedPhase = scalar, F32, 1108, "deg", 1, 0 +; total TS size = 1112 +totalRevolutionCounter = scalar, U32, 1112, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1116, "", 1, 0 +vvtCurrentPosition = scalar, F32, 1120, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1124, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 1128, "", 1, 0 +triggerStateIndex = scalar, U08, 1132, "", 1, 0 +vvtCounter = scalar, U08, 1133, "", 1, 0 +camResyncCounter = scalar, U08, 1134, "", 1, 0 +vvtStateIndex = scalar, U08, 1135, "", 1, 0 ; total TS size = 1136 -wallFuelCorrection = scalar, F32, 1136, "", 1, 0 -wallFuel = scalar, F32, 1140, "", 1, 0 -; total TS size = 1144 -idleState = bits, S32, 1144, [0:2], "not important" -currentIdlePosition = scalar, F32, 1148 -baseIdlePosition = scalar, F32, 1152 -iacByTpsTaper = scalar, F32, 1156 -throttlePedalUpState = scalar, S32, 1160, "", 1, 0 -mightResetPid = bits, U32, 1164, [0:0] -shouldResetPid = bits, U32, 1164, [1:1] -wasResetPid = bits, U32, 1164, [2:2] -mustResetPid = bits, U32, 1164, [3:3] -isCranking = bits, U32, 1164, [4:4] -useIacTableForCoasting = bits, U32, 1164, [5:5] -notIdling = bits, U32, 1164, [6:6] -needReset = bits, U32, 1164, [7:7] -isInDeadZone = bits, U32, 1164, [8:8] -isBlipping = bits, U32, 1164, [9:9] -useClosedLoop = bits, U32, 1164, [10:10] -badTps = bits, U32, 1164, [11:11] -looksLikeRunning = bits, U32, 1164, [12:12] -looksLikeCoasting = bits, U32, 1164, [13:13] -looksLikeCrankToIdle = bits, U32, 1164, [14:14] -isVerboseIAC = bits, U32, 1164, [15:15] -isIdleCoasting = bits, U32, 1164, [16:16] -unusedBit_22_17 = bits, U32, 1164, [17:17] -unusedBit_22_18 = bits, U32, 1164, [18:18] -unusedBit_22_19 = bits, U32, 1164, [19:19] -unusedBit_22_20 = bits, U32, 1164, [20:20] -unusedBit_22_21 = bits, U32, 1164, [21:21] -unusedBit_22_22 = bits, U32, 1164, [22:22] -unusedBit_22_23 = bits, U32, 1164, [23:23] -unusedBit_22_24 = bits, U32, 1164, [24:24] -unusedBit_22_25 = bits, U32, 1164, [25:25] -unusedBit_22_26 = bits, U32, 1164, [26:26] -unusedBit_22_27 = bits, U32, 1164, [27:27] -unusedBit_22_28 = bits, U32, 1164, [28:28] -unusedBit_22_29 = bits, U32, 1164, [29:29] -unusedBit_22_30 = bits, U32, 1164, [30:30] -unusedBit_22_31 = bits, U32, 1164, [31:31] -targetRpmByClt = scalar, S32, 1168, "", 1, 0 -targetRpmAcBump = scalar, S32, 1172, "", 1, 0 -iacByRpmTaper = scalar, F32, 1176 -luaAdd = scalar, F32, 1180 -; total TS size = 1184 -baseDwell = scalar, F32, 1184, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 1188, "", 1, 0 -luaTimingAdd = scalar, F32, 1192, "", 1, 0 -luaTimingMult = scalar, F32, 1196, "", 1, 0 -; total TS size = 1200 -idlePosition = scalar, F32, 1200, "", 1, 0 -trim = scalar, F32, 1204, "", 1, 0 -luaAdjustment = scalar, F32, 1208, "", 1, 0 -etbFeedForward = scalar, F32, 1212 -etbIntegralError = scalar, F32, 1216, "", 1, 0 -etbCurrentTarget = scalar, F32, 1220, "%", 1, 0 -etbRevLimitActive = bits, U32, 1224, [0:0] -unusedBit_7_1 = bits, U32, 1224, [1:1] -unusedBit_7_2 = bits, U32, 1224, [2:2] -unusedBit_7_3 = bits, U32, 1224, [3:3] -unusedBit_7_4 = bits, U32, 1224, [4:4] -unusedBit_7_5 = bits, U32, 1224, [5:5] -unusedBit_7_6 = bits, U32, 1224, [6:6] -unusedBit_7_7 = bits, U32, 1224, [7:7] -unusedBit_7_8 = bits, U32, 1224, [8:8] -unusedBit_7_9 = bits, U32, 1224, [9:9] -unusedBit_7_10 = bits, U32, 1224, [10:10] -unusedBit_7_11 = bits, U32, 1224, [11:11] -unusedBit_7_12 = bits, U32, 1224, [12:12] -unusedBit_7_13 = bits, U32, 1224, [13:13] -unusedBit_7_14 = bits, U32, 1224, [14:14] -unusedBit_7_15 = bits, U32, 1224, [15:15] -unusedBit_7_16 = bits, U32, 1224, [16:16] -unusedBit_7_17 = bits, U32, 1224, [17:17] -unusedBit_7_18 = bits, U32, 1224, [18:18] -unusedBit_7_19 = bits, U32, 1224, [19:19] -unusedBit_7_20 = bits, U32, 1224, [20:20] -unusedBit_7_21 = bits, U32, 1224, [21:21] -unusedBit_7_22 = bits, U32, 1224, [22:22] -unusedBit_7_23 = bits, U32, 1224, [23:23] -unusedBit_7_24 = bits, U32, 1224, [24:24] -unusedBit_7_25 = bits, U32, 1224, [25:25] -unusedBit_7_26 = bits, U32, 1224, [26:26] -unusedBit_7_27 = bits, U32, 1224, [27:27] -unusedBit_7_28 = bits, U32, 1224, [28:28] -unusedBit_7_29 = bits, U32, 1224, [29:29] -unusedBit_7_30 = bits, U32, 1224, [30:30] -unusedBit_7_31 = bits, U32, 1224, [31:31] -; total TS size = 1228 -faultCode = scalar, U08, 1228, "", 1, 0 -heaterDuty = scalar, U08, 1229, "%", 1, 0 -pumpDuty = scalar, U08, 1230, "%", 1, 0 -tempC = scalar, U16, 1232, "C", 1, 0 -nernstVoltage = scalar, U16, 1234, "V", 0.001, 0 -esr = scalar, U16, 1236, "", 1, 0 -; total TS size = 1240 +m_hasSynchronizedPhase = bits, U32, 1136, [0:0] +unusedBit_1_1 = bits, U32, 1136, [1:1] +unusedBit_1_2 = bits, U32, 1136, [2:2] +unusedBit_1_3 = bits, U32, 1136, [3:3] +unusedBit_1_4 = bits, U32, 1136, [4:4] +unusedBit_1_5 = bits, U32, 1136, [5:5] +unusedBit_1_6 = bits, U32, 1136, [6:6] +unusedBit_1_7 = bits, U32, 1136, [7:7] +unusedBit_1_8 = bits, U32, 1136, [8:8] +unusedBit_1_9 = bits, U32, 1136, [9:9] +unusedBit_1_10 = bits, U32, 1136, [10:10] +unusedBit_1_11 = bits, U32, 1136, [11:11] +unusedBit_1_12 = bits, U32, 1136, [12:12] +unusedBit_1_13 = bits, U32, 1136, [13:13] +unusedBit_1_14 = bits, U32, 1136, [14:14] +unusedBit_1_15 = bits, U32, 1136, [15:15] +unusedBit_1_16 = bits, U32, 1136, [16:16] +unusedBit_1_17 = bits, U32, 1136, [17:17] +unusedBit_1_18 = bits, U32, 1136, [18:18] +unusedBit_1_19 = bits, U32, 1136, [19:19] +unusedBit_1_20 = bits, U32, 1136, [20:20] +unusedBit_1_21 = bits, U32, 1136, [21:21] +unusedBit_1_22 = bits, U32, 1136, [22:22] +unusedBit_1_23 = bits, U32, 1136, [23:23] +unusedBit_1_24 = bits, U32, 1136, [24:24] +unusedBit_1_25 = bits, U32, 1136, [25:25] +unusedBit_1_26 = bits, U32, 1136, [26:26] +unusedBit_1_27 = bits, U32, 1136, [27:27] +unusedBit_1_28 = bits, U32, 1136, [28:28] +unusedBit_1_29 = bits, U32, 1136, [29:29] +unusedBit_1_30 = bits, U32, 1136, [30:30] +unusedBit_1_31 = bits, U32, 1136, [31:31] +; total TS size = 1140 +wallFuelCorrection = scalar, F32, 1140, "", 1, 0 +wallFuel = scalar, F32, 1144, "", 1, 0 +; total TS size = 1148 +idleState = bits, S32, 1148, [0:2], "not important" +currentIdlePosition = scalar, F32, 1152 +baseIdlePosition = scalar, F32, 1156 +iacByTpsTaper = scalar, F32, 1160 +throttlePedalUpState = scalar, S32, 1164, "", 1, 0 +mightResetPid = bits, U32, 1168, [0:0] +shouldResetPid = bits, U32, 1168, [1:1] +wasResetPid = bits, U32, 1168, [2:2] +mustResetPid = bits, U32, 1168, [3:3] +isCranking = bits, U32, 1168, [4:4] +useIacTableForCoasting = bits, U32, 1168, [5:5] +notIdling = bits, U32, 1168, [6:6] +needReset = bits, U32, 1168, [7:7] +isInDeadZone = bits, U32, 1168, [8:8] +isBlipping = bits, U32, 1168, [9:9] +useClosedLoop = bits, U32, 1168, [10:10] +badTps = bits, U32, 1168, [11:11] +looksLikeRunning = bits, U32, 1168, [12:12] +looksLikeCoasting = bits, U32, 1168, [13:13] +looksLikeCrankToIdle = bits, U32, 1168, [14:14] +isVerboseIAC = bits, U32, 1168, [15:15] +isIdleCoasting = bits, U32, 1168, [16:16] +unusedBit_22_17 = bits, U32, 1168, [17:17] +unusedBit_22_18 = bits, U32, 1168, [18:18] +unusedBit_22_19 = bits, U32, 1168, [19:19] +unusedBit_22_20 = bits, U32, 1168, [20:20] +unusedBit_22_21 = bits, U32, 1168, [21:21] +unusedBit_22_22 = bits, U32, 1168, [22:22] +unusedBit_22_23 = bits, U32, 1168, [23:23] +unusedBit_22_24 = bits, U32, 1168, [24:24] +unusedBit_22_25 = bits, U32, 1168, [25:25] +unusedBit_22_26 = bits, U32, 1168, [26:26] +unusedBit_22_27 = bits, U32, 1168, [27:27] +unusedBit_22_28 = bits, U32, 1168, [28:28] +unusedBit_22_29 = bits, U32, 1168, [29:29] +unusedBit_22_30 = bits, U32, 1168, [30:30] +unusedBit_22_31 = bits, U32, 1168, [31:31] +targetRpmByClt = scalar, S32, 1172, "", 1, 0 +targetRpmAcBump = scalar, S32, 1176, "", 1, 0 +iacByRpmTaper = scalar, F32, 1180 +luaAdd = scalar, F32, 1184 +; total TS size = 1188 +baseDwell = scalar, F32, 1188, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 1192, "", 1, 0 +luaTimingAdd = scalar, F32, 1196, "", 1, 0 +luaTimingMult = scalar, F32, 1200, "", 1, 0 +; total TS size = 1204 +idlePosition = scalar, F32, 1204, "", 1, 0 +trim = scalar, F32, 1208, "", 1, 0 +luaAdjustment = scalar, F32, 1212, "", 1, 0 +etbFeedForward = scalar, F32, 1216 +etbIntegralError = scalar, F32, 1220, "", 1, 0 +etbCurrentTarget = scalar, F32, 1224, "%", 1, 0 +etbRevLimitActive = bits, U32, 1228, [0:0] +unusedBit_7_1 = bits, U32, 1228, [1:1] +unusedBit_7_2 = bits, U32, 1228, [2:2] +unusedBit_7_3 = bits, U32, 1228, [3:3] +unusedBit_7_4 = bits, U32, 1228, [4:4] +unusedBit_7_5 = bits, U32, 1228, [5:5] +unusedBit_7_6 = bits, U32, 1228, [6:6] +unusedBit_7_7 = bits, U32, 1228, [7:7] +unusedBit_7_8 = bits, U32, 1228, [8:8] +unusedBit_7_9 = bits, U32, 1228, [9:9] +unusedBit_7_10 = bits, U32, 1228, [10:10] +unusedBit_7_11 = bits, U32, 1228, [11:11] +unusedBit_7_12 = bits, U32, 1228, [12:12] +unusedBit_7_13 = bits, U32, 1228, [13:13] +unusedBit_7_14 = bits, U32, 1228, [14:14] +unusedBit_7_15 = bits, U32, 1228, [15:15] +unusedBit_7_16 = bits, U32, 1228, [16:16] +unusedBit_7_17 = bits, U32, 1228, [17:17] +unusedBit_7_18 = bits, U32, 1228, [18:18] +unusedBit_7_19 = bits, U32, 1228, [19:19] +unusedBit_7_20 = bits, U32, 1228, [20:20] +unusedBit_7_21 = bits, U32, 1228, [21:21] +unusedBit_7_22 = bits, U32, 1228, [22:22] +unusedBit_7_23 = bits, U32, 1228, [23:23] +unusedBit_7_24 = bits, U32, 1228, [24:24] +unusedBit_7_25 = bits, U32, 1228, [25:25] +unusedBit_7_26 = bits, U32, 1228, [26:26] +unusedBit_7_27 = bits, U32, 1228, [27:27] +unusedBit_7_28 = bits, U32, 1228, [28:28] +unusedBit_7_29 = bits, U32, 1228, [29:29] +unusedBit_7_30 = bits, U32, 1228, [30:30] +unusedBit_7_31 = bits, U32, 1228, [31:31] +; total TS size = 1232 +faultCode = scalar, U08, 1232, "", 1, 0 +heaterDuty = scalar, U08, 1233, "%", 1, 0 +pumpDuty = scalar, U08, 1234, "%", 1, 0 +tempC = scalar, U16, 1236, "C", 1, 0 +nernstVoltage = scalar, U16, 1238, "V", 0.001, 0 +esr = scalar, U16, 1240, "", 1, 0 +; total TS size = 1244 time = { timeNow } @@ -4847,7 +4847,7 @@ entry = mapVvt_MAP_AT_SPECIAL_POINT, "mapVvt_MAP_AT_SPECIAL_POINT", float, "%.3 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 Phase2", int, "%d" +entry = currentEngineDecodedPhase, "Engine Phase2", float, "%.3f" entry = totalRevolutionCounter, "Crank revolution counter", int, "%d" entry = vvtSyncGapRatio, "vvtSyncGapRatio", float, "%.3f" entry = vvtCurrentPosition, "vvtCurrentPosition", float, "%.3f" diff --git a/firmware/tunerstudio/generated/rusefi_kin.ini b/firmware/tunerstudio/generated/rusefi_kin.ini index 4b235d477d..2114706fc2 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.01.kin.3073264745" + signature = "rusEFI 2022.09.01.kin.2957215856" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.09.01.kin.3073264745" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.09.01.kin.2957215856" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Thu Sep 01 04:52:04 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Thu Sep 01 05:32:55 UTC 2022 pageSize = 21300 page = 1 @@ -2118,7 +2118,7 @@ maxKnockRetardRpmBins = array, U08, 21294, [6], "RPM", 100.0, 0, 0, 25000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1240 + ochBlockSize = 1244 ; ; see TunerStudioOutputChannels struct @@ -3090,147 +3090,147 @@ mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1096, "", 1, 0 mapVvt_MAP_AT_DIFF = scalar, F32, 1100, "", 1, 0 mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1104, "", 1, 0 mapVvt_map_peak = scalar, U08, 1105, "", 1, 0 -currentEngineDecodedPhase = scalar, U16, 1106, "deg", 1, 0 -; total TS size = 1108 -totalRevolutionCounter = scalar, U32, 1108, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1112, "", 1, 0 -vvtCurrentPosition = scalar, F32, 1116, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1120, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 1124, "", 1, 0 -triggerStateIndex = scalar, U08, 1128, "", 1, 0 -vvtCounter = scalar, U08, 1129, "", 1, 0 -camResyncCounter = scalar, U08, 1130, "", 1, 0 -vvtStateIndex = scalar, U08, 1131, "", 1, 0 -; total TS size = 1132 -m_hasSynchronizedPhase = bits, U32, 1132, [0:0] -unusedBit_1_1 = bits, U32, 1132, [1:1] -unusedBit_1_2 = bits, U32, 1132, [2:2] -unusedBit_1_3 = bits, U32, 1132, [3:3] -unusedBit_1_4 = bits, U32, 1132, [4:4] -unusedBit_1_5 = bits, U32, 1132, [5:5] -unusedBit_1_6 = bits, U32, 1132, [6:6] -unusedBit_1_7 = bits, U32, 1132, [7:7] -unusedBit_1_8 = bits, U32, 1132, [8:8] -unusedBit_1_9 = bits, U32, 1132, [9:9] -unusedBit_1_10 = bits, U32, 1132, [10:10] -unusedBit_1_11 = bits, U32, 1132, [11:11] -unusedBit_1_12 = bits, U32, 1132, [12:12] -unusedBit_1_13 = bits, U32, 1132, [13:13] -unusedBit_1_14 = bits, U32, 1132, [14:14] -unusedBit_1_15 = bits, U32, 1132, [15:15] -unusedBit_1_16 = bits, U32, 1132, [16:16] -unusedBit_1_17 = bits, U32, 1132, [17:17] -unusedBit_1_18 = bits, U32, 1132, [18:18] -unusedBit_1_19 = bits, U32, 1132, [19:19] -unusedBit_1_20 = bits, U32, 1132, [20:20] -unusedBit_1_21 = bits, U32, 1132, [21:21] -unusedBit_1_22 = bits, U32, 1132, [22:22] -unusedBit_1_23 = bits, U32, 1132, [23:23] -unusedBit_1_24 = bits, U32, 1132, [24:24] -unusedBit_1_25 = bits, U32, 1132, [25:25] -unusedBit_1_26 = bits, U32, 1132, [26:26] -unusedBit_1_27 = bits, U32, 1132, [27:27] -unusedBit_1_28 = bits, U32, 1132, [28:28] -unusedBit_1_29 = bits, U32, 1132, [29:29] -unusedBit_1_30 = bits, U32, 1132, [30:30] -unusedBit_1_31 = bits, U32, 1132, [31:31] +currentEngineDecodedPhase = scalar, F32, 1108, "deg", 1, 0 +; total TS size = 1112 +totalRevolutionCounter = scalar, U32, 1112, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1116, "", 1, 0 +vvtCurrentPosition = scalar, F32, 1120, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1124, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 1128, "", 1, 0 +triggerStateIndex = scalar, U08, 1132, "", 1, 0 +vvtCounter = scalar, U08, 1133, "", 1, 0 +camResyncCounter = scalar, U08, 1134, "", 1, 0 +vvtStateIndex = scalar, U08, 1135, "", 1, 0 ; total TS size = 1136 -wallFuelCorrection = scalar, F32, 1136, "", 1, 0 -wallFuel = scalar, F32, 1140, "", 1, 0 -; total TS size = 1144 -idleState = bits, S32, 1144, [0:2], "not important" -currentIdlePosition = scalar, F32, 1148 -baseIdlePosition = scalar, F32, 1152 -iacByTpsTaper = scalar, F32, 1156 -throttlePedalUpState = scalar, S32, 1160, "", 1, 0 -mightResetPid = bits, U32, 1164, [0:0] -shouldResetPid = bits, U32, 1164, [1:1] -wasResetPid = bits, U32, 1164, [2:2] -mustResetPid = bits, U32, 1164, [3:3] -isCranking = bits, U32, 1164, [4:4] -useIacTableForCoasting = bits, U32, 1164, [5:5] -notIdling = bits, U32, 1164, [6:6] -needReset = bits, U32, 1164, [7:7] -isInDeadZone = bits, U32, 1164, [8:8] -isBlipping = bits, U32, 1164, [9:9] -useClosedLoop = bits, U32, 1164, [10:10] -badTps = bits, U32, 1164, [11:11] -looksLikeRunning = bits, U32, 1164, [12:12] -looksLikeCoasting = bits, U32, 1164, [13:13] -looksLikeCrankToIdle = bits, U32, 1164, [14:14] -isVerboseIAC = bits, U32, 1164, [15:15] -isIdleCoasting = bits, U32, 1164, [16:16] -unusedBit_22_17 = bits, U32, 1164, [17:17] -unusedBit_22_18 = bits, U32, 1164, [18:18] -unusedBit_22_19 = bits, U32, 1164, [19:19] -unusedBit_22_20 = bits, U32, 1164, [20:20] -unusedBit_22_21 = bits, U32, 1164, [21:21] -unusedBit_22_22 = bits, U32, 1164, [22:22] -unusedBit_22_23 = bits, U32, 1164, [23:23] -unusedBit_22_24 = bits, U32, 1164, [24:24] -unusedBit_22_25 = bits, U32, 1164, [25:25] -unusedBit_22_26 = bits, U32, 1164, [26:26] -unusedBit_22_27 = bits, U32, 1164, [27:27] -unusedBit_22_28 = bits, U32, 1164, [28:28] -unusedBit_22_29 = bits, U32, 1164, [29:29] -unusedBit_22_30 = bits, U32, 1164, [30:30] -unusedBit_22_31 = bits, U32, 1164, [31:31] -targetRpmByClt = scalar, S32, 1168, "", 1, 0 -targetRpmAcBump = scalar, S32, 1172, "", 1, 0 -iacByRpmTaper = scalar, F32, 1176 -luaAdd = scalar, F32, 1180 -; total TS size = 1184 -baseDwell = scalar, F32, 1184, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 1188, "", 1, 0 -luaTimingAdd = scalar, F32, 1192, "", 1, 0 -luaTimingMult = scalar, F32, 1196, "", 1, 0 -; total TS size = 1200 -idlePosition = scalar, F32, 1200, "", 1, 0 -trim = scalar, F32, 1204, "", 1, 0 -luaAdjustment = scalar, F32, 1208, "", 1, 0 -etbFeedForward = scalar, F32, 1212 -etbIntegralError = scalar, F32, 1216, "", 1, 0 -etbCurrentTarget = scalar, F32, 1220, "%", 1, 0 -etbRevLimitActive = bits, U32, 1224, [0:0] -unusedBit_7_1 = bits, U32, 1224, [1:1] -unusedBit_7_2 = bits, U32, 1224, [2:2] -unusedBit_7_3 = bits, U32, 1224, [3:3] -unusedBit_7_4 = bits, U32, 1224, [4:4] -unusedBit_7_5 = bits, U32, 1224, [5:5] -unusedBit_7_6 = bits, U32, 1224, [6:6] -unusedBit_7_7 = bits, U32, 1224, [7:7] -unusedBit_7_8 = bits, U32, 1224, [8:8] -unusedBit_7_9 = bits, U32, 1224, [9:9] -unusedBit_7_10 = bits, U32, 1224, [10:10] -unusedBit_7_11 = bits, U32, 1224, [11:11] -unusedBit_7_12 = bits, U32, 1224, [12:12] -unusedBit_7_13 = bits, U32, 1224, [13:13] -unusedBit_7_14 = bits, U32, 1224, [14:14] -unusedBit_7_15 = bits, U32, 1224, [15:15] -unusedBit_7_16 = bits, U32, 1224, [16:16] -unusedBit_7_17 = bits, U32, 1224, [17:17] -unusedBit_7_18 = bits, U32, 1224, [18:18] -unusedBit_7_19 = bits, U32, 1224, [19:19] -unusedBit_7_20 = bits, U32, 1224, [20:20] -unusedBit_7_21 = bits, U32, 1224, [21:21] -unusedBit_7_22 = bits, U32, 1224, [22:22] -unusedBit_7_23 = bits, U32, 1224, [23:23] -unusedBit_7_24 = bits, U32, 1224, [24:24] -unusedBit_7_25 = bits, U32, 1224, [25:25] -unusedBit_7_26 = bits, U32, 1224, [26:26] -unusedBit_7_27 = bits, U32, 1224, [27:27] -unusedBit_7_28 = bits, U32, 1224, [28:28] -unusedBit_7_29 = bits, U32, 1224, [29:29] -unusedBit_7_30 = bits, U32, 1224, [30:30] -unusedBit_7_31 = bits, U32, 1224, [31:31] -; total TS size = 1228 -faultCode = scalar, U08, 1228, "", 1, 0 -heaterDuty = scalar, U08, 1229, "%", 1, 0 -pumpDuty = scalar, U08, 1230, "%", 1, 0 -tempC = scalar, U16, 1232, "C", 1, 0 -nernstVoltage = scalar, U16, 1234, "V", 0.001, 0 -esr = scalar, U16, 1236, "", 1, 0 -; total TS size = 1240 +m_hasSynchronizedPhase = bits, U32, 1136, [0:0] +unusedBit_1_1 = bits, U32, 1136, [1:1] +unusedBit_1_2 = bits, U32, 1136, [2:2] +unusedBit_1_3 = bits, U32, 1136, [3:3] +unusedBit_1_4 = bits, U32, 1136, [4:4] +unusedBit_1_5 = bits, U32, 1136, [5:5] +unusedBit_1_6 = bits, U32, 1136, [6:6] +unusedBit_1_7 = bits, U32, 1136, [7:7] +unusedBit_1_8 = bits, U32, 1136, [8:8] +unusedBit_1_9 = bits, U32, 1136, [9:9] +unusedBit_1_10 = bits, U32, 1136, [10:10] +unusedBit_1_11 = bits, U32, 1136, [11:11] +unusedBit_1_12 = bits, U32, 1136, [12:12] +unusedBit_1_13 = bits, U32, 1136, [13:13] +unusedBit_1_14 = bits, U32, 1136, [14:14] +unusedBit_1_15 = bits, U32, 1136, [15:15] +unusedBit_1_16 = bits, U32, 1136, [16:16] +unusedBit_1_17 = bits, U32, 1136, [17:17] +unusedBit_1_18 = bits, U32, 1136, [18:18] +unusedBit_1_19 = bits, U32, 1136, [19:19] +unusedBit_1_20 = bits, U32, 1136, [20:20] +unusedBit_1_21 = bits, U32, 1136, [21:21] +unusedBit_1_22 = bits, U32, 1136, [22:22] +unusedBit_1_23 = bits, U32, 1136, [23:23] +unusedBit_1_24 = bits, U32, 1136, [24:24] +unusedBit_1_25 = bits, U32, 1136, [25:25] +unusedBit_1_26 = bits, U32, 1136, [26:26] +unusedBit_1_27 = bits, U32, 1136, [27:27] +unusedBit_1_28 = bits, U32, 1136, [28:28] +unusedBit_1_29 = bits, U32, 1136, [29:29] +unusedBit_1_30 = bits, U32, 1136, [30:30] +unusedBit_1_31 = bits, U32, 1136, [31:31] +; total TS size = 1140 +wallFuelCorrection = scalar, F32, 1140, "", 1, 0 +wallFuel = scalar, F32, 1144, "", 1, 0 +; total TS size = 1148 +idleState = bits, S32, 1148, [0:2], "not important" +currentIdlePosition = scalar, F32, 1152 +baseIdlePosition = scalar, F32, 1156 +iacByTpsTaper = scalar, F32, 1160 +throttlePedalUpState = scalar, S32, 1164, "", 1, 0 +mightResetPid = bits, U32, 1168, [0:0] +shouldResetPid = bits, U32, 1168, [1:1] +wasResetPid = bits, U32, 1168, [2:2] +mustResetPid = bits, U32, 1168, [3:3] +isCranking = bits, U32, 1168, [4:4] +useIacTableForCoasting = bits, U32, 1168, [5:5] +notIdling = bits, U32, 1168, [6:6] +needReset = bits, U32, 1168, [7:7] +isInDeadZone = bits, U32, 1168, [8:8] +isBlipping = bits, U32, 1168, [9:9] +useClosedLoop = bits, U32, 1168, [10:10] +badTps = bits, U32, 1168, [11:11] +looksLikeRunning = bits, U32, 1168, [12:12] +looksLikeCoasting = bits, U32, 1168, [13:13] +looksLikeCrankToIdle = bits, U32, 1168, [14:14] +isVerboseIAC = bits, U32, 1168, [15:15] +isIdleCoasting = bits, U32, 1168, [16:16] +unusedBit_22_17 = bits, U32, 1168, [17:17] +unusedBit_22_18 = bits, U32, 1168, [18:18] +unusedBit_22_19 = bits, U32, 1168, [19:19] +unusedBit_22_20 = bits, U32, 1168, [20:20] +unusedBit_22_21 = bits, U32, 1168, [21:21] +unusedBit_22_22 = bits, U32, 1168, [22:22] +unusedBit_22_23 = bits, U32, 1168, [23:23] +unusedBit_22_24 = bits, U32, 1168, [24:24] +unusedBit_22_25 = bits, U32, 1168, [25:25] +unusedBit_22_26 = bits, U32, 1168, [26:26] +unusedBit_22_27 = bits, U32, 1168, [27:27] +unusedBit_22_28 = bits, U32, 1168, [28:28] +unusedBit_22_29 = bits, U32, 1168, [29:29] +unusedBit_22_30 = bits, U32, 1168, [30:30] +unusedBit_22_31 = bits, U32, 1168, [31:31] +targetRpmByClt = scalar, S32, 1172, "", 1, 0 +targetRpmAcBump = scalar, S32, 1176, "", 1, 0 +iacByRpmTaper = scalar, F32, 1180 +luaAdd = scalar, F32, 1184 +; total TS size = 1188 +baseDwell = scalar, F32, 1188, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 1192, "", 1, 0 +luaTimingAdd = scalar, F32, 1196, "", 1, 0 +luaTimingMult = scalar, F32, 1200, "", 1, 0 +; total TS size = 1204 +idlePosition = scalar, F32, 1204, "", 1, 0 +trim = scalar, F32, 1208, "", 1, 0 +luaAdjustment = scalar, F32, 1212, "", 1, 0 +etbFeedForward = scalar, F32, 1216 +etbIntegralError = scalar, F32, 1220, "", 1, 0 +etbCurrentTarget = scalar, F32, 1224, "%", 1, 0 +etbRevLimitActive = bits, U32, 1228, [0:0] +unusedBit_7_1 = bits, U32, 1228, [1:1] +unusedBit_7_2 = bits, U32, 1228, [2:2] +unusedBit_7_3 = bits, U32, 1228, [3:3] +unusedBit_7_4 = bits, U32, 1228, [4:4] +unusedBit_7_5 = bits, U32, 1228, [5:5] +unusedBit_7_6 = bits, U32, 1228, [6:6] +unusedBit_7_7 = bits, U32, 1228, [7:7] +unusedBit_7_8 = bits, U32, 1228, [8:8] +unusedBit_7_9 = bits, U32, 1228, [9:9] +unusedBit_7_10 = bits, U32, 1228, [10:10] +unusedBit_7_11 = bits, U32, 1228, [11:11] +unusedBit_7_12 = bits, U32, 1228, [12:12] +unusedBit_7_13 = bits, U32, 1228, [13:13] +unusedBit_7_14 = bits, U32, 1228, [14:14] +unusedBit_7_15 = bits, U32, 1228, [15:15] +unusedBit_7_16 = bits, U32, 1228, [16:16] +unusedBit_7_17 = bits, U32, 1228, [17:17] +unusedBit_7_18 = bits, U32, 1228, [18:18] +unusedBit_7_19 = bits, U32, 1228, [19:19] +unusedBit_7_20 = bits, U32, 1228, [20:20] +unusedBit_7_21 = bits, U32, 1228, [21:21] +unusedBit_7_22 = bits, U32, 1228, [22:22] +unusedBit_7_23 = bits, U32, 1228, [23:23] +unusedBit_7_24 = bits, U32, 1228, [24:24] +unusedBit_7_25 = bits, U32, 1228, [25:25] +unusedBit_7_26 = bits, U32, 1228, [26:26] +unusedBit_7_27 = bits, U32, 1228, [27:27] +unusedBit_7_28 = bits, U32, 1228, [28:28] +unusedBit_7_29 = bits, U32, 1228, [29:29] +unusedBit_7_30 = bits, U32, 1228, [30:30] +unusedBit_7_31 = bits, U32, 1228, [31:31] +; total TS size = 1232 +faultCode = scalar, U08, 1232, "", 1, 0 +heaterDuty = scalar, U08, 1233, "%", 1, 0 +pumpDuty = scalar, U08, 1234, "%", 1, 0 +tempC = scalar, U16, 1236, "C", 1, 0 +nernstVoltage = scalar, U16, 1238, "V", 0.001, 0 +esr = scalar, U16, 1240, "", 1, 0 +; total TS size = 1244 time = { timeNow } @@ -4847,7 +4847,7 @@ entry = mapVvt_MAP_AT_SPECIAL_POINT, "mapVvt_MAP_AT_SPECIAL_POINT", float, "%.3 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 Phase2", int, "%d" +entry = currentEngineDecodedPhase, "Engine Phase2", float, "%.3f" entry = totalRevolutionCounter, "Crank revolution counter", int, "%d" entry = vvtSyncGapRatio, "vvtSyncGapRatio", float, "%.3f" entry = vvtCurrentPosition, "vvtCurrentPosition", float, "%.3f" diff --git a/firmware/tunerstudio/generated/rusefi_mre_f4.ini b/firmware/tunerstudio/generated/rusefi_mre_f4.ini index f01ec8b0ce..ecdcf19e34 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.01.mre_f4.271540819" + signature = "rusEFI 2022.09.01.mre_f4.390243914" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.09.01.mre_f4.271540819" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.09.01.mre_f4.390243914" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Sep 01 04:52:33 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Sep 01 05:33:24 UTC 2022 pageSize = 21300 page = 1 @@ -2118,7 +2118,7 @@ maxKnockRetardRpmBins = array, U08, 21294, [6], "RPM", 100.0, 0, 0, 25000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1240 + ochBlockSize = 1244 ; ; see TunerStudioOutputChannels struct @@ -3090,147 +3090,147 @@ mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1096, "", 1, 0 mapVvt_MAP_AT_DIFF = scalar, F32, 1100, "", 1, 0 mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1104, "", 1, 0 mapVvt_map_peak = scalar, U08, 1105, "", 1, 0 -currentEngineDecodedPhase = scalar, U16, 1106, "deg", 1, 0 -; total TS size = 1108 -totalRevolutionCounter = scalar, U32, 1108, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1112, "", 1, 0 -vvtCurrentPosition = scalar, F32, 1116, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1120, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 1124, "", 1, 0 -triggerStateIndex = scalar, U08, 1128, "", 1, 0 -vvtCounter = scalar, U08, 1129, "", 1, 0 -camResyncCounter = scalar, U08, 1130, "", 1, 0 -vvtStateIndex = scalar, U08, 1131, "", 1, 0 -; total TS size = 1132 -m_hasSynchronizedPhase = bits, U32, 1132, [0:0] -unusedBit_1_1 = bits, U32, 1132, [1:1] -unusedBit_1_2 = bits, U32, 1132, [2:2] -unusedBit_1_3 = bits, U32, 1132, [3:3] -unusedBit_1_4 = bits, U32, 1132, [4:4] -unusedBit_1_5 = bits, U32, 1132, [5:5] -unusedBit_1_6 = bits, U32, 1132, [6:6] -unusedBit_1_7 = bits, U32, 1132, [7:7] -unusedBit_1_8 = bits, U32, 1132, [8:8] -unusedBit_1_9 = bits, U32, 1132, [9:9] -unusedBit_1_10 = bits, U32, 1132, [10:10] -unusedBit_1_11 = bits, U32, 1132, [11:11] -unusedBit_1_12 = bits, U32, 1132, [12:12] -unusedBit_1_13 = bits, U32, 1132, [13:13] -unusedBit_1_14 = bits, U32, 1132, [14:14] -unusedBit_1_15 = bits, U32, 1132, [15:15] -unusedBit_1_16 = bits, U32, 1132, [16:16] -unusedBit_1_17 = bits, U32, 1132, [17:17] -unusedBit_1_18 = bits, U32, 1132, [18:18] -unusedBit_1_19 = bits, U32, 1132, [19:19] -unusedBit_1_20 = bits, U32, 1132, [20:20] -unusedBit_1_21 = bits, U32, 1132, [21:21] -unusedBit_1_22 = bits, U32, 1132, [22:22] -unusedBit_1_23 = bits, U32, 1132, [23:23] -unusedBit_1_24 = bits, U32, 1132, [24:24] -unusedBit_1_25 = bits, U32, 1132, [25:25] -unusedBit_1_26 = bits, U32, 1132, [26:26] -unusedBit_1_27 = bits, U32, 1132, [27:27] -unusedBit_1_28 = bits, U32, 1132, [28:28] -unusedBit_1_29 = bits, U32, 1132, [29:29] -unusedBit_1_30 = bits, U32, 1132, [30:30] -unusedBit_1_31 = bits, U32, 1132, [31:31] +currentEngineDecodedPhase = scalar, F32, 1108, "deg", 1, 0 +; total TS size = 1112 +totalRevolutionCounter = scalar, U32, 1112, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1116, "", 1, 0 +vvtCurrentPosition = scalar, F32, 1120, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1124, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 1128, "", 1, 0 +triggerStateIndex = scalar, U08, 1132, "", 1, 0 +vvtCounter = scalar, U08, 1133, "", 1, 0 +camResyncCounter = scalar, U08, 1134, "", 1, 0 +vvtStateIndex = scalar, U08, 1135, "", 1, 0 ; total TS size = 1136 -wallFuelCorrection = scalar, F32, 1136, "", 1, 0 -wallFuel = scalar, F32, 1140, "", 1, 0 -; total TS size = 1144 -idleState = bits, S32, 1144, [0:2], "not important" -currentIdlePosition = scalar, F32, 1148 -baseIdlePosition = scalar, F32, 1152 -iacByTpsTaper = scalar, F32, 1156 -throttlePedalUpState = scalar, S32, 1160, "", 1, 0 -mightResetPid = bits, U32, 1164, [0:0] -shouldResetPid = bits, U32, 1164, [1:1] -wasResetPid = bits, U32, 1164, [2:2] -mustResetPid = bits, U32, 1164, [3:3] -isCranking = bits, U32, 1164, [4:4] -useIacTableForCoasting = bits, U32, 1164, [5:5] -notIdling = bits, U32, 1164, [6:6] -needReset = bits, U32, 1164, [7:7] -isInDeadZone = bits, U32, 1164, [8:8] -isBlipping = bits, U32, 1164, [9:9] -useClosedLoop = bits, U32, 1164, [10:10] -badTps = bits, U32, 1164, [11:11] -looksLikeRunning = bits, U32, 1164, [12:12] -looksLikeCoasting = bits, U32, 1164, [13:13] -looksLikeCrankToIdle = bits, U32, 1164, [14:14] -isVerboseIAC = bits, U32, 1164, [15:15] -isIdleCoasting = bits, U32, 1164, [16:16] -unusedBit_22_17 = bits, U32, 1164, [17:17] -unusedBit_22_18 = bits, U32, 1164, [18:18] -unusedBit_22_19 = bits, U32, 1164, [19:19] -unusedBit_22_20 = bits, U32, 1164, [20:20] -unusedBit_22_21 = bits, U32, 1164, [21:21] -unusedBit_22_22 = bits, U32, 1164, [22:22] -unusedBit_22_23 = bits, U32, 1164, [23:23] -unusedBit_22_24 = bits, U32, 1164, [24:24] -unusedBit_22_25 = bits, U32, 1164, [25:25] -unusedBit_22_26 = bits, U32, 1164, [26:26] -unusedBit_22_27 = bits, U32, 1164, [27:27] -unusedBit_22_28 = bits, U32, 1164, [28:28] -unusedBit_22_29 = bits, U32, 1164, [29:29] -unusedBit_22_30 = bits, U32, 1164, [30:30] -unusedBit_22_31 = bits, U32, 1164, [31:31] -targetRpmByClt = scalar, S32, 1168, "", 1, 0 -targetRpmAcBump = scalar, S32, 1172, "", 1, 0 -iacByRpmTaper = scalar, F32, 1176 -luaAdd = scalar, F32, 1180 -; total TS size = 1184 -baseDwell = scalar, F32, 1184, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 1188, "", 1, 0 -luaTimingAdd = scalar, F32, 1192, "", 1, 0 -luaTimingMult = scalar, F32, 1196, "", 1, 0 -; total TS size = 1200 -idlePosition = scalar, F32, 1200, "", 1, 0 -trim = scalar, F32, 1204, "", 1, 0 -luaAdjustment = scalar, F32, 1208, "", 1, 0 -etbFeedForward = scalar, F32, 1212 -etbIntegralError = scalar, F32, 1216, "", 1, 0 -etbCurrentTarget = scalar, F32, 1220, "%", 1, 0 -etbRevLimitActive = bits, U32, 1224, [0:0] -unusedBit_7_1 = bits, U32, 1224, [1:1] -unusedBit_7_2 = bits, U32, 1224, [2:2] -unusedBit_7_3 = bits, U32, 1224, [3:3] -unusedBit_7_4 = bits, U32, 1224, [4:4] -unusedBit_7_5 = bits, U32, 1224, [5:5] -unusedBit_7_6 = bits, U32, 1224, [6:6] -unusedBit_7_7 = bits, U32, 1224, [7:7] -unusedBit_7_8 = bits, U32, 1224, [8:8] -unusedBit_7_9 = bits, U32, 1224, [9:9] -unusedBit_7_10 = bits, U32, 1224, [10:10] -unusedBit_7_11 = bits, U32, 1224, [11:11] -unusedBit_7_12 = bits, U32, 1224, [12:12] -unusedBit_7_13 = bits, U32, 1224, [13:13] -unusedBit_7_14 = bits, U32, 1224, [14:14] -unusedBit_7_15 = bits, U32, 1224, [15:15] -unusedBit_7_16 = bits, U32, 1224, [16:16] -unusedBit_7_17 = bits, U32, 1224, [17:17] -unusedBit_7_18 = bits, U32, 1224, [18:18] -unusedBit_7_19 = bits, U32, 1224, [19:19] -unusedBit_7_20 = bits, U32, 1224, [20:20] -unusedBit_7_21 = bits, U32, 1224, [21:21] -unusedBit_7_22 = bits, U32, 1224, [22:22] -unusedBit_7_23 = bits, U32, 1224, [23:23] -unusedBit_7_24 = bits, U32, 1224, [24:24] -unusedBit_7_25 = bits, U32, 1224, [25:25] -unusedBit_7_26 = bits, U32, 1224, [26:26] -unusedBit_7_27 = bits, U32, 1224, [27:27] -unusedBit_7_28 = bits, U32, 1224, [28:28] -unusedBit_7_29 = bits, U32, 1224, [29:29] -unusedBit_7_30 = bits, U32, 1224, [30:30] -unusedBit_7_31 = bits, U32, 1224, [31:31] -; total TS size = 1228 -faultCode = scalar, U08, 1228, "", 1, 0 -heaterDuty = scalar, U08, 1229, "%", 1, 0 -pumpDuty = scalar, U08, 1230, "%", 1, 0 -tempC = scalar, U16, 1232, "C", 1, 0 -nernstVoltage = scalar, U16, 1234, "V", 0.001, 0 -esr = scalar, U16, 1236, "", 1, 0 -; total TS size = 1240 +m_hasSynchronizedPhase = bits, U32, 1136, [0:0] +unusedBit_1_1 = bits, U32, 1136, [1:1] +unusedBit_1_2 = bits, U32, 1136, [2:2] +unusedBit_1_3 = bits, U32, 1136, [3:3] +unusedBit_1_4 = bits, U32, 1136, [4:4] +unusedBit_1_5 = bits, U32, 1136, [5:5] +unusedBit_1_6 = bits, U32, 1136, [6:6] +unusedBit_1_7 = bits, U32, 1136, [7:7] +unusedBit_1_8 = bits, U32, 1136, [8:8] +unusedBit_1_9 = bits, U32, 1136, [9:9] +unusedBit_1_10 = bits, U32, 1136, [10:10] +unusedBit_1_11 = bits, U32, 1136, [11:11] +unusedBit_1_12 = bits, U32, 1136, [12:12] +unusedBit_1_13 = bits, U32, 1136, [13:13] +unusedBit_1_14 = bits, U32, 1136, [14:14] +unusedBit_1_15 = bits, U32, 1136, [15:15] +unusedBit_1_16 = bits, U32, 1136, [16:16] +unusedBit_1_17 = bits, U32, 1136, [17:17] +unusedBit_1_18 = bits, U32, 1136, [18:18] +unusedBit_1_19 = bits, U32, 1136, [19:19] +unusedBit_1_20 = bits, U32, 1136, [20:20] +unusedBit_1_21 = bits, U32, 1136, [21:21] +unusedBit_1_22 = bits, U32, 1136, [22:22] +unusedBit_1_23 = bits, U32, 1136, [23:23] +unusedBit_1_24 = bits, U32, 1136, [24:24] +unusedBit_1_25 = bits, U32, 1136, [25:25] +unusedBit_1_26 = bits, U32, 1136, [26:26] +unusedBit_1_27 = bits, U32, 1136, [27:27] +unusedBit_1_28 = bits, U32, 1136, [28:28] +unusedBit_1_29 = bits, U32, 1136, [29:29] +unusedBit_1_30 = bits, U32, 1136, [30:30] +unusedBit_1_31 = bits, U32, 1136, [31:31] +; total TS size = 1140 +wallFuelCorrection = scalar, F32, 1140, "", 1, 0 +wallFuel = scalar, F32, 1144, "", 1, 0 +; total TS size = 1148 +idleState = bits, S32, 1148, [0:2], "not important" +currentIdlePosition = scalar, F32, 1152 +baseIdlePosition = scalar, F32, 1156 +iacByTpsTaper = scalar, F32, 1160 +throttlePedalUpState = scalar, S32, 1164, "", 1, 0 +mightResetPid = bits, U32, 1168, [0:0] +shouldResetPid = bits, U32, 1168, [1:1] +wasResetPid = bits, U32, 1168, [2:2] +mustResetPid = bits, U32, 1168, [3:3] +isCranking = bits, U32, 1168, [4:4] +useIacTableForCoasting = bits, U32, 1168, [5:5] +notIdling = bits, U32, 1168, [6:6] +needReset = bits, U32, 1168, [7:7] +isInDeadZone = bits, U32, 1168, [8:8] +isBlipping = bits, U32, 1168, [9:9] +useClosedLoop = bits, U32, 1168, [10:10] +badTps = bits, U32, 1168, [11:11] +looksLikeRunning = bits, U32, 1168, [12:12] +looksLikeCoasting = bits, U32, 1168, [13:13] +looksLikeCrankToIdle = bits, U32, 1168, [14:14] +isVerboseIAC = bits, U32, 1168, [15:15] +isIdleCoasting = bits, U32, 1168, [16:16] +unusedBit_22_17 = bits, U32, 1168, [17:17] +unusedBit_22_18 = bits, U32, 1168, [18:18] +unusedBit_22_19 = bits, U32, 1168, [19:19] +unusedBit_22_20 = bits, U32, 1168, [20:20] +unusedBit_22_21 = bits, U32, 1168, [21:21] +unusedBit_22_22 = bits, U32, 1168, [22:22] +unusedBit_22_23 = bits, U32, 1168, [23:23] +unusedBit_22_24 = bits, U32, 1168, [24:24] +unusedBit_22_25 = bits, U32, 1168, [25:25] +unusedBit_22_26 = bits, U32, 1168, [26:26] +unusedBit_22_27 = bits, U32, 1168, [27:27] +unusedBit_22_28 = bits, U32, 1168, [28:28] +unusedBit_22_29 = bits, U32, 1168, [29:29] +unusedBit_22_30 = bits, U32, 1168, [30:30] +unusedBit_22_31 = bits, U32, 1168, [31:31] +targetRpmByClt = scalar, S32, 1172, "", 1, 0 +targetRpmAcBump = scalar, S32, 1176, "", 1, 0 +iacByRpmTaper = scalar, F32, 1180 +luaAdd = scalar, F32, 1184 +; total TS size = 1188 +baseDwell = scalar, F32, 1188, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 1192, "", 1, 0 +luaTimingAdd = scalar, F32, 1196, "", 1, 0 +luaTimingMult = scalar, F32, 1200, "", 1, 0 +; total TS size = 1204 +idlePosition = scalar, F32, 1204, "", 1, 0 +trim = scalar, F32, 1208, "", 1, 0 +luaAdjustment = scalar, F32, 1212, "", 1, 0 +etbFeedForward = scalar, F32, 1216 +etbIntegralError = scalar, F32, 1220, "", 1, 0 +etbCurrentTarget = scalar, F32, 1224, "%", 1, 0 +etbRevLimitActive = bits, U32, 1228, [0:0] +unusedBit_7_1 = bits, U32, 1228, [1:1] +unusedBit_7_2 = bits, U32, 1228, [2:2] +unusedBit_7_3 = bits, U32, 1228, [3:3] +unusedBit_7_4 = bits, U32, 1228, [4:4] +unusedBit_7_5 = bits, U32, 1228, [5:5] +unusedBit_7_6 = bits, U32, 1228, [6:6] +unusedBit_7_7 = bits, U32, 1228, [7:7] +unusedBit_7_8 = bits, U32, 1228, [8:8] +unusedBit_7_9 = bits, U32, 1228, [9:9] +unusedBit_7_10 = bits, U32, 1228, [10:10] +unusedBit_7_11 = bits, U32, 1228, [11:11] +unusedBit_7_12 = bits, U32, 1228, [12:12] +unusedBit_7_13 = bits, U32, 1228, [13:13] +unusedBit_7_14 = bits, U32, 1228, [14:14] +unusedBit_7_15 = bits, U32, 1228, [15:15] +unusedBit_7_16 = bits, U32, 1228, [16:16] +unusedBit_7_17 = bits, U32, 1228, [17:17] +unusedBit_7_18 = bits, U32, 1228, [18:18] +unusedBit_7_19 = bits, U32, 1228, [19:19] +unusedBit_7_20 = bits, U32, 1228, [20:20] +unusedBit_7_21 = bits, U32, 1228, [21:21] +unusedBit_7_22 = bits, U32, 1228, [22:22] +unusedBit_7_23 = bits, U32, 1228, [23:23] +unusedBit_7_24 = bits, U32, 1228, [24:24] +unusedBit_7_25 = bits, U32, 1228, [25:25] +unusedBit_7_26 = bits, U32, 1228, [26:26] +unusedBit_7_27 = bits, U32, 1228, [27:27] +unusedBit_7_28 = bits, U32, 1228, [28:28] +unusedBit_7_29 = bits, U32, 1228, [29:29] +unusedBit_7_30 = bits, U32, 1228, [30:30] +unusedBit_7_31 = bits, U32, 1228, [31:31] +; total TS size = 1232 +faultCode = scalar, U08, 1232, "", 1, 0 +heaterDuty = scalar, U08, 1233, "%", 1, 0 +pumpDuty = scalar, U08, 1234, "%", 1, 0 +tempC = scalar, U16, 1236, "C", 1, 0 +nernstVoltage = scalar, U16, 1238, "V", 0.001, 0 +esr = scalar, U16, 1240, "", 1, 0 +; total TS size = 1244 time = { timeNow } @@ -4847,7 +4847,7 @@ entry = mapVvt_MAP_AT_SPECIAL_POINT, "mapVvt_MAP_AT_SPECIAL_POINT", float, "%.3 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 Phase2", int, "%d" +entry = currentEngineDecodedPhase, "Engine Phase2", float, "%.3f" entry = totalRevolutionCounter, "Crank revolution counter", int, "%d" entry = vvtSyncGapRatio, "vvtSyncGapRatio", float, "%.3f" entry = vvtCurrentPosition, "vvtCurrentPosition", float, "%.3f" diff --git a/firmware/tunerstudio/generated/rusefi_mre_f7.ini b/firmware/tunerstudio/generated/rusefi_mre_f7.ini index e201074d01..efce03559a 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.01.mre_f7.271540819" + signature = "rusEFI 2022.09.01.mre_f7.390243914" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.09.01.mre_f7.271540819" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.09.01.mre_f7.390243914" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Sep 01 04:52:31 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Sep 01 05:33:22 UTC 2022 pageSize = 21300 page = 1 @@ -2118,7 +2118,7 @@ maxKnockRetardRpmBins = array, U08, 21294, [6], "RPM", 100.0, 0, 0, 25000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1240 + ochBlockSize = 1244 ; ; see TunerStudioOutputChannels struct @@ -3090,147 +3090,147 @@ mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1096, "", 1, 0 mapVvt_MAP_AT_DIFF = scalar, F32, 1100, "", 1, 0 mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1104, "", 1, 0 mapVvt_map_peak = scalar, U08, 1105, "", 1, 0 -currentEngineDecodedPhase = scalar, U16, 1106, "deg", 1, 0 -; total TS size = 1108 -totalRevolutionCounter = scalar, U32, 1108, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1112, "", 1, 0 -vvtCurrentPosition = scalar, F32, 1116, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1120, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 1124, "", 1, 0 -triggerStateIndex = scalar, U08, 1128, "", 1, 0 -vvtCounter = scalar, U08, 1129, "", 1, 0 -camResyncCounter = scalar, U08, 1130, "", 1, 0 -vvtStateIndex = scalar, U08, 1131, "", 1, 0 -; total TS size = 1132 -m_hasSynchronizedPhase = bits, U32, 1132, [0:0] -unusedBit_1_1 = bits, U32, 1132, [1:1] -unusedBit_1_2 = bits, U32, 1132, [2:2] -unusedBit_1_3 = bits, U32, 1132, [3:3] -unusedBit_1_4 = bits, U32, 1132, [4:4] -unusedBit_1_5 = bits, U32, 1132, [5:5] -unusedBit_1_6 = bits, U32, 1132, [6:6] -unusedBit_1_7 = bits, U32, 1132, [7:7] -unusedBit_1_8 = bits, U32, 1132, [8:8] -unusedBit_1_9 = bits, U32, 1132, [9:9] -unusedBit_1_10 = bits, U32, 1132, [10:10] -unusedBit_1_11 = bits, U32, 1132, [11:11] -unusedBit_1_12 = bits, U32, 1132, [12:12] -unusedBit_1_13 = bits, U32, 1132, [13:13] -unusedBit_1_14 = bits, U32, 1132, [14:14] -unusedBit_1_15 = bits, U32, 1132, [15:15] -unusedBit_1_16 = bits, U32, 1132, [16:16] -unusedBit_1_17 = bits, U32, 1132, [17:17] -unusedBit_1_18 = bits, U32, 1132, [18:18] -unusedBit_1_19 = bits, U32, 1132, [19:19] -unusedBit_1_20 = bits, U32, 1132, [20:20] -unusedBit_1_21 = bits, U32, 1132, [21:21] -unusedBit_1_22 = bits, U32, 1132, [22:22] -unusedBit_1_23 = bits, U32, 1132, [23:23] -unusedBit_1_24 = bits, U32, 1132, [24:24] -unusedBit_1_25 = bits, U32, 1132, [25:25] -unusedBit_1_26 = bits, U32, 1132, [26:26] -unusedBit_1_27 = bits, U32, 1132, [27:27] -unusedBit_1_28 = bits, U32, 1132, [28:28] -unusedBit_1_29 = bits, U32, 1132, [29:29] -unusedBit_1_30 = bits, U32, 1132, [30:30] -unusedBit_1_31 = bits, U32, 1132, [31:31] +currentEngineDecodedPhase = scalar, F32, 1108, "deg", 1, 0 +; total TS size = 1112 +totalRevolutionCounter = scalar, U32, 1112, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1116, "", 1, 0 +vvtCurrentPosition = scalar, F32, 1120, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1124, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 1128, "", 1, 0 +triggerStateIndex = scalar, U08, 1132, "", 1, 0 +vvtCounter = scalar, U08, 1133, "", 1, 0 +camResyncCounter = scalar, U08, 1134, "", 1, 0 +vvtStateIndex = scalar, U08, 1135, "", 1, 0 ; total TS size = 1136 -wallFuelCorrection = scalar, F32, 1136, "", 1, 0 -wallFuel = scalar, F32, 1140, "", 1, 0 -; total TS size = 1144 -idleState = bits, S32, 1144, [0:2], "not important" -currentIdlePosition = scalar, F32, 1148 -baseIdlePosition = scalar, F32, 1152 -iacByTpsTaper = scalar, F32, 1156 -throttlePedalUpState = scalar, S32, 1160, "", 1, 0 -mightResetPid = bits, U32, 1164, [0:0] -shouldResetPid = bits, U32, 1164, [1:1] -wasResetPid = bits, U32, 1164, [2:2] -mustResetPid = bits, U32, 1164, [3:3] -isCranking = bits, U32, 1164, [4:4] -useIacTableForCoasting = bits, U32, 1164, [5:5] -notIdling = bits, U32, 1164, [6:6] -needReset = bits, U32, 1164, [7:7] -isInDeadZone = bits, U32, 1164, [8:8] -isBlipping = bits, U32, 1164, [9:9] -useClosedLoop = bits, U32, 1164, [10:10] -badTps = bits, U32, 1164, [11:11] -looksLikeRunning = bits, U32, 1164, [12:12] -looksLikeCoasting = bits, U32, 1164, [13:13] -looksLikeCrankToIdle = bits, U32, 1164, [14:14] -isVerboseIAC = bits, U32, 1164, [15:15] -isIdleCoasting = bits, U32, 1164, [16:16] -unusedBit_22_17 = bits, U32, 1164, [17:17] -unusedBit_22_18 = bits, U32, 1164, [18:18] -unusedBit_22_19 = bits, U32, 1164, [19:19] -unusedBit_22_20 = bits, U32, 1164, [20:20] -unusedBit_22_21 = bits, U32, 1164, [21:21] -unusedBit_22_22 = bits, U32, 1164, [22:22] -unusedBit_22_23 = bits, U32, 1164, [23:23] -unusedBit_22_24 = bits, U32, 1164, [24:24] -unusedBit_22_25 = bits, U32, 1164, [25:25] -unusedBit_22_26 = bits, U32, 1164, [26:26] -unusedBit_22_27 = bits, U32, 1164, [27:27] -unusedBit_22_28 = bits, U32, 1164, [28:28] -unusedBit_22_29 = bits, U32, 1164, [29:29] -unusedBit_22_30 = bits, U32, 1164, [30:30] -unusedBit_22_31 = bits, U32, 1164, [31:31] -targetRpmByClt = scalar, S32, 1168, "", 1, 0 -targetRpmAcBump = scalar, S32, 1172, "", 1, 0 -iacByRpmTaper = scalar, F32, 1176 -luaAdd = scalar, F32, 1180 -; total TS size = 1184 -baseDwell = scalar, F32, 1184, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 1188, "", 1, 0 -luaTimingAdd = scalar, F32, 1192, "", 1, 0 -luaTimingMult = scalar, F32, 1196, "", 1, 0 -; total TS size = 1200 -idlePosition = scalar, F32, 1200, "", 1, 0 -trim = scalar, F32, 1204, "", 1, 0 -luaAdjustment = scalar, F32, 1208, "", 1, 0 -etbFeedForward = scalar, F32, 1212 -etbIntegralError = scalar, F32, 1216, "", 1, 0 -etbCurrentTarget = scalar, F32, 1220, "%", 1, 0 -etbRevLimitActive = bits, U32, 1224, [0:0] -unusedBit_7_1 = bits, U32, 1224, [1:1] -unusedBit_7_2 = bits, U32, 1224, [2:2] -unusedBit_7_3 = bits, U32, 1224, [3:3] -unusedBit_7_4 = bits, U32, 1224, [4:4] -unusedBit_7_5 = bits, U32, 1224, [5:5] -unusedBit_7_6 = bits, U32, 1224, [6:6] -unusedBit_7_7 = bits, U32, 1224, [7:7] -unusedBit_7_8 = bits, U32, 1224, [8:8] -unusedBit_7_9 = bits, U32, 1224, [9:9] -unusedBit_7_10 = bits, U32, 1224, [10:10] -unusedBit_7_11 = bits, U32, 1224, [11:11] -unusedBit_7_12 = bits, U32, 1224, [12:12] -unusedBit_7_13 = bits, U32, 1224, [13:13] -unusedBit_7_14 = bits, U32, 1224, [14:14] -unusedBit_7_15 = bits, U32, 1224, [15:15] -unusedBit_7_16 = bits, U32, 1224, [16:16] -unusedBit_7_17 = bits, U32, 1224, [17:17] -unusedBit_7_18 = bits, U32, 1224, [18:18] -unusedBit_7_19 = bits, U32, 1224, [19:19] -unusedBit_7_20 = bits, U32, 1224, [20:20] -unusedBit_7_21 = bits, U32, 1224, [21:21] -unusedBit_7_22 = bits, U32, 1224, [22:22] -unusedBit_7_23 = bits, U32, 1224, [23:23] -unusedBit_7_24 = bits, U32, 1224, [24:24] -unusedBit_7_25 = bits, U32, 1224, [25:25] -unusedBit_7_26 = bits, U32, 1224, [26:26] -unusedBit_7_27 = bits, U32, 1224, [27:27] -unusedBit_7_28 = bits, U32, 1224, [28:28] -unusedBit_7_29 = bits, U32, 1224, [29:29] -unusedBit_7_30 = bits, U32, 1224, [30:30] -unusedBit_7_31 = bits, U32, 1224, [31:31] -; total TS size = 1228 -faultCode = scalar, U08, 1228, "", 1, 0 -heaterDuty = scalar, U08, 1229, "%", 1, 0 -pumpDuty = scalar, U08, 1230, "%", 1, 0 -tempC = scalar, U16, 1232, "C", 1, 0 -nernstVoltage = scalar, U16, 1234, "V", 0.001, 0 -esr = scalar, U16, 1236, "", 1, 0 -; total TS size = 1240 +m_hasSynchronizedPhase = bits, U32, 1136, [0:0] +unusedBit_1_1 = bits, U32, 1136, [1:1] +unusedBit_1_2 = bits, U32, 1136, [2:2] +unusedBit_1_3 = bits, U32, 1136, [3:3] +unusedBit_1_4 = bits, U32, 1136, [4:4] +unusedBit_1_5 = bits, U32, 1136, [5:5] +unusedBit_1_6 = bits, U32, 1136, [6:6] +unusedBit_1_7 = bits, U32, 1136, [7:7] +unusedBit_1_8 = bits, U32, 1136, [8:8] +unusedBit_1_9 = bits, U32, 1136, [9:9] +unusedBit_1_10 = bits, U32, 1136, [10:10] +unusedBit_1_11 = bits, U32, 1136, [11:11] +unusedBit_1_12 = bits, U32, 1136, [12:12] +unusedBit_1_13 = bits, U32, 1136, [13:13] +unusedBit_1_14 = bits, U32, 1136, [14:14] +unusedBit_1_15 = bits, U32, 1136, [15:15] +unusedBit_1_16 = bits, U32, 1136, [16:16] +unusedBit_1_17 = bits, U32, 1136, [17:17] +unusedBit_1_18 = bits, U32, 1136, [18:18] +unusedBit_1_19 = bits, U32, 1136, [19:19] +unusedBit_1_20 = bits, U32, 1136, [20:20] +unusedBit_1_21 = bits, U32, 1136, [21:21] +unusedBit_1_22 = bits, U32, 1136, [22:22] +unusedBit_1_23 = bits, U32, 1136, [23:23] +unusedBit_1_24 = bits, U32, 1136, [24:24] +unusedBit_1_25 = bits, U32, 1136, [25:25] +unusedBit_1_26 = bits, U32, 1136, [26:26] +unusedBit_1_27 = bits, U32, 1136, [27:27] +unusedBit_1_28 = bits, U32, 1136, [28:28] +unusedBit_1_29 = bits, U32, 1136, [29:29] +unusedBit_1_30 = bits, U32, 1136, [30:30] +unusedBit_1_31 = bits, U32, 1136, [31:31] +; total TS size = 1140 +wallFuelCorrection = scalar, F32, 1140, "", 1, 0 +wallFuel = scalar, F32, 1144, "", 1, 0 +; total TS size = 1148 +idleState = bits, S32, 1148, [0:2], "not important" +currentIdlePosition = scalar, F32, 1152 +baseIdlePosition = scalar, F32, 1156 +iacByTpsTaper = scalar, F32, 1160 +throttlePedalUpState = scalar, S32, 1164, "", 1, 0 +mightResetPid = bits, U32, 1168, [0:0] +shouldResetPid = bits, U32, 1168, [1:1] +wasResetPid = bits, U32, 1168, [2:2] +mustResetPid = bits, U32, 1168, [3:3] +isCranking = bits, U32, 1168, [4:4] +useIacTableForCoasting = bits, U32, 1168, [5:5] +notIdling = bits, U32, 1168, [6:6] +needReset = bits, U32, 1168, [7:7] +isInDeadZone = bits, U32, 1168, [8:8] +isBlipping = bits, U32, 1168, [9:9] +useClosedLoop = bits, U32, 1168, [10:10] +badTps = bits, U32, 1168, [11:11] +looksLikeRunning = bits, U32, 1168, [12:12] +looksLikeCoasting = bits, U32, 1168, [13:13] +looksLikeCrankToIdle = bits, U32, 1168, [14:14] +isVerboseIAC = bits, U32, 1168, [15:15] +isIdleCoasting = bits, U32, 1168, [16:16] +unusedBit_22_17 = bits, U32, 1168, [17:17] +unusedBit_22_18 = bits, U32, 1168, [18:18] +unusedBit_22_19 = bits, U32, 1168, [19:19] +unusedBit_22_20 = bits, U32, 1168, [20:20] +unusedBit_22_21 = bits, U32, 1168, [21:21] +unusedBit_22_22 = bits, U32, 1168, [22:22] +unusedBit_22_23 = bits, U32, 1168, [23:23] +unusedBit_22_24 = bits, U32, 1168, [24:24] +unusedBit_22_25 = bits, U32, 1168, [25:25] +unusedBit_22_26 = bits, U32, 1168, [26:26] +unusedBit_22_27 = bits, U32, 1168, [27:27] +unusedBit_22_28 = bits, U32, 1168, [28:28] +unusedBit_22_29 = bits, U32, 1168, [29:29] +unusedBit_22_30 = bits, U32, 1168, [30:30] +unusedBit_22_31 = bits, U32, 1168, [31:31] +targetRpmByClt = scalar, S32, 1172, "", 1, 0 +targetRpmAcBump = scalar, S32, 1176, "", 1, 0 +iacByRpmTaper = scalar, F32, 1180 +luaAdd = scalar, F32, 1184 +; total TS size = 1188 +baseDwell = scalar, F32, 1188, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 1192, "", 1, 0 +luaTimingAdd = scalar, F32, 1196, "", 1, 0 +luaTimingMult = scalar, F32, 1200, "", 1, 0 +; total TS size = 1204 +idlePosition = scalar, F32, 1204, "", 1, 0 +trim = scalar, F32, 1208, "", 1, 0 +luaAdjustment = scalar, F32, 1212, "", 1, 0 +etbFeedForward = scalar, F32, 1216 +etbIntegralError = scalar, F32, 1220, "", 1, 0 +etbCurrentTarget = scalar, F32, 1224, "%", 1, 0 +etbRevLimitActive = bits, U32, 1228, [0:0] +unusedBit_7_1 = bits, U32, 1228, [1:1] +unusedBit_7_2 = bits, U32, 1228, [2:2] +unusedBit_7_3 = bits, U32, 1228, [3:3] +unusedBit_7_4 = bits, U32, 1228, [4:4] +unusedBit_7_5 = bits, U32, 1228, [5:5] +unusedBit_7_6 = bits, U32, 1228, [6:6] +unusedBit_7_7 = bits, U32, 1228, [7:7] +unusedBit_7_8 = bits, U32, 1228, [8:8] +unusedBit_7_9 = bits, U32, 1228, [9:9] +unusedBit_7_10 = bits, U32, 1228, [10:10] +unusedBit_7_11 = bits, U32, 1228, [11:11] +unusedBit_7_12 = bits, U32, 1228, [12:12] +unusedBit_7_13 = bits, U32, 1228, [13:13] +unusedBit_7_14 = bits, U32, 1228, [14:14] +unusedBit_7_15 = bits, U32, 1228, [15:15] +unusedBit_7_16 = bits, U32, 1228, [16:16] +unusedBit_7_17 = bits, U32, 1228, [17:17] +unusedBit_7_18 = bits, U32, 1228, [18:18] +unusedBit_7_19 = bits, U32, 1228, [19:19] +unusedBit_7_20 = bits, U32, 1228, [20:20] +unusedBit_7_21 = bits, U32, 1228, [21:21] +unusedBit_7_22 = bits, U32, 1228, [22:22] +unusedBit_7_23 = bits, U32, 1228, [23:23] +unusedBit_7_24 = bits, U32, 1228, [24:24] +unusedBit_7_25 = bits, U32, 1228, [25:25] +unusedBit_7_26 = bits, U32, 1228, [26:26] +unusedBit_7_27 = bits, U32, 1228, [27:27] +unusedBit_7_28 = bits, U32, 1228, [28:28] +unusedBit_7_29 = bits, U32, 1228, [29:29] +unusedBit_7_30 = bits, U32, 1228, [30:30] +unusedBit_7_31 = bits, U32, 1228, [31:31] +; total TS size = 1232 +faultCode = scalar, U08, 1232, "", 1, 0 +heaterDuty = scalar, U08, 1233, "%", 1, 0 +pumpDuty = scalar, U08, 1234, "%", 1, 0 +tempC = scalar, U16, 1236, "C", 1, 0 +nernstVoltage = scalar, U16, 1238, "V", 0.001, 0 +esr = scalar, U16, 1240, "", 1, 0 +; total TS size = 1244 time = { timeNow } @@ -4847,7 +4847,7 @@ entry = mapVvt_MAP_AT_SPECIAL_POINT, "mapVvt_MAP_AT_SPECIAL_POINT", float, "%.3 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 Phase2", int, "%d" +entry = currentEngineDecodedPhase, "Engine Phase2", float, "%.3f" entry = totalRevolutionCounter, "Crank revolution counter", int, "%d" entry = vvtSyncGapRatio, "vvtSyncGapRatio", float, "%.3f" entry = vvtCurrentPosition, "vvtCurrentPosition", float, "%.3f" diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_405.ini b/firmware/tunerstudio/generated/rusefi_prometheus_405.ini index dcd40f8dc8..ceea7c887f 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.01.prometheus_405.2400401219" + signature = "rusEFI 2022.09.01.prometheus_405.2290021210" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.09.01.prometheus_405.2400401219" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.09.01.prometheus_405.2290021210" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Sep 01 04:52:41 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Sep 01 05:33:31 UTC 2022 pageSize = 21300 page = 1 @@ -2118,7 +2118,7 @@ maxKnockRetardRpmBins = array, U08, 21294, [6], "RPM", 100.0, 0, 0, 25000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1240 + ochBlockSize = 1244 ; ; see TunerStudioOutputChannels struct @@ -3090,147 +3090,147 @@ mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1096, "", 1, 0 mapVvt_MAP_AT_DIFF = scalar, F32, 1100, "", 1, 0 mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1104, "", 1, 0 mapVvt_map_peak = scalar, U08, 1105, "", 1, 0 -currentEngineDecodedPhase = scalar, U16, 1106, "deg", 1, 0 -; total TS size = 1108 -totalRevolutionCounter = scalar, U32, 1108, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1112, "", 1, 0 -vvtCurrentPosition = scalar, F32, 1116, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1120, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 1124, "", 1, 0 -triggerStateIndex = scalar, U08, 1128, "", 1, 0 -vvtCounter = scalar, U08, 1129, "", 1, 0 -camResyncCounter = scalar, U08, 1130, "", 1, 0 -vvtStateIndex = scalar, U08, 1131, "", 1, 0 -; total TS size = 1132 -m_hasSynchronizedPhase = bits, U32, 1132, [0:0] -unusedBit_1_1 = bits, U32, 1132, [1:1] -unusedBit_1_2 = bits, U32, 1132, [2:2] -unusedBit_1_3 = bits, U32, 1132, [3:3] -unusedBit_1_4 = bits, U32, 1132, [4:4] -unusedBit_1_5 = bits, U32, 1132, [5:5] -unusedBit_1_6 = bits, U32, 1132, [6:6] -unusedBit_1_7 = bits, U32, 1132, [7:7] -unusedBit_1_8 = bits, U32, 1132, [8:8] -unusedBit_1_9 = bits, U32, 1132, [9:9] -unusedBit_1_10 = bits, U32, 1132, [10:10] -unusedBit_1_11 = bits, U32, 1132, [11:11] -unusedBit_1_12 = bits, U32, 1132, [12:12] -unusedBit_1_13 = bits, U32, 1132, [13:13] -unusedBit_1_14 = bits, U32, 1132, [14:14] -unusedBit_1_15 = bits, U32, 1132, [15:15] -unusedBit_1_16 = bits, U32, 1132, [16:16] -unusedBit_1_17 = bits, U32, 1132, [17:17] -unusedBit_1_18 = bits, U32, 1132, [18:18] -unusedBit_1_19 = bits, U32, 1132, [19:19] -unusedBit_1_20 = bits, U32, 1132, [20:20] -unusedBit_1_21 = bits, U32, 1132, [21:21] -unusedBit_1_22 = bits, U32, 1132, [22:22] -unusedBit_1_23 = bits, U32, 1132, [23:23] -unusedBit_1_24 = bits, U32, 1132, [24:24] -unusedBit_1_25 = bits, U32, 1132, [25:25] -unusedBit_1_26 = bits, U32, 1132, [26:26] -unusedBit_1_27 = bits, U32, 1132, [27:27] -unusedBit_1_28 = bits, U32, 1132, [28:28] -unusedBit_1_29 = bits, U32, 1132, [29:29] -unusedBit_1_30 = bits, U32, 1132, [30:30] -unusedBit_1_31 = bits, U32, 1132, [31:31] +currentEngineDecodedPhase = scalar, F32, 1108, "deg", 1, 0 +; total TS size = 1112 +totalRevolutionCounter = scalar, U32, 1112, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1116, "", 1, 0 +vvtCurrentPosition = scalar, F32, 1120, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1124, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 1128, "", 1, 0 +triggerStateIndex = scalar, U08, 1132, "", 1, 0 +vvtCounter = scalar, U08, 1133, "", 1, 0 +camResyncCounter = scalar, U08, 1134, "", 1, 0 +vvtStateIndex = scalar, U08, 1135, "", 1, 0 ; total TS size = 1136 -wallFuelCorrection = scalar, F32, 1136, "", 1, 0 -wallFuel = scalar, F32, 1140, "", 1, 0 -; total TS size = 1144 -idleState = bits, S32, 1144, [0:2], "not important" -currentIdlePosition = scalar, F32, 1148 -baseIdlePosition = scalar, F32, 1152 -iacByTpsTaper = scalar, F32, 1156 -throttlePedalUpState = scalar, S32, 1160, "", 1, 0 -mightResetPid = bits, U32, 1164, [0:0] -shouldResetPid = bits, U32, 1164, [1:1] -wasResetPid = bits, U32, 1164, [2:2] -mustResetPid = bits, U32, 1164, [3:3] -isCranking = bits, U32, 1164, [4:4] -useIacTableForCoasting = bits, U32, 1164, [5:5] -notIdling = bits, U32, 1164, [6:6] -needReset = bits, U32, 1164, [7:7] -isInDeadZone = bits, U32, 1164, [8:8] -isBlipping = bits, U32, 1164, [9:9] -useClosedLoop = bits, U32, 1164, [10:10] -badTps = bits, U32, 1164, [11:11] -looksLikeRunning = bits, U32, 1164, [12:12] -looksLikeCoasting = bits, U32, 1164, [13:13] -looksLikeCrankToIdle = bits, U32, 1164, [14:14] -isVerboseIAC = bits, U32, 1164, [15:15] -isIdleCoasting = bits, U32, 1164, [16:16] -unusedBit_22_17 = bits, U32, 1164, [17:17] -unusedBit_22_18 = bits, U32, 1164, [18:18] -unusedBit_22_19 = bits, U32, 1164, [19:19] -unusedBit_22_20 = bits, U32, 1164, [20:20] -unusedBit_22_21 = bits, U32, 1164, [21:21] -unusedBit_22_22 = bits, U32, 1164, [22:22] -unusedBit_22_23 = bits, U32, 1164, [23:23] -unusedBit_22_24 = bits, U32, 1164, [24:24] -unusedBit_22_25 = bits, U32, 1164, [25:25] -unusedBit_22_26 = bits, U32, 1164, [26:26] -unusedBit_22_27 = bits, U32, 1164, [27:27] -unusedBit_22_28 = bits, U32, 1164, [28:28] -unusedBit_22_29 = bits, U32, 1164, [29:29] -unusedBit_22_30 = bits, U32, 1164, [30:30] -unusedBit_22_31 = bits, U32, 1164, [31:31] -targetRpmByClt = scalar, S32, 1168, "", 1, 0 -targetRpmAcBump = scalar, S32, 1172, "", 1, 0 -iacByRpmTaper = scalar, F32, 1176 -luaAdd = scalar, F32, 1180 -; total TS size = 1184 -baseDwell = scalar, F32, 1184, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 1188, "", 1, 0 -luaTimingAdd = scalar, F32, 1192, "", 1, 0 -luaTimingMult = scalar, F32, 1196, "", 1, 0 -; total TS size = 1200 -idlePosition = scalar, F32, 1200, "", 1, 0 -trim = scalar, F32, 1204, "", 1, 0 -luaAdjustment = scalar, F32, 1208, "", 1, 0 -etbFeedForward = scalar, F32, 1212 -etbIntegralError = scalar, F32, 1216, "", 1, 0 -etbCurrentTarget = scalar, F32, 1220, "%", 1, 0 -etbRevLimitActive = bits, U32, 1224, [0:0] -unusedBit_7_1 = bits, U32, 1224, [1:1] -unusedBit_7_2 = bits, U32, 1224, [2:2] -unusedBit_7_3 = bits, U32, 1224, [3:3] -unusedBit_7_4 = bits, U32, 1224, [4:4] -unusedBit_7_5 = bits, U32, 1224, [5:5] -unusedBit_7_6 = bits, U32, 1224, [6:6] -unusedBit_7_7 = bits, U32, 1224, [7:7] -unusedBit_7_8 = bits, U32, 1224, [8:8] -unusedBit_7_9 = bits, U32, 1224, [9:9] -unusedBit_7_10 = bits, U32, 1224, [10:10] -unusedBit_7_11 = bits, U32, 1224, [11:11] -unusedBit_7_12 = bits, U32, 1224, [12:12] -unusedBit_7_13 = bits, U32, 1224, [13:13] -unusedBit_7_14 = bits, U32, 1224, [14:14] -unusedBit_7_15 = bits, U32, 1224, [15:15] -unusedBit_7_16 = bits, U32, 1224, [16:16] -unusedBit_7_17 = bits, U32, 1224, [17:17] -unusedBit_7_18 = bits, U32, 1224, [18:18] -unusedBit_7_19 = bits, U32, 1224, [19:19] -unusedBit_7_20 = bits, U32, 1224, [20:20] -unusedBit_7_21 = bits, U32, 1224, [21:21] -unusedBit_7_22 = bits, U32, 1224, [22:22] -unusedBit_7_23 = bits, U32, 1224, [23:23] -unusedBit_7_24 = bits, U32, 1224, [24:24] -unusedBit_7_25 = bits, U32, 1224, [25:25] -unusedBit_7_26 = bits, U32, 1224, [26:26] -unusedBit_7_27 = bits, U32, 1224, [27:27] -unusedBit_7_28 = bits, U32, 1224, [28:28] -unusedBit_7_29 = bits, U32, 1224, [29:29] -unusedBit_7_30 = bits, U32, 1224, [30:30] -unusedBit_7_31 = bits, U32, 1224, [31:31] -; total TS size = 1228 -faultCode = scalar, U08, 1228, "", 1, 0 -heaterDuty = scalar, U08, 1229, "%", 1, 0 -pumpDuty = scalar, U08, 1230, "%", 1, 0 -tempC = scalar, U16, 1232, "C", 1, 0 -nernstVoltage = scalar, U16, 1234, "V", 0.001, 0 -esr = scalar, U16, 1236, "", 1, 0 -; total TS size = 1240 +m_hasSynchronizedPhase = bits, U32, 1136, [0:0] +unusedBit_1_1 = bits, U32, 1136, [1:1] +unusedBit_1_2 = bits, U32, 1136, [2:2] +unusedBit_1_3 = bits, U32, 1136, [3:3] +unusedBit_1_4 = bits, U32, 1136, [4:4] +unusedBit_1_5 = bits, U32, 1136, [5:5] +unusedBit_1_6 = bits, U32, 1136, [6:6] +unusedBit_1_7 = bits, U32, 1136, [7:7] +unusedBit_1_8 = bits, U32, 1136, [8:8] +unusedBit_1_9 = bits, U32, 1136, [9:9] +unusedBit_1_10 = bits, U32, 1136, [10:10] +unusedBit_1_11 = bits, U32, 1136, [11:11] +unusedBit_1_12 = bits, U32, 1136, [12:12] +unusedBit_1_13 = bits, U32, 1136, [13:13] +unusedBit_1_14 = bits, U32, 1136, [14:14] +unusedBit_1_15 = bits, U32, 1136, [15:15] +unusedBit_1_16 = bits, U32, 1136, [16:16] +unusedBit_1_17 = bits, U32, 1136, [17:17] +unusedBit_1_18 = bits, U32, 1136, [18:18] +unusedBit_1_19 = bits, U32, 1136, [19:19] +unusedBit_1_20 = bits, U32, 1136, [20:20] +unusedBit_1_21 = bits, U32, 1136, [21:21] +unusedBit_1_22 = bits, U32, 1136, [22:22] +unusedBit_1_23 = bits, U32, 1136, [23:23] +unusedBit_1_24 = bits, U32, 1136, [24:24] +unusedBit_1_25 = bits, U32, 1136, [25:25] +unusedBit_1_26 = bits, U32, 1136, [26:26] +unusedBit_1_27 = bits, U32, 1136, [27:27] +unusedBit_1_28 = bits, U32, 1136, [28:28] +unusedBit_1_29 = bits, U32, 1136, [29:29] +unusedBit_1_30 = bits, U32, 1136, [30:30] +unusedBit_1_31 = bits, U32, 1136, [31:31] +; total TS size = 1140 +wallFuelCorrection = scalar, F32, 1140, "", 1, 0 +wallFuel = scalar, F32, 1144, "", 1, 0 +; total TS size = 1148 +idleState = bits, S32, 1148, [0:2], "not important" +currentIdlePosition = scalar, F32, 1152 +baseIdlePosition = scalar, F32, 1156 +iacByTpsTaper = scalar, F32, 1160 +throttlePedalUpState = scalar, S32, 1164, "", 1, 0 +mightResetPid = bits, U32, 1168, [0:0] +shouldResetPid = bits, U32, 1168, [1:1] +wasResetPid = bits, U32, 1168, [2:2] +mustResetPid = bits, U32, 1168, [3:3] +isCranking = bits, U32, 1168, [4:4] +useIacTableForCoasting = bits, U32, 1168, [5:5] +notIdling = bits, U32, 1168, [6:6] +needReset = bits, U32, 1168, [7:7] +isInDeadZone = bits, U32, 1168, [8:8] +isBlipping = bits, U32, 1168, [9:9] +useClosedLoop = bits, U32, 1168, [10:10] +badTps = bits, U32, 1168, [11:11] +looksLikeRunning = bits, U32, 1168, [12:12] +looksLikeCoasting = bits, U32, 1168, [13:13] +looksLikeCrankToIdle = bits, U32, 1168, [14:14] +isVerboseIAC = bits, U32, 1168, [15:15] +isIdleCoasting = bits, U32, 1168, [16:16] +unusedBit_22_17 = bits, U32, 1168, [17:17] +unusedBit_22_18 = bits, U32, 1168, [18:18] +unusedBit_22_19 = bits, U32, 1168, [19:19] +unusedBit_22_20 = bits, U32, 1168, [20:20] +unusedBit_22_21 = bits, U32, 1168, [21:21] +unusedBit_22_22 = bits, U32, 1168, [22:22] +unusedBit_22_23 = bits, U32, 1168, [23:23] +unusedBit_22_24 = bits, U32, 1168, [24:24] +unusedBit_22_25 = bits, U32, 1168, [25:25] +unusedBit_22_26 = bits, U32, 1168, [26:26] +unusedBit_22_27 = bits, U32, 1168, [27:27] +unusedBit_22_28 = bits, U32, 1168, [28:28] +unusedBit_22_29 = bits, U32, 1168, [29:29] +unusedBit_22_30 = bits, U32, 1168, [30:30] +unusedBit_22_31 = bits, U32, 1168, [31:31] +targetRpmByClt = scalar, S32, 1172, "", 1, 0 +targetRpmAcBump = scalar, S32, 1176, "", 1, 0 +iacByRpmTaper = scalar, F32, 1180 +luaAdd = scalar, F32, 1184 +; total TS size = 1188 +baseDwell = scalar, F32, 1188, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 1192, "", 1, 0 +luaTimingAdd = scalar, F32, 1196, "", 1, 0 +luaTimingMult = scalar, F32, 1200, "", 1, 0 +; total TS size = 1204 +idlePosition = scalar, F32, 1204, "", 1, 0 +trim = scalar, F32, 1208, "", 1, 0 +luaAdjustment = scalar, F32, 1212, "", 1, 0 +etbFeedForward = scalar, F32, 1216 +etbIntegralError = scalar, F32, 1220, "", 1, 0 +etbCurrentTarget = scalar, F32, 1224, "%", 1, 0 +etbRevLimitActive = bits, U32, 1228, [0:0] +unusedBit_7_1 = bits, U32, 1228, [1:1] +unusedBit_7_2 = bits, U32, 1228, [2:2] +unusedBit_7_3 = bits, U32, 1228, [3:3] +unusedBit_7_4 = bits, U32, 1228, [4:4] +unusedBit_7_5 = bits, U32, 1228, [5:5] +unusedBit_7_6 = bits, U32, 1228, [6:6] +unusedBit_7_7 = bits, U32, 1228, [7:7] +unusedBit_7_8 = bits, U32, 1228, [8:8] +unusedBit_7_9 = bits, U32, 1228, [9:9] +unusedBit_7_10 = bits, U32, 1228, [10:10] +unusedBit_7_11 = bits, U32, 1228, [11:11] +unusedBit_7_12 = bits, U32, 1228, [12:12] +unusedBit_7_13 = bits, U32, 1228, [13:13] +unusedBit_7_14 = bits, U32, 1228, [14:14] +unusedBit_7_15 = bits, U32, 1228, [15:15] +unusedBit_7_16 = bits, U32, 1228, [16:16] +unusedBit_7_17 = bits, U32, 1228, [17:17] +unusedBit_7_18 = bits, U32, 1228, [18:18] +unusedBit_7_19 = bits, U32, 1228, [19:19] +unusedBit_7_20 = bits, U32, 1228, [20:20] +unusedBit_7_21 = bits, U32, 1228, [21:21] +unusedBit_7_22 = bits, U32, 1228, [22:22] +unusedBit_7_23 = bits, U32, 1228, [23:23] +unusedBit_7_24 = bits, U32, 1228, [24:24] +unusedBit_7_25 = bits, U32, 1228, [25:25] +unusedBit_7_26 = bits, U32, 1228, [26:26] +unusedBit_7_27 = bits, U32, 1228, [27:27] +unusedBit_7_28 = bits, U32, 1228, [28:28] +unusedBit_7_29 = bits, U32, 1228, [29:29] +unusedBit_7_30 = bits, U32, 1228, [30:30] +unusedBit_7_31 = bits, U32, 1228, [31:31] +; total TS size = 1232 +faultCode = scalar, U08, 1232, "", 1, 0 +heaterDuty = scalar, U08, 1233, "%", 1, 0 +pumpDuty = scalar, U08, 1234, "%", 1, 0 +tempC = scalar, U16, 1236, "C", 1, 0 +nernstVoltage = scalar, U16, 1238, "V", 0.001, 0 +esr = scalar, U16, 1240, "", 1, 0 +; total TS size = 1244 time = { timeNow } @@ -4847,7 +4847,7 @@ entry = mapVvt_MAP_AT_SPECIAL_POINT, "mapVvt_MAP_AT_SPECIAL_POINT", float, "%.3 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 Phase2", int, "%d" +entry = currentEngineDecodedPhase, "Engine Phase2", float, "%.3f" entry = totalRevolutionCounter, "Crank revolution counter", int, "%d" entry = vvtSyncGapRatio, "vvtSyncGapRatio", float, "%.3f" entry = vvtCurrentPosition, "vvtCurrentPosition", float, "%.3f" diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_469.ini b/firmware/tunerstudio/generated/rusefi_prometheus_469.ini index f3b0a11488..a58eb8d37e 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.01.prometheus_469.2400401219" + signature = "rusEFI 2022.09.01.prometheus_469.2290021210" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.09.01.prometheus_469.2400401219" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.09.01.prometheus_469.2290021210" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Sep 01 04:52:39 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Sep 01 05:33:30 UTC 2022 pageSize = 21300 page = 1 @@ -2118,7 +2118,7 @@ maxKnockRetardRpmBins = array, U08, 21294, [6], "RPM", 100.0, 0, 0, 25000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1240 + ochBlockSize = 1244 ; ; see TunerStudioOutputChannels struct @@ -3090,147 +3090,147 @@ mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1096, "", 1, 0 mapVvt_MAP_AT_DIFF = scalar, F32, 1100, "", 1, 0 mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1104, "", 1, 0 mapVvt_map_peak = scalar, U08, 1105, "", 1, 0 -currentEngineDecodedPhase = scalar, U16, 1106, "deg", 1, 0 -; total TS size = 1108 -totalRevolutionCounter = scalar, U32, 1108, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1112, "", 1, 0 -vvtCurrentPosition = scalar, F32, 1116, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1120, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 1124, "", 1, 0 -triggerStateIndex = scalar, U08, 1128, "", 1, 0 -vvtCounter = scalar, U08, 1129, "", 1, 0 -camResyncCounter = scalar, U08, 1130, "", 1, 0 -vvtStateIndex = scalar, U08, 1131, "", 1, 0 -; total TS size = 1132 -m_hasSynchronizedPhase = bits, U32, 1132, [0:0] -unusedBit_1_1 = bits, U32, 1132, [1:1] -unusedBit_1_2 = bits, U32, 1132, [2:2] -unusedBit_1_3 = bits, U32, 1132, [3:3] -unusedBit_1_4 = bits, U32, 1132, [4:4] -unusedBit_1_5 = bits, U32, 1132, [5:5] -unusedBit_1_6 = bits, U32, 1132, [6:6] -unusedBit_1_7 = bits, U32, 1132, [7:7] -unusedBit_1_8 = bits, U32, 1132, [8:8] -unusedBit_1_9 = bits, U32, 1132, [9:9] -unusedBit_1_10 = bits, U32, 1132, [10:10] -unusedBit_1_11 = bits, U32, 1132, [11:11] -unusedBit_1_12 = bits, U32, 1132, [12:12] -unusedBit_1_13 = bits, U32, 1132, [13:13] -unusedBit_1_14 = bits, U32, 1132, [14:14] -unusedBit_1_15 = bits, U32, 1132, [15:15] -unusedBit_1_16 = bits, U32, 1132, [16:16] -unusedBit_1_17 = bits, U32, 1132, [17:17] -unusedBit_1_18 = bits, U32, 1132, [18:18] -unusedBit_1_19 = bits, U32, 1132, [19:19] -unusedBit_1_20 = bits, U32, 1132, [20:20] -unusedBit_1_21 = bits, U32, 1132, [21:21] -unusedBit_1_22 = bits, U32, 1132, [22:22] -unusedBit_1_23 = bits, U32, 1132, [23:23] -unusedBit_1_24 = bits, U32, 1132, [24:24] -unusedBit_1_25 = bits, U32, 1132, [25:25] -unusedBit_1_26 = bits, U32, 1132, [26:26] -unusedBit_1_27 = bits, U32, 1132, [27:27] -unusedBit_1_28 = bits, U32, 1132, [28:28] -unusedBit_1_29 = bits, U32, 1132, [29:29] -unusedBit_1_30 = bits, U32, 1132, [30:30] -unusedBit_1_31 = bits, U32, 1132, [31:31] +currentEngineDecodedPhase = scalar, F32, 1108, "deg", 1, 0 +; total TS size = 1112 +totalRevolutionCounter = scalar, U32, 1112, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1116, "", 1, 0 +vvtCurrentPosition = scalar, F32, 1120, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1124, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 1128, "", 1, 0 +triggerStateIndex = scalar, U08, 1132, "", 1, 0 +vvtCounter = scalar, U08, 1133, "", 1, 0 +camResyncCounter = scalar, U08, 1134, "", 1, 0 +vvtStateIndex = scalar, U08, 1135, "", 1, 0 ; total TS size = 1136 -wallFuelCorrection = scalar, F32, 1136, "", 1, 0 -wallFuel = scalar, F32, 1140, "", 1, 0 -; total TS size = 1144 -idleState = bits, S32, 1144, [0:2], "not important" -currentIdlePosition = scalar, F32, 1148 -baseIdlePosition = scalar, F32, 1152 -iacByTpsTaper = scalar, F32, 1156 -throttlePedalUpState = scalar, S32, 1160, "", 1, 0 -mightResetPid = bits, U32, 1164, [0:0] -shouldResetPid = bits, U32, 1164, [1:1] -wasResetPid = bits, U32, 1164, [2:2] -mustResetPid = bits, U32, 1164, [3:3] -isCranking = bits, U32, 1164, [4:4] -useIacTableForCoasting = bits, U32, 1164, [5:5] -notIdling = bits, U32, 1164, [6:6] -needReset = bits, U32, 1164, [7:7] -isInDeadZone = bits, U32, 1164, [8:8] -isBlipping = bits, U32, 1164, [9:9] -useClosedLoop = bits, U32, 1164, [10:10] -badTps = bits, U32, 1164, [11:11] -looksLikeRunning = bits, U32, 1164, [12:12] -looksLikeCoasting = bits, U32, 1164, [13:13] -looksLikeCrankToIdle = bits, U32, 1164, [14:14] -isVerboseIAC = bits, U32, 1164, [15:15] -isIdleCoasting = bits, U32, 1164, [16:16] -unusedBit_22_17 = bits, U32, 1164, [17:17] -unusedBit_22_18 = bits, U32, 1164, [18:18] -unusedBit_22_19 = bits, U32, 1164, [19:19] -unusedBit_22_20 = bits, U32, 1164, [20:20] -unusedBit_22_21 = bits, U32, 1164, [21:21] -unusedBit_22_22 = bits, U32, 1164, [22:22] -unusedBit_22_23 = bits, U32, 1164, [23:23] -unusedBit_22_24 = bits, U32, 1164, [24:24] -unusedBit_22_25 = bits, U32, 1164, [25:25] -unusedBit_22_26 = bits, U32, 1164, [26:26] -unusedBit_22_27 = bits, U32, 1164, [27:27] -unusedBit_22_28 = bits, U32, 1164, [28:28] -unusedBit_22_29 = bits, U32, 1164, [29:29] -unusedBit_22_30 = bits, U32, 1164, [30:30] -unusedBit_22_31 = bits, U32, 1164, [31:31] -targetRpmByClt = scalar, S32, 1168, "", 1, 0 -targetRpmAcBump = scalar, S32, 1172, "", 1, 0 -iacByRpmTaper = scalar, F32, 1176 -luaAdd = scalar, F32, 1180 -; total TS size = 1184 -baseDwell = scalar, F32, 1184, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 1188, "", 1, 0 -luaTimingAdd = scalar, F32, 1192, "", 1, 0 -luaTimingMult = scalar, F32, 1196, "", 1, 0 -; total TS size = 1200 -idlePosition = scalar, F32, 1200, "", 1, 0 -trim = scalar, F32, 1204, "", 1, 0 -luaAdjustment = scalar, F32, 1208, "", 1, 0 -etbFeedForward = scalar, F32, 1212 -etbIntegralError = scalar, F32, 1216, "", 1, 0 -etbCurrentTarget = scalar, F32, 1220, "%", 1, 0 -etbRevLimitActive = bits, U32, 1224, [0:0] -unusedBit_7_1 = bits, U32, 1224, [1:1] -unusedBit_7_2 = bits, U32, 1224, [2:2] -unusedBit_7_3 = bits, U32, 1224, [3:3] -unusedBit_7_4 = bits, U32, 1224, [4:4] -unusedBit_7_5 = bits, U32, 1224, [5:5] -unusedBit_7_6 = bits, U32, 1224, [6:6] -unusedBit_7_7 = bits, U32, 1224, [7:7] -unusedBit_7_8 = bits, U32, 1224, [8:8] -unusedBit_7_9 = bits, U32, 1224, [9:9] -unusedBit_7_10 = bits, U32, 1224, [10:10] -unusedBit_7_11 = bits, U32, 1224, [11:11] -unusedBit_7_12 = bits, U32, 1224, [12:12] -unusedBit_7_13 = bits, U32, 1224, [13:13] -unusedBit_7_14 = bits, U32, 1224, [14:14] -unusedBit_7_15 = bits, U32, 1224, [15:15] -unusedBit_7_16 = bits, U32, 1224, [16:16] -unusedBit_7_17 = bits, U32, 1224, [17:17] -unusedBit_7_18 = bits, U32, 1224, [18:18] -unusedBit_7_19 = bits, U32, 1224, [19:19] -unusedBit_7_20 = bits, U32, 1224, [20:20] -unusedBit_7_21 = bits, U32, 1224, [21:21] -unusedBit_7_22 = bits, U32, 1224, [22:22] -unusedBit_7_23 = bits, U32, 1224, [23:23] -unusedBit_7_24 = bits, U32, 1224, [24:24] -unusedBit_7_25 = bits, U32, 1224, [25:25] -unusedBit_7_26 = bits, U32, 1224, [26:26] -unusedBit_7_27 = bits, U32, 1224, [27:27] -unusedBit_7_28 = bits, U32, 1224, [28:28] -unusedBit_7_29 = bits, U32, 1224, [29:29] -unusedBit_7_30 = bits, U32, 1224, [30:30] -unusedBit_7_31 = bits, U32, 1224, [31:31] -; total TS size = 1228 -faultCode = scalar, U08, 1228, "", 1, 0 -heaterDuty = scalar, U08, 1229, "%", 1, 0 -pumpDuty = scalar, U08, 1230, "%", 1, 0 -tempC = scalar, U16, 1232, "C", 1, 0 -nernstVoltage = scalar, U16, 1234, "V", 0.001, 0 -esr = scalar, U16, 1236, "", 1, 0 -; total TS size = 1240 +m_hasSynchronizedPhase = bits, U32, 1136, [0:0] +unusedBit_1_1 = bits, U32, 1136, [1:1] +unusedBit_1_2 = bits, U32, 1136, [2:2] +unusedBit_1_3 = bits, U32, 1136, [3:3] +unusedBit_1_4 = bits, U32, 1136, [4:4] +unusedBit_1_5 = bits, U32, 1136, [5:5] +unusedBit_1_6 = bits, U32, 1136, [6:6] +unusedBit_1_7 = bits, U32, 1136, [7:7] +unusedBit_1_8 = bits, U32, 1136, [8:8] +unusedBit_1_9 = bits, U32, 1136, [9:9] +unusedBit_1_10 = bits, U32, 1136, [10:10] +unusedBit_1_11 = bits, U32, 1136, [11:11] +unusedBit_1_12 = bits, U32, 1136, [12:12] +unusedBit_1_13 = bits, U32, 1136, [13:13] +unusedBit_1_14 = bits, U32, 1136, [14:14] +unusedBit_1_15 = bits, U32, 1136, [15:15] +unusedBit_1_16 = bits, U32, 1136, [16:16] +unusedBit_1_17 = bits, U32, 1136, [17:17] +unusedBit_1_18 = bits, U32, 1136, [18:18] +unusedBit_1_19 = bits, U32, 1136, [19:19] +unusedBit_1_20 = bits, U32, 1136, [20:20] +unusedBit_1_21 = bits, U32, 1136, [21:21] +unusedBit_1_22 = bits, U32, 1136, [22:22] +unusedBit_1_23 = bits, U32, 1136, [23:23] +unusedBit_1_24 = bits, U32, 1136, [24:24] +unusedBit_1_25 = bits, U32, 1136, [25:25] +unusedBit_1_26 = bits, U32, 1136, [26:26] +unusedBit_1_27 = bits, U32, 1136, [27:27] +unusedBit_1_28 = bits, U32, 1136, [28:28] +unusedBit_1_29 = bits, U32, 1136, [29:29] +unusedBit_1_30 = bits, U32, 1136, [30:30] +unusedBit_1_31 = bits, U32, 1136, [31:31] +; total TS size = 1140 +wallFuelCorrection = scalar, F32, 1140, "", 1, 0 +wallFuel = scalar, F32, 1144, "", 1, 0 +; total TS size = 1148 +idleState = bits, S32, 1148, [0:2], "not important" +currentIdlePosition = scalar, F32, 1152 +baseIdlePosition = scalar, F32, 1156 +iacByTpsTaper = scalar, F32, 1160 +throttlePedalUpState = scalar, S32, 1164, "", 1, 0 +mightResetPid = bits, U32, 1168, [0:0] +shouldResetPid = bits, U32, 1168, [1:1] +wasResetPid = bits, U32, 1168, [2:2] +mustResetPid = bits, U32, 1168, [3:3] +isCranking = bits, U32, 1168, [4:4] +useIacTableForCoasting = bits, U32, 1168, [5:5] +notIdling = bits, U32, 1168, [6:6] +needReset = bits, U32, 1168, [7:7] +isInDeadZone = bits, U32, 1168, [8:8] +isBlipping = bits, U32, 1168, [9:9] +useClosedLoop = bits, U32, 1168, [10:10] +badTps = bits, U32, 1168, [11:11] +looksLikeRunning = bits, U32, 1168, [12:12] +looksLikeCoasting = bits, U32, 1168, [13:13] +looksLikeCrankToIdle = bits, U32, 1168, [14:14] +isVerboseIAC = bits, U32, 1168, [15:15] +isIdleCoasting = bits, U32, 1168, [16:16] +unusedBit_22_17 = bits, U32, 1168, [17:17] +unusedBit_22_18 = bits, U32, 1168, [18:18] +unusedBit_22_19 = bits, U32, 1168, [19:19] +unusedBit_22_20 = bits, U32, 1168, [20:20] +unusedBit_22_21 = bits, U32, 1168, [21:21] +unusedBit_22_22 = bits, U32, 1168, [22:22] +unusedBit_22_23 = bits, U32, 1168, [23:23] +unusedBit_22_24 = bits, U32, 1168, [24:24] +unusedBit_22_25 = bits, U32, 1168, [25:25] +unusedBit_22_26 = bits, U32, 1168, [26:26] +unusedBit_22_27 = bits, U32, 1168, [27:27] +unusedBit_22_28 = bits, U32, 1168, [28:28] +unusedBit_22_29 = bits, U32, 1168, [29:29] +unusedBit_22_30 = bits, U32, 1168, [30:30] +unusedBit_22_31 = bits, U32, 1168, [31:31] +targetRpmByClt = scalar, S32, 1172, "", 1, 0 +targetRpmAcBump = scalar, S32, 1176, "", 1, 0 +iacByRpmTaper = scalar, F32, 1180 +luaAdd = scalar, F32, 1184 +; total TS size = 1188 +baseDwell = scalar, F32, 1188, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 1192, "", 1, 0 +luaTimingAdd = scalar, F32, 1196, "", 1, 0 +luaTimingMult = scalar, F32, 1200, "", 1, 0 +; total TS size = 1204 +idlePosition = scalar, F32, 1204, "", 1, 0 +trim = scalar, F32, 1208, "", 1, 0 +luaAdjustment = scalar, F32, 1212, "", 1, 0 +etbFeedForward = scalar, F32, 1216 +etbIntegralError = scalar, F32, 1220, "", 1, 0 +etbCurrentTarget = scalar, F32, 1224, "%", 1, 0 +etbRevLimitActive = bits, U32, 1228, [0:0] +unusedBit_7_1 = bits, U32, 1228, [1:1] +unusedBit_7_2 = bits, U32, 1228, [2:2] +unusedBit_7_3 = bits, U32, 1228, [3:3] +unusedBit_7_4 = bits, U32, 1228, [4:4] +unusedBit_7_5 = bits, U32, 1228, [5:5] +unusedBit_7_6 = bits, U32, 1228, [6:6] +unusedBit_7_7 = bits, U32, 1228, [7:7] +unusedBit_7_8 = bits, U32, 1228, [8:8] +unusedBit_7_9 = bits, U32, 1228, [9:9] +unusedBit_7_10 = bits, U32, 1228, [10:10] +unusedBit_7_11 = bits, U32, 1228, [11:11] +unusedBit_7_12 = bits, U32, 1228, [12:12] +unusedBit_7_13 = bits, U32, 1228, [13:13] +unusedBit_7_14 = bits, U32, 1228, [14:14] +unusedBit_7_15 = bits, U32, 1228, [15:15] +unusedBit_7_16 = bits, U32, 1228, [16:16] +unusedBit_7_17 = bits, U32, 1228, [17:17] +unusedBit_7_18 = bits, U32, 1228, [18:18] +unusedBit_7_19 = bits, U32, 1228, [19:19] +unusedBit_7_20 = bits, U32, 1228, [20:20] +unusedBit_7_21 = bits, U32, 1228, [21:21] +unusedBit_7_22 = bits, U32, 1228, [22:22] +unusedBit_7_23 = bits, U32, 1228, [23:23] +unusedBit_7_24 = bits, U32, 1228, [24:24] +unusedBit_7_25 = bits, U32, 1228, [25:25] +unusedBit_7_26 = bits, U32, 1228, [26:26] +unusedBit_7_27 = bits, U32, 1228, [27:27] +unusedBit_7_28 = bits, U32, 1228, [28:28] +unusedBit_7_29 = bits, U32, 1228, [29:29] +unusedBit_7_30 = bits, U32, 1228, [30:30] +unusedBit_7_31 = bits, U32, 1228, [31:31] +; total TS size = 1232 +faultCode = scalar, U08, 1232, "", 1, 0 +heaterDuty = scalar, U08, 1233, "%", 1, 0 +pumpDuty = scalar, U08, 1234, "%", 1, 0 +tempC = scalar, U16, 1236, "C", 1, 0 +nernstVoltage = scalar, U16, 1238, "V", 0.001, 0 +esr = scalar, U16, 1240, "", 1, 0 +; total TS size = 1244 time = { timeNow } @@ -4847,7 +4847,7 @@ entry = mapVvt_MAP_AT_SPECIAL_POINT, "mapVvt_MAP_AT_SPECIAL_POINT", float, "%.3 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 Phase2", int, "%d" +entry = currentEngineDecodedPhase, "Engine Phase2", float, "%.3f" entry = totalRevolutionCounter, "Crank revolution counter", int, "%d" entry = vvtSyncGapRatio, "vvtSyncGapRatio", float, "%.3f" entry = vvtCurrentPosition, "vvtCurrentPosition", float, "%.3f" diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f4.ini b/firmware/tunerstudio/generated/rusefi_proteus_f4.ini index 51667ce7b5..a3a8a6d7da 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.01.proteus_f4.2050238931" + signature = "rusEFI 2022.09.01.proteus_f4.2103045578" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.09.01.proteus_f4.2050238931" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.09.01.proteus_f4.2103045578" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Sep 01 04:52:44 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Sep 01 05:33:35 UTC 2022 pageSize = 21300 page = 1 @@ -2118,7 +2118,7 @@ maxKnockRetardRpmBins = array, U08, 21294, [6], "RPM", 100.0, 0, 0, 25000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1240 + ochBlockSize = 1244 ; ; see TunerStudioOutputChannels struct @@ -3090,147 +3090,147 @@ mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1096, "", 1, 0 mapVvt_MAP_AT_DIFF = scalar, F32, 1100, "", 1, 0 mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1104, "", 1, 0 mapVvt_map_peak = scalar, U08, 1105, "", 1, 0 -currentEngineDecodedPhase = scalar, U16, 1106, "deg", 1, 0 -; total TS size = 1108 -totalRevolutionCounter = scalar, U32, 1108, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1112, "", 1, 0 -vvtCurrentPosition = scalar, F32, 1116, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1120, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 1124, "", 1, 0 -triggerStateIndex = scalar, U08, 1128, "", 1, 0 -vvtCounter = scalar, U08, 1129, "", 1, 0 -camResyncCounter = scalar, U08, 1130, "", 1, 0 -vvtStateIndex = scalar, U08, 1131, "", 1, 0 -; total TS size = 1132 -m_hasSynchronizedPhase = bits, U32, 1132, [0:0] -unusedBit_1_1 = bits, U32, 1132, [1:1] -unusedBit_1_2 = bits, U32, 1132, [2:2] -unusedBit_1_3 = bits, U32, 1132, [3:3] -unusedBit_1_4 = bits, U32, 1132, [4:4] -unusedBit_1_5 = bits, U32, 1132, [5:5] -unusedBit_1_6 = bits, U32, 1132, [6:6] -unusedBit_1_7 = bits, U32, 1132, [7:7] -unusedBit_1_8 = bits, U32, 1132, [8:8] -unusedBit_1_9 = bits, U32, 1132, [9:9] -unusedBit_1_10 = bits, U32, 1132, [10:10] -unusedBit_1_11 = bits, U32, 1132, [11:11] -unusedBit_1_12 = bits, U32, 1132, [12:12] -unusedBit_1_13 = bits, U32, 1132, [13:13] -unusedBit_1_14 = bits, U32, 1132, [14:14] -unusedBit_1_15 = bits, U32, 1132, [15:15] -unusedBit_1_16 = bits, U32, 1132, [16:16] -unusedBit_1_17 = bits, U32, 1132, [17:17] -unusedBit_1_18 = bits, U32, 1132, [18:18] -unusedBit_1_19 = bits, U32, 1132, [19:19] -unusedBit_1_20 = bits, U32, 1132, [20:20] -unusedBit_1_21 = bits, U32, 1132, [21:21] -unusedBit_1_22 = bits, U32, 1132, [22:22] -unusedBit_1_23 = bits, U32, 1132, [23:23] -unusedBit_1_24 = bits, U32, 1132, [24:24] -unusedBit_1_25 = bits, U32, 1132, [25:25] -unusedBit_1_26 = bits, U32, 1132, [26:26] -unusedBit_1_27 = bits, U32, 1132, [27:27] -unusedBit_1_28 = bits, U32, 1132, [28:28] -unusedBit_1_29 = bits, U32, 1132, [29:29] -unusedBit_1_30 = bits, U32, 1132, [30:30] -unusedBit_1_31 = bits, U32, 1132, [31:31] +currentEngineDecodedPhase = scalar, F32, 1108, "deg", 1, 0 +; total TS size = 1112 +totalRevolutionCounter = scalar, U32, 1112, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1116, "", 1, 0 +vvtCurrentPosition = scalar, F32, 1120, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1124, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 1128, "", 1, 0 +triggerStateIndex = scalar, U08, 1132, "", 1, 0 +vvtCounter = scalar, U08, 1133, "", 1, 0 +camResyncCounter = scalar, U08, 1134, "", 1, 0 +vvtStateIndex = scalar, U08, 1135, "", 1, 0 ; total TS size = 1136 -wallFuelCorrection = scalar, F32, 1136, "", 1, 0 -wallFuel = scalar, F32, 1140, "", 1, 0 -; total TS size = 1144 -idleState = bits, S32, 1144, [0:2], "not important" -currentIdlePosition = scalar, F32, 1148 -baseIdlePosition = scalar, F32, 1152 -iacByTpsTaper = scalar, F32, 1156 -throttlePedalUpState = scalar, S32, 1160, "", 1, 0 -mightResetPid = bits, U32, 1164, [0:0] -shouldResetPid = bits, U32, 1164, [1:1] -wasResetPid = bits, U32, 1164, [2:2] -mustResetPid = bits, U32, 1164, [3:3] -isCranking = bits, U32, 1164, [4:4] -useIacTableForCoasting = bits, U32, 1164, [5:5] -notIdling = bits, U32, 1164, [6:6] -needReset = bits, U32, 1164, [7:7] -isInDeadZone = bits, U32, 1164, [8:8] -isBlipping = bits, U32, 1164, [9:9] -useClosedLoop = bits, U32, 1164, [10:10] -badTps = bits, U32, 1164, [11:11] -looksLikeRunning = bits, U32, 1164, [12:12] -looksLikeCoasting = bits, U32, 1164, [13:13] -looksLikeCrankToIdle = bits, U32, 1164, [14:14] -isVerboseIAC = bits, U32, 1164, [15:15] -isIdleCoasting = bits, U32, 1164, [16:16] -unusedBit_22_17 = bits, U32, 1164, [17:17] -unusedBit_22_18 = bits, U32, 1164, [18:18] -unusedBit_22_19 = bits, U32, 1164, [19:19] -unusedBit_22_20 = bits, U32, 1164, [20:20] -unusedBit_22_21 = bits, U32, 1164, [21:21] -unusedBit_22_22 = bits, U32, 1164, [22:22] -unusedBit_22_23 = bits, U32, 1164, [23:23] -unusedBit_22_24 = bits, U32, 1164, [24:24] -unusedBit_22_25 = bits, U32, 1164, [25:25] -unusedBit_22_26 = bits, U32, 1164, [26:26] -unusedBit_22_27 = bits, U32, 1164, [27:27] -unusedBit_22_28 = bits, U32, 1164, [28:28] -unusedBit_22_29 = bits, U32, 1164, [29:29] -unusedBit_22_30 = bits, U32, 1164, [30:30] -unusedBit_22_31 = bits, U32, 1164, [31:31] -targetRpmByClt = scalar, S32, 1168, "", 1, 0 -targetRpmAcBump = scalar, S32, 1172, "", 1, 0 -iacByRpmTaper = scalar, F32, 1176 -luaAdd = scalar, F32, 1180 -; total TS size = 1184 -baseDwell = scalar, F32, 1184, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 1188, "", 1, 0 -luaTimingAdd = scalar, F32, 1192, "", 1, 0 -luaTimingMult = scalar, F32, 1196, "", 1, 0 -; total TS size = 1200 -idlePosition = scalar, F32, 1200, "", 1, 0 -trim = scalar, F32, 1204, "", 1, 0 -luaAdjustment = scalar, F32, 1208, "", 1, 0 -etbFeedForward = scalar, F32, 1212 -etbIntegralError = scalar, F32, 1216, "", 1, 0 -etbCurrentTarget = scalar, F32, 1220, "%", 1, 0 -etbRevLimitActive = bits, U32, 1224, [0:0] -unusedBit_7_1 = bits, U32, 1224, [1:1] -unusedBit_7_2 = bits, U32, 1224, [2:2] -unusedBit_7_3 = bits, U32, 1224, [3:3] -unusedBit_7_4 = bits, U32, 1224, [4:4] -unusedBit_7_5 = bits, U32, 1224, [5:5] -unusedBit_7_6 = bits, U32, 1224, [6:6] -unusedBit_7_7 = bits, U32, 1224, [7:7] -unusedBit_7_8 = bits, U32, 1224, [8:8] -unusedBit_7_9 = bits, U32, 1224, [9:9] -unusedBit_7_10 = bits, U32, 1224, [10:10] -unusedBit_7_11 = bits, U32, 1224, [11:11] -unusedBit_7_12 = bits, U32, 1224, [12:12] -unusedBit_7_13 = bits, U32, 1224, [13:13] -unusedBit_7_14 = bits, U32, 1224, [14:14] -unusedBit_7_15 = bits, U32, 1224, [15:15] -unusedBit_7_16 = bits, U32, 1224, [16:16] -unusedBit_7_17 = bits, U32, 1224, [17:17] -unusedBit_7_18 = bits, U32, 1224, [18:18] -unusedBit_7_19 = bits, U32, 1224, [19:19] -unusedBit_7_20 = bits, U32, 1224, [20:20] -unusedBit_7_21 = bits, U32, 1224, [21:21] -unusedBit_7_22 = bits, U32, 1224, [22:22] -unusedBit_7_23 = bits, U32, 1224, [23:23] -unusedBit_7_24 = bits, U32, 1224, [24:24] -unusedBit_7_25 = bits, U32, 1224, [25:25] -unusedBit_7_26 = bits, U32, 1224, [26:26] -unusedBit_7_27 = bits, U32, 1224, [27:27] -unusedBit_7_28 = bits, U32, 1224, [28:28] -unusedBit_7_29 = bits, U32, 1224, [29:29] -unusedBit_7_30 = bits, U32, 1224, [30:30] -unusedBit_7_31 = bits, U32, 1224, [31:31] -; total TS size = 1228 -faultCode = scalar, U08, 1228, "", 1, 0 -heaterDuty = scalar, U08, 1229, "%", 1, 0 -pumpDuty = scalar, U08, 1230, "%", 1, 0 -tempC = scalar, U16, 1232, "C", 1, 0 -nernstVoltage = scalar, U16, 1234, "V", 0.001, 0 -esr = scalar, U16, 1236, "", 1, 0 -; total TS size = 1240 +m_hasSynchronizedPhase = bits, U32, 1136, [0:0] +unusedBit_1_1 = bits, U32, 1136, [1:1] +unusedBit_1_2 = bits, U32, 1136, [2:2] +unusedBit_1_3 = bits, U32, 1136, [3:3] +unusedBit_1_4 = bits, U32, 1136, [4:4] +unusedBit_1_5 = bits, U32, 1136, [5:5] +unusedBit_1_6 = bits, U32, 1136, [6:6] +unusedBit_1_7 = bits, U32, 1136, [7:7] +unusedBit_1_8 = bits, U32, 1136, [8:8] +unusedBit_1_9 = bits, U32, 1136, [9:9] +unusedBit_1_10 = bits, U32, 1136, [10:10] +unusedBit_1_11 = bits, U32, 1136, [11:11] +unusedBit_1_12 = bits, U32, 1136, [12:12] +unusedBit_1_13 = bits, U32, 1136, [13:13] +unusedBit_1_14 = bits, U32, 1136, [14:14] +unusedBit_1_15 = bits, U32, 1136, [15:15] +unusedBit_1_16 = bits, U32, 1136, [16:16] +unusedBit_1_17 = bits, U32, 1136, [17:17] +unusedBit_1_18 = bits, U32, 1136, [18:18] +unusedBit_1_19 = bits, U32, 1136, [19:19] +unusedBit_1_20 = bits, U32, 1136, [20:20] +unusedBit_1_21 = bits, U32, 1136, [21:21] +unusedBit_1_22 = bits, U32, 1136, [22:22] +unusedBit_1_23 = bits, U32, 1136, [23:23] +unusedBit_1_24 = bits, U32, 1136, [24:24] +unusedBit_1_25 = bits, U32, 1136, [25:25] +unusedBit_1_26 = bits, U32, 1136, [26:26] +unusedBit_1_27 = bits, U32, 1136, [27:27] +unusedBit_1_28 = bits, U32, 1136, [28:28] +unusedBit_1_29 = bits, U32, 1136, [29:29] +unusedBit_1_30 = bits, U32, 1136, [30:30] +unusedBit_1_31 = bits, U32, 1136, [31:31] +; total TS size = 1140 +wallFuelCorrection = scalar, F32, 1140, "", 1, 0 +wallFuel = scalar, F32, 1144, "", 1, 0 +; total TS size = 1148 +idleState = bits, S32, 1148, [0:2], "not important" +currentIdlePosition = scalar, F32, 1152 +baseIdlePosition = scalar, F32, 1156 +iacByTpsTaper = scalar, F32, 1160 +throttlePedalUpState = scalar, S32, 1164, "", 1, 0 +mightResetPid = bits, U32, 1168, [0:0] +shouldResetPid = bits, U32, 1168, [1:1] +wasResetPid = bits, U32, 1168, [2:2] +mustResetPid = bits, U32, 1168, [3:3] +isCranking = bits, U32, 1168, [4:4] +useIacTableForCoasting = bits, U32, 1168, [5:5] +notIdling = bits, U32, 1168, [6:6] +needReset = bits, U32, 1168, [7:7] +isInDeadZone = bits, U32, 1168, [8:8] +isBlipping = bits, U32, 1168, [9:9] +useClosedLoop = bits, U32, 1168, [10:10] +badTps = bits, U32, 1168, [11:11] +looksLikeRunning = bits, U32, 1168, [12:12] +looksLikeCoasting = bits, U32, 1168, [13:13] +looksLikeCrankToIdle = bits, U32, 1168, [14:14] +isVerboseIAC = bits, U32, 1168, [15:15] +isIdleCoasting = bits, U32, 1168, [16:16] +unusedBit_22_17 = bits, U32, 1168, [17:17] +unusedBit_22_18 = bits, U32, 1168, [18:18] +unusedBit_22_19 = bits, U32, 1168, [19:19] +unusedBit_22_20 = bits, U32, 1168, [20:20] +unusedBit_22_21 = bits, U32, 1168, [21:21] +unusedBit_22_22 = bits, U32, 1168, [22:22] +unusedBit_22_23 = bits, U32, 1168, [23:23] +unusedBit_22_24 = bits, U32, 1168, [24:24] +unusedBit_22_25 = bits, U32, 1168, [25:25] +unusedBit_22_26 = bits, U32, 1168, [26:26] +unusedBit_22_27 = bits, U32, 1168, [27:27] +unusedBit_22_28 = bits, U32, 1168, [28:28] +unusedBit_22_29 = bits, U32, 1168, [29:29] +unusedBit_22_30 = bits, U32, 1168, [30:30] +unusedBit_22_31 = bits, U32, 1168, [31:31] +targetRpmByClt = scalar, S32, 1172, "", 1, 0 +targetRpmAcBump = scalar, S32, 1176, "", 1, 0 +iacByRpmTaper = scalar, F32, 1180 +luaAdd = scalar, F32, 1184 +; total TS size = 1188 +baseDwell = scalar, F32, 1188, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 1192, "", 1, 0 +luaTimingAdd = scalar, F32, 1196, "", 1, 0 +luaTimingMult = scalar, F32, 1200, "", 1, 0 +; total TS size = 1204 +idlePosition = scalar, F32, 1204, "", 1, 0 +trim = scalar, F32, 1208, "", 1, 0 +luaAdjustment = scalar, F32, 1212, "", 1, 0 +etbFeedForward = scalar, F32, 1216 +etbIntegralError = scalar, F32, 1220, "", 1, 0 +etbCurrentTarget = scalar, F32, 1224, "%", 1, 0 +etbRevLimitActive = bits, U32, 1228, [0:0] +unusedBit_7_1 = bits, U32, 1228, [1:1] +unusedBit_7_2 = bits, U32, 1228, [2:2] +unusedBit_7_3 = bits, U32, 1228, [3:3] +unusedBit_7_4 = bits, U32, 1228, [4:4] +unusedBit_7_5 = bits, U32, 1228, [5:5] +unusedBit_7_6 = bits, U32, 1228, [6:6] +unusedBit_7_7 = bits, U32, 1228, [7:7] +unusedBit_7_8 = bits, U32, 1228, [8:8] +unusedBit_7_9 = bits, U32, 1228, [9:9] +unusedBit_7_10 = bits, U32, 1228, [10:10] +unusedBit_7_11 = bits, U32, 1228, [11:11] +unusedBit_7_12 = bits, U32, 1228, [12:12] +unusedBit_7_13 = bits, U32, 1228, [13:13] +unusedBit_7_14 = bits, U32, 1228, [14:14] +unusedBit_7_15 = bits, U32, 1228, [15:15] +unusedBit_7_16 = bits, U32, 1228, [16:16] +unusedBit_7_17 = bits, U32, 1228, [17:17] +unusedBit_7_18 = bits, U32, 1228, [18:18] +unusedBit_7_19 = bits, U32, 1228, [19:19] +unusedBit_7_20 = bits, U32, 1228, [20:20] +unusedBit_7_21 = bits, U32, 1228, [21:21] +unusedBit_7_22 = bits, U32, 1228, [22:22] +unusedBit_7_23 = bits, U32, 1228, [23:23] +unusedBit_7_24 = bits, U32, 1228, [24:24] +unusedBit_7_25 = bits, U32, 1228, [25:25] +unusedBit_7_26 = bits, U32, 1228, [26:26] +unusedBit_7_27 = bits, U32, 1228, [27:27] +unusedBit_7_28 = bits, U32, 1228, [28:28] +unusedBit_7_29 = bits, U32, 1228, [29:29] +unusedBit_7_30 = bits, U32, 1228, [30:30] +unusedBit_7_31 = bits, U32, 1228, [31:31] +; total TS size = 1232 +faultCode = scalar, U08, 1232, "", 1, 0 +heaterDuty = scalar, U08, 1233, "%", 1, 0 +pumpDuty = scalar, U08, 1234, "%", 1, 0 +tempC = scalar, U16, 1236, "C", 1, 0 +nernstVoltage = scalar, U16, 1238, "V", 0.001, 0 +esr = scalar, U16, 1240, "", 1, 0 +; total TS size = 1244 time = { timeNow } @@ -4847,7 +4847,7 @@ entry = mapVvt_MAP_AT_SPECIAL_POINT, "mapVvt_MAP_AT_SPECIAL_POINT", float, "%.3 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 Phase2", int, "%d" +entry = currentEngineDecodedPhase, "Engine Phase2", float, "%.3f" entry = totalRevolutionCounter, "Crank revolution counter", int, "%d" entry = vvtSyncGapRatio, "vvtSyncGapRatio", float, "%.3f" entry = vvtCurrentPosition, "vvtCurrentPosition", float, "%.3f" diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f7.ini b/firmware/tunerstudio/generated/rusefi_proteus_f7.ini index d8a8b4bd81..10c69a386f 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.01.proteus_f7.2050238931" + signature = "rusEFI 2022.09.01.proteus_f7.2103045578" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.09.01.proteus_f7.2050238931" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.09.01.proteus_f7.2103045578" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Sep 01 04:52:42 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Sep 01 05:33:33 UTC 2022 pageSize = 21300 page = 1 @@ -2118,7 +2118,7 @@ maxKnockRetardRpmBins = array, U08, 21294, [6], "RPM", 100.0, 0, 0, 25000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1240 + ochBlockSize = 1244 ; ; see TunerStudioOutputChannels struct @@ -3090,147 +3090,147 @@ mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1096, "", 1, 0 mapVvt_MAP_AT_DIFF = scalar, F32, 1100, "", 1, 0 mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1104, "", 1, 0 mapVvt_map_peak = scalar, U08, 1105, "", 1, 0 -currentEngineDecodedPhase = scalar, U16, 1106, "deg", 1, 0 -; total TS size = 1108 -totalRevolutionCounter = scalar, U32, 1108, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1112, "", 1, 0 -vvtCurrentPosition = scalar, F32, 1116, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1120, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 1124, "", 1, 0 -triggerStateIndex = scalar, U08, 1128, "", 1, 0 -vvtCounter = scalar, U08, 1129, "", 1, 0 -camResyncCounter = scalar, U08, 1130, "", 1, 0 -vvtStateIndex = scalar, U08, 1131, "", 1, 0 -; total TS size = 1132 -m_hasSynchronizedPhase = bits, U32, 1132, [0:0] -unusedBit_1_1 = bits, U32, 1132, [1:1] -unusedBit_1_2 = bits, U32, 1132, [2:2] -unusedBit_1_3 = bits, U32, 1132, [3:3] -unusedBit_1_4 = bits, U32, 1132, [4:4] -unusedBit_1_5 = bits, U32, 1132, [5:5] -unusedBit_1_6 = bits, U32, 1132, [6:6] -unusedBit_1_7 = bits, U32, 1132, [7:7] -unusedBit_1_8 = bits, U32, 1132, [8:8] -unusedBit_1_9 = bits, U32, 1132, [9:9] -unusedBit_1_10 = bits, U32, 1132, [10:10] -unusedBit_1_11 = bits, U32, 1132, [11:11] -unusedBit_1_12 = bits, U32, 1132, [12:12] -unusedBit_1_13 = bits, U32, 1132, [13:13] -unusedBit_1_14 = bits, U32, 1132, [14:14] -unusedBit_1_15 = bits, U32, 1132, [15:15] -unusedBit_1_16 = bits, U32, 1132, [16:16] -unusedBit_1_17 = bits, U32, 1132, [17:17] -unusedBit_1_18 = bits, U32, 1132, [18:18] -unusedBit_1_19 = bits, U32, 1132, [19:19] -unusedBit_1_20 = bits, U32, 1132, [20:20] -unusedBit_1_21 = bits, U32, 1132, [21:21] -unusedBit_1_22 = bits, U32, 1132, [22:22] -unusedBit_1_23 = bits, U32, 1132, [23:23] -unusedBit_1_24 = bits, U32, 1132, [24:24] -unusedBit_1_25 = bits, U32, 1132, [25:25] -unusedBit_1_26 = bits, U32, 1132, [26:26] -unusedBit_1_27 = bits, U32, 1132, [27:27] -unusedBit_1_28 = bits, U32, 1132, [28:28] -unusedBit_1_29 = bits, U32, 1132, [29:29] -unusedBit_1_30 = bits, U32, 1132, [30:30] -unusedBit_1_31 = bits, U32, 1132, [31:31] +currentEngineDecodedPhase = scalar, F32, 1108, "deg", 1, 0 +; total TS size = 1112 +totalRevolutionCounter = scalar, U32, 1112, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1116, "", 1, 0 +vvtCurrentPosition = scalar, F32, 1120, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1124, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 1128, "", 1, 0 +triggerStateIndex = scalar, U08, 1132, "", 1, 0 +vvtCounter = scalar, U08, 1133, "", 1, 0 +camResyncCounter = scalar, U08, 1134, "", 1, 0 +vvtStateIndex = scalar, U08, 1135, "", 1, 0 ; total TS size = 1136 -wallFuelCorrection = scalar, F32, 1136, "", 1, 0 -wallFuel = scalar, F32, 1140, "", 1, 0 -; total TS size = 1144 -idleState = bits, S32, 1144, [0:2], "not important" -currentIdlePosition = scalar, F32, 1148 -baseIdlePosition = scalar, F32, 1152 -iacByTpsTaper = scalar, F32, 1156 -throttlePedalUpState = scalar, S32, 1160, "", 1, 0 -mightResetPid = bits, U32, 1164, [0:0] -shouldResetPid = bits, U32, 1164, [1:1] -wasResetPid = bits, U32, 1164, [2:2] -mustResetPid = bits, U32, 1164, [3:3] -isCranking = bits, U32, 1164, [4:4] -useIacTableForCoasting = bits, U32, 1164, [5:5] -notIdling = bits, U32, 1164, [6:6] -needReset = bits, U32, 1164, [7:7] -isInDeadZone = bits, U32, 1164, [8:8] -isBlipping = bits, U32, 1164, [9:9] -useClosedLoop = bits, U32, 1164, [10:10] -badTps = bits, U32, 1164, [11:11] -looksLikeRunning = bits, U32, 1164, [12:12] -looksLikeCoasting = bits, U32, 1164, [13:13] -looksLikeCrankToIdle = bits, U32, 1164, [14:14] -isVerboseIAC = bits, U32, 1164, [15:15] -isIdleCoasting = bits, U32, 1164, [16:16] -unusedBit_22_17 = bits, U32, 1164, [17:17] -unusedBit_22_18 = bits, U32, 1164, [18:18] -unusedBit_22_19 = bits, U32, 1164, [19:19] -unusedBit_22_20 = bits, U32, 1164, [20:20] -unusedBit_22_21 = bits, U32, 1164, [21:21] -unusedBit_22_22 = bits, U32, 1164, [22:22] -unusedBit_22_23 = bits, U32, 1164, [23:23] -unusedBit_22_24 = bits, U32, 1164, [24:24] -unusedBit_22_25 = bits, U32, 1164, [25:25] -unusedBit_22_26 = bits, U32, 1164, [26:26] -unusedBit_22_27 = bits, U32, 1164, [27:27] -unusedBit_22_28 = bits, U32, 1164, [28:28] -unusedBit_22_29 = bits, U32, 1164, [29:29] -unusedBit_22_30 = bits, U32, 1164, [30:30] -unusedBit_22_31 = bits, U32, 1164, [31:31] -targetRpmByClt = scalar, S32, 1168, "", 1, 0 -targetRpmAcBump = scalar, S32, 1172, "", 1, 0 -iacByRpmTaper = scalar, F32, 1176 -luaAdd = scalar, F32, 1180 -; total TS size = 1184 -baseDwell = scalar, F32, 1184, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 1188, "", 1, 0 -luaTimingAdd = scalar, F32, 1192, "", 1, 0 -luaTimingMult = scalar, F32, 1196, "", 1, 0 -; total TS size = 1200 -idlePosition = scalar, F32, 1200, "", 1, 0 -trim = scalar, F32, 1204, "", 1, 0 -luaAdjustment = scalar, F32, 1208, "", 1, 0 -etbFeedForward = scalar, F32, 1212 -etbIntegralError = scalar, F32, 1216, "", 1, 0 -etbCurrentTarget = scalar, F32, 1220, "%", 1, 0 -etbRevLimitActive = bits, U32, 1224, [0:0] -unusedBit_7_1 = bits, U32, 1224, [1:1] -unusedBit_7_2 = bits, U32, 1224, [2:2] -unusedBit_7_3 = bits, U32, 1224, [3:3] -unusedBit_7_4 = bits, U32, 1224, [4:4] -unusedBit_7_5 = bits, U32, 1224, [5:5] -unusedBit_7_6 = bits, U32, 1224, [6:6] -unusedBit_7_7 = bits, U32, 1224, [7:7] -unusedBit_7_8 = bits, U32, 1224, [8:8] -unusedBit_7_9 = bits, U32, 1224, [9:9] -unusedBit_7_10 = bits, U32, 1224, [10:10] -unusedBit_7_11 = bits, U32, 1224, [11:11] -unusedBit_7_12 = bits, U32, 1224, [12:12] -unusedBit_7_13 = bits, U32, 1224, [13:13] -unusedBit_7_14 = bits, U32, 1224, [14:14] -unusedBit_7_15 = bits, U32, 1224, [15:15] -unusedBit_7_16 = bits, U32, 1224, [16:16] -unusedBit_7_17 = bits, U32, 1224, [17:17] -unusedBit_7_18 = bits, U32, 1224, [18:18] -unusedBit_7_19 = bits, U32, 1224, [19:19] -unusedBit_7_20 = bits, U32, 1224, [20:20] -unusedBit_7_21 = bits, U32, 1224, [21:21] -unusedBit_7_22 = bits, U32, 1224, [22:22] -unusedBit_7_23 = bits, U32, 1224, [23:23] -unusedBit_7_24 = bits, U32, 1224, [24:24] -unusedBit_7_25 = bits, U32, 1224, [25:25] -unusedBit_7_26 = bits, U32, 1224, [26:26] -unusedBit_7_27 = bits, U32, 1224, [27:27] -unusedBit_7_28 = bits, U32, 1224, [28:28] -unusedBit_7_29 = bits, U32, 1224, [29:29] -unusedBit_7_30 = bits, U32, 1224, [30:30] -unusedBit_7_31 = bits, U32, 1224, [31:31] -; total TS size = 1228 -faultCode = scalar, U08, 1228, "", 1, 0 -heaterDuty = scalar, U08, 1229, "%", 1, 0 -pumpDuty = scalar, U08, 1230, "%", 1, 0 -tempC = scalar, U16, 1232, "C", 1, 0 -nernstVoltage = scalar, U16, 1234, "V", 0.001, 0 -esr = scalar, U16, 1236, "", 1, 0 -; total TS size = 1240 +m_hasSynchronizedPhase = bits, U32, 1136, [0:0] +unusedBit_1_1 = bits, U32, 1136, [1:1] +unusedBit_1_2 = bits, U32, 1136, [2:2] +unusedBit_1_3 = bits, U32, 1136, [3:3] +unusedBit_1_4 = bits, U32, 1136, [4:4] +unusedBit_1_5 = bits, U32, 1136, [5:5] +unusedBit_1_6 = bits, U32, 1136, [6:6] +unusedBit_1_7 = bits, U32, 1136, [7:7] +unusedBit_1_8 = bits, U32, 1136, [8:8] +unusedBit_1_9 = bits, U32, 1136, [9:9] +unusedBit_1_10 = bits, U32, 1136, [10:10] +unusedBit_1_11 = bits, U32, 1136, [11:11] +unusedBit_1_12 = bits, U32, 1136, [12:12] +unusedBit_1_13 = bits, U32, 1136, [13:13] +unusedBit_1_14 = bits, U32, 1136, [14:14] +unusedBit_1_15 = bits, U32, 1136, [15:15] +unusedBit_1_16 = bits, U32, 1136, [16:16] +unusedBit_1_17 = bits, U32, 1136, [17:17] +unusedBit_1_18 = bits, U32, 1136, [18:18] +unusedBit_1_19 = bits, U32, 1136, [19:19] +unusedBit_1_20 = bits, U32, 1136, [20:20] +unusedBit_1_21 = bits, U32, 1136, [21:21] +unusedBit_1_22 = bits, U32, 1136, [22:22] +unusedBit_1_23 = bits, U32, 1136, [23:23] +unusedBit_1_24 = bits, U32, 1136, [24:24] +unusedBit_1_25 = bits, U32, 1136, [25:25] +unusedBit_1_26 = bits, U32, 1136, [26:26] +unusedBit_1_27 = bits, U32, 1136, [27:27] +unusedBit_1_28 = bits, U32, 1136, [28:28] +unusedBit_1_29 = bits, U32, 1136, [29:29] +unusedBit_1_30 = bits, U32, 1136, [30:30] +unusedBit_1_31 = bits, U32, 1136, [31:31] +; total TS size = 1140 +wallFuelCorrection = scalar, F32, 1140, "", 1, 0 +wallFuel = scalar, F32, 1144, "", 1, 0 +; total TS size = 1148 +idleState = bits, S32, 1148, [0:2], "not important" +currentIdlePosition = scalar, F32, 1152 +baseIdlePosition = scalar, F32, 1156 +iacByTpsTaper = scalar, F32, 1160 +throttlePedalUpState = scalar, S32, 1164, "", 1, 0 +mightResetPid = bits, U32, 1168, [0:0] +shouldResetPid = bits, U32, 1168, [1:1] +wasResetPid = bits, U32, 1168, [2:2] +mustResetPid = bits, U32, 1168, [3:3] +isCranking = bits, U32, 1168, [4:4] +useIacTableForCoasting = bits, U32, 1168, [5:5] +notIdling = bits, U32, 1168, [6:6] +needReset = bits, U32, 1168, [7:7] +isInDeadZone = bits, U32, 1168, [8:8] +isBlipping = bits, U32, 1168, [9:9] +useClosedLoop = bits, U32, 1168, [10:10] +badTps = bits, U32, 1168, [11:11] +looksLikeRunning = bits, U32, 1168, [12:12] +looksLikeCoasting = bits, U32, 1168, [13:13] +looksLikeCrankToIdle = bits, U32, 1168, [14:14] +isVerboseIAC = bits, U32, 1168, [15:15] +isIdleCoasting = bits, U32, 1168, [16:16] +unusedBit_22_17 = bits, U32, 1168, [17:17] +unusedBit_22_18 = bits, U32, 1168, [18:18] +unusedBit_22_19 = bits, U32, 1168, [19:19] +unusedBit_22_20 = bits, U32, 1168, [20:20] +unusedBit_22_21 = bits, U32, 1168, [21:21] +unusedBit_22_22 = bits, U32, 1168, [22:22] +unusedBit_22_23 = bits, U32, 1168, [23:23] +unusedBit_22_24 = bits, U32, 1168, [24:24] +unusedBit_22_25 = bits, U32, 1168, [25:25] +unusedBit_22_26 = bits, U32, 1168, [26:26] +unusedBit_22_27 = bits, U32, 1168, [27:27] +unusedBit_22_28 = bits, U32, 1168, [28:28] +unusedBit_22_29 = bits, U32, 1168, [29:29] +unusedBit_22_30 = bits, U32, 1168, [30:30] +unusedBit_22_31 = bits, U32, 1168, [31:31] +targetRpmByClt = scalar, S32, 1172, "", 1, 0 +targetRpmAcBump = scalar, S32, 1176, "", 1, 0 +iacByRpmTaper = scalar, F32, 1180 +luaAdd = scalar, F32, 1184 +; total TS size = 1188 +baseDwell = scalar, F32, 1188, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 1192, "", 1, 0 +luaTimingAdd = scalar, F32, 1196, "", 1, 0 +luaTimingMult = scalar, F32, 1200, "", 1, 0 +; total TS size = 1204 +idlePosition = scalar, F32, 1204, "", 1, 0 +trim = scalar, F32, 1208, "", 1, 0 +luaAdjustment = scalar, F32, 1212, "", 1, 0 +etbFeedForward = scalar, F32, 1216 +etbIntegralError = scalar, F32, 1220, "", 1, 0 +etbCurrentTarget = scalar, F32, 1224, "%", 1, 0 +etbRevLimitActive = bits, U32, 1228, [0:0] +unusedBit_7_1 = bits, U32, 1228, [1:1] +unusedBit_7_2 = bits, U32, 1228, [2:2] +unusedBit_7_3 = bits, U32, 1228, [3:3] +unusedBit_7_4 = bits, U32, 1228, [4:4] +unusedBit_7_5 = bits, U32, 1228, [5:5] +unusedBit_7_6 = bits, U32, 1228, [6:6] +unusedBit_7_7 = bits, U32, 1228, [7:7] +unusedBit_7_8 = bits, U32, 1228, [8:8] +unusedBit_7_9 = bits, U32, 1228, [9:9] +unusedBit_7_10 = bits, U32, 1228, [10:10] +unusedBit_7_11 = bits, U32, 1228, [11:11] +unusedBit_7_12 = bits, U32, 1228, [12:12] +unusedBit_7_13 = bits, U32, 1228, [13:13] +unusedBit_7_14 = bits, U32, 1228, [14:14] +unusedBit_7_15 = bits, U32, 1228, [15:15] +unusedBit_7_16 = bits, U32, 1228, [16:16] +unusedBit_7_17 = bits, U32, 1228, [17:17] +unusedBit_7_18 = bits, U32, 1228, [18:18] +unusedBit_7_19 = bits, U32, 1228, [19:19] +unusedBit_7_20 = bits, U32, 1228, [20:20] +unusedBit_7_21 = bits, U32, 1228, [21:21] +unusedBit_7_22 = bits, U32, 1228, [22:22] +unusedBit_7_23 = bits, U32, 1228, [23:23] +unusedBit_7_24 = bits, U32, 1228, [24:24] +unusedBit_7_25 = bits, U32, 1228, [25:25] +unusedBit_7_26 = bits, U32, 1228, [26:26] +unusedBit_7_27 = bits, U32, 1228, [27:27] +unusedBit_7_28 = bits, U32, 1228, [28:28] +unusedBit_7_29 = bits, U32, 1228, [29:29] +unusedBit_7_30 = bits, U32, 1228, [30:30] +unusedBit_7_31 = bits, U32, 1228, [31:31] +; total TS size = 1232 +faultCode = scalar, U08, 1232, "", 1, 0 +heaterDuty = scalar, U08, 1233, "%", 1, 0 +pumpDuty = scalar, U08, 1234, "%", 1, 0 +tempC = scalar, U16, 1236, "C", 1, 0 +nernstVoltage = scalar, U16, 1238, "V", 0.001, 0 +esr = scalar, U16, 1240, "", 1, 0 +; total TS size = 1244 time = { timeNow } @@ -4847,7 +4847,7 @@ entry = mapVvt_MAP_AT_SPECIAL_POINT, "mapVvt_MAP_AT_SPECIAL_POINT", float, "%.3 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 Phase2", int, "%d" +entry = currentEngineDecodedPhase, "Engine Phase2", float, "%.3f" entry = totalRevolutionCounter, "Crank revolution counter", int, "%d" entry = vvtSyncGapRatio, "vvtSyncGapRatio", float, "%.3f" entry = vvtCurrentPosition, "vvtCurrentPosition", float, "%.3f" diff --git a/firmware/tunerstudio/generated/rusefi_proteus_h7.ini b/firmware/tunerstudio/generated/rusefi_proteus_h7.ini index 2c4fb0747f..35d79166d4 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.01.proteus_h7.2050238931" + signature = "rusEFI 2022.09.01.proteus_h7.2103045578" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.09.01.proteus_h7.2050238931" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.09.01.proteus_h7.2103045578" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Sep 01 04:52:45 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Sep 01 05:33:36 UTC 2022 pageSize = 21300 page = 1 @@ -2118,7 +2118,7 @@ maxKnockRetardRpmBins = array, U08, 21294, [6], "RPM", 100.0, 0, 0, 25000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1240 + ochBlockSize = 1244 ; ; see TunerStudioOutputChannels struct @@ -3090,147 +3090,147 @@ mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1096, "", 1, 0 mapVvt_MAP_AT_DIFF = scalar, F32, 1100, "", 1, 0 mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1104, "", 1, 0 mapVvt_map_peak = scalar, U08, 1105, "", 1, 0 -currentEngineDecodedPhase = scalar, U16, 1106, "deg", 1, 0 -; total TS size = 1108 -totalRevolutionCounter = scalar, U32, 1108, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1112, "", 1, 0 -vvtCurrentPosition = scalar, F32, 1116, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1120, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 1124, "", 1, 0 -triggerStateIndex = scalar, U08, 1128, "", 1, 0 -vvtCounter = scalar, U08, 1129, "", 1, 0 -camResyncCounter = scalar, U08, 1130, "", 1, 0 -vvtStateIndex = scalar, U08, 1131, "", 1, 0 -; total TS size = 1132 -m_hasSynchronizedPhase = bits, U32, 1132, [0:0] -unusedBit_1_1 = bits, U32, 1132, [1:1] -unusedBit_1_2 = bits, U32, 1132, [2:2] -unusedBit_1_3 = bits, U32, 1132, [3:3] -unusedBit_1_4 = bits, U32, 1132, [4:4] -unusedBit_1_5 = bits, U32, 1132, [5:5] -unusedBit_1_6 = bits, U32, 1132, [6:6] -unusedBit_1_7 = bits, U32, 1132, [7:7] -unusedBit_1_8 = bits, U32, 1132, [8:8] -unusedBit_1_9 = bits, U32, 1132, [9:9] -unusedBit_1_10 = bits, U32, 1132, [10:10] -unusedBit_1_11 = bits, U32, 1132, [11:11] -unusedBit_1_12 = bits, U32, 1132, [12:12] -unusedBit_1_13 = bits, U32, 1132, [13:13] -unusedBit_1_14 = bits, U32, 1132, [14:14] -unusedBit_1_15 = bits, U32, 1132, [15:15] -unusedBit_1_16 = bits, U32, 1132, [16:16] -unusedBit_1_17 = bits, U32, 1132, [17:17] -unusedBit_1_18 = bits, U32, 1132, [18:18] -unusedBit_1_19 = bits, U32, 1132, [19:19] -unusedBit_1_20 = bits, U32, 1132, [20:20] -unusedBit_1_21 = bits, U32, 1132, [21:21] -unusedBit_1_22 = bits, U32, 1132, [22:22] -unusedBit_1_23 = bits, U32, 1132, [23:23] -unusedBit_1_24 = bits, U32, 1132, [24:24] -unusedBit_1_25 = bits, U32, 1132, [25:25] -unusedBit_1_26 = bits, U32, 1132, [26:26] -unusedBit_1_27 = bits, U32, 1132, [27:27] -unusedBit_1_28 = bits, U32, 1132, [28:28] -unusedBit_1_29 = bits, U32, 1132, [29:29] -unusedBit_1_30 = bits, U32, 1132, [30:30] -unusedBit_1_31 = bits, U32, 1132, [31:31] +currentEngineDecodedPhase = scalar, F32, 1108, "deg", 1, 0 +; total TS size = 1112 +totalRevolutionCounter = scalar, U32, 1112, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1116, "", 1, 0 +vvtCurrentPosition = scalar, F32, 1120, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1124, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 1128, "", 1, 0 +triggerStateIndex = scalar, U08, 1132, "", 1, 0 +vvtCounter = scalar, U08, 1133, "", 1, 0 +camResyncCounter = scalar, U08, 1134, "", 1, 0 +vvtStateIndex = scalar, U08, 1135, "", 1, 0 ; total TS size = 1136 -wallFuelCorrection = scalar, F32, 1136, "", 1, 0 -wallFuel = scalar, F32, 1140, "", 1, 0 -; total TS size = 1144 -idleState = bits, S32, 1144, [0:2], "not important" -currentIdlePosition = scalar, F32, 1148 -baseIdlePosition = scalar, F32, 1152 -iacByTpsTaper = scalar, F32, 1156 -throttlePedalUpState = scalar, S32, 1160, "", 1, 0 -mightResetPid = bits, U32, 1164, [0:0] -shouldResetPid = bits, U32, 1164, [1:1] -wasResetPid = bits, U32, 1164, [2:2] -mustResetPid = bits, U32, 1164, [3:3] -isCranking = bits, U32, 1164, [4:4] -useIacTableForCoasting = bits, U32, 1164, [5:5] -notIdling = bits, U32, 1164, [6:6] -needReset = bits, U32, 1164, [7:7] -isInDeadZone = bits, U32, 1164, [8:8] -isBlipping = bits, U32, 1164, [9:9] -useClosedLoop = bits, U32, 1164, [10:10] -badTps = bits, U32, 1164, [11:11] -looksLikeRunning = bits, U32, 1164, [12:12] -looksLikeCoasting = bits, U32, 1164, [13:13] -looksLikeCrankToIdle = bits, U32, 1164, [14:14] -isVerboseIAC = bits, U32, 1164, [15:15] -isIdleCoasting = bits, U32, 1164, [16:16] -unusedBit_22_17 = bits, U32, 1164, [17:17] -unusedBit_22_18 = bits, U32, 1164, [18:18] -unusedBit_22_19 = bits, U32, 1164, [19:19] -unusedBit_22_20 = bits, U32, 1164, [20:20] -unusedBit_22_21 = bits, U32, 1164, [21:21] -unusedBit_22_22 = bits, U32, 1164, [22:22] -unusedBit_22_23 = bits, U32, 1164, [23:23] -unusedBit_22_24 = bits, U32, 1164, [24:24] -unusedBit_22_25 = bits, U32, 1164, [25:25] -unusedBit_22_26 = bits, U32, 1164, [26:26] -unusedBit_22_27 = bits, U32, 1164, [27:27] -unusedBit_22_28 = bits, U32, 1164, [28:28] -unusedBit_22_29 = bits, U32, 1164, [29:29] -unusedBit_22_30 = bits, U32, 1164, [30:30] -unusedBit_22_31 = bits, U32, 1164, [31:31] -targetRpmByClt = scalar, S32, 1168, "", 1, 0 -targetRpmAcBump = scalar, S32, 1172, "", 1, 0 -iacByRpmTaper = scalar, F32, 1176 -luaAdd = scalar, F32, 1180 -; total TS size = 1184 -baseDwell = scalar, F32, 1184, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 1188, "", 1, 0 -luaTimingAdd = scalar, F32, 1192, "", 1, 0 -luaTimingMult = scalar, F32, 1196, "", 1, 0 -; total TS size = 1200 -idlePosition = scalar, F32, 1200, "", 1, 0 -trim = scalar, F32, 1204, "", 1, 0 -luaAdjustment = scalar, F32, 1208, "", 1, 0 -etbFeedForward = scalar, F32, 1212 -etbIntegralError = scalar, F32, 1216, "", 1, 0 -etbCurrentTarget = scalar, F32, 1220, "%", 1, 0 -etbRevLimitActive = bits, U32, 1224, [0:0] -unusedBit_7_1 = bits, U32, 1224, [1:1] -unusedBit_7_2 = bits, U32, 1224, [2:2] -unusedBit_7_3 = bits, U32, 1224, [3:3] -unusedBit_7_4 = bits, U32, 1224, [4:4] -unusedBit_7_5 = bits, U32, 1224, [5:5] -unusedBit_7_6 = bits, U32, 1224, [6:6] -unusedBit_7_7 = bits, U32, 1224, [7:7] -unusedBit_7_8 = bits, U32, 1224, [8:8] -unusedBit_7_9 = bits, U32, 1224, [9:9] -unusedBit_7_10 = bits, U32, 1224, [10:10] -unusedBit_7_11 = bits, U32, 1224, [11:11] -unusedBit_7_12 = bits, U32, 1224, [12:12] -unusedBit_7_13 = bits, U32, 1224, [13:13] -unusedBit_7_14 = bits, U32, 1224, [14:14] -unusedBit_7_15 = bits, U32, 1224, [15:15] -unusedBit_7_16 = bits, U32, 1224, [16:16] -unusedBit_7_17 = bits, U32, 1224, [17:17] -unusedBit_7_18 = bits, U32, 1224, [18:18] -unusedBit_7_19 = bits, U32, 1224, [19:19] -unusedBit_7_20 = bits, U32, 1224, [20:20] -unusedBit_7_21 = bits, U32, 1224, [21:21] -unusedBit_7_22 = bits, U32, 1224, [22:22] -unusedBit_7_23 = bits, U32, 1224, [23:23] -unusedBit_7_24 = bits, U32, 1224, [24:24] -unusedBit_7_25 = bits, U32, 1224, [25:25] -unusedBit_7_26 = bits, U32, 1224, [26:26] -unusedBit_7_27 = bits, U32, 1224, [27:27] -unusedBit_7_28 = bits, U32, 1224, [28:28] -unusedBit_7_29 = bits, U32, 1224, [29:29] -unusedBit_7_30 = bits, U32, 1224, [30:30] -unusedBit_7_31 = bits, U32, 1224, [31:31] -; total TS size = 1228 -faultCode = scalar, U08, 1228, "", 1, 0 -heaterDuty = scalar, U08, 1229, "%", 1, 0 -pumpDuty = scalar, U08, 1230, "%", 1, 0 -tempC = scalar, U16, 1232, "C", 1, 0 -nernstVoltage = scalar, U16, 1234, "V", 0.001, 0 -esr = scalar, U16, 1236, "", 1, 0 -; total TS size = 1240 +m_hasSynchronizedPhase = bits, U32, 1136, [0:0] +unusedBit_1_1 = bits, U32, 1136, [1:1] +unusedBit_1_2 = bits, U32, 1136, [2:2] +unusedBit_1_3 = bits, U32, 1136, [3:3] +unusedBit_1_4 = bits, U32, 1136, [4:4] +unusedBit_1_5 = bits, U32, 1136, [5:5] +unusedBit_1_6 = bits, U32, 1136, [6:6] +unusedBit_1_7 = bits, U32, 1136, [7:7] +unusedBit_1_8 = bits, U32, 1136, [8:8] +unusedBit_1_9 = bits, U32, 1136, [9:9] +unusedBit_1_10 = bits, U32, 1136, [10:10] +unusedBit_1_11 = bits, U32, 1136, [11:11] +unusedBit_1_12 = bits, U32, 1136, [12:12] +unusedBit_1_13 = bits, U32, 1136, [13:13] +unusedBit_1_14 = bits, U32, 1136, [14:14] +unusedBit_1_15 = bits, U32, 1136, [15:15] +unusedBit_1_16 = bits, U32, 1136, [16:16] +unusedBit_1_17 = bits, U32, 1136, [17:17] +unusedBit_1_18 = bits, U32, 1136, [18:18] +unusedBit_1_19 = bits, U32, 1136, [19:19] +unusedBit_1_20 = bits, U32, 1136, [20:20] +unusedBit_1_21 = bits, U32, 1136, [21:21] +unusedBit_1_22 = bits, U32, 1136, [22:22] +unusedBit_1_23 = bits, U32, 1136, [23:23] +unusedBit_1_24 = bits, U32, 1136, [24:24] +unusedBit_1_25 = bits, U32, 1136, [25:25] +unusedBit_1_26 = bits, U32, 1136, [26:26] +unusedBit_1_27 = bits, U32, 1136, [27:27] +unusedBit_1_28 = bits, U32, 1136, [28:28] +unusedBit_1_29 = bits, U32, 1136, [29:29] +unusedBit_1_30 = bits, U32, 1136, [30:30] +unusedBit_1_31 = bits, U32, 1136, [31:31] +; total TS size = 1140 +wallFuelCorrection = scalar, F32, 1140, "", 1, 0 +wallFuel = scalar, F32, 1144, "", 1, 0 +; total TS size = 1148 +idleState = bits, S32, 1148, [0:2], "not important" +currentIdlePosition = scalar, F32, 1152 +baseIdlePosition = scalar, F32, 1156 +iacByTpsTaper = scalar, F32, 1160 +throttlePedalUpState = scalar, S32, 1164, "", 1, 0 +mightResetPid = bits, U32, 1168, [0:0] +shouldResetPid = bits, U32, 1168, [1:1] +wasResetPid = bits, U32, 1168, [2:2] +mustResetPid = bits, U32, 1168, [3:3] +isCranking = bits, U32, 1168, [4:4] +useIacTableForCoasting = bits, U32, 1168, [5:5] +notIdling = bits, U32, 1168, [6:6] +needReset = bits, U32, 1168, [7:7] +isInDeadZone = bits, U32, 1168, [8:8] +isBlipping = bits, U32, 1168, [9:9] +useClosedLoop = bits, U32, 1168, [10:10] +badTps = bits, U32, 1168, [11:11] +looksLikeRunning = bits, U32, 1168, [12:12] +looksLikeCoasting = bits, U32, 1168, [13:13] +looksLikeCrankToIdle = bits, U32, 1168, [14:14] +isVerboseIAC = bits, U32, 1168, [15:15] +isIdleCoasting = bits, U32, 1168, [16:16] +unusedBit_22_17 = bits, U32, 1168, [17:17] +unusedBit_22_18 = bits, U32, 1168, [18:18] +unusedBit_22_19 = bits, U32, 1168, [19:19] +unusedBit_22_20 = bits, U32, 1168, [20:20] +unusedBit_22_21 = bits, U32, 1168, [21:21] +unusedBit_22_22 = bits, U32, 1168, [22:22] +unusedBit_22_23 = bits, U32, 1168, [23:23] +unusedBit_22_24 = bits, U32, 1168, [24:24] +unusedBit_22_25 = bits, U32, 1168, [25:25] +unusedBit_22_26 = bits, U32, 1168, [26:26] +unusedBit_22_27 = bits, U32, 1168, [27:27] +unusedBit_22_28 = bits, U32, 1168, [28:28] +unusedBit_22_29 = bits, U32, 1168, [29:29] +unusedBit_22_30 = bits, U32, 1168, [30:30] +unusedBit_22_31 = bits, U32, 1168, [31:31] +targetRpmByClt = scalar, S32, 1172, "", 1, 0 +targetRpmAcBump = scalar, S32, 1176, "", 1, 0 +iacByRpmTaper = scalar, F32, 1180 +luaAdd = scalar, F32, 1184 +; total TS size = 1188 +baseDwell = scalar, F32, 1188, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 1192, "", 1, 0 +luaTimingAdd = scalar, F32, 1196, "", 1, 0 +luaTimingMult = scalar, F32, 1200, "", 1, 0 +; total TS size = 1204 +idlePosition = scalar, F32, 1204, "", 1, 0 +trim = scalar, F32, 1208, "", 1, 0 +luaAdjustment = scalar, F32, 1212, "", 1, 0 +etbFeedForward = scalar, F32, 1216 +etbIntegralError = scalar, F32, 1220, "", 1, 0 +etbCurrentTarget = scalar, F32, 1224, "%", 1, 0 +etbRevLimitActive = bits, U32, 1228, [0:0] +unusedBit_7_1 = bits, U32, 1228, [1:1] +unusedBit_7_2 = bits, U32, 1228, [2:2] +unusedBit_7_3 = bits, U32, 1228, [3:3] +unusedBit_7_4 = bits, U32, 1228, [4:4] +unusedBit_7_5 = bits, U32, 1228, [5:5] +unusedBit_7_6 = bits, U32, 1228, [6:6] +unusedBit_7_7 = bits, U32, 1228, [7:7] +unusedBit_7_8 = bits, U32, 1228, [8:8] +unusedBit_7_9 = bits, U32, 1228, [9:9] +unusedBit_7_10 = bits, U32, 1228, [10:10] +unusedBit_7_11 = bits, U32, 1228, [11:11] +unusedBit_7_12 = bits, U32, 1228, [12:12] +unusedBit_7_13 = bits, U32, 1228, [13:13] +unusedBit_7_14 = bits, U32, 1228, [14:14] +unusedBit_7_15 = bits, U32, 1228, [15:15] +unusedBit_7_16 = bits, U32, 1228, [16:16] +unusedBit_7_17 = bits, U32, 1228, [17:17] +unusedBit_7_18 = bits, U32, 1228, [18:18] +unusedBit_7_19 = bits, U32, 1228, [19:19] +unusedBit_7_20 = bits, U32, 1228, [20:20] +unusedBit_7_21 = bits, U32, 1228, [21:21] +unusedBit_7_22 = bits, U32, 1228, [22:22] +unusedBit_7_23 = bits, U32, 1228, [23:23] +unusedBit_7_24 = bits, U32, 1228, [24:24] +unusedBit_7_25 = bits, U32, 1228, [25:25] +unusedBit_7_26 = bits, U32, 1228, [26:26] +unusedBit_7_27 = bits, U32, 1228, [27:27] +unusedBit_7_28 = bits, U32, 1228, [28:28] +unusedBit_7_29 = bits, U32, 1228, [29:29] +unusedBit_7_30 = bits, U32, 1228, [30:30] +unusedBit_7_31 = bits, U32, 1228, [31:31] +; total TS size = 1232 +faultCode = scalar, U08, 1232, "", 1, 0 +heaterDuty = scalar, U08, 1233, "%", 1, 0 +pumpDuty = scalar, U08, 1234, "%", 1, 0 +tempC = scalar, U16, 1236, "C", 1, 0 +nernstVoltage = scalar, U16, 1238, "V", 0.001, 0 +esr = scalar, U16, 1240, "", 1, 0 +; total TS size = 1244 time = { timeNow } @@ -4847,7 +4847,7 @@ entry = mapVvt_MAP_AT_SPECIAL_POINT, "mapVvt_MAP_AT_SPECIAL_POINT", float, "%.3 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 Phase2", int, "%d" +entry = currentEngineDecodedPhase, "Engine Phase2", float, "%.3f" entry = totalRevolutionCounter, "Crank revolution counter", int, "%d" entry = vvtSyncGapRatio, "vvtSyncGapRatio", float, "%.3f" entry = vvtCurrentPosition, "vvtCurrentPosition", float, "%.3f" diff --git a/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini b/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini index 5528341022..e6047a7567 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.01.subaru_eg33_f7.2800170879" + signature = "rusEFI 2022.09.01.subaru_eg33_f7.2710238054" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.09.01.subaru_eg33_f7.2800170879" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.09.01.subaru_eg33_f7.2710238054" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on config/boards/subaru_eg33/config/gen_subaru_config.sh integration/rusefi_config.txt Thu Sep 01 04:52:07 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on config/boards/subaru_eg33/config/gen_subaru_config.sh integration/rusefi_config.txt Thu Sep 01 05:32:58 UTC 2022 pageSize = 21300 page = 1 @@ -2118,7 +2118,7 @@ maxKnockRetardRpmBins = array, U08, 21294, [6], "RPM", 100.0, 0, 0, 25000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1240 + ochBlockSize = 1244 ; ; see TunerStudioOutputChannels struct @@ -3090,147 +3090,147 @@ mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1096, "", 1, 0 mapVvt_MAP_AT_DIFF = scalar, F32, 1100, "", 1, 0 mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1104, "", 1, 0 mapVvt_map_peak = scalar, U08, 1105, "", 1, 0 -currentEngineDecodedPhase = scalar, U16, 1106, "deg", 1, 0 -; total TS size = 1108 -totalRevolutionCounter = scalar, U32, 1108, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1112, "", 1, 0 -vvtCurrentPosition = scalar, F32, 1116, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1120, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 1124, "", 1, 0 -triggerStateIndex = scalar, U08, 1128, "", 1, 0 -vvtCounter = scalar, U08, 1129, "", 1, 0 -camResyncCounter = scalar, U08, 1130, "", 1, 0 -vvtStateIndex = scalar, U08, 1131, "", 1, 0 -; total TS size = 1132 -m_hasSynchronizedPhase = bits, U32, 1132, [0:0] -unusedBit_1_1 = bits, U32, 1132, [1:1] -unusedBit_1_2 = bits, U32, 1132, [2:2] -unusedBit_1_3 = bits, U32, 1132, [3:3] -unusedBit_1_4 = bits, U32, 1132, [4:4] -unusedBit_1_5 = bits, U32, 1132, [5:5] -unusedBit_1_6 = bits, U32, 1132, [6:6] -unusedBit_1_7 = bits, U32, 1132, [7:7] -unusedBit_1_8 = bits, U32, 1132, [8:8] -unusedBit_1_9 = bits, U32, 1132, [9:9] -unusedBit_1_10 = bits, U32, 1132, [10:10] -unusedBit_1_11 = bits, U32, 1132, [11:11] -unusedBit_1_12 = bits, U32, 1132, [12:12] -unusedBit_1_13 = bits, U32, 1132, [13:13] -unusedBit_1_14 = bits, U32, 1132, [14:14] -unusedBit_1_15 = bits, U32, 1132, [15:15] -unusedBit_1_16 = bits, U32, 1132, [16:16] -unusedBit_1_17 = bits, U32, 1132, [17:17] -unusedBit_1_18 = bits, U32, 1132, [18:18] -unusedBit_1_19 = bits, U32, 1132, [19:19] -unusedBit_1_20 = bits, U32, 1132, [20:20] -unusedBit_1_21 = bits, U32, 1132, [21:21] -unusedBit_1_22 = bits, U32, 1132, [22:22] -unusedBit_1_23 = bits, U32, 1132, [23:23] -unusedBit_1_24 = bits, U32, 1132, [24:24] -unusedBit_1_25 = bits, U32, 1132, [25:25] -unusedBit_1_26 = bits, U32, 1132, [26:26] -unusedBit_1_27 = bits, U32, 1132, [27:27] -unusedBit_1_28 = bits, U32, 1132, [28:28] -unusedBit_1_29 = bits, U32, 1132, [29:29] -unusedBit_1_30 = bits, U32, 1132, [30:30] -unusedBit_1_31 = bits, U32, 1132, [31:31] +currentEngineDecodedPhase = scalar, F32, 1108, "deg", 1, 0 +; total TS size = 1112 +totalRevolutionCounter = scalar, U32, 1112, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1116, "", 1, 0 +vvtCurrentPosition = scalar, F32, 1120, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1124, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 1128, "", 1, 0 +triggerStateIndex = scalar, U08, 1132, "", 1, 0 +vvtCounter = scalar, U08, 1133, "", 1, 0 +camResyncCounter = scalar, U08, 1134, "", 1, 0 +vvtStateIndex = scalar, U08, 1135, "", 1, 0 ; total TS size = 1136 -wallFuelCorrection = scalar, F32, 1136, "", 1, 0 -wallFuel = scalar, F32, 1140, "", 1, 0 -; total TS size = 1144 -idleState = bits, S32, 1144, [0:2], "not important" -currentIdlePosition = scalar, F32, 1148 -baseIdlePosition = scalar, F32, 1152 -iacByTpsTaper = scalar, F32, 1156 -throttlePedalUpState = scalar, S32, 1160, "", 1, 0 -mightResetPid = bits, U32, 1164, [0:0] -shouldResetPid = bits, U32, 1164, [1:1] -wasResetPid = bits, U32, 1164, [2:2] -mustResetPid = bits, U32, 1164, [3:3] -isCranking = bits, U32, 1164, [4:4] -useIacTableForCoasting = bits, U32, 1164, [5:5] -notIdling = bits, U32, 1164, [6:6] -needReset = bits, U32, 1164, [7:7] -isInDeadZone = bits, U32, 1164, [8:8] -isBlipping = bits, U32, 1164, [9:9] -useClosedLoop = bits, U32, 1164, [10:10] -badTps = bits, U32, 1164, [11:11] -looksLikeRunning = bits, U32, 1164, [12:12] -looksLikeCoasting = bits, U32, 1164, [13:13] -looksLikeCrankToIdle = bits, U32, 1164, [14:14] -isVerboseIAC = bits, U32, 1164, [15:15] -isIdleCoasting = bits, U32, 1164, [16:16] -unusedBit_22_17 = bits, U32, 1164, [17:17] -unusedBit_22_18 = bits, U32, 1164, [18:18] -unusedBit_22_19 = bits, U32, 1164, [19:19] -unusedBit_22_20 = bits, U32, 1164, [20:20] -unusedBit_22_21 = bits, U32, 1164, [21:21] -unusedBit_22_22 = bits, U32, 1164, [22:22] -unusedBit_22_23 = bits, U32, 1164, [23:23] -unusedBit_22_24 = bits, U32, 1164, [24:24] -unusedBit_22_25 = bits, U32, 1164, [25:25] -unusedBit_22_26 = bits, U32, 1164, [26:26] -unusedBit_22_27 = bits, U32, 1164, [27:27] -unusedBit_22_28 = bits, U32, 1164, [28:28] -unusedBit_22_29 = bits, U32, 1164, [29:29] -unusedBit_22_30 = bits, U32, 1164, [30:30] -unusedBit_22_31 = bits, U32, 1164, [31:31] -targetRpmByClt = scalar, S32, 1168, "", 1, 0 -targetRpmAcBump = scalar, S32, 1172, "", 1, 0 -iacByRpmTaper = scalar, F32, 1176 -luaAdd = scalar, F32, 1180 -; total TS size = 1184 -baseDwell = scalar, F32, 1184, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 1188, "", 1, 0 -luaTimingAdd = scalar, F32, 1192, "", 1, 0 -luaTimingMult = scalar, F32, 1196, "", 1, 0 -; total TS size = 1200 -idlePosition = scalar, F32, 1200, "", 1, 0 -trim = scalar, F32, 1204, "", 1, 0 -luaAdjustment = scalar, F32, 1208, "", 1, 0 -etbFeedForward = scalar, F32, 1212 -etbIntegralError = scalar, F32, 1216, "", 1, 0 -etbCurrentTarget = scalar, F32, 1220, "%", 1, 0 -etbRevLimitActive = bits, U32, 1224, [0:0] -unusedBit_7_1 = bits, U32, 1224, [1:1] -unusedBit_7_2 = bits, U32, 1224, [2:2] -unusedBit_7_3 = bits, U32, 1224, [3:3] -unusedBit_7_4 = bits, U32, 1224, [4:4] -unusedBit_7_5 = bits, U32, 1224, [5:5] -unusedBit_7_6 = bits, U32, 1224, [6:6] -unusedBit_7_7 = bits, U32, 1224, [7:7] -unusedBit_7_8 = bits, U32, 1224, [8:8] -unusedBit_7_9 = bits, U32, 1224, [9:9] -unusedBit_7_10 = bits, U32, 1224, [10:10] -unusedBit_7_11 = bits, U32, 1224, [11:11] -unusedBit_7_12 = bits, U32, 1224, [12:12] -unusedBit_7_13 = bits, U32, 1224, [13:13] -unusedBit_7_14 = bits, U32, 1224, [14:14] -unusedBit_7_15 = bits, U32, 1224, [15:15] -unusedBit_7_16 = bits, U32, 1224, [16:16] -unusedBit_7_17 = bits, U32, 1224, [17:17] -unusedBit_7_18 = bits, U32, 1224, [18:18] -unusedBit_7_19 = bits, U32, 1224, [19:19] -unusedBit_7_20 = bits, U32, 1224, [20:20] -unusedBit_7_21 = bits, U32, 1224, [21:21] -unusedBit_7_22 = bits, U32, 1224, [22:22] -unusedBit_7_23 = bits, U32, 1224, [23:23] -unusedBit_7_24 = bits, U32, 1224, [24:24] -unusedBit_7_25 = bits, U32, 1224, [25:25] -unusedBit_7_26 = bits, U32, 1224, [26:26] -unusedBit_7_27 = bits, U32, 1224, [27:27] -unusedBit_7_28 = bits, U32, 1224, [28:28] -unusedBit_7_29 = bits, U32, 1224, [29:29] -unusedBit_7_30 = bits, U32, 1224, [30:30] -unusedBit_7_31 = bits, U32, 1224, [31:31] -; total TS size = 1228 -faultCode = scalar, U08, 1228, "", 1, 0 -heaterDuty = scalar, U08, 1229, "%", 1, 0 -pumpDuty = scalar, U08, 1230, "%", 1, 0 -tempC = scalar, U16, 1232, "C", 1, 0 -nernstVoltage = scalar, U16, 1234, "V", 0.001, 0 -esr = scalar, U16, 1236, "", 1, 0 -; total TS size = 1240 +m_hasSynchronizedPhase = bits, U32, 1136, [0:0] +unusedBit_1_1 = bits, U32, 1136, [1:1] +unusedBit_1_2 = bits, U32, 1136, [2:2] +unusedBit_1_3 = bits, U32, 1136, [3:3] +unusedBit_1_4 = bits, U32, 1136, [4:4] +unusedBit_1_5 = bits, U32, 1136, [5:5] +unusedBit_1_6 = bits, U32, 1136, [6:6] +unusedBit_1_7 = bits, U32, 1136, [7:7] +unusedBit_1_8 = bits, U32, 1136, [8:8] +unusedBit_1_9 = bits, U32, 1136, [9:9] +unusedBit_1_10 = bits, U32, 1136, [10:10] +unusedBit_1_11 = bits, U32, 1136, [11:11] +unusedBit_1_12 = bits, U32, 1136, [12:12] +unusedBit_1_13 = bits, U32, 1136, [13:13] +unusedBit_1_14 = bits, U32, 1136, [14:14] +unusedBit_1_15 = bits, U32, 1136, [15:15] +unusedBit_1_16 = bits, U32, 1136, [16:16] +unusedBit_1_17 = bits, U32, 1136, [17:17] +unusedBit_1_18 = bits, U32, 1136, [18:18] +unusedBit_1_19 = bits, U32, 1136, [19:19] +unusedBit_1_20 = bits, U32, 1136, [20:20] +unusedBit_1_21 = bits, U32, 1136, [21:21] +unusedBit_1_22 = bits, U32, 1136, [22:22] +unusedBit_1_23 = bits, U32, 1136, [23:23] +unusedBit_1_24 = bits, U32, 1136, [24:24] +unusedBit_1_25 = bits, U32, 1136, [25:25] +unusedBit_1_26 = bits, U32, 1136, [26:26] +unusedBit_1_27 = bits, U32, 1136, [27:27] +unusedBit_1_28 = bits, U32, 1136, [28:28] +unusedBit_1_29 = bits, U32, 1136, [29:29] +unusedBit_1_30 = bits, U32, 1136, [30:30] +unusedBit_1_31 = bits, U32, 1136, [31:31] +; total TS size = 1140 +wallFuelCorrection = scalar, F32, 1140, "", 1, 0 +wallFuel = scalar, F32, 1144, "", 1, 0 +; total TS size = 1148 +idleState = bits, S32, 1148, [0:2], "not important" +currentIdlePosition = scalar, F32, 1152 +baseIdlePosition = scalar, F32, 1156 +iacByTpsTaper = scalar, F32, 1160 +throttlePedalUpState = scalar, S32, 1164, "", 1, 0 +mightResetPid = bits, U32, 1168, [0:0] +shouldResetPid = bits, U32, 1168, [1:1] +wasResetPid = bits, U32, 1168, [2:2] +mustResetPid = bits, U32, 1168, [3:3] +isCranking = bits, U32, 1168, [4:4] +useIacTableForCoasting = bits, U32, 1168, [5:5] +notIdling = bits, U32, 1168, [6:6] +needReset = bits, U32, 1168, [7:7] +isInDeadZone = bits, U32, 1168, [8:8] +isBlipping = bits, U32, 1168, [9:9] +useClosedLoop = bits, U32, 1168, [10:10] +badTps = bits, U32, 1168, [11:11] +looksLikeRunning = bits, U32, 1168, [12:12] +looksLikeCoasting = bits, U32, 1168, [13:13] +looksLikeCrankToIdle = bits, U32, 1168, [14:14] +isVerboseIAC = bits, U32, 1168, [15:15] +isIdleCoasting = bits, U32, 1168, [16:16] +unusedBit_22_17 = bits, U32, 1168, [17:17] +unusedBit_22_18 = bits, U32, 1168, [18:18] +unusedBit_22_19 = bits, U32, 1168, [19:19] +unusedBit_22_20 = bits, U32, 1168, [20:20] +unusedBit_22_21 = bits, U32, 1168, [21:21] +unusedBit_22_22 = bits, U32, 1168, [22:22] +unusedBit_22_23 = bits, U32, 1168, [23:23] +unusedBit_22_24 = bits, U32, 1168, [24:24] +unusedBit_22_25 = bits, U32, 1168, [25:25] +unusedBit_22_26 = bits, U32, 1168, [26:26] +unusedBit_22_27 = bits, U32, 1168, [27:27] +unusedBit_22_28 = bits, U32, 1168, [28:28] +unusedBit_22_29 = bits, U32, 1168, [29:29] +unusedBit_22_30 = bits, U32, 1168, [30:30] +unusedBit_22_31 = bits, U32, 1168, [31:31] +targetRpmByClt = scalar, S32, 1172, "", 1, 0 +targetRpmAcBump = scalar, S32, 1176, "", 1, 0 +iacByRpmTaper = scalar, F32, 1180 +luaAdd = scalar, F32, 1184 +; total TS size = 1188 +baseDwell = scalar, F32, 1188, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 1192, "", 1, 0 +luaTimingAdd = scalar, F32, 1196, "", 1, 0 +luaTimingMult = scalar, F32, 1200, "", 1, 0 +; total TS size = 1204 +idlePosition = scalar, F32, 1204, "", 1, 0 +trim = scalar, F32, 1208, "", 1, 0 +luaAdjustment = scalar, F32, 1212, "", 1, 0 +etbFeedForward = scalar, F32, 1216 +etbIntegralError = scalar, F32, 1220, "", 1, 0 +etbCurrentTarget = scalar, F32, 1224, "%", 1, 0 +etbRevLimitActive = bits, U32, 1228, [0:0] +unusedBit_7_1 = bits, U32, 1228, [1:1] +unusedBit_7_2 = bits, U32, 1228, [2:2] +unusedBit_7_3 = bits, U32, 1228, [3:3] +unusedBit_7_4 = bits, U32, 1228, [4:4] +unusedBit_7_5 = bits, U32, 1228, [5:5] +unusedBit_7_6 = bits, U32, 1228, [6:6] +unusedBit_7_7 = bits, U32, 1228, [7:7] +unusedBit_7_8 = bits, U32, 1228, [8:8] +unusedBit_7_9 = bits, U32, 1228, [9:9] +unusedBit_7_10 = bits, U32, 1228, [10:10] +unusedBit_7_11 = bits, U32, 1228, [11:11] +unusedBit_7_12 = bits, U32, 1228, [12:12] +unusedBit_7_13 = bits, U32, 1228, [13:13] +unusedBit_7_14 = bits, U32, 1228, [14:14] +unusedBit_7_15 = bits, U32, 1228, [15:15] +unusedBit_7_16 = bits, U32, 1228, [16:16] +unusedBit_7_17 = bits, U32, 1228, [17:17] +unusedBit_7_18 = bits, U32, 1228, [18:18] +unusedBit_7_19 = bits, U32, 1228, [19:19] +unusedBit_7_20 = bits, U32, 1228, [20:20] +unusedBit_7_21 = bits, U32, 1228, [21:21] +unusedBit_7_22 = bits, U32, 1228, [22:22] +unusedBit_7_23 = bits, U32, 1228, [23:23] +unusedBit_7_24 = bits, U32, 1228, [24:24] +unusedBit_7_25 = bits, U32, 1228, [25:25] +unusedBit_7_26 = bits, U32, 1228, [26:26] +unusedBit_7_27 = bits, U32, 1228, [27:27] +unusedBit_7_28 = bits, U32, 1228, [28:28] +unusedBit_7_29 = bits, U32, 1228, [29:29] +unusedBit_7_30 = bits, U32, 1228, [30:30] +unusedBit_7_31 = bits, U32, 1228, [31:31] +; total TS size = 1232 +faultCode = scalar, U08, 1232, "", 1, 0 +heaterDuty = scalar, U08, 1233, "%", 1, 0 +pumpDuty = scalar, U08, 1234, "%", 1, 0 +tempC = scalar, U16, 1236, "C", 1, 0 +nernstVoltage = scalar, U16, 1238, "V", 0.001, 0 +esr = scalar, U16, 1240, "", 1, 0 +; total TS size = 1244 time = { timeNow } @@ -4847,7 +4847,7 @@ entry = mapVvt_MAP_AT_SPECIAL_POINT, "mapVvt_MAP_AT_SPECIAL_POINT", float, "%.3 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 Phase2", int, "%d" +entry = currentEngineDecodedPhase, "Engine Phase2", float, "%.3f" entry = totalRevolutionCounter, "Crank revolution counter", int, "%d" entry = vvtSyncGapRatio, "vvtSyncGapRatio", float, "%.3f" entry = vvtCurrentPosition, "vvtCurrentPosition", float, "%.3f" diff --git a/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini b/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini index 601e37de23..08778323be 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.01.tdg-pdm8.1978736881" + signature = "rusEFI 2022.09.01.tdg-pdm8.1922884840" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.09.01.tdg-pdm8.1978736881" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.09.01.tdg-pdm8.1922884840" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Sep 01 04:52:52 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Sep 01 05:33:43 UTC 2022 pageSize = 21300 page = 1 @@ -2118,7 +2118,7 @@ maxKnockRetardRpmBins = array, U08, 21294, [6], "RPM", 100.0, 0, 0, 25000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1240 + ochBlockSize = 1244 ; ; see TunerStudioOutputChannels struct @@ -3090,147 +3090,147 @@ mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1096, "", 1, 0 mapVvt_MAP_AT_DIFF = scalar, F32, 1100, "", 1, 0 mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1104, "", 1, 0 mapVvt_map_peak = scalar, U08, 1105, "", 1, 0 -currentEngineDecodedPhase = scalar, U16, 1106, "deg", 1, 0 -; total TS size = 1108 -totalRevolutionCounter = scalar, U32, 1108, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1112, "", 1, 0 -vvtCurrentPosition = scalar, F32, 1116, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1120, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 1124, "", 1, 0 -triggerStateIndex = scalar, U08, 1128, "", 1, 0 -vvtCounter = scalar, U08, 1129, "", 1, 0 -camResyncCounter = scalar, U08, 1130, "", 1, 0 -vvtStateIndex = scalar, U08, 1131, "", 1, 0 -; total TS size = 1132 -m_hasSynchronizedPhase = bits, U32, 1132, [0:0] -unusedBit_1_1 = bits, U32, 1132, [1:1] -unusedBit_1_2 = bits, U32, 1132, [2:2] -unusedBit_1_3 = bits, U32, 1132, [3:3] -unusedBit_1_4 = bits, U32, 1132, [4:4] -unusedBit_1_5 = bits, U32, 1132, [5:5] -unusedBit_1_6 = bits, U32, 1132, [6:6] -unusedBit_1_7 = bits, U32, 1132, [7:7] -unusedBit_1_8 = bits, U32, 1132, [8:8] -unusedBit_1_9 = bits, U32, 1132, [9:9] -unusedBit_1_10 = bits, U32, 1132, [10:10] -unusedBit_1_11 = bits, U32, 1132, [11:11] -unusedBit_1_12 = bits, U32, 1132, [12:12] -unusedBit_1_13 = bits, U32, 1132, [13:13] -unusedBit_1_14 = bits, U32, 1132, [14:14] -unusedBit_1_15 = bits, U32, 1132, [15:15] -unusedBit_1_16 = bits, U32, 1132, [16:16] -unusedBit_1_17 = bits, U32, 1132, [17:17] -unusedBit_1_18 = bits, U32, 1132, [18:18] -unusedBit_1_19 = bits, U32, 1132, [19:19] -unusedBit_1_20 = bits, U32, 1132, [20:20] -unusedBit_1_21 = bits, U32, 1132, [21:21] -unusedBit_1_22 = bits, U32, 1132, [22:22] -unusedBit_1_23 = bits, U32, 1132, [23:23] -unusedBit_1_24 = bits, U32, 1132, [24:24] -unusedBit_1_25 = bits, U32, 1132, [25:25] -unusedBit_1_26 = bits, U32, 1132, [26:26] -unusedBit_1_27 = bits, U32, 1132, [27:27] -unusedBit_1_28 = bits, U32, 1132, [28:28] -unusedBit_1_29 = bits, U32, 1132, [29:29] -unusedBit_1_30 = bits, U32, 1132, [30:30] -unusedBit_1_31 = bits, U32, 1132, [31:31] +currentEngineDecodedPhase = scalar, F32, 1108, "deg", 1, 0 +; total TS size = 1112 +totalRevolutionCounter = scalar, U32, 1112, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1116, "", 1, 0 +vvtCurrentPosition = scalar, F32, 1120, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1124, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 1128, "", 1, 0 +triggerStateIndex = scalar, U08, 1132, "", 1, 0 +vvtCounter = scalar, U08, 1133, "", 1, 0 +camResyncCounter = scalar, U08, 1134, "", 1, 0 +vvtStateIndex = scalar, U08, 1135, "", 1, 0 ; total TS size = 1136 -wallFuelCorrection = scalar, F32, 1136, "", 1, 0 -wallFuel = scalar, F32, 1140, "", 1, 0 -; total TS size = 1144 -idleState = bits, S32, 1144, [0:2], "not important" -currentIdlePosition = scalar, F32, 1148 -baseIdlePosition = scalar, F32, 1152 -iacByTpsTaper = scalar, F32, 1156 -throttlePedalUpState = scalar, S32, 1160, "", 1, 0 -mightResetPid = bits, U32, 1164, [0:0] -shouldResetPid = bits, U32, 1164, [1:1] -wasResetPid = bits, U32, 1164, [2:2] -mustResetPid = bits, U32, 1164, [3:3] -isCranking = bits, U32, 1164, [4:4] -useIacTableForCoasting = bits, U32, 1164, [5:5] -notIdling = bits, U32, 1164, [6:6] -needReset = bits, U32, 1164, [7:7] -isInDeadZone = bits, U32, 1164, [8:8] -isBlipping = bits, U32, 1164, [9:9] -useClosedLoop = bits, U32, 1164, [10:10] -badTps = bits, U32, 1164, [11:11] -looksLikeRunning = bits, U32, 1164, [12:12] -looksLikeCoasting = bits, U32, 1164, [13:13] -looksLikeCrankToIdle = bits, U32, 1164, [14:14] -isVerboseIAC = bits, U32, 1164, [15:15] -isIdleCoasting = bits, U32, 1164, [16:16] -unusedBit_22_17 = bits, U32, 1164, [17:17] -unusedBit_22_18 = bits, U32, 1164, [18:18] -unusedBit_22_19 = bits, U32, 1164, [19:19] -unusedBit_22_20 = bits, U32, 1164, [20:20] -unusedBit_22_21 = bits, U32, 1164, [21:21] -unusedBit_22_22 = bits, U32, 1164, [22:22] -unusedBit_22_23 = bits, U32, 1164, [23:23] -unusedBit_22_24 = bits, U32, 1164, [24:24] -unusedBit_22_25 = bits, U32, 1164, [25:25] -unusedBit_22_26 = bits, U32, 1164, [26:26] -unusedBit_22_27 = bits, U32, 1164, [27:27] -unusedBit_22_28 = bits, U32, 1164, [28:28] -unusedBit_22_29 = bits, U32, 1164, [29:29] -unusedBit_22_30 = bits, U32, 1164, [30:30] -unusedBit_22_31 = bits, U32, 1164, [31:31] -targetRpmByClt = scalar, S32, 1168, "", 1, 0 -targetRpmAcBump = scalar, S32, 1172, "", 1, 0 -iacByRpmTaper = scalar, F32, 1176 -luaAdd = scalar, F32, 1180 -; total TS size = 1184 -baseDwell = scalar, F32, 1184, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 1188, "", 1, 0 -luaTimingAdd = scalar, F32, 1192, "", 1, 0 -luaTimingMult = scalar, F32, 1196, "", 1, 0 -; total TS size = 1200 -idlePosition = scalar, F32, 1200, "", 1, 0 -trim = scalar, F32, 1204, "", 1, 0 -luaAdjustment = scalar, F32, 1208, "", 1, 0 -etbFeedForward = scalar, F32, 1212 -etbIntegralError = scalar, F32, 1216, "", 1, 0 -etbCurrentTarget = scalar, F32, 1220, "%", 1, 0 -etbRevLimitActive = bits, U32, 1224, [0:0] -unusedBit_7_1 = bits, U32, 1224, [1:1] -unusedBit_7_2 = bits, U32, 1224, [2:2] -unusedBit_7_3 = bits, U32, 1224, [3:3] -unusedBit_7_4 = bits, U32, 1224, [4:4] -unusedBit_7_5 = bits, U32, 1224, [5:5] -unusedBit_7_6 = bits, U32, 1224, [6:6] -unusedBit_7_7 = bits, U32, 1224, [7:7] -unusedBit_7_8 = bits, U32, 1224, [8:8] -unusedBit_7_9 = bits, U32, 1224, [9:9] -unusedBit_7_10 = bits, U32, 1224, [10:10] -unusedBit_7_11 = bits, U32, 1224, [11:11] -unusedBit_7_12 = bits, U32, 1224, [12:12] -unusedBit_7_13 = bits, U32, 1224, [13:13] -unusedBit_7_14 = bits, U32, 1224, [14:14] -unusedBit_7_15 = bits, U32, 1224, [15:15] -unusedBit_7_16 = bits, U32, 1224, [16:16] -unusedBit_7_17 = bits, U32, 1224, [17:17] -unusedBit_7_18 = bits, U32, 1224, [18:18] -unusedBit_7_19 = bits, U32, 1224, [19:19] -unusedBit_7_20 = bits, U32, 1224, [20:20] -unusedBit_7_21 = bits, U32, 1224, [21:21] -unusedBit_7_22 = bits, U32, 1224, [22:22] -unusedBit_7_23 = bits, U32, 1224, [23:23] -unusedBit_7_24 = bits, U32, 1224, [24:24] -unusedBit_7_25 = bits, U32, 1224, [25:25] -unusedBit_7_26 = bits, U32, 1224, [26:26] -unusedBit_7_27 = bits, U32, 1224, [27:27] -unusedBit_7_28 = bits, U32, 1224, [28:28] -unusedBit_7_29 = bits, U32, 1224, [29:29] -unusedBit_7_30 = bits, U32, 1224, [30:30] -unusedBit_7_31 = bits, U32, 1224, [31:31] -; total TS size = 1228 -faultCode = scalar, U08, 1228, "", 1, 0 -heaterDuty = scalar, U08, 1229, "%", 1, 0 -pumpDuty = scalar, U08, 1230, "%", 1, 0 -tempC = scalar, U16, 1232, "C", 1, 0 -nernstVoltage = scalar, U16, 1234, "V", 0.001, 0 -esr = scalar, U16, 1236, "", 1, 0 -; total TS size = 1240 +m_hasSynchronizedPhase = bits, U32, 1136, [0:0] +unusedBit_1_1 = bits, U32, 1136, [1:1] +unusedBit_1_2 = bits, U32, 1136, [2:2] +unusedBit_1_3 = bits, U32, 1136, [3:3] +unusedBit_1_4 = bits, U32, 1136, [4:4] +unusedBit_1_5 = bits, U32, 1136, [5:5] +unusedBit_1_6 = bits, U32, 1136, [6:6] +unusedBit_1_7 = bits, U32, 1136, [7:7] +unusedBit_1_8 = bits, U32, 1136, [8:8] +unusedBit_1_9 = bits, U32, 1136, [9:9] +unusedBit_1_10 = bits, U32, 1136, [10:10] +unusedBit_1_11 = bits, U32, 1136, [11:11] +unusedBit_1_12 = bits, U32, 1136, [12:12] +unusedBit_1_13 = bits, U32, 1136, [13:13] +unusedBit_1_14 = bits, U32, 1136, [14:14] +unusedBit_1_15 = bits, U32, 1136, [15:15] +unusedBit_1_16 = bits, U32, 1136, [16:16] +unusedBit_1_17 = bits, U32, 1136, [17:17] +unusedBit_1_18 = bits, U32, 1136, [18:18] +unusedBit_1_19 = bits, U32, 1136, [19:19] +unusedBit_1_20 = bits, U32, 1136, [20:20] +unusedBit_1_21 = bits, U32, 1136, [21:21] +unusedBit_1_22 = bits, U32, 1136, [22:22] +unusedBit_1_23 = bits, U32, 1136, [23:23] +unusedBit_1_24 = bits, U32, 1136, [24:24] +unusedBit_1_25 = bits, U32, 1136, [25:25] +unusedBit_1_26 = bits, U32, 1136, [26:26] +unusedBit_1_27 = bits, U32, 1136, [27:27] +unusedBit_1_28 = bits, U32, 1136, [28:28] +unusedBit_1_29 = bits, U32, 1136, [29:29] +unusedBit_1_30 = bits, U32, 1136, [30:30] +unusedBit_1_31 = bits, U32, 1136, [31:31] +; total TS size = 1140 +wallFuelCorrection = scalar, F32, 1140, "", 1, 0 +wallFuel = scalar, F32, 1144, "", 1, 0 +; total TS size = 1148 +idleState = bits, S32, 1148, [0:2], "not important" +currentIdlePosition = scalar, F32, 1152 +baseIdlePosition = scalar, F32, 1156 +iacByTpsTaper = scalar, F32, 1160 +throttlePedalUpState = scalar, S32, 1164, "", 1, 0 +mightResetPid = bits, U32, 1168, [0:0] +shouldResetPid = bits, U32, 1168, [1:1] +wasResetPid = bits, U32, 1168, [2:2] +mustResetPid = bits, U32, 1168, [3:3] +isCranking = bits, U32, 1168, [4:4] +useIacTableForCoasting = bits, U32, 1168, [5:5] +notIdling = bits, U32, 1168, [6:6] +needReset = bits, U32, 1168, [7:7] +isInDeadZone = bits, U32, 1168, [8:8] +isBlipping = bits, U32, 1168, [9:9] +useClosedLoop = bits, U32, 1168, [10:10] +badTps = bits, U32, 1168, [11:11] +looksLikeRunning = bits, U32, 1168, [12:12] +looksLikeCoasting = bits, U32, 1168, [13:13] +looksLikeCrankToIdle = bits, U32, 1168, [14:14] +isVerboseIAC = bits, U32, 1168, [15:15] +isIdleCoasting = bits, U32, 1168, [16:16] +unusedBit_22_17 = bits, U32, 1168, [17:17] +unusedBit_22_18 = bits, U32, 1168, [18:18] +unusedBit_22_19 = bits, U32, 1168, [19:19] +unusedBit_22_20 = bits, U32, 1168, [20:20] +unusedBit_22_21 = bits, U32, 1168, [21:21] +unusedBit_22_22 = bits, U32, 1168, [22:22] +unusedBit_22_23 = bits, U32, 1168, [23:23] +unusedBit_22_24 = bits, U32, 1168, [24:24] +unusedBit_22_25 = bits, U32, 1168, [25:25] +unusedBit_22_26 = bits, U32, 1168, [26:26] +unusedBit_22_27 = bits, U32, 1168, [27:27] +unusedBit_22_28 = bits, U32, 1168, [28:28] +unusedBit_22_29 = bits, U32, 1168, [29:29] +unusedBit_22_30 = bits, U32, 1168, [30:30] +unusedBit_22_31 = bits, U32, 1168, [31:31] +targetRpmByClt = scalar, S32, 1172, "", 1, 0 +targetRpmAcBump = scalar, S32, 1176, "", 1, 0 +iacByRpmTaper = scalar, F32, 1180 +luaAdd = scalar, F32, 1184 +; total TS size = 1188 +baseDwell = scalar, F32, 1188, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 1192, "", 1, 0 +luaTimingAdd = scalar, F32, 1196, "", 1, 0 +luaTimingMult = scalar, F32, 1200, "", 1, 0 +; total TS size = 1204 +idlePosition = scalar, F32, 1204, "", 1, 0 +trim = scalar, F32, 1208, "", 1, 0 +luaAdjustment = scalar, F32, 1212, "", 1, 0 +etbFeedForward = scalar, F32, 1216 +etbIntegralError = scalar, F32, 1220, "", 1, 0 +etbCurrentTarget = scalar, F32, 1224, "%", 1, 0 +etbRevLimitActive = bits, U32, 1228, [0:0] +unusedBit_7_1 = bits, U32, 1228, [1:1] +unusedBit_7_2 = bits, U32, 1228, [2:2] +unusedBit_7_3 = bits, U32, 1228, [3:3] +unusedBit_7_4 = bits, U32, 1228, [4:4] +unusedBit_7_5 = bits, U32, 1228, [5:5] +unusedBit_7_6 = bits, U32, 1228, [6:6] +unusedBit_7_7 = bits, U32, 1228, [7:7] +unusedBit_7_8 = bits, U32, 1228, [8:8] +unusedBit_7_9 = bits, U32, 1228, [9:9] +unusedBit_7_10 = bits, U32, 1228, [10:10] +unusedBit_7_11 = bits, U32, 1228, [11:11] +unusedBit_7_12 = bits, U32, 1228, [12:12] +unusedBit_7_13 = bits, U32, 1228, [13:13] +unusedBit_7_14 = bits, U32, 1228, [14:14] +unusedBit_7_15 = bits, U32, 1228, [15:15] +unusedBit_7_16 = bits, U32, 1228, [16:16] +unusedBit_7_17 = bits, U32, 1228, [17:17] +unusedBit_7_18 = bits, U32, 1228, [18:18] +unusedBit_7_19 = bits, U32, 1228, [19:19] +unusedBit_7_20 = bits, U32, 1228, [20:20] +unusedBit_7_21 = bits, U32, 1228, [21:21] +unusedBit_7_22 = bits, U32, 1228, [22:22] +unusedBit_7_23 = bits, U32, 1228, [23:23] +unusedBit_7_24 = bits, U32, 1228, [24:24] +unusedBit_7_25 = bits, U32, 1228, [25:25] +unusedBit_7_26 = bits, U32, 1228, [26:26] +unusedBit_7_27 = bits, U32, 1228, [27:27] +unusedBit_7_28 = bits, U32, 1228, [28:28] +unusedBit_7_29 = bits, U32, 1228, [29:29] +unusedBit_7_30 = bits, U32, 1228, [30:30] +unusedBit_7_31 = bits, U32, 1228, [31:31] +; total TS size = 1232 +faultCode = scalar, U08, 1232, "", 1, 0 +heaterDuty = scalar, U08, 1233, "%", 1, 0 +pumpDuty = scalar, U08, 1234, "%", 1, 0 +tempC = scalar, U16, 1236, "C", 1, 0 +nernstVoltage = scalar, U16, 1238, "V", 0.001, 0 +esr = scalar, U16, 1240, "", 1, 0 +; total TS size = 1244 time = { timeNow } @@ -4847,7 +4847,7 @@ entry = mapVvt_MAP_AT_SPECIAL_POINT, "mapVvt_MAP_AT_SPECIAL_POINT", float, "%.3 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 Phase2", int, "%d" +entry = currentEngineDecodedPhase, "Engine Phase2", float, "%.3f" entry = totalRevolutionCounter, "Crank revolution counter", int, "%d" entry = vvtSyncGapRatio, "vvtSyncGapRatio", float, "%.3f" entry = vvtCurrentPosition, "vvtCurrentPosition", float, "%.3f" 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 0ab52628a4..7174926843 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/Fields.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/Fields.java @@ -1,6 +1,6 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Sep 01 04:30:06 UTC 2022 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Sep 01 05:33:47 UTC 2022 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -2380,10 +2380,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.01.all.3757698725"; + public static final String TS_SIGNATURE = "rusEFI 2022.09.01.all.3633588924"; 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 = 1240; + public static final int TS_TOTAL_OUTPUT_SIZE = 1244; 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 29168e39ce..dd897fc0e1 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 03:55:33 UTC 2022 +// 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 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -18,7 +18,8 @@ public class TriggerCentral { public static final Field MAPVVT_MAP_AT_DIFF = Field.create("MAPVVT_MAP_AT_DIFF", 32, FieldType.FLOAT); public static final Field MAPVVT_MAP_AT_CYCLE_COUNT = Field.create("MAPVVT_MAP_AT_CYCLE_COUNT", 36, FieldType.INT8).setScale(1.0); public static final Field MAPVVT_MAP_PEAK = Field.create("MAPVVT_MAP_PEAK", 37, FieldType.INT8).setScale(1.0); - public static final Field CURRENTENGINEDECODEDPHASE = Field.create("CURRENTENGINEDECODEDPHASE", 38, FieldType.INT16).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[] VALUES = { HWEVENTCOUNTERS1, HWEVENTCOUNTERS2, @@ -31,6 +32,7 @@ public class TriggerCentral { MAPVVT_MAP_AT_DIFF, MAPVVT_MAP_AT_CYCLE_COUNT, MAPVVT_MAP_PEAK, + ALIGNMENTFILL_AT_38, CURRENTENGINEDECODEDPHASE, }; }