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 7d491c40ed..32b1035cdb 100644 --- a/firmware/config/boards/cypress/config/controllers/algo/rusefi_generated.h +++ b/firmware/config/boards/cypress/config/controllers/algo/rusefi_generated.h @@ -1934,7 +1934,7 @@ #define show_Frankenso_presets true #define show_test_presets true #define showHumanReadableWarning_offset 960 -#define SIGNATURE_HASH 1969688327 +#define SIGNATURE_HASH 1913309982 #define silentTriggerError_offset 1360 #define skippedWheelOnCam_offset 1360 #define slowAdcAlpha_offset 1600 @@ -2490,12 +2490,12 @@ #define ts_show_vbatt true #define ts_show_vr_threshold_2 true #define ts_show_vr_threshold_all true -#define TS_SIGNATURE "rusEFI 2022.08.24.cypress.1969688327" +#define TS_SIGNATURE "rusEFI 2022.08.24.cypress.1913309982" #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 1220 +#define TS_TOTAL_OUTPUT_SIZE 1224 #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 c40954c10f..5dc26b94fe 100644 --- a/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h +++ b/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h @@ -1934,7 +1934,7 @@ #define show_Frankenso_presets true #define show_test_presets true #define showHumanReadableWarning_offset 960 -#define SIGNATURE_HASH 498118091 +#define SIGNATURE_HASH 450718162 #define silentTriggerError_offset 1360 #define skippedWheelOnCam_offset 1360 #define slowAdcAlpha_offset 1600 @@ -2490,12 +2490,12 @@ #define ts_show_vbatt true #define ts_show_vr_threshold_2 true #define ts_show_vr_threshold_all true -#define TS_SIGNATURE "rusEFI 2022.08.24.kin.498118091" +#define TS_SIGNATURE "rusEFI 2022.08.24.kin.450718162" #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 1220 +#define TS_TOTAL_OUTPUT_SIZE 1224 #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 7298e060de..9803f629dd 100644 --- a/firmware/config/boards/subaru_eg33/config/controllers/algo/rusefi_generated.h +++ b/firmware/config/boards/subaru_eg33/config/controllers/algo/rusefi_generated.h @@ -1900,7 +1900,7 @@ #define show_Proteus_presets false #define show_test_presets false #define showHumanReadableWarning_offset 960 -#define SIGNATURE_HASH 995801279 +#define SIGNATURE_HASH 1010269350 #define silentTriggerError_offset 1360 #define skippedWheelOnCam_offset 1360 #define slowAdcAlpha_offset 1600 @@ -2457,12 +2457,12 @@ #define ts_show_vbatt true #define ts_show_vr_threshold_2 true #define ts_show_vr_threshold_all true -#define TS_SIGNATURE "rusEFI 2022.08.24.subaru_eg33_f7.995801279" +#define TS_SIGNATURE "rusEFI 2022.08.24.subaru_eg33_f7.1010269350" #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 1220 +#define TS_TOTAL_OUTPUT_SIZE 1224 #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 c87b997f1b..f82aa87531 100644 --- a/firmware/console/binary/generated/data_logs.ini +++ b/firmware/console/binary/generated/data_logs.ini @@ -371,7 +371,6 @@ entry = hellenBoardId, "Detected Board ID", int, "%d" entry = clutchUpState, "clutch: up", int, "%d" entry = clutchDownState, "clutch: down", int, "%d" entry = brakePedalState, "brake: down", int, "%d" -entry = isSynchronizedPhase, "isSynchronizedPhase", int, "%d" entry = egt1, "egt1", float, "%.3f" entry = egt2, "egt2", float, "%.3f" entry = desiredRpmLimit, "User-defined RPM hard limit", int, "%d" @@ -412,6 +411,7 @@ entry = triggerStateIndex, "triggerStateIndex", int, "%d" entry = vvtCounter, "vvtCounter", int, "%d" entry = camResyncCounter, "camResyncCounter", int, "%d" entry = vvtStateIndex, "vvtStateIndex", int, "%d" +entry = m_hasSynchronizedPhase, "m_hasSynchronizedPhase", int, "%d" entry = wallFuelCorrection, "fuel injection time correction to account for wall wetting effect for current cycle", float, "%.3f" entry = wallFuel, "Amount of fuel on the wall, in ms of injector open time for each injector.", float, "%.3f" entry = idleState, "idleState", int, "%d" diff --git a/firmware/console/binary/generated/fancy_content.ini b/firmware/console/binary/generated/fancy_content.ini index 1fcead3460..91c444ab27 100644 --- a/firmware/console/binary/generated/fancy_content.ini +++ b/firmware/console/binary/generated/fancy_content.ini @@ -115,7 +115,6 @@ indicatorPanel = engine_stateIndicatorPanel, 2 indicator = {clutchUpState}, "clutchUpState No", "clutchUpState Yes" indicator = {clutchDownState}, "clutchDownState No", "clutchDownState Yes" indicator = {brakePedalState}, "brakePedalState No", "brakePedalState Yes" - indicator = {isSynchronizedPhase}, "isSynchronizedPhase No", "isSynchronizedPhase Yes" dialog = engine_stateDialog, "engine_state" panel = engine_stateIndicatorPanel @@ -224,6 +223,12 @@ dialog = trigger_stateDialog, "trigger_state" liveGraph = trigger_state_3_Graph, "Graph", South graphLine = vvtStateIndex +indicatorPanel = trigger_state_primaryIndicatorPanel, 2 + indicator = {m_hasSynchronizedPhase}, "m_hasSynchronizedPhase No", "m_hasSynchronizedPhase Yes" + +dialog = trigger_state_primaryDialog, "trigger_state_primary" + panel = trigger_state_primaryIndicatorPanel + dialog = wall_fuel_stateDialog, "wall_fuel_state" liveGraph = wall_fuel_state_1_Graph, "Graph", South diff --git a/firmware/console/binary/generated/fancy_menu.ini b/firmware/console/binary/generated/fancy_menu.ini index 0a478181b0..b33bfa85fe 100644 --- a/firmware/console/binary/generated/fancy_menu.ini +++ b/firmware/console/binary/generated/fancy_menu.ini @@ -11,6 +11,7 @@ subMenu = tps_accel_stateDialog, "tps_accel_state" subMenu = trigger_centralDialog, "trigger_central" subMenu = trigger_stateDialog, "trigger_state" + subMenu = trigger_state_primaryDialog, "trigger_state_primary" subMenu = wall_fuel_stateDialog, "wall_fuel_state" subMenu = idle_stateDialog, "idle_state" subMenu = ignition_stateDialog, "ignition_state" diff --git a/firmware/console/binary/generated/live_data_fragments.h b/firmware/console/binary/generated/live_data_fragments.h index 80b7c77510..5911421a6c 100644 --- a/firmware/console/binary/generated/live_data_fragments.h +++ b/firmware/console/binary/generated/live_data_fragments.h @@ -18,6 +18,7 @@ getLiveDataAddr(0), // trg // getLiveDataAddr(2), // vvt1e // getLiveDataAddr(3), // vvt2i // getLiveDataAddr(4), // vvt2e +getLiveDataAddr(), getLiveDataAddr(), getLiveDataAddr(), getLiveDataAddr(), diff --git a/firmware/console/binary/generated/live_data_ids.h b/firmware/console/binary/generated/live_data_ids.h index f1c940af17..c8f7cc9839 100644 --- a/firmware/console/binary/generated/live_data_ids.h +++ b/firmware/console/binary/generated/live_data_ids.h @@ -16,6 +16,7 @@ LDS_engine_state, LDS_tps_accel_state, LDS_trigger_central, LDS_trigger_state, +LDS_trigger_state_primary, LDS_wall_fuel_state, LDS_idle_state, LDS_ignition_state, diff --git a/firmware/console/binary/generated/output_channels.ini b/firmware/console/binary/generated/output_channels.ini index 3d78bf8884..b5a708ef61 100644 --- a/firmware/console/binary/generated/output_channels.ini +++ b/firmware/console/binary/generated/output_channels.ini @@ -873,35 +873,35 @@ hellenBoardId = scalar, S16, 990, "id", 1, 0 clutchUpState = bits, U32, 992, [0:0] clutchDownState = bits, U32, 992, [1:1] brakePedalState = bits, U32, 992, [2:2] -isSynchronizedPhase = bits, U32, 992, [3:3] -unusedBit_23_4 = bits, U32, 992, [4:4] -unusedBit_23_5 = bits, U32, 992, [5:5] -unusedBit_23_6 = bits, U32, 992, [6:6] -unusedBit_23_7 = bits, U32, 992, [7:7] -unusedBit_23_8 = bits, U32, 992, [8:8] -unusedBit_23_9 = bits, U32, 992, [9:9] -unusedBit_23_10 = bits, U32, 992, [10:10] -unusedBit_23_11 = bits, U32, 992, [11:11] -unusedBit_23_12 = bits, U32, 992, [12:12] -unusedBit_23_13 = bits, U32, 992, [13:13] -unusedBit_23_14 = bits, U32, 992, [14:14] -unusedBit_23_15 = bits, U32, 992, [15:15] -unusedBit_23_16 = bits, U32, 992, [16:16] -unusedBit_23_17 = bits, U32, 992, [17:17] -unusedBit_23_18 = bits, U32, 992, [18:18] -unusedBit_23_19 = bits, U32, 992, [19:19] -unusedBit_23_20 = bits, U32, 992, [20:20] -unusedBit_23_21 = bits, U32, 992, [21:21] -unusedBit_23_22 = bits, U32, 992, [22:22] -unusedBit_23_23 = bits, U32, 992, [23:23] -unusedBit_23_24 = bits, U32, 992, [24:24] -unusedBit_23_25 = bits, U32, 992, [25:25] -unusedBit_23_26 = bits, U32, 992, [26:26] -unusedBit_23_27 = bits, U32, 992, [27:27] -unusedBit_23_28 = bits, U32, 992, [28:28] -unusedBit_23_29 = bits, U32, 992, [29:29] -unusedBit_23_30 = bits, U32, 992, [30:30] -unusedBit_23_31 = bits, U32, 992, [31:31] +unusedBit_22_3 = bits, U32, 992, [3:3] +unusedBit_22_4 = bits, U32, 992, [4:4] +unusedBit_22_5 = bits, U32, 992, [5:5] +unusedBit_22_6 = bits, U32, 992, [6:6] +unusedBit_22_7 = bits, U32, 992, [7:7] +unusedBit_22_8 = bits, U32, 992, [8:8] +unusedBit_22_9 = bits, U32, 992, [9:9] +unusedBit_22_10 = bits, U32, 992, [10:10] +unusedBit_22_11 = bits, U32, 992, [11:11] +unusedBit_22_12 = bits, U32, 992, [12:12] +unusedBit_22_13 = bits, U32, 992, [13:13] +unusedBit_22_14 = bits, U32, 992, [14:14] +unusedBit_22_15 = bits, U32, 992, [15:15] +unusedBit_22_16 = bits, U32, 992, [16:16] +unusedBit_22_17 = bits, U32, 992, [17:17] +unusedBit_22_18 = bits, U32, 992, [18:18] +unusedBit_22_19 = bits, U32, 992, [19:19] +unusedBit_22_20 = bits, U32, 992, [20:20] +unusedBit_22_21 = bits, U32, 992, [21:21] +unusedBit_22_22 = bits, U32, 992, [22:22] +unusedBit_22_23 = bits, U32, 992, [23:23] +unusedBit_22_24 = bits, U32, 992, [24:24] +unusedBit_22_25 = bits, U32, 992, [25:25] +unusedBit_22_26 = bits, U32, 992, [26:26] +unusedBit_22_27 = bits, U32, 992, [27:27] +unusedBit_22_28 = bits, U32, 992, [28:28] +unusedBit_22_29 = bits, U32, 992, [29:29] +unusedBit_22_30 = bits, U32, 992, [30:30] +unusedBit_22_31 = bits, U32, 992, [31:31] egt1 = scalar, F32, 996, "", 1, 0 egt2 = scalar, F32, 1000, "", 1, 0 desiredRpmLimit = scalar, S16, 1004, "rpm", 1, 0 @@ -972,67 +972,100 @@ vvtCounter = scalar, U08, 1117, "", 1, 0 camResyncCounter = scalar, U08, 1118, "", 1, 0 vvtStateIndex = scalar, U08, 1119, "", 1, 0 ; total TS size = 1120 -wallFuelCorrection = scalar, F32, 1120, "", 1, 0 -wallFuel = scalar, F32, 1124, "", 1, 0 -; total TS size = 1128 -idleState = bits, S32, 1128, [0:2], "not important" -currentIdlePosition = scalar, F32, 1132 -baseIdlePosition = scalar, F32, 1136 -iacByTpsTaper = scalar, F32, 1140 -throttlePedalUpState = scalar, S32, 1144, "", 1, 0 -mightResetPid = bits, U32, 1148, [0:0] -shouldResetPid = bits, U32, 1148, [1:1] -wasResetPid = bits, U32, 1148, [2:2] -mustResetPid = bits, U32, 1148, [3:3] -isCoasting = bits, U32, 1148, [4:4] -useIacTableForCoasting = bits, U32, 1148, [5:5] -notIdling = bits, U32, 1148, [6:6] -needReset = bits, U32, 1148, [7:7] -isInDeadZone = bits, U32, 1148, [8:8] -isBlipping = bits, U32, 1148, [9:9] -useClosedLoop = bits, U32, 1148, [10:10] -badTps = bits, U32, 1148, [11:11] -looksLikeRunning = bits, U32, 1148, [12:12] -looksLikeCoasting = bits, U32, 1148, [13:13] -looksLikeCrankToIdle = bits, U32, 1148, [14:14] -useInstantRpmForIdle = bits, U32, 1148, [15:15] -isVerboseIAC = bits, U32, 1148, [16:16] -unusedBit_22_17 = bits, U32, 1148, [17:17] -unusedBit_22_18 = bits, U32, 1148, [18:18] -unusedBit_22_19 = bits, U32, 1148, [19:19] -unusedBit_22_20 = bits, U32, 1148, [20:20] -unusedBit_22_21 = bits, U32, 1148, [21:21] -unusedBit_22_22 = bits, U32, 1148, [22:22] -unusedBit_22_23 = bits, U32, 1148, [23:23] -unusedBit_22_24 = bits, U32, 1148, [24:24] -unusedBit_22_25 = bits, U32, 1148, [25:25] -unusedBit_22_26 = bits, U32, 1148, [26:26] -unusedBit_22_27 = bits, U32, 1148, [27:27] -unusedBit_22_28 = bits, U32, 1148, [28:28] -unusedBit_22_29 = bits, U32, 1148, [29:29] -unusedBit_22_30 = bits, U32, 1148, [30:30] -unusedBit_22_31 = bits, U32, 1148, [31:31] -targetRpmByClt = scalar, S32, 1152, "", 1, 0 -targetRpmAcBump = scalar, S32, 1156, "", 1, 0 -iacByRpmTaper = scalar, F32, 1160 -luaAdd = scalar, F32, 1164 -; total TS size = 1168 -baseDwell = scalar, F32, 1168, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 1172, "", 1, 0 -luaTimingAdd = scalar, F32, 1176, "", 1, 0 -luaTimingMult = scalar, F32, 1180, "", 1, 0 -; total TS size = 1184 -idlePosition = scalar, F32, 1184, "", 1, 0 -trim = scalar, F32, 1188, "", 1, 0 -luaAdjustment = scalar, F32, 1192, "", 1, 0 -etbFeedForward = scalar, F32, 1196 -etbIntegralError = scalar, F32, 1200, "", 1, 0 -etbCurrentTarget = scalar, F32, 1204, "%", 1, 0 -; total TS size = 1208 -faultCode = scalar, U08, 1208, "", 1, 0 -heaterDuty = scalar, U08, 1209, "%", 1, 0 -pumpDuty = scalar, U08, 1210, "%", 1, 0 -tempC = scalar, U16, 1212, "C", 1, 0 -nernstVoltage = scalar, U16, 1214, "V", 0.001, 0 -esr = scalar, U16, 1216, "", 1, 0 -; total TS size = 1220 +m_hasSynchronizedPhase = bits, U32, 1120, [0:0] +unusedBit_1_1 = bits, U32, 1120, [1:1] +unusedBit_1_2 = bits, U32, 1120, [2:2] +unusedBit_1_3 = bits, U32, 1120, [3:3] +unusedBit_1_4 = bits, U32, 1120, [4:4] +unusedBit_1_5 = bits, U32, 1120, [5:5] +unusedBit_1_6 = bits, U32, 1120, [6:6] +unusedBit_1_7 = bits, U32, 1120, [7:7] +unusedBit_1_8 = bits, U32, 1120, [8:8] +unusedBit_1_9 = bits, U32, 1120, [9:9] +unusedBit_1_10 = bits, U32, 1120, [10:10] +unusedBit_1_11 = bits, U32, 1120, [11:11] +unusedBit_1_12 = bits, U32, 1120, [12:12] +unusedBit_1_13 = bits, U32, 1120, [13:13] +unusedBit_1_14 = bits, U32, 1120, [14:14] +unusedBit_1_15 = bits, U32, 1120, [15:15] +unusedBit_1_16 = bits, U32, 1120, [16:16] +unusedBit_1_17 = bits, U32, 1120, [17:17] +unusedBit_1_18 = bits, U32, 1120, [18:18] +unusedBit_1_19 = bits, U32, 1120, [19:19] +unusedBit_1_20 = bits, U32, 1120, [20:20] +unusedBit_1_21 = bits, U32, 1120, [21:21] +unusedBit_1_22 = bits, U32, 1120, [22:22] +unusedBit_1_23 = bits, U32, 1120, [23:23] +unusedBit_1_24 = bits, U32, 1120, [24:24] +unusedBit_1_25 = bits, U32, 1120, [25:25] +unusedBit_1_26 = bits, U32, 1120, [26:26] +unusedBit_1_27 = bits, U32, 1120, [27:27] +unusedBit_1_28 = bits, U32, 1120, [28:28] +unusedBit_1_29 = bits, U32, 1120, [29:29] +unusedBit_1_30 = bits, U32, 1120, [30:30] +unusedBit_1_31 = bits, U32, 1120, [31:31] +; total TS size = 1124 +wallFuelCorrection = scalar, F32, 1124, "", 1, 0 +wallFuel = scalar, F32, 1128, "", 1, 0 +; total TS size = 1132 +idleState = bits, S32, 1132, [0:2], "not important" +currentIdlePosition = scalar, F32, 1136 +baseIdlePosition = scalar, F32, 1140 +iacByTpsTaper = scalar, F32, 1144 +throttlePedalUpState = scalar, S32, 1148, "", 1, 0 +mightResetPid = bits, U32, 1152, [0:0] +shouldResetPid = bits, U32, 1152, [1:1] +wasResetPid = bits, U32, 1152, [2:2] +mustResetPid = bits, U32, 1152, [3:3] +isCoasting = bits, U32, 1152, [4:4] +useIacTableForCoasting = bits, U32, 1152, [5:5] +notIdling = bits, U32, 1152, [6:6] +needReset = bits, U32, 1152, [7:7] +isInDeadZone = bits, U32, 1152, [8:8] +isBlipping = bits, U32, 1152, [9:9] +useClosedLoop = bits, U32, 1152, [10:10] +badTps = bits, U32, 1152, [11:11] +looksLikeRunning = bits, U32, 1152, [12:12] +looksLikeCoasting = bits, U32, 1152, [13:13] +looksLikeCrankToIdle = bits, U32, 1152, [14:14] +useInstantRpmForIdle = bits, U32, 1152, [15:15] +isVerboseIAC = bits, U32, 1152, [16:16] +unusedBit_22_17 = bits, U32, 1152, [17:17] +unusedBit_22_18 = bits, U32, 1152, [18:18] +unusedBit_22_19 = bits, U32, 1152, [19:19] +unusedBit_22_20 = bits, U32, 1152, [20:20] +unusedBit_22_21 = bits, U32, 1152, [21:21] +unusedBit_22_22 = bits, U32, 1152, [22:22] +unusedBit_22_23 = bits, U32, 1152, [23:23] +unusedBit_22_24 = bits, U32, 1152, [24:24] +unusedBit_22_25 = bits, U32, 1152, [25:25] +unusedBit_22_26 = bits, U32, 1152, [26:26] +unusedBit_22_27 = bits, U32, 1152, [27:27] +unusedBit_22_28 = bits, U32, 1152, [28:28] +unusedBit_22_29 = bits, U32, 1152, [29:29] +unusedBit_22_30 = bits, U32, 1152, [30:30] +unusedBit_22_31 = bits, U32, 1152, [31:31] +targetRpmByClt = scalar, S32, 1156, "", 1, 0 +targetRpmAcBump = scalar, S32, 1160, "", 1, 0 +iacByRpmTaper = scalar, F32, 1164 +luaAdd = scalar, F32, 1168 +; total TS size = 1172 +baseDwell = scalar, F32, 1172, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 1176, "", 1, 0 +luaTimingAdd = scalar, F32, 1180, "", 1, 0 +luaTimingMult = scalar, F32, 1184, "", 1, 0 +; total TS size = 1188 +idlePosition = scalar, F32, 1188, "", 1, 0 +trim = scalar, F32, 1192, "", 1, 0 +luaAdjustment = scalar, F32, 1196, "", 1, 0 +etbFeedForward = scalar, F32, 1200 +etbIntegralError = scalar, F32, 1204, "", 1, 0 +etbCurrentTarget = scalar, F32, 1208, "%", 1, 0 +; total TS size = 1212 +faultCode = scalar, U08, 1212, "", 1, 0 +heaterDuty = scalar, U08, 1213, "%", 1, 0 +pumpDuty = scalar, U08, 1214, "%", 1, 0 +tempC = scalar, U16, 1216, "C", 1, 0 +nernstVoltage = scalar, U16, 1218, "V", 0.001, 0 +esr = scalar, U16, 1220, "", 1, 0 +; total TS size = 1224 diff --git a/firmware/console/binary/generated/sensors.java b/firmware/console/binary/generated/sensors.java index 4907636631..75c42fa1ed 100644 --- a/firmware/console/binary/generated/sensors.java +++ b/firmware/console/binary/generated/sensors.java @@ -460,32 +460,32 @@ triggerStateIndex("triggerStateIndex", SensorCategory.SENSOR_INPUTS, FieldType.I vvtCounter("vvtCounter", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1117, 1.0, -1.0, -1.0, ""), camResyncCounter("camResyncCounter", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1118, 1.0, -1.0, -1.0, ""), vvtStateIndex("vvtStateIndex", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1119, 1.0, -1.0, -1.0, ""), -wallFuelCorrection("fuel injection time correction to account for wall wetting effect for current cycle", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1120, 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, 1124, 1.0, -1.0, -1.0, ""), -idleState("idleState", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1128, 1.0, -1.0, -1.0, ""), -currentIdlePosition("idle: current position\nthat's current position with CLT and IAT corrections", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1132, 1.0, -1.0, -1.0, ""), -baseIdlePosition("idle: base value\ncurrent position without adjustments (iacByTpsTaper, afterCrankingIACtaperDuration)", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1136, 1.0, -1.0, -1.0, ""), -iacByTpsTaper("idle: iacByTpsTaper portion of idle", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1140, 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, 1144, 1.0, -1.0, -1.0, ""), -targetRpmByClt("idle: target by CLT", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1152, 1.0, -1.0, -1.0, ""), -targetRpmAcBump("idle: A/C bump", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1156, 1.0, -1.0, -1.0, ""), -iacByRpmTaper("idle: iacByRpmTaper portion of idle", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1160, 1.0, -1.0, -1.0, ""), -luaAdd("idle: Lua Adder", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1164, 1.0, -1.0, -1.0, ""), -baseDwell("baseDwell", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1168, 1.0, -1.0, -1.0, ""), -dwellVoltageCorrection("dwellVoltageCorrection", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1172, 1.0, -1.0, -1.0, ""), -luaTimingAdd("luaTimingAdd", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1176, 1.0, -1.0, -1.0, ""), -luaTimingMult("luaTimingMult", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1180, 1.0, -1.0, -1.0, ""), -idlePosition("idlePosition", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1184, 1.0, -1.0, -1.0, ""), -trim("trim", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1188, 1.0, -1.0, -1.0, ""), -luaAdjustment("luaAdjustment", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1192, 1.0, -1.0, -1.0, ""), -etbFeedForward("etbFeedForward", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1196, 1.0, -1.0, -1.0, ""), -etbIntegralError("etbIntegralError", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1200, 1.0, -10000.0, 10000.0, ""), -etbCurrentTarget("etbCurrentTarget", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1204, 1.0, -10000.0, 10000.0, "%"), -faultCode("faultCode", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1208, 1.0, -1.0, -1.0, ""), -heaterDuty("heaterDuty", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1209, 1.0, 0.0, 100.0, "%"), -pumpDuty("pumpDuty", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1210, 1.0, 0.0, 100.0, "%"), -alignmentFill_at_3("need 4 byte alignment", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1211, 1.0, -20.0, 100.0, "units"), -tempC("tempC", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1212, 1.0, 500.0, 1000.0, "C"), -nernstVoltage("nernstVoltage", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1214, 0.001, 0.0, 1.0, "V"), -esr("esr", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1216, 1.0, -1.0, -1.0, ""), -alignmentFill_at_10("need 4 byte alignment", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1218, 1.0, -20.0, 100.0, "units"), +wallFuelCorrection("fuel injection time correction to account for wall wetting effect for current cycle", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1124, 1.0, -1.0, -1.0, ""), +wallFuel("Amount of fuel on the wall, in ms of injector open time for each injector.", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1128, 1.0, -1.0, -1.0, ""), +idleState("idleState", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1132, 1.0, -1.0, -1.0, ""), +currentIdlePosition("idle: current position\nthat's current position with CLT and IAT corrections", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1136, 1.0, -1.0, -1.0, ""), +baseIdlePosition("idle: base value\ncurrent position without adjustments (iacByTpsTaper, afterCrankingIACtaperDuration)", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1140, 1.0, -1.0, -1.0, ""), +iacByTpsTaper("idle: iacByTpsTaper portion of idle", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1144, 1.0, -1.0, -1.0, ""), +throttlePedalUpState("true in IDLE throttle pedal state, false if driver is touching the pedal\ntodo: better name for this field?", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1148, 1.0, -1.0, -1.0, ""), +targetRpmByClt("idle: target by CLT", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1156, 1.0, -1.0, -1.0, ""), +targetRpmAcBump("idle: A/C bump", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1160, 1.0, -1.0, -1.0, ""), +iacByRpmTaper("idle: iacByRpmTaper portion of idle", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1164, 1.0, -1.0, -1.0, ""), +luaAdd("idle: Lua Adder", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1168, 1.0, -1.0, -1.0, ""), +baseDwell("baseDwell", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1172, 1.0, -1.0, -1.0, ""), +dwellVoltageCorrection("dwellVoltageCorrection", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1176, 1.0, -1.0, -1.0, ""), +luaTimingAdd("luaTimingAdd", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1180, 1.0, -1.0, -1.0, ""), +luaTimingMult("luaTimingMult", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1184, 1.0, -1.0, -1.0, ""), +idlePosition("idlePosition", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1188, 1.0, -1.0, -1.0, ""), +trim("trim", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1192, 1.0, -1.0, -1.0, ""), +luaAdjustment("luaAdjustment", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1196, 1.0, -1.0, -1.0, ""), +etbFeedForward("etbFeedForward", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1200, 1.0, -1.0, -1.0, ""), +etbIntegralError("etbIntegralError", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1204, 1.0, -10000.0, 10000.0, ""), +etbCurrentTarget("etbCurrentTarget", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1208, 1.0, -10000.0, 10000.0, "%"), +faultCode("faultCode", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1212, 1.0, -1.0, -1.0, ""), +heaterDuty("heaterDuty", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1213, 1.0, 0.0, 100.0, "%"), +pumpDuty("pumpDuty", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1214, 1.0, 0.0, 100.0, "%"), +alignmentFill_at_3("need 4 byte alignment", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1215, 1.0, -20.0, 100.0, "units"), +tempC("tempC", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1216, 1.0, 500.0, 1000.0, "C"), +nernstVoltage("nernstVoltage", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1218, 0.001, 0.0, 1.0, "V"), +esr("esr", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1220, 1.0, -1.0, -1.0, ""), +alignmentFill_at_10("need 4 byte alignment", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1222, 1.0, -20.0, 100.0, "units"), diff --git a/firmware/console/binary/generated/total_live_data_generated.h b/firmware/console/binary/generated/total_live_data_generated.h index 7184a0658c..e626c38d05 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 1220 \ No newline at end of file +#define TS_TOTAL_OUTPUT_SIZE 1224 \ No newline at end of file diff --git a/firmware/controllers/algo/engine_state_generated.h b/firmware/controllers/algo/engine_state_generated.h index c6ad875939..b64807a497 100644 --- a/firmware/controllers/algo/engine_state_generated.h +++ b/firmware/controllers/algo/engine_state_generated.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/algo/engine_state.txt Wed Aug 24 02:18:28 UTC 2022 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/algo/engine_state.txt Wed Aug 24 22:14:46 UTC 2022 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -407,91 +407,91 @@ struct engine_state_s { bool brakePedalState : 1 {}; /** offset 136 bit 3 */ - bool isSynchronizedPhase : 1 {}; + bool unusedBit_22_3 : 1 {}; /** offset 136 bit 4 */ - bool unusedBit_23_4 : 1 {}; + bool unusedBit_22_4 : 1 {}; /** offset 136 bit 5 */ - bool unusedBit_23_5 : 1 {}; + bool unusedBit_22_5 : 1 {}; /** offset 136 bit 6 */ - bool unusedBit_23_6 : 1 {}; + bool unusedBit_22_6 : 1 {}; /** offset 136 bit 7 */ - bool unusedBit_23_7 : 1 {}; + bool unusedBit_22_7 : 1 {}; /** offset 136 bit 8 */ - bool unusedBit_23_8 : 1 {}; + bool unusedBit_22_8 : 1 {}; /** offset 136 bit 9 */ - bool unusedBit_23_9 : 1 {}; + bool unusedBit_22_9 : 1 {}; /** offset 136 bit 10 */ - bool unusedBit_23_10 : 1 {}; + bool unusedBit_22_10 : 1 {}; /** offset 136 bit 11 */ - bool unusedBit_23_11 : 1 {}; + bool unusedBit_22_11 : 1 {}; /** offset 136 bit 12 */ - bool unusedBit_23_12 : 1 {}; + bool unusedBit_22_12 : 1 {}; /** offset 136 bit 13 */ - bool unusedBit_23_13 : 1 {}; + bool unusedBit_22_13 : 1 {}; /** offset 136 bit 14 */ - bool unusedBit_23_14 : 1 {}; + bool unusedBit_22_14 : 1 {}; /** offset 136 bit 15 */ - bool unusedBit_23_15 : 1 {}; + bool unusedBit_22_15 : 1 {}; /** offset 136 bit 16 */ - bool unusedBit_23_16 : 1 {}; + bool unusedBit_22_16 : 1 {}; /** offset 136 bit 17 */ - bool unusedBit_23_17 : 1 {}; + bool unusedBit_22_17 : 1 {}; /** offset 136 bit 18 */ - bool unusedBit_23_18 : 1 {}; + bool unusedBit_22_18 : 1 {}; /** offset 136 bit 19 */ - bool unusedBit_23_19 : 1 {}; + bool unusedBit_22_19 : 1 {}; /** offset 136 bit 20 */ - bool unusedBit_23_20 : 1 {}; + bool unusedBit_22_20 : 1 {}; /** offset 136 bit 21 */ - bool unusedBit_23_21 : 1 {}; + bool unusedBit_22_21 : 1 {}; /** offset 136 bit 22 */ - bool unusedBit_23_22 : 1 {}; + bool unusedBit_22_22 : 1 {}; /** offset 136 bit 23 */ - bool unusedBit_23_23 : 1 {}; + bool unusedBit_22_23 : 1 {}; /** offset 136 bit 24 */ - bool unusedBit_23_24 : 1 {}; + bool unusedBit_22_24 : 1 {}; /** offset 136 bit 25 */ - bool unusedBit_23_25 : 1 {}; + bool unusedBit_22_25 : 1 {}; /** offset 136 bit 26 */ - bool unusedBit_23_26 : 1 {}; + bool unusedBit_22_26 : 1 {}; /** offset 136 bit 27 */ - bool unusedBit_23_27 : 1 {}; + bool unusedBit_22_27 : 1 {}; /** offset 136 bit 28 */ - bool unusedBit_23_28 : 1 {}; + bool unusedBit_22_28 : 1 {}; /** offset 136 bit 29 */ - bool unusedBit_23_29 : 1 {}; + bool unusedBit_22_29 : 1 {}; /** offset 136 bit 30 */ - bool unusedBit_23_30 : 1 {}; + bool unusedBit_22_30 : 1 {}; /** offset 136 bit 31 */ - bool unusedBit_23_31 : 1 {}; + bool unusedBit_22_31 : 1 {}; /** * offset 140 */ @@ -516,4 +516,4 @@ struct engine_state_s { static_assert(sizeof(engine_state_s) == 152); // end -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/algo/engine_state.txt Wed Aug 24 02:18:28 UTC 2022 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/algo/engine_state.txt Wed Aug 24 22:14:46 UTC 2022 diff --git a/firmware/controllers/generated/rusefi_generated.h b/firmware/controllers/generated/rusefi_generated.h index 38b8cc4894..901c2c7187 100644 --- a/firmware/controllers/generated/rusefi_generated.h +++ b/firmware/controllers/generated/rusefi_generated.h @@ -1934,7 +1934,7 @@ #define show_Frankenso_presets true #define show_test_presets true #define showHumanReadableWarning_offset 960 -#define SIGNATURE_HASH 1969688327 +#define SIGNATURE_HASH 1913309982 #define silentTriggerError_offset 1360 #define skippedWheelOnCam_offset 1360 #define slowAdcAlpha_offset 1600 @@ -2490,12 +2490,12 @@ #define ts_show_vbatt true #define ts_show_vr_threshold_2 true #define ts_show_vr_threshold_all true -#define TS_SIGNATURE "rusEFI 2022.08.24.all.1969688327" +#define TS_SIGNATURE "rusEFI 2022.08.24.all.1913309982" #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 1220 +#define TS_TOTAL_OUTPUT_SIZE 1224 #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 9f41609c47..cb0ef483c1 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 1648363336 -#define TS_SIGNATURE "rusEFI 2022.08.24.48way.1648363336" +#define SIGNATURE_HASH 1697497937 +#define TS_SIGNATURE "rusEFI 2022.08.24.48way.1697497937" diff --git a/firmware/controllers/generated/signature_all.h b/firmware/controllers/generated/signature_all.h index dc54bff9d4..000fc984c4 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 1969688327 -#define TS_SIGNATURE "rusEFI 2022.08.24.all.1969688327" +#define SIGNATURE_HASH 1913309982 +#define TS_SIGNATURE "rusEFI 2022.08.24.all.1913309982" diff --git a/firmware/controllers/generated/signature_alphax-2chan.h b/firmware/controllers/generated/signature_alphax-2chan.h index 15bd555405..d134925714 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 1198887531 -#define TS_SIGNATURE "rusEFI 2022.08.24.alphax-2chan.1198887531" +#define SIGNATURE_HASH 1075336818 +#define TS_SIGNATURE "rusEFI 2022.08.24.alphax-2chan.1075336818" diff --git a/firmware/controllers/generated/signature_alphax-4chan.h b/firmware/controllers/generated/signature_alphax-4chan.h index d05567e830..b7dfc76c4b 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 4269526152 -#define TS_SIGNATURE "rusEFI 2022.08.24.alphax-4chan.4269526152" +#define SIGNATURE_HASH 4178970769 +#define TS_SIGNATURE "rusEFI 2022.08.24.alphax-4chan.4178970769" diff --git a/firmware/controllers/generated/signature_atlas.h b/firmware/controllers/generated/signature_atlas.h index ec082ddd2a..33725c29e6 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 1773009440 -#define TS_SIGNATURE "rusEFI 2022.08.24.atlas.1773009440" +#define SIGNATURE_HASH 1858092601 +#define TS_SIGNATURE "rusEFI 2022.08.24.atlas.1858092601" diff --git a/firmware/controllers/generated/signature_core8.h b/firmware/controllers/generated/signature_core8.h index 8cb7b59b21..f43cc5751a 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 2206949118 -#define TS_SIGNATURE "rusEFI 2022.08.24.core8.2206949118" +#define SIGNATURE_HASH 2229705447 +#define TS_SIGNATURE "rusEFI 2022.08.24.core8.2229705447" diff --git a/firmware/controllers/generated/signature_cypress.h b/firmware/controllers/generated/signature_cypress.h index 06efce092f..600bc625ad 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 1969688327 -#define TS_SIGNATURE "rusEFI 2022.08.24.cypress.1969688327" +#define SIGNATURE_HASH 1913309982 +#define TS_SIGNATURE "rusEFI 2022.08.24.cypress.1913309982" diff --git a/firmware/controllers/generated/signature_f407-discovery.h b/firmware/controllers/generated/signature_f407-discovery.h index 1beac0f299..4ef08271c7 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 1969688327 -#define TS_SIGNATURE "rusEFI 2022.08.24.f407-discovery.1969688327" +#define SIGNATURE_HASH 1913309982 +#define TS_SIGNATURE "rusEFI 2022.08.24.f407-discovery.1913309982" diff --git a/firmware/controllers/generated/signature_f429-discovery.h b/firmware/controllers/generated/signature_f429-discovery.h index 364f31fa9f..2b40bca62a 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 1969688327 -#define TS_SIGNATURE "rusEFI 2022.08.24.f429-discovery.1969688327" +#define SIGNATURE_HASH 1913309982 +#define TS_SIGNATURE "rusEFI 2022.08.24.f429-discovery.1913309982" diff --git a/firmware/controllers/generated/signature_frankenso_na6.h b/firmware/controllers/generated/signature_frankenso_na6.h index 88215975e0..663cd973c5 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 923530179 -#define TS_SIGNATURE "rusEFI 2022.08.24.frankenso_na6.923530179" +#define SIGNATURE_HASH 812005338 +#define TS_SIGNATURE "rusEFI 2022.08.24.frankenso_na6.812005338" diff --git a/firmware/controllers/generated/signature_harley81.h b/firmware/controllers/generated/signature_harley81.h index a1676fb1cc..281094e75a 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 2241464872 -#define TS_SIGNATURE "rusEFI 2022.08.24.harley81.2241464872" +#define SIGNATURE_HASH 2197278257 +#define TS_SIGNATURE "rusEFI 2022.08.24.harley81.2197278257" diff --git a/firmware/controllers/generated/signature_hellen-gm-e67.h b/firmware/controllers/generated/signature_hellen-gm-e67.h index 441e808fb4..7ae11460be 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 3238038193 -#define TS_SIGNATURE "rusEFI 2022.08.24.hellen-gm-e67.3238038193" +#define SIGNATURE_HASH 3329052328 +#define TS_SIGNATURE "rusEFI 2022.08.24.hellen-gm-e67.3329052328" diff --git a/firmware/controllers/generated/signature_hellen-nb1.h b/firmware/controllers/generated/signature_hellen-nb1.h index 059e954a13..886bafd0b0 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 2901163723 -#define TS_SIGNATURE "rusEFI 2022.08.24.hellen-nb1.2901163723" +#define SIGNATURE_HASH 2877422290 +#define TS_SIGNATURE "rusEFI 2022.08.24.hellen-nb1.2877422290" diff --git a/firmware/controllers/generated/signature_hellen121nissan.h b/firmware/controllers/generated/signature_hellen121nissan.h index 90de766ab6..0db88cfa03 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 4256806893 -#define TS_SIGNATURE "rusEFI 2022.08.24.hellen121nissan.4256806893" +#define SIGNATURE_HASH 4208227316 +#define TS_SIGNATURE "rusEFI 2022.08.24.hellen121nissan.4208227316" diff --git a/firmware/controllers/generated/signature_hellen121vag.h b/firmware/controllers/generated/signature_hellen121vag.h index 8db17fe5ce..aa7f021f30 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 88525949 -#define TS_SIGNATURE "rusEFI 2022.08.24.hellen121vag.88525949" +#define SIGNATURE_HASH 36374628 +#define TS_SIGNATURE "rusEFI 2022.08.24.hellen121vag.36374628" diff --git a/firmware/controllers/generated/signature_hellen128.h b/firmware/controllers/generated/signature_hellen128.h index dc3cae7283..ead681fa35 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 2342072889 -#define TS_SIGNATURE "rusEFI 2022.08.24.hellen128.2342072889" +#define SIGNATURE_HASH 2364864032 +#define TS_SIGNATURE "rusEFI 2022.08.24.hellen128.2364864032" diff --git a/firmware/controllers/generated/signature_hellen154hyundai.h b/firmware/controllers/generated/signature_hellen154hyundai.h index 0425b766f0..ff3eb7a331 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 3978853763 -#define TS_SIGNATURE "rusEFI 2022.08.24.hellen154hyundai.3978853763" +#define SIGNATURE_HASH 3930438042 +#define TS_SIGNATURE "rusEFI 2022.08.24.hellen154hyundai.3930438042" diff --git a/firmware/controllers/generated/signature_hellen72.h b/firmware/controllers/generated/signature_hellen72.h index 35378bfca2..2035d1a415 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 2270701059 -#define TS_SIGNATURE "rusEFI 2022.08.24.hellen72.2270701059" +#define SIGNATURE_HASH 2151014938 +#define TS_SIGNATURE "rusEFI 2022.08.24.hellen72.2151014938" diff --git a/firmware/controllers/generated/signature_hellen81.h b/firmware/controllers/generated/signature_hellen81.h index 11dcf996e7..787b257613 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 1473435405 -#define TS_SIGNATURE "rusEFI 2022.08.24.hellen81.1473435405" +#define SIGNATURE_HASH 1354699540 +#define TS_SIGNATURE "rusEFI 2022.08.24.hellen81.1354699540" diff --git a/firmware/controllers/generated/signature_hellen88bmw.h b/firmware/controllers/generated/signature_hellen88bmw.h index 481eb4a0d7..81fc2f145e 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 1620188363 -#define TS_SIGNATURE "rusEFI 2022.08.24.hellen88bmw.1620188363" +#define SIGNATURE_HASH 1744820434 +#define TS_SIGNATURE "rusEFI 2022.08.24.hellen88bmw.1744820434" diff --git a/firmware/controllers/generated/signature_hellenNA6.h b/firmware/controllers/generated/signature_hellenNA6.h index 95fbaba3be..c7b6f7a2d6 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 4159503975 -#define TS_SIGNATURE "rusEFI 2022.08.24.hellenNA6.4159503975" +#define SIGNATURE_HASH 4035000958 +#define TS_SIGNATURE "rusEFI 2022.08.24.hellenNA6.4035000958" diff --git a/firmware/controllers/generated/signature_hellenNA8_96.h b/firmware/controllers/generated/signature_hellenNA8_96.h index b8c481fb0e..f8c478d021 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 3580804847 -#define TS_SIGNATURE "rusEFI 2022.08.24.hellenNA8_96.3580804847" +#define SIGNATURE_HASH 3523443446 +#define TS_SIGNATURE "rusEFI 2022.08.24.hellenNA8_96.3523443446" diff --git a/firmware/controllers/generated/signature_kin.h b/firmware/controllers/generated/signature_kin.h index df029d6470..6333fe1eb0 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 498118091 -#define TS_SIGNATURE "rusEFI 2022.08.24.kin.498118091" +#define SIGNATURE_HASH 450718162 +#define TS_SIGNATURE "rusEFI 2022.08.24.kin.450718162" diff --git a/firmware/controllers/generated/signature_mre_f4.h b/firmware/controllers/generated/signature_mre_f4.h index defa06b298..a3db8d2224 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 3132195825 -#define TS_SIGNATURE "rusEFI 2022.08.24.mre_f4.3132195825" +#define SIGNATURE_HASH 3185330152 +#define TS_SIGNATURE "rusEFI 2022.08.24.mre_f4.3185330152" diff --git a/firmware/controllers/generated/signature_mre_f7.h b/firmware/controllers/generated/signature_mre_f7.h index d9917c6c9b..070ddd0339 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 3132195825 -#define TS_SIGNATURE "rusEFI 2022.08.24.mre_f7.3132195825" +#define SIGNATURE_HASH 3185330152 +#define TS_SIGNATURE "rusEFI 2022.08.24.mre_f7.3185330152" diff --git a/firmware/controllers/generated/signature_prometheus_405.h b/firmware/controllers/generated/signature_prometheus_405.h index b3a03a2aaa..75a6a3bdfc 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 630052577 -#define TS_SIGNATURE "rusEFI 2022.08.24.prometheus_405.630052577" +#define SIGNATURE_HASH 585110264 +#define TS_SIGNATURE "rusEFI 2022.08.24.prometheus_405.585110264" diff --git a/firmware/controllers/generated/signature_prometheus_469.h b/firmware/controllers/generated/signature_prometheus_469.h index 25b9563dfd..40b6ff5118 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 630052577 -#define TS_SIGNATURE "rusEFI 2022.08.24.prometheus_469.630052577" +#define SIGNATURE_HASH 585110264 +#define TS_SIGNATURE "rusEFI 2022.08.24.prometheus_469.585110264" diff --git a/firmware/controllers/generated/signature_proteus_f4.h b/firmware/controllers/generated/signature_proteus_f4.h index d4b7696d43..c01b575cfa 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 3500853361 -#define TS_SIGNATURE "rusEFI 2022.08.24.proteus_f4.3500853361" +#define SIGNATURE_HASH 3620146280 +#define TS_SIGNATURE "rusEFI 2022.08.24.proteus_f4.3620146280" diff --git a/firmware/controllers/generated/signature_proteus_f7.h b/firmware/controllers/generated/signature_proteus_f7.h index 000cde74eb..39ee751e7a 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 3500853361 -#define TS_SIGNATURE "rusEFI 2022.08.24.proteus_f7.3500853361" +#define SIGNATURE_HASH 3620146280 +#define TS_SIGNATURE "rusEFI 2022.08.24.proteus_f7.3620146280" diff --git a/firmware/controllers/generated/signature_proteus_h7.h b/firmware/controllers/generated/signature_proteus_h7.h index a53d75b9dc..e888398819 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 3500853361 -#define TS_SIGNATURE "rusEFI 2022.08.24.proteus_h7.3500853361" +#define SIGNATURE_HASH 3620146280 +#define TS_SIGNATURE "rusEFI 2022.08.24.proteus_h7.3620146280" diff --git a/firmware/controllers/generated/signature_subaru_eg33_f7.h b/firmware/controllers/generated/signature_subaru_eg33_f7.h index 67d05f6c37..e8eda71d7d 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 995801279 -#define TS_SIGNATURE "rusEFI 2022.08.24.subaru_eg33_f7.995801279" +#define SIGNATURE_HASH 1010269350 +#define TS_SIGNATURE "rusEFI 2022.08.24.subaru_eg33_f7.1010269350" diff --git a/firmware/controllers/generated/signature_tdg-pdm8.h b/firmware/controllers/generated/signature_tdg-pdm8.h index 8a3894437d..11c4b70871 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 3748643155 -#define TS_SIGNATURE "rusEFI 2022.08.24.tdg-pdm8.3748643155" +#define SIGNATURE_HASH 3624011082 +#define TS_SIGNATURE "rusEFI 2022.08.24.tdg-pdm8.3624011082" diff --git a/firmware/controllers/trigger/trigger_state_primary_generated.h b/firmware/controllers/trigger/trigger_state_primary_generated.h new file mode 100644 index 0000000000..19d1e6d618 --- /dev/null +++ b/firmware/controllers/trigger/trigger_state_primary_generated.h @@ -0,0 +1,108 @@ +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/trigger/trigger_state_primary.txt Wed Aug 24 22:14:46 UTC 2022 +// by class com.rusefi.output.CHeaderConsumer +// begin +#pragma once +#include "rusefi_types.h" +// start of trigger_state_primary_s +struct trigger_state_primary_s { + /** + offset 0 bit 0 */ + bool m_hasSynchronizedPhase : 1 {}; + /** + offset 0 bit 1 */ + bool unusedBit_1_1 : 1 {}; + /** + offset 0 bit 2 */ + bool unusedBit_1_2 : 1 {}; + /** + offset 0 bit 3 */ + bool unusedBit_1_3 : 1 {}; + /** + offset 0 bit 4 */ + bool unusedBit_1_4 : 1 {}; + /** + offset 0 bit 5 */ + bool unusedBit_1_5 : 1 {}; + /** + offset 0 bit 6 */ + bool unusedBit_1_6 : 1 {}; + /** + offset 0 bit 7 */ + bool unusedBit_1_7 : 1 {}; + /** + offset 0 bit 8 */ + bool unusedBit_1_8 : 1 {}; + /** + offset 0 bit 9 */ + bool unusedBit_1_9 : 1 {}; + /** + offset 0 bit 10 */ + bool unusedBit_1_10 : 1 {}; + /** + offset 0 bit 11 */ + bool unusedBit_1_11 : 1 {}; + /** + offset 0 bit 12 */ + bool unusedBit_1_12 : 1 {}; + /** + offset 0 bit 13 */ + bool unusedBit_1_13 : 1 {}; + /** + offset 0 bit 14 */ + bool unusedBit_1_14 : 1 {}; + /** + offset 0 bit 15 */ + bool unusedBit_1_15 : 1 {}; + /** + offset 0 bit 16 */ + bool unusedBit_1_16 : 1 {}; + /** + offset 0 bit 17 */ + bool unusedBit_1_17 : 1 {}; + /** + offset 0 bit 18 */ + bool unusedBit_1_18 : 1 {}; + /** + offset 0 bit 19 */ + bool unusedBit_1_19 : 1 {}; + /** + offset 0 bit 20 */ + bool unusedBit_1_20 : 1 {}; + /** + offset 0 bit 21 */ + bool unusedBit_1_21 : 1 {}; + /** + offset 0 bit 22 */ + bool unusedBit_1_22 : 1 {}; + /** + offset 0 bit 23 */ + bool unusedBit_1_23 : 1 {}; + /** + offset 0 bit 24 */ + bool unusedBit_1_24 : 1 {}; + /** + offset 0 bit 25 */ + bool unusedBit_1_25 : 1 {}; + /** + offset 0 bit 26 */ + bool unusedBit_1_26 : 1 {}; + /** + offset 0 bit 27 */ + bool unusedBit_1_27 : 1 {}; + /** + offset 0 bit 28 */ + bool unusedBit_1_28 : 1 {}; + /** + offset 0 bit 29 */ + bool unusedBit_1_29 : 1 {}; + /** + offset 0 bit 30 */ + bool unusedBit_1_30 : 1 {}; + /** + offset 0 bit 31 */ + bool unusedBit_1_31 : 1 {}; +}; +static_assert(sizeof(trigger_state_primary_s) == 4); + +// end +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/trigger/trigger_state_primary.txt Wed Aug 24 22:14:46 UTC 2022 diff --git a/firmware/tunerstudio/generated/rusefi.ini b/firmware/tunerstudio/generated/rusefi.ini index 9946e31c4b..07f4bde450 100644 --- a/firmware/tunerstudio/generated/rusefi.ini +++ b/firmware/tunerstudio/generated/rusefi.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.08.24.all.1969688327" + signature = "rusEFI 2022.08.24.all.1913309982" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.08.24.all.1969688327" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.08.24.all.1913309982" ; 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 Wed Aug 24 16:16:00 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Aug 24 22:15:38 UTC 2022 pageSize = 21300 page = 1 @@ -2109,7 +2109,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1220 + ochBlockSize = 1224 ; ; see TunerStudioOutputChannels struct @@ -2990,35 +2990,35 @@ hellenBoardId = scalar, S16, 990, "id", 1, 0 clutchUpState = bits, U32, 992, [0:0] clutchDownState = bits, U32, 992, [1:1] brakePedalState = bits, U32, 992, [2:2] -isSynchronizedPhase = bits, U32, 992, [3:3] -unusedBit_23_4 = bits, U32, 992, [4:4] -unusedBit_23_5 = bits, U32, 992, [5:5] -unusedBit_23_6 = bits, U32, 992, [6:6] -unusedBit_23_7 = bits, U32, 992, [7:7] -unusedBit_23_8 = bits, U32, 992, [8:8] -unusedBit_23_9 = bits, U32, 992, [9:9] -unusedBit_23_10 = bits, U32, 992, [10:10] -unusedBit_23_11 = bits, U32, 992, [11:11] -unusedBit_23_12 = bits, U32, 992, [12:12] -unusedBit_23_13 = bits, U32, 992, [13:13] -unusedBit_23_14 = bits, U32, 992, [14:14] -unusedBit_23_15 = bits, U32, 992, [15:15] -unusedBit_23_16 = bits, U32, 992, [16:16] -unusedBit_23_17 = bits, U32, 992, [17:17] -unusedBit_23_18 = bits, U32, 992, [18:18] -unusedBit_23_19 = bits, U32, 992, [19:19] -unusedBit_23_20 = bits, U32, 992, [20:20] -unusedBit_23_21 = bits, U32, 992, [21:21] -unusedBit_23_22 = bits, U32, 992, [22:22] -unusedBit_23_23 = bits, U32, 992, [23:23] -unusedBit_23_24 = bits, U32, 992, [24:24] -unusedBit_23_25 = bits, U32, 992, [25:25] -unusedBit_23_26 = bits, U32, 992, [26:26] -unusedBit_23_27 = bits, U32, 992, [27:27] -unusedBit_23_28 = bits, U32, 992, [28:28] -unusedBit_23_29 = bits, U32, 992, [29:29] -unusedBit_23_30 = bits, U32, 992, [30:30] -unusedBit_23_31 = bits, U32, 992, [31:31] +unusedBit_22_3 = bits, U32, 992, [3:3] +unusedBit_22_4 = bits, U32, 992, [4:4] +unusedBit_22_5 = bits, U32, 992, [5:5] +unusedBit_22_6 = bits, U32, 992, [6:6] +unusedBit_22_7 = bits, U32, 992, [7:7] +unusedBit_22_8 = bits, U32, 992, [8:8] +unusedBit_22_9 = bits, U32, 992, [9:9] +unusedBit_22_10 = bits, U32, 992, [10:10] +unusedBit_22_11 = bits, U32, 992, [11:11] +unusedBit_22_12 = bits, U32, 992, [12:12] +unusedBit_22_13 = bits, U32, 992, [13:13] +unusedBit_22_14 = bits, U32, 992, [14:14] +unusedBit_22_15 = bits, U32, 992, [15:15] +unusedBit_22_16 = bits, U32, 992, [16:16] +unusedBit_22_17 = bits, U32, 992, [17:17] +unusedBit_22_18 = bits, U32, 992, [18:18] +unusedBit_22_19 = bits, U32, 992, [19:19] +unusedBit_22_20 = bits, U32, 992, [20:20] +unusedBit_22_21 = bits, U32, 992, [21:21] +unusedBit_22_22 = bits, U32, 992, [22:22] +unusedBit_22_23 = bits, U32, 992, [23:23] +unusedBit_22_24 = bits, U32, 992, [24:24] +unusedBit_22_25 = bits, U32, 992, [25:25] +unusedBit_22_26 = bits, U32, 992, [26:26] +unusedBit_22_27 = bits, U32, 992, [27:27] +unusedBit_22_28 = bits, U32, 992, [28:28] +unusedBit_22_29 = bits, U32, 992, [29:29] +unusedBit_22_30 = bits, U32, 992, [30:30] +unusedBit_22_31 = bits, U32, 992, [31:31] egt1 = scalar, F32, 996, "", 1, 0 egt2 = scalar, F32, 1000, "", 1, 0 desiredRpmLimit = scalar, S16, 1004, "rpm", 1, 0 @@ -3089,70 +3089,103 @@ vvtCounter = scalar, U08, 1117, "", 1, 0 camResyncCounter = scalar, U08, 1118, "", 1, 0 vvtStateIndex = scalar, U08, 1119, "", 1, 0 ; total TS size = 1120 -wallFuelCorrection = scalar, F32, 1120, "", 1, 0 -wallFuel = scalar, F32, 1124, "", 1, 0 -; total TS size = 1128 -idleState = bits, S32, 1128, [0:2], "not important" -currentIdlePosition = scalar, F32, 1132 -baseIdlePosition = scalar, F32, 1136 -iacByTpsTaper = scalar, F32, 1140 -throttlePedalUpState = scalar, S32, 1144, "", 1, 0 -mightResetPid = bits, U32, 1148, [0:0] -shouldResetPid = bits, U32, 1148, [1:1] -wasResetPid = bits, U32, 1148, [2:2] -mustResetPid = bits, U32, 1148, [3:3] -isCoasting = bits, U32, 1148, [4:4] -useIacTableForCoasting = bits, U32, 1148, [5:5] -notIdling = bits, U32, 1148, [6:6] -needReset = bits, U32, 1148, [7:7] -isInDeadZone = bits, U32, 1148, [8:8] -isBlipping = bits, U32, 1148, [9:9] -useClosedLoop = bits, U32, 1148, [10:10] -badTps = bits, U32, 1148, [11:11] -looksLikeRunning = bits, U32, 1148, [12:12] -looksLikeCoasting = bits, U32, 1148, [13:13] -looksLikeCrankToIdle = bits, U32, 1148, [14:14] -useInstantRpmForIdle = bits, U32, 1148, [15:15] -isVerboseIAC = bits, U32, 1148, [16:16] -unusedBit_22_17 = bits, U32, 1148, [17:17] -unusedBit_22_18 = bits, U32, 1148, [18:18] -unusedBit_22_19 = bits, U32, 1148, [19:19] -unusedBit_22_20 = bits, U32, 1148, [20:20] -unusedBit_22_21 = bits, U32, 1148, [21:21] -unusedBit_22_22 = bits, U32, 1148, [22:22] -unusedBit_22_23 = bits, U32, 1148, [23:23] -unusedBit_22_24 = bits, U32, 1148, [24:24] -unusedBit_22_25 = bits, U32, 1148, [25:25] -unusedBit_22_26 = bits, U32, 1148, [26:26] -unusedBit_22_27 = bits, U32, 1148, [27:27] -unusedBit_22_28 = bits, U32, 1148, [28:28] -unusedBit_22_29 = bits, U32, 1148, [29:29] -unusedBit_22_30 = bits, U32, 1148, [30:30] -unusedBit_22_31 = bits, U32, 1148, [31:31] -targetRpmByClt = scalar, S32, 1152, "", 1, 0 -targetRpmAcBump = scalar, S32, 1156, "", 1, 0 -iacByRpmTaper = scalar, F32, 1160 -luaAdd = scalar, F32, 1164 -; total TS size = 1168 -baseDwell = scalar, F32, 1168, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 1172, "", 1, 0 -luaTimingAdd = scalar, F32, 1176, "", 1, 0 -luaTimingMult = scalar, F32, 1180, "", 1, 0 -; total TS size = 1184 -idlePosition = scalar, F32, 1184, "", 1, 0 -trim = scalar, F32, 1188, "", 1, 0 -luaAdjustment = scalar, F32, 1192, "", 1, 0 -etbFeedForward = scalar, F32, 1196 -etbIntegralError = scalar, F32, 1200, "", 1, 0 -etbCurrentTarget = scalar, F32, 1204, "%", 1, 0 -; total TS size = 1208 -faultCode = scalar, U08, 1208, "", 1, 0 -heaterDuty = scalar, U08, 1209, "%", 1, 0 -pumpDuty = scalar, U08, 1210, "%", 1, 0 -tempC = scalar, U16, 1212, "C", 1, 0 -nernstVoltage = scalar, U16, 1214, "V", 0.001, 0 -esr = scalar, U16, 1216, "", 1, 0 -; total TS size = 1220 +m_hasSynchronizedPhase = bits, U32, 1120, [0:0] +unusedBit_1_1 = bits, U32, 1120, [1:1] +unusedBit_1_2 = bits, U32, 1120, [2:2] +unusedBit_1_3 = bits, U32, 1120, [3:3] +unusedBit_1_4 = bits, U32, 1120, [4:4] +unusedBit_1_5 = bits, U32, 1120, [5:5] +unusedBit_1_6 = bits, U32, 1120, [6:6] +unusedBit_1_7 = bits, U32, 1120, [7:7] +unusedBit_1_8 = bits, U32, 1120, [8:8] +unusedBit_1_9 = bits, U32, 1120, [9:9] +unusedBit_1_10 = bits, U32, 1120, [10:10] +unusedBit_1_11 = bits, U32, 1120, [11:11] +unusedBit_1_12 = bits, U32, 1120, [12:12] +unusedBit_1_13 = bits, U32, 1120, [13:13] +unusedBit_1_14 = bits, U32, 1120, [14:14] +unusedBit_1_15 = bits, U32, 1120, [15:15] +unusedBit_1_16 = bits, U32, 1120, [16:16] +unusedBit_1_17 = bits, U32, 1120, [17:17] +unusedBit_1_18 = bits, U32, 1120, [18:18] +unusedBit_1_19 = bits, U32, 1120, [19:19] +unusedBit_1_20 = bits, U32, 1120, [20:20] +unusedBit_1_21 = bits, U32, 1120, [21:21] +unusedBit_1_22 = bits, U32, 1120, [22:22] +unusedBit_1_23 = bits, U32, 1120, [23:23] +unusedBit_1_24 = bits, U32, 1120, [24:24] +unusedBit_1_25 = bits, U32, 1120, [25:25] +unusedBit_1_26 = bits, U32, 1120, [26:26] +unusedBit_1_27 = bits, U32, 1120, [27:27] +unusedBit_1_28 = bits, U32, 1120, [28:28] +unusedBit_1_29 = bits, U32, 1120, [29:29] +unusedBit_1_30 = bits, U32, 1120, [30:30] +unusedBit_1_31 = bits, U32, 1120, [31:31] +; total TS size = 1124 +wallFuelCorrection = scalar, F32, 1124, "", 1, 0 +wallFuel = scalar, F32, 1128, "", 1, 0 +; total TS size = 1132 +idleState = bits, S32, 1132, [0:2], "not important" +currentIdlePosition = scalar, F32, 1136 +baseIdlePosition = scalar, F32, 1140 +iacByTpsTaper = scalar, F32, 1144 +throttlePedalUpState = scalar, S32, 1148, "", 1, 0 +mightResetPid = bits, U32, 1152, [0:0] +shouldResetPid = bits, U32, 1152, [1:1] +wasResetPid = bits, U32, 1152, [2:2] +mustResetPid = bits, U32, 1152, [3:3] +isCoasting = bits, U32, 1152, [4:4] +useIacTableForCoasting = bits, U32, 1152, [5:5] +notIdling = bits, U32, 1152, [6:6] +needReset = bits, U32, 1152, [7:7] +isInDeadZone = bits, U32, 1152, [8:8] +isBlipping = bits, U32, 1152, [9:9] +useClosedLoop = bits, U32, 1152, [10:10] +badTps = bits, U32, 1152, [11:11] +looksLikeRunning = bits, U32, 1152, [12:12] +looksLikeCoasting = bits, U32, 1152, [13:13] +looksLikeCrankToIdle = bits, U32, 1152, [14:14] +useInstantRpmForIdle = bits, U32, 1152, [15:15] +isVerboseIAC = bits, U32, 1152, [16:16] +unusedBit_22_17 = bits, U32, 1152, [17:17] +unusedBit_22_18 = bits, U32, 1152, [18:18] +unusedBit_22_19 = bits, U32, 1152, [19:19] +unusedBit_22_20 = bits, U32, 1152, [20:20] +unusedBit_22_21 = bits, U32, 1152, [21:21] +unusedBit_22_22 = bits, U32, 1152, [22:22] +unusedBit_22_23 = bits, U32, 1152, [23:23] +unusedBit_22_24 = bits, U32, 1152, [24:24] +unusedBit_22_25 = bits, U32, 1152, [25:25] +unusedBit_22_26 = bits, U32, 1152, [26:26] +unusedBit_22_27 = bits, U32, 1152, [27:27] +unusedBit_22_28 = bits, U32, 1152, [28:28] +unusedBit_22_29 = bits, U32, 1152, [29:29] +unusedBit_22_30 = bits, U32, 1152, [30:30] +unusedBit_22_31 = bits, U32, 1152, [31:31] +targetRpmByClt = scalar, S32, 1156, "", 1, 0 +targetRpmAcBump = scalar, S32, 1160, "", 1, 0 +iacByRpmTaper = scalar, F32, 1164 +luaAdd = scalar, F32, 1168 +; total TS size = 1172 +baseDwell = scalar, F32, 1172, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 1176, "", 1, 0 +luaTimingAdd = scalar, F32, 1180, "", 1, 0 +luaTimingMult = scalar, F32, 1184, "", 1, 0 +; total TS size = 1188 +idlePosition = scalar, F32, 1188, "", 1, 0 +trim = scalar, F32, 1192, "", 1, 0 +luaAdjustment = scalar, F32, 1196, "", 1, 0 +etbFeedForward = scalar, F32, 1200 +etbIntegralError = scalar, F32, 1204, "", 1, 0 +etbCurrentTarget = scalar, F32, 1208, "%", 1, 0 +; total TS size = 1212 +faultCode = scalar, U08, 1212, "", 1, 0 +heaterDuty = scalar, U08, 1213, "%", 1, 0 +pumpDuty = scalar, U08, 1214, "%", 1, 0 +tempC = scalar, U16, 1216, "C", 1, 0 +nernstVoltage = scalar, U16, 1218, "V", 0.001, 0 +esr = scalar, U16, 1220, "", 1, 0 +; total TS size = 1224 time = { timeNow } @@ -4721,7 +4754,6 @@ entry = hellenBoardId, "Detected Board ID", int, "%d" entry = clutchUpState, "clutch: up", int, "%d" entry = clutchDownState, "clutch: down", int, "%d" entry = brakePedalState, "brake: down", int, "%d" -entry = isSynchronizedPhase, "isSynchronizedPhase", int, "%d" entry = egt1, "egt1", float, "%.3f" entry = egt2, "egt2", float, "%.3f" entry = desiredRpmLimit, "User-defined RPM hard limit", int, "%d" @@ -4762,6 +4794,7 @@ entry = triggerStateIndex, "triggerStateIndex", int, "%d" entry = vvtCounter, "vvtCounter", int, "%d" entry = camResyncCounter, "camResyncCounter", int, "%d" entry = vvtStateIndex, "vvtStateIndex", int, "%d" +entry = m_hasSynchronizedPhase, "m_hasSynchronizedPhase", int, "%d" entry = wallFuelCorrection, "fuel injection time correction to account for wall wetting effect for current cycle", float, "%.3f" entry = wallFuel, "Amount of fuel on the wall, in ms of injector open time for each injector.", float, "%.3f" entry = idleState, "idleState", int, "%d" @@ -4966,6 +4999,7 @@ menuDialog = main subMenu = tps_accel_stateDialog, "tps_accel_state" subMenu = trigger_centralDialog, "trigger_central" subMenu = trigger_stateDialog, "trigger_state" + subMenu = trigger_state_primaryDialog, "trigger_state_primary" subMenu = wall_fuel_stateDialog, "wall_fuel_state" subMenu = idle_stateDialog, "idle_state" subMenu = ignition_stateDialog, "ignition_state" @@ -5418,7 +5452,6 @@ indicatorPanel = engine_stateIndicatorPanel, 2 indicator = {clutchUpState}, "clutchUpState No", "clutchUpState Yes" indicator = {clutchDownState}, "clutchDownState No", "clutchDownState Yes" indicator = {brakePedalState}, "brakePedalState No", "brakePedalState Yes" - indicator = {isSynchronizedPhase}, "isSynchronizedPhase No", "isSynchronizedPhase Yes" dialog = engine_stateDialog, "engine_state" panel = engine_stateIndicatorPanel @@ -5527,6 +5560,12 @@ dialog = trigger_stateDialog, "trigger_state" liveGraph = trigger_state_3_Graph, "Graph", South graphLine = vvtStateIndex +indicatorPanel = trigger_state_primaryIndicatorPanel, 2 + indicator = {m_hasSynchronizedPhase}, "m_hasSynchronizedPhase No", "m_hasSynchronizedPhase Yes" + +dialog = trigger_state_primaryDialog, "trigger_state_primary" + panel = trigger_state_primaryIndicatorPanel + dialog = wall_fuel_stateDialog, "wall_fuel_state" liveGraph = wall_fuel_state_1_Graph, "Graph", South diff --git a/firmware/tunerstudio/generated/rusefi_48way.ini b/firmware/tunerstudio/generated/rusefi_48way.ini index 3742e2e57c..26c95ae10d 100644 --- a/firmware/tunerstudio/generated/rusefi_48way.ini +++ b/firmware/tunerstudio/generated/rusefi_48way.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.08.24.48way.1648363336" + signature = "rusEFI 2022.08.24.48way.1697497937" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.08.24.48way.1648363336" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.08.24.48way.1697497937" ; 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 Wed Aug 24 16:15:42 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Aug 24 22:15:20 UTC 2022 pageSize = 21300 page = 1 @@ -2109,7 +2109,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1220 + ochBlockSize = 1224 ; ; see TunerStudioOutputChannels struct @@ -2990,35 +2990,35 @@ hellenBoardId = scalar, S16, 990, "id", 1, 0 clutchUpState = bits, U32, 992, [0:0] clutchDownState = bits, U32, 992, [1:1] brakePedalState = bits, U32, 992, [2:2] -isSynchronizedPhase = bits, U32, 992, [3:3] -unusedBit_23_4 = bits, U32, 992, [4:4] -unusedBit_23_5 = bits, U32, 992, [5:5] -unusedBit_23_6 = bits, U32, 992, [6:6] -unusedBit_23_7 = bits, U32, 992, [7:7] -unusedBit_23_8 = bits, U32, 992, [8:8] -unusedBit_23_9 = bits, U32, 992, [9:9] -unusedBit_23_10 = bits, U32, 992, [10:10] -unusedBit_23_11 = bits, U32, 992, [11:11] -unusedBit_23_12 = bits, U32, 992, [12:12] -unusedBit_23_13 = bits, U32, 992, [13:13] -unusedBit_23_14 = bits, U32, 992, [14:14] -unusedBit_23_15 = bits, U32, 992, [15:15] -unusedBit_23_16 = bits, U32, 992, [16:16] -unusedBit_23_17 = bits, U32, 992, [17:17] -unusedBit_23_18 = bits, U32, 992, [18:18] -unusedBit_23_19 = bits, U32, 992, [19:19] -unusedBit_23_20 = bits, U32, 992, [20:20] -unusedBit_23_21 = bits, U32, 992, [21:21] -unusedBit_23_22 = bits, U32, 992, [22:22] -unusedBit_23_23 = bits, U32, 992, [23:23] -unusedBit_23_24 = bits, U32, 992, [24:24] -unusedBit_23_25 = bits, U32, 992, [25:25] -unusedBit_23_26 = bits, U32, 992, [26:26] -unusedBit_23_27 = bits, U32, 992, [27:27] -unusedBit_23_28 = bits, U32, 992, [28:28] -unusedBit_23_29 = bits, U32, 992, [29:29] -unusedBit_23_30 = bits, U32, 992, [30:30] -unusedBit_23_31 = bits, U32, 992, [31:31] +unusedBit_22_3 = bits, U32, 992, [3:3] +unusedBit_22_4 = bits, U32, 992, [4:4] +unusedBit_22_5 = bits, U32, 992, [5:5] +unusedBit_22_6 = bits, U32, 992, [6:6] +unusedBit_22_7 = bits, U32, 992, [7:7] +unusedBit_22_8 = bits, U32, 992, [8:8] +unusedBit_22_9 = bits, U32, 992, [9:9] +unusedBit_22_10 = bits, U32, 992, [10:10] +unusedBit_22_11 = bits, U32, 992, [11:11] +unusedBit_22_12 = bits, U32, 992, [12:12] +unusedBit_22_13 = bits, U32, 992, [13:13] +unusedBit_22_14 = bits, U32, 992, [14:14] +unusedBit_22_15 = bits, U32, 992, [15:15] +unusedBit_22_16 = bits, U32, 992, [16:16] +unusedBit_22_17 = bits, U32, 992, [17:17] +unusedBit_22_18 = bits, U32, 992, [18:18] +unusedBit_22_19 = bits, U32, 992, [19:19] +unusedBit_22_20 = bits, U32, 992, [20:20] +unusedBit_22_21 = bits, U32, 992, [21:21] +unusedBit_22_22 = bits, U32, 992, [22:22] +unusedBit_22_23 = bits, U32, 992, [23:23] +unusedBit_22_24 = bits, U32, 992, [24:24] +unusedBit_22_25 = bits, U32, 992, [25:25] +unusedBit_22_26 = bits, U32, 992, [26:26] +unusedBit_22_27 = bits, U32, 992, [27:27] +unusedBit_22_28 = bits, U32, 992, [28:28] +unusedBit_22_29 = bits, U32, 992, [29:29] +unusedBit_22_30 = bits, U32, 992, [30:30] +unusedBit_22_31 = bits, U32, 992, [31:31] egt1 = scalar, F32, 996, "", 1, 0 egt2 = scalar, F32, 1000, "", 1, 0 desiredRpmLimit = scalar, S16, 1004, "rpm", 1, 0 @@ -3089,70 +3089,103 @@ vvtCounter = scalar, U08, 1117, "", 1, 0 camResyncCounter = scalar, U08, 1118, "", 1, 0 vvtStateIndex = scalar, U08, 1119, "", 1, 0 ; total TS size = 1120 -wallFuelCorrection = scalar, F32, 1120, "", 1, 0 -wallFuel = scalar, F32, 1124, "", 1, 0 -; total TS size = 1128 -idleState = bits, S32, 1128, [0:2], "not important" -currentIdlePosition = scalar, F32, 1132 -baseIdlePosition = scalar, F32, 1136 -iacByTpsTaper = scalar, F32, 1140 -throttlePedalUpState = scalar, S32, 1144, "", 1, 0 -mightResetPid = bits, U32, 1148, [0:0] -shouldResetPid = bits, U32, 1148, [1:1] -wasResetPid = bits, U32, 1148, [2:2] -mustResetPid = bits, U32, 1148, [3:3] -isCoasting = bits, U32, 1148, [4:4] -useIacTableForCoasting = bits, U32, 1148, [5:5] -notIdling = bits, U32, 1148, [6:6] -needReset = bits, U32, 1148, [7:7] -isInDeadZone = bits, U32, 1148, [8:8] -isBlipping = bits, U32, 1148, [9:9] -useClosedLoop = bits, U32, 1148, [10:10] -badTps = bits, U32, 1148, [11:11] -looksLikeRunning = bits, U32, 1148, [12:12] -looksLikeCoasting = bits, U32, 1148, [13:13] -looksLikeCrankToIdle = bits, U32, 1148, [14:14] -useInstantRpmForIdle = bits, U32, 1148, [15:15] -isVerboseIAC = bits, U32, 1148, [16:16] -unusedBit_22_17 = bits, U32, 1148, [17:17] -unusedBit_22_18 = bits, U32, 1148, [18:18] -unusedBit_22_19 = bits, U32, 1148, [19:19] -unusedBit_22_20 = bits, U32, 1148, [20:20] -unusedBit_22_21 = bits, U32, 1148, [21:21] -unusedBit_22_22 = bits, U32, 1148, [22:22] -unusedBit_22_23 = bits, U32, 1148, [23:23] -unusedBit_22_24 = bits, U32, 1148, [24:24] -unusedBit_22_25 = bits, U32, 1148, [25:25] -unusedBit_22_26 = bits, U32, 1148, [26:26] -unusedBit_22_27 = bits, U32, 1148, [27:27] -unusedBit_22_28 = bits, U32, 1148, [28:28] -unusedBit_22_29 = bits, U32, 1148, [29:29] -unusedBit_22_30 = bits, U32, 1148, [30:30] -unusedBit_22_31 = bits, U32, 1148, [31:31] -targetRpmByClt = scalar, S32, 1152, "", 1, 0 -targetRpmAcBump = scalar, S32, 1156, "", 1, 0 -iacByRpmTaper = scalar, F32, 1160 -luaAdd = scalar, F32, 1164 -; total TS size = 1168 -baseDwell = scalar, F32, 1168, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 1172, "", 1, 0 -luaTimingAdd = scalar, F32, 1176, "", 1, 0 -luaTimingMult = scalar, F32, 1180, "", 1, 0 -; total TS size = 1184 -idlePosition = scalar, F32, 1184, "", 1, 0 -trim = scalar, F32, 1188, "", 1, 0 -luaAdjustment = scalar, F32, 1192, "", 1, 0 -etbFeedForward = scalar, F32, 1196 -etbIntegralError = scalar, F32, 1200, "", 1, 0 -etbCurrentTarget = scalar, F32, 1204, "%", 1, 0 -; total TS size = 1208 -faultCode = scalar, U08, 1208, "", 1, 0 -heaterDuty = scalar, U08, 1209, "%", 1, 0 -pumpDuty = scalar, U08, 1210, "%", 1, 0 -tempC = scalar, U16, 1212, "C", 1, 0 -nernstVoltage = scalar, U16, 1214, "V", 0.001, 0 -esr = scalar, U16, 1216, "", 1, 0 -; total TS size = 1220 +m_hasSynchronizedPhase = bits, U32, 1120, [0:0] +unusedBit_1_1 = bits, U32, 1120, [1:1] +unusedBit_1_2 = bits, U32, 1120, [2:2] +unusedBit_1_3 = bits, U32, 1120, [3:3] +unusedBit_1_4 = bits, U32, 1120, [4:4] +unusedBit_1_5 = bits, U32, 1120, [5:5] +unusedBit_1_6 = bits, U32, 1120, [6:6] +unusedBit_1_7 = bits, U32, 1120, [7:7] +unusedBit_1_8 = bits, U32, 1120, [8:8] +unusedBit_1_9 = bits, U32, 1120, [9:9] +unusedBit_1_10 = bits, U32, 1120, [10:10] +unusedBit_1_11 = bits, U32, 1120, [11:11] +unusedBit_1_12 = bits, U32, 1120, [12:12] +unusedBit_1_13 = bits, U32, 1120, [13:13] +unusedBit_1_14 = bits, U32, 1120, [14:14] +unusedBit_1_15 = bits, U32, 1120, [15:15] +unusedBit_1_16 = bits, U32, 1120, [16:16] +unusedBit_1_17 = bits, U32, 1120, [17:17] +unusedBit_1_18 = bits, U32, 1120, [18:18] +unusedBit_1_19 = bits, U32, 1120, [19:19] +unusedBit_1_20 = bits, U32, 1120, [20:20] +unusedBit_1_21 = bits, U32, 1120, [21:21] +unusedBit_1_22 = bits, U32, 1120, [22:22] +unusedBit_1_23 = bits, U32, 1120, [23:23] +unusedBit_1_24 = bits, U32, 1120, [24:24] +unusedBit_1_25 = bits, U32, 1120, [25:25] +unusedBit_1_26 = bits, U32, 1120, [26:26] +unusedBit_1_27 = bits, U32, 1120, [27:27] +unusedBit_1_28 = bits, U32, 1120, [28:28] +unusedBit_1_29 = bits, U32, 1120, [29:29] +unusedBit_1_30 = bits, U32, 1120, [30:30] +unusedBit_1_31 = bits, U32, 1120, [31:31] +; total TS size = 1124 +wallFuelCorrection = scalar, F32, 1124, "", 1, 0 +wallFuel = scalar, F32, 1128, "", 1, 0 +; total TS size = 1132 +idleState = bits, S32, 1132, [0:2], "not important" +currentIdlePosition = scalar, F32, 1136 +baseIdlePosition = scalar, F32, 1140 +iacByTpsTaper = scalar, F32, 1144 +throttlePedalUpState = scalar, S32, 1148, "", 1, 0 +mightResetPid = bits, U32, 1152, [0:0] +shouldResetPid = bits, U32, 1152, [1:1] +wasResetPid = bits, U32, 1152, [2:2] +mustResetPid = bits, U32, 1152, [3:3] +isCoasting = bits, U32, 1152, [4:4] +useIacTableForCoasting = bits, U32, 1152, [5:5] +notIdling = bits, U32, 1152, [6:6] +needReset = bits, U32, 1152, [7:7] +isInDeadZone = bits, U32, 1152, [8:8] +isBlipping = bits, U32, 1152, [9:9] +useClosedLoop = bits, U32, 1152, [10:10] +badTps = bits, U32, 1152, [11:11] +looksLikeRunning = bits, U32, 1152, [12:12] +looksLikeCoasting = bits, U32, 1152, [13:13] +looksLikeCrankToIdle = bits, U32, 1152, [14:14] +useInstantRpmForIdle = bits, U32, 1152, [15:15] +isVerboseIAC = bits, U32, 1152, [16:16] +unusedBit_22_17 = bits, U32, 1152, [17:17] +unusedBit_22_18 = bits, U32, 1152, [18:18] +unusedBit_22_19 = bits, U32, 1152, [19:19] +unusedBit_22_20 = bits, U32, 1152, [20:20] +unusedBit_22_21 = bits, U32, 1152, [21:21] +unusedBit_22_22 = bits, U32, 1152, [22:22] +unusedBit_22_23 = bits, U32, 1152, [23:23] +unusedBit_22_24 = bits, U32, 1152, [24:24] +unusedBit_22_25 = bits, U32, 1152, [25:25] +unusedBit_22_26 = bits, U32, 1152, [26:26] +unusedBit_22_27 = bits, U32, 1152, [27:27] +unusedBit_22_28 = bits, U32, 1152, [28:28] +unusedBit_22_29 = bits, U32, 1152, [29:29] +unusedBit_22_30 = bits, U32, 1152, [30:30] +unusedBit_22_31 = bits, U32, 1152, [31:31] +targetRpmByClt = scalar, S32, 1156, "", 1, 0 +targetRpmAcBump = scalar, S32, 1160, "", 1, 0 +iacByRpmTaper = scalar, F32, 1164 +luaAdd = scalar, F32, 1168 +; total TS size = 1172 +baseDwell = scalar, F32, 1172, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 1176, "", 1, 0 +luaTimingAdd = scalar, F32, 1180, "", 1, 0 +luaTimingMult = scalar, F32, 1184, "", 1, 0 +; total TS size = 1188 +idlePosition = scalar, F32, 1188, "", 1, 0 +trim = scalar, F32, 1192, "", 1, 0 +luaAdjustment = scalar, F32, 1196, "", 1, 0 +etbFeedForward = scalar, F32, 1200 +etbIntegralError = scalar, F32, 1204, "", 1, 0 +etbCurrentTarget = scalar, F32, 1208, "%", 1, 0 +; total TS size = 1212 +faultCode = scalar, U08, 1212, "", 1, 0 +heaterDuty = scalar, U08, 1213, "%", 1, 0 +pumpDuty = scalar, U08, 1214, "%", 1, 0 +tempC = scalar, U16, 1216, "C", 1, 0 +nernstVoltage = scalar, U16, 1218, "V", 0.001, 0 +esr = scalar, U16, 1220, "", 1, 0 +; total TS size = 1224 time = { timeNow } @@ -4721,7 +4754,6 @@ entry = hellenBoardId, "Detected Board ID", int, "%d" entry = clutchUpState, "clutch: up", int, "%d" entry = clutchDownState, "clutch: down", int, "%d" entry = brakePedalState, "brake: down", int, "%d" -entry = isSynchronizedPhase, "isSynchronizedPhase", int, "%d" entry = egt1, "egt1", float, "%.3f" entry = egt2, "egt2", float, "%.3f" entry = desiredRpmLimit, "User-defined RPM hard limit", int, "%d" @@ -4762,6 +4794,7 @@ entry = triggerStateIndex, "triggerStateIndex", int, "%d" entry = vvtCounter, "vvtCounter", int, "%d" entry = camResyncCounter, "camResyncCounter", int, "%d" entry = vvtStateIndex, "vvtStateIndex", int, "%d" +entry = m_hasSynchronizedPhase, "m_hasSynchronizedPhase", int, "%d" entry = wallFuelCorrection, "fuel injection time correction to account for wall wetting effect for current cycle", float, "%.3f" entry = wallFuel, "Amount of fuel on the wall, in ms of injector open time for each injector.", float, "%.3f" entry = idleState, "idleState", int, "%d" @@ -4966,6 +4999,7 @@ menuDialog = main subMenu = tps_accel_stateDialog, "tps_accel_state" subMenu = trigger_centralDialog, "trigger_central" subMenu = trigger_stateDialog, "trigger_state" + subMenu = trigger_state_primaryDialog, "trigger_state_primary" subMenu = wall_fuel_stateDialog, "wall_fuel_state" subMenu = idle_stateDialog, "idle_state" subMenu = ignition_stateDialog, "ignition_state" @@ -5415,7 +5449,6 @@ indicatorPanel = engine_stateIndicatorPanel, 2 indicator = {clutchUpState}, "clutchUpState No", "clutchUpState Yes" indicator = {clutchDownState}, "clutchDownState No", "clutchDownState Yes" indicator = {brakePedalState}, "brakePedalState No", "brakePedalState Yes" - indicator = {isSynchronizedPhase}, "isSynchronizedPhase No", "isSynchronizedPhase Yes" dialog = engine_stateDialog, "engine_state" panel = engine_stateIndicatorPanel @@ -5524,6 +5557,12 @@ dialog = trigger_stateDialog, "trigger_state" liveGraph = trigger_state_3_Graph, "Graph", South graphLine = vvtStateIndex +indicatorPanel = trigger_state_primaryIndicatorPanel, 2 + indicator = {m_hasSynchronizedPhase}, "m_hasSynchronizedPhase No", "m_hasSynchronizedPhase Yes" + +dialog = trigger_state_primaryDialog, "trigger_state_primary" + panel = trigger_state_primaryIndicatorPanel + dialog = wall_fuel_stateDialog, "wall_fuel_state" liveGraph = wall_fuel_state_1_Graph, "Graph", South diff --git a/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini b/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini index 922d7f4935..97590d0d7f 100644 --- a/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini +++ b/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.08.24.alphax-2chan.1198887531" + signature = "rusEFI 2022.08.24.alphax-2chan.1075336818" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.08.24.alphax-2chan.1198887531" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.08.24.alphax-2chan.1075336818" ; 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 Wed Aug 24 16:15:13 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Aug 24 22:14:52 UTC 2022 pageSize = 21300 page = 1 @@ -2109,7 +2109,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1220 + ochBlockSize = 1224 ; ; see TunerStudioOutputChannels struct @@ -2990,35 +2990,35 @@ hellenBoardId = scalar, S16, 990, "id", 1, 0 clutchUpState = bits, U32, 992, [0:0] clutchDownState = bits, U32, 992, [1:1] brakePedalState = bits, U32, 992, [2:2] -isSynchronizedPhase = bits, U32, 992, [3:3] -unusedBit_23_4 = bits, U32, 992, [4:4] -unusedBit_23_5 = bits, U32, 992, [5:5] -unusedBit_23_6 = bits, U32, 992, [6:6] -unusedBit_23_7 = bits, U32, 992, [7:7] -unusedBit_23_8 = bits, U32, 992, [8:8] -unusedBit_23_9 = bits, U32, 992, [9:9] -unusedBit_23_10 = bits, U32, 992, [10:10] -unusedBit_23_11 = bits, U32, 992, [11:11] -unusedBit_23_12 = bits, U32, 992, [12:12] -unusedBit_23_13 = bits, U32, 992, [13:13] -unusedBit_23_14 = bits, U32, 992, [14:14] -unusedBit_23_15 = bits, U32, 992, [15:15] -unusedBit_23_16 = bits, U32, 992, [16:16] -unusedBit_23_17 = bits, U32, 992, [17:17] -unusedBit_23_18 = bits, U32, 992, [18:18] -unusedBit_23_19 = bits, U32, 992, [19:19] -unusedBit_23_20 = bits, U32, 992, [20:20] -unusedBit_23_21 = bits, U32, 992, [21:21] -unusedBit_23_22 = bits, U32, 992, [22:22] -unusedBit_23_23 = bits, U32, 992, [23:23] -unusedBit_23_24 = bits, U32, 992, [24:24] -unusedBit_23_25 = bits, U32, 992, [25:25] -unusedBit_23_26 = bits, U32, 992, [26:26] -unusedBit_23_27 = bits, U32, 992, [27:27] -unusedBit_23_28 = bits, U32, 992, [28:28] -unusedBit_23_29 = bits, U32, 992, [29:29] -unusedBit_23_30 = bits, U32, 992, [30:30] -unusedBit_23_31 = bits, U32, 992, [31:31] +unusedBit_22_3 = bits, U32, 992, [3:3] +unusedBit_22_4 = bits, U32, 992, [4:4] +unusedBit_22_5 = bits, U32, 992, [5:5] +unusedBit_22_6 = bits, U32, 992, [6:6] +unusedBit_22_7 = bits, U32, 992, [7:7] +unusedBit_22_8 = bits, U32, 992, [8:8] +unusedBit_22_9 = bits, U32, 992, [9:9] +unusedBit_22_10 = bits, U32, 992, [10:10] +unusedBit_22_11 = bits, U32, 992, [11:11] +unusedBit_22_12 = bits, U32, 992, [12:12] +unusedBit_22_13 = bits, U32, 992, [13:13] +unusedBit_22_14 = bits, U32, 992, [14:14] +unusedBit_22_15 = bits, U32, 992, [15:15] +unusedBit_22_16 = bits, U32, 992, [16:16] +unusedBit_22_17 = bits, U32, 992, [17:17] +unusedBit_22_18 = bits, U32, 992, [18:18] +unusedBit_22_19 = bits, U32, 992, [19:19] +unusedBit_22_20 = bits, U32, 992, [20:20] +unusedBit_22_21 = bits, U32, 992, [21:21] +unusedBit_22_22 = bits, U32, 992, [22:22] +unusedBit_22_23 = bits, U32, 992, [23:23] +unusedBit_22_24 = bits, U32, 992, [24:24] +unusedBit_22_25 = bits, U32, 992, [25:25] +unusedBit_22_26 = bits, U32, 992, [26:26] +unusedBit_22_27 = bits, U32, 992, [27:27] +unusedBit_22_28 = bits, U32, 992, [28:28] +unusedBit_22_29 = bits, U32, 992, [29:29] +unusedBit_22_30 = bits, U32, 992, [30:30] +unusedBit_22_31 = bits, U32, 992, [31:31] egt1 = scalar, F32, 996, "", 1, 0 egt2 = scalar, F32, 1000, "", 1, 0 desiredRpmLimit = scalar, S16, 1004, "rpm", 1, 0 @@ -3089,70 +3089,103 @@ vvtCounter = scalar, U08, 1117, "", 1, 0 camResyncCounter = scalar, U08, 1118, "", 1, 0 vvtStateIndex = scalar, U08, 1119, "", 1, 0 ; total TS size = 1120 -wallFuelCorrection = scalar, F32, 1120, "", 1, 0 -wallFuel = scalar, F32, 1124, "", 1, 0 -; total TS size = 1128 -idleState = bits, S32, 1128, [0:2], "not important" -currentIdlePosition = scalar, F32, 1132 -baseIdlePosition = scalar, F32, 1136 -iacByTpsTaper = scalar, F32, 1140 -throttlePedalUpState = scalar, S32, 1144, "", 1, 0 -mightResetPid = bits, U32, 1148, [0:0] -shouldResetPid = bits, U32, 1148, [1:1] -wasResetPid = bits, U32, 1148, [2:2] -mustResetPid = bits, U32, 1148, [3:3] -isCoasting = bits, U32, 1148, [4:4] -useIacTableForCoasting = bits, U32, 1148, [5:5] -notIdling = bits, U32, 1148, [6:6] -needReset = bits, U32, 1148, [7:7] -isInDeadZone = bits, U32, 1148, [8:8] -isBlipping = bits, U32, 1148, [9:9] -useClosedLoop = bits, U32, 1148, [10:10] -badTps = bits, U32, 1148, [11:11] -looksLikeRunning = bits, U32, 1148, [12:12] -looksLikeCoasting = bits, U32, 1148, [13:13] -looksLikeCrankToIdle = bits, U32, 1148, [14:14] -useInstantRpmForIdle = bits, U32, 1148, [15:15] -isVerboseIAC = bits, U32, 1148, [16:16] -unusedBit_22_17 = bits, U32, 1148, [17:17] -unusedBit_22_18 = bits, U32, 1148, [18:18] -unusedBit_22_19 = bits, U32, 1148, [19:19] -unusedBit_22_20 = bits, U32, 1148, [20:20] -unusedBit_22_21 = bits, U32, 1148, [21:21] -unusedBit_22_22 = bits, U32, 1148, [22:22] -unusedBit_22_23 = bits, U32, 1148, [23:23] -unusedBit_22_24 = bits, U32, 1148, [24:24] -unusedBit_22_25 = bits, U32, 1148, [25:25] -unusedBit_22_26 = bits, U32, 1148, [26:26] -unusedBit_22_27 = bits, U32, 1148, [27:27] -unusedBit_22_28 = bits, U32, 1148, [28:28] -unusedBit_22_29 = bits, U32, 1148, [29:29] -unusedBit_22_30 = bits, U32, 1148, [30:30] -unusedBit_22_31 = bits, U32, 1148, [31:31] -targetRpmByClt = scalar, S32, 1152, "", 1, 0 -targetRpmAcBump = scalar, S32, 1156, "", 1, 0 -iacByRpmTaper = scalar, F32, 1160 -luaAdd = scalar, F32, 1164 -; total TS size = 1168 -baseDwell = scalar, F32, 1168, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 1172, "", 1, 0 -luaTimingAdd = scalar, F32, 1176, "", 1, 0 -luaTimingMult = scalar, F32, 1180, "", 1, 0 -; total TS size = 1184 -idlePosition = scalar, F32, 1184, "", 1, 0 -trim = scalar, F32, 1188, "", 1, 0 -luaAdjustment = scalar, F32, 1192, "", 1, 0 -etbFeedForward = scalar, F32, 1196 -etbIntegralError = scalar, F32, 1200, "", 1, 0 -etbCurrentTarget = scalar, F32, 1204, "%", 1, 0 -; total TS size = 1208 -faultCode = scalar, U08, 1208, "", 1, 0 -heaterDuty = scalar, U08, 1209, "%", 1, 0 -pumpDuty = scalar, U08, 1210, "%", 1, 0 -tempC = scalar, U16, 1212, "C", 1, 0 -nernstVoltage = scalar, U16, 1214, "V", 0.001, 0 -esr = scalar, U16, 1216, "", 1, 0 -; total TS size = 1220 +m_hasSynchronizedPhase = bits, U32, 1120, [0:0] +unusedBit_1_1 = bits, U32, 1120, [1:1] +unusedBit_1_2 = bits, U32, 1120, [2:2] +unusedBit_1_3 = bits, U32, 1120, [3:3] +unusedBit_1_4 = bits, U32, 1120, [4:4] +unusedBit_1_5 = bits, U32, 1120, [5:5] +unusedBit_1_6 = bits, U32, 1120, [6:6] +unusedBit_1_7 = bits, U32, 1120, [7:7] +unusedBit_1_8 = bits, U32, 1120, [8:8] +unusedBit_1_9 = bits, U32, 1120, [9:9] +unusedBit_1_10 = bits, U32, 1120, [10:10] +unusedBit_1_11 = bits, U32, 1120, [11:11] +unusedBit_1_12 = bits, U32, 1120, [12:12] +unusedBit_1_13 = bits, U32, 1120, [13:13] +unusedBit_1_14 = bits, U32, 1120, [14:14] +unusedBit_1_15 = bits, U32, 1120, [15:15] +unusedBit_1_16 = bits, U32, 1120, [16:16] +unusedBit_1_17 = bits, U32, 1120, [17:17] +unusedBit_1_18 = bits, U32, 1120, [18:18] +unusedBit_1_19 = bits, U32, 1120, [19:19] +unusedBit_1_20 = bits, U32, 1120, [20:20] +unusedBit_1_21 = bits, U32, 1120, [21:21] +unusedBit_1_22 = bits, U32, 1120, [22:22] +unusedBit_1_23 = bits, U32, 1120, [23:23] +unusedBit_1_24 = bits, U32, 1120, [24:24] +unusedBit_1_25 = bits, U32, 1120, [25:25] +unusedBit_1_26 = bits, U32, 1120, [26:26] +unusedBit_1_27 = bits, U32, 1120, [27:27] +unusedBit_1_28 = bits, U32, 1120, [28:28] +unusedBit_1_29 = bits, U32, 1120, [29:29] +unusedBit_1_30 = bits, U32, 1120, [30:30] +unusedBit_1_31 = bits, U32, 1120, [31:31] +; total TS size = 1124 +wallFuelCorrection = scalar, F32, 1124, "", 1, 0 +wallFuel = scalar, F32, 1128, "", 1, 0 +; total TS size = 1132 +idleState = bits, S32, 1132, [0:2], "not important" +currentIdlePosition = scalar, F32, 1136 +baseIdlePosition = scalar, F32, 1140 +iacByTpsTaper = scalar, F32, 1144 +throttlePedalUpState = scalar, S32, 1148, "", 1, 0 +mightResetPid = bits, U32, 1152, [0:0] +shouldResetPid = bits, U32, 1152, [1:1] +wasResetPid = bits, U32, 1152, [2:2] +mustResetPid = bits, U32, 1152, [3:3] +isCoasting = bits, U32, 1152, [4:4] +useIacTableForCoasting = bits, U32, 1152, [5:5] +notIdling = bits, U32, 1152, [6:6] +needReset = bits, U32, 1152, [7:7] +isInDeadZone = bits, U32, 1152, [8:8] +isBlipping = bits, U32, 1152, [9:9] +useClosedLoop = bits, U32, 1152, [10:10] +badTps = bits, U32, 1152, [11:11] +looksLikeRunning = bits, U32, 1152, [12:12] +looksLikeCoasting = bits, U32, 1152, [13:13] +looksLikeCrankToIdle = bits, U32, 1152, [14:14] +useInstantRpmForIdle = bits, U32, 1152, [15:15] +isVerboseIAC = bits, U32, 1152, [16:16] +unusedBit_22_17 = bits, U32, 1152, [17:17] +unusedBit_22_18 = bits, U32, 1152, [18:18] +unusedBit_22_19 = bits, U32, 1152, [19:19] +unusedBit_22_20 = bits, U32, 1152, [20:20] +unusedBit_22_21 = bits, U32, 1152, [21:21] +unusedBit_22_22 = bits, U32, 1152, [22:22] +unusedBit_22_23 = bits, U32, 1152, [23:23] +unusedBit_22_24 = bits, U32, 1152, [24:24] +unusedBit_22_25 = bits, U32, 1152, [25:25] +unusedBit_22_26 = bits, U32, 1152, [26:26] +unusedBit_22_27 = bits, U32, 1152, [27:27] +unusedBit_22_28 = bits, U32, 1152, [28:28] +unusedBit_22_29 = bits, U32, 1152, [29:29] +unusedBit_22_30 = bits, U32, 1152, [30:30] +unusedBit_22_31 = bits, U32, 1152, [31:31] +targetRpmByClt = scalar, S32, 1156, "", 1, 0 +targetRpmAcBump = scalar, S32, 1160, "", 1, 0 +iacByRpmTaper = scalar, F32, 1164 +luaAdd = scalar, F32, 1168 +; total TS size = 1172 +baseDwell = scalar, F32, 1172, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 1176, "", 1, 0 +luaTimingAdd = scalar, F32, 1180, "", 1, 0 +luaTimingMult = scalar, F32, 1184, "", 1, 0 +; total TS size = 1188 +idlePosition = scalar, F32, 1188, "", 1, 0 +trim = scalar, F32, 1192, "", 1, 0 +luaAdjustment = scalar, F32, 1196, "", 1, 0 +etbFeedForward = scalar, F32, 1200 +etbIntegralError = scalar, F32, 1204, "", 1, 0 +etbCurrentTarget = scalar, F32, 1208, "%", 1, 0 +; total TS size = 1212 +faultCode = scalar, U08, 1212, "", 1, 0 +heaterDuty = scalar, U08, 1213, "%", 1, 0 +pumpDuty = scalar, U08, 1214, "%", 1, 0 +tempC = scalar, U16, 1216, "C", 1, 0 +nernstVoltage = scalar, U16, 1218, "V", 0.001, 0 +esr = scalar, U16, 1220, "", 1, 0 +; total TS size = 1224 time = { timeNow } @@ -4721,7 +4754,6 @@ entry = hellenBoardId, "Detected Board ID", int, "%d" entry = clutchUpState, "clutch: up", int, "%d" entry = clutchDownState, "clutch: down", int, "%d" entry = brakePedalState, "brake: down", int, "%d" -entry = isSynchronizedPhase, "isSynchronizedPhase", int, "%d" entry = egt1, "egt1", float, "%.3f" entry = egt2, "egt2", float, "%.3f" entry = desiredRpmLimit, "User-defined RPM hard limit", int, "%d" @@ -4762,6 +4794,7 @@ entry = triggerStateIndex, "triggerStateIndex", int, "%d" entry = vvtCounter, "vvtCounter", int, "%d" entry = camResyncCounter, "camResyncCounter", int, "%d" entry = vvtStateIndex, "vvtStateIndex", int, "%d" +entry = m_hasSynchronizedPhase, "m_hasSynchronizedPhase", int, "%d" entry = wallFuelCorrection, "fuel injection time correction to account for wall wetting effect for current cycle", float, "%.3f" entry = wallFuel, "Amount of fuel on the wall, in ms of injector open time for each injector.", float, "%.3f" entry = idleState, "idleState", int, "%d" @@ -4966,6 +4999,7 @@ menuDialog = main subMenu = tps_accel_stateDialog, "tps_accel_state" subMenu = trigger_centralDialog, "trigger_central" subMenu = trigger_stateDialog, "trigger_state" + subMenu = trigger_state_primaryDialog, "trigger_state_primary" subMenu = wall_fuel_stateDialog, "wall_fuel_state" subMenu = idle_stateDialog, "idle_state" subMenu = ignition_stateDialog, "ignition_state" @@ -5412,7 +5446,6 @@ indicatorPanel = engine_stateIndicatorPanel, 2 indicator = {clutchUpState}, "clutchUpState No", "clutchUpState Yes" indicator = {clutchDownState}, "clutchDownState No", "clutchDownState Yes" indicator = {brakePedalState}, "brakePedalState No", "brakePedalState Yes" - indicator = {isSynchronizedPhase}, "isSynchronizedPhase No", "isSynchronizedPhase Yes" dialog = engine_stateDialog, "engine_state" panel = engine_stateIndicatorPanel @@ -5521,6 +5554,12 @@ dialog = trigger_stateDialog, "trigger_state" liveGraph = trigger_state_3_Graph, "Graph", South graphLine = vvtStateIndex +indicatorPanel = trigger_state_primaryIndicatorPanel, 2 + indicator = {m_hasSynchronizedPhase}, "m_hasSynchronizedPhase No", "m_hasSynchronizedPhase Yes" + +dialog = trigger_state_primaryDialog, "trigger_state_primary" + panel = trigger_state_primaryIndicatorPanel + dialog = wall_fuel_stateDialog, "wall_fuel_state" liveGraph = wall_fuel_state_1_Graph, "Graph", South diff --git a/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini b/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini index ad1c61f65c..d775b7dc06 100644 --- a/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini +++ b/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.08.24.alphax-4chan.4269526152" + signature = "rusEFI 2022.08.24.alphax-4chan.4178970769" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.08.24.alphax-4chan.4269526152" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.08.24.alphax-4chan.4178970769" ; 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 Wed Aug 24 16:15:15 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Aug 24 22:14:54 UTC 2022 pageSize = 21300 page = 1 @@ -2109,7 +2109,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1220 + ochBlockSize = 1224 ; ; see TunerStudioOutputChannels struct @@ -2990,35 +2990,35 @@ hellenBoardId = scalar, S16, 990, "id", 1, 0 clutchUpState = bits, U32, 992, [0:0] clutchDownState = bits, U32, 992, [1:1] brakePedalState = bits, U32, 992, [2:2] -isSynchronizedPhase = bits, U32, 992, [3:3] -unusedBit_23_4 = bits, U32, 992, [4:4] -unusedBit_23_5 = bits, U32, 992, [5:5] -unusedBit_23_6 = bits, U32, 992, [6:6] -unusedBit_23_7 = bits, U32, 992, [7:7] -unusedBit_23_8 = bits, U32, 992, [8:8] -unusedBit_23_9 = bits, U32, 992, [9:9] -unusedBit_23_10 = bits, U32, 992, [10:10] -unusedBit_23_11 = bits, U32, 992, [11:11] -unusedBit_23_12 = bits, U32, 992, [12:12] -unusedBit_23_13 = bits, U32, 992, [13:13] -unusedBit_23_14 = bits, U32, 992, [14:14] -unusedBit_23_15 = bits, U32, 992, [15:15] -unusedBit_23_16 = bits, U32, 992, [16:16] -unusedBit_23_17 = bits, U32, 992, [17:17] -unusedBit_23_18 = bits, U32, 992, [18:18] -unusedBit_23_19 = bits, U32, 992, [19:19] -unusedBit_23_20 = bits, U32, 992, [20:20] -unusedBit_23_21 = bits, U32, 992, [21:21] -unusedBit_23_22 = bits, U32, 992, [22:22] -unusedBit_23_23 = bits, U32, 992, [23:23] -unusedBit_23_24 = bits, U32, 992, [24:24] -unusedBit_23_25 = bits, U32, 992, [25:25] -unusedBit_23_26 = bits, U32, 992, [26:26] -unusedBit_23_27 = bits, U32, 992, [27:27] -unusedBit_23_28 = bits, U32, 992, [28:28] -unusedBit_23_29 = bits, U32, 992, [29:29] -unusedBit_23_30 = bits, U32, 992, [30:30] -unusedBit_23_31 = bits, U32, 992, [31:31] +unusedBit_22_3 = bits, U32, 992, [3:3] +unusedBit_22_4 = bits, U32, 992, [4:4] +unusedBit_22_5 = bits, U32, 992, [5:5] +unusedBit_22_6 = bits, U32, 992, [6:6] +unusedBit_22_7 = bits, U32, 992, [7:7] +unusedBit_22_8 = bits, U32, 992, [8:8] +unusedBit_22_9 = bits, U32, 992, [9:9] +unusedBit_22_10 = bits, U32, 992, [10:10] +unusedBit_22_11 = bits, U32, 992, [11:11] +unusedBit_22_12 = bits, U32, 992, [12:12] +unusedBit_22_13 = bits, U32, 992, [13:13] +unusedBit_22_14 = bits, U32, 992, [14:14] +unusedBit_22_15 = bits, U32, 992, [15:15] +unusedBit_22_16 = bits, U32, 992, [16:16] +unusedBit_22_17 = bits, U32, 992, [17:17] +unusedBit_22_18 = bits, U32, 992, [18:18] +unusedBit_22_19 = bits, U32, 992, [19:19] +unusedBit_22_20 = bits, U32, 992, [20:20] +unusedBit_22_21 = bits, U32, 992, [21:21] +unusedBit_22_22 = bits, U32, 992, [22:22] +unusedBit_22_23 = bits, U32, 992, [23:23] +unusedBit_22_24 = bits, U32, 992, [24:24] +unusedBit_22_25 = bits, U32, 992, [25:25] +unusedBit_22_26 = bits, U32, 992, [26:26] +unusedBit_22_27 = bits, U32, 992, [27:27] +unusedBit_22_28 = bits, U32, 992, [28:28] +unusedBit_22_29 = bits, U32, 992, [29:29] +unusedBit_22_30 = bits, U32, 992, [30:30] +unusedBit_22_31 = bits, U32, 992, [31:31] egt1 = scalar, F32, 996, "", 1, 0 egt2 = scalar, F32, 1000, "", 1, 0 desiredRpmLimit = scalar, S16, 1004, "rpm", 1, 0 @@ -3089,70 +3089,103 @@ vvtCounter = scalar, U08, 1117, "", 1, 0 camResyncCounter = scalar, U08, 1118, "", 1, 0 vvtStateIndex = scalar, U08, 1119, "", 1, 0 ; total TS size = 1120 -wallFuelCorrection = scalar, F32, 1120, "", 1, 0 -wallFuel = scalar, F32, 1124, "", 1, 0 -; total TS size = 1128 -idleState = bits, S32, 1128, [0:2], "not important" -currentIdlePosition = scalar, F32, 1132 -baseIdlePosition = scalar, F32, 1136 -iacByTpsTaper = scalar, F32, 1140 -throttlePedalUpState = scalar, S32, 1144, "", 1, 0 -mightResetPid = bits, U32, 1148, [0:0] -shouldResetPid = bits, U32, 1148, [1:1] -wasResetPid = bits, U32, 1148, [2:2] -mustResetPid = bits, U32, 1148, [3:3] -isCoasting = bits, U32, 1148, [4:4] -useIacTableForCoasting = bits, U32, 1148, [5:5] -notIdling = bits, U32, 1148, [6:6] -needReset = bits, U32, 1148, [7:7] -isInDeadZone = bits, U32, 1148, [8:8] -isBlipping = bits, U32, 1148, [9:9] -useClosedLoop = bits, U32, 1148, [10:10] -badTps = bits, U32, 1148, [11:11] -looksLikeRunning = bits, U32, 1148, [12:12] -looksLikeCoasting = bits, U32, 1148, [13:13] -looksLikeCrankToIdle = bits, U32, 1148, [14:14] -useInstantRpmForIdle = bits, U32, 1148, [15:15] -isVerboseIAC = bits, U32, 1148, [16:16] -unusedBit_22_17 = bits, U32, 1148, [17:17] -unusedBit_22_18 = bits, U32, 1148, [18:18] -unusedBit_22_19 = bits, U32, 1148, [19:19] -unusedBit_22_20 = bits, U32, 1148, [20:20] -unusedBit_22_21 = bits, U32, 1148, [21:21] -unusedBit_22_22 = bits, U32, 1148, [22:22] -unusedBit_22_23 = bits, U32, 1148, [23:23] -unusedBit_22_24 = bits, U32, 1148, [24:24] -unusedBit_22_25 = bits, U32, 1148, [25:25] -unusedBit_22_26 = bits, U32, 1148, [26:26] -unusedBit_22_27 = bits, U32, 1148, [27:27] -unusedBit_22_28 = bits, U32, 1148, [28:28] -unusedBit_22_29 = bits, U32, 1148, [29:29] -unusedBit_22_30 = bits, U32, 1148, [30:30] -unusedBit_22_31 = bits, U32, 1148, [31:31] -targetRpmByClt = scalar, S32, 1152, "", 1, 0 -targetRpmAcBump = scalar, S32, 1156, "", 1, 0 -iacByRpmTaper = scalar, F32, 1160 -luaAdd = scalar, F32, 1164 -; total TS size = 1168 -baseDwell = scalar, F32, 1168, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 1172, "", 1, 0 -luaTimingAdd = scalar, F32, 1176, "", 1, 0 -luaTimingMult = scalar, F32, 1180, "", 1, 0 -; total TS size = 1184 -idlePosition = scalar, F32, 1184, "", 1, 0 -trim = scalar, F32, 1188, "", 1, 0 -luaAdjustment = scalar, F32, 1192, "", 1, 0 -etbFeedForward = scalar, F32, 1196 -etbIntegralError = scalar, F32, 1200, "", 1, 0 -etbCurrentTarget = scalar, F32, 1204, "%", 1, 0 -; total TS size = 1208 -faultCode = scalar, U08, 1208, "", 1, 0 -heaterDuty = scalar, U08, 1209, "%", 1, 0 -pumpDuty = scalar, U08, 1210, "%", 1, 0 -tempC = scalar, U16, 1212, "C", 1, 0 -nernstVoltage = scalar, U16, 1214, "V", 0.001, 0 -esr = scalar, U16, 1216, "", 1, 0 -; total TS size = 1220 +m_hasSynchronizedPhase = bits, U32, 1120, [0:0] +unusedBit_1_1 = bits, U32, 1120, [1:1] +unusedBit_1_2 = bits, U32, 1120, [2:2] +unusedBit_1_3 = bits, U32, 1120, [3:3] +unusedBit_1_4 = bits, U32, 1120, [4:4] +unusedBit_1_5 = bits, U32, 1120, [5:5] +unusedBit_1_6 = bits, U32, 1120, [6:6] +unusedBit_1_7 = bits, U32, 1120, [7:7] +unusedBit_1_8 = bits, U32, 1120, [8:8] +unusedBit_1_9 = bits, U32, 1120, [9:9] +unusedBit_1_10 = bits, U32, 1120, [10:10] +unusedBit_1_11 = bits, U32, 1120, [11:11] +unusedBit_1_12 = bits, U32, 1120, [12:12] +unusedBit_1_13 = bits, U32, 1120, [13:13] +unusedBit_1_14 = bits, U32, 1120, [14:14] +unusedBit_1_15 = bits, U32, 1120, [15:15] +unusedBit_1_16 = bits, U32, 1120, [16:16] +unusedBit_1_17 = bits, U32, 1120, [17:17] +unusedBit_1_18 = bits, U32, 1120, [18:18] +unusedBit_1_19 = bits, U32, 1120, [19:19] +unusedBit_1_20 = bits, U32, 1120, [20:20] +unusedBit_1_21 = bits, U32, 1120, [21:21] +unusedBit_1_22 = bits, U32, 1120, [22:22] +unusedBit_1_23 = bits, U32, 1120, [23:23] +unusedBit_1_24 = bits, U32, 1120, [24:24] +unusedBit_1_25 = bits, U32, 1120, [25:25] +unusedBit_1_26 = bits, U32, 1120, [26:26] +unusedBit_1_27 = bits, U32, 1120, [27:27] +unusedBit_1_28 = bits, U32, 1120, [28:28] +unusedBit_1_29 = bits, U32, 1120, [29:29] +unusedBit_1_30 = bits, U32, 1120, [30:30] +unusedBit_1_31 = bits, U32, 1120, [31:31] +; total TS size = 1124 +wallFuelCorrection = scalar, F32, 1124, "", 1, 0 +wallFuel = scalar, F32, 1128, "", 1, 0 +; total TS size = 1132 +idleState = bits, S32, 1132, [0:2], "not important" +currentIdlePosition = scalar, F32, 1136 +baseIdlePosition = scalar, F32, 1140 +iacByTpsTaper = scalar, F32, 1144 +throttlePedalUpState = scalar, S32, 1148, "", 1, 0 +mightResetPid = bits, U32, 1152, [0:0] +shouldResetPid = bits, U32, 1152, [1:1] +wasResetPid = bits, U32, 1152, [2:2] +mustResetPid = bits, U32, 1152, [3:3] +isCoasting = bits, U32, 1152, [4:4] +useIacTableForCoasting = bits, U32, 1152, [5:5] +notIdling = bits, U32, 1152, [6:6] +needReset = bits, U32, 1152, [7:7] +isInDeadZone = bits, U32, 1152, [8:8] +isBlipping = bits, U32, 1152, [9:9] +useClosedLoop = bits, U32, 1152, [10:10] +badTps = bits, U32, 1152, [11:11] +looksLikeRunning = bits, U32, 1152, [12:12] +looksLikeCoasting = bits, U32, 1152, [13:13] +looksLikeCrankToIdle = bits, U32, 1152, [14:14] +useInstantRpmForIdle = bits, U32, 1152, [15:15] +isVerboseIAC = bits, U32, 1152, [16:16] +unusedBit_22_17 = bits, U32, 1152, [17:17] +unusedBit_22_18 = bits, U32, 1152, [18:18] +unusedBit_22_19 = bits, U32, 1152, [19:19] +unusedBit_22_20 = bits, U32, 1152, [20:20] +unusedBit_22_21 = bits, U32, 1152, [21:21] +unusedBit_22_22 = bits, U32, 1152, [22:22] +unusedBit_22_23 = bits, U32, 1152, [23:23] +unusedBit_22_24 = bits, U32, 1152, [24:24] +unusedBit_22_25 = bits, U32, 1152, [25:25] +unusedBit_22_26 = bits, U32, 1152, [26:26] +unusedBit_22_27 = bits, U32, 1152, [27:27] +unusedBit_22_28 = bits, U32, 1152, [28:28] +unusedBit_22_29 = bits, U32, 1152, [29:29] +unusedBit_22_30 = bits, U32, 1152, [30:30] +unusedBit_22_31 = bits, U32, 1152, [31:31] +targetRpmByClt = scalar, S32, 1156, "", 1, 0 +targetRpmAcBump = scalar, S32, 1160, "", 1, 0 +iacByRpmTaper = scalar, F32, 1164 +luaAdd = scalar, F32, 1168 +; total TS size = 1172 +baseDwell = scalar, F32, 1172, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 1176, "", 1, 0 +luaTimingAdd = scalar, F32, 1180, "", 1, 0 +luaTimingMult = scalar, F32, 1184, "", 1, 0 +; total TS size = 1188 +idlePosition = scalar, F32, 1188, "", 1, 0 +trim = scalar, F32, 1192, "", 1, 0 +luaAdjustment = scalar, F32, 1196, "", 1, 0 +etbFeedForward = scalar, F32, 1200 +etbIntegralError = scalar, F32, 1204, "", 1, 0 +etbCurrentTarget = scalar, F32, 1208, "%", 1, 0 +; total TS size = 1212 +faultCode = scalar, U08, 1212, "", 1, 0 +heaterDuty = scalar, U08, 1213, "%", 1, 0 +pumpDuty = scalar, U08, 1214, "%", 1, 0 +tempC = scalar, U16, 1216, "C", 1, 0 +nernstVoltage = scalar, U16, 1218, "V", 0.001, 0 +esr = scalar, U16, 1220, "", 1, 0 +; total TS size = 1224 time = { timeNow } @@ -4721,7 +4754,6 @@ entry = hellenBoardId, "Detected Board ID", int, "%d" entry = clutchUpState, "clutch: up", int, "%d" entry = clutchDownState, "clutch: down", int, "%d" entry = brakePedalState, "brake: down", int, "%d" -entry = isSynchronizedPhase, "isSynchronizedPhase", int, "%d" entry = egt1, "egt1", float, "%.3f" entry = egt2, "egt2", float, "%.3f" entry = desiredRpmLimit, "User-defined RPM hard limit", int, "%d" @@ -4762,6 +4794,7 @@ entry = triggerStateIndex, "triggerStateIndex", int, "%d" entry = vvtCounter, "vvtCounter", int, "%d" entry = camResyncCounter, "camResyncCounter", int, "%d" entry = vvtStateIndex, "vvtStateIndex", int, "%d" +entry = m_hasSynchronizedPhase, "m_hasSynchronizedPhase", int, "%d" entry = wallFuelCorrection, "fuel injection time correction to account for wall wetting effect for current cycle", float, "%.3f" entry = wallFuel, "Amount of fuel on the wall, in ms of injector open time for each injector.", float, "%.3f" entry = idleState, "idleState", int, "%d" @@ -4966,6 +4999,7 @@ menuDialog = main subMenu = tps_accel_stateDialog, "tps_accel_state" subMenu = trigger_centralDialog, "trigger_central" subMenu = trigger_stateDialog, "trigger_state" + subMenu = trigger_state_primaryDialog, "trigger_state_primary" subMenu = wall_fuel_stateDialog, "wall_fuel_state" subMenu = idle_stateDialog, "idle_state" subMenu = ignition_stateDialog, "ignition_state" @@ -5414,7 +5448,6 @@ indicatorPanel = engine_stateIndicatorPanel, 2 indicator = {clutchUpState}, "clutchUpState No", "clutchUpState Yes" indicator = {clutchDownState}, "clutchDownState No", "clutchDownState Yes" indicator = {brakePedalState}, "brakePedalState No", "brakePedalState Yes" - indicator = {isSynchronizedPhase}, "isSynchronizedPhase No", "isSynchronizedPhase Yes" dialog = engine_stateDialog, "engine_state" panel = engine_stateIndicatorPanel @@ -5523,6 +5556,12 @@ dialog = trigger_stateDialog, "trigger_state" liveGraph = trigger_state_3_Graph, "Graph", South graphLine = vvtStateIndex +indicatorPanel = trigger_state_primaryIndicatorPanel, 2 + indicator = {m_hasSynchronizedPhase}, "m_hasSynchronizedPhase No", "m_hasSynchronizedPhase Yes" + +dialog = trigger_state_primaryDialog, "trigger_state_primary" + panel = trigger_state_primaryIndicatorPanel + dialog = wall_fuel_stateDialog, "wall_fuel_state" liveGraph = wall_fuel_state_1_Graph, "Graph", South diff --git a/firmware/tunerstudio/generated/rusefi_atlas.ini b/firmware/tunerstudio/generated/rusefi_atlas.ini index 1a741b30f5..576cb28acc 100644 --- a/firmware/tunerstudio/generated/rusefi_atlas.ini +++ b/firmware/tunerstudio/generated/rusefi_atlas.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.08.24.atlas.1773009440" + signature = "rusEFI 2022.08.24.atlas.1858092601" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.08.24.atlas.1773009440" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.08.24.atlas.1858092601" ; 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 Wed Aug 24 16:15:57 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Aug 24 22:15:34 UTC 2022 pageSize = 21300 page = 1 @@ -2109,7 +2109,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1220 + ochBlockSize = 1224 ; ; see TunerStudioOutputChannels struct @@ -2990,35 +2990,35 @@ hellenBoardId = scalar, S16, 990, "id", 1, 0 clutchUpState = bits, U32, 992, [0:0] clutchDownState = bits, U32, 992, [1:1] brakePedalState = bits, U32, 992, [2:2] -isSynchronizedPhase = bits, U32, 992, [3:3] -unusedBit_23_4 = bits, U32, 992, [4:4] -unusedBit_23_5 = bits, U32, 992, [5:5] -unusedBit_23_6 = bits, U32, 992, [6:6] -unusedBit_23_7 = bits, U32, 992, [7:7] -unusedBit_23_8 = bits, U32, 992, [8:8] -unusedBit_23_9 = bits, U32, 992, [9:9] -unusedBit_23_10 = bits, U32, 992, [10:10] -unusedBit_23_11 = bits, U32, 992, [11:11] -unusedBit_23_12 = bits, U32, 992, [12:12] -unusedBit_23_13 = bits, U32, 992, [13:13] -unusedBit_23_14 = bits, U32, 992, [14:14] -unusedBit_23_15 = bits, U32, 992, [15:15] -unusedBit_23_16 = bits, U32, 992, [16:16] -unusedBit_23_17 = bits, U32, 992, [17:17] -unusedBit_23_18 = bits, U32, 992, [18:18] -unusedBit_23_19 = bits, U32, 992, [19:19] -unusedBit_23_20 = bits, U32, 992, [20:20] -unusedBit_23_21 = bits, U32, 992, [21:21] -unusedBit_23_22 = bits, U32, 992, [22:22] -unusedBit_23_23 = bits, U32, 992, [23:23] -unusedBit_23_24 = bits, U32, 992, [24:24] -unusedBit_23_25 = bits, U32, 992, [25:25] -unusedBit_23_26 = bits, U32, 992, [26:26] -unusedBit_23_27 = bits, U32, 992, [27:27] -unusedBit_23_28 = bits, U32, 992, [28:28] -unusedBit_23_29 = bits, U32, 992, [29:29] -unusedBit_23_30 = bits, U32, 992, [30:30] -unusedBit_23_31 = bits, U32, 992, [31:31] +unusedBit_22_3 = bits, U32, 992, [3:3] +unusedBit_22_4 = bits, U32, 992, [4:4] +unusedBit_22_5 = bits, U32, 992, [5:5] +unusedBit_22_6 = bits, U32, 992, [6:6] +unusedBit_22_7 = bits, U32, 992, [7:7] +unusedBit_22_8 = bits, U32, 992, [8:8] +unusedBit_22_9 = bits, U32, 992, [9:9] +unusedBit_22_10 = bits, U32, 992, [10:10] +unusedBit_22_11 = bits, U32, 992, [11:11] +unusedBit_22_12 = bits, U32, 992, [12:12] +unusedBit_22_13 = bits, U32, 992, [13:13] +unusedBit_22_14 = bits, U32, 992, [14:14] +unusedBit_22_15 = bits, U32, 992, [15:15] +unusedBit_22_16 = bits, U32, 992, [16:16] +unusedBit_22_17 = bits, U32, 992, [17:17] +unusedBit_22_18 = bits, U32, 992, [18:18] +unusedBit_22_19 = bits, U32, 992, [19:19] +unusedBit_22_20 = bits, U32, 992, [20:20] +unusedBit_22_21 = bits, U32, 992, [21:21] +unusedBit_22_22 = bits, U32, 992, [22:22] +unusedBit_22_23 = bits, U32, 992, [23:23] +unusedBit_22_24 = bits, U32, 992, [24:24] +unusedBit_22_25 = bits, U32, 992, [25:25] +unusedBit_22_26 = bits, U32, 992, [26:26] +unusedBit_22_27 = bits, U32, 992, [27:27] +unusedBit_22_28 = bits, U32, 992, [28:28] +unusedBit_22_29 = bits, U32, 992, [29:29] +unusedBit_22_30 = bits, U32, 992, [30:30] +unusedBit_22_31 = bits, U32, 992, [31:31] egt1 = scalar, F32, 996, "", 1, 0 egt2 = scalar, F32, 1000, "", 1, 0 desiredRpmLimit = scalar, S16, 1004, "rpm", 1, 0 @@ -3089,70 +3089,103 @@ vvtCounter = scalar, U08, 1117, "", 1, 0 camResyncCounter = scalar, U08, 1118, "", 1, 0 vvtStateIndex = scalar, U08, 1119, "", 1, 0 ; total TS size = 1120 -wallFuelCorrection = scalar, F32, 1120, "", 1, 0 -wallFuel = scalar, F32, 1124, "", 1, 0 -; total TS size = 1128 -idleState = bits, S32, 1128, [0:2], "not important" -currentIdlePosition = scalar, F32, 1132 -baseIdlePosition = scalar, F32, 1136 -iacByTpsTaper = scalar, F32, 1140 -throttlePedalUpState = scalar, S32, 1144, "", 1, 0 -mightResetPid = bits, U32, 1148, [0:0] -shouldResetPid = bits, U32, 1148, [1:1] -wasResetPid = bits, U32, 1148, [2:2] -mustResetPid = bits, U32, 1148, [3:3] -isCoasting = bits, U32, 1148, [4:4] -useIacTableForCoasting = bits, U32, 1148, [5:5] -notIdling = bits, U32, 1148, [6:6] -needReset = bits, U32, 1148, [7:7] -isInDeadZone = bits, U32, 1148, [8:8] -isBlipping = bits, U32, 1148, [9:9] -useClosedLoop = bits, U32, 1148, [10:10] -badTps = bits, U32, 1148, [11:11] -looksLikeRunning = bits, U32, 1148, [12:12] -looksLikeCoasting = bits, U32, 1148, [13:13] -looksLikeCrankToIdle = bits, U32, 1148, [14:14] -useInstantRpmForIdle = bits, U32, 1148, [15:15] -isVerboseIAC = bits, U32, 1148, [16:16] -unusedBit_22_17 = bits, U32, 1148, [17:17] -unusedBit_22_18 = bits, U32, 1148, [18:18] -unusedBit_22_19 = bits, U32, 1148, [19:19] -unusedBit_22_20 = bits, U32, 1148, [20:20] -unusedBit_22_21 = bits, U32, 1148, [21:21] -unusedBit_22_22 = bits, U32, 1148, [22:22] -unusedBit_22_23 = bits, U32, 1148, [23:23] -unusedBit_22_24 = bits, U32, 1148, [24:24] -unusedBit_22_25 = bits, U32, 1148, [25:25] -unusedBit_22_26 = bits, U32, 1148, [26:26] -unusedBit_22_27 = bits, U32, 1148, [27:27] -unusedBit_22_28 = bits, U32, 1148, [28:28] -unusedBit_22_29 = bits, U32, 1148, [29:29] -unusedBit_22_30 = bits, U32, 1148, [30:30] -unusedBit_22_31 = bits, U32, 1148, [31:31] -targetRpmByClt = scalar, S32, 1152, "", 1, 0 -targetRpmAcBump = scalar, S32, 1156, "", 1, 0 -iacByRpmTaper = scalar, F32, 1160 -luaAdd = scalar, F32, 1164 -; total TS size = 1168 -baseDwell = scalar, F32, 1168, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 1172, "", 1, 0 -luaTimingAdd = scalar, F32, 1176, "", 1, 0 -luaTimingMult = scalar, F32, 1180, "", 1, 0 -; total TS size = 1184 -idlePosition = scalar, F32, 1184, "", 1, 0 -trim = scalar, F32, 1188, "", 1, 0 -luaAdjustment = scalar, F32, 1192, "", 1, 0 -etbFeedForward = scalar, F32, 1196 -etbIntegralError = scalar, F32, 1200, "", 1, 0 -etbCurrentTarget = scalar, F32, 1204, "%", 1, 0 -; total TS size = 1208 -faultCode = scalar, U08, 1208, "", 1, 0 -heaterDuty = scalar, U08, 1209, "%", 1, 0 -pumpDuty = scalar, U08, 1210, "%", 1, 0 -tempC = scalar, U16, 1212, "C", 1, 0 -nernstVoltage = scalar, U16, 1214, "V", 0.001, 0 -esr = scalar, U16, 1216, "", 1, 0 -; total TS size = 1220 +m_hasSynchronizedPhase = bits, U32, 1120, [0:0] +unusedBit_1_1 = bits, U32, 1120, [1:1] +unusedBit_1_2 = bits, U32, 1120, [2:2] +unusedBit_1_3 = bits, U32, 1120, [3:3] +unusedBit_1_4 = bits, U32, 1120, [4:4] +unusedBit_1_5 = bits, U32, 1120, [5:5] +unusedBit_1_6 = bits, U32, 1120, [6:6] +unusedBit_1_7 = bits, U32, 1120, [7:7] +unusedBit_1_8 = bits, U32, 1120, [8:8] +unusedBit_1_9 = bits, U32, 1120, [9:9] +unusedBit_1_10 = bits, U32, 1120, [10:10] +unusedBit_1_11 = bits, U32, 1120, [11:11] +unusedBit_1_12 = bits, U32, 1120, [12:12] +unusedBit_1_13 = bits, U32, 1120, [13:13] +unusedBit_1_14 = bits, U32, 1120, [14:14] +unusedBit_1_15 = bits, U32, 1120, [15:15] +unusedBit_1_16 = bits, U32, 1120, [16:16] +unusedBit_1_17 = bits, U32, 1120, [17:17] +unusedBit_1_18 = bits, U32, 1120, [18:18] +unusedBit_1_19 = bits, U32, 1120, [19:19] +unusedBit_1_20 = bits, U32, 1120, [20:20] +unusedBit_1_21 = bits, U32, 1120, [21:21] +unusedBit_1_22 = bits, U32, 1120, [22:22] +unusedBit_1_23 = bits, U32, 1120, [23:23] +unusedBit_1_24 = bits, U32, 1120, [24:24] +unusedBit_1_25 = bits, U32, 1120, [25:25] +unusedBit_1_26 = bits, U32, 1120, [26:26] +unusedBit_1_27 = bits, U32, 1120, [27:27] +unusedBit_1_28 = bits, U32, 1120, [28:28] +unusedBit_1_29 = bits, U32, 1120, [29:29] +unusedBit_1_30 = bits, U32, 1120, [30:30] +unusedBit_1_31 = bits, U32, 1120, [31:31] +; total TS size = 1124 +wallFuelCorrection = scalar, F32, 1124, "", 1, 0 +wallFuel = scalar, F32, 1128, "", 1, 0 +; total TS size = 1132 +idleState = bits, S32, 1132, [0:2], "not important" +currentIdlePosition = scalar, F32, 1136 +baseIdlePosition = scalar, F32, 1140 +iacByTpsTaper = scalar, F32, 1144 +throttlePedalUpState = scalar, S32, 1148, "", 1, 0 +mightResetPid = bits, U32, 1152, [0:0] +shouldResetPid = bits, U32, 1152, [1:1] +wasResetPid = bits, U32, 1152, [2:2] +mustResetPid = bits, U32, 1152, [3:3] +isCoasting = bits, U32, 1152, [4:4] +useIacTableForCoasting = bits, U32, 1152, [5:5] +notIdling = bits, U32, 1152, [6:6] +needReset = bits, U32, 1152, [7:7] +isInDeadZone = bits, U32, 1152, [8:8] +isBlipping = bits, U32, 1152, [9:9] +useClosedLoop = bits, U32, 1152, [10:10] +badTps = bits, U32, 1152, [11:11] +looksLikeRunning = bits, U32, 1152, [12:12] +looksLikeCoasting = bits, U32, 1152, [13:13] +looksLikeCrankToIdle = bits, U32, 1152, [14:14] +useInstantRpmForIdle = bits, U32, 1152, [15:15] +isVerboseIAC = bits, U32, 1152, [16:16] +unusedBit_22_17 = bits, U32, 1152, [17:17] +unusedBit_22_18 = bits, U32, 1152, [18:18] +unusedBit_22_19 = bits, U32, 1152, [19:19] +unusedBit_22_20 = bits, U32, 1152, [20:20] +unusedBit_22_21 = bits, U32, 1152, [21:21] +unusedBit_22_22 = bits, U32, 1152, [22:22] +unusedBit_22_23 = bits, U32, 1152, [23:23] +unusedBit_22_24 = bits, U32, 1152, [24:24] +unusedBit_22_25 = bits, U32, 1152, [25:25] +unusedBit_22_26 = bits, U32, 1152, [26:26] +unusedBit_22_27 = bits, U32, 1152, [27:27] +unusedBit_22_28 = bits, U32, 1152, [28:28] +unusedBit_22_29 = bits, U32, 1152, [29:29] +unusedBit_22_30 = bits, U32, 1152, [30:30] +unusedBit_22_31 = bits, U32, 1152, [31:31] +targetRpmByClt = scalar, S32, 1156, "", 1, 0 +targetRpmAcBump = scalar, S32, 1160, "", 1, 0 +iacByRpmTaper = scalar, F32, 1164 +luaAdd = scalar, F32, 1168 +; total TS size = 1172 +baseDwell = scalar, F32, 1172, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 1176, "", 1, 0 +luaTimingAdd = scalar, F32, 1180, "", 1, 0 +luaTimingMult = scalar, F32, 1184, "", 1, 0 +; total TS size = 1188 +idlePosition = scalar, F32, 1188, "", 1, 0 +trim = scalar, F32, 1192, "", 1, 0 +luaAdjustment = scalar, F32, 1196, "", 1, 0 +etbFeedForward = scalar, F32, 1200 +etbIntegralError = scalar, F32, 1204, "", 1, 0 +etbCurrentTarget = scalar, F32, 1208, "%", 1, 0 +; total TS size = 1212 +faultCode = scalar, U08, 1212, "", 1, 0 +heaterDuty = scalar, U08, 1213, "%", 1, 0 +pumpDuty = scalar, U08, 1214, "%", 1, 0 +tempC = scalar, U16, 1216, "C", 1, 0 +nernstVoltage = scalar, U16, 1218, "V", 0.001, 0 +esr = scalar, U16, 1220, "", 1, 0 +; total TS size = 1224 time = { timeNow } @@ -4721,7 +4754,6 @@ entry = hellenBoardId, "Detected Board ID", int, "%d" entry = clutchUpState, "clutch: up", int, "%d" entry = clutchDownState, "clutch: down", int, "%d" entry = brakePedalState, "brake: down", int, "%d" -entry = isSynchronizedPhase, "isSynchronizedPhase", int, "%d" entry = egt1, "egt1", float, "%.3f" entry = egt2, "egt2", float, "%.3f" entry = desiredRpmLimit, "User-defined RPM hard limit", int, "%d" @@ -4762,6 +4794,7 @@ entry = triggerStateIndex, "triggerStateIndex", int, "%d" entry = vvtCounter, "vvtCounter", int, "%d" entry = camResyncCounter, "camResyncCounter", int, "%d" entry = vvtStateIndex, "vvtStateIndex", int, "%d" +entry = m_hasSynchronizedPhase, "m_hasSynchronizedPhase", int, "%d" entry = wallFuelCorrection, "fuel injection time correction to account for wall wetting effect for current cycle", float, "%.3f" entry = wallFuel, "Amount of fuel on the wall, in ms of injector open time for each injector.", float, "%.3f" entry = idleState, "idleState", int, "%d" @@ -4966,6 +4999,7 @@ menuDialog = main subMenu = tps_accel_stateDialog, "tps_accel_state" subMenu = trigger_centralDialog, "trigger_central" subMenu = trigger_stateDialog, "trigger_state" + subMenu = trigger_state_primaryDialog, "trigger_state_primary" subMenu = wall_fuel_stateDialog, "wall_fuel_state" subMenu = idle_stateDialog, "idle_state" subMenu = ignition_stateDialog, "ignition_state" @@ -5418,7 +5452,6 @@ indicatorPanel = engine_stateIndicatorPanel, 2 indicator = {clutchUpState}, "clutchUpState No", "clutchUpState Yes" indicator = {clutchDownState}, "clutchDownState No", "clutchDownState Yes" indicator = {brakePedalState}, "brakePedalState No", "brakePedalState Yes" - indicator = {isSynchronizedPhase}, "isSynchronizedPhase No", "isSynchronizedPhase Yes" dialog = engine_stateDialog, "engine_state" panel = engine_stateIndicatorPanel @@ -5527,6 +5560,12 @@ dialog = trigger_stateDialog, "trigger_state" liveGraph = trigger_state_3_Graph, "Graph", South graphLine = vvtStateIndex +indicatorPanel = trigger_state_primaryIndicatorPanel, 2 + indicator = {m_hasSynchronizedPhase}, "m_hasSynchronizedPhase No", "m_hasSynchronizedPhase Yes" + +dialog = trigger_state_primaryDialog, "trigger_state_primary" + panel = trigger_state_primaryIndicatorPanel + dialog = wall_fuel_stateDialog, "wall_fuel_state" liveGraph = wall_fuel_state_1_Graph, "Graph", South diff --git a/firmware/tunerstudio/generated/rusefi_core8.ini b/firmware/tunerstudio/generated/rusefi_core8.ini index 374923cbe0..ea5553570f 100644 --- a/firmware/tunerstudio/generated/rusefi_core8.ini +++ b/firmware/tunerstudio/generated/rusefi_core8.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.08.24.core8.2206949118" + signature = "rusEFI 2022.08.24.core8.2229705447" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.08.24.core8.2206949118" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.08.24.core8.2229705447" ; 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 Wed Aug 24 16:15:40 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Aug 24 22:15:18 UTC 2022 pageSize = 21300 page = 1 @@ -2109,7 +2109,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1220 + ochBlockSize = 1224 ; ; see TunerStudioOutputChannels struct @@ -2990,35 +2990,35 @@ hellenBoardId = scalar, S16, 990, "id", 1, 0 clutchUpState = bits, U32, 992, [0:0] clutchDownState = bits, U32, 992, [1:1] brakePedalState = bits, U32, 992, [2:2] -isSynchronizedPhase = bits, U32, 992, [3:3] -unusedBit_23_4 = bits, U32, 992, [4:4] -unusedBit_23_5 = bits, U32, 992, [5:5] -unusedBit_23_6 = bits, U32, 992, [6:6] -unusedBit_23_7 = bits, U32, 992, [7:7] -unusedBit_23_8 = bits, U32, 992, [8:8] -unusedBit_23_9 = bits, U32, 992, [9:9] -unusedBit_23_10 = bits, U32, 992, [10:10] -unusedBit_23_11 = bits, U32, 992, [11:11] -unusedBit_23_12 = bits, U32, 992, [12:12] -unusedBit_23_13 = bits, U32, 992, [13:13] -unusedBit_23_14 = bits, U32, 992, [14:14] -unusedBit_23_15 = bits, U32, 992, [15:15] -unusedBit_23_16 = bits, U32, 992, [16:16] -unusedBit_23_17 = bits, U32, 992, [17:17] -unusedBit_23_18 = bits, U32, 992, [18:18] -unusedBit_23_19 = bits, U32, 992, [19:19] -unusedBit_23_20 = bits, U32, 992, [20:20] -unusedBit_23_21 = bits, U32, 992, [21:21] -unusedBit_23_22 = bits, U32, 992, [22:22] -unusedBit_23_23 = bits, U32, 992, [23:23] -unusedBit_23_24 = bits, U32, 992, [24:24] -unusedBit_23_25 = bits, U32, 992, [25:25] -unusedBit_23_26 = bits, U32, 992, [26:26] -unusedBit_23_27 = bits, U32, 992, [27:27] -unusedBit_23_28 = bits, U32, 992, [28:28] -unusedBit_23_29 = bits, U32, 992, [29:29] -unusedBit_23_30 = bits, U32, 992, [30:30] -unusedBit_23_31 = bits, U32, 992, [31:31] +unusedBit_22_3 = bits, U32, 992, [3:3] +unusedBit_22_4 = bits, U32, 992, [4:4] +unusedBit_22_5 = bits, U32, 992, [5:5] +unusedBit_22_6 = bits, U32, 992, [6:6] +unusedBit_22_7 = bits, U32, 992, [7:7] +unusedBit_22_8 = bits, U32, 992, [8:8] +unusedBit_22_9 = bits, U32, 992, [9:9] +unusedBit_22_10 = bits, U32, 992, [10:10] +unusedBit_22_11 = bits, U32, 992, [11:11] +unusedBit_22_12 = bits, U32, 992, [12:12] +unusedBit_22_13 = bits, U32, 992, [13:13] +unusedBit_22_14 = bits, U32, 992, [14:14] +unusedBit_22_15 = bits, U32, 992, [15:15] +unusedBit_22_16 = bits, U32, 992, [16:16] +unusedBit_22_17 = bits, U32, 992, [17:17] +unusedBit_22_18 = bits, U32, 992, [18:18] +unusedBit_22_19 = bits, U32, 992, [19:19] +unusedBit_22_20 = bits, U32, 992, [20:20] +unusedBit_22_21 = bits, U32, 992, [21:21] +unusedBit_22_22 = bits, U32, 992, [22:22] +unusedBit_22_23 = bits, U32, 992, [23:23] +unusedBit_22_24 = bits, U32, 992, [24:24] +unusedBit_22_25 = bits, U32, 992, [25:25] +unusedBit_22_26 = bits, U32, 992, [26:26] +unusedBit_22_27 = bits, U32, 992, [27:27] +unusedBit_22_28 = bits, U32, 992, [28:28] +unusedBit_22_29 = bits, U32, 992, [29:29] +unusedBit_22_30 = bits, U32, 992, [30:30] +unusedBit_22_31 = bits, U32, 992, [31:31] egt1 = scalar, F32, 996, "", 1, 0 egt2 = scalar, F32, 1000, "", 1, 0 desiredRpmLimit = scalar, S16, 1004, "rpm", 1, 0 @@ -3089,70 +3089,103 @@ vvtCounter = scalar, U08, 1117, "", 1, 0 camResyncCounter = scalar, U08, 1118, "", 1, 0 vvtStateIndex = scalar, U08, 1119, "", 1, 0 ; total TS size = 1120 -wallFuelCorrection = scalar, F32, 1120, "", 1, 0 -wallFuel = scalar, F32, 1124, "", 1, 0 -; total TS size = 1128 -idleState = bits, S32, 1128, [0:2], "not important" -currentIdlePosition = scalar, F32, 1132 -baseIdlePosition = scalar, F32, 1136 -iacByTpsTaper = scalar, F32, 1140 -throttlePedalUpState = scalar, S32, 1144, "", 1, 0 -mightResetPid = bits, U32, 1148, [0:0] -shouldResetPid = bits, U32, 1148, [1:1] -wasResetPid = bits, U32, 1148, [2:2] -mustResetPid = bits, U32, 1148, [3:3] -isCoasting = bits, U32, 1148, [4:4] -useIacTableForCoasting = bits, U32, 1148, [5:5] -notIdling = bits, U32, 1148, [6:6] -needReset = bits, U32, 1148, [7:7] -isInDeadZone = bits, U32, 1148, [8:8] -isBlipping = bits, U32, 1148, [9:9] -useClosedLoop = bits, U32, 1148, [10:10] -badTps = bits, U32, 1148, [11:11] -looksLikeRunning = bits, U32, 1148, [12:12] -looksLikeCoasting = bits, U32, 1148, [13:13] -looksLikeCrankToIdle = bits, U32, 1148, [14:14] -useInstantRpmForIdle = bits, U32, 1148, [15:15] -isVerboseIAC = bits, U32, 1148, [16:16] -unusedBit_22_17 = bits, U32, 1148, [17:17] -unusedBit_22_18 = bits, U32, 1148, [18:18] -unusedBit_22_19 = bits, U32, 1148, [19:19] -unusedBit_22_20 = bits, U32, 1148, [20:20] -unusedBit_22_21 = bits, U32, 1148, [21:21] -unusedBit_22_22 = bits, U32, 1148, [22:22] -unusedBit_22_23 = bits, U32, 1148, [23:23] -unusedBit_22_24 = bits, U32, 1148, [24:24] -unusedBit_22_25 = bits, U32, 1148, [25:25] -unusedBit_22_26 = bits, U32, 1148, [26:26] -unusedBit_22_27 = bits, U32, 1148, [27:27] -unusedBit_22_28 = bits, U32, 1148, [28:28] -unusedBit_22_29 = bits, U32, 1148, [29:29] -unusedBit_22_30 = bits, U32, 1148, [30:30] -unusedBit_22_31 = bits, U32, 1148, [31:31] -targetRpmByClt = scalar, S32, 1152, "", 1, 0 -targetRpmAcBump = scalar, S32, 1156, "", 1, 0 -iacByRpmTaper = scalar, F32, 1160 -luaAdd = scalar, F32, 1164 -; total TS size = 1168 -baseDwell = scalar, F32, 1168, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 1172, "", 1, 0 -luaTimingAdd = scalar, F32, 1176, "", 1, 0 -luaTimingMult = scalar, F32, 1180, "", 1, 0 -; total TS size = 1184 -idlePosition = scalar, F32, 1184, "", 1, 0 -trim = scalar, F32, 1188, "", 1, 0 -luaAdjustment = scalar, F32, 1192, "", 1, 0 -etbFeedForward = scalar, F32, 1196 -etbIntegralError = scalar, F32, 1200, "", 1, 0 -etbCurrentTarget = scalar, F32, 1204, "%", 1, 0 -; total TS size = 1208 -faultCode = scalar, U08, 1208, "", 1, 0 -heaterDuty = scalar, U08, 1209, "%", 1, 0 -pumpDuty = scalar, U08, 1210, "%", 1, 0 -tempC = scalar, U16, 1212, "C", 1, 0 -nernstVoltage = scalar, U16, 1214, "V", 0.001, 0 -esr = scalar, U16, 1216, "", 1, 0 -; total TS size = 1220 +m_hasSynchronizedPhase = bits, U32, 1120, [0:0] +unusedBit_1_1 = bits, U32, 1120, [1:1] +unusedBit_1_2 = bits, U32, 1120, [2:2] +unusedBit_1_3 = bits, U32, 1120, [3:3] +unusedBit_1_4 = bits, U32, 1120, [4:4] +unusedBit_1_5 = bits, U32, 1120, [5:5] +unusedBit_1_6 = bits, U32, 1120, [6:6] +unusedBit_1_7 = bits, U32, 1120, [7:7] +unusedBit_1_8 = bits, U32, 1120, [8:8] +unusedBit_1_9 = bits, U32, 1120, [9:9] +unusedBit_1_10 = bits, U32, 1120, [10:10] +unusedBit_1_11 = bits, U32, 1120, [11:11] +unusedBit_1_12 = bits, U32, 1120, [12:12] +unusedBit_1_13 = bits, U32, 1120, [13:13] +unusedBit_1_14 = bits, U32, 1120, [14:14] +unusedBit_1_15 = bits, U32, 1120, [15:15] +unusedBit_1_16 = bits, U32, 1120, [16:16] +unusedBit_1_17 = bits, U32, 1120, [17:17] +unusedBit_1_18 = bits, U32, 1120, [18:18] +unusedBit_1_19 = bits, U32, 1120, [19:19] +unusedBit_1_20 = bits, U32, 1120, [20:20] +unusedBit_1_21 = bits, U32, 1120, [21:21] +unusedBit_1_22 = bits, U32, 1120, [22:22] +unusedBit_1_23 = bits, U32, 1120, [23:23] +unusedBit_1_24 = bits, U32, 1120, [24:24] +unusedBit_1_25 = bits, U32, 1120, [25:25] +unusedBit_1_26 = bits, U32, 1120, [26:26] +unusedBit_1_27 = bits, U32, 1120, [27:27] +unusedBit_1_28 = bits, U32, 1120, [28:28] +unusedBit_1_29 = bits, U32, 1120, [29:29] +unusedBit_1_30 = bits, U32, 1120, [30:30] +unusedBit_1_31 = bits, U32, 1120, [31:31] +; total TS size = 1124 +wallFuelCorrection = scalar, F32, 1124, "", 1, 0 +wallFuel = scalar, F32, 1128, "", 1, 0 +; total TS size = 1132 +idleState = bits, S32, 1132, [0:2], "not important" +currentIdlePosition = scalar, F32, 1136 +baseIdlePosition = scalar, F32, 1140 +iacByTpsTaper = scalar, F32, 1144 +throttlePedalUpState = scalar, S32, 1148, "", 1, 0 +mightResetPid = bits, U32, 1152, [0:0] +shouldResetPid = bits, U32, 1152, [1:1] +wasResetPid = bits, U32, 1152, [2:2] +mustResetPid = bits, U32, 1152, [3:3] +isCoasting = bits, U32, 1152, [4:4] +useIacTableForCoasting = bits, U32, 1152, [5:5] +notIdling = bits, U32, 1152, [6:6] +needReset = bits, U32, 1152, [7:7] +isInDeadZone = bits, U32, 1152, [8:8] +isBlipping = bits, U32, 1152, [9:9] +useClosedLoop = bits, U32, 1152, [10:10] +badTps = bits, U32, 1152, [11:11] +looksLikeRunning = bits, U32, 1152, [12:12] +looksLikeCoasting = bits, U32, 1152, [13:13] +looksLikeCrankToIdle = bits, U32, 1152, [14:14] +useInstantRpmForIdle = bits, U32, 1152, [15:15] +isVerboseIAC = bits, U32, 1152, [16:16] +unusedBit_22_17 = bits, U32, 1152, [17:17] +unusedBit_22_18 = bits, U32, 1152, [18:18] +unusedBit_22_19 = bits, U32, 1152, [19:19] +unusedBit_22_20 = bits, U32, 1152, [20:20] +unusedBit_22_21 = bits, U32, 1152, [21:21] +unusedBit_22_22 = bits, U32, 1152, [22:22] +unusedBit_22_23 = bits, U32, 1152, [23:23] +unusedBit_22_24 = bits, U32, 1152, [24:24] +unusedBit_22_25 = bits, U32, 1152, [25:25] +unusedBit_22_26 = bits, U32, 1152, [26:26] +unusedBit_22_27 = bits, U32, 1152, [27:27] +unusedBit_22_28 = bits, U32, 1152, [28:28] +unusedBit_22_29 = bits, U32, 1152, [29:29] +unusedBit_22_30 = bits, U32, 1152, [30:30] +unusedBit_22_31 = bits, U32, 1152, [31:31] +targetRpmByClt = scalar, S32, 1156, "", 1, 0 +targetRpmAcBump = scalar, S32, 1160, "", 1, 0 +iacByRpmTaper = scalar, F32, 1164 +luaAdd = scalar, F32, 1168 +; total TS size = 1172 +baseDwell = scalar, F32, 1172, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 1176, "", 1, 0 +luaTimingAdd = scalar, F32, 1180, "", 1, 0 +luaTimingMult = scalar, F32, 1184, "", 1, 0 +; total TS size = 1188 +idlePosition = scalar, F32, 1188, "", 1, 0 +trim = scalar, F32, 1192, "", 1, 0 +luaAdjustment = scalar, F32, 1196, "", 1, 0 +etbFeedForward = scalar, F32, 1200 +etbIntegralError = scalar, F32, 1204, "", 1, 0 +etbCurrentTarget = scalar, F32, 1208, "%", 1, 0 +; total TS size = 1212 +faultCode = scalar, U08, 1212, "", 1, 0 +heaterDuty = scalar, U08, 1213, "%", 1, 0 +pumpDuty = scalar, U08, 1214, "%", 1, 0 +tempC = scalar, U16, 1216, "C", 1, 0 +nernstVoltage = scalar, U16, 1218, "V", 0.001, 0 +esr = scalar, U16, 1220, "", 1, 0 +; total TS size = 1224 time = { timeNow } @@ -4721,7 +4754,6 @@ entry = hellenBoardId, "Detected Board ID", int, "%d" entry = clutchUpState, "clutch: up", int, "%d" entry = clutchDownState, "clutch: down", int, "%d" entry = brakePedalState, "brake: down", int, "%d" -entry = isSynchronizedPhase, "isSynchronizedPhase", int, "%d" entry = egt1, "egt1", float, "%.3f" entry = egt2, "egt2", float, "%.3f" entry = desiredRpmLimit, "User-defined RPM hard limit", int, "%d" @@ -4762,6 +4794,7 @@ entry = triggerStateIndex, "triggerStateIndex", int, "%d" entry = vvtCounter, "vvtCounter", int, "%d" entry = camResyncCounter, "camResyncCounter", int, "%d" entry = vvtStateIndex, "vvtStateIndex", int, "%d" +entry = m_hasSynchronizedPhase, "m_hasSynchronizedPhase", int, "%d" entry = wallFuelCorrection, "fuel injection time correction to account for wall wetting effect for current cycle", float, "%.3f" entry = wallFuel, "Amount of fuel on the wall, in ms of injector open time for each injector.", float, "%.3f" entry = idleState, "idleState", int, "%d" @@ -4966,6 +4999,7 @@ menuDialog = main subMenu = tps_accel_stateDialog, "tps_accel_state" subMenu = trigger_centralDialog, "trigger_central" subMenu = trigger_stateDialog, "trigger_state" + subMenu = trigger_state_primaryDialog, "trigger_state_primary" subMenu = wall_fuel_stateDialog, "wall_fuel_state" subMenu = idle_stateDialog, "idle_state" subMenu = ignition_stateDialog, "ignition_state" @@ -5415,7 +5449,6 @@ indicatorPanel = engine_stateIndicatorPanel, 2 indicator = {clutchUpState}, "clutchUpState No", "clutchUpState Yes" indicator = {clutchDownState}, "clutchDownState No", "clutchDownState Yes" indicator = {brakePedalState}, "brakePedalState No", "brakePedalState Yes" - indicator = {isSynchronizedPhase}, "isSynchronizedPhase No", "isSynchronizedPhase Yes" dialog = engine_stateDialog, "engine_state" panel = engine_stateIndicatorPanel @@ -5524,6 +5557,12 @@ dialog = trigger_stateDialog, "trigger_state" liveGraph = trigger_state_3_Graph, "Graph", South graphLine = vvtStateIndex +indicatorPanel = trigger_state_primaryIndicatorPanel, 2 + indicator = {m_hasSynchronizedPhase}, "m_hasSynchronizedPhase No", "m_hasSynchronizedPhase Yes" + +dialog = trigger_state_primaryDialog, "trigger_state_primary" + panel = trigger_state_primaryIndicatorPanel + dialog = wall_fuel_stateDialog, "wall_fuel_state" liveGraph = wall_fuel_state_1_Graph, "Graph", South diff --git a/firmware/tunerstudio/generated/rusefi_cypress.ini b/firmware/tunerstudio/generated/rusefi_cypress.ini index b242ec1ceb..9ac2c3aa6d 100644 --- a/firmware/tunerstudio/generated/rusefi_cypress.ini +++ b/firmware/tunerstudio/generated/rusefi_cypress.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.08.24.cypress.1969688327" + signature = "rusEFI 2022.08.24.cypress.1913309982" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.08.24.cypress.1969688327" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.08.24.cypress.1913309982" ; 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 Wed Aug 24 16:15:10 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Wed Aug 24 22:14:49 UTC 2022 pageSize = 21300 page = 1 @@ -2109,7 +2109,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1220 + ochBlockSize = 1224 ; ; see TunerStudioOutputChannels struct @@ -2990,35 +2990,35 @@ hellenBoardId = scalar, S16, 990, "id", 1, 0 clutchUpState = bits, U32, 992, [0:0] clutchDownState = bits, U32, 992, [1:1] brakePedalState = bits, U32, 992, [2:2] -isSynchronizedPhase = bits, U32, 992, [3:3] -unusedBit_23_4 = bits, U32, 992, [4:4] -unusedBit_23_5 = bits, U32, 992, [5:5] -unusedBit_23_6 = bits, U32, 992, [6:6] -unusedBit_23_7 = bits, U32, 992, [7:7] -unusedBit_23_8 = bits, U32, 992, [8:8] -unusedBit_23_9 = bits, U32, 992, [9:9] -unusedBit_23_10 = bits, U32, 992, [10:10] -unusedBit_23_11 = bits, U32, 992, [11:11] -unusedBit_23_12 = bits, U32, 992, [12:12] -unusedBit_23_13 = bits, U32, 992, [13:13] -unusedBit_23_14 = bits, U32, 992, [14:14] -unusedBit_23_15 = bits, U32, 992, [15:15] -unusedBit_23_16 = bits, U32, 992, [16:16] -unusedBit_23_17 = bits, U32, 992, [17:17] -unusedBit_23_18 = bits, U32, 992, [18:18] -unusedBit_23_19 = bits, U32, 992, [19:19] -unusedBit_23_20 = bits, U32, 992, [20:20] -unusedBit_23_21 = bits, U32, 992, [21:21] -unusedBit_23_22 = bits, U32, 992, [22:22] -unusedBit_23_23 = bits, U32, 992, [23:23] -unusedBit_23_24 = bits, U32, 992, [24:24] -unusedBit_23_25 = bits, U32, 992, [25:25] -unusedBit_23_26 = bits, U32, 992, [26:26] -unusedBit_23_27 = bits, U32, 992, [27:27] -unusedBit_23_28 = bits, U32, 992, [28:28] -unusedBit_23_29 = bits, U32, 992, [29:29] -unusedBit_23_30 = bits, U32, 992, [30:30] -unusedBit_23_31 = bits, U32, 992, [31:31] +unusedBit_22_3 = bits, U32, 992, [3:3] +unusedBit_22_4 = bits, U32, 992, [4:4] +unusedBit_22_5 = bits, U32, 992, [5:5] +unusedBit_22_6 = bits, U32, 992, [6:6] +unusedBit_22_7 = bits, U32, 992, [7:7] +unusedBit_22_8 = bits, U32, 992, [8:8] +unusedBit_22_9 = bits, U32, 992, [9:9] +unusedBit_22_10 = bits, U32, 992, [10:10] +unusedBit_22_11 = bits, U32, 992, [11:11] +unusedBit_22_12 = bits, U32, 992, [12:12] +unusedBit_22_13 = bits, U32, 992, [13:13] +unusedBit_22_14 = bits, U32, 992, [14:14] +unusedBit_22_15 = bits, U32, 992, [15:15] +unusedBit_22_16 = bits, U32, 992, [16:16] +unusedBit_22_17 = bits, U32, 992, [17:17] +unusedBit_22_18 = bits, U32, 992, [18:18] +unusedBit_22_19 = bits, U32, 992, [19:19] +unusedBit_22_20 = bits, U32, 992, [20:20] +unusedBit_22_21 = bits, U32, 992, [21:21] +unusedBit_22_22 = bits, U32, 992, [22:22] +unusedBit_22_23 = bits, U32, 992, [23:23] +unusedBit_22_24 = bits, U32, 992, [24:24] +unusedBit_22_25 = bits, U32, 992, [25:25] +unusedBit_22_26 = bits, U32, 992, [26:26] +unusedBit_22_27 = bits, U32, 992, [27:27] +unusedBit_22_28 = bits, U32, 992, [28:28] +unusedBit_22_29 = bits, U32, 992, [29:29] +unusedBit_22_30 = bits, U32, 992, [30:30] +unusedBit_22_31 = bits, U32, 992, [31:31] egt1 = scalar, F32, 996, "", 1, 0 egt2 = scalar, F32, 1000, "", 1, 0 desiredRpmLimit = scalar, S16, 1004, "rpm", 1, 0 @@ -3089,70 +3089,103 @@ vvtCounter = scalar, U08, 1117, "", 1, 0 camResyncCounter = scalar, U08, 1118, "", 1, 0 vvtStateIndex = scalar, U08, 1119, "", 1, 0 ; total TS size = 1120 -wallFuelCorrection = scalar, F32, 1120, "", 1, 0 -wallFuel = scalar, F32, 1124, "", 1, 0 -; total TS size = 1128 -idleState = bits, S32, 1128, [0:2], "not important" -currentIdlePosition = scalar, F32, 1132 -baseIdlePosition = scalar, F32, 1136 -iacByTpsTaper = scalar, F32, 1140 -throttlePedalUpState = scalar, S32, 1144, "", 1, 0 -mightResetPid = bits, U32, 1148, [0:0] -shouldResetPid = bits, U32, 1148, [1:1] -wasResetPid = bits, U32, 1148, [2:2] -mustResetPid = bits, U32, 1148, [3:3] -isCoasting = bits, U32, 1148, [4:4] -useIacTableForCoasting = bits, U32, 1148, [5:5] -notIdling = bits, U32, 1148, [6:6] -needReset = bits, U32, 1148, [7:7] -isInDeadZone = bits, U32, 1148, [8:8] -isBlipping = bits, U32, 1148, [9:9] -useClosedLoop = bits, U32, 1148, [10:10] -badTps = bits, U32, 1148, [11:11] -looksLikeRunning = bits, U32, 1148, [12:12] -looksLikeCoasting = bits, U32, 1148, [13:13] -looksLikeCrankToIdle = bits, U32, 1148, [14:14] -useInstantRpmForIdle = bits, U32, 1148, [15:15] -isVerboseIAC = bits, U32, 1148, [16:16] -unusedBit_22_17 = bits, U32, 1148, [17:17] -unusedBit_22_18 = bits, U32, 1148, [18:18] -unusedBit_22_19 = bits, U32, 1148, [19:19] -unusedBit_22_20 = bits, U32, 1148, [20:20] -unusedBit_22_21 = bits, U32, 1148, [21:21] -unusedBit_22_22 = bits, U32, 1148, [22:22] -unusedBit_22_23 = bits, U32, 1148, [23:23] -unusedBit_22_24 = bits, U32, 1148, [24:24] -unusedBit_22_25 = bits, U32, 1148, [25:25] -unusedBit_22_26 = bits, U32, 1148, [26:26] -unusedBit_22_27 = bits, U32, 1148, [27:27] -unusedBit_22_28 = bits, U32, 1148, [28:28] -unusedBit_22_29 = bits, U32, 1148, [29:29] -unusedBit_22_30 = bits, U32, 1148, [30:30] -unusedBit_22_31 = bits, U32, 1148, [31:31] -targetRpmByClt = scalar, S32, 1152, "", 1, 0 -targetRpmAcBump = scalar, S32, 1156, "", 1, 0 -iacByRpmTaper = scalar, F32, 1160 -luaAdd = scalar, F32, 1164 -; total TS size = 1168 -baseDwell = scalar, F32, 1168, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 1172, "", 1, 0 -luaTimingAdd = scalar, F32, 1176, "", 1, 0 -luaTimingMult = scalar, F32, 1180, "", 1, 0 -; total TS size = 1184 -idlePosition = scalar, F32, 1184, "", 1, 0 -trim = scalar, F32, 1188, "", 1, 0 -luaAdjustment = scalar, F32, 1192, "", 1, 0 -etbFeedForward = scalar, F32, 1196 -etbIntegralError = scalar, F32, 1200, "", 1, 0 -etbCurrentTarget = scalar, F32, 1204, "%", 1, 0 -; total TS size = 1208 -faultCode = scalar, U08, 1208, "", 1, 0 -heaterDuty = scalar, U08, 1209, "%", 1, 0 -pumpDuty = scalar, U08, 1210, "%", 1, 0 -tempC = scalar, U16, 1212, "C", 1, 0 -nernstVoltage = scalar, U16, 1214, "V", 0.001, 0 -esr = scalar, U16, 1216, "", 1, 0 -; total TS size = 1220 +m_hasSynchronizedPhase = bits, U32, 1120, [0:0] +unusedBit_1_1 = bits, U32, 1120, [1:1] +unusedBit_1_2 = bits, U32, 1120, [2:2] +unusedBit_1_3 = bits, U32, 1120, [3:3] +unusedBit_1_4 = bits, U32, 1120, [4:4] +unusedBit_1_5 = bits, U32, 1120, [5:5] +unusedBit_1_6 = bits, U32, 1120, [6:6] +unusedBit_1_7 = bits, U32, 1120, [7:7] +unusedBit_1_8 = bits, U32, 1120, [8:8] +unusedBit_1_9 = bits, U32, 1120, [9:9] +unusedBit_1_10 = bits, U32, 1120, [10:10] +unusedBit_1_11 = bits, U32, 1120, [11:11] +unusedBit_1_12 = bits, U32, 1120, [12:12] +unusedBit_1_13 = bits, U32, 1120, [13:13] +unusedBit_1_14 = bits, U32, 1120, [14:14] +unusedBit_1_15 = bits, U32, 1120, [15:15] +unusedBit_1_16 = bits, U32, 1120, [16:16] +unusedBit_1_17 = bits, U32, 1120, [17:17] +unusedBit_1_18 = bits, U32, 1120, [18:18] +unusedBit_1_19 = bits, U32, 1120, [19:19] +unusedBit_1_20 = bits, U32, 1120, [20:20] +unusedBit_1_21 = bits, U32, 1120, [21:21] +unusedBit_1_22 = bits, U32, 1120, [22:22] +unusedBit_1_23 = bits, U32, 1120, [23:23] +unusedBit_1_24 = bits, U32, 1120, [24:24] +unusedBit_1_25 = bits, U32, 1120, [25:25] +unusedBit_1_26 = bits, U32, 1120, [26:26] +unusedBit_1_27 = bits, U32, 1120, [27:27] +unusedBit_1_28 = bits, U32, 1120, [28:28] +unusedBit_1_29 = bits, U32, 1120, [29:29] +unusedBit_1_30 = bits, U32, 1120, [30:30] +unusedBit_1_31 = bits, U32, 1120, [31:31] +; total TS size = 1124 +wallFuelCorrection = scalar, F32, 1124, "", 1, 0 +wallFuel = scalar, F32, 1128, "", 1, 0 +; total TS size = 1132 +idleState = bits, S32, 1132, [0:2], "not important" +currentIdlePosition = scalar, F32, 1136 +baseIdlePosition = scalar, F32, 1140 +iacByTpsTaper = scalar, F32, 1144 +throttlePedalUpState = scalar, S32, 1148, "", 1, 0 +mightResetPid = bits, U32, 1152, [0:0] +shouldResetPid = bits, U32, 1152, [1:1] +wasResetPid = bits, U32, 1152, [2:2] +mustResetPid = bits, U32, 1152, [3:3] +isCoasting = bits, U32, 1152, [4:4] +useIacTableForCoasting = bits, U32, 1152, [5:5] +notIdling = bits, U32, 1152, [6:6] +needReset = bits, U32, 1152, [7:7] +isInDeadZone = bits, U32, 1152, [8:8] +isBlipping = bits, U32, 1152, [9:9] +useClosedLoop = bits, U32, 1152, [10:10] +badTps = bits, U32, 1152, [11:11] +looksLikeRunning = bits, U32, 1152, [12:12] +looksLikeCoasting = bits, U32, 1152, [13:13] +looksLikeCrankToIdle = bits, U32, 1152, [14:14] +useInstantRpmForIdle = bits, U32, 1152, [15:15] +isVerboseIAC = bits, U32, 1152, [16:16] +unusedBit_22_17 = bits, U32, 1152, [17:17] +unusedBit_22_18 = bits, U32, 1152, [18:18] +unusedBit_22_19 = bits, U32, 1152, [19:19] +unusedBit_22_20 = bits, U32, 1152, [20:20] +unusedBit_22_21 = bits, U32, 1152, [21:21] +unusedBit_22_22 = bits, U32, 1152, [22:22] +unusedBit_22_23 = bits, U32, 1152, [23:23] +unusedBit_22_24 = bits, U32, 1152, [24:24] +unusedBit_22_25 = bits, U32, 1152, [25:25] +unusedBit_22_26 = bits, U32, 1152, [26:26] +unusedBit_22_27 = bits, U32, 1152, [27:27] +unusedBit_22_28 = bits, U32, 1152, [28:28] +unusedBit_22_29 = bits, U32, 1152, [29:29] +unusedBit_22_30 = bits, U32, 1152, [30:30] +unusedBit_22_31 = bits, U32, 1152, [31:31] +targetRpmByClt = scalar, S32, 1156, "", 1, 0 +targetRpmAcBump = scalar, S32, 1160, "", 1, 0 +iacByRpmTaper = scalar, F32, 1164 +luaAdd = scalar, F32, 1168 +; total TS size = 1172 +baseDwell = scalar, F32, 1172, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 1176, "", 1, 0 +luaTimingAdd = scalar, F32, 1180, "", 1, 0 +luaTimingMult = scalar, F32, 1184, "", 1, 0 +; total TS size = 1188 +idlePosition = scalar, F32, 1188, "", 1, 0 +trim = scalar, F32, 1192, "", 1, 0 +luaAdjustment = scalar, F32, 1196, "", 1, 0 +etbFeedForward = scalar, F32, 1200 +etbIntegralError = scalar, F32, 1204, "", 1, 0 +etbCurrentTarget = scalar, F32, 1208, "%", 1, 0 +; total TS size = 1212 +faultCode = scalar, U08, 1212, "", 1, 0 +heaterDuty = scalar, U08, 1213, "%", 1, 0 +pumpDuty = scalar, U08, 1214, "%", 1, 0 +tempC = scalar, U16, 1216, "C", 1, 0 +nernstVoltage = scalar, U16, 1218, "V", 0.001, 0 +esr = scalar, U16, 1220, "", 1, 0 +; total TS size = 1224 time = { timeNow } @@ -4721,7 +4754,6 @@ entry = hellenBoardId, "Detected Board ID", int, "%d" entry = clutchUpState, "clutch: up", int, "%d" entry = clutchDownState, "clutch: down", int, "%d" entry = brakePedalState, "brake: down", int, "%d" -entry = isSynchronizedPhase, "isSynchronizedPhase", int, "%d" entry = egt1, "egt1", float, "%.3f" entry = egt2, "egt2", float, "%.3f" entry = desiredRpmLimit, "User-defined RPM hard limit", int, "%d" @@ -4762,6 +4794,7 @@ entry = triggerStateIndex, "triggerStateIndex", int, "%d" entry = vvtCounter, "vvtCounter", int, "%d" entry = camResyncCounter, "camResyncCounter", int, "%d" entry = vvtStateIndex, "vvtStateIndex", int, "%d" +entry = m_hasSynchronizedPhase, "m_hasSynchronizedPhase", int, "%d" entry = wallFuelCorrection, "fuel injection time correction to account for wall wetting effect for current cycle", float, "%.3f" entry = wallFuel, "Amount of fuel on the wall, in ms of injector open time for each injector.", float, "%.3f" entry = idleState, "idleState", int, "%d" @@ -4966,6 +4999,7 @@ menuDialog = main subMenu = tps_accel_stateDialog, "tps_accel_state" subMenu = trigger_centralDialog, "trigger_central" subMenu = trigger_stateDialog, "trigger_state" + subMenu = trigger_state_primaryDialog, "trigger_state_primary" subMenu = wall_fuel_stateDialog, "wall_fuel_state" subMenu = idle_stateDialog, "idle_state" subMenu = ignition_stateDialog, "ignition_state" @@ -5418,7 +5452,6 @@ indicatorPanel = engine_stateIndicatorPanel, 2 indicator = {clutchUpState}, "clutchUpState No", "clutchUpState Yes" indicator = {clutchDownState}, "clutchDownState No", "clutchDownState Yes" indicator = {brakePedalState}, "brakePedalState No", "brakePedalState Yes" - indicator = {isSynchronizedPhase}, "isSynchronizedPhase No", "isSynchronizedPhase Yes" dialog = engine_stateDialog, "engine_state" panel = engine_stateIndicatorPanel @@ -5527,6 +5560,12 @@ dialog = trigger_stateDialog, "trigger_state" liveGraph = trigger_state_3_Graph, "Graph", South graphLine = vvtStateIndex +indicatorPanel = trigger_state_primaryIndicatorPanel, 2 + indicator = {m_hasSynchronizedPhase}, "m_hasSynchronizedPhase No", "m_hasSynchronizedPhase Yes" + +dialog = trigger_state_primaryDialog, "trigger_state_primary" + panel = trigger_state_primaryIndicatorPanel + dialog = wall_fuel_stateDialog, "wall_fuel_state" liveGraph = wall_fuel_state_1_Graph, "Graph", South diff --git a/firmware/tunerstudio/generated/rusefi_f407-discovery.ini b/firmware/tunerstudio/generated/rusefi_f407-discovery.ini index d392d3369f..bc6887158b 100644 --- a/firmware/tunerstudio/generated/rusefi_f407-discovery.ini +++ b/firmware/tunerstudio/generated/rusefi_f407-discovery.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.08.24.f407-discovery.1969688327" + signature = "rusEFI 2022.08.24.f407-discovery.1913309982" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.08.24.f407-discovery.1969688327" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.08.24.f407-discovery.1913309982" ; 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 Wed Aug 24 16:15:54 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Aug 24 22:15:31 UTC 2022 pageSize = 21300 page = 1 @@ -2109,7 +2109,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1220 + ochBlockSize = 1224 ; ; see TunerStudioOutputChannels struct @@ -2990,35 +2990,35 @@ hellenBoardId = scalar, S16, 990, "id", 1, 0 clutchUpState = bits, U32, 992, [0:0] clutchDownState = bits, U32, 992, [1:1] brakePedalState = bits, U32, 992, [2:2] -isSynchronizedPhase = bits, U32, 992, [3:3] -unusedBit_23_4 = bits, U32, 992, [4:4] -unusedBit_23_5 = bits, U32, 992, [5:5] -unusedBit_23_6 = bits, U32, 992, [6:6] -unusedBit_23_7 = bits, U32, 992, [7:7] -unusedBit_23_8 = bits, U32, 992, [8:8] -unusedBit_23_9 = bits, U32, 992, [9:9] -unusedBit_23_10 = bits, U32, 992, [10:10] -unusedBit_23_11 = bits, U32, 992, [11:11] -unusedBit_23_12 = bits, U32, 992, [12:12] -unusedBit_23_13 = bits, U32, 992, [13:13] -unusedBit_23_14 = bits, U32, 992, [14:14] -unusedBit_23_15 = bits, U32, 992, [15:15] -unusedBit_23_16 = bits, U32, 992, [16:16] -unusedBit_23_17 = bits, U32, 992, [17:17] -unusedBit_23_18 = bits, U32, 992, [18:18] -unusedBit_23_19 = bits, U32, 992, [19:19] -unusedBit_23_20 = bits, U32, 992, [20:20] -unusedBit_23_21 = bits, U32, 992, [21:21] -unusedBit_23_22 = bits, U32, 992, [22:22] -unusedBit_23_23 = bits, U32, 992, [23:23] -unusedBit_23_24 = bits, U32, 992, [24:24] -unusedBit_23_25 = bits, U32, 992, [25:25] -unusedBit_23_26 = bits, U32, 992, [26:26] -unusedBit_23_27 = bits, U32, 992, [27:27] -unusedBit_23_28 = bits, U32, 992, [28:28] -unusedBit_23_29 = bits, U32, 992, [29:29] -unusedBit_23_30 = bits, U32, 992, [30:30] -unusedBit_23_31 = bits, U32, 992, [31:31] +unusedBit_22_3 = bits, U32, 992, [3:3] +unusedBit_22_4 = bits, U32, 992, [4:4] +unusedBit_22_5 = bits, U32, 992, [5:5] +unusedBit_22_6 = bits, U32, 992, [6:6] +unusedBit_22_7 = bits, U32, 992, [7:7] +unusedBit_22_8 = bits, U32, 992, [8:8] +unusedBit_22_9 = bits, U32, 992, [9:9] +unusedBit_22_10 = bits, U32, 992, [10:10] +unusedBit_22_11 = bits, U32, 992, [11:11] +unusedBit_22_12 = bits, U32, 992, [12:12] +unusedBit_22_13 = bits, U32, 992, [13:13] +unusedBit_22_14 = bits, U32, 992, [14:14] +unusedBit_22_15 = bits, U32, 992, [15:15] +unusedBit_22_16 = bits, U32, 992, [16:16] +unusedBit_22_17 = bits, U32, 992, [17:17] +unusedBit_22_18 = bits, U32, 992, [18:18] +unusedBit_22_19 = bits, U32, 992, [19:19] +unusedBit_22_20 = bits, U32, 992, [20:20] +unusedBit_22_21 = bits, U32, 992, [21:21] +unusedBit_22_22 = bits, U32, 992, [22:22] +unusedBit_22_23 = bits, U32, 992, [23:23] +unusedBit_22_24 = bits, U32, 992, [24:24] +unusedBit_22_25 = bits, U32, 992, [25:25] +unusedBit_22_26 = bits, U32, 992, [26:26] +unusedBit_22_27 = bits, U32, 992, [27:27] +unusedBit_22_28 = bits, U32, 992, [28:28] +unusedBit_22_29 = bits, U32, 992, [29:29] +unusedBit_22_30 = bits, U32, 992, [30:30] +unusedBit_22_31 = bits, U32, 992, [31:31] egt1 = scalar, F32, 996, "", 1, 0 egt2 = scalar, F32, 1000, "", 1, 0 desiredRpmLimit = scalar, S16, 1004, "rpm", 1, 0 @@ -3089,70 +3089,103 @@ vvtCounter = scalar, U08, 1117, "", 1, 0 camResyncCounter = scalar, U08, 1118, "", 1, 0 vvtStateIndex = scalar, U08, 1119, "", 1, 0 ; total TS size = 1120 -wallFuelCorrection = scalar, F32, 1120, "", 1, 0 -wallFuel = scalar, F32, 1124, "", 1, 0 -; total TS size = 1128 -idleState = bits, S32, 1128, [0:2], "not important" -currentIdlePosition = scalar, F32, 1132 -baseIdlePosition = scalar, F32, 1136 -iacByTpsTaper = scalar, F32, 1140 -throttlePedalUpState = scalar, S32, 1144, "", 1, 0 -mightResetPid = bits, U32, 1148, [0:0] -shouldResetPid = bits, U32, 1148, [1:1] -wasResetPid = bits, U32, 1148, [2:2] -mustResetPid = bits, U32, 1148, [3:3] -isCoasting = bits, U32, 1148, [4:4] -useIacTableForCoasting = bits, U32, 1148, [5:5] -notIdling = bits, U32, 1148, [6:6] -needReset = bits, U32, 1148, [7:7] -isInDeadZone = bits, U32, 1148, [8:8] -isBlipping = bits, U32, 1148, [9:9] -useClosedLoop = bits, U32, 1148, [10:10] -badTps = bits, U32, 1148, [11:11] -looksLikeRunning = bits, U32, 1148, [12:12] -looksLikeCoasting = bits, U32, 1148, [13:13] -looksLikeCrankToIdle = bits, U32, 1148, [14:14] -useInstantRpmForIdle = bits, U32, 1148, [15:15] -isVerboseIAC = bits, U32, 1148, [16:16] -unusedBit_22_17 = bits, U32, 1148, [17:17] -unusedBit_22_18 = bits, U32, 1148, [18:18] -unusedBit_22_19 = bits, U32, 1148, [19:19] -unusedBit_22_20 = bits, U32, 1148, [20:20] -unusedBit_22_21 = bits, U32, 1148, [21:21] -unusedBit_22_22 = bits, U32, 1148, [22:22] -unusedBit_22_23 = bits, U32, 1148, [23:23] -unusedBit_22_24 = bits, U32, 1148, [24:24] -unusedBit_22_25 = bits, U32, 1148, [25:25] -unusedBit_22_26 = bits, U32, 1148, [26:26] -unusedBit_22_27 = bits, U32, 1148, [27:27] -unusedBit_22_28 = bits, U32, 1148, [28:28] -unusedBit_22_29 = bits, U32, 1148, [29:29] -unusedBit_22_30 = bits, U32, 1148, [30:30] -unusedBit_22_31 = bits, U32, 1148, [31:31] -targetRpmByClt = scalar, S32, 1152, "", 1, 0 -targetRpmAcBump = scalar, S32, 1156, "", 1, 0 -iacByRpmTaper = scalar, F32, 1160 -luaAdd = scalar, F32, 1164 -; total TS size = 1168 -baseDwell = scalar, F32, 1168, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 1172, "", 1, 0 -luaTimingAdd = scalar, F32, 1176, "", 1, 0 -luaTimingMult = scalar, F32, 1180, "", 1, 0 -; total TS size = 1184 -idlePosition = scalar, F32, 1184, "", 1, 0 -trim = scalar, F32, 1188, "", 1, 0 -luaAdjustment = scalar, F32, 1192, "", 1, 0 -etbFeedForward = scalar, F32, 1196 -etbIntegralError = scalar, F32, 1200, "", 1, 0 -etbCurrentTarget = scalar, F32, 1204, "%", 1, 0 -; total TS size = 1208 -faultCode = scalar, U08, 1208, "", 1, 0 -heaterDuty = scalar, U08, 1209, "%", 1, 0 -pumpDuty = scalar, U08, 1210, "%", 1, 0 -tempC = scalar, U16, 1212, "C", 1, 0 -nernstVoltage = scalar, U16, 1214, "V", 0.001, 0 -esr = scalar, U16, 1216, "", 1, 0 -; total TS size = 1220 +m_hasSynchronizedPhase = bits, U32, 1120, [0:0] +unusedBit_1_1 = bits, U32, 1120, [1:1] +unusedBit_1_2 = bits, U32, 1120, [2:2] +unusedBit_1_3 = bits, U32, 1120, [3:3] +unusedBit_1_4 = bits, U32, 1120, [4:4] +unusedBit_1_5 = bits, U32, 1120, [5:5] +unusedBit_1_6 = bits, U32, 1120, [6:6] +unusedBit_1_7 = bits, U32, 1120, [7:7] +unusedBit_1_8 = bits, U32, 1120, [8:8] +unusedBit_1_9 = bits, U32, 1120, [9:9] +unusedBit_1_10 = bits, U32, 1120, [10:10] +unusedBit_1_11 = bits, U32, 1120, [11:11] +unusedBit_1_12 = bits, U32, 1120, [12:12] +unusedBit_1_13 = bits, U32, 1120, [13:13] +unusedBit_1_14 = bits, U32, 1120, [14:14] +unusedBit_1_15 = bits, U32, 1120, [15:15] +unusedBit_1_16 = bits, U32, 1120, [16:16] +unusedBit_1_17 = bits, U32, 1120, [17:17] +unusedBit_1_18 = bits, U32, 1120, [18:18] +unusedBit_1_19 = bits, U32, 1120, [19:19] +unusedBit_1_20 = bits, U32, 1120, [20:20] +unusedBit_1_21 = bits, U32, 1120, [21:21] +unusedBit_1_22 = bits, U32, 1120, [22:22] +unusedBit_1_23 = bits, U32, 1120, [23:23] +unusedBit_1_24 = bits, U32, 1120, [24:24] +unusedBit_1_25 = bits, U32, 1120, [25:25] +unusedBit_1_26 = bits, U32, 1120, [26:26] +unusedBit_1_27 = bits, U32, 1120, [27:27] +unusedBit_1_28 = bits, U32, 1120, [28:28] +unusedBit_1_29 = bits, U32, 1120, [29:29] +unusedBit_1_30 = bits, U32, 1120, [30:30] +unusedBit_1_31 = bits, U32, 1120, [31:31] +; total TS size = 1124 +wallFuelCorrection = scalar, F32, 1124, "", 1, 0 +wallFuel = scalar, F32, 1128, "", 1, 0 +; total TS size = 1132 +idleState = bits, S32, 1132, [0:2], "not important" +currentIdlePosition = scalar, F32, 1136 +baseIdlePosition = scalar, F32, 1140 +iacByTpsTaper = scalar, F32, 1144 +throttlePedalUpState = scalar, S32, 1148, "", 1, 0 +mightResetPid = bits, U32, 1152, [0:0] +shouldResetPid = bits, U32, 1152, [1:1] +wasResetPid = bits, U32, 1152, [2:2] +mustResetPid = bits, U32, 1152, [3:3] +isCoasting = bits, U32, 1152, [4:4] +useIacTableForCoasting = bits, U32, 1152, [5:5] +notIdling = bits, U32, 1152, [6:6] +needReset = bits, U32, 1152, [7:7] +isInDeadZone = bits, U32, 1152, [8:8] +isBlipping = bits, U32, 1152, [9:9] +useClosedLoop = bits, U32, 1152, [10:10] +badTps = bits, U32, 1152, [11:11] +looksLikeRunning = bits, U32, 1152, [12:12] +looksLikeCoasting = bits, U32, 1152, [13:13] +looksLikeCrankToIdle = bits, U32, 1152, [14:14] +useInstantRpmForIdle = bits, U32, 1152, [15:15] +isVerboseIAC = bits, U32, 1152, [16:16] +unusedBit_22_17 = bits, U32, 1152, [17:17] +unusedBit_22_18 = bits, U32, 1152, [18:18] +unusedBit_22_19 = bits, U32, 1152, [19:19] +unusedBit_22_20 = bits, U32, 1152, [20:20] +unusedBit_22_21 = bits, U32, 1152, [21:21] +unusedBit_22_22 = bits, U32, 1152, [22:22] +unusedBit_22_23 = bits, U32, 1152, [23:23] +unusedBit_22_24 = bits, U32, 1152, [24:24] +unusedBit_22_25 = bits, U32, 1152, [25:25] +unusedBit_22_26 = bits, U32, 1152, [26:26] +unusedBit_22_27 = bits, U32, 1152, [27:27] +unusedBit_22_28 = bits, U32, 1152, [28:28] +unusedBit_22_29 = bits, U32, 1152, [29:29] +unusedBit_22_30 = bits, U32, 1152, [30:30] +unusedBit_22_31 = bits, U32, 1152, [31:31] +targetRpmByClt = scalar, S32, 1156, "", 1, 0 +targetRpmAcBump = scalar, S32, 1160, "", 1, 0 +iacByRpmTaper = scalar, F32, 1164 +luaAdd = scalar, F32, 1168 +; total TS size = 1172 +baseDwell = scalar, F32, 1172, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 1176, "", 1, 0 +luaTimingAdd = scalar, F32, 1180, "", 1, 0 +luaTimingMult = scalar, F32, 1184, "", 1, 0 +; total TS size = 1188 +idlePosition = scalar, F32, 1188, "", 1, 0 +trim = scalar, F32, 1192, "", 1, 0 +luaAdjustment = scalar, F32, 1196, "", 1, 0 +etbFeedForward = scalar, F32, 1200 +etbIntegralError = scalar, F32, 1204, "", 1, 0 +etbCurrentTarget = scalar, F32, 1208, "%", 1, 0 +; total TS size = 1212 +faultCode = scalar, U08, 1212, "", 1, 0 +heaterDuty = scalar, U08, 1213, "%", 1, 0 +pumpDuty = scalar, U08, 1214, "%", 1, 0 +tempC = scalar, U16, 1216, "C", 1, 0 +nernstVoltage = scalar, U16, 1218, "V", 0.001, 0 +esr = scalar, U16, 1220, "", 1, 0 +; total TS size = 1224 time = { timeNow } @@ -4721,7 +4754,6 @@ entry = hellenBoardId, "Detected Board ID", int, "%d" entry = clutchUpState, "clutch: up", int, "%d" entry = clutchDownState, "clutch: down", int, "%d" entry = brakePedalState, "brake: down", int, "%d" -entry = isSynchronizedPhase, "isSynchronizedPhase", int, "%d" entry = egt1, "egt1", float, "%.3f" entry = egt2, "egt2", float, "%.3f" entry = desiredRpmLimit, "User-defined RPM hard limit", int, "%d" @@ -4762,6 +4794,7 @@ entry = triggerStateIndex, "triggerStateIndex", int, "%d" entry = vvtCounter, "vvtCounter", int, "%d" entry = camResyncCounter, "camResyncCounter", int, "%d" entry = vvtStateIndex, "vvtStateIndex", int, "%d" +entry = m_hasSynchronizedPhase, "m_hasSynchronizedPhase", int, "%d" entry = wallFuelCorrection, "fuel injection time correction to account for wall wetting effect for current cycle", float, "%.3f" entry = wallFuel, "Amount of fuel on the wall, in ms of injector open time for each injector.", float, "%.3f" entry = idleState, "idleState", int, "%d" @@ -4966,6 +4999,7 @@ menuDialog = main subMenu = tps_accel_stateDialog, "tps_accel_state" subMenu = trigger_centralDialog, "trigger_central" subMenu = trigger_stateDialog, "trigger_state" + subMenu = trigger_state_primaryDialog, "trigger_state_primary" subMenu = wall_fuel_stateDialog, "wall_fuel_state" subMenu = idle_stateDialog, "idle_state" subMenu = ignition_stateDialog, "ignition_state" @@ -5418,7 +5452,6 @@ indicatorPanel = engine_stateIndicatorPanel, 2 indicator = {clutchUpState}, "clutchUpState No", "clutchUpState Yes" indicator = {clutchDownState}, "clutchDownState No", "clutchDownState Yes" indicator = {brakePedalState}, "brakePedalState No", "brakePedalState Yes" - indicator = {isSynchronizedPhase}, "isSynchronizedPhase No", "isSynchronizedPhase Yes" dialog = engine_stateDialog, "engine_state" panel = engine_stateIndicatorPanel @@ -5527,6 +5560,12 @@ dialog = trigger_stateDialog, "trigger_state" liveGraph = trigger_state_3_Graph, "Graph", South graphLine = vvtStateIndex +indicatorPanel = trigger_state_primaryIndicatorPanel, 2 + indicator = {m_hasSynchronizedPhase}, "m_hasSynchronizedPhase No", "m_hasSynchronizedPhase Yes" + +dialog = trigger_state_primaryDialog, "trigger_state_primary" + panel = trigger_state_primaryIndicatorPanel + dialog = wall_fuel_stateDialog, "wall_fuel_state" liveGraph = wall_fuel_state_1_Graph, "Graph", South diff --git a/firmware/tunerstudio/generated/rusefi_f429-discovery.ini b/firmware/tunerstudio/generated/rusefi_f429-discovery.ini index 270aaf044b..894b968c9e 100644 --- a/firmware/tunerstudio/generated/rusefi_f429-discovery.ini +++ b/firmware/tunerstudio/generated/rusefi_f429-discovery.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.08.24.f429-discovery.1969688327" + signature = "rusEFI 2022.08.24.f429-discovery.1913309982" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.08.24.f429-discovery.1969688327" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.08.24.f429-discovery.1913309982" ; 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 Wed Aug 24 16:15:55 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Aug 24 22:15:33 UTC 2022 pageSize = 21300 page = 1 @@ -2109,7 +2109,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1220 + ochBlockSize = 1224 ; ; see TunerStudioOutputChannels struct @@ -2990,35 +2990,35 @@ hellenBoardId = scalar, S16, 990, "id", 1, 0 clutchUpState = bits, U32, 992, [0:0] clutchDownState = bits, U32, 992, [1:1] brakePedalState = bits, U32, 992, [2:2] -isSynchronizedPhase = bits, U32, 992, [3:3] -unusedBit_23_4 = bits, U32, 992, [4:4] -unusedBit_23_5 = bits, U32, 992, [5:5] -unusedBit_23_6 = bits, U32, 992, [6:6] -unusedBit_23_7 = bits, U32, 992, [7:7] -unusedBit_23_8 = bits, U32, 992, [8:8] -unusedBit_23_9 = bits, U32, 992, [9:9] -unusedBit_23_10 = bits, U32, 992, [10:10] -unusedBit_23_11 = bits, U32, 992, [11:11] -unusedBit_23_12 = bits, U32, 992, [12:12] -unusedBit_23_13 = bits, U32, 992, [13:13] -unusedBit_23_14 = bits, U32, 992, [14:14] -unusedBit_23_15 = bits, U32, 992, [15:15] -unusedBit_23_16 = bits, U32, 992, [16:16] -unusedBit_23_17 = bits, U32, 992, [17:17] -unusedBit_23_18 = bits, U32, 992, [18:18] -unusedBit_23_19 = bits, U32, 992, [19:19] -unusedBit_23_20 = bits, U32, 992, [20:20] -unusedBit_23_21 = bits, U32, 992, [21:21] -unusedBit_23_22 = bits, U32, 992, [22:22] -unusedBit_23_23 = bits, U32, 992, [23:23] -unusedBit_23_24 = bits, U32, 992, [24:24] -unusedBit_23_25 = bits, U32, 992, [25:25] -unusedBit_23_26 = bits, U32, 992, [26:26] -unusedBit_23_27 = bits, U32, 992, [27:27] -unusedBit_23_28 = bits, U32, 992, [28:28] -unusedBit_23_29 = bits, U32, 992, [29:29] -unusedBit_23_30 = bits, U32, 992, [30:30] -unusedBit_23_31 = bits, U32, 992, [31:31] +unusedBit_22_3 = bits, U32, 992, [3:3] +unusedBit_22_4 = bits, U32, 992, [4:4] +unusedBit_22_5 = bits, U32, 992, [5:5] +unusedBit_22_6 = bits, U32, 992, [6:6] +unusedBit_22_7 = bits, U32, 992, [7:7] +unusedBit_22_8 = bits, U32, 992, [8:8] +unusedBit_22_9 = bits, U32, 992, [9:9] +unusedBit_22_10 = bits, U32, 992, [10:10] +unusedBit_22_11 = bits, U32, 992, [11:11] +unusedBit_22_12 = bits, U32, 992, [12:12] +unusedBit_22_13 = bits, U32, 992, [13:13] +unusedBit_22_14 = bits, U32, 992, [14:14] +unusedBit_22_15 = bits, U32, 992, [15:15] +unusedBit_22_16 = bits, U32, 992, [16:16] +unusedBit_22_17 = bits, U32, 992, [17:17] +unusedBit_22_18 = bits, U32, 992, [18:18] +unusedBit_22_19 = bits, U32, 992, [19:19] +unusedBit_22_20 = bits, U32, 992, [20:20] +unusedBit_22_21 = bits, U32, 992, [21:21] +unusedBit_22_22 = bits, U32, 992, [22:22] +unusedBit_22_23 = bits, U32, 992, [23:23] +unusedBit_22_24 = bits, U32, 992, [24:24] +unusedBit_22_25 = bits, U32, 992, [25:25] +unusedBit_22_26 = bits, U32, 992, [26:26] +unusedBit_22_27 = bits, U32, 992, [27:27] +unusedBit_22_28 = bits, U32, 992, [28:28] +unusedBit_22_29 = bits, U32, 992, [29:29] +unusedBit_22_30 = bits, U32, 992, [30:30] +unusedBit_22_31 = bits, U32, 992, [31:31] egt1 = scalar, F32, 996, "", 1, 0 egt2 = scalar, F32, 1000, "", 1, 0 desiredRpmLimit = scalar, S16, 1004, "rpm", 1, 0 @@ -3089,70 +3089,103 @@ vvtCounter = scalar, U08, 1117, "", 1, 0 camResyncCounter = scalar, U08, 1118, "", 1, 0 vvtStateIndex = scalar, U08, 1119, "", 1, 0 ; total TS size = 1120 -wallFuelCorrection = scalar, F32, 1120, "", 1, 0 -wallFuel = scalar, F32, 1124, "", 1, 0 -; total TS size = 1128 -idleState = bits, S32, 1128, [0:2], "not important" -currentIdlePosition = scalar, F32, 1132 -baseIdlePosition = scalar, F32, 1136 -iacByTpsTaper = scalar, F32, 1140 -throttlePedalUpState = scalar, S32, 1144, "", 1, 0 -mightResetPid = bits, U32, 1148, [0:0] -shouldResetPid = bits, U32, 1148, [1:1] -wasResetPid = bits, U32, 1148, [2:2] -mustResetPid = bits, U32, 1148, [3:3] -isCoasting = bits, U32, 1148, [4:4] -useIacTableForCoasting = bits, U32, 1148, [5:5] -notIdling = bits, U32, 1148, [6:6] -needReset = bits, U32, 1148, [7:7] -isInDeadZone = bits, U32, 1148, [8:8] -isBlipping = bits, U32, 1148, [9:9] -useClosedLoop = bits, U32, 1148, [10:10] -badTps = bits, U32, 1148, [11:11] -looksLikeRunning = bits, U32, 1148, [12:12] -looksLikeCoasting = bits, U32, 1148, [13:13] -looksLikeCrankToIdle = bits, U32, 1148, [14:14] -useInstantRpmForIdle = bits, U32, 1148, [15:15] -isVerboseIAC = bits, U32, 1148, [16:16] -unusedBit_22_17 = bits, U32, 1148, [17:17] -unusedBit_22_18 = bits, U32, 1148, [18:18] -unusedBit_22_19 = bits, U32, 1148, [19:19] -unusedBit_22_20 = bits, U32, 1148, [20:20] -unusedBit_22_21 = bits, U32, 1148, [21:21] -unusedBit_22_22 = bits, U32, 1148, [22:22] -unusedBit_22_23 = bits, U32, 1148, [23:23] -unusedBit_22_24 = bits, U32, 1148, [24:24] -unusedBit_22_25 = bits, U32, 1148, [25:25] -unusedBit_22_26 = bits, U32, 1148, [26:26] -unusedBit_22_27 = bits, U32, 1148, [27:27] -unusedBit_22_28 = bits, U32, 1148, [28:28] -unusedBit_22_29 = bits, U32, 1148, [29:29] -unusedBit_22_30 = bits, U32, 1148, [30:30] -unusedBit_22_31 = bits, U32, 1148, [31:31] -targetRpmByClt = scalar, S32, 1152, "", 1, 0 -targetRpmAcBump = scalar, S32, 1156, "", 1, 0 -iacByRpmTaper = scalar, F32, 1160 -luaAdd = scalar, F32, 1164 -; total TS size = 1168 -baseDwell = scalar, F32, 1168, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 1172, "", 1, 0 -luaTimingAdd = scalar, F32, 1176, "", 1, 0 -luaTimingMult = scalar, F32, 1180, "", 1, 0 -; total TS size = 1184 -idlePosition = scalar, F32, 1184, "", 1, 0 -trim = scalar, F32, 1188, "", 1, 0 -luaAdjustment = scalar, F32, 1192, "", 1, 0 -etbFeedForward = scalar, F32, 1196 -etbIntegralError = scalar, F32, 1200, "", 1, 0 -etbCurrentTarget = scalar, F32, 1204, "%", 1, 0 -; total TS size = 1208 -faultCode = scalar, U08, 1208, "", 1, 0 -heaterDuty = scalar, U08, 1209, "%", 1, 0 -pumpDuty = scalar, U08, 1210, "%", 1, 0 -tempC = scalar, U16, 1212, "C", 1, 0 -nernstVoltage = scalar, U16, 1214, "V", 0.001, 0 -esr = scalar, U16, 1216, "", 1, 0 -; total TS size = 1220 +m_hasSynchronizedPhase = bits, U32, 1120, [0:0] +unusedBit_1_1 = bits, U32, 1120, [1:1] +unusedBit_1_2 = bits, U32, 1120, [2:2] +unusedBit_1_3 = bits, U32, 1120, [3:3] +unusedBit_1_4 = bits, U32, 1120, [4:4] +unusedBit_1_5 = bits, U32, 1120, [5:5] +unusedBit_1_6 = bits, U32, 1120, [6:6] +unusedBit_1_7 = bits, U32, 1120, [7:7] +unusedBit_1_8 = bits, U32, 1120, [8:8] +unusedBit_1_9 = bits, U32, 1120, [9:9] +unusedBit_1_10 = bits, U32, 1120, [10:10] +unusedBit_1_11 = bits, U32, 1120, [11:11] +unusedBit_1_12 = bits, U32, 1120, [12:12] +unusedBit_1_13 = bits, U32, 1120, [13:13] +unusedBit_1_14 = bits, U32, 1120, [14:14] +unusedBit_1_15 = bits, U32, 1120, [15:15] +unusedBit_1_16 = bits, U32, 1120, [16:16] +unusedBit_1_17 = bits, U32, 1120, [17:17] +unusedBit_1_18 = bits, U32, 1120, [18:18] +unusedBit_1_19 = bits, U32, 1120, [19:19] +unusedBit_1_20 = bits, U32, 1120, [20:20] +unusedBit_1_21 = bits, U32, 1120, [21:21] +unusedBit_1_22 = bits, U32, 1120, [22:22] +unusedBit_1_23 = bits, U32, 1120, [23:23] +unusedBit_1_24 = bits, U32, 1120, [24:24] +unusedBit_1_25 = bits, U32, 1120, [25:25] +unusedBit_1_26 = bits, U32, 1120, [26:26] +unusedBit_1_27 = bits, U32, 1120, [27:27] +unusedBit_1_28 = bits, U32, 1120, [28:28] +unusedBit_1_29 = bits, U32, 1120, [29:29] +unusedBit_1_30 = bits, U32, 1120, [30:30] +unusedBit_1_31 = bits, U32, 1120, [31:31] +; total TS size = 1124 +wallFuelCorrection = scalar, F32, 1124, "", 1, 0 +wallFuel = scalar, F32, 1128, "", 1, 0 +; total TS size = 1132 +idleState = bits, S32, 1132, [0:2], "not important" +currentIdlePosition = scalar, F32, 1136 +baseIdlePosition = scalar, F32, 1140 +iacByTpsTaper = scalar, F32, 1144 +throttlePedalUpState = scalar, S32, 1148, "", 1, 0 +mightResetPid = bits, U32, 1152, [0:0] +shouldResetPid = bits, U32, 1152, [1:1] +wasResetPid = bits, U32, 1152, [2:2] +mustResetPid = bits, U32, 1152, [3:3] +isCoasting = bits, U32, 1152, [4:4] +useIacTableForCoasting = bits, U32, 1152, [5:5] +notIdling = bits, U32, 1152, [6:6] +needReset = bits, U32, 1152, [7:7] +isInDeadZone = bits, U32, 1152, [8:8] +isBlipping = bits, U32, 1152, [9:9] +useClosedLoop = bits, U32, 1152, [10:10] +badTps = bits, U32, 1152, [11:11] +looksLikeRunning = bits, U32, 1152, [12:12] +looksLikeCoasting = bits, U32, 1152, [13:13] +looksLikeCrankToIdle = bits, U32, 1152, [14:14] +useInstantRpmForIdle = bits, U32, 1152, [15:15] +isVerboseIAC = bits, U32, 1152, [16:16] +unusedBit_22_17 = bits, U32, 1152, [17:17] +unusedBit_22_18 = bits, U32, 1152, [18:18] +unusedBit_22_19 = bits, U32, 1152, [19:19] +unusedBit_22_20 = bits, U32, 1152, [20:20] +unusedBit_22_21 = bits, U32, 1152, [21:21] +unusedBit_22_22 = bits, U32, 1152, [22:22] +unusedBit_22_23 = bits, U32, 1152, [23:23] +unusedBit_22_24 = bits, U32, 1152, [24:24] +unusedBit_22_25 = bits, U32, 1152, [25:25] +unusedBit_22_26 = bits, U32, 1152, [26:26] +unusedBit_22_27 = bits, U32, 1152, [27:27] +unusedBit_22_28 = bits, U32, 1152, [28:28] +unusedBit_22_29 = bits, U32, 1152, [29:29] +unusedBit_22_30 = bits, U32, 1152, [30:30] +unusedBit_22_31 = bits, U32, 1152, [31:31] +targetRpmByClt = scalar, S32, 1156, "", 1, 0 +targetRpmAcBump = scalar, S32, 1160, "", 1, 0 +iacByRpmTaper = scalar, F32, 1164 +luaAdd = scalar, F32, 1168 +; total TS size = 1172 +baseDwell = scalar, F32, 1172, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 1176, "", 1, 0 +luaTimingAdd = scalar, F32, 1180, "", 1, 0 +luaTimingMult = scalar, F32, 1184, "", 1, 0 +; total TS size = 1188 +idlePosition = scalar, F32, 1188, "", 1, 0 +trim = scalar, F32, 1192, "", 1, 0 +luaAdjustment = scalar, F32, 1196, "", 1, 0 +etbFeedForward = scalar, F32, 1200 +etbIntegralError = scalar, F32, 1204, "", 1, 0 +etbCurrentTarget = scalar, F32, 1208, "%", 1, 0 +; total TS size = 1212 +faultCode = scalar, U08, 1212, "", 1, 0 +heaterDuty = scalar, U08, 1213, "%", 1, 0 +pumpDuty = scalar, U08, 1214, "%", 1, 0 +tempC = scalar, U16, 1216, "C", 1, 0 +nernstVoltage = scalar, U16, 1218, "V", 0.001, 0 +esr = scalar, U16, 1220, "", 1, 0 +; total TS size = 1224 time = { timeNow } @@ -4721,7 +4754,6 @@ entry = hellenBoardId, "Detected Board ID", int, "%d" entry = clutchUpState, "clutch: up", int, "%d" entry = clutchDownState, "clutch: down", int, "%d" entry = brakePedalState, "brake: down", int, "%d" -entry = isSynchronizedPhase, "isSynchronizedPhase", int, "%d" entry = egt1, "egt1", float, "%.3f" entry = egt2, "egt2", float, "%.3f" entry = desiredRpmLimit, "User-defined RPM hard limit", int, "%d" @@ -4762,6 +4794,7 @@ entry = triggerStateIndex, "triggerStateIndex", int, "%d" entry = vvtCounter, "vvtCounter", int, "%d" entry = camResyncCounter, "camResyncCounter", int, "%d" entry = vvtStateIndex, "vvtStateIndex", int, "%d" +entry = m_hasSynchronizedPhase, "m_hasSynchronizedPhase", int, "%d" entry = wallFuelCorrection, "fuel injection time correction to account for wall wetting effect for current cycle", float, "%.3f" entry = wallFuel, "Amount of fuel on the wall, in ms of injector open time for each injector.", float, "%.3f" entry = idleState, "idleState", int, "%d" @@ -4966,6 +4999,7 @@ menuDialog = main subMenu = tps_accel_stateDialog, "tps_accel_state" subMenu = trigger_centralDialog, "trigger_central" subMenu = trigger_stateDialog, "trigger_state" + subMenu = trigger_state_primaryDialog, "trigger_state_primary" subMenu = wall_fuel_stateDialog, "wall_fuel_state" subMenu = idle_stateDialog, "idle_state" subMenu = ignition_stateDialog, "ignition_state" @@ -5418,7 +5452,6 @@ indicatorPanel = engine_stateIndicatorPanel, 2 indicator = {clutchUpState}, "clutchUpState No", "clutchUpState Yes" indicator = {clutchDownState}, "clutchDownState No", "clutchDownState Yes" indicator = {brakePedalState}, "brakePedalState No", "brakePedalState Yes" - indicator = {isSynchronizedPhase}, "isSynchronizedPhase No", "isSynchronizedPhase Yes" dialog = engine_stateDialog, "engine_state" panel = engine_stateIndicatorPanel @@ -5527,6 +5560,12 @@ dialog = trigger_stateDialog, "trigger_state" liveGraph = trigger_state_3_Graph, "Graph", South graphLine = vvtStateIndex +indicatorPanel = trigger_state_primaryIndicatorPanel, 2 + indicator = {m_hasSynchronizedPhase}, "m_hasSynchronizedPhase No", "m_hasSynchronizedPhase Yes" + +dialog = trigger_state_primaryDialog, "trigger_state_primary" + panel = trigger_state_primaryIndicatorPanel + dialog = wall_fuel_stateDialog, "wall_fuel_state" liveGraph = wall_fuel_state_1_Graph, "Graph", South diff --git a/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini b/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini index 3dd04e3295..5d12ccf143 100644 --- a/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini +++ b/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.08.24.frankenso_na6.923530179" + signature = "rusEFI 2022.08.24.frankenso_na6.812005338" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.08.24.frankenso_na6.923530179" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.08.24.frankenso_na6.812005338" ; 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 Wed Aug 24 16:15:44 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Aug 24 22:15:21 UTC 2022 pageSize = 21300 page = 1 @@ -2109,7 +2109,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1220 + ochBlockSize = 1224 ; ; see TunerStudioOutputChannels struct @@ -2990,35 +2990,35 @@ hellenBoardId = scalar, S16, 990, "id", 1, 0 clutchUpState = bits, U32, 992, [0:0] clutchDownState = bits, U32, 992, [1:1] brakePedalState = bits, U32, 992, [2:2] -isSynchronizedPhase = bits, U32, 992, [3:3] -unusedBit_23_4 = bits, U32, 992, [4:4] -unusedBit_23_5 = bits, U32, 992, [5:5] -unusedBit_23_6 = bits, U32, 992, [6:6] -unusedBit_23_7 = bits, U32, 992, [7:7] -unusedBit_23_8 = bits, U32, 992, [8:8] -unusedBit_23_9 = bits, U32, 992, [9:9] -unusedBit_23_10 = bits, U32, 992, [10:10] -unusedBit_23_11 = bits, U32, 992, [11:11] -unusedBit_23_12 = bits, U32, 992, [12:12] -unusedBit_23_13 = bits, U32, 992, [13:13] -unusedBit_23_14 = bits, U32, 992, [14:14] -unusedBit_23_15 = bits, U32, 992, [15:15] -unusedBit_23_16 = bits, U32, 992, [16:16] -unusedBit_23_17 = bits, U32, 992, [17:17] -unusedBit_23_18 = bits, U32, 992, [18:18] -unusedBit_23_19 = bits, U32, 992, [19:19] -unusedBit_23_20 = bits, U32, 992, [20:20] -unusedBit_23_21 = bits, U32, 992, [21:21] -unusedBit_23_22 = bits, U32, 992, [22:22] -unusedBit_23_23 = bits, U32, 992, [23:23] -unusedBit_23_24 = bits, U32, 992, [24:24] -unusedBit_23_25 = bits, U32, 992, [25:25] -unusedBit_23_26 = bits, U32, 992, [26:26] -unusedBit_23_27 = bits, U32, 992, [27:27] -unusedBit_23_28 = bits, U32, 992, [28:28] -unusedBit_23_29 = bits, U32, 992, [29:29] -unusedBit_23_30 = bits, U32, 992, [30:30] -unusedBit_23_31 = bits, U32, 992, [31:31] +unusedBit_22_3 = bits, U32, 992, [3:3] +unusedBit_22_4 = bits, U32, 992, [4:4] +unusedBit_22_5 = bits, U32, 992, [5:5] +unusedBit_22_6 = bits, U32, 992, [6:6] +unusedBit_22_7 = bits, U32, 992, [7:7] +unusedBit_22_8 = bits, U32, 992, [8:8] +unusedBit_22_9 = bits, U32, 992, [9:9] +unusedBit_22_10 = bits, U32, 992, [10:10] +unusedBit_22_11 = bits, U32, 992, [11:11] +unusedBit_22_12 = bits, U32, 992, [12:12] +unusedBit_22_13 = bits, U32, 992, [13:13] +unusedBit_22_14 = bits, U32, 992, [14:14] +unusedBit_22_15 = bits, U32, 992, [15:15] +unusedBit_22_16 = bits, U32, 992, [16:16] +unusedBit_22_17 = bits, U32, 992, [17:17] +unusedBit_22_18 = bits, U32, 992, [18:18] +unusedBit_22_19 = bits, U32, 992, [19:19] +unusedBit_22_20 = bits, U32, 992, [20:20] +unusedBit_22_21 = bits, U32, 992, [21:21] +unusedBit_22_22 = bits, U32, 992, [22:22] +unusedBit_22_23 = bits, U32, 992, [23:23] +unusedBit_22_24 = bits, U32, 992, [24:24] +unusedBit_22_25 = bits, U32, 992, [25:25] +unusedBit_22_26 = bits, U32, 992, [26:26] +unusedBit_22_27 = bits, U32, 992, [27:27] +unusedBit_22_28 = bits, U32, 992, [28:28] +unusedBit_22_29 = bits, U32, 992, [29:29] +unusedBit_22_30 = bits, U32, 992, [30:30] +unusedBit_22_31 = bits, U32, 992, [31:31] egt1 = scalar, F32, 996, "", 1, 0 egt2 = scalar, F32, 1000, "", 1, 0 desiredRpmLimit = scalar, S16, 1004, "rpm", 1, 0 @@ -3089,70 +3089,103 @@ vvtCounter = scalar, U08, 1117, "", 1, 0 camResyncCounter = scalar, U08, 1118, "", 1, 0 vvtStateIndex = scalar, U08, 1119, "", 1, 0 ; total TS size = 1120 -wallFuelCorrection = scalar, F32, 1120, "", 1, 0 -wallFuel = scalar, F32, 1124, "", 1, 0 -; total TS size = 1128 -idleState = bits, S32, 1128, [0:2], "not important" -currentIdlePosition = scalar, F32, 1132 -baseIdlePosition = scalar, F32, 1136 -iacByTpsTaper = scalar, F32, 1140 -throttlePedalUpState = scalar, S32, 1144, "", 1, 0 -mightResetPid = bits, U32, 1148, [0:0] -shouldResetPid = bits, U32, 1148, [1:1] -wasResetPid = bits, U32, 1148, [2:2] -mustResetPid = bits, U32, 1148, [3:3] -isCoasting = bits, U32, 1148, [4:4] -useIacTableForCoasting = bits, U32, 1148, [5:5] -notIdling = bits, U32, 1148, [6:6] -needReset = bits, U32, 1148, [7:7] -isInDeadZone = bits, U32, 1148, [8:8] -isBlipping = bits, U32, 1148, [9:9] -useClosedLoop = bits, U32, 1148, [10:10] -badTps = bits, U32, 1148, [11:11] -looksLikeRunning = bits, U32, 1148, [12:12] -looksLikeCoasting = bits, U32, 1148, [13:13] -looksLikeCrankToIdle = bits, U32, 1148, [14:14] -useInstantRpmForIdle = bits, U32, 1148, [15:15] -isVerboseIAC = bits, U32, 1148, [16:16] -unusedBit_22_17 = bits, U32, 1148, [17:17] -unusedBit_22_18 = bits, U32, 1148, [18:18] -unusedBit_22_19 = bits, U32, 1148, [19:19] -unusedBit_22_20 = bits, U32, 1148, [20:20] -unusedBit_22_21 = bits, U32, 1148, [21:21] -unusedBit_22_22 = bits, U32, 1148, [22:22] -unusedBit_22_23 = bits, U32, 1148, [23:23] -unusedBit_22_24 = bits, U32, 1148, [24:24] -unusedBit_22_25 = bits, U32, 1148, [25:25] -unusedBit_22_26 = bits, U32, 1148, [26:26] -unusedBit_22_27 = bits, U32, 1148, [27:27] -unusedBit_22_28 = bits, U32, 1148, [28:28] -unusedBit_22_29 = bits, U32, 1148, [29:29] -unusedBit_22_30 = bits, U32, 1148, [30:30] -unusedBit_22_31 = bits, U32, 1148, [31:31] -targetRpmByClt = scalar, S32, 1152, "", 1, 0 -targetRpmAcBump = scalar, S32, 1156, "", 1, 0 -iacByRpmTaper = scalar, F32, 1160 -luaAdd = scalar, F32, 1164 -; total TS size = 1168 -baseDwell = scalar, F32, 1168, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 1172, "", 1, 0 -luaTimingAdd = scalar, F32, 1176, "", 1, 0 -luaTimingMult = scalar, F32, 1180, "", 1, 0 -; total TS size = 1184 -idlePosition = scalar, F32, 1184, "", 1, 0 -trim = scalar, F32, 1188, "", 1, 0 -luaAdjustment = scalar, F32, 1192, "", 1, 0 -etbFeedForward = scalar, F32, 1196 -etbIntegralError = scalar, F32, 1200, "", 1, 0 -etbCurrentTarget = scalar, F32, 1204, "%", 1, 0 -; total TS size = 1208 -faultCode = scalar, U08, 1208, "", 1, 0 -heaterDuty = scalar, U08, 1209, "%", 1, 0 -pumpDuty = scalar, U08, 1210, "%", 1, 0 -tempC = scalar, U16, 1212, "C", 1, 0 -nernstVoltage = scalar, U16, 1214, "V", 0.001, 0 -esr = scalar, U16, 1216, "", 1, 0 -; total TS size = 1220 +m_hasSynchronizedPhase = bits, U32, 1120, [0:0] +unusedBit_1_1 = bits, U32, 1120, [1:1] +unusedBit_1_2 = bits, U32, 1120, [2:2] +unusedBit_1_3 = bits, U32, 1120, [3:3] +unusedBit_1_4 = bits, U32, 1120, [4:4] +unusedBit_1_5 = bits, U32, 1120, [5:5] +unusedBit_1_6 = bits, U32, 1120, [6:6] +unusedBit_1_7 = bits, U32, 1120, [7:7] +unusedBit_1_8 = bits, U32, 1120, [8:8] +unusedBit_1_9 = bits, U32, 1120, [9:9] +unusedBit_1_10 = bits, U32, 1120, [10:10] +unusedBit_1_11 = bits, U32, 1120, [11:11] +unusedBit_1_12 = bits, U32, 1120, [12:12] +unusedBit_1_13 = bits, U32, 1120, [13:13] +unusedBit_1_14 = bits, U32, 1120, [14:14] +unusedBit_1_15 = bits, U32, 1120, [15:15] +unusedBit_1_16 = bits, U32, 1120, [16:16] +unusedBit_1_17 = bits, U32, 1120, [17:17] +unusedBit_1_18 = bits, U32, 1120, [18:18] +unusedBit_1_19 = bits, U32, 1120, [19:19] +unusedBit_1_20 = bits, U32, 1120, [20:20] +unusedBit_1_21 = bits, U32, 1120, [21:21] +unusedBit_1_22 = bits, U32, 1120, [22:22] +unusedBit_1_23 = bits, U32, 1120, [23:23] +unusedBit_1_24 = bits, U32, 1120, [24:24] +unusedBit_1_25 = bits, U32, 1120, [25:25] +unusedBit_1_26 = bits, U32, 1120, [26:26] +unusedBit_1_27 = bits, U32, 1120, [27:27] +unusedBit_1_28 = bits, U32, 1120, [28:28] +unusedBit_1_29 = bits, U32, 1120, [29:29] +unusedBit_1_30 = bits, U32, 1120, [30:30] +unusedBit_1_31 = bits, U32, 1120, [31:31] +; total TS size = 1124 +wallFuelCorrection = scalar, F32, 1124, "", 1, 0 +wallFuel = scalar, F32, 1128, "", 1, 0 +; total TS size = 1132 +idleState = bits, S32, 1132, [0:2], "not important" +currentIdlePosition = scalar, F32, 1136 +baseIdlePosition = scalar, F32, 1140 +iacByTpsTaper = scalar, F32, 1144 +throttlePedalUpState = scalar, S32, 1148, "", 1, 0 +mightResetPid = bits, U32, 1152, [0:0] +shouldResetPid = bits, U32, 1152, [1:1] +wasResetPid = bits, U32, 1152, [2:2] +mustResetPid = bits, U32, 1152, [3:3] +isCoasting = bits, U32, 1152, [4:4] +useIacTableForCoasting = bits, U32, 1152, [5:5] +notIdling = bits, U32, 1152, [6:6] +needReset = bits, U32, 1152, [7:7] +isInDeadZone = bits, U32, 1152, [8:8] +isBlipping = bits, U32, 1152, [9:9] +useClosedLoop = bits, U32, 1152, [10:10] +badTps = bits, U32, 1152, [11:11] +looksLikeRunning = bits, U32, 1152, [12:12] +looksLikeCoasting = bits, U32, 1152, [13:13] +looksLikeCrankToIdle = bits, U32, 1152, [14:14] +useInstantRpmForIdle = bits, U32, 1152, [15:15] +isVerboseIAC = bits, U32, 1152, [16:16] +unusedBit_22_17 = bits, U32, 1152, [17:17] +unusedBit_22_18 = bits, U32, 1152, [18:18] +unusedBit_22_19 = bits, U32, 1152, [19:19] +unusedBit_22_20 = bits, U32, 1152, [20:20] +unusedBit_22_21 = bits, U32, 1152, [21:21] +unusedBit_22_22 = bits, U32, 1152, [22:22] +unusedBit_22_23 = bits, U32, 1152, [23:23] +unusedBit_22_24 = bits, U32, 1152, [24:24] +unusedBit_22_25 = bits, U32, 1152, [25:25] +unusedBit_22_26 = bits, U32, 1152, [26:26] +unusedBit_22_27 = bits, U32, 1152, [27:27] +unusedBit_22_28 = bits, U32, 1152, [28:28] +unusedBit_22_29 = bits, U32, 1152, [29:29] +unusedBit_22_30 = bits, U32, 1152, [30:30] +unusedBit_22_31 = bits, U32, 1152, [31:31] +targetRpmByClt = scalar, S32, 1156, "", 1, 0 +targetRpmAcBump = scalar, S32, 1160, "", 1, 0 +iacByRpmTaper = scalar, F32, 1164 +luaAdd = scalar, F32, 1168 +; total TS size = 1172 +baseDwell = scalar, F32, 1172, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 1176, "", 1, 0 +luaTimingAdd = scalar, F32, 1180, "", 1, 0 +luaTimingMult = scalar, F32, 1184, "", 1, 0 +; total TS size = 1188 +idlePosition = scalar, F32, 1188, "", 1, 0 +trim = scalar, F32, 1192, "", 1, 0 +luaAdjustment = scalar, F32, 1196, "", 1, 0 +etbFeedForward = scalar, F32, 1200 +etbIntegralError = scalar, F32, 1204, "", 1, 0 +etbCurrentTarget = scalar, F32, 1208, "%", 1, 0 +; total TS size = 1212 +faultCode = scalar, U08, 1212, "", 1, 0 +heaterDuty = scalar, U08, 1213, "%", 1, 0 +pumpDuty = scalar, U08, 1214, "%", 1, 0 +tempC = scalar, U16, 1216, "C", 1, 0 +nernstVoltage = scalar, U16, 1218, "V", 0.001, 0 +esr = scalar, U16, 1220, "", 1, 0 +; total TS size = 1224 time = { timeNow } @@ -4721,7 +4754,6 @@ entry = hellenBoardId, "Detected Board ID", int, "%d" entry = clutchUpState, "clutch: up", int, "%d" entry = clutchDownState, "clutch: down", int, "%d" entry = brakePedalState, "brake: down", int, "%d" -entry = isSynchronizedPhase, "isSynchronizedPhase", int, "%d" entry = egt1, "egt1", float, "%.3f" entry = egt2, "egt2", float, "%.3f" entry = desiredRpmLimit, "User-defined RPM hard limit", int, "%d" @@ -4762,6 +4794,7 @@ entry = triggerStateIndex, "triggerStateIndex", int, "%d" entry = vvtCounter, "vvtCounter", int, "%d" entry = camResyncCounter, "camResyncCounter", int, "%d" entry = vvtStateIndex, "vvtStateIndex", int, "%d" +entry = m_hasSynchronizedPhase, "m_hasSynchronizedPhase", int, "%d" entry = wallFuelCorrection, "fuel injection time correction to account for wall wetting effect for current cycle", float, "%.3f" entry = wallFuel, "Amount of fuel on the wall, in ms of injector open time for each injector.", float, "%.3f" entry = idleState, "idleState", int, "%d" @@ -4966,6 +4999,7 @@ menuDialog = main subMenu = tps_accel_stateDialog, "tps_accel_state" subMenu = trigger_centralDialog, "trigger_central" subMenu = trigger_stateDialog, "trigger_state" + subMenu = trigger_state_primaryDialog, "trigger_state_primary" subMenu = wall_fuel_stateDialog, "wall_fuel_state" subMenu = idle_stateDialog, "idle_state" subMenu = ignition_stateDialog, "ignition_state" @@ -5418,7 +5452,6 @@ indicatorPanel = engine_stateIndicatorPanel, 2 indicator = {clutchUpState}, "clutchUpState No", "clutchUpState Yes" indicator = {clutchDownState}, "clutchDownState No", "clutchDownState Yes" indicator = {brakePedalState}, "brakePedalState No", "brakePedalState Yes" - indicator = {isSynchronizedPhase}, "isSynchronizedPhase No", "isSynchronizedPhase Yes" dialog = engine_stateDialog, "engine_state" panel = engine_stateIndicatorPanel @@ -5527,6 +5560,12 @@ dialog = trigger_stateDialog, "trigger_state" liveGraph = trigger_state_3_Graph, "Graph", South graphLine = vvtStateIndex +indicatorPanel = trigger_state_primaryIndicatorPanel, 2 + indicator = {m_hasSynchronizedPhase}, "m_hasSynchronizedPhase No", "m_hasSynchronizedPhase Yes" + +dialog = trigger_state_primaryDialog, "trigger_state_primary" + panel = trigger_state_primaryIndicatorPanel + dialog = wall_fuel_stateDialog, "wall_fuel_state" liveGraph = wall_fuel_state_1_Graph, "Graph", South diff --git a/firmware/tunerstudio/generated/rusefi_harley81.ini b/firmware/tunerstudio/generated/rusefi_harley81.ini index 4ec5ce1652..6920d9fac8 100644 --- a/firmware/tunerstudio/generated/rusefi_harley81.ini +++ b/firmware/tunerstudio/generated/rusefi_harley81.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.08.24.harley81.2241464872" + signature = "rusEFI 2022.08.24.harley81.2197278257" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.08.24.harley81.2241464872" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.08.24.harley81.2197278257" ; 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 Wed Aug 24 16:15:17 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Aug 24 22:14:56 UTC 2022 pageSize = 21300 page = 1 @@ -2109,7 +2109,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1220 + ochBlockSize = 1224 ; ; see TunerStudioOutputChannels struct @@ -2990,35 +2990,35 @@ hellenBoardId = scalar, S16, 990, "id", 1, 0 clutchUpState = bits, U32, 992, [0:0] clutchDownState = bits, U32, 992, [1:1] brakePedalState = bits, U32, 992, [2:2] -isSynchronizedPhase = bits, U32, 992, [3:3] -unusedBit_23_4 = bits, U32, 992, [4:4] -unusedBit_23_5 = bits, U32, 992, [5:5] -unusedBit_23_6 = bits, U32, 992, [6:6] -unusedBit_23_7 = bits, U32, 992, [7:7] -unusedBit_23_8 = bits, U32, 992, [8:8] -unusedBit_23_9 = bits, U32, 992, [9:9] -unusedBit_23_10 = bits, U32, 992, [10:10] -unusedBit_23_11 = bits, U32, 992, [11:11] -unusedBit_23_12 = bits, U32, 992, [12:12] -unusedBit_23_13 = bits, U32, 992, [13:13] -unusedBit_23_14 = bits, U32, 992, [14:14] -unusedBit_23_15 = bits, U32, 992, [15:15] -unusedBit_23_16 = bits, U32, 992, [16:16] -unusedBit_23_17 = bits, U32, 992, [17:17] -unusedBit_23_18 = bits, U32, 992, [18:18] -unusedBit_23_19 = bits, U32, 992, [19:19] -unusedBit_23_20 = bits, U32, 992, [20:20] -unusedBit_23_21 = bits, U32, 992, [21:21] -unusedBit_23_22 = bits, U32, 992, [22:22] -unusedBit_23_23 = bits, U32, 992, [23:23] -unusedBit_23_24 = bits, U32, 992, [24:24] -unusedBit_23_25 = bits, U32, 992, [25:25] -unusedBit_23_26 = bits, U32, 992, [26:26] -unusedBit_23_27 = bits, U32, 992, [27:27] -unusedBit_23_28 = bits, U32, 992, [28:28] -unusedBit_23_29 = bits, U32, 992, [29:29] -unusedBit_23_30 = bits, U32, 992, [30:30] -unusedBit_23_31 = bits, U32, 992, [31:31] +unusedBit_22_3 = bits, U32, 992, [3:3] +unusedBit_22_4 = bits, U32, 992, [4:4] +unusedBit_22_5 = bits, U32, 992, [5:5] +unusedBit_22_6 = bits, U32, 992, [6:6] +unusedBit_22_7 = bits, U32, 992, [7:7] +unusedBit_22_8 = bits, U32, 992, [8:8] +unusedBit_22_9 = bits, U32, 992, [9:9] +unusedBit_22_10 = bits, U32, 992, [10:10] +unusedBit_22_11 = bits, U32, 992, [11:11] +unusedBit_22_12 = bits, U32, 992, [12:12] +unusedBit_22_13 = bits, U32, 992, [13:13] +unusedBit_22_14 = bits, U32, 992, [14:14] +unusedBit_22_15 = bits, U32, 992, [15:15] +unusedBit_22_16 = bits, U32, 992, [16:16] +unusedBit_22_17 = bits, U32, 992, [17:17] +unusedBit_22_18 = bits, U32, 992, [18:18] +unusedBit_22_19 = bits, U32, 992, [19:19] +unusedBit_22_20 = bits, U32, 992, [20:20] +unusedBit_22_21 = bits, U32, 992, [21:21] +unusedBit_22_22 = bits, U32, 992, [22:22] +unusedBit_22_23 = bits, U32, 992, [23:23] +unusedBit_22_24 = bits, U32, 992, [24:24] +unusedBit_22_25 = bits, U32, 992, [25:25] +unusedBit_22_26 = bits, U32, 992, [26:26] +unusedBit_22_27 = bits, U32, 992, [27:27] +unusedBit_22_28 = bits, U32, 992, [28:28] +unusedBit_22_29 = bits, U32, 992, [29:29] +unusedBit_22_30 = bits, U32, 992, [30:30] +unusedBit_22_31 = bits, U32, 992, [31:31] egt1 = scalar, F32, 996, "", 1, 0 egt2 = scalar, F32, 1000, "", 1, 0 desiredRpmLimit = scalar, S16, 1004, "rpm", 1, 0 @@ -3089,70 +3089,103 @@ vvtCounter = scalar, U08, 1117, "", 1, 0 camResyncCounter = scalar, U08, 1118, "", 1, 0 vvtStateIndex = scalar, U08, 1119, "", 1, 0 ; total TS size = 1120 -wallFuelCorrection = scalar, F32, 1120, "", 1, 0 -wallFuel = scalar, F32, 1124, "", 1, 0 -; total TS size = 1128 -idleState = bits, S32, 1128, [0:2], "not important" -currentIdlePosition = scalar, F32, 1132 -baseIdlePosition = scalar, F32, 1136 -iacByTpsTaper = scalar, F32, 1140 -throttlePedalUpState = scalar, S32, 1144, "", 1, 0 -mightResetPid = bits, U32, 1148, [0:0] -shouldResetPid = bits, U32, 1148, [1:1] -wasResetPid = bits, U32, 1148, [2:2] -mustResetPid = bits, U32, 1148, [3:3] -isCoasting = bits, U32, 1148, [4:4] -useIacTableForCoasting = bits, U32, 1148, [5:5] -notIdling = bits, U32, 1148, [6:6] -needReset = bits, U32, 1148, [7:7] -isInDeadZone = bits, U32, 1148, [8:8] -isBlipping = bits, U32, 1148, [9:9] -useClosedLoop = bits, U32, 1148, [10:10] -badTps = bits, U32, 1148, [11:11] -looksLikeRunning = bits, U32, 1148, [12:12] -looksLikeCoasting = bits, U32, 1148, [13:13] -looksLikeCrankToIdle = bits, U32, 1148, [14:14] -useInstantRpmForIdle = bits, U32, 1148, [15:15] -isVerboseIAC = bits, U32, 1148, [16:16] -unusedBit_22_17 = bits, U32, 1148, [17:17] -unusedBit_22_18 = bits, U32, 1148, [18:18] -unusedBit_22_19 = bits, U32, 1148, [19:19] -unusedBit_22_20 = bits, U32, 1148, [20:20] -unusedBit_22_21 = bits, U32, 1148, [21:21] -unusedBit_22_22 = bits, U32, 1148, [22:22] -unusedBit_22_23 = bits, U32, 1148, [23:23] -unusedBit_22_24 = bits, U32, 1148, [24:24] -unusedBit_22_25 = bits, U32, 1148, [25:25] -unusedBit_22_26 = bits, U32, 1148, [26:26] -unusedBit_22_27 = bits, U32, 1148, [27:27] -unusedBit_22_28 = bits, U32, 1148, [28:28] -unusedBit_22_29 = bits, U32, 1148, [29:29] -unusedBit_22_30 = bits, U32, 1148, [30:30] -unusedBit_22_31 = bits, U32, 1148, [31:31] -targetRpmByClt = scalar, S32, 1152, "", 1, 0 -targetRpmAcBump = scalar, S32, 1156, "", 1, 0 -iacByRpmTaper = scalar, F32, 1160 -luaAdd = scalar, F32, 1164 -; total TS size = 1168 -baseDwell = scalar, F32, 1168, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 1172, "", 1, 0 -luaTimingAdd = scalar, F32, 1176, "", 1, 0 -luaTimingMult = scalar, F32, 1180, "", 1, 0 -; total TS size = 1184 -idlePosition = scalar, F32, 1184, "", 1, 0 -trim = scalar, F32, 1188, "", 1, 0 -luaAdjustment = scalar, F32, 1192, "", 1, 0 -etbFeedForward = scalar, F32, 1196 -etbIntegralError = scalar, F32, 1200, "", 1, 0 -etbCurrentTarget = scalar, F32, 1204, "%", 1, 0 -; total TS size = 1208 -faultCode = scalar, U08, 1208, "", 1, 0 -heaterDuty = scalar, U08, 1209, "%", 1, 0 -pumpDuty = scalar, U08, 1210, "%", 1, 0 -tempC = scalar, U16, 1212, "C", 1, 0 -nernstVoltage = scalar, U16, 1214, "V", 0.001, 0 -esr = scalar, U16, 1216, "", 1, 0 -; total TS size = 1220 +m_hasSynchronizedPhase = bits, U32, 1120, [0:0] +unusedBit_1_1 = bits, U32, 1120, [1:1] +unusedBit_1_2 = bits, U32, 1120, [2:2] +unusedBit_1_3 = bits, U32, 1120, [3:3] +unusedBit_1_4 = bits, U32, 1120, [4:4] +unusedBit_1_5 = bits, U32, 1120, [5:5] +unusedBit_1_6 = bits, U32, 1120, [6:6] +unusedBit_1_7 = bits, U32, 1120, [7:7] +unusedBit_1_8 = bits, U32, 1120, [8:8] +unusedBit_1_9 = bits, U32, 1120, [9:9] +unusedBit_1_10 = bits, U32, 1120, [10:10] +unusedBit_1_11 = bits, U32, 1120, [11:11] +unusedBit_1_12 = bits, U32, 1120, [12:12] +unusedBit_1_13 = bits, U32, 1120, [13:13] +unusedBit_1_14 = bits, U32, 1120, [14:14] +unusedBit_1_15 = bits, U32, 1120, [15:15] +unusedBit_1_16 = bits, U32, 1120, [16:16] +unusedBit_1_17 = bits, U32, 1120, [17:17] +unusedBit_1_18 = bits, U32, 1120, [18:18] +unusedBit_1_19 = bits, U32, 1120, [19:19] +unusedBit_1_20 = bits, U32, 1120, [20:20] +unusedBit_1_21 = bits, U32, 1120, [21:21] +unusedBit_1_22 = bits, U32, 1120, [22:22] +unusedBit_1_23 = bits, U32, 1120, [23:23] +unusedBit_1_24 = bits, U32, 1120, [24:24] +unusedBit_1_25 = bits, U32, 1120, [25:25] +unusedBit_1_26 = bits, U32, 1120, [26:26] +unusedBit_1_27 = bits, U32, 1120, [27:27] +unusedBit_1_28 = bits, U32, 1120, [28:28] +unusedBit_1_29 = bits, U32, 1120, [29:29] +unusedBit_1_30 = bits, U32, 1120, [30:30] +unusedBit_1_31 = bits, U32, 1120, [31:31] +; total TS size = 1124 +wallFuelCorrection = scalar, F32, 1124, "", 1, 0 +wallFuel = scalar, F32, 1128, "", 1, 0 +; total TS size = 1132 +idleState = bits, S32, 1132, [0:2], "not important" +currentIdlePosition = scalar, F32, 1136 +baseIdlePosition = scalar, F32, 1140 +iacByTpsTaper = scalar, F32, 1144 +throttlePedalUpState = scalar, S32, 1148, "", 1, 0 +mightResetPid = bits, U32, 1152, [0:0] +shouldResetPid = bits, U32, 1152, [1:1] +wasResetPid = bits, U32, 1152, [2:2] +mustResetPid = bits, U32, 1152, [3:3] +isCoasting = bits, U32, 1152, [4:4] +useIacTableForCoasting = bits, U32, 1152, [5:5] +notIdling = bits, U32, 1152, [6:6] +needReset = bits, U32, 1152, [7:7] +isInDeadZone = bits, U32, 1152, [8:8] +isBlipping = bits, U32, 1152, [9:9] +useClosedLoop = bits, U32, 1152, [10:10] +badTps = bits, U32, 1152, [11:11] +looksLikeRunning = bits, U32, 1152, [12:12] +looksLikeCoasting = bits, U32, 1152, [13:13] +looksLikeCrankToIdle = bits, U32, 1152, [14:14] +useInstantRpmForIdle = bits, U32, 1152, [15:15] +isVerboseIAC = bits, U32, 1152, [16:16] +unusedBit_22_17 = bits, U32, 1152, [17:17] +unusedBit_22_18 = bits, U32, 1152, [18:18] +unusedBit_22_19 = bits, U32, 1152, [19:19] +unusedBit_22_20 = bits, U32, 1152, [20:20] +unusedBit_22_21 = bits, U32, 1152, [21:21] +unusedBit_22_22 = bits, U32, 1152, [22:22] +unusedBit_22_23 = bits, U32, 1152, [23:23] +unusedBit_22_24 = bits, U32, 1152, [24:24] +unusedBit_22_25 = bits, U32, 1152, [25:25] +unusedBit_22_26 = bits, U32, 1152, [26:26] +unusedBit_22_27 = bits, U32, 1152, [27:27] +unusedBit_22_28 = bits, U32, 1152, [28:28] +unusedBit_22_29 = bits, U32, 1152, [29:29] +unusedBit_22_30 = bits, U32, 1152, [30:30] +unusedBit_22_31 = bits, U32, 1152, [31:31] +targetRpmByClt = scalar, S32, 1156, "", 1, 0 +targetRpmAcBump = scalar, S32, 1160, "", 1, 0 +iacByRpmTaper = scalar, F32, 1164 +luaAdd = scalar, F32, 1168 +; total TS size = 1172 +baseDwell = scalar, F32, 1172, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 1176, "", 1, 0 +luaTimingAdd = scalar, F32, 1180, "", 1, 0 +luaTimingMult = scalar, F32, 1184, "", 1, 0 +; total TS size = 1188 +idlePosition = scalar, F32, 1188, "", 1, 0 +trim = scalar, F32, 1192, "", 1, 0 +luaAdjustment = scalar, F32, 1196, "", 1, 0 +etbFeedForward = scalar, F32, 1200 +etbIntegralError = scalar, F32, 1204, "", 1, 0 +etbCurrentTarget = scalar, F32, 1208, "%", 1, 0 +; total TS size = 1212 +faultCode = scalar, U08, 1212, "", 1, 0 +heaterDuty = scalar, U08, 1213, "%", 1, 0 +pumpDuty = scalar, U08, 1214, "%", 1, 0 +tempC = scalar, U16, 1216, "C", 1, 0 +nernstVoltage = scalar, U16, 1218, "V", 0.001, 0 +esr = scalar, U16, 1220, "", 1, 0 +; total TS size = 1224 time = { timeNow } @@ -4721,7 +4754,6 @@ entry = hellenBoardId, "Detected Board ID", int, "%d" entry = clutchUpState, "clutch: up", int, "%d" entry = clutchDownState, "clutch: down", int, "%d" entry = brakePedalState, "brake: down", int, "%d" -entry = isSynchronizedPhase, "isSynchronizedPhase", int, "%d" entry = egt1, "egt1", float, "%.3f" entry = egt2, "egt2", float, "%.3f" entry = desiredRpmLimit, "User-defined RPM hard limit", int, "%d" @@ -4762,6 +4794,7 @@ entry = triggerStateIndex, "triggerStateIndex", int, "%d" entry = vvtCounter, "vvtCounter", int, "%d" entry = camResyncCounter, "camResyncCounter", int, "%d" entry = vvtStateIndex, "vvtStateIndex", int, "%d" +entry = m_hasSynchronizedPhase, "m_hasSynchronizedPhase", int, "%d" entry = wallFuelCorrection, "fuel injection time correction to account for wall wetting effect for current cycle", float, "%.3f" entry = wallFuel, "Amount of fuel on the wall, in ms of injector open time for each injector.", float, "%.3f" entry = idleState, "idleState", int, "%d" @@ -4966,6 +4999,7 @@ menuDialog = main subMenu = tps_accel_stateDialog, "tps_accel_state" subMenu = trigger_centralDialog, "trigger_central" subMenu = trigger_stateDialog, "trigger_state" + subMenu = trigger_state_primaryDialog, "trigger_state_primary" subMenu = wall_fuel_stateDialog, "wall_fuel_state" subMenu = idle_stateDialog, "idle_state" subMenu = ignition_stateDialog, "ignition_state" @@ -5414,7 +5448,6 @@ indicatorPanel = engine_stateIndicatorPanel, 2 indicator = {clutchUpState}, "clutchUpState No", "clutchUpState Yes" indicator = {clutchDownState}, "clutchDownState No", "clutchDownState Yes" indicator = {brakePedalState}, "brakePedalState No", "brakePedalState Yes" - indicator = {isSynchronizedPhase}, "isSynchronizedPhase No", "isSynchronizedPhase Yes" dialog = engine_stateDialog, "engine_state" panel = engine_stateIndicatorPanel @@ -5523,6 +5556,12 @@ dialog = trigger_stateDialog, "trigger_state" liveGraph = trigger_state_3_Graph, "Graph", South graphLine = vvtStateIndex +indicatorPanel = trigger_state_primaryIndicatorPanel, 2 + indicator = {m_hasSynchronizedPhase}, "m_hasSynchronizedPhase No", "m_hasSynchronizedPhase Yes" + +dialog = trigger_state_primaryDialog, "trigger_state_primary" + panel = trigger_state_primaryIndicatorPanel + dialog = wall_fuel_stateDialog, "wall_fuel_state" liveGraph = wall_fuel_state_1_Graph, "Graph", South diff --git a/firmware/tunerstudio/generated/rusefi_hellen-gm-e67.ini b/firmware/tunerstudio/generated/rusefi_hellen-gm-e67.ini index c9bc7ef033..9ffde985ff 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen-gm-e67.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen-gm-e67.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.08.24.hellen-gm-e67.3238038193" + signature = "rusEFI 2022.08.24.hellen-gm-e67.3329052328" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.08.24.hellen-gm-e67.3238038193" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.08.24.hellen-gm-e67.3329052328" ; 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 Wed Aug 24 16:15:32 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Aug 24 22:15:10 UTC 2022 pageSize = 21300 page = 1 @@ -2109,7 +2109,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1220 + ochBlockSize = 1224 ; ; see TunerStudioOutputChannels struct @@ -2990,35 +2990,35 @@ hellenBoardId = scalar, S16, 990, "id", 1, 0 clutchUpState = bits, U32, 992, [0:0] clutchDownState = bits, U32, 992, [1:1] brakePedalState = bits, U32, 992, [2:2] -isSynchronizedPhase = bits, U32, 992, [3:3] -unusedBit_23_4 = bits, U32, 992, [4:4] -unusedBit_23_5 = bits, U32, 992, [5:5] -unusedBit_23_6 = bits, U32, 992, [6:6] -unusedBit_23_7 = bits, U32, 992, [7:7] -unusedBit_23_8 = bits, U32, 992, [8:8] -unusedBit_23_9 = bits, U32, 992, [9:9] -unusedBit_23_10 = bits, U32, 992, [10:10] -unusedBit_23_11 = bits, U32, 992, [11:11] -unusedBit_23_12 = bits, U32, 992, [12:12] -unusedBit_23_13 = bits, U32, 992, [13:13] -unusedBit_23_14 = bits, U32, 992, [14:14] -unusedBit_23_15 = bits, U32, 992, [15:15] -unusedBit_23_16 = bits, U32, 992, [16:16] -unusedBit_23_17 = bits, U32, 992, [17:17] -unusedBit_23_18 = bits, U32, 992, [18:18] -unusedBit_23_19 = bits, U32, 992, [19:19] -unusedBit_23_20 = bits, U32, 992, [20:20] -unusedBit_23_21 = bits, U32, 992, [21:21] -unusedBit_23_22 = bits, U32, 992, [22:22] -unusedBit_23_23 = bits, U32, 992, [23:23] -unusedBit_23_24 = bits, U32, 992, [24:24] -unusedBit_23_25 = bits, U32, 992, [25:25] -unusedBit_23_26 = bits, U32, 992, [26:26] -unusedBit_23_27 = bits, U32, 992, [27:27] -unusedBit_23_28 = bits, U32, 992, [28:28] -unusedBit_23_29 = bits, U32, 992, [29:29] -unusedBit_23_30 = bits, U32, 992, [30:30] -unusedBit_23_31 = bits, U32, 992, [31:31] +unusedBit_22_3 = bits, U32, 992, [3:3] +unusedBit_22_4 = bits, U32, 992, [4:4] +unusedBit_22_5 = bits, U32, 992, [5:5] +unusedBit_22_6 = bits, U32, 992, [6:6] +unusedBit_22_7 = bits, U32, 992, [7:7] +unusedBit_22_8 = bits, U32, 992, [8:8] +unusedBit_22_9 = bits, U32, 992, [9:9] +unusedBit_22_10 = bits, U32, 992, [10:10] +unusedBit_22_11 = bits, U32, 992, [11:11] +unusedBit_22_12 = bits, U32, 992, [12:12] +unusedBit_22_13 = bits, U32, 992, [13:13] +unusedBit_22_14 = bits, U32, 992, [14:14] +unusedBit_22_15 = bits, U32, 992, [15:15] +unusedBit_22_16 = bits, U32, 992, [16:16] +unusedBit_22_17 = bits, U32, 992, [17:17] +unusedBit_22_18 = bits, U32, 992, [18:18] +unusedBit_22_19 = bits, U32, 992, [19:19] +unusedBit_22_20 = bits, U32, 992, [20:20] +unusedBit_22_21 = bits, U32, 992, [21:21] +unusedBit_22_22 = bits, U32, 992, [22:22] +unusedBit_22_23 = bits, U32, 992, [23:23] +unusedBit_22_24 = bits, U32, 992, [24:24] +unusedBit_22_25 = bits, U32, 992, [25:25] +unusedBit_22_26 = bits, U32, 992, [26:26] +unusedBit_22_27 = bits, U32, 992, [27:27] +unusedBit_22_28 = bits, U32, 992, [28:28] +unusedBit_22_29 = bits, U32, 992, [29:29] +unusedBit_22_30 = bits, U32, 992, [30:30] +unusedBit_22_31 = bits, U32, 992, [31:31] egt1 = scalar, F32, 996, "", 1, 0 egt2 = scalar, F32, 1000, "", 1, 0 desiredRpmLimit = scalar, S16, 1004, "rpm", 1, 0 @@ -3089,70 +3089,103 @@ vvtCounter = scalar, U08, 1117, "", 1, 0 camResyncCounter = scalar, U08, 1118, "", 1, 0 vvtStateIndex = scalar, U08, 1119, "", 1, 0 ; total TS size = 1120 -wallFuelCorrection = scalar, F32, 1120, "", 1, 0 -wallFuel = scalar, F32, 1124, "", 1, 0 -; total TS size = 1128 -idleState = bits, S32, 1128, [0:2], "not important" -currentIdlePosition = scalar, F32, 1132 -baseIdlePosition = scalar, F32, 1136 -iacByTpsTaper = scalar, F32, 1140 -throttlePedalUpState = scalar, S32, 1144, "", 1, 0 -mightResetPid = bits, U32, 1148, [0:0] -shouldResetPid = bits, U32, 1148, [1:1] -wasResetPid = bits, U32, 1148, [2:2] -mustResetPid = bits, U32, 1148, [3:3] -isCoasting = bits, U32, 1148, [4:4] -useIacTableForCoasting = bits, U32, 1148, [5:5] -notIdling = bits, U32, 1148, [6:6] -needReset = bits, U32, 1148, [7:7] -isInDeadZone = bits, U32, 1148, [8:8] -isBlipping = bits, U32, 1148, [9:9] -useClosedLoop = bits, U32, 1148, [10:10] -badTps = bits, U32, 1148, [11:11] -looksLikeRunning = bits, U32, 1148, [12:12] -looksLikeCoasting = bits, U32, 1148, [13:13] -looksLikeCrankToIdle = bits, U32, 1148, [14:14] -useInstantRpmForIdle = bits, U32, 1148, [15:15] -isVerboseIAC = bits, U32, 1148, [16:16] -unusedBit_22_17 = bits, U32, 1148, [17:17] -unusedBit_22_18 = bits, U32, 1148, [18:18] -unusedBit_22_19 = bits, U32, 1148, [19:19] -unusedBit_22_20 = bits, U32, 1148, [20:20] -unusedBit_22_21 = bits, U32, 1148, [21:21] -unusedBit_22_22 = bits, U32, 1148, [22:22] -unusedBit_22_23 = bits, U32, 1148, [23:23] -unusedBit_22_24 = bits, U32, 1148, [24:24] -unusedBit_22_25 = bits, U32, 1148, [25:25] -unusedBit_22_26 = bits, U32, 1148, [26:26] -unusedBit_22_27 = bits, U32, 1148, [27:27] -unusedBit_22_28 = bits, U32, 1148, [28:28] -unusedBit_22_29 = bits, U32, 1148, [29:29] -unusedBit_22_30 = bits, U32, 1148, [30:30] -unusedBit_22_31 = bits, U32, 1148, [31:31] -targetRpmByClt = scalar, S32, 1152, "", 1, 0 -targetRpmAcBump = scalar, S32, 1156, "", 1, 0 -iacByRpmTaper = scalar, F32, 1160 -luaAdd = scalar, F32, 1164 -; total TS size = 1168 -baseDwell = scalar, F32, 1168, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 1172, "", 1, 0 -luaTimingAdd = scalar, F32, 1176, "", 1, 0 -luaTimingMult = scalar, F32, 1180, "", 1, 0 -; total TS size = 1184 -idlePosition = scalar, F32, 1184, "", 1, 0 -trim = scalar, F32, 1188, "", 1, 0 -luaAdjustment = scalar, F32, 1192, "", 1, 0 -etbFeedForward = scalar, F32, 1196 -etbIntegralError = scalar, F32, 1200, "", 1, 0 -etbCurrentTarget = scalar, F32, 1204, "%", 1, 0 -; total TS size = 1208 -faultCode = scalar, U08, 1208, "", 1, 0 -heaterDuty = scalar, U08, 1209, "%", 1, 0 -pumpDuty = scalar, U08, 1210, "%", 1, 0 -tempC = scalar, U16, 1212, "C", 1, 0 -nernstVoltage = scalar, U16, 1214, "V", 0.001, 0 -esr = scalar, U16, 1216, "", 1, 0 -; total TS size = 1220 +m_hasSynchronizedPhase = bits, U32, 1120, [0:0] +unusedBit_1_1 = bits, U32, 1120, [1:1] +unusedBit_1_2 = bits, U32, 1120, [2:2] +unusedBit_1_3 = bits, U32, 1120, [3:3] +unusedBit_1_4 = bits, U32, 1120, [4:4] +unusedBit_1_5 = bits, U32, 1120, [5:5] +unusedBit_1_6 = bits, U32, 1120, [6:6] +unusedBit_1_7 = bits, U32, 1120, [7:7] +unusedBit_1_8 = bits, U32, 1120, [8:8] +unusedBit_1_9 = bits, U32, 1120, [9:9] +unusedBit_1_10 = bits, U32, 1120, [10:10] +unusedBit_1_11 = bits, U32, 1120, [11:11] +unusedBit_1_12 = bits, U32, 1120, [12:12] +unusedBit_1_13 = bits, U32, 1120, [13:13] +unusedBit_1_14 = bits, U32, 1120, [14:14] +unusedBit_1_15 = bits, U32, 1120, [15:15] +unusedBit_1_16 = bits, U32, 1120, [16:16] +unusedBit_1_17 = bits, U32, 1120, [17:17] +unusedBit_1_18 = bits, U32, 1120, [18:18] +unusedBit_1_19 = bits, U32, 1120, [19:19] +unusedBit_1_20 = bits, U32, 1120, [20:20] +unusedBit_1_21 = bits, U32, 1120, [21:21] +unusedBit_1_22 = bits, U32, 1120, [22:22] +unusedBit_1_23 = bits, U32, 1120, [23:23] +unusedBit_1_24 = bits, U32, 1120, [24:24] +unusedBit_1_25 = bits, U32, 1120, [25:25] +unusedBit_1_26 = bits, U32, 1120, [26:26] +unusedBit_1_27 = bits, U32, 1120, [27:27] +unusedBit_1_28 = bits, U32, 1120, [28:28] +unusedBit_1_29 = bits, U32, 1120, [29:29] +unusedBit_1_30 = bits, U32, 1120, [30:30] +unusedBit_1_31 = bits, U32, 1120, [31:31] +; total TS size = 1124 +wallFuelCorrection = scalar, F32, 1124, "", 1, 0 +wallFuel = scalar, F32, 1128, "", 1, 0 +; total TS size = 1132 +idleState = bits, S32, 1132, [0:2], "not important" +currentIdlePosition = scalar, F32, 1136 +baseIdlePosition = scalar, F32, 1140 +iacByTpsTaper = scalar, F32, 1144 +throttlePedalUpState = scalar, S32, 1148, "", 1, 0 +mightResetPid = bits, U32, 1152, [0:0] +shouldResetPid = bits, U32, 1152, [1:1] +wasResetPid = bits, U32, 1152, [2:2] +mustResetPid = bits, U32, 1152, [3:3] +isCoasting = bits, U32, 1152, [4:4] +useIacTableForCoasting = bits, U32, 1152, [5:5] +notIdling = bits, U32, 1152, [6:6] +needReset = bits, U32, 1152, [7:7] +isInDeadZone = bits, U32, 1152, [8:8] +isBlipping = bits, U32, 1152, [9:9] +useClosedLoop = bits, U32, 1152, [10:10] +badTps = bits, U32, 1152, [11:11] +looksLikeRunning = bits, U32, 1152, [12:12] +looksLikeCoasting = bits, U32, 1152, [13:13] +looksLikeCrankToIdle = bits, U32, 1152, [14:14] +useInstantRpmForIdle = bits, U32, 1152, [15:15] +isVerboseIAC = bits, U32, 1152, [16:16] +unusedBit_22_17 = bits, U32, 1152, [17:17] +unusedBit_22_18 = bits, U32, 1152, [18:18] +unusedBit_22_19 = bits, U32, 1152, [19:19] +unusedBit_22_20 = bits, U32, 1152, [20:20] +unusedBit_22_21 = bits, U32, 1152, [21:21] +unusedBit_22_22 = bits, U32, 1152, [22:22] +unusedBit_22_23 = bits, U32, 1152, [23:23] +unusedBit_22_24 = bits, U32, 1152, [24:24] +unusedBit_22_25 = bits, U32, 1152, [25:25] +unusedBit_22_26 = bits, U32, 1152, [26:26] +unusedBit_22_27 = bits, U32, 1152, [27:27] +unusedBit_22_28 = bits, U32, 1152, [28:28] +unusedBit_22_29 = bits, U32, 1152, [29:29] +unusedBit_22_30 = bits, U32, 1152, [30:30] +unusedBit_22_31 = bits, U32, 1152, [31:31] +targetRpmByClt = scalar, S32, 1156, "", 1, 0 +targetRpmAcBump = scalar, S32, 1160, "", 1, 0 +iacByRpmTaper = scalar, F32, 1164 +luaAdd = scalar, F32, 1168 +; total TS size = 1172 +baseDwell = scalar, F32, 1172, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 1176, "", 1, 0 +luaTimingAdd = scalar, F32, 1180, "", 1, 0 +luaTimingMult = scalar, F32, 1184, "", 1, 0 +; total TS size = 1188 +idlePosition = scalar, F32, 1188, "", 1, 0 +trim = scalar, F32, 1192, "", 1, 0 +luaAdjustment = scalar, F32, 1196, "", 1, 0 +etbFeedForward = scalar, F32, 1200 +etbIntegralError = scalar, F32, 1204, "", 1, 0 +etbCurrentTarget = scalar, F32, 1208, "%", 1, 0 +; total TS size = 1212 +faultCode = scalar, U08, 1212, "", 1, 0 +heaterDuty = scalar, U08, 1213, "%", 1, 0 +pumpDuty = scalar, U08, 1214, "%", 1, 0 +tempC = scalar, U16, 1216, "C", 1, 0 +nernstVoltage = scalar, U16, 1218, "V", 0.001, 0 +esr = scalar, U16, 1220, "", 1, 0 +; total TS size = 1224 time = { timeNow } @@ -4721,7 +4754,6 @@ entry = hellenBoardId, "Detected Board ID", int, "%d" entry = clutchUpState, "clutch: up", int, "%d" entry = clutchDownState, "clutch: down", int, "%d" entry = brakePedalState, "brake: down", int, "%d" -entry = isSynchronizedPhase, "isSynchronizedPhase", int, "%d" entry = egt1, "egt1", float, "%.3f" entry = egt2, "egt2", float, "%.3f" entry = desiredRpmLimit, "User-defined RPM hard limit", int, "%d" @@ -4762,6 +4794,7 @@ entry = triggerStateIndex, "triggerStateIndex", int, "%d" entry = vvtCounter, "vvtCounter", int, "%d" entry = camResyncCounter, "camResyncCounter", int, "%d" entry = vvtStateIndex, "vvtStateIndex", int, "%d" +entry = m_hasSynchronizedPhase, "m_hasSynchronizedPhase", int, "%d" entry = wallFuelCorrection, "fuel injection time correction to account for wall wetting effect for current cycle", float, "%.3f" entry = wallFuel, "Amount of fuel on the wall, in ms of injector open time for each injector.", float, "%.3f" entry = idleState, "idleState", int, "%d" @@ -4966,6 +4999,7 @@ menuDialog = main subMenu = tps_accel_stateDialog, "tps_accel_state" subMenu = trigger_centralDialog, "trigger_central" subMenu = trigger_stateDialog, "trigger_state" + subMenu = trigger_state_primaryDialog, "trigger_state_primary" subMenu = wall_fuel_stateDialog, "wall_fuel_state" subMenu = idle_stateDialog, "idle_state" subMenu = ignition_stateDialog, "ignition_state" @@ -5414,7 +5448,6 @@ indicatorPanel = engine_stateIndicatorPanel, 2 indicator = {clutchUpState}, "clutchUpState No", "clutchUpState Yes" indicator = {clutchDownState}, "clutchDownState No", "clutchDownState Yes" indicator = {brakePedalState}, "brakePedalState No", "brakePedalState Yes" - indicator = {isSynchronizedPhase}, "isSynchronizedPhase No", "isSynchronizedPhase Yes" dialog = engine_stateDialog, "engine_state" panel = engine_stateIndicatorPanel @@ -5523,6 +5556,12 @@ dialog = trigger_stateDialog, "trigger_state" liveGraph = trigger_state_3_Graph, "Graph", South graphLine = vvtStateIndex +indicatorPanel = trigger_state_primaryIndicatorPanel, 2 + indicator = {m_hasSynchronizedPhase}, "m_hasSynchronizedPhase No", "m_hasSynchronizedPhase Yes" + +dialog = trigger_state_primaryDialog, "trigger_state_primary" + panel = trigger_state_primaryIndicatorPanel + dialog = wall_fuel_stateDialog, "wall_fuel_state" liveGraph = wall_fuel_state_1_Graph, "Graph", South diff --git a/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini b/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini index b25fb1039d..ec787b3e44 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.08.24.hellen-nb1.2901163723" + signature = "rusEFI 2022.08.24.hellen-nb1.2877422290" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.08.24.hellen-nb1.2901163723" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.08.24.hellen-nb1.2877422290" ; 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 Wed Aug 24 16:15:30 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Aug 24 22:15:08 UTC 2022 pageSize = 21300 page = 1 @@ -2109,7 +2109,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1220 + ochBlockSize = 1224 ; ; see TunerStudioOutputChannels struct @@ -2990,35 +2990,35 @@ hellenBoardId = scalar, S16, 990, "id", 1, 0 clutchUpState = bits, U32, 992, [0:0] clutchDownState = bits, U32, 992, [1:1] brakePedalState = bits, U32, 992, [2:2] -isSynchronizedPhase = bits, U32, 992, [3:3] -unusedBit_23_4 = bits, U32, 992, [4:4] -unusedBit_23_5 = bits, U32, 992, [5:5] -unusedBit_23_6 = bits, U32, 992, [6:6] -unusedBit_23_7 = bits, U32, 992, [7:7] -unusedBit_23_8 = bits, U32, 992, [8:8] -unusedBit_23_9 = bits, U32, 992, [9:9] -unusedBit_23_10 = bits, U32, 992, [10:10] -unusedBit_23_11 = bits, U32, 992, [11:11] -unusedBit_23_12 = bits, U32, 992, [12:12] -unusedBit_23_13 = bits, U32, 992, [13:13] -unusedBit_23_14 = bits, U32, 992, [14:14] -unusedBit_23_15 = bits, U32, 992, [15:15] -unusedBit_23_16 = bits, U32, 992, [16:16] -unusedBit_23_17 = bits, U32, 992, [17:17] -unusedBit_23_18 = bits, U32, 992, [18:18] -unusedBit_23_19 = bits, U32, 992, [19:19] -unusedBit_23_20 = bits, U32, 992, [20:20] -unusedBit_23_21 = bits, U32, 992, [21:21] -unusedBit_23_22 = bits, U32, 992, [22:22] -unusedBit_23_23 = bits, U32, 992, [23:23] -unusedBit_23_24 = bits, U32, 992, [24:24] -unusedBit_23_25 = bits, U32, 992, [25:25] -unusedBit_23_26 = bits, U32, 992, [26:26] -unusedBit_23_27 = bits, U32, 992, [27:27] -unusedBit_23_28 = bits, U32, 992, [28:28] -unusedBit_23_29 = bits, U32, 992, [29:29] -unusedBit_23_30 = bits, U32, 992, [30:30] -unusedBit_23_31 = bits, U32, 992, [31:31] +unusedBit_22_3 = bits, U32, 992, [3:3] +unusedBit_22_4 = bits, U32, 992, [4:4] +unusedBit_22_5 = bits, U32, 992, [5:5] +unusedBit_22_6 = bits, U32, 992, [6:6] +unusedBit_22_7 = bits, U32, 992, [7:7] +unusedBit_22_8 = bits, U32, 992, [8:8] +unusedBit_22_9 = bits, U32, 992, [9:9] +unusedBit_22_10 = bits, U32, 992, [10:10] +unusedBit_22_11 = bits, U32, 992, [11:11] +unusedBit_22_12 = bits, U32, 992, [12:12] +unusedBit_22_13 = bits, U32, 992, [13:13] +unusedBit_22_14 = bits, U32, 992, [14:14] +unusedBit_22_15 = bits, U32, 992, [15:15] +unusedBit_22_16 = bits, U32, 992, [16:16] +unusedBit_22_17 = bits, U32, 992, [17:17] +unusedBit_22_18 = bits, U32, 992, [18:18] +unusedBit_22_19 = bits, U32, 992, [19:19] +unusedBit_22_20 = bits, U32, 992, [20:20] +unusedBit_22_21 = bits, U32, 992, [21:21] +unusedBit_22_22 = bits, U32, 992, [22:22] +unusedBit_22_23 = bits, U32, 992, [23:23] +unusedBit_22_24 = bits, U32, 992, [24:24] +unusedBit_22_25 = bits, U32, 992, [25:25] +unusedBit_22_26 = bits, U32, 992, [26:26] +unusedBit_22_27 = bits, U32, 992, [27:27] +unusedBit_22_28 = bits, U32, 992, [28:28] +unusedBit_22_29 = bits, U32, 992, [29:29] +unusedBit_22_30 = bits, U32, 992, [30:30] +unusedBit_22_31 = bits, U32, 992, [31:31] egt1 = scalar, F32, 996, "", 1, 0 egt2 = scalar, F32, 1000, "", 1, 0 desiredRpmLimit = scalar, S16, 1004, "rpm", 1, 0 @@ -3089,70 +3089,103 @@ vvtCounter = scalar, U08, 1117, "", 1, 0 camResyncCounter = scalar, U08, 1118, "", 1, 0 vvtStateIndex = scalar, U08, 1119, "", 1, 0 ; total TS size = 1120 -wallFuelCorrection = scalar, F32, 1120, "", 1, 0 -wallFuel = scalar, F32, 1124, "", 1, 0 -; total TS size = 1128 -idleState = bits, S32, 1128, [0:2], "not important" -currentIdlePosition = scalar, F32, 1132 -baseIdlePosition = scalar, F32, 1136 -iacByTpsTaper = scalar, F32, 1140 -throttlePedalUpState = scalar, S32, 1144, "", 1, 0 -mightResetPid = bits, U32, 1148, [0:0] -shouldResetPid = bits, U32, 1148, [1:1] -wasResetPid = bits, U32, 1148, [2:2] -mustResetPid = bits, U32, 1148, [3:3] -isCoasting = bits, U32, 1148, [4:4] -useIacTableForCoasting = bits, U32, 1148, [5:5] -notIdling = bits, U32, 1148, [6:6] -needReset = bits, U32, 1148, [7:7] -isInDeadZone = bits, U32, 1148, [8:8] -isBlipping = bits, U32, 1148, [9:9] -useClosedLoop = bits, U32, 1148, [10:10] -badTps = bits, U32, 1148, [11:11] -looksLikeRunning = bits, U32, 1148, [12:12] -looksLikeCoasting = bits, U32, 1148, [13:13] -looksLikeCrankToIdle = bits, U32, 1148, [14:14] -useInstantRpmForIdle = bits, U32, 1148, [15:15] -isVerboseIAC = bits, U32, 1148, [16:16] -unusedBit_22_17 = bits, U32, 1148, [17:17] -unusedBit_22_18 = bits, U32, 1148, [18:18] -unusedBit_22_19 = bits, U32, 1148, [19:19] -unusedBit_22_20 = bits, U32, 1148, [20:20] -unusedBit_22_21 = bits, U32, 1148, [21:21] -unusedBit_22_22 = bits, U32, 1148, [22:22] -unusedBit_22_23 = bits, U32, 1148, [23:23] -unusedBit_22_24 = bits, U32, 1148, [24:24] -unusedBit_22_25 = bits, U32, 1148, [25:25] -unusedBit_22_26 = bits, U32, 1148, [26:26] -unusedBit_22_27 = bits, U32, 1148, [27:27] -unusedBit_22_28 = bits, U32, 1148, [28:28] -unusedBit_22_29 = bits, U32, 1148, [29:29] -unusedBit_22_30 = bits, U32, 1148, [30:30] -unusedBit_22_31 = bits, U32, 1148, [31:31] -targetRpmByClt = scalar, S32, 1152, "", 1, 0 -targetRpmAcBump = scalar, S32, 1156, "", 1, 0 -iacByRpmTaper = scalar, F32, 1160 -luaAdd = scalar, F32, 1164 -; total TS size = 1168 -baseDwell = scalar, F32, 1168, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 1172, "", 1, 0 -luaTimingAdd = scalar, F32, 1176, "", 1, 0 -luaTimingMult = scalar, F32, 1180, "", 1, 0 -; total TS size = 1184 -idlePosition = scalar, F32, 1184, "", 1, 0 -trim = scalar, F32, 1188, "", 1, 0 -luaAdjustment = scalar, F32, 1192, "", 1, 0 -etbFeedForward = scalar, F32, 1196 -etbIntegralError = scalar, F32, 1200, "", 1, 0 -etbCurrentTarget = scalar, F32, 1204, "%", 1, 0 -; total TS size = 1208 -faultCode = scalar, U08, 1208, "", 1, 0 -heaterDuty = scalar, U08, 1209, "%", 1, 0 -pumpDuty = scalar, U08, 1210, "%", 1, 0 -tempC = scalar, U16, 1212, "C", 1, 0 -nernstVoltage = scalar, U16, 1214, "V", 0.001, 0 -esr = scalar, U16, 1216, "", 1, 0 -; total TS size = 1220 +m_hasSynchronizedPhase = bits, U32, 1120, [0:0] +unusedBit_1_1 = bits, U32, 1120, [1:1] +unusedBit_1_2 = bits, U32, 1120, [2:2] +unusedBit_1_3 = bits, U32, 1120, [3:3] +unusedBit_1_4 = bits, U32, 1120, [4:4] +unusedBit_1_5 = bits, U32, 1120, [5:5] +unusedBit_1_6 = bits, U32, 1120, [6:6] +unusedBit_1_7 = bits, U32, 1120, [7:7] +unusedBit_1_8 = bits, U32, 1120, [8:8] +unusedBit_1_9 = bits, U32, 1120, [9:9] +unusedBit_1_10 = bits, U32, 1120, [10:10] +unusedBit_1_11 = bits, U32, 1120, [11:11] +unusedBit_1_12 = bits, U32, 1120, [12:12] +unusedBit_1_13 = bits, U32, 1120, [13:13] +unusedBit_1_14 = bits, U32, 1120, [14:14] +unusedBit_1_15 = bits, U32, 1120, [15:15] +unusedBit_1_16 = bits, U32, 1120, [16:16] +unusedBit_1_17 = bits, U32, 1120, [17:17] +unusedBit_1_18 = bits, U32, 1120, [18:18] +unusedBit_1_19 = bits, U32, 1120, [19:19] +unusedBit_1_20 = bits, U32, 1120, [20:20] +unusedBit_1_21 = bits, U32, 1120, [21:21] +unusedBit_1_22 = bits, U32, 1120, [22:22] +unusedBit_1_23 = bits, U32, 1120, [23:23] +unusedBit_1_24 = bits, U32, 1120, [24:24] +unusedBit_1_25 = bits, U32, 1120, [25:25] +unusedBit_1_26 = bits, U32, 1120, [26:26] +unusedBit_1_27 = bits, U32, 1120, [27:27] +unusedBit_1_28 = bits, U32, 1120, [28:28] +unusedBit_1_29 = bits, U32, 1120, [29:29] +unusedBit_1_30 = bits, U32, 1120, [30:30] +unusedBit_1_31 = bits, U32, 1120, [31:31] +; total TS size = 1124 +wallFuelCorrection = scalar, F32, 1124, "", 1, 0 +wallFuel = scalar, F32, 1128, "", 1, 0 +; total TS size = 1132 +idleState = bits, S32, 1132, [0:2], "not important" +currentIdlePosition = scalar, F32, 1136 +baseIdlePosition = scalar, F32, 1140 +iacByTpsTaper = scalar, F32, 1144 +throttlePedalUpState = scalar, S32, 1148, "", 1, 0 +mightResetPid = bits, U32, 1152, [0:0] +shouldResetPid = bits, U32, 1152, [1:1] +wasResetPid = bits, U32, 1152, [2:2] +mustResetPid = bits, U32, 1152, [3:3] +isCoasting = bits, U32, 1152, [4:4] +useIacTableForCoasting = bits, U32, 1152, [5:5] +notIdling = bits, U32, 1152, [6:6] +needReset = bits, U32, 1152, [7:7] +isInDeadZone = bits, U32, 1152, [8:8] +isBlipping = bits, U32, 1152, [9:9] +useClosedLoop = bits, U32, 1152, [10:10] +badTps = bits, U32, 1152, [11:11] +looksLikeRunning = bits, U32, 1152, [12:12] +looksLikeCoasting = bits, U32, 1152, [13:13] +looksLikeCrankToIdle = bits, U32, 1152, [14:14] +useInstantRpmForIdle = bits, U32, 1152, [15:15] +isVerboseIAC = bits, U32, 1152, [16:16] +unusedBit_22_17 = bits, U32, 1152, [17:17] +unusedBit_22_18 = bits, U32, 1152, [18:18] +unusedBit_22_19 = bits, U32, 1152, [19:19] +unusedBit_22_20 = bits, U32, 1152, [20:20] +unusedBit_22_21 = bits, U32, 1152, [21:21] +unusedBit_22_22 = bits, U32, 1152, [22:22] +unusedBit_22_23 = bits, U32, 1152, [23:23] +unusedBit_22_24 = bits, U32, 1152, [24:24] +unusedBit_22_25 = bits, U32, 1152, [25:25] +unusedBit_22_26 = bits, U32, 1152, [26:26] +unusedBit_22_27 = bits, U32, 1152, [27:27] +unusedBit_22_28 = bits, U32, 1152, [28:28] +unusedBit_22_29 = bits, U32, 1152, [29:29] +unusedBit_22_30 = bits, U32, 1152, [30:30] +unusedBit_22_31 = bits, U32, 1152, [31:31] +targetRpmByClt = scalar, S32, 1156, "", 1, 0 +targetRpmAcBump = scalar, S32, 1160, "", 1, 0 +iacByRpmTaper = scalar, F32, 1164 +luaAdd = scalar, F32, 1168 +; total TS size = 1172 +baseDwell = scalar, F32, 1172, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 1176, "", 1, 0 +luaTimingAdd = scalar, F32, 1180, "", 1, 0 +luaTimingMult = scalar, F32, 1184, "", 1, 0 +; total TS size = 1188 +idlePosition = scalar, F32, 1188, "", 1, 0 +trim = scalar, F32, 1192, "", 1, 0 +luaAdjustment = scalar, F32, 1196, "", 1, 0 +etbFeedForward = scalar, F32, 1200 +etbIntegralError = scalar, F32, 1204, "", 1, 0 +etbCurrentTarget = scalar, F32, 1208, "%", 1, 0 +; total TS size = 1212 +faultCode = scalar, U08, 1212, "", 1, 0 +heaterDuty = scalar, U08, 1213, "%", 1, 0 +pumpDuty = scalar, U08, 1214, "%", 1, 0 +tempC = scalar, U16, 1216, "C", 1, 0 +nernstVoltage = scalar, U16, 1218, "V", 0.001, 0 +esr = scalar, U16, 1220, "", 1, 0 +; total TS size = 1224 time = { timeNow } @@ -4721,7 +4754,6 @@ entry = hellenBoardId, "Detected Board ID", int, "%d" entry = clutchUpState, "clutch: up", int, "%d" entry = clutchDownState, "clutch: down", int, "%d" entry = brakePedalState, "brake: down", int, "%d" -entry = isSynchronizedPhase, "isSynchronizedPhase", int, "%d" entry = egt1, "egt1", float, "%.3f" entry = egt2, "egt2", float, "%.3f" entry = desiredRpmLimit, "User-defined RPM hard limit", int, "%d" @@ -4762,6 +4794,7 @@ entry = triggerStateIndex, "triggerStateIndex", int, "%d" entry = vvtCounter, "vvtCounter", int, "%d" entry = camResyncCounter, "camResyncCounter", int, "%d" entry = vvtStateIndex, "vvtStateIndex", int, "%d" +entry = m_hasSynchronizedPhase, "m_hasSynchronizedPhase", int, "%d" entry = wallFuelCorrection, "fuel injection time correction to account for wall wetting effect for current cycle", float, "%.3f" entry = wallFuel, "Amount of fuel on the wall, in ms of injector open time for each injector.", float, "%.3f" entry = idleState, "idleState", int, "%d" @@ -4966,6 +4999,7 @@ menuDialog = main subMenu = tps_accel_stateDialog, "tps_accel_state" subMenu = trigger_centralDialog, "trigger_central" subMenu = trigger_stateDialog, "trigger_state" + subMenu = trigger_state_primaryDialog, "trigger_state_primary" subMenu = wall_fuel_stateDialog, "wall_fuel_state" subMenu = idle_stateDialog, "idle_state" subMenu = ignition_stateDialog, "ignition_state" @@ -5414,7 +5448,6 @@ indicatorPanel = engine_stateIndicatorPanel, 2 indicator = {clutchUpState}, "clutchUpState No", "clutchUpState Yes" indicator = {clutchDownState}, "clutchDownState No", "clutchDownState Yes" indicator = {brakePedalState}, "brakePedalState No", "brakePedalState Yes" - indicator = {isSynchronizedPhase}, "isSynchronizedPhase No", "isSynchronizedPhase Yes" dialog = engine_stateDialog, "engine_state" panel = engine_stateIndicatorPanel @@ -5523,6 +5556,12 @@ dialog = trigger_stateDialog, "trigger_state" liveGraph = trigger_state_3_Graph, "Graph", South graphLine = vvtStateIndex +indicatorPanel = trigger_state_primaryIndicatorPanel, 2 + indicator = {m_hasSynchronizedPhase}, "m_hasSynchronizedPhase No", "m_hasSynchronizedPhase Yes" + +dialog = trigger_state_primaryDialog, "trigger_state_primary" + panel = trigger_state_primaryIndicatorPanel + dialog = wall_fuel_stateDialog, "wall_fuel_state" liveGraph = wall_fuel_state_1_Graph, "Graph", South diff --git a/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini b/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini index e28561d558..4056084d61 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.08.24.hellen121nissan.4256806893" + signature = "rusEFI 2022.08.24.hellen121nissan.4208227316" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.08.24.hellen121nissan.4256806893" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.08.24.hellen121nissan.4208227316" ; 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 Wed Aug 24 16:15:22 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Aug 24 22:15:00 UTC 2022 pageSize = 21300 page = 1 @@ -2109,7 +2109,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1220 + ochBlockSize = 1224 ; ; see TunerStudioOutputChannels struct @@ -2990,35 +2990,35 @@ hellenBoardId = scalar, S16, 990, "id", 1, 0 clutchUpState = bits, U32, 992, [0:0] clutchDownState = bits, U32, 992, [1:1] brakePedalState = bits, U32, 992, [2:2] -isSynchronizedPhase = bits, U32, 992, [3:3] -unusedBit_23_4 = bits, U32, 992, [4:4] -unusedBit_23_5 = bits, U32, 992, [5:5] -unusedBit_23_6 = bits, U32, 992, [6:6] -unusedBit_23_7 = bits, U32, 992, [7:7] -unusedBit_23_8 = bits, U32, 992, [8:8] -unusedBit_23_9 = bits, U32, 992, [9:9] -unusedBit_23_10 = bits, U32, 992, [10:10] -unusedBit_23_11 = bits, U32, 992, [11:11] -unusedBit_23_12 = bits, U32, 992, [12:12] -unusedBit_23_13 = bits, U32, 992, [13:13] -unusedBit_23_14 = bits, U32, 992, [14:14] -unusedBit_23_15 = bits, U32, 992, [15:15] -unusedBit_23_16 = bits, U32, 992, [16:16] -unusedBit_23_17 = bits, U32, 992, [17:17] -unusedBit_23_18 = bits, U32, 992, [18:18] -unusedBit_23_19 = bits, U32, 992, [19:19] -unusedBit_23_20 = bits, U32, 992, [20:20] -unusedBit_23_21 = bits, U32, 992, [21:21] -unusedBit_23_22 = bits, U32, 992, [22:22] -unusedBit_23_23 = bits, U32, 992, [23:23] -unusedBit_23_24 = bits, U32, 992, [24:24] -unusedBit_23_25 = bits, U32, 992, [25:25] -unusedBit_23_26 = bits, U32, 992, [26:26] -unusedBit_23_27 = bits, U32, 992, [27:27] -unusedBit_23_28 = bits, U32, 992, [28:28] -unusedBit_23_29 = bits, U32, 992, [29:29] -unusedBit_23_30 = bits, U32, 992, [30:30] -unusedBit_23_31 = bits, U32, 992, [31:31] +unusedBit_22_3 = bits, U32, 992, [3:3] +unusedBit_22_4 = bits, U32, 992, [4:4] +unusedBit_22_5 = bits, U32, 992, [5:5] +unusedBit_22_6 = bits, U32, 992, [6:6] +unusedBit_22_7 = bits, U32, 992, [7:7] +unusedBit_22_8 = bits, U32, 992, [8:8] +unusedBit_22_9 = bits, U32, 992, [9:9] +unusedBit_22_10 = bits, U32, 992, [10:10] +unusedBit_22_11 = bits, U32, 992, [11:11] +unusedBit_22_12 = bits, U32, 992, [12:12] +unusedBit_22_13 = bits, U32, 992, [13:13] +unusedBit_22_14 = bits, U32, 992, [14:14] +unusedBit_22_15 = bits, U32, 992, [15:15] +unusedBit_22_16 = bits, U32, 992, [16:16] +unusedBit_22_17 = bits, U32, 992, [17:17] +unusedBit_22_18 = bits, U32, 992, [18:18] +unusedBit_22_19 = bits, U32, 992, [19:19] +unusedBit_22_20 = bits, U32, 992, [20:20] +unusedBit_22_21 = bits, U32, 992, [21:21] +unusedBit_22_22 = bits, U32, 992, [22:22] +unusedBit_22_23 = bits, U32, 992, [23:23] +unusedBit_22_24 = bits, U32, 992, [24:24] +unusedBit_22_25 = bits, U32, 992, [25:25] +unusedBit_22_26 = bits, U32, 992, [26:26] +unusedBit_22_27 = bits, U32, 992, [27:27] +unusedBit_22_28 = bits, U32, 992, [28:28] +unusedBit_22_29 = bits, U32, 992, [29:29] +unusedBit_22_30 = bits, U32, 992, [30:30] +unusedBit_22_31 = bits, U32, 992, [31:31] egt1 = scalar, F32, 996, "", 1, 0 egt2 = scalar, F32, 1000, "", 1, 0 desiredRpmLimit = scalar, S16, 1004, "rpm", 1, 0 @@ -3089,70 +3089,103 @@ vvtCounter = scalar, U08, 1117, "", 1, 0 camResyncCounter = scalar, U08, 1118, "", 1, 0 vvtStateIndex = scalar, U08, 1119, "", 1, 0 ; total TS size = 1120 -wallFuelCorrection = scalar, F32, 1120, "", 1, 0 -wallFuel = scalar, F32, 1124, "", 1, 0 -; total TS size = 1128 -idleState = bits, S32, 1128, [0:2], "not important" -currentIdlePosition = scalar, F32, 1132 -baseIdlePosition = scalar, F32, 1136 -iacByTpsTaper = scalar, F32, 1140 -throttlePedalUpState = scalar, S32, 1144, "", 1, 0 -mightResetPid = bits, U32, 1148, [0:0] -shouldResetPid = bits, U32, 1148, [1:1] -wasResetPid = bits, U32, 1148, [2:2] -mustResetPid = bits, U32, 1148, [3:3] -isCoasting = bits, U32, 1148, [4:4] -useIacTableForCoasting = bits, U32, 1148, [5:5] -notIdling = bits, U32, 1148, [6:6] -needReset = bits, U32, 1148, [7:7] -isInDeadZone = bits, U32, 1148, [8:8] -isBlipping = bits, U32, 1148, [9:9] -useClosedLoop = bits, U32, 1148, [10:10] -badTps = bits, U32, 1148, [11:11] -looksLikeRunning = bits, U32, 1148, [12:12] -looksLikeCoasting = bits, U32, 1148, [13:13] -looksLikeCrankToIdle = bits, U32, 1148, [14:14] -useInstantRpmForIdle = bits, U32, 1148, [15:15] -isVerboseIAC = bits, U32, 1148, [16:16] -unusedBit_22_17 = bits, U32, 1148, [17:17] -unusedBit_22_18 = bits, U32, 1148, [18:18] -unusedBit_22_19 = bits, U32, 1148, [19:19] -unusedBit_22_20 = bits, U32, 1148, [20:20] -unusedBit_22_21 = bits, U32, 1148, [21:21] -unusedBit_22_22 = bits, U32, 1148, [22:22] -unusedBit_22_23 = bits, U32, 1148, [23:23] -unusedBit_22_24 = bits, U32, 1148, [24:24] -unusedBit_22_25 = bits, U32, 1148, [25:25] -unusedBit_22_26 = bits, U32, 1148, [26:26] -unusedBit_22_27 = bits, U32, 1148, [27:27] -unusedBit_22_28 = bits, U32, 1148, [28:28] -unusedBit_22_29 = bits, U32, 1148, [29:29] -unusedBit_22_30 = bits, U32, 1148, [30:30] -unusedBit_22_31 = bits, U32, 1148, [31:31] -targetRpmByClt = scalar, S32, 1152, "", 1, 0 -targetRpmAcBump = scalar, S32, 1156, "", 1, 0 -iacByRpmTaper = scalar, F32, 1160 -luaAdd = scalar, F32, 1164 -; total TS size = 1168 -baseDwell = scalar, F32, 1168, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 1172, "", 1, 0 -luaTimingAdd = scalar, F32, 1176, "", 1, 0 -luaTimingMult = scalar, F32, 1180, "", 1, 0 -; total TS size = 1184 -idlePosition = scalar, F32, 1184, "", 1, 0 -trim = scalar, F32, 1188, "", 1, 0 -luaAdjustment = scalar, F32, 1192, "", 1, 0 -etbFeedForward = scalar, F32, 1196 -etbIntegralError = scalar, F32, 1200, "", 1, 0 -etbCurrentTarget = scalar, F32, 1204, "%", 1, 0 -; total TS size = 1208 -faultCode = scalar, U08, 1208, "", 1, 0 -heaterDuty = scalar, U08, 1209, "%", 1, 0 -pumpDuty = scalar, U08, 1210, "%", 1, 0 -tempC = scalar, U16, 1212, "C", 1, 0 -nernstVoltage = scalar, U16, 1214, "V", 0.001, 0 -esr = scalar, U16, 1216, "", 1, 0 -; total TS size = 1220 +m_hasSynchronizedPhase = bits, U32, 1120, [0:0] +unusedBit_1_1 = bits, U32, 1120, [1:1] +unusedBit_1_2 = bits, U32, 1120, [2:2] +unusedBit_1_3 = bits, U32, 1120, [3:3] +unusedBit_1_4 = bits, U32, 1120, [4:4] +unusedBit_1_5 = bits, U32, 1120, [5:5] +unusedBit_1_6 = bits, U32, 1120, [6:6] +unusedBit_1_7 = bits, U32, 1120, [7:7] +unusedBit_1_8 = bits, U32, 1120, [8:8] +unusedBit_1_9 = bits, U32, 1120, [9:9] +unusedBit_1_10 = bits, U32, 1120, [10:10] +unusedBit_1_11 = bits, U32, 1120, [11:11] +unusedBit_1_12 = bits, U32, 1120, [12:12] +unusedBit_1_13 = bits, U32, 1120, [13:13] +unusedBit_1_14 = bits, U32, 1120, [14:14] +unusedBit_1_15 = bits, U32, 1120, [15:15] +unusedBit_1_16 = bits, U32, 1120, [16:16] +unusedBit_1_17 = bits, U32, 1120, [17:17] +unusedBit_1_18 = bits, U32, 1120, [18:18] +unusedBit_1_19 = bits, U32, 1120, [19:19] +unusedBit_1_20 = bits, U32, 1120, [20:20] +unusedBit_1_21 = bits, U32, 1120, [21:21] +unusedBit_1_22 = bits, U32, 1120, [22:22] +unusedBit_1_23 = bits, U32, 1120, [23:23] +unusedBit_1_24 = bits, U32, 1120, [24:24] +unusedBit_1_25 = bits, U32, 1120, [25:25] +unusedBit_1_26 = bits, U32, 1120, [26:26] +unusedBit_1_27 = bits, U32, 1120, [27:27] +unusedBit_1_28 = bits, U32, 1120, [28:28] +unusedBit_1_29 = bits, U32, 1120, [29:29] +unusedBit_1_30 = bits, U32, 1120, [30:30] +unusedBit_1_31 = bits, U32, 1120, [31:31] +; total TS size = 1124 +wallFuelCorrection = scalar, F32, 1124, "", 1, 0 +wallFuel = scalar, F32, 1128, "", 1, 0 +; total TS size = 1132 +idleState = bits, S32, 1132, [0:2], "not important" +currentIdlePosition = scalar, F32, 1136 +baseIdlePosition = scalar, F32, 1140 +iacByTpsTaper = scalar, F32, 1144 +throttlePedalUpState = scalar, S32, 1148, "", 1, 0 +mightResetPid = bits, U32, 1152, [0:0] +shouldResetPid = bits, U32, 1152, [1:1] +wasResetPid = bits, U32, 1152, [2:2] +mustResetPid = bits, U32, 1152, [3:3] +isCoasting = bits, U32, 1152, [4:4] +useIacTableForCoasting = bits, U32, 1152, [5:5] +notIdling = bits, U32, 1152, [6:6] +needReset = bits, U32, 1152, [7:7] +isInDeadZone = bits, U32, 1152, [8:8] +isBlipping = bits, U32, 1152, [9:9] +useClosedLoop = bits, U32, 1152, [10:10] +badTps = bits, U32, 1152, [11:11] +looksLikeRunning = bits, U32, 1152, [12:12] +looksLikeCoasting = bits, U32, 1152, [13:13] +looksLikeCrankToIdle = bits, U32, 1152, [14:14] +useInstantRpmForIdle = bits, U32, 1152, [15:15] +isVerboseIAC = bits, U32, 1152, [16:16] +unusedBit_22_17 = bits, U32, 1152, [17:17] +unusedBit_22_18 = bits, U32, 1152, [18:18] +unusedBit_22_19 = bits, U32, 1152, [19:19] +unusedBit_22_20 = bits, U32, 1152, [20:20] +unusedBit_22_21 = bits, U32, 1152, [21:21] +unusedBit_22_22 = bits, U32, 1152, [22:22] +unusedBit_22_23 = bits, U32, 1152, [23:23] +unusedBit_22_24 = bits, U32, 1152, [24:24] +unusedBit_22_25 = bits, U32, 1152, [25:25] +unusedBit_22_26 = bits, U32, 1152, [26:26] +unusedBit_22_27 = bits, U32, 1152, [27:27] +unusedBit_22_28 = bits, U32, 1152, [28:28] +unusedBit_22_29 = bits, U32, 1152, [29:29] +unusedBit_22_30 = bits, U32, 1152, [30:30] +unusedBit_22_31 = bits, U32, 1152, [31:31] +targetRpmByClt = scalar, S32, 1156, "", 1, 0 +targetRpmAcBump = scalar, S32, 1160, "", 1, 0 +iacByRpmTaper = scalar, F32, 1164 +luaAdd = scalar, F32, 1168 +; total TS size = 1172 +baseDwell = scalar, F32, 1172, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 1176, "", 1, 0 +luaTimingAdd = scalar, F32, 1180, "", 1, 0 +luaTimingMult = scalar, F32, 1184, "", 1, 0 +; total TS size = 1188 +idlePosition = scalar, F32, 1188, "", 1, 0 +trim = scalar, F32, 1192, "", 1, 0 +luaAdjustment = scalar, F32, 1196, "", 1, 0 +etbFeedForward = scalar, F32, 1200 +etbIntegralError = scalar, F32, 1204, "", 1, 0 +etbCurrentTarget = scalar, F32, 1208, "%", 1, 0 +; total TS size = 1212 +faultCode = scalar, U08, 1212, "", 1, 0 +heaterDuty = scalar, U08, 1213, "%", 1, 0 +pumpDuty = scalar, U08, 1214, "%", 1, 0 +tempC = scalar, U16, 1216, "C", 1, 0 +nernstVoltage = scalar, U16, 1218, "V", 0.001, 0 +esr = scalar, U16, 1220, "", 1, 0 +; total TS size = 1224 time = { timeNow } @@ -4721,7 +4754,6 @@ entry = hellenBoardId, "Detected Board ID", int, "%d" entry = clutchUpState, "clutch: up", int, "%d" entry = clutchDownState, "clutch: down", int, "%d" entry = brakePedalState, "brake: down", int, "%d" -entry = isSynchronizedPhase, "isSynchronizedPhase", int, "%d" entry = egt1, "egt1", float, "%.3f" entry = egt2, "egt2", float, "%.3f" entry = desiredRpmLimit, "User-defined RPM hard limit", int, "%d" @@ -4762,6 +4794,7 @@ entry = triggerStateIndex, "triggerStateIndex", int, "%d" entry = vvtCounter, "vvtCounter", int, "%d" entry = camResyncCounter, "camResyncCounter", int, "%d" entry = vvtStateIndex, "vvtStateIndex", int, "%d" +entry = m_hasSynchronizedPhase, "m_hasSynchronizedPhase", int, "%d" entry = wallFuelCorrection, "fuel injection time correction to account for wall wetting effect for current cycle", float, "%.3f" entry = wallFuel, "Amount of fuel on the wall, in ms of injector open time for each injector.", float, "%.3f" entry = idleState, "idleState", int, "%d" @@ -4966,6 +4999,7 @@ menuDialog = main subMenu = tps_accel_stateDialog, "tps_accel_state" subMenu = trigger_centralDialog, "trigger_central" subMenu = trigger_stateDialog, "trigger_state" + subMenu = trigger_state_primaryDialog, "trigger_state_primary" subMenu = wall_fuel_stateDialog, "wall_fuel_state" subMenu = idle_stateDialog, "idle_state" subMenu = ignition_stateDialog, "ignition_state" @@ -5414,7 +5448,6 @@ indicatorPanel = engine_stateIndicatorPanel, 2 indicator = {clutchUpState}, "clutchUpState No", "clutchUpState Yes" indicator = {clutchDownState}, "clutchDownState No", "clutchDownState Yes" indicator = {brakePedalState}, "brakePedalState No", "brakePedalState Yes" - indicator = {isSynchronizedPhase}, "isSynchronizedPhase No", "isSynchronizedPhase Yes" dialog = engine_stateDialog, "engine_state" panel = engine_stateIndicatorPanel @@ -5523,6 +5556,12 @@ dialog = trigger_stateDialog, "trigger_state" liveGraph = trigger_state_3_Graph, "Graph", South graphLine = vvtStateIndex +indicatorPanel = trigger_state_primaryIndicatorPanel, 2 + indicator = {m_hasSynchronizedPhase}, "m_hasSynchronizedPhase No", "m_hasSynchronizedPhase Yes" + +dialog = trigger_state_primaryDialog, "trigger_state_primary" + panel = trigger_state_primaryIndicatorPanel + dialog = wall_fuel_stateDialog, "wall_fuel_state" liveGraph = wall_fuel_state_1_Graph, "Graph", South diff --git a/firmware/tunerstudio/generated/rusefi_hellen121vag.ini b/firmware/tunerstudio/generated/rusefi_hellen121vag.ini index ec904996ca..5bd8528bdc 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen121vag.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen121vag.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.08.24.hellen121vag.88525949" + signature = "rusEFI 2022.08.24.hellen121vag.36374628" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.08.24.hellen121vag.88525949" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.08.24.hellen121vag.36374628" ; 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 Wed Aug 24 16:15:20 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Aug 24 22:14:59 UTC 2022 pageSize = 21300 page = 1 @@ -2109,7 +2109,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1220 + ochBlockSize = 1224 ; ; see TunerStudioOutputChannels struct @@ -2990,35 +2990,35 @@ hellenBoardId = scalar, S16, 990, "id", 1, 0 clutchUpState = bits, U32, 992, [0:0] clutchDownState = bits, U32, 992, [1:1] brakePedalState = bits, U32, 992, [2:2] -isSynchronizedPhase = bits, U32, 992, [3:3] -unusedBit_23_4 = bits, U32, 992, [4:4] -unusedBit_23_5 = bits, U32, 992, [5:5] -unusedBit_23_6 = bits, U32, 992, [6:6] -unusedBit_23_7 = bits, U32, 992, [7:7] -unusedBit_23_8 = bits, U32, 992, [8:8] -unusedBit_23_9 = bits, U32, 992, [9:9] -unusedBit_23_10 = bits, U32, 992, [10:10] -unusedBit_23_11 = bits, U32, 992, [11:11] -unusedBit_23_12 = bits, U32, 992, [12:12] -unusedBit_23_13 = bits, U32, 992, [13:13] -unusedBit_23_14 = bits, U32, 992, [14:14] -unusedBit_23_15 = bits, U32, 992, [15:15] -unusedBit_23_16 = bits, U32, 992, [16:16] -unusedBit_23_17 = bits, U32, 992, [17:17] -unusedBit_23_18 = bits, U32, 992, [18:18] -unusedBit_23_19 = bits, U32, 992, [19:19] -unusedBit_23_20 = bits, U32, 992, [20:20] -unusedBit_23_21 = bits, U32, 992, [21:21] -unusedBit_23_22 = bits, U32, 992, [22:22] -unusedBit_23_23 = bits, U32, 992, [23:23] -unusedBit_23_24 = bits, U32, 992, [24:24] -unusedBit_23_25 = bits, U32, 992, [25:25] -unusedBit_23_26 = bits, U32, 992, [26:26] -unusedBit_23_27 = bits, U32, 992, [27:27] -unusedBit_23_28 = bits, U32, 992, [28:28] -unusedBit_23_29 = bits, U32, 992, [29:29] -unusedBit_23_30 = bits, U32, 992, [30:30] -unusedBit_23_31 = bits, U32, 992, [31:31] +unusedBit_22_3 = bits, U32, 992, [3:3] +unusedBit_22_4 = bits, U32, 992, [4:4] +unusedBit_22_5 = bits, U32, 992, [5:5] +unusedBit_22_6 = bits, U32, 992, [6:6] +unusedBit_22_7 = bits, U32, 992, [7:7] +unusedBit_22_8 = bits, U32, 992, [8:8] +unusedBit_22_9 = bits, U32, 992, [9:9] +unusedBit_22_10 = bits, U32, 992, [10:10] +unusedBit_22_11 = bits, U32, 992, [11:11] +unusedBit_22_12 = bits, U32, 992, [12:12] +unusedBit_22_13 = bits, U32, 992, [13:13] +unusedBit_22_14 = bits, U32, 992, [14:14] +unusedBit_22_15 = bits, U32, 992, [15:15] +unusedBit_22_16 = bits, U32, 992, [16:16] +unusedBit_22_17 = bits, U32, 992, [17:17] +unusedBit_22_18 = bits, U32, 992, [18:18] +unusedBit_22_19 = bits, U32, 992, [19:19] +unusedBit_22_20 = bits, U32, 992, [20:20] +unusedBit_22_21 = bits, U32, 992, [21:21] +unusedBit_22_22 = bits, U32, 992, [22:22] +unusedBit_22_23 = bits, U32, 992, [23:23] +unusedBit_22_24 = bits, U32, 992, [24:24] +unusedBit_22_25 = bits, U32, 992, [25:25] +unusedBit_22_26 = bits, U32, 992, [26:26] +unusedBit_22_27 = bits, U32, 992, [27:27] +unusedBit_22_28 = bits, U32, 992, [28:28] +unusedBit_22_29 = bits, U32, 992, [29:29] +unusedBit_22_30 = bits, U32, 992, [30:30] +unusedBit_22_31 = bits, U32, 992, [31:31] egt1 = scalar, F32, 996, "", 1, 0 egt2 = scalar, F32, 1000, "", 1, 0 desiredRpmLimit = scalar, S16, 1004, "rpm", 1, 0 @@ -3089,70 +3089,103 @@ vvtCounter = scalar, U08, 1117, "", 1, 0 camResyncCounter = scalar, U08, 1118, "", 1, 0 vvtStateIndex = scalar, U08, 1119, "", 1, 0 ; total TS size = 1120 -wallFuelCorrection = scalar, F32, 1120, "", 1, 0 -wallFuel = scalar, F32, 1124, "", 1, 0 -; total TS size = 1128 -idleState = bits, S32, 1128, [0:2], "not important" -currentIdlePosition = scalar, F32, 1132 -baseIdlePosition = scalar, F32, 1136 -iacByTpsTaper = scalar, F32, 1140 -throttlePedalUpState = scalar, S32, 1144, "", 1, 0 -mightResetPid = bits, U32, 1148, [0:0] -shouldResetPid = bits, U32, 1148, [1:1] -wasResetPid = bits, U32, 1148, [2:2] -mustResetPid = bits, U32, 1148, [3:3] -isCoasting = bits, U32, 1148, [4:4] -useIacTableForCoasting = bits, U32, 1148, [5:5] -notIdling = bits, U32, 1148, [6:6] -needReset = bits, U32, 1148, [7:7] -isInDeadZone = bits, U32, 1148, [8:8] -isBlipping = bits, U32, 1148, [9:9] -useClosedLoop = bits, U32, 1148, [10:10] -badTps = bits, U32, 1148, [11:11] -looksLikeRunning = bits, U32, 1148, [12:12] -looksLikeCoasting = bits, U32, 1148, [13:13] -looksLikeCrankToIdle = bits, U32, 1148, [14:14] -useInstantRpmForIdle = bits, U32, 1148, [15:15] -isVerboseIAC = bits, U32, 1148, [16:16] -unusedBit_22_17 = bits, U32, 1148, [17:17] -unusedBit_22_18 = bits, U32, 1148, [18:18] -unusedBit_22_19 = bits, U32, 1148, [19:19] -unusedBit_22_20 = bits, U32, 1148, [20:20] -unusedBit_22_21 = bits, U32, 1148, [21:21] -unusedBit_22_22 = bits, U32, 1148, [22:22] -unusedBit_22_23 = bits, U32, 1148, [23:23] -unusedBit_22_24 = bits, U32, 1148, [24:24] -unusedBit_22_25 = bits, U32, 1148, [25:25] -unusedBit_22_26 = bits, U32, 1148, [26:26] -unusedBit_22_27 = bits, U32, 1148, [27:27] -unusedBit_22_28 = bits, U32, 1148, [28:28] -unusedBit_22_29 = bits, U32, 1148, [29:29] -unusedBit_22_30 = bits, U32, 1148, [30:30] -unusedBit_22_31 = bits, U32, 1148, [31:31] -targetRpmByClt = scalar, S32, 1152, "", 1, 0 -targetRpmAcBump = scalar, S32, 1156, "", 1, 0 -iacByRpmTaper = scalar, F32, 1160 -luaAdd = scalar, F32, 1164 -; total TS size = 1168 -baseDwell = scalar, F32, 1168, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 1172, "", 1, 0 -luaTimingAdd = scalar, F32, 1176, "", 1, 0 -luaTimingMult = scalar, F32, 1180, "", 1, 0 -; total TS size = 1184 -idlePosition = scalar, F32, 1184, "", 1, 0 -trim = scalar, F32, 1188, "", 1, 0 -luaAdjustment = scalar, F32, 1192, "", 1, 0 -etbFeedForward = scalar, F32, 1196 -etbIntegralError = scalar, F32, 1200, "", 1, 0 -etbCurrentTarget = scalar, F32, 1204, "%", 1, 0 -; total TS size = 1208 -faultCode = scalar, U08, 1208, "", 1, 0 -heaterDuty = scalar, U08, 1209, "%", 1, 0 -pumpDuty = scalar, U08, 1210, "%", 1, 0 -tempC = scalar, U16, 1212, "C", 1, 0 -nernstVoltage = scalar, U16, 1214, "V", 0.001, 0 -esr = scalar, U16, 1216, "", 1, 0 -; total TS size = 1220 +m_hasSynchronizedPhase = bits, U32, 1120, [0:0] +unusedBit_1_1 = bits, U32, 1120, [1:1] +unusedBit_1_2 = bits, U32, 1120, [2:2] +unusedBit_1_3 = bits, U32, 1120, [3:3] +unusedBit_1_4 = bits, U32, 1120, [4:4] +unusedBit_1_5 = bits, U32, 1120, [5:5] +unusedBit_1_6 = bits, U32, 1120, [6:6] +unusedBit_1_7 = bits, U32, 1120, [7:7] +unusedBit_1_8 = bits, U32, 1120, [8:8] +unusedBit_1_9 = bits, U32, 1120, [9:9] +unusedBit_1_10 = bits, U32, 1120, [10:10] +unusedBit_1_11 = bits, U32, 1120, [11:11] +unusedBit_1_12 = bits, U32, 1120, [12:12] +unusedBit_1_13 = bits, U32, 1120, [13:13] +unusedBit_1_14 = bits, U32, 1120, [14:14] +unusedBit_1_15 = bits, U32, 1120, [15:15] +unusedBit_1_16 = bits, U32, 1120, [16:16] +unusedBit_1_17 = bits, U32, 1120, [17:17] +unusedBit_1_18 = bits, U32, 1120, [18:18] +unusedBit_1_19 = bits, U32, 1120, [19:19] +unusedBit_1_20 = bits, U32, 1120, [20:20] +unusedBit_1_21 = bits, U32, 1120, [21:21] +unusedBit_1_22 = bits, U32, 1120, [22:22] +unusedBit_1_23 = bits, U32, 1120, [23:23] +unusedBit_1_24 = bits, U32, 1120, [24:24] +unusedBit_1_25 = bits, U32, 1120, [25:25] +unusedBit_1_26 = bits, U32, 1120, [26:26] +unusedBit_1_27 = bits, U32, 1120, [27:27] +unusedBit_1_28 = bits, U32, 1120, [28:28] +unusedBit_1_29 = bits, U32, 1120, [29:29] +unusedBit_1_30 = bits, U32, 1120, [30:30] +unusedBit_1_31 = bits, U32, 1120, [31:31] +; total TS size = 1124 +wallFuelCorrection = scalar, F32, 1124, "", 1, 0 +wallFuel = scalar, F32, 1128, "", 1, 0 +; total TS size = 1132 +idleState = bits, S32, 1132, [0:2], "not important" +currentIdlePosition = scalar, F32, 1136 +baseIdlePosition = scalar, F32, 1140 +iacByTpsTaper = scalar, F32, 1144 +throttlePedalUpState = scalar, S32, 1148, "", 1, 0 +mightResetPid = bits, U32, 1152, [0:0] +shouldResetPid = bits, U32, 1152, [1:1] +wasResetPid = bits, U32, 1152, [2:2] +mustResetPid = bits, U32, 1152, [3:3] +isCoasting = bits, U32, 1152, [4:4] +useIacTableForCoasting = bits, U32, 1152, [5:5] +notIdling = bits, U32, 1152, [6:6] +needReset = bits, U32, 1152, [7:7] +isInDeadZone = bits, U32, 1152, [8:8] +isBlipping = bits, U32, 1152, [9:9] +useClosedLoop = bits, U32, 1152, [10:10] +badTps = bits, U32, 1152, [11:11] +looksLikeRunning = bits, U32, 1152, [12:12] +looksLikeCoasting = bits, U32, 1152, [13:13] +looksLikeCrankToIdle = bits, U32, 1152, [14:14] +useInstantRpmForIdle = bits, U32, 1152, [15:15] +isVerboseIAC = bits, U32, 1152, [16:16] +unusedBit_22_17 = bits, U32, 1152, [17:17] +unusedBit_22_18 = bits, U32, 1152, [18:18] +unusedBit_22_19 = bits, U32, 1152, [19:19] +unusedBit_22_20 = bits, U32, 1152, [20:20] +unusedBit_22_21 = bits, U32, 1152, [21:21] +unusedBit_22_22 = bits, U32, 1152, [22:22] +unusedBit_22_23 = bits, U32, 1152, [23:23] +unusedBit_22_24 = bits, U32, 1152, [24:24] +unusedBit_22_25 = bits, U32, 1152, [25:25] +unusedBit_22_26 = bits, U32, 1152, [26:26] +unusedBit_22_27 = bits, U32, 1152, [27:27] +unusedBit_22_28 = bits, U32, 1152, [28:28] +unusedBit_22_29 = bits, U32, 1152, [29:29] +unusedBit_22_30 = bits, U32, 1152, [30:30] +unusedBit_22_31 = bits, U32, 1152, [31:31] +targetRpmByClt = scalar, S32, 1156, "", 1, 0 +targetRpmAcBump = scalar, S32, 1160, "", 1, 0 +iacByRpmTaper = scalar, F32, 1164 +luaAdd = scalar, F32, 1168 +; total TS size = 1172 +baseDwell = scalar, F32, 1172, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 1176, "", 1, 0 +luaTimingAdd = scalar, F32, 1180, "", 1, 0 +luaTimingMult = scalar, F32, 1184, "", 1, 0 +; total TS size = 1188 +idlePosition = scalar, F32, 1188, "", 1, 0 +trim = scalar, F32, 1192, "", 1, 0 +luaAdjustment = scalar, F32, 1196, "", 1, 0 +etbFeedForward = scalar, F32, 1200 +etbIntegralError = scalar, F32, 1204, "", 1, 0 +etbCurrentTarget = scalar, F32, 1208, "%", 1, 0 +; total TS size = 1212 +faultCode = scalar, U08, 1212, "", 1, 0 +heaterDuty = scalar, U08, 1213, "%", 1, 0 +pumpDuty = scalar, U08, 1214, "%", 1, 0 +tempC = scalar, U16, 1216, "C", 1, 0 +nernstVoltage = scalar, U16, 1218, "V", 0.001, 0 +esr = scalar, U16, 1220, "", 1, 0 +; total TS size = 1224 time = { timeNow } @@ -4721,7 +4754,6 @@ entry = hellenBoardId, "Detected Board ID", int, "%d" entry = clutchUpState, "clutch: up", int, "%d" entry = clutchDownState, "clutch: down", int, "%d" entry = brakePedalState, "brake: down", int, "%d" -entry = isSynchronizedPhase, "isSynchronizedPhase", int, "%d" entry = egt1, "egt1", float, "%.3f" entry = egt2, "egt2", float, "%.3f" entry = desiredRpmLimit, "User-defined RPM hard limit", int, "%d" @@ -4762,6 +4794,7 @@ entry = triggerStateIndex, "triggerStateIndex", int, "%d" entry = vvtCounter, "vvtCounter", int, "%d" entry = camResyncCounter, "camResyncCounter", int, "%d" entry = vvtStateIndex, "vvtStateIndex", int, "%d" +entry = m_hasSynchronizedPhase, "m_hasSynchronizedPhase", int, "%d" entry = wallFuelCorrection, "fuel injection time correction to account for wall wetting effect for current cycle", float, "%.3f" entry = wallFuel, "Amount of fuel on the wall, in ms of injector open time for each injector.", float, "%.3f" entry = idleState, "idleState", int, "%d" @@ -4966,6 +4999,7 @@ menuDialog = main subMenu = tps_accel_stateDialog, "tps_accel_state" subMenu = trigger_centralDialog, "trigger_central" subMenu = trigger_stateDialog, "trigger_state" + subMenu = trigger_state_primaryDialog, "trigger_state_primary" subMenu = wall_fuel_stateDialog, "wall_fuel_state" subMenu = idle_stateDialog, "idle_state" subMenu = ignition_stateDialog, "ignition_state" @@ -5414,7 +5448,6 @@ indicatorPanel = engine_stateIndicatorPanel, 2 indicator = {clutchUpState}, "clutchUpState No", "clutchUpState Yes" indicator = {clutchDownState}, "clutchDownState No", "clutchDownState Yes" indicator = {brakePedalState}, "brakePedalState No", "brakePedalState Yes" - indicator = {isSynchronizedPhase}, "isSynchronizedPhase No", "isSynchronizedPhase Yes" dialog = engine_stateDialog, "engine_state" panel = engine_stateIndicatorPanel @@ -5523,6 +5556,12 @@ dialog = trigger_stateDialog, "trigger_state" liveGraph = trigger_state_3_Graph, "Graph", South graphLine = vvtStateIndex +indicatorPanel = trigger_state_primaryIndicatorPanel, 2 + indicator = {m_hasSynchronizedPhase}, "m_hasSynchronizedPhase No", "m_hasSynchronizedPhase Yes" + +dialog = trigger_state_primaryDialog, "trigger_state_primary" + panel = trigger_state_primaryIndicatorPanel + dialog = wall_fuel_stateDialog, "wall_fuel_state" liveGraph = wall_fuel_state_1_Graph, "Graph", South diff --git a/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini b/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini index 65c20ddd7d..c4216e8f12 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.08.24.hellen128.2342072889" + signature = "rusEFI 2022.08.24.hellen128.2364864032" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.08.24.hellen128.2342072889" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.08.24.hellen128.2364864032" ; 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 Wed Aug 24 16:15:18 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Aug 24 22:14:57 UTC 2022 pageSize = 21300 page = 1 @@ -2109,7 +2109,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1220 + ochBlockSize = 1224 ; ; see TunerStudioOutputChannels struct @@ -2990,35 +2990,35 @@ hellenBoardId = scalar, S16, 990, "id", 1, 0 clutchUpState = bits, U32, 992, [0:0] clutchDownState = bits, U32, 992, [1:1] brakePedalState = bits, U32, 992, [2:2] -isSynchronizedPhase = bits, U32, 992, [3:3] -unusedBit_23_4 = bits, U32, 992, [4:4] -unusedBit_23_5 = bits, U32, 992, [5:5] -unusedBit_23_6 = bits, U32, 992, [6:6] -unusedBit_23_7 = bits, U32, 992, [7:7] -unusedBit_23_8 = bits, U32, 992, [8:8] -unusedBit_23_9 = bits, U32, 992, [9:9] -unusedBit_23_10 = bits, U32, 992, [10:10] -unusedBit_23_11 = bits, U32, 992, [11:11] -unusedBit_23_12 = bits, U32, 992, [12:12] -unusedBit_23_13 = bits, U32, 992, [13:13] -unusedBit_23_14 = bits, U32, 992, [14:14] -unusedBit_23_15 = bits, U32, 992, [15:15] -unusedBit_23_16 = bits, U32, 992, [16:16] -unusedBit_23_17 = bits, U32, 992, [17:17] -unusedBit_23_18 = bits, U32, 992, [18:18] -unusedBit_23_19 = bits, U32, 992, [19:19] -unusedBit_23_20 = bits, U32, 992, [20:20] -unusedBit_23_21 = bits, U32, 992, [21:21] -unusedBit_23_22 = bits, U32, 992, [22:22] -unusedBit_23_23 = bits, U32, 992, [23:23] -unusedBit_23_24 = bits, U32, 992, [24:24] -unusedBit_23_25 = bits, U32, 992, [25:25] -unusedBit_23_26 = bits, U32, 992, [26:26] -unusedBit_23_27 = bits, U32, 992, [27:27] -unusedBit_23_28 = bits, U32, 992, [28:28] -unusedBit_23_29 = bits, U32, 992, [29:29] -unusedBit_23_30 = bits, U32, 992, [30:30] -unusedBit_23_31 = bits, U32, 992, [31:31] +unusedBit_22_3 = bits, U32, 992, [3:3] +unusedBit_22_4 = bits, U32, 992, [4:4] +unusedBit_22_5 = bits, U32, 992, [5:5] +unusedBit_22_6 = bits, U32, 992, [6:6] +unusedBit_22_7 = bits, U32, 992, [7:7] +unusedBit_22_8 = bits, U32, 992, [8:8] +unusedBit_22_9 = bits, U32, 992, [9:9] +unusedBit_22_10 = bits, U32, 992, [10:10] +unusedBit_22_11 = bits, U32, 992, [11:11] +unusedBit_22_12 = bits, U32, 992, [12:12] +unusedBit_22_13 = bits, U32, 992, [13:13] +unusedBit_22_14 = bits, U32, 992, [14:14] +unusedBit_22_15 = bits, U32, 992, [15:15] +unusedBit_22_16 = bits, U32, 992, [16:16] +unusedBit_22_17 = bits, U32, 992, [17:17] +unusedBit_22_18 = bits, U32, 992, [18:18] +unusedBit_22_19 = bits, U32, 992, [19:19] +unusedBit_22_20 = bits, U32, 992, [20:20] +unusedBit_22_21 = bits, U32, 992, [21:21] +unusedBit_22_22 = bits, U32, 992, [22:22] +unusedBit_22_23 = bits, U32, 992, [23:23] +unusedBit_22_24 = bits, U32, 992, [24:24] +unusedBit_22_25 = bits, U32, 992, [25:25] +unusedBit_22_26 = bits, U32, 992, [26:26] +unusedBit_22_27 = bits, U32, 992, [27:27] +unusedBit_22_28 = bits, U32, 992, [28:28] +unusedBit_22_29 = bits, U32, 992, [29:29] +unusedBit_22_30 = bits, U32, 992, [30:30] +unusedBit_22_31 = bits, U32, 992, [31:31] egt1 = scalar, F32, 996, "", 1, 0 egt2 = scalar, F32, 1000, "", 1, 0 desiredRpmLimit = scalar, S16, 1004, "rpm", 1, 0 @@ -3089,70 +3089,103 @@ vvtCounter = scalar, U08, 1117, "", 1, 0 camResyncCounter = scalar, U08, 1118, "", 1, 0 vvtStateIndex = scalar, U08, 1119, "", 1, 0 ; total TS size = 1120 -wallFuelCorrection = scalar, F32, 1120, "", 1, 0 -wallFuel = scalar, F32, 1124, "", 1, 0 -; total TS size = 1128 -idleState = bits, S32, 1128, [0:2], "not important" -currentIdlePosition = scalar, F32, 1132 -baseIdlePosition = scalar, F32, 1136 -iacByTpsTaper = scalar, F32, 1140 -throttlePedalUpState = scalar, S32, 1144, "", 1, 0 -mightResetPid = bits, U32, 1148, [0:0] -shouldResetPid = bits, U32, 1148, [1:1] -wasResetPid = bits, U32, 1148, [2:2] -mustResetPid = bits, U32, 1148, [3:3] -isCoasting = bits, U32, 1148, [4:4] -useIacTableForCoasting = bits, U32, 1148, [5:5] -notIdling = bits, U32, 1148, [6:6] -needReset = bits, U32, 1148, [7:7] -isInDeadZone = bits, U32, 1148, [8:8] -isBlipping = bits, U32, 1148, [9:9] -useClosedLoop = bits, U32, 1148, [10:10] -badTps = bits, U32, 1148, [11:11] -looksLikeRunning = bits, U32, 1148, [12:12] -looksLikeCoasting = bits, U32, 1148, [13:13] -looksLikeCrankToIdle = bits, U32, 1148, [14:14] -useInstantRpmForIdle = bits, U32, 1148, [15:15] -isVerboseIAC = bits, U32, 1148, [16:16] -unusedBit_22_17 = bits, U32, 1148, [17:17] -unusedBit_22_18 = bits, U32, 1148, [18:18] -unusedBit_22_19 = bits, U32, 1148, [19:19] -unusedBit_22_20 = bits, U32, 1148, [20:20] -unusedBit_22_21 = bits, U32, 1148, [21:21] -unusedBit_22_22 = bits, U32, 1148, [22:22] -unusedBit_22_23 = bits, U32, 1148, [23:23] -unusedBit_22_24 = bits, U32, 1148, [24:24] -unusedBit_22_25 = bits, U32, 1148, [25:25] -unusedBit_22_26 = bits, U32, 1148, [26:26] -unusedBit_22_27 = bits, U32, 1148, [27:27] -unusedBit_22_28 = bits, U32, 1148, [28:28] -unusedBit_22_29 = bits, U32, 1148, [29:29] -unusedBit_22_30 = bits, U32, 1148, [30:30] -unusedBit_22_31 = bits, U32, 1148, [31:31] -targetRpmByClt = scalar, S32, 1152, "", 1, 0 -targetRpmAcBump = scalar, S32, 1156, "", 1, 0 -iacByRpmTaper = scalar, F32, 1160 -luaAdd = scalar, F32, 1164 -; total TS size = 1168 -baseDwell = scalar, F32, 1168, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 1172, "", 1, 0 -luaTimingAdd = scalar, F32, 1176, "", 1, 0 -luaTimingMult = scalar, F32, 1180, "", 1, 0 -; total TS size = 1184 -idlePosition = scalar, F32, 1184, "", 1, 0 -trim = scalar, F32, 1188, "", 1, 0 -luaAdjustment = scalar, F32, 1192, "", 1, 0 -etbFeedForward = scalar, F32, 1196 -etbIntegralError = scalar, F32, 1200, "", 1, 0 -etbCurrentTarget = scalar, F32, 1204, "%", 1, 0 -; total TS size = 1208 -faultCode = scalar, U08, 1208, "", 1, 0 -heaterDuty = scalar, U08, 1209, "%", 1, 0 -pumpDuty = scalar, U08, 1210, "%", 1, 0 -tempC = scalar, U16, 1212, "C", 1, 0 -nernstVoltage = scalar, U16, 1214, "V", 0.001, 0 -esr = scalar, U16, 1216, "", 1, 0 -; total TS size = 1220 +m_hasSynchronizedPhase = bits, U32, 1120, [0:0] +unusedBit_1_1 = bits, U32, 1120, [1:1] +unusedBit_1_2 = bits, U32, 1120, [2:2] +unusedBit_1_3 = bits, U32, 1120, [3:3] +unusedBit_1_4 = bits, U32, 1120, [4:4] +unusedBit_1_5 = bits, U32, 1120, [5:5] +unusedBit_1_6 = bits, U32, 1120, [6:6] +unusedBit_1_7 = bits, U32, 1120, [7:7] +unusedBit_1_8 = bits, U32, 1120, [8:8] +unusedBit_1_9 = bits, U32, 1120, [9:9] +unusedBit_1_10 = bits, U32, 1120, [10:10] +unusedBit_1_11 = bits, U32, 1120, [11:11] +unusedBit_1_12 = bits, U32, 1120, [12:12] +unusedBit_1_13 = bits, U32, 1120, [13:13] +unusedBit_1_14 = bits, U32, 1120, [14:14] +unusedBit_1_15 = bits, U32, 1120, [15:15] +unusedBit_1_16 = bits, U32, 1120, [16:16] +unusedBit_1_17 = bits, U32, 1120, [17:17] +unusedBit_1_18 = bits, U32, 1120, [18:18] +unusedBit_1_19 = bits, U32, 1120, [19:19] +unusedBit_1_20 = bits, U32, 1120, [20:20] +unusedBit_1_21 = bits, U32, 1120, [21:21] +unusedBit_1_22 = bits, U32, 1120, [22:22] +unusedBit_1_23 = bits, U32, 1120, [23:23] +unusedBit_1_24 = bits, U32, 1120, [24:24] +unusedBit_1_25 = bits, U32, 1120, [25:25] +unusedBit_1_26 = bits, U32, 1120, [26:26] +unusedBit_1_27 = bits, U32, 1120, [27:27] +unusedBit_1_28 = bits, U32, 1120, [28:28] +unusedBit_1_29 = bits, U32, 1120, [29:29] +unusedBit_1_30 = bits, U32, 1120, [30:30] +unusedBit_1_31 = bits, U32, 1120, [31:31] +; total TS size = 1124 +wallFuelCorrection = scalar, F32, 1124, "", 1, 0 +wallFuel = scalar, F32, 1128, "", 1, 0 +; total TS size = 1132 +idleState = bits, S32, 1132, [0:2], "not important" +currentIdlePosition = scalar, F32, 1136 +baseIdlePosition = scalar, F32, 1140 +iacByTpsTaper = scalar, F32, 1144 +throttlePedalUpState = scalar, S32, 1148, "", 1, 0 +mightResetPid = bits, U32, 1152, [0:0] +shouldResetPid = bits, U32, 1152, [1:1] +wasResetPid = bits, U32, 1152, [2:2] +mustResetPid = bits, U32, 1152, [3:3] +isCoasting = bits, U32, 1152, [4:4] +useIacTableForCoasting = bits, U32, 1152, [5:5] +notIdling = bits, U32, 1152, [6:6] +needReset = bits, U32, 1152, [7:7] +isInDeadZone = bits, U32, 1152, [8:8] +isBlipping = bits, U32, 1152, [9:9] +useClosedLoop = bits, U32, 1152, [10:10] +badTps = bits, U32, 1152, [11:11] +looksLikeRunning = bits, U32, 1152, [12:12] +looksLikeCoasting = bits, U32, 1152, [13:13] +looksLikeCrankToIdle = bits, U32, 1152, [14:14] +useInstantRpmForIdle = bits, U32, 1152, [15:15] +isVerboseIAC = bits, U32, 1152, [16:16] +unusedBit_22_17 = bits, U32, 1152, [17:17] +unusedBit_22_18 = bits, U32, 1152, [18:18] +unusedBit_22_19 = bits, U32, 1152, [19:19] +unusedBit_22_20 = bits, U32, 1152, [20:20] +unusedBit_22_21 = bits, U32, 1152, [21:21] +unusedBit_22_22 = bits, U32, 1152, [22:22] +unusedBit_22_23 = bits, U32, 1152, [23:23] +unusedBit_22_24 = bits, U32, 1152, [24:24] +unusedBit_22_25 = bits, U32, 1152, [25:25] +unusedBit_22_26 = bits, U32, 1152, [26:26] +unusedBit_22_27 = bits, U32, 1152, [27:27] +unusedBit_22_28 = bits, U32, 1152, [28:28] +unusedBit_22_29 = bits, U32, 1152, [29:29] +unusedBit_22_30 = bits, U32, 1152, [30:30] +unusedBit_22_31 = bits, U32, 1152, [31:31] +targetRpmByClt = scalar, S32, 1156, "", 1, 0 +targetRpmAcBump = scalar, S32, 1160, "", 1, 0 +iacByRpmTaper = scalar, F32, 1164 +luaAdd = scalar, F32, 1168 +; total TS size = 1172 +baseDwell = scalar, F32, 1172, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 1176, "", 1, 0 +luaTimingAdd = scalar, F32, 1180, "", 1, 0 +luaTimingMult = scalar, F32, 1184, "", 1, 0 +; total TS size = 1188 +idlePosition = scalar, F32, 1188, "", 1, 0 +trim = scalar, F32, 1192, "", 1, 0 +luaAdjustment = scalar, F32, 1196, "", 1, 0 +etbFeedForward = scalar, F32, 1200 +etbIntegralError = scalar, F32, 1204, "", 1, 0 +etbCurrentTarget = scalar, F32, 1208, "%", 1, 0 +; total TS size = 1212 +faultCode = scalar, U08, 1212, "", 1, 0 +heaterDuty = scalar, U08, 1213, "%", 1, 0 +pumpDuty = scalar, U08, 1214, "%", 1, 0 +tempC = scalar, U16, 1216, "C", 1, 0 +nernstVoltage = scalar, U16, 1218, "V", 0.001, 0 +esr = scalar, U16, 1220, "", 1, 0 +; total TS size = 1224 time = { timeNow } @@ -4721,7 +4754,6 @@ entry = hellenBoardId, "Detected Board ID", int, "%d" entry = clutchUpState, "clutch: up", int, "%d" entry = clutchDownState, "clutch: down", int, "%d" entry = brakePedalState, "brake: down", int, "%d" -entry = isSynchronizedPhase, "isSynchronizedPhase", int, "%d" entry = egt1, "egt1", float, "%.3f" entry = egt2, "egt2", float, "%.3f" entry = desiredRpmLimit, "User-defined RPM hard limit", int, "%d" @@ -4762,6 +4794,7 @@ entry = triggerStateIndex, "triggerStateIndex", int, "%d" entry = vvtCounter, "vvtCounter", int, "%d" entry = camResyncCounter, "camResyncCounter", int, "%d" entry = vvtStateIndex, "vvtStateIndex", int, "%d" +entry = m_hasSynchronizedPhase, "m_hasSynchronizedPhase", int, "%d" entry = wallFuelCorrection, "fuel injection time correction to account for wall wetting effect for current cycle", float, "%.3f" entry = wallFuel, "Amount of fuel on the wall, in ms of injector open time for each injector.", float, "%.3f" entry = idleState, "idleState", int, "%d" @@ -4966,6 +4999,7 @@ menuDialog = main subMenu = tps_accel_stateDialog, "tps_accel_state" subMenu = trigger_centralDialog, "trigger_central" subMenu = trigger_stateDialog, "trigger_state" + subMenu = trigger_state_primaryDialog, "trigger_state_primary" subMenu = wall_fuel_stateDialog, "wall_fuel_state" subMenu = idle_stateDialog, "idle_state" subMenu = ignition_stateDialog, "ignition_state" @@ -5414,7 +5448,6 @@ indicatorPanel = engine_stateIndicatorPanel, 2 indicator = {clutchUpState}, "clutchUpState No", "clutchUpState Yes" indicator = {clutchDownState}, "clutchDownState No", "clutchDownState Yes" indicator = {brakePedalState}, "brakePedalState No", "brakePedalState Yes" - indicator = {isSynchronizedPhase}, "isSynchronizedPhase No", "isSynchronizedPhase Yes" dialog = engine_stateDialog, "engine_state" panel = engine_stateIndicatorPanel @@ -5523,6 +5556,12 @@ dialog = trigger_stateDialog, "trigger_state" liveGraph = trigger_state_3_Graph, "Graph", South graphLine = vvtStateIndex +indicatorPanel = trigger_state_primaryIndicatorPanel, 2 + indicator = {m_hasSynchronizedPhase}, "m_hasSynchronizedPhase No", "m_hasSynchronizedPhase Yes" + +dialog = trigger_state_primaryDialog, "trigger_state_primary" + panel = trigger_state_primaryIndicatorPanel + dialog = wall_fuel_stateDialog, "wall_fuel_state" liveGraph = wall_fuel_state_1_Graph, "Graph", South diff --git a/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini b/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini index 70b97634b2..8b1c084f41 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.08.24.hellen154hyundai.3978853763" + signature = "rusEFI 2022.08.24.hellen154hyundai.3930438042" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.08.24.hellen154hyundai.3978853763" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.08.24.hellen154hyundai.3930438042" ; 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 Wed Aug 24 16:15:24 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Aug 24 22:15:02 UTC 2022 pageSize = 21300 page = 1 @@ -2109,7 +2109,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1220 + ochBlockSize = 1224 ; ; see TunerStudioOutputChannels struct @@ -2990,35 +2990,35 @@ hellenBoardId = scalar, S16, 990, "id", 1, 0 clutchUpState = bits, U32, 992, [0:0] clutchDownState = bits, U32, 992, [1:1] brakePedalState = bits, U32, 992, [2:2] -isSynchronizedPhase = bits, U32, 992, [3:3] -unusedBit_23_4 = bits, U32, 992, [4:4] -unusedBit_23_5 = bits, U32, 992, [5:5] -unusedBit_23_6 = bits, U32, 992, [6:6] -unusedBit_23_7 = bits, U32, 992, [7:7] -unusedBit_23_8 = bits, U32, 992, [8:8] -unusedBit_23_9 = bits, U32, 992, [9:9] -unusedBit_23_10 = bits, U32, 992, [10:10] -unusedBit_23_11 = bits, U32, 992, [11:11] -unusedBit_23_12 = bits, U32, 992, [12:12] -unusedBit_23_13 = bits, U32, 992, [13:13] -unusedBit_23_14 = bits, U32, 992, [14:14] -unusedBit_23_15 = bits, U32, 992, [15:15] -unusedBit_23_16 = bits, U32, 992, [16:16] -unusedBit_23_17 = bits, U32, 992, [17:17] -unusedBit_23_18 = bits, U32, 992, [18:18] -unusedBit_23_19 = bits, U32, 992, [19:19] -unusedBit_23_20 = bits, U32, 992, [20:20] -unusedBit_23_21 = bits, U32, 992, [21:21] -unusedBit_23_22 = bits, U32, 992, [22:22] -unusedBit_23_23 = bits, U32, 992, [23:23] -unusedBit_23_24 = bits, U32, 992, [24:24] -unusedBit_23_25 = bits, U32, 992, [25:25] -unusedBit_23_26 = bits, U32, 992, [26:26] -unusedBit_23_27 = bits, U32, 992, [27:27] -unusedBit_23_28 = bits, U32, 992, [28:28] -unusedBit_23_29 = bits, U32, 992, [29:29] -unusedBit_23_30 = bits, U32, 992, [30:30] -unusedBit_23_31 = bits, U32, 992, [31:31] +unusedBit_22_3 = bits, U32, 992, [3:3] +unusedBit_22_4 = bits, U32, 992, [4:4] +unusedBit_22_5 = bits, U32, 992, [5:5] +unusedBit_22_6 = bits, U32, 992, [6:6] +unusedBit_22_7 = bits, U32, 992, [7:7] +unusedBit_22_8 = bits, U32, 992, [8:8] +unusedBit_22_9 = bits, U32, 992, [9:9] +unusedBit_22_10 = bits, U32, 992, [10:10] +unusedBit_22_11 = bits, U32, 992, [11:11] +unusedBit_22_12 = bits, U32, 992, [12:12] +unusedBit_22_13 = bits, U32, 992, [13:13] +unusedBit_22_14 = bits, U32, 992, [14:14] +unusedBit_22_15 = bits, U32, 992, [15:15] +unusedBit_22_16 = bits, U32, 992, [16:16] +unusedBit_22_17 = bits, U32, 992, [17:17] +unusedBit_22_18 = bits, U32, 992, [18:18] +unusedBit_22_19 = bits, U32, 992, [19:19] +unusedBit_22_20 = bits, U32, 992, [20:20] +unusedBit_22_21 = bits, U32, 992, [21:21] +unusedBit_22_22 = bits, U32, 992, [22:22] +unusedBit_22_23 = bits, U32, 992, [23:23] +unusedBit_22_24 = bits, U32, 992, [24:24] +unusedBit_22_25 = bits, U32, 992, [25:25] +unusedBit_22_26 = bits, U32, 992, [26:26] +unusedBit_22_27 = bits, U32, 992, [27:27] +unusedBit_22_28 = bits, U32, 992, [28:28] +unusedBit_22_29 = bits, U32, 992, [29:29] +unusedBit_22_30 = bits, U32, 992, [30:30] +unusedBit_22_31 = bits, U32, 992, [31:31] egt1 = scalar, F32, 996, "", 1, 0 egt2 = scalar, F32, 1000, "", 1, 0 desiredRpmLimit = scalar, S16, 1004, "rpm", 1, 0 @@ -3089,70 +3089,103 @@ vvtCounter = scalar, U08, 1117, "", 1, 0 camResyncCounter = scalar, U08, 1118, "", 1, 0 vvtStateIndex = scalar, U08, 1119, "", 1, 0 ; total TS size = 1120 -wallFuelCorrection = scalar, F32, 1120, "", 1, 0 -wallFuel = scalar, F32, 1124, "", 1, 0 -; total TS size = 1128 -idleState = bits, S32, 1128, [0:2], "not important" -currentIdlePosition = scalar, F32, 1132 -baseIdlePosition = scalar, F32, 1136 -iacByTpsTaper = scalar, F32, 1140 -throttlePedalUpState = scalar, S32, 1144, "", 1, 0 -mightResetPid = bits, U32, 1148, [0:0] -shouldResetPid = bits, U32, 1148, [1:1] -wasResetPid = bits, U32, 1148, [2:2] -mustResetPid = bits, U32, 1148, [3:3] -isCoasting = bits, U32, 1148, [4:4] -useIacTableForCoasting = bits, U32, 1148, [5:5] -notIdling = bits, U32, 1148, [6:6] -needReset = bits, U32, 1148, [7:7] -isInDeadZone = bits, U32, 1148, [8:8] -isBlipping = bits, U32, 1148, [9:9] -useClosedLoop = bits, U32, 1148, [10:10] -badTps = bits, U32, 1148, [11:11] -looksLikeRunning = bits, U32, 1148, [12:12] -looksLikeCoasting = bits, U32, 1148, [13:13] -looksLikeCrankToIdle = bits, U32, 1148, [14:14] -useInstantRpmForIdle = bits, U32, 1148, [15:15] -isVerboseIAC = bits, U32, 1148, [16:16] -unusedBit_22_17 = bits, U32, 1148, [17:17] -unusedBit_22_18 = bits, U32, 1148, [18:18] -unusedBit_22_19 = bits, U32, 1148, [19:19] -unusedBit_22_20 = bits, U32, 1148, [20:20] -unusedBit_22_21 = bits, U32, 1148, [21:21] -unusedBit_22_22 = bits, U32, 1148, [22:22] -unusedBit_22_23 = bits, U32, 1148, [23:23] -unusedBit_22_24 = bits, U32, 1148, [24:24] -unusedBit_22_25 = bits, U32, 1148, [25:25] -unusedBit_22_26 = bits, U32, 1148, [26:26] -unusedBit_22_27 = bits, U32, 1148, [27:27] -unusedBit_22_28 = bits, U32, 1148, [28:28] -unusedBit_22_29 = bits, U32, 1148, [29:29] -unusedBit_22_30 = bits, U32, 1148, [30:30] -unusedBit_22_31 = bits, U32, 1148, [31:31] -targetRpmByClt = scalar, S32, 1152, "", 1, 0 -targetRpmAcBump = scalar, S32, 1156, "", 1, 0 -iacByRpmTaper = scalar, F32, 1160 -luaAdd = scalar, F32, 1164 -; total TS size = 1168 -baseDwell = scalar, F32, 1168, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 1172, "", 1, 0 -luaTimingAdd = scalar, F32, 1176, "", 1, 0 -luaTimingMult = scalar, F32, 1180, "", 1, 0 -; total TS size = 1184 -idlePosition = scalar, F32, 1184, "", 1, 0 -trim = scalar, F32, 1188, "", 1, 0 -luaAdjustment = scalar, F32, 1192, "", 1, 0 -etbFeedForward = scalar, F32, 1196 -etbIntegralError = scalar, F32, 1200, "", 1, 0 -etbCurrentTarget = scalar, F32, 1204, "%", 1, 0 -; total TS size = 1208 -faultCode = scalar, U08, 1208, "", 1, 0 -heaterDuty = scalar, U08, 1209, "%", 1, 0 -pumpDuty = scalar, U08, 1210, "%", 1, 0 -tempC = scalar, U16, 1212, "C", 1, 0 -nernstVoltage = scalar, U16, 1214, "V", 0.001, 0 -esr = scalar, U16, 1216, "", 1, 0 -; total TS size = 1220 +m_hasSynchronizedPhase = bits, U32, 1120, [0:0] +unusedBit_1_1 = bits, U32, 1120, [1:1] +unusedBit_1_2 = bits, U32, 1120, [2:2] +unusedBit_1_3 = bits, U32, 1120, [3:3] +unusedBit_1_4 = bits, U32, 1120, [4:4] +unusedBit_1_5 = bits, U32, 1120, [5:5] +unusedBit_1_6 = bits, U32, 1120, [6:6] +unusedBit_1_7 = bits, U32, 1120, [7:7] +unusedBit_1_8 = bits, U32, 1120, [8:8] +unusedBit_1_9 = bits, U32, 1120, [9:9] +unusedBit_1_10 = bits, U32, 1120, [10:10] +unusedBit_1_11 = bits, U32, 1120, [11:11] +unusedBit_1_12 = bits, U32, 1120, [12:12] +unusedBit_1_13 = bits, U32, 1120, [13:13] +unusedBit_1_14 = bits, U32, 1120, [14:14] +unusedBit_1_15 = bits, U32, 1120, [15:15] +unusedBit_1_16 = bits, U32, 1120, [16:16] +unusedBit_1_17 = bits, U32, 1120, [17:17] +unusedBit_1_18 = bits, U32, 1120, [18:18] +unusedBit_1_19 = bits, U32, 1120, [19:19] +unusedBit_1_20 = bits, U32, 1120, [20:20] +unusedBit_1_21 = bits, U32, 1120, [21:21] +unusedBit_1_22 = bits, U32, 1120, [22:22] +unusedBit_1_23 = bits, U32, 1120, [23:23] +unusedBit_1_24 = bits, U32, 1120, [24:24] +unusedBit_1_25 = bits, U32, 1120, [25:25] +unusedBit_1_26 = bits, U32, 1120, [26:26] +unusedBit_1_27 = bits, U32, 1120, [27:27] +unusedBit_1_28 = bits, U32, 1120, [28:28] +unusedBit_1_29 = bits, U32, 1120, [29:29] +unusedBit_1_30 = bits, U32, 1120, [30:30] +unusedBit_1_31 = bits, U32, 1120, [31:31] +; total TS size = 1124 +wallFuelCorrection = scalar, F32, 1124, "", 1, 0 +wallFuel = scalar, F32, 1128, "", 1, 0 +; total TS size = 1132 +idleState = bits, S32, 1132, [0:2], "not important" +currentIdlePosition = scalar, F32, 1136 +baseIdlePosition = scalar, F32, 1140 +iacByTpsTaper = scalar, F32, 1144 +throttlePedalUpState = scalar, S32, 1148, "", 1, 0 +mightResetPid = bits, U32, 1152, [0:0] +shouldResetPid = bits, U32, 1152, [1:1] +wasResetPid = bits, U32, 1152, [2:2] +mustResetPid = bits, U32, 1152, [3:3] +isCoasting = bits, U32, 1152, [4:4] +useIacTableForCoasting = bits, U32, 1152, [5:5] +notIdling = bits, U32, 1152, [6:6] +needReset = bits, U32, 1152, [7:7] +isInDeadZone = bits, U32, 1152, [8:8] +isBlipping = bits, U32, 1152, [9:9] +useClosedLoop = bits, U32, 1152, [10:10] +badTps = bits, U32, 1152, [11:11] +looksLikeRunning = bits, U32, 1152, [12:12] +looksLikeCoasting = bits, U32, 1152, [13:13] +looksLikeCrankToIdle = bits, U32, 1152, [14:14] +useInstantRpmForIdle = bits, U32, 1152, [15:15] +isVerboseIAC = bits, U32, 1152, [16:16] +unusedBit_22_17 = bits, U32, 1152, [17:17] +unusedBit_22_18 = bits, U32, 1152, [18:18] +unusedBit_22_19 = bits, U32, 1152, [19:19] +unusedBit_22_20 = bits, U32, 1152, [20:20] +unusedBit_22_21 = bits, U32, 1152, [21:21] +unusedBit_22_22 = bits, U32, 1152, [22:22] +unusedBit_22_23 = bits, U32, 1152, [23:23] +unusedBit_22_24 = bits, U32, 1152, [24:24] +unusedBit_22_25 = bits, U32, 1152, [25:25] +unusedBit_22_26 = bits, U32, 1152, [26:26] +unusedBit_22_27 = bits, U32, 1152, [27:27] +unusedBit_22_28 = bits, U32, 1152, [28:28] +unusedBit_22_29 = bits, U32, 1152, [29:29] +unusedBit_22_30 = bits, U32, 1152, [30:30] +unusedBit_22_31 = bits, U32, 1152, [31:31] +targetRpmByClt = scalar, S32, 1156, "", 1, 0 +targetRpmAcBump = scalar, S32, 1160, "", 1, 0 +iacByRpmTaper = scalar, F32, 1164 +luaAdd = scalar, F32, 1168 +; total TS size = 1172 +baseDwell = scalar, F32, 1172, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 1176, "", 1, 0 +luaTimingAdd = scalar, F32, 1180, "", 1, 0 +luaTimingMult = scalar, F32, 1184, "", 1, 0 +; total TS size = 1188 +idlePosition = scalar, F32, 1188, "", 1, 0 +trim = scalar, F32, 1192, "", 1, 0 +luaAdjustment = scalar, F32, 1196, "", 1, 0 +etbFeedForward = scalar, F32, 1200 +etbIntegralError = scalar, F32, 1204, "", 1, 0 +etbCurrentTarget = scalar, F32, 1208, "%", 1, 0 +; total TS size = 1212 +faultCode = scalar, U08, 1212, "", 1, 0 +heaterDuty = scalar, U08, 1213, "%", 1, 0 +pumpDuty = scalar, U08, 1214, "%", 1, 0 +tempC = scalar, U16, 1216, "C", 1, 0 +nernstVoltage = scalar, U16, 1218, "V", 0.001, 0 +esr = scalar, U16, 1220, "", 1, 0 +; total TS size = 1224 time = { timeNow } @@ -4721,7 +4754,6 @@ entry = hellenBoardId, "Detected Board ID", int, "%d" entry = clutchUpState, "clutch: up", int, "%d" entry = clutchDownState, "clutch: down", int, "%d" entry = brakePedalState, "brake: down", int, "%d" -entry = isSynchronizedPhase, "isSynchronizedPhase", int, "%d" entry = egt1, "egt1", float, "%.3f" entry = egt2, "egt2", float, "%.3f" entry = desiredRpmLimit, "User-defined RPM hard limit", int, "%d" @@ -4762,6 +4794,7 @@ entry = triggerStateIndex, "triggerStateIndex", int, "%d" entry = vvtCounter, "vvtCounter", int, "%d" entry = camResyncCounter, "camResyncCounter", int, "%d" entry = vvtStateIndex, "vvtStateIndex", int, "%d" +entry = m_hasSynchronizedPhase, "m_hasSynchronizedPhase", int, "%d" entry = wallFuelCorrection, "fuel injection time correction to account for wall wetting effect for current cycle", float, "%.3f" entry = wallFuel, "Amount of fuel on the wall, in ms of injector open time for each injector.", float, "%.3f" entry = idleState, "idleState", int, "%d" @@ -4966,6 +4999,7 @@ menuDialog = main subMenu = tps_accel_stateDialog, "tps_accel_state" subMenu = trigger_centralDialog, "trigger_central" subMenu = trigger_stateDialog, "trigger_state" + subMenu = trigger_state_primaryDialog, "trigger_state_primary" subMenu = wall_fuel_stateDialog, "wall_fuel_state" subMenu = idle_stateDialog, "idle_state" subMenu = ignition_stateDialog, "ignition_state" @@ -5414,7 +5448,6 @@ indicatorPanel = engine_stateIndicatorPanel, 2 indicator = {clutchUpState}, "clutchUpState No", "clutchUpState Yes" indicator = {clutchDownState}, "clutchDownState No", "clutchDownState Yes" indicator = {brakePedalState}, "brakePedalState No", "brakePedalState Yes" - indicator = {isSynchronizedPhase}, "isSynchronizedPhase No", "isSynchronizedPhase Yes" dialog = engine_stateDialog, "engine_state" panel = engine_stateIndicatorPanel @@ -5523,6 +5556,12 @@ dialog = trigger_stateDialog, "trigger_state" liveGraph = trigger_state_3_Graph, "Graph", South graphLine = vvtStateIndex +indicatorPanel = trigger_state_primaryIndicatorPanel, 2 + indicator = {m_hasSynchronizedPhase}, "m_hasSynchronizedPhase No", "m_hasSynchronizedPhase Yes" + +dialog = trigger_state_primaryDialog, "trigger_state_primary" + panel = trigger_state_primaryIndicatorPanel + dialog = wall_fuel_stateDialog, "wall_fuel_state" liveGraph = wall_fuel_state_1_Graph, "Graph", South diff --git a/firmware/tunerstudio/generated/rusefi_hellen72.ini b/firmware/tunerstudio/generated/rusefi_hellen72.ini index 107570eea2..1b8292ce1c 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen72.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen72.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.08.24.hellen72.2270701059" + signature = "rusEFI 2022.08.24.hellen72.2151014938" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.08.24.hellen72.2270701059" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.08.24.hellen72.2151014938" ; 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 Wed Aug 24 16:15:27 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Aug 24 22:15:05 UTC 2022 pageSize = 21300 page = 1 @@ -2109,7 +2109,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1220 + ochBlockSize = 1224 ; ; see TunerStudioOutputChannels struct @@ -2990,35 +2990,35 @@ hellenBoardId = scalar, S16, 990, "id", 1, 0 clutchUpState = bits, U32, 992, [0:0] clutchDownState = bits, U32, 992, [1:1] brakePedalState = bits, U32, 992, [2:2] -isSynchronizedPhase = bits, U32, 992, [3:3] -unusedBit_23_4 = bits, U32, 992, [4:4] -unusedBit_23_5 = bits, U32, 992, [5:5] -unusedBit_23_6 = bits, U32, 992, [6:6] -unusedBit_23_7 = bits, U32, 992, [7:7] -unusedBit_23_8 = bits, U32, 992, [8:8] -unusedBit_23_9 = bits, U32, 992, [9:9] -unusedBit_23_10 = bits, U32, 992, [10:10] -unusedBit_23_11 = bits, U32, 992, [11:11] -unusedBit_23_12 = bits, U32, 992, [12:12] -unusedBit_23_13 = bits, U32, 992, [13:13] -unusedBit_23_14 = bits, U32, 992, [14:14] -unusedBit_23_15 = bits, U32, 992, [15:15] -unusedBit_23_16 = bits, U32, 992, [16:16] -unusedBit_23_17 = bits, U32, 992, [17:17] -unusedBit_23_18 = bits, U32, 992, [18:18] -unusedBit_23_19 = bits, U32, 992, [19:19] -unusedBit_23_20 = bits, U32, 992, [20:20] -unusedBit_23_21 = bits, U32, 992, [21:21] -unusedBit_23_22 = bits, U32, 992, [22:22] -unusedBit_23_23 = bits, U32, 992, [23:23] -unusedBit_23_24 = bits, U32, 992, [24:24] -unusedBit_23_25 = bits, U32, 992, [25:25] -unusedBit_23_26 = bits, U32, 992, [26:26] -unusedBit_23_27 = bits, U32, 992, [27:27] -unusedBit_23_28 = bits, U32, 992, [28:28] -unusedBit_23_29 = bits, U32, 992, [29:29] -unusedBit_23_30 = bits, U32, 992, [30:30] -unusedBit_23_31 = bits, U32, 992, [31:31] +unusedBit_22_3 = bits, U32, 992, [3:3] +unusedBit_22_4 = bits, U32, 992, [4:4] +unusedBit_22_5 = bits, U32, 992, [5:5] +unusedBit_22_6 = bits, U32, 992, [6:6] +unusedBit_22_7 = bits, U32, 992, [7:7] +unusedBit_22_8 = bits, U32, 992, [8:8] +unusedBit_22_9 = bits, U32, 992, [9:9] +unusedBit_22_10 = bits, U32, 992, [10:10] +unusedBit_22_11 = bits, U32, 992, [11:11] +unusedBit_22_12 = bits, U32, 992, [12:12] +unusedBit_22_13 = bits, U32, 992, [13:13] +unusedBit_22_14 = bits, U32, 992, [14:14] +unusedBit_22_15 = bits, U32, 992, [15:15] +unusedBit_22_16 = bits, U32, 992, [16:16] +unusedBit_22_17 = bits, U32, 992, [17:17] +unusedBit_22_18 = bits, U32, 992, [18:18] +unusedBit_22_19 = bits, U32, 992, [19:19] +unusedBit_22_20 = bits, U32, 992, [20:20] +unusedBit_22_21 = bits, U32, 992, [21:21] +unusedBit_22_22 = bits, U32, 992, [22:22] +unusedBit_22_23 = bits, U32, 992, [23:23] +unusedBit_22_24 = bits, U32, 992, [24:24] +unusedBit_22_25 = bits, U32, 992, [25:25] +unusedBit_22_26 = bits, U32, 992, [26:26] +unusedBit_22_27 = bits, U32, 992, [27:27] +unusedBit_22_28 = bits, U32, 992, [28:28] +unusedBit_22_29 = bits, U32, 992, [29:29] +unusedBit_22_30 = bits, U32, 992, [30:30] +unusedBit_22_31 = bits, U32, 992, [31:31] egt1 = scalar, F32, 996, "", 1, 0 egt2 = scalar, F32, 1000, "", 1, 0 desiredRpmLimit = scalar, S16, 1004, "rpm", 1, 0 @@ -3089,70 +3089,103 @@ vvtCounter = scalar, U08, 1117, "", 1, 0 camResyncCounter = scalar, U08, 1118, "", 1, 0 vvtStateIndex = scalar, U08, 1119, "", 1, 0 ; total TS size = 1120 -wallFuelCorrection = scalar, F32, 1120, "", 1, 0 -wallFuel = scalar, F32, 1124, "", 1, 0 -; total TS size = 1128 -idleState = bits, S32, 1128, [0:2], "not important" -currentIdlePosition = scalar, F32, 1132 -baseIdlePosition = scalar, F32, 1136 -iacByTpsTaper = scalar, F32, 1140 -throttlePedalUpState = scalar, S32, 1144, "", 1, 0 -mightResetPid = bits, U32, 1148, [0:0] -shouldResetPid = bits, U32, 1148, [1:1] -wasResetPid = bits, U32, 1148, [2:2] -mustResetPid = bits, U32, 1148, [3:3] -isCoasting = bits, U32, 1148, [4:4] -useIacTableForCoasting = bits, U32, 1148, [5:5] -notIdling = bits, U32, 1148, [6:6] -needReset = bits, U32, 1148, [7:7] -isInDeadZone = bits, U32, 1148, [8:8] -isBlipping = bits, U32, 1148, [9:9] -useClosedLoop = bits, U32, 1148, [10:10] -badTps = bits, U32, 1148, [11:11] -looksLikeRunning = bits, U32, 1148, [12:12] -looksLikeCoasting = bits, U32, 1148, [13:13] -looksLikeCrankToIdle = bits, U32, 1148, [14:14] -useInstantRpmForIdle = bits, U32, 1148, [15:15] -isVerboseIAC = bits, U32, 1148, [16:16] -unusedBit_22_17 = bits, U32, 1148, [17:17] -unusedBit_22_18 = bits, U32, 1148, [18:18] -unusedBit_22_19 = bits, U32, 1148, [19:19] -unusedBit_22_20 = bits, U32, 1148, [20:20] -unusedBit_22_21 = bits, U32, 1148, [21:21] -unusedBit_22_22 = bits, U32, 1148, [22:22] -unusedBit_22_23 = bits, U32, 1148, [23:23] -unusedBit_22_24 = bits, U32, 1148, [24:24] -unusedBit_22_25 = bits, U32, 1148, [25:25] -unusedBit_22_26 = bits, U32, 1148, [26:26] -unusedBit_22_27 = bits, U32, 1148, [27:27] -unusedBit_22_28 = bits, U32, 1148, [28:28] -unusedBit_22_29 = bits, U32, 1148, [29:29] -unusedBit_22_30 = bits, U32, 1148, [30:30] -unusedBit_22_31 = bits, U32, 1148, [31:31] -targetRpmByClt = scalar, S32, 1152, "", 1, 0 -targetRpmAcBump = scalar, S32, 1156, "", 1, 0 -iacByRpmTaper = scalar, F32, 1160 -luaAdd = scalar, F32, 1164 -; total TS size = 1168 -baseDwell = scalar, F32, 1168, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 1172, "", 1, 0 -luaTimingAdd = scalar, F32, 1176, "", 1, 0 -luaTimingMult = scalar, F32, 1180, "", 1, 0 -; total TS size = 1184 -idlePosition = scalar, F32, 1184, "", 1, 0 -trim = scalar, F32, 1188, "", 1, 0 -luaAdjustment = scalar, F32, 1192, "", 1, 0 -etbFeedForward = scalar, F32, 1196 -etbIntegralError = scalar, F32, 1200, "", 1, 0 -etbCurrentTarget = scalar, F32, 1204, "%", 1, 0 -; total TS size = 1208 -faultCode = scalar, U08, 1208, "", 1, 0 -heaterDuty = scalar, U08, 1209, "%", 1, 0 -pumpDuty = scalar, U08, 1210, "%", 1, 0 -tempC = scalar, U16, 1212, "C", 1, 0 -nernstVoltage = scalar, U16, 1214, "V", 0.001, 0 -esr = scalar, U16, 1216, "", 1, 0 -; total TS size = 1220 +m_hasSynchronizedPhase = bits, U32, 1120, [0:0] +unusedBit_1_1 = bits, U32, 1120, [1:1] +unusedBit_1_2 = bits, U32, 1120, [2:2] +unusedBit_1_3 = bits, U32, 1120, [3:3] +unusedBit_1_4 = bits, U32, 1120, [4:4] +unusedBit_1_5 = bits, U32, 1120, [5:5] +unusedBit_1_6 = bits, U32, 1120, [6:6] +unusedBit_1_7 = bits, U32, 1120, [7:7] +unusedBit_1_8 = bits, U32, 1120, [8:8] +unusedBit_1_9 = bits, U32, 1120, [9:9] +unusedBit_1_10 = bits, U32, 1120, [10:10] +unusedBit_1_11 = bits, U32, 1120, [11:11] +unusedBit_1_12 = bits, U32, 1120, [12:12] +unusedBit_1_13 = bits, U32, 1120, [13:13] +unusedBit_1_14 = bits, U32, 1120, [14:14] +unusedBit_1_15 = bits, U32, 1120, [15:15] +unusedBit_1_16 = bits, U32, 1120, [16:16] +unusedBit_1_17 = bits, U32, 1120, [17:17] +unusedBit_1_18 = bits, U32, 1120, [18:18] +unusedBit_1_19 = bits, U32, 1120, [19:19] +unusedBit_1_20 = bits, U32, 1120, [20:20] +unusedBit_1_21 = bits, U32, 1120, [21:21] +unusedBit_1_22 = bits, U32, 1120, [22:22] +unusedBit_1_23 = bits, U32, 1120, [23:23] +unusedBit_1_24 = bits, U32, 1120, [24:24] +unusedBit_1_25 = bits, U32, 1120, [25:25] +unusedBit_1_26 = bits, U32, 1120, [26:26] +unusedBit_1_27 = bits, U32, 1120, [27:27] +unusedBit_1_28 = bits, U32, 1120, [28:28] +unusedBit_1_29 = bits, U32, 1120, [29:29] +unusedBit_1_30 = bits, U32, 1120, [30:30] +unusedBit_1_31 = bits, U32, 1120, [31:31] +; total TS size = 1124 +wallFuelCorrection = scalar, F32, 1124, "", 1, 0 +wallFuel = scalar, F32, 1128, "", 1, 0 +; total TS size = 1132 +idleState = bits, S32, 1132, [0:2], "not important" +currentIdlePosition = scalar, F32, 1136 +baseIdlePosition = scalar, F32, 1140 +iacByTpsTaper = scalar, F32, 1144 +throttlePedalUpState = scalar, S32, 1148, "", 1, 0 +mightResetPid = bits, U32, 1152, [0:0] +shouldResetPid = bits, U32, 1152, [1:1] +wasResetPid = bits, U32, 1152, [2:2] +mustResetPid = bits, U32, 1152, [3:3] +isCoasting = bits, U32, 1152, [4:4] +useIacTableForCoasting = bits, U32, 1152, [5:5] +notIdling = bits, U32, 1152, [6:6] +needReset = bits, U32, 1152, [7:7] +isInDeadZone = bits, U32, 1152, [8:8] +isBlipping = bits, U32, 1152, [9:9] +useClosedLoop = bits, U32, 1152, [10:10] +badTps = bits, U32, 1152, [11:11] +looksLikeRunning = bits, U32, 1152, [12:12] +looksLikeCoasting = bits, U32, 1152, [13:13] +looksLikeCrankToIdle = bits, U32, 1152, [14:14] +useInstantRpmForIdle = bits, U32, 1152, [15:15] +isVerboseIAC = bits, U32, 1152, [16:16] +unusedBit_22_17 = bits, U32, 1152, [17:17] +unusedBit_22_18 = bits, U32, 1152, [18:18] +unusedBit_22_19 = bits, U32, 1152, [19:19] +unusedBit_22_20 = bits, U32, 1152, [20:20] +unusedBit_22_21 = bits, U32, 1152, [21:21] +unusedBit_22_22 = bits, U32, 1152, [22:22] +unusedBit_22_23 = bits, U32, 1152, [23:23] +unusedBit_22_24 = bits, U32, 1152, [24:24] +unusedBit_22_25 = bits, U32, 1152, [25:25] +unusedBit_22_26 = bits, U32, 1152, [26:26] +unusedBit_22_27 = bits, U32, 1152, [27:27] +unusedBit_22_28 = bits, U32, 1152, [28:28] +unusedBit_22_29 = bits, U32, 1152, [29:29] +unusedBit_22_30 = bits, U32, 1152, [30:30] +unusedBit_22_31 = bits, U32, 1152, [31:31] +targetRpmByClt = scalar, S32, 1156, "", 1, 0 +targetRpmAcBump = scalar, S32, 1160, "", 1, 0 +iacByRpmTaper = scalar, F32, 1164 +luaAdd = scalar, F32, 1168 +; total TS size = 1172 +baseDwell = scalar, F32, 1172, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 1176, "", 1, 0 +luaTimingAdd = scalar, F32, 1180, "", 1, 0 +luaTimingMult = scalar, F32, 1184, "", 1, 0 +; total TS size = 1188 +idlePosition = scalar, F32, 1188, "", 1, 0 +trim = scalar, F32, 1192, "", 1, 0 +luaAdjustment = scalar, F32, 1196, "", 1, 0 +etbFeedForward = scalar, F32, 1200 +etbIntegralError = scalar, F32, 1204, "", 1, 0 +etbCurrentTarget = scalar, F32, 1208, "%", 1, 0 +; total TS size = 1212 +faultCode = scalar, U08, 1212, "", 1, 0 +heaterDuty = scalar, U08, 1213, "%", 1, 0 +pumpDuty = scalar, U08, 1214, "%", 1, 0 +tempC = scalar, U16, 1216, "C", 1, 0 +nernstVoltage = scalar, U16, 1218, "V", 0.001, 0 +esr = scalar, U16, 1220, "", 1, 0 +; total TS size = 1224 time = { timeNow } @@ -4721,7 +4754,6 @@ entry = hellenBoardId, "Detected Board ID", int, "%d" entry = clutchUpState, "clutch: up", int, "%d" entry = clutchDownState, "clutch: down", int, "%d" entry = brakePedalState, "brake: down", int, "%d" -entry = isSynchronizedPhase, "isSynchronizedPhase", int, "%d" entry = egt1, "egt1", float, "%.3f" entry = egt2, "egt2", float, "%.3f" entry = desiredRpmLimit, "User-defined RPM hard limit", int, "%d" @@ -4762,6 +4794,7 @@ entry = triggerStateIndex, "triggerStateIndex", int, "%d" entry = vvtCounter, "vvtCounter", int, "%d" entry = camResyncCounter, "camResyncCounter", int, "%d" entry = vvtStateIndex, "vvtStateIndex", int, "%d" +entry = m_hasSynchronizedPhase, "m_hasSynchronizedPhase", int, "%d" entry = wallFuelCorrection, "fuel injection time correction to account for wall wetting effect for current cycle", float, "%.3f" entry = wallFuel, "Amount of fuel on the wall, in ms of injector open time for each injector.", float, "%.3f" entry = idleState, "idleState", int, "%d" @@ -4966,6 +4999,7 @@ menuDialog = main subMenu = tps_accel_stateDialog, "tps_accel_state" subMenu = trigger_centralDialog, "trigger_central" subMenu = trigger_stateDialog, "trigger_state" + subMenu = trigger_state_primaryDialog, "trigger_state_primary" subMenu = wall_fuel_stateDialog, "wall_fuel_state" subMenu = idle_stateDialog, "idle_state" subMenu = ignition_stateDialog, "ignition_state" @@ -5414,7 +5448,6 @@ indicatorPanel = engine_stateIndicatorPanel, 2 indicator = {clutchUpState}, "clutchUpState No", "clutchUpState Yes" indicator = {clutchDownState}, "clutchDownState No", "clutchDownState Yes" indicator = {brakePedalState}, "brakePedalState No", "brakePedalState Yes" - indicator = {isSynchronizedPhase}, "isSynchronizedPhase No", "isSynchronizedPhase Yes" dialog = engine_stateDialog, "engine_state" panel = engine_stateIndicatorPanel @@ -5523,6 +5556,12 @@ dialog = trigger_stateDialog, "trigger_state" liveGraph = trigger_state_3_Graph, "Graph", South graphLine = vvtStateIndex +indicatorPanel = trigger_state_primaryIndicatorPanel, 2 + indicator = {m_hasSynchronizedPhase}, "m_hasSynchronizedPhase No", "m_hasSynchronizedPhase Yes" + +dialog = trigger_state_primaryDialog, "trigger_state_primary" + panel = trigger_state_primaryIndicatorPanel + dialog = wall_fuel_stateDialog, "wall_fuel_state" liveGraph = wall_fuel_state_1_Graph, "Graph", South diff --git a/firmware/tunerstudio/generated/rusefi_hellen81.ini b/firmware/tunerstudio/generated/rusefi_hellen81.ini index 4c8b435708..cb4526f219 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen81.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen81.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.08.24.hellen81.1473435405" + signature = "rusEFI 2022.08.24.hellen81.1354699540" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.08.24.hellen81.1473435405" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.08.24.hellen81.1354699540" ; 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 Wed Aug 24 16:15:29 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Aug 24 22:15:07 UTC 2022 pageSize = 21300 page = 1 @@ -2109,7 +2109,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1220 + ochBlockSize = 1224 ; ; see TunerStudioOutputChannels struct @@ -2990,35 +2990,35 @@ hellenBoardId = scalar, S16, 990, "id", 1, 0 clutchUpState = bits, U32, 992, [0:0] clutchDownState = bits, U32, 992, [1:1] brakePedalState = bits, U32, 992, [2:2] -isSynchronizedPhase = bits, U32, 992, [3:3] -unusedBit_23_4 = bits, U32, 992, [4:4] -unusedBit_23_5 = bits, U32, 992, [5:5] -unusedBit_23_6 = bits, U32, 992, [6:6] -unusedBit_23_7 = bits, U32, 992, [7:7] -unusedBit_23_8 = bits, U32, 992, [8:8] -unusedBit_23_9 = bits, U32, 992, [9:9] -unusedBit_23_10 = bits, U32, 992, [10:10] -unusedBit_23_11 = bits, U32, 992, [11:11] -unusedBit_23_12 = bits, U32, 992, [12:12] -unusedBit_23_13 = bits, U32, 992, [13:13] -unusedBit_23_14 = bits, U32, 992, [14:14] -unusedBit_23_15 = bits, U32, 992, [15:15] -unusedBit_23_16 = bits, U32, 992, [16:16] -unusedBit_23_17 = bits, U32, 992, [17:17] -unusedBit_23_18 = bits, U32, 992, [18:18] -unusedBit_23_19 = bits, U32, 992, [19:19] -unusedBit_23_20 = bits, U32, 992, [20:20] -unusedBit_23_21 = bits, U32, 992, [21:21] -unusedBit_23_22 = bits, U32, 992, [22:22] -unusedBit_23_23 = bits, U32, 992, [23:23] -unusedBit_23_24 = bits, U32, 992, [24:24] -unusedBit_23_25 = bits, U32, 992, [25:25] -unusedBit_23_26 = bits, U32, 992, [26:26] -unusedBit_23_27 = bits, U32, 992, [27:27] -unusedBit_23_28 = bits, U32, 992, [28:28] -unusedBit_23_29 = bits, U32, 992, [29:29] -unusedBit_23_30 = bits, U32, 992, [30:30] -unusedBit_23_31 = bits, U32, 992, [31:31] +unusedBit_22_3 = bits, U32, 992, [3:3] +unusedBit_22_4 = bits, U32, 992, [4:4] +unusedBit_22_5 = bits, U32, 992, [5:5] +unusedBit_22_6 = bits, U32, 992, [6:6] +unusedBit_22_7 = bits, U32, 992, [7:7] +unusedBit_22_8 = bits, U32, 992, [8:8] +unusedBit_22_9 = bits, U32, 992, [9:9] +unusedBit_22_10 = bits, U32, 992, [10:10] +unusedBit_22_11 = bits, U32, 992, [11:11] +unusedBit_22_12 = bits, U32, 992, [12:12] +unusedBit_22_13 = bits, U32, 992, [13:13] +unusedBit_22_14 = bits, U32, 992, [14:14] +unusedBit_22_15 = bits, U32, 992, [15:15] +unusedBit_22_16 = bits, U32, 992, [16:16] +unusedBit_22_17 = bits, U32, 992, [17:17] +unusedBit_22_18 = bits, U32, 992, [18:18] +unusedBit_22_19 = bits, U32, 992, [19:19] +unusedBit_22_20 = bits, U32, 992, [20:20] +unusedBit_22_21 = bits, U32, 992, [21:21] +unusedBit_22_22 = bits, U32, 992, [22:22] +unusedBit_22_23 = bits, U32, 992, [23:23] +unusedBit_22_24 = bits, U32, 992, [24:24] +unusedBit_22_25 = bits, U32, 992, [25:25] +unusedBit_22_26 = bits, U32, 992, [26:26] +unusedBit_22_27 = bits, U32, 992, [27:27] +unusedBit_22_28 = bits, U32, 992, [28:28] +unusedBit_22_29 = bits, U32, 992, [29:29] +unusedBit_22_30 = bits, U32, 992, [30:30] +unusedBit_22_31 = bits, U32, 992, [31:31] egt1 = scalar, F32, 996, "", 1, 0 egt2 = scalar, F32, 1000, "", 1, 0 desiredRpmLimit = scalar, S16, 1004, "rpm", 1, 0 @@ -3089,70 +3089,103 @@ vvtCounter = scalar, U08, 1117, "", 1, 0 camResyncCounter = scalar, U08, 1118, "", 1, 0 vvtStateIndex = scalar, U08, 1119, "", 1, 0 ; total TS size = 1120 -wallFuelCorrection = scalar, F32, 1120, "", 1, 0 -wallFuel = scalar, F32, 1124, "", 1, 0 -; total TS size = 1128 -idleState = bits, S32, 1128, [0:2], "not important" -currentIdlePosition = scalar, F32, 1132 -baseIdlePosition = scalar, F32, 1136 -iacByTpsTaper = scalar, F32, 1140 -throttlePedalUpState = scalar, S32, 1144, "", 1, 0 -mightResetPid = bits, U32, 1148, [0:0] -shouldResetPid = bits, U32, 1148, [1:1] -wasResetPid = bits, U32, 1148, [2:2] -mustResetPid = bits, U32, 1148, [3:3] -isCoasting = bits, U32, 1148, [4:4] -useIacTableForCoasting = bits, U32, 1148, [5:5] -notIdling = bits, U32, 1148, [6:6] -needReset = bits, U32, 1148, [7:7] -isInDeadZone = bits, U32, 1148, [8:8] -isBlipping = bits, U32, 1148, [9:9] -useClosedLoop = bits, U32, 1148, [10:10] -badTps = bits, U32, 1148, [11:11] -looksLikeRunning = bits, U32, 1148, [12:12] -looksLikeCoasting = bits, U32, 1148, [13:13] -looksLikeCrankToIdle = bits, U32, 1148, [14:14] -useInstantRpmForIdle = bits, U32, 1148, [15:15] -isVerboseIAC = bits, U32, 1148, [16:16] -unusedBit_22_17 = bits, U32, 1148, [17:17] -unusedBit_22_18 = bits, U32, 1148, [18:18] -unusedBit_22_19 = bits, U32, 1148, [19:19] -unusedBit_22_20 = bits, U32, 1148, [20:20] -unusedBit_22_21 = bits, U32, 1148, [21:21] -unusedBit_22_22 = bits, U32, 1148, [22:22] -unusedBit_22_23 = bits, U32, 1148, [23:23] -unusedBit_22_24 = bits, U32, 1148, [24:24] -unusedBit_22_25 = bits, U32, 1148, [25:25] -unusedBit_22_26 = bits, U32, 1148, [26:26] -unusedBit_22_27 = bits, U32, 1148, [27:27] -unusedBit_22_28 = bits, U32, 1148, [28:28] -unusedBit_22_29 = bits, U32, 1148, [29:29] -unusedBit_22_30 = bits, U32, 1148, [30:30] -unusedBit_22_31 = bits, U32, 1148, [31:31] -targetRpmByClt = scalar, S32, 1152, "", 1, 0 -targetRpmAcBump = scalar, S32, 1156, "", 1, 0 -iacByRpmTaper = scalar, F32, 1160 -luaAdd = scalar, F32, 1164 -; total TS size = 1168 -baseDwell = scalar, F32, 1168, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 1172, "", 1, 0 -luaTimingAdd = scalar, F32, 1176, "", 1, 0 -luaTimingMult = scalar, F32, 1180, "", 1, 0 -; total TS size = 1184 -idlePosition = scalar, F32, 1184, "", 1, 0 -trim = scalar, F32, 1188, "", 1, 0 -luaAdjustment = scalar, F32, 1192, "", 1, 0 -etbFeedForward = scalar, F32, 1196 -etbIntegralError = scalar, F32, 1200, "", 1, 0 -etbCurrentTarget = scalar, F32, 1204, "%", 1, 0 -; total TS size = 1208 -faultCode = scalar, U08, 1208, "", 1, 0 -heaterDuty = scalar, U08, 1209, "%", 1, 0 -pumpDuty = scalar, U08, 1210, "%", 1, 0 -tempC = scalar, U16, 1212, "C", 1, 0 -nernstVoltage = scalar, U16, 1214, "V", 0.001, 0 -esr = scalar, U16, 1216, "", 1, 0 -; total TS size = 1220 +m_hasSynchronizedPhase = bits, U32, 1120, [0:0] +unusedBit_1_1 = bits, U32, 1120, [1:1] +unusedBit_1_2 = bits, U32, 1120, [2:2] +unusedBit_1_3 = bits, U32, 1120, [3:3] +unusedBit_1_4 = bits, U32, 1120, [4:4] +unusedBit_1_5 = bits, U32, 1120, [5:5] +unusedBit_1_6 = bits, U32, 1120, [6:6] +unusedBit_1_7 = bits, U32, 1120, [7:7] +unusedBit_1_8 = bits, U32, 1120, [8:8] +unusedBit_1_9 = bits, U32, 1120, [9:9] +unusedBit_1_10 = bits, U32, 1120, [10:10] +unusedBit_1_11 = bits, U32, 1120, [11:11] +unusedBit_1_12 = bits, U32, 1120, [12:12] +unusedBit_1_13 = bits, U32, 1120, [13:13] +unusedBit_1_14 = bits, U32, 1120, [14:14] +unusedBit_1_15 = bits, U32, 1120, [15:15] +unusedBit_1_16 = bits, U32, 1120, [16:16] +unusedBit_1_17 = bits, U32, 1120, [17:17] +unusedBit_1_18 = bits, U32, 1120, [18:18] +unusedBit_1_19 = bits, U32, 1120, [19:19] +unusedBit_1_20 = bits, U32, 1120, [20:20] +unusedBit_1_21 = bits, U32, 1120, [21:21] +unusedBit_1_22 = bits, U32, 1120, [22:22] +unusedBit_1_23 = bits, U32, 1120, [23:23] +unusedBit_1_24 = bits, U32, 1120, [24:24] +unusedBit_1_25 = bits, U32, 1120, [25:25] +unusedBit_1_26 = bits, U32, 1120, [26:26] +unusedBit_1_27 = bits, U32, 1120, [27:27] +unusedBit_1_28 = bits, U32, 1120, [28:28] +unusedBit_1_29 = bits, U32, 1120, [29:29] +unusedBit_1_30 = bits, U32, 1120, [30:30] +unusedBit_1_31 = bits, U32, 1120, [31:31] +; total TS size = 1124 +wallFuelCorrection = scalar, F32, 1124, "", 1, 0 +wallFuel = scalar, F32, 1128, "", 1, 0 +; total TS size = 1132 +idleState = bits, S32, 1132, [0:2], "not important" +currentIdlePosition = scalar, F32, 1136 +baseIdlePosition = scalar, F32, 1140 +iacByTpsTaper = scalar, F32, 1144 +throttlePedalUpState = scalar, S32, 1148, "", 1, 0 +mightResetPid = bits, U32, 1152, [0:0] +shouldResetPid = bits, U32, 1152, [1:1] +wasResetPid = bits, U32, 1152, [2:2] +mustResetPid = bits, U32, 1152, [3:3] +isCoasting = bits, U32, 1152, [4:4] +useIacTableForCoasting = bits, U32, 1152, [5:5] +notIdling = bits, U32, 1152, [6:6] +needReset = bits, U32, 1152, [7:7] +isInDeadZone = bits, U32, 1152, [8:8] +isBlipping = bits, U32, 1152, [9:9] +useClosedLoop = bits, U32, 1152, [10:10] +badTps = bits, U32, 1152, [11:11] +looksLikeRunning = bits, U32, 1152, [12:12] +looksLikeCoasting = bits, U32, 1152, [13:13] +looksLikeCrankToIdle = bits, U32, 1152, [14:14] +useInstantRpmForIdle = bits, U32, 1152, [15:15] +isVerboseIAC = bits, U32, 1152, [16:16] +unusedBit_22_17 = bits, U32, 1152, [17:17] +unusedBit_22_18 = bits, U32, 1152, [18:18] +unusedBit_22_19 = bits, U32, 1152, [19:19] +unusedBit_22_20 = bits, U32, 1152, [20:20] +unusedBit_22_21 = bits, U32, 1152, [21:21] +unusedBit_22_22 = bits, U32, 1152, [22:22] +unusedBit_22_23 = bits, U32, 1152, [23:23] +unusedBit_22_24 = bits, U32, 1152, [24:24] +unusedBit_22_25 = bits, U32, 1152, [25:25] +unusedBit_22_26 = bits, U32, 1152, [26:26] +unusedBit_22_27 = bits, U32, 1152, [27:27] +unusedBit_22_28 = bits, U32, 1152, [28:28] +unusedBit_22_29 = bits, U32, 1152, [29:29] +unusedBit_22_30 = bits, U32, 1152, [30:30] +unusedBit_22_31 = bits, U32, 1152, [31:31] +targetRpmByClt = scalar, S32, 1156, "", 1, 0 +targetRpmAcBump = scalar, S32, 1160, "", 1, 0 +iacByRpmTaper = scalar, F32, 1164 +luaAdd = scalar, F32, 1168 +; total TS size = 1172 +baseDwell = scalar, F32, 1172, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 1176, "", 1, 0 +luaTimingAdd = scalar, F32, 1180, "", 1, 0 +luaTimingMult = scalar, F32, 1184, "", 1, 0 +; total TS size = 1188 +idlePosition = scalar, F32, 1188, "", 1, 0 +trim = scalar, F32, 1192, "", 1, 0 +luaAdjustment = scalar, F32, 1196, "", 1, 0 +etbFeedForward = scalar, F32, 1200 +etbIntegralError = scalar, F32, 1204, "", 1, 0 +etbCurrentTarget = scalar, F32, 1208, "%", 1, 0 +; total TS size = 1212 +faultCode = scalar, U08, 1212, "", 1, 0 +heaterDuty = scalar, U08, 1213, "%", 1, 0 +pumpDuty = scalar, U08, 1214, "%", 1, 0 +tempC = scalar, U16, 1216, "C", 1, 0 +nernstVoltage = scalar, U16, 1218, "V", 0.001, 0 +esr = scalar, U16, 1220, "", 1, 0 +; total TS size = 1224 time = { timeNow } @@ -4721,7 +4754,6 @@ entry = hellenBoardId, "Detected Board ID", int, "%d" entry = clutchUpState, "clutch: up", int, "%d" entry = clutchDownState, "clutch: down", int, "%d" entry = brakePedalState, "brake: down", int, "%d" -entry = isSynchronizedPhase, "isSynchronizedPhase", int, "%d" entry = egt1, "egt1", float, "%.3f" entry = egt2, "egt2", float, "%.3f" entry = desiredRpmLimit, "User-defined RPM hard limit", int, "%d" @@ -4762,6 +4794,7 @@ entry = triggerStateIndex, "triggerStateIndex", int, "%d" entry = vvtCounter, "vvtCounter", int, "%d" entry = camResyncCounter, "camResyncCounter", int, "%d" entry = vvtStateIndex, "vvtStateIndex", int, "%d" +entry = m_hasSynchronizedPhase, "m_hasSynchronizedPhase", int, "%d" entry = wallFuelCorrection, "fuel injection time correction to account for wall wetting effect for current cycle", float, "%.3f" entry = wallFuel, "Amount of fuel on the wall, in ms of injector open time for each injector.", float, "%.3f" entry = idleState, "idleState", int, "%d" @@ -4966,6 +4999,7 @@ menuDialog = main subMenu = tps_accel_stateDialog, "tps_accel_state" subMenu = trigger_centralDialog, "trigger_central" subMenu = trigger_stateDialog, "trigger_state" + subMenu = trigger_state_primaryDialog, "trigger_state_primary" subMenu = wall_fuel_stateDialog, "wall_fuel_state" subMenu = idle_stateDialog, "idle_state" subMenu = ignition_stateDialog, "ignition_state" @@ -5413,7 +5447,6 @@ indicatorPanel = engine_stateIndicatorPanel, 2 indicator = {clutchUpState}, "clutchUpState No", "clutchUpState Yes" indicator = {clutchDownState}, "clutchDownState No", "clutchDownState Yes" indicator = {brakePedalState}, "brakePedalState No", "brakePedalState Yes" - indicator = {isSynchronizedPhase}, "isSynchronizedPhase No", "isSynchronizedPhase Yes" dialog = engine_stateDialog, "engine_state" panel = engine_stateIndicatorPanel @@ -5522,6 +5555,12 @@ dialog = trigger_stateDialog, "trigger_state" liveGraph = trigger_state_3_Graph, "Graph", South graphLine = vvtStateIndex +indicatorPanel = trigger_state_primaryIndicatorPanel, 2 + indicator = {m_hasSynchronizedPhase}, "m_hasSynchronizedPhase No", "m_hasSynchronizedPhase Yes" + +dialog = trigger_state_primaryDialog, "trigger_state_primary" + panel = trigger_state_primaryIndicatorPanel + dialog = wall_fuel_stateDialog, "wall_fuel_state" liveGraph = wall_fuel_state_1_Graph, "Graph", South diff --git a/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini b/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini index 4a68441aa2..026d0cf0c0 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.08.24.hellen88bmw.1620188363" + signature = "rusEFI 2022.08.24.hellen88bmw.1744820434" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.08.24.hellen88bmw.1620188363" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.08.24.hellen88bmw.1744820434" ; 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 Wed Aug 24 16:15:25 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Aug 24 22:15:04 UTC 2022 pageSize = 21300 page = 1 @@ -2109,7 +2109,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1220 + ochBlockSize = 1224 ; ; see TunerStudioOutputChannels struct @@ -2990,35 +2990,35 @@ hellenBoardId = scalar, S16, 990, "id", 1, 0 clutchUpState = bits, U32, 992, [0:0] clutchDownState = bits, U32, 992, [1:1] brakePedalState = bits, U32, 992, [2:2] -isSynchronizedPhase = bits, U32, 992, [3:3] -unusedBit_23_4 = bits, U32, 992, [4:4] -unusedBit_23_5 = bits, U32, 992, [5:5] -unusedBit_23_6 = bits, U32, 992, [6:6] -unusedBit_23_7 = bits, U32, 992, [7:7] -unusedBit_23_8 = bits, U32, 992, [8:8] -unusedBit_23_9 = bits, U32, 992, [9:9] -unusedBit_23_10 = bits, U32, 992, [10:10] -unusedBit_23_11 = bits, U32, 992, [11:11] -unusedBit_23_12 = bits, U32, 992, [12:12] -unusedBit_23_13 = bits, U32, 992, [13:13] -unusedBit_23_14 = bits, U32, 992, [14:14] -unusedBit_23_15 = bits, U32, 992, [15:15] -unusedBit_23_16 = bits, U32, 992, [16:16] -unusedBit_23_17 = bits, U32, 992, [17:17] -unusedBit_23_18 = bits, U32, 992, [18:18] -unusedBit_23_19 = bits, U32, 992, [19:19] -unusedBit_23_20 = bits, U32, 992, [20:20] -unusedBit_23_21 = bits, U32, 992, [21:21] -unusedBit_23_22 = bits, U32, 992, [22:22] -unusedBit_23_23 = bits, U32, 992, [23:23] -unusedBit_23_24 = bits, U32, 992, [24:24] -unusedBit_23_25 = bits, U32, 992, [25:25] -unusedBit_23_26 = bits, U32, 992, [26:26] -unusedBit_23_27 = bits, U32, 992, [27:27] -unusedBit_23_28 = bits, U32, 992, [28:28] -unusedBit_23_29 = bits, U32, 992, [29:29] -unusedBit_23_30 = bits, U32, 992, [30:30] -unusedBit_23_31 = bits, U32, 992, [31:31] +unusedBit_22_3 = bits, U32, 992, [3:3] +unusedBit_22_4 = bits, U32, 992, [4:4] +unusedBit_22_5 = bits, U32, 992, [5:5] +unusedBit_22_6 = bits, U32, 992, [6:6] +unusedBit_22_7 = bits, U32, 992, [7:7] +unusedBit_22_8 = bits, U32, 992, [8:8] +unusedBit_22_9 = bits, U32, 992, [9:9] +unusedBit_22_10 = bits, U32, 992, [10:10] +unusedBit_22_11 = bits, U32, 992, [11:11] +unusedBit_22_12 = bits, U32, 992, [12:12] +unusedBit_22_13 = bits, U32, 992, [13:13] +unusedBit_22_14 = bits, U32, 992, [14:14] +unusedBit_22_15 = bits, U32, 992, [15:15] +unusedBit_22_16 = bits, U32, 992, [16:16] +unusedBit_22_17 = bits, U32, 992, [17:17] +unusedBit_22_18 = bits, U32, 992, [18:18] +unusedBit_22_19 = bits, U32, 992, [19:19] +unusedBit_22_20 = bits, U32, 992, [20:20] +unusedBit_22_21 = bits, U32, 992, [21:21] +unusedBit_22_22 = bits, U32, 992, [22:22] +unusedBit_22_23 = bits, U32, 992, [23:23] +unusedBit_22_24 = bits, U32, 992, [24:24] +unusedBit_22_25 = bits, U32, 992, [25:25] +unusedBit_22_26 = bits, U32, 992, [26:26] +unusedBit_22_27 = bits, U32, 992, [27:27] +unusedBit_22_28 = bits, U32, 992, [28:28] +unusedBit_22_29 = bits, U32, 992, [29:29] +unusedBit_22_30 = bits, U32, 992, [30:30] +unusedBit_22_31 = bits, U32, 992, [31:31] egt1 = scalar, F32, 996, "", 1, 0 egt2 = scalar, F32, 1000, "", 1, 0 desiredRpmLimit = scalar, S16, 1004, "rpm", 1, 0 @@ -3089,70 +3089,103 @@ vvtCounter = scalar, U08, 1117, "", 1, 0 camResyncCounter = scalar, U08, 1118, "", 1, 0 vvtStateIndex = scalar, U08, 1119, "", 1, 0 ; total TS size = 1120 -wallFuelCorrection = scalar, F32, 1120, "", 1, 0 -wallFuel = scalar, F32, 1124, "", 1, 0 -; total TS size = 1128 -idleState = bits, S32, 1128, [0:2], "not important" -currentIdlePosition = scalar, F32, 1132 -baseIdlePosition = scalar, F32, 1136 -iacByTpsTaper = scalar, F32, 1140 -throttlePedalUpState = scalar, S32, 1144, "", 1, 0 -mightResetPid = bits, U32, 1148, [0:0] -shouldResetPid = bits, U32, 1148, [1:1] -wasResetPid = bits, U32, 1148, [2:2] -mustResetPid = bits, U32, 1148, [3:3] -isCoasting = bits, U32, 1148, [4:4] -useIacTableForCoasting = bits, U32, 1148, [5:5] -notIdling = bits, U32, 1148, [6:6] -needReset = bits, U32, 1148, [7:7] -isInDeadZone = bits, U32, 1148, [8:8] -isBlipping = bits, U32, 1148, [9:9] -useClosedLoop = bits, U32, 1148, [10:10] -badTps = bits, U32, 1148, [11:11] -looksLikeRunning = bits, U32, 1148, [12:12] -looksLikeCoasting = bits, U32, 1148, [13:13] -looksLikeCrankToIdle = bits, U32, 1148, [14:14] -useInstantRpmForIdle = bits, U32, 1148, [15:15] -isVerboseIAC = bits, U32, 1148, [16:16] -unusedBit_22_17 = bits, U32, 1148, [17:17] -unusedBit_22_18 = bits, U32, 1148, [18:18] -unusedBit_22_19 = bits, U32, 1148, [19:19] -unusedBit_22_20 = bits, U32, 1148, [20:20] -unusedBit_22_21 = bits, U32, 1148, [21:21] -unusedBit_22_22 = bits, U32, 1148, [22:22] -unusedBit_22_23 = bits, U32, 1148, [23:23] -unusedBit_22_24 = bits, U32, 1148, [24:24] -unusedBit_22_25 = bits, U32, 1148, [25:25] -unusedBit_22_26 = bits, U32, 1148, [26:26] -unusedBit_22_27 = bits, U32, 1148, [27:27] -unusedBit_22_28 = bits, U32, 1148, [28:28] -unusedBit_22_29 = bits, U32, 1148, [29:29] -unusedBit_22_30 = bits, U32, 1148, [30:30] -unusedBit_22_31 = bits, U32, 1148, [31:31] -targetRpmByClt = scalar, S32, 1152, "", 1, 0 -targetRpmAcBump = scalar, S32, 1156, "", 1, 0 -iacByRpmTaper = scalar, F32, 1160 -luaAdd = scalar, F32, 1164 -; total TS size = 1168 -baseDwell = scalar, F32, 1168, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 1172, "", 1, 0 -luaTimingAdd = scalar, F32, 1176, "", 1, 0 -luaTimingMult = scalar, F32, 1180, "", 1, 0 -; total TS size = 1184 -idlePosition = scalar, F32, 1184, "", 1, 0 -trim = scalar, F32, 1188, "", 1, 0 -luaAdjustment = scalar, F32, 1192, "", 1, 0 -etbFeedForward = scalar, F32, 1196 -etbIntegralError = scalar, F32, 1200, "", 1, 0 -etbCurrentTarget = scalar, F32, 1204, "%", 1, 0 -; total TS size = 1208 -faultCode = scalar, U08, 1208, "", 1, 0 -heaterDuty = scalar, U08, 1209, "%", 1, 0 -pumpDuty = scalar, U08, 1210, "%", 1, 0 -tempC = scalar, U16, 1212, "C", 1, 0 -nernstVoltage = scalar, U16, 1214, "V", 0.001, 0 -esr = scalar, U16, 1216, "", 1, 0 -; total TS size = 1220 +m_hasSynchronizedPhase = bits, U32, 1120, [0:0] +unusedBit_1_1 = bits, U32, 1120, [1:1] +unusedBit_1_2 = bits, U32, 1120, [2:2] +unusedBit_1_3 = bits, U32, 1120, [3:3] +unusedBit_1_4 = bits, U32, 1120, [4:4] +unusedBit_1_5 = bits, U32, 1120, [5:5] +unusedBit_1_6 = bits, U32, 1120, [6:6] +unusedBit_1_7 = bits, U32, 1120, [7:7] +unusedBit_1_8 = bits, U32, 1120, [8:8] +unusedBit_1_9 = bits, U32, 1120, [9:9] +unusedBit_1_10 = bits, U32, 1120, [10:10] +unusedBit_1_11 = bits, U32, 1120, [11:11] +unusedBit_1_12 = bits, U32, 1120, [12:12] +unusedBit_1_13 = bits, U32, 1120, [13:13] +unusedBit_1_14 = bits, U32, 1120, [14:14] +unusedBit_1_15 = bits, U32, 1120, [15:15] +unusedBit_1_16 = bits, U32, 1120, [16:16] +unusedBit_1_17 = bits, U32, 1120, [17:17] +unusedBit_1_18 = bits, U32, 1120, [18:18] +unusedBit_1_19 = bits, U32, 1120, [19:19] +unusedBit_1_20 = bits, U32, 1120, [20:20] +unusedBit_1_21 = bits, U32, 1120, [21:21] +unusedBit_1_22 = bits, U32, 1120, [22:22] +unusedBit_1_23 = bits, U32, 1120, [23:23] +unusedBit_1_24 = bits, U32, 1120, [24:24] +unusedBit_1_25 = bits, U32, 1120, [25:25] +unusedBit_1_26 = bits, U32, 1120, [26:26] +unusedBit_1_27 = bits, U32, 1120, [27:27] +unusedBit_1_28 = bits, U32, 1120, [28:28] +unusedBit_1_29 = bits, U32, 1120, [29:29] +unusedBit_1_30 = bits, U32, 1120, [30:30] +unusedBit_1_31 = bits, U32, 1120, [31:31] +; total TS size = 1124 +wallFuelCorrection = scalar, F32, 1124, "", 1, 0 +wallFuel = scalar, F32, 1128, "", 1, 0 +; total TS size = 1132 +idleState = bits, S32, 1132, [0:2], "not important" +currentIdlePosition = scalar, F32, 1136 +baseIdlePosition = scalar, F32, 1140 +iacByTpsTaper = scalar, F32, 1144 +throttlePedalUpState = scalar, S32, 1148, "", 1, 0 +mightResetPid = bits, U32, 1152, [0:0] +shouldResetPid = bits, U32, 1152, [1:1] +wasResetPid = bits, U32, 1152, [2:2] +mustResetPid = bits, U32, 1152, [3:3] +isCoasting = bits, U32, 1152, [4:4] +useIacTableForCoasting = bits, U32, 1152, [5:5] +notIdling = bits, U32, 1152, [6:6] +needReset = bits, U32, 1152, [7:7] +isInDeadZone = bits, U32, 1152, [8:8] +isBlipping = bits, U32, 1152, [9:9] +useClosedLoop = bits, U32, 1152, [10:10] +badTps = bits, U32, 1152, [11:11] +looksLikeRunning = bits, U32, 1152, [12:12] +looksLikeCoasting = bits, U32, 1152, [13:13] +looksLikeCrankToIdle = bits, U32, 1152, [14:14] +useInstantRpmForIdle = bits, U32, 1152, [15:15] +isVerboseIAC = bits, U32, 1152, [16:16] +unusedBit_22_17 = bits, U32, 1152, [17:17] +unusedBit_22_18 = bits, U32, 1152, [18:18] +unusedBit_22_19 = bits, U32, 1152, [19:19] +unusedBit_22_20 = bits, U32, 1152, [20:20] +unusedBit_22_21 = bits, U32, 1152, [21:21] +unusedBit_22_22 = bits, U32, 1152, [22:22] +unusedBit_22_23 = bits, U32, 1152, [23:23] +unusedBit_22_24 = bits, U32, 1152, [24:24] +unusedBit_22_25 = bits, U32, 1152, [25:25] +unusedBit_22_26 = bits, U32, 1152, [26:26] +unusedBit_22_27 = bits, U32, 1152, [27:27] +unusedBit_22_28 = bits, U32, 1152, [28:28] +unusedBit_22_29 = bits, U32, 1152, [29:29] +unusedBit_22_30 = bits, U32, 1152, [30:30] +unusedBit_22_31 = bits, U32, 1152, [31:31] +targetRpmByClt = scalar, S32, 1156, "", 1, 0 +targetRpmAcBump = scalar, S32, 1160, "", 1, 0 +iacByRpmTaper = scalar, F32, 1164 +luaAdd = scalar, F32, 1168 +; total TS size = 1172 +baseDwell = scalar, F32, 1172, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 1176, "", 1, 0 +luaTimingAdd = scalar, F32, 1180, "", 1, 0 +luaTimingMult = scalar, F32, 1184, "", 1, 0 +; total TS size = 1188 +idlePosition = scalar, F32, 1188, "", 1, 0 +trim = scalar, F32, 1192, "", 1, 0 +luaAdjustment = scalar, F32, 1196, "", 1, 0 +etbFeedForward = scalar, F32, 1200 +etbIntegralError = scalar, F32, 1204, "", 1, 0 +etbCurrentTarget = scalar, F32, 1208, "%", 1, 0 +; total TS size = 1212 +faultCode = scalar, U08, 1212, "", 1, 0 +heaterDuty = scalar, U08, 1213, "%", 1, 0 +pumpDuty = scalar, U08, 1214, "%", 1, 0 +tempC = scalar, U16, 1216, "C", 1, 0 +nernstVoltage = scalar, U16, 1218, "V", 0.001, 0 +esr = scalar, U16, 1220, "", 1, 0 +; total TS size = 1224 time = { timeNow } @@ -4721,7 +4754,6 @@ entry = hellenBoardId, "Detected Board ID", int, "%d" entry = clutchUpState, "clutch: up", int, "%d" entry = clutchDownState, "clutch: down", int, "%d" entry = brakePedalState, "brake: down", int, "%d" -entry = isSynchronizedPhase, "isSynchronizedPhase", int, "%d" entry = egt1, "egt1", float, "%.3f" entry = egt2, "egt2", float, "%.3f" entry = desiredRpmLimit, "User-defined RPM hard limit", int, "%d" @@ -4762,6 +4794,7 @@ entry = triggerStateIndex, "triggerStateIndex", int, "%d" entry = vvtCounter, "vvtCounter", int, "%d" entry = camResyncCounter, "camResyncCounter", int, "%d" entry = vvtStateIndex, "vvtStateIndex", int, "%d" +entry = m_hasSynchronizedPhase, "m_hasSynchronizedPhase", int, "%d" entry = wallFuelCorrection, "fuel injection time correction to account for wall wetting effect for current cycle", float, "%.3f" entry = wallFuel, "Amount of fuel on the wall, in ms of injector open time for each injector.", float, "%.3f" entry = idleState, "idleState", int, "%d" @@ -4966,6 +4999,7 @@ menuDialog = main subMenu = tps_accel_stateDialog, "tps_accel_state" subMenu = trigger_centralDialog, "trigger_central" subMenu = trigger_stateDialog, "trigger_state" + subMenu = trigger_state_primaryDialog, "trigger_state_primary" subMenu = wall_fuel_stateDialog, "wall_fuel_state" subMenu = idle_stateDialog, "idle_state" subMenu = ignition_stateDialog, "ignition_state" @@ -5414,7 +5448,6 @@ indicatorPanel = engine_stateIndicatorPanel, 2 indicator = {clutchUpState}, "clutchUpState No", "clutchUpState Yes" indicator = {clutchDownState}, "clutchDownState No", "clutchDownState Yes" indicator = {brakePedalState}, "brakePedalState No", "brakePedalState Yes" - indicator = {isSynchronizedPhase}, "isSynchronizedPhase No", "isSynchronizedPhase Yes" dialog = engine_stateDialog, "engine_state" panel = engine_stateIndicatorPanel @@ -5523,6 +5556,12 @@ dialog = trigger_stateDialog, "trigger_state" liveGraph = trigger_state_3_Graph, "Graph", South graphLine = vvtStateIndex +indicatorPanel = trigger_state_primaryIndicatorPanel, 2 + indicator = {m_hasSynchronizedPhase}, "m_hasSynchronizedPhase No", "m_hasSynchronizedPhase Yes" + +dialog = trigger_state_primaryDialog, "trigger_state_primary" + panel = trigger_state_primaryIndicatorPanel + dialog = wall_fuel_stateDialog, "wall_fuel_state" liveGraph = wall_fuel_state_1_Graph, "Graph", South diff --git a/firmware/tunerstudio/generated/rusefi_hellenNA6.ini b/firmware/tunerstudio/generated/rusefi_hellenNA6.ini index 0b19c8578f..9496f3deb3 100644 --- a/firmware/tunerstudio/generated/rusefi_hellenNA6.ini +++ b/firmware/tunerstudio/generated/rusefi_hellenNA6.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.08.24.hellenNA6.4159503975" + signature = "rusEFI 2022.08.24.hellenNA6.4035000958" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.08.24.hellenNA6.4159503975" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.08.24.hellenNA6.4035000958" ; 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 Wed Aug 24 16:15:34 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Aug 24 22:15:12 UTC 2022 pageSize = 21300 page = 1 @@ -2109,7 +2109,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1220 + ochBlockSize = 1224 ; ; see TunerStudioOutputChannels struct @@ -2990,35 +2990,35 @@ hellenBoardId = scalar, S16, 990, "id", 1, 0 clutchUpState = bits, U32, 992, [0:0] clutchDownState = bits, U32, 992, [1:1] brakePedalState = bits, U32, 992, [2:2] -isSynchronizedPhase = bits, U32, 992, [3:3] -unusedBit_23_4 = bits, U32, 992, [4:4] -unusedBit_23_5 = bits, U32, 992, [5:5] -unusedBit_23_6 = bits, U32, 992, [6:6] -unusedBit_23_7 = bits, U32, 992, [7:7] -unusedBit_23_8 = bits, U32, 992, [8:8] -unusedBit_23_9 = bits, U32, 992, [9:9] -unusedBit_23_10 = bits, U32, 992, [10:10] -unusedBit_23_11 = bits, U32, 992, [11:11] -unusedBit_23_12 = bits, U32, 992, [12:12] -unusedBit_23_13 = bits, U32, 992, [13:13] -unusedBit_23_14 = bits, U32, 992, [14:14] -unusedBit_23_15 = bits, U32, 992, [15:15] -unusedBit_23_16 = bits, U32, 992, [16:16] -unusedBit_23_17 = bits, U32, 992, [17:17] -unusedBit_23_18 = bits, U32, 992, [18:18] -unusedBit_23_19 = bits, U32, 992, [19:19] -unusedBit_23_20 = bits, U32, 992, [20:20] -unusedBit_23_21 = bits, U32, 992, [21:21] -unusedBit_23_22 = bits, U32, 992, [22:22] -unusedBit_23_23 = bits, U32, 992, [23:23] -unusedBit_23_24 = bits, U32, 992, [24:24] -unusedBit_23_25 = bits, U32, 992, [25:25] -unusedBit_23_26 = bits, U32, 992, [26:26] -unusedBit_23_27 = bits, U32, 992, [27:27] -unusedBit_23_28 = bits, U32, 992, [28:28] -unusedBit_23_29 = bits, U32, 992, [29:29] -unusedBit_23_30 = bits, U32, 992, [30:30] -unusedBit_23_31 = bits, U32, 992, [31:31] +unusedBit_22_3 = bits, U32, 992, [3:3] +unusedBit_22_4 = bits, U32, 992, [4:4] +unusedBit_22_5 = bits, U32, 992, [5:5] +unusedBit_22_6 = bits, U32, 992, [6:6] +unusedBit_22_7 = bits, U32, 992, [7:7] +unusedBit_22_8 = bits, U32, 992, [8:8] +unusedBit_22_9 = bits, U32, 992, [9:9] +unusedBit_22_10 = bits, U32, 992, [10:10] +unusedBit_22_11 = bits, U32, 992, [11:11] +unusedBit_22_12 = bits, U32, 992, [12:12] +unusedBit_22_13 = bits, U32, 992, [13:13] +unusedBit_22_14 = bits, U32, 992, [14:14] +unusedBit_22_15 = bits, U32, 992, [15:15] +unusedBit_22_16 = bits, U32, 992, [16:16] +unusedBit_22_17 = bits, U32, 992, [17:17] +unusedBit_22_18 = bits, U32, 992, [18:18] +unusedBit_22_19 = bits, U32, 992, [19:19] +unusedBit_22_20 = bits, U32, 992, [20:20] +unusedBit_22_21 = bits, U32, 992, [21:21] +unusedBit_22_22 = bits, U32, 992, [22:22] +unusedBit_22_23 = bits, U32, 992, [23:23] +unusedBit_22_24 = bits, U32, 992, [24:24] +unusedBit_22_25 = bits, U32, 992, [25:25] +unusedBit_22_26 = bits, U32, 992, [26:26] +unusedBit_22_27 = bits, U32, 992, [27:27] +unusedBit_22_28 = bits, U32, 992, [28:28] +unusedBit_22_29 = bits, U32, 992, [29:29] +unusedBit_22_30 = bits, U32, 992, [30:30] +unusedBit_22_31 = bits, U32, 992, [31:31] egt1 = scalar, F32, 996, "", 1, 0 egt2 = scalar, F32, 1000, "", 1, 0 desiredRpmLimit = scalar, S16, 1004, "rpm", 1, 0 @@ -3089,70 +3089,103 @@ vvtCounter = scalar, U08, 1117, "", 1, 0 camResyncCounter = scalar, U08, 1118, "", 1, 0 vvtStateIndex = scalar, U08, 1119, "", 1, 0 ; total TS size = 1120 -wallFuelCorrection = scalar, F32, 1120, "", 1, 0 -wallFuel = scalar, F32, 1124, "", 1, 0 -; total TS size = 1128 -idleState = bits, S32, 1128, [0:2], "not important" -currentIdlePosition = scalar, F32, 1132 -baseIdlePosition = scalar, F32, 1136 -iacByTpsTaper = scalar, F32, 1140 -throttlePedalUpState = scalar, S32, 1144, "", 1, 0 -mightResetPid = bits, U32, 1148, [0:0] -shouldResetPid = bits, U32, 1148, [1:1] -wasResetPid = bits, U32, 1148, [2:2] -mustResetPid = bits, U32, 1148, [3:3] -isCoasting = bits, U32, 1148, [4:4] -useIacTableForCoasting = bits, U32, 1148, [5:5] -notIdling = bits, U32, 1148, [6:6] -needReset = bits, U32, 1148, [7:7] -isInDeadZone = bits, U32, 1148, [8:8] -isBlipping = bits, U32, 1148, [9:9] -useClosedLoop = bits, U32, 1148, [10:10] -badTps = bits, U32, 1148, [11:11] -looksLikeRunning = bits, U32, 1148, [12:12] -looksLikeCoasting = bits, U32, 1148, [13:13] -looksLikeCrankToIdle = bits, U32, 1148, [14:14] -useInstantRpmForIdle = bits, U32, 1148, [15:15] -isVerboseIAC = bits, U32, 1148, [16:16] -unusedBit_22_17 = bits, U32, 1148, [17:17] -unusedBit_22_18 = bits, U32, 1148, [18:18] -unusedBit_22_19 = bits, U32, 1148, [19:19] -unusedBit_22_20 = bits, U32, 1148, [20:20] -unusedBit_22_21 = bits, U32, 1148, [21:21] -unusedBit_22_22 = bits, U32, 1148, [22:22] -unusedBit_22_23 = bits, U32, 1148, [23:23] -unusedBit_22_24 = bits, U32, 1148, [24:24] -unusedBit_22_25 = bits, U32, 1148, [25:25] -unusedBit_22_26 = bits, U32, 1148, [26:26] -unusedBit_22_27 = bits, U32, 1148, [27:27] -unusedBit_22_28 = bits, U32, 1148, [28:28] -unusedBit_22_29 = bits, U32, 1148, [29:29] -unusedBit_22_30 = bits, U32, 1148, [30:30] -unusedBit_22_31 = bits, U32, 1148, [31:31] -targetRpmByClt = scalar, S32, 1152, "", 1, 0 -targetRpmAcBump = scalar, S32, 1156, "", 1, 0 -iacByRpmTaper = scalar, F32, 1160 -luaAdd = scalar, F32, 1164 -; total TS size = 1168 -baseDwell = scalar, F32, 1168, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 1172, "", 1, 0 -luaTimingAdd = scalar, F32, 1176, "", 1, 0 -luaTimingMult = scalar, F32, 1180, "", 1, 0 -; total TS size = 1184 -idlePosition = scalar, F32, 1184, "", 1, 0 -trim = scalar, F32, 1188, "", 1, 0 -luaAdjustment = scalar, F32, 1192, "", 1, 0 -etbFeedForward = scalar, F32, 1196 -etbIntegralError = scalar, F32, 1200, "", 1, 0 -etbCurrentTarget = scalar, F32, 1204, "%", 1, 0 -; total TS size = 1208 -faultCode = scalar, U08, 1208, "", 1, 0 -heaterDuty = scalar, U08, 1209, "%", 1, 0 -pumpDuty = scalar, U08, 1210, "%", 1, 0 -tempC = scalar, U16, 1212, "C", 1, 0 -nernstVoltage = scalar, U16, 1214, "V", 0.001, 0 -esr = scalar, U16, 1216, "", 1, 0 -; total TS size = 1220 +m_hasSynchronizedPhase = bits, U32, 1120, [0:0] +unusedBit_1_1 = bits, U32, 1120, [1:1] +unusedBit_1_2 = bits, U32, 1120, [2:2] +unusedBit_1_3 = bits, U32, 1120, [3:3] +unusedBit_1_4 = bits, U32, 1120, [4:4] +unusedBit_1_5 = bits, U32, 1120, [5:5] +unusedBit_1_6 = bits, U32, 1120, [6:6] +unusedBit_1_7 = bits, U32, 1120, [7:7] +unusedBit_1_8 = bits, U32, 1120, [8:8] +unusedBit_1_9 = bits, U32, 1120, [9:9] +unusedBit_1_10 = bits, U32, 1120, [10:10] +unusedBit_1_11 = bits, U32, 1120, [11:11] +unusedBit_1_12 = bits, U32, 1120, [12:12] +unusedBit_1_13 = bits, U32, 1120, [13:13] +unusedBit_1_14 = bits, U32, 1120, [14:14] +unusedBit_1_15 = bits, U32, 1120, [15:15] +unusedBit_1_16 = bits, U32, 1120, [16:16] +unusedBit_1_17 = bits, U32, 1120, [17:17] +unusedBit_1_18 = bits, U32, 1120, [18:18] +unusedBit_1_19 = bits, U32, 1120, [19:19] +unusedBit_1_20 = bits, U32, 1120, [20:20] +unusedBit_1_21 = bits, U32, 1120, [21:21] +unusedBit_1_22 = bits, U32, 1120, [22:22] +unusedBit_1_23 = bits, U32, 1120, [23:23] +unusedBit_1_24 = bits, U32, 1120, [24:24] +unusedBit_1_25 = bits, U32, 1120, [25:25] +unusedBit_1_26 = bits, U32, 1120, [26:26] +unusedBit_1_27 = bits, U32, 1120, [27:27] +unusedBit_1_28 = bits, U32, 1120, [28:28] +unusedBit_1_29 = bits, U32, 1120, [29:29] +unusedBit_1_30 = bits, U32, 1120, [30:30] +unusedBit_1_31 = bits, U32, 1120, [31:31] +; total TS size = 1124 +wallFuelCorrection = scalar, F32, 1124, "", 1, 0 +wallFuel = scalar, F32, 1128, "", 1, 0 +; total TS size = 1132 +idleState = bits, S32, 1132, [0:2], "not important" +currentIdlePosition = scalar, F32, 1136 +baseIdlePosition = scalar, F32, 1140 +iacByTpsTaper = scalar, F32, 1144 +throttlePedalUpState = scalar, S32, 1148, "", 1, 0 +mightResetPid = bits, U32, 1152, [0:0] +shouldResetPid = bits, U32, 1152, [1:1] +wasResetPid = bits, U32, 1152, [2:2] +mustResetPid = bits, U32, 1152, [3:3] +isCoasting = bits, U32, 1152, [4:4] +useIacTableForCoasting = bits, U32, 1152, [5:5] +notIdling = bits, U32, 1152, [6:6] +needReset = bits, U32, 1152, [7:7] +isInDeadZone = bits, U32, 1152, [8:8] +isBlipping = bits, U32, 1152, [9:9] +useClosedLoop = bits, U32, 1152, [10:10] +badTps = bits, U32, 1152, [11:11] +looksLikeRunning = bits, U32, 1152, [12:12] +looksLikeCoasting = bits, U32, 1152, [13:13] +looksLikeCrankToIdle = bits, U32, 1152, [14:14] +useInstantRpmForIdle = bits, U32, 1152, [15:15] +isVerboseIAC = bits, U32, 1152, [16:16] +unusedBit_22_17 = bits, U32, 1152, [17:17] +unusedBit_22_18 = bits, U32, 1152, [18:18] +unusedBit_22_19 = bits, U32, 1152, [19:19] +unusedBit_22_20 = bits, U32, 1152, [20:20] +unusedBit_22_21 = bits, U32, 1152, [21:21] +unusedBit_22_22 = bits, U32, 1152, [22:22] +unusedBit_22_23 = bits, U32, 1152, [23:23] +unusedBit_22_24 = bits, U32, 1152, [24:24] +unusedBit_22_25 = bits, U32, 1152, [25:25] +unusedBit_22_26 = bits, U32, 1152, [26:26] +unusedBit_22_27 = bits, U32, 1152, [27:27] +unusedBit_22_28 = bits, U32, 1152, [28:28] +unusedBit_22_29 = bits, U32, 1152, [29:29] +unusedBit_22_30 = bits, U32, 1152, [30:30] +unusedBit_22_31 = bits, U32, 1152, [31:31] +targetRpmByClt = scalar, S32, 1156, "", 1, 0 +targetRpmAcBump = scalar, S32, 1160, "", 1, 0 +iacByRpmTaper = scalar, F32, 1164 +luaAdd = scalar, F32, 1168 +; total TS size = 1172 +baseDwell = scalar, F32, 1172, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 1176, "", 1, 0 +luaTimingAdd = scalar, F32, 1180, "", 1, 0 +luaTimingMult = scalar, F32, 1184, "", 1, 0 +; total TS size = 1188 +idlePosition = scalar, F32, 1188, "", 1, 0 +trim = scalar, F32, 1192, "", 1, 0 +luaAdjustment = scalar, F32, 1196, "", 1, 0 +etbFeedForward = scalar, F32, 1200 +etbIntegralError = scalar, F32, 1204, "", 1, 0 +etbCurrentTarget = scalar, F32, 1208, "%", 1, 0 +; total TS size = 1212 +faultCode = scalar, U08, 1212, "", 1, 0 +heaterDuty = scalar, U08, 1213, "%", 1, 0 +pumpDuty = scalar, U08, 1214, "%", 1, 0 +tempC = scalar, U16, 1216, "C", 1, 0 +nernstVoltage = scalar, U16, 1218, "V", 0.001, 0 +esr = scalar, U16, 1220, "", 1, 0 +; total TS size = 1224 time = { timeNow } @@ -4721,7 +4754,6 @@ entry = hellenBoardId, "Detected Board ID", int, "%d" entry = clutchUpState, "clutch: up", int, "%d" entry = clutchDownState, "clutch: down", int, "%d" entry = brakePedalState, "brake: down", int, "%d" -entry = isSynchronizedPhase, "isSynchronizedPhase", int, "%d" entry = egt1, "egt1", float, "%.3f" entry = egt2, "egt2", float, "%.3f" entry = desiredRpmLimit, "User-defined RPM hard limit", int, "%d" @@ -4762,6 +4794,7 @@ entry = triggerStateIndex, "triggerStateIndex", int, "%d" entry = vvtCounter, "vvtCounter", int, "%d" entry = camResyncCounter, "camResyncCounter", int, "%d" entry = vvtStateIndex, "vvtStateIndex", int, "%d" +entry = m_hasSynchronizedPhase, "m_hasSynchronizedPhase", int, "%d" entry = wallFuelCorrection, "fuel injection time correction to account for wall wetting effect for current cycle", float, "%.3f" entry = wallFuel, "Amount of fuel on the wall, in ms of injector open time for each injector.", float, "%.3f" entry = idleState, "idleState", int, "%d" @@ -4966,6 +4999,7 @@ menuDialog = main subMenu = tps_accel_stateDialog, "tps_accel_state" subMenu = trigger_centralDialog, "trigger_central" subMenu = trigger_stateDialog, "trigger_state" + subMenu = trigger_state_primaryDialog, "trigger_state_primary" subMenu = wall_fuel_stateDialog, "wall_fuel_state" subMenu = idle_stateDialog, "idle_state" subMenu = ignition_stateDialog, "ignition_state" @@ -5414,7 +5448,6 @@ indicatorPanel = engine_stateIndicatorPanel, 2 indicator = {clutchUpState}, "clutchUpState No", "clutchUpState Yes" indicator = {clutchDownState}, "clutchDownState No", "clutchDownState Yes" indicator = {brakePedalState}, "brakePedalState No", "brakePedalState Yes" - indicator = {isSynchronizedPhase}, "isSynchronizedPhase No", "isSynchronizedPhase Yes" dialog = engine_stateDialog, "engine_state" panel = engine_stateIndicatorPanel @@ -5523,6 +5556,12 @@ dialog = trigger_stateDialog, "trigger_state" liveGraph = trigger_state_3_Graph, "Graph", South graphLine = vvtStateIndex +indicatorPanel = trigger_state_primaryIndicatorPanel, 2 + indicator = {m_hasSynchronizedPhase}, "m_hasSynchronizedPhase No", "m_hasSynchronizedPhase Yes" + +dialog = trigger_state_primaryDialog, "trigger_state_primary" + panel = trigger_state_primaryIndicatorPanel + dialog = wall_fuel_stateDialog, "wall_fuel_state" liveGraph = wall_fuel_state_1_Graph, "Graph", South diff --git a/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini b/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini index bd0b135268..985aaced73 100644 --- a/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini +++ b/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.08.24.hellenNA8_96.3580804847" + signature = "rusEFI 2022.08.24.hellenNA8_96.3523443446" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.08.24.hellenNA8_96.3580804847" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.08.24.hellenNA8_96.3523443446" ; 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 Wed Aug 24 16:15:35 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Aug 24 22:15:13 UTC 2022 pageSize = 21300 page = 1 @@ -2109,7 +2109,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1220 + ochBlockSize = 1224 ; ; see TunerStudioOutputChannels struct @@ -2990,35 +2990,35 @@ hellenBoardId = scalar, S16, 990, "id", 1, 0 clutchUpState = bits, U32, 992, [0:0] clutchDownState = bits, U32, 992, [1:1] brakePedalState = bits, U32, 992, [2:2] -isSynchronizedPhase = bits, U32, 992, [3:3] -unusedBit_23_4 = bits, U32, 992, [4:4] -unusedBit_23_5 = bits, U32, 992, [5:5] -unusedBit_23_6 = bits, U32, 992, [6:6] -unusedBit_23_7 = bits, U32, 992, [7:7] -unusedBit_23_8 = bits, U32, 992, [8:8] -unusedBit_23_9 = bits, U32, 992, [9:9] -unusedBit_23_10 = bits, U32, 992, [10:10] -unusedBit_23_11 = bits, U32, 992, [11:11] -unusedBit_23_12 = bits, U32, 992, [12:12] -unusedBit_23_13 = bits, U32, 992, [13:13] -unusedBit_23_14 = bits, U32, 992, [14:14] -unusedBit_23_15 = bits, U32, 992, [15:15] -unusedBit_23_16 = bits, U32, 992, [16:16] -unusedBit_23_17 = bits, U32, 992, [17:17] -unusedBit_23_18 = bits, U32, 992, [18:18] -unusedBit_23_19 = bits, U32, 992, [19:19] -unusedBit_23_20 = bits, U32, 992, [20:20] -unusedBit_23_21 = bits, U32, 992, [21:21] -unusedBit_23_22 = bits, U32, 992, [22:22] -unusedBit_23_23 = bits, U32, 992, [23:23] -unusedBit_23_24 = bits, U32, 992, [24:24] -unusedBit_23_25 = bits, U32, 992, [25:25] -unusedBit_23_26 = bits, U32, 992, [26:26] -unusedBit_23_27 = bits, U32, 992, [27:27] -unusedBit_23_28 = bits, U32, 992, [28:28] -unusedBit_23_29 = bits, U32, 992, [29:29] -unusedBit_23_30 = bits, U32, 992, [30:30] -unusedBit_23_31 = bits, U32, 992, [31:31] +unusedBit_22_3 = bits, U32, 992, [3:3] +unusedBit_22_4 = bits, U32, 992, [4:4] +unusedBit_22_5 = bits, U32, 992, [5:5] +unusedBit_22_6 = bits, U32, 992, [6:6] +unusedBit_22_7 = bits, U32, 992, [7:7] +unusedBit_22_8 = bits, U32, 992, [8:8] +unusedBit_22_9 = bits, U32, 992, [9:9] +unusedBit_22_10 = bits, U32, 992, [10:10] +unusedBit_22_11 = bits, U32, 992, [11:11] +unusedBit_22_12 = bits, U32, 992, [12:12] +unusedBit_22_13 = bits, U32, 992, [13:13] +unusedBit_22_14 = bits, U32, 992, [14:14] +unusedBit_22_15 = bits, U32, 992, [15:15] +unusedBit_22_16 = bits, U32, 992, [16:16] +unusedBit_22_17 = bits, U32, 992, [17:17] +unusedBit_22_18 = bits, U32, 992, [18:18] +unusedBit_22_19 = bits, U32, 992, [19:19] +unusedBit_22_20 = bits, U32, 992, [20:20] +unusedBit_22_21 = bits, U32, 992, [21:21] +unusedBit_22_22 = bits, U32, 992, [22:22] +unusedBit_22_23 = bits, U32, 992, [23:23] +unusedBit_22_24 = bits, U32, 992, [24:24] +unusedBit_22_25 = bits, U32, 992, [25:25] +unusedBit_22_26 = bits, U32, 992, [26:26] +unusedBit_22_27 = bits, U32, 992, [27:27] +unusedBit_22_28 = bits, U32, 992, [28:28] +unusedBit_22_29 = bits, U32, 992, [29:29] +unusedBit_22_30 = bits, U32, 992, [30:30] +unusedBit_22_31 = bits, U32, 992, [31:31] egt1 = scalar, F32, 996, "", 1, 0 egt2 = scalar, F32, 1000, "", 1, 0 desiredRpmLimit = scalar, S16, 1004, "rpm", 1, 0 @@ -3089,70 +3089,103 @@ vvtCounter = scalar, U08, 1117, "", 1, 0 camResyncCounter = scalar, U08, 1118, "", 1, 0 vvtStateIndex = scalar, U08, 1119, "", 1, 0 ; total TS size = 1120 -wallFuelCorrection = scalar, F32, 1120, "", 1, 0 -wallFuel = scalar, F32, 1124, "", 1, 0 -; total TS size = 1128 -idleState = bits, S32, 1128, [0:2], "not important" -currentIdlePosition = scalar, F32, 1132 -baseIdlePosition = scalar, F32, 1136 -iacByTpsTaper = scalar, F32, 1140 -throttlePedalUpState = scalar, S32, 1144, "", 1, 0 -mightResetPid = bits, U32, 1148, [0:0] -shouldResetPid = bits, U32, 1148, [1:1] -wasResetPid = bits, U32, 1148, [2:2] -mustResetPid = bits, U32, 1148, [3:3] -isCoasting = bits, U32, 1148, [4:4] -useIacTableForCoasting = bits, U32, 1148, [5:5] -notIdling = bits, U32, 1148, [6:6] -needReset = bits, U32, 1148, [7:7] -isInDeadZone = bits, U32, 1148, [8:8] -isBlipping = bits, U32, 1148, [9:9] -useClosedLoop = bits, U32, 1148, [10:10] -badTps = bits, U32, 1148, [11:11] -looksLikeRunning = bits, U32, 1148, [12:12] -looksLikeCoasting = bits, U32, 1148, [13:13] -looksLikeCrankToIdle = bits, U32, 1148, [14:14] -useInstantRpmForIdle = bits, U32, 1148, [15:15] -isVerboseIAC = bits, U32, 1148, [16:16] -unusedBit_22_17 = bits, U32, 1148, [17:17] -unusedBit_22_18 = bits, U32, 1148, [18:18] -unusedBit_22_19 = bits, U32, 1148, [19:19] -unusedBit_22_20 = bits, U32, 1148, [20:20] -unusedBit_22_21 = bits, U32, 1148, [21:21] -unusedBit_22_22 = bits, U32, 1148, [22:22] -unusedBit_22_23 = bits, U32, 1148, [23:23] -unusedBit_22_24 = bits, U32, 1148, [24:24] -unusedBit_22_25 = bits, U32, 1148, [25:25] -unusedBit_22_26 = bits, U32, 1148, [26:26] -unusedBit_22_27 = bits, U32, 1148, [27:27] -unusedBit_22_28 = bits, U32, 1148, [28:28] -unusedBit_22_29 = bits, U32, 1148, [29:29] -unusedBit_22_30 = bits, U32, 1148, [30:30] -unusedBit_22_31 = bits, U32, 1148, [31:31] -targetRpmByClt = scalar, S32, 1152, "", 1, 0 -targetRpmAcBump = scalar, S32, 1156, "", 1, 0 -iacByRpmTaper = scalar, F32, 1160 -luaAdd = scalar, F32, 1164 -; total TS size = 1168 -baseDwell = scalar, F32, 1168, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 1172, "", 1, 0 -luaTimingAdd = scalar, F32, 1176, "", 1, 0 -luaTimingMult = scalar, F32, 1180, "", 1, 0 -; total TS size = 1184 -idlePosition = scalar, F32, 1184, "", 1, 0 -trim = scalar, F32, 1188, "", 1, 0 -luaAdjustment = scalar, F32, 1192, "", 1, 0 -etbFeedForward = scalar, F32, 1196 -etbIntegralError = scalar, F32, 1200, "", 1, 0 -etbCurrentTarget = scalar, F32, 1204, "%", 1, 0 -; total TS size = 1208 -faultCode = scalar, U08, 1208, "", 1, 0 -heaterDuty = scalar, U08, 1209, "%", 1, 0 -pumpDuty = scalar, U08, 1210, "%", 1, 0 -tempC = scalar, U16, 1212, "C", 1, 0 -nernstVoltage = scalar, U16, 1214, "V", 0.001, 0 -esr = scalar, U16, 1216, "", 1, 0 -; total TS size = 1220 +m_hasSynchronizedPhase = bits, U32, 1120, [0:0] +unusedBit_1_1 = bits, U32, 1120, [1:1] +unusedBit_1_2 = bits, U32, 1120, [2:2] +unusedBit_1_3 = bits, U32, 1120, [3:3] +unusedBit_1_4 = bits, U32, 1120, [4:4] +unusedBit_1_5 = bits, U32, 1120, [5:5] +unusedBit_1_6 = bits, U32, 1120, [6:6] +unusedBit_1_7 = bits, U32, 1120, [7:7] +unusedBit_1_8 = bits, U32, 1120, [8:8] +unusedBit_1_9 = bits, U32, 1120, [9:9] +unusedBit_1_10 = bits, U32, 1120, [10:10] +unusedBit_1_11 = bits, U32, 1120, [11:11] +unusedBit_1_12 = bits, U32, 1120, [12:12] +unusedBit_1_13 = bits, U32, 1120, [13:13] +unusedBit_1_14 = bits, U32, 1120, [14:14] +unusedBit_1_15 = bits, U32, 1120, [15:15] +unusedBit_1_16 = bits, U32, 1120, [16:16] +unusedBit_1_17 = bits, U32, 1120, [17:17] +unusedBit_1_18 = bits, U32, 1120, [18:18] +unusedBit_1_19 = bits, U32, 1120, [19:19] +unusedBit_1_20 = bits, U32, 1120, [20:20] +unusedBit_1_21 = bits, U32, 1120, [21:21] +unusedBit_1_22 = bits, U32, 1120, [22:22] +unusedBit_1_23 = bits, U32, 1120, [23:23] +unusedBit_1_24 = bits, U32, 1120, [24:24] +unusedBit_1_25 = bits, U32, 1120, [25:25] +unusedBit_1_26 = bits, U32, 1120, [26:26] +unusedBit_1_27 = bits, U32, 1120, [27:27] +unusedBit_1_28 = bits, U32, 1120, [28:28] +unusedBit_1_29 = bits, U32, 1120, [29:29] +unusedBit_1_30 = bits, U32, 1120, [30:30] +unusedBit_1_31 = bits, U32, 1120, [31:31] +; total TS size = 1124 +wallFuelCorrection = scalar, F32, 1124, "", 1, 0 +wallFuel = scalar, F32, 1128, "", 1, 0 +; total TS size = 1132 +idleState = bits, S32, 1132, [0:2], "not important" +currentIdlePosition = scalar, F32, 1136 +baseIdlePosition = scalar, F32, 1140 +iacByTpsTaper = scalar, F32, 1144 +throttlePedalUpState = scalar, S32, 1148, "", 1, 0 +mightResetPid = bits, U32, 1152, [0:0] +shouldResetPid = bits, U32, 1152, [1:1] +wasResetPid = bits, U32, 1152, [2:2] +mustResetPid = bits, U32, 1152, [3:3] +isCoasting = bits, U32, 1152, [4:4] +useIacTableForCoasting = bits, U32, 1152, [5:5] +notIdling = bits, U32, 1152, [6:6] +needReset = bits, U32, 1152, [7:7] +isInDeadZone = bits, U32, 1152, [8:8] +isBlipping = bits, U32, 1152, [9:9] +useClosedLoop = bits, U32, 1152, [10:10] +badTps = bits, U32, 1152, [11:11] +looksLikeRunning = bits, U32, 1152, [12:12] +looksLikeCoasting = bits, U32, 1152, [13:13] +looksLikeCrankToIdle = bits, U32, 1152, [14:14] +useInstantRpmForIdle = bits, U32, 1152, [15:15] +isVerboseIAC = bits, U32, 1152, [16:16] +unusedBit_22_17 = bits, U32, 1152, [17:17] +unusedBit_22_18 = bits, U32, 1152, [18:18] +unusedBit_22_19 = bits, U32, 1152, [19:19] +unusedBit_22_20 = bits, U32, 1152, [20:20] +unusedBit_22_21 = bits, U32, 1152, [21:21] +unusedBit_22_22 = bits, U32, 1152, [22:22] +unusedBit_22_23 = bits, U32, 1152, [23:23] +unusedBit_22_24 = bits, U32, 1152, [24:24] +unusedBit_22_25 = bits, U32, 1152, [25:25] +unusedBit_22_26 = bits, U32, 1152, [26:26] +unusedBit_22_27 = bits, U32, 1152, [27:27] +unusedBit_22_28 = bits, U32, 1152, [28:28] +unusedBit_22_29 = bits, U32, 1152, [29:29] +unusedBit_22_30 = bits, U32, 1152, [30:30] +unusedBit_22_31 = bits, U32, 1152, [31:31] +targetRpmByClt = scalar, S32, 1156, "", 1, 0 +targetRpmAcBump = scalar, S32, 1160, "", 1, 0 +iacByRpmTaper = scalar, F32, 1164 +luaAdd = scalar, F32, 1168 +; total TS size = 1172 +baseDwell = scalar, F32, 1172, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 1176, "", 1, 0 +luaTimingAdd = scalar, F32, 1180, "", 1, 0 +luaTimingMult = scalar, F32, 1184, "", 1, 0 +; total TS size = 1188 +idlePosition = scalar, F32, 1188, "", 1, 0 +trim = scalar, F32, 1192, "", 1, 0 +luaAdjustment = scalar, F32, 1196, "", 1, 0 +etbFeedForward = scalar, F32, 1200 +etbIntegralError = scalar, F32, 1204, "", 1, 0 +etbCurrentTarget = scalar, F32, 1208, "%", 1, 0 +; total TS size = 1212 +faultCode = scalar, U08, 1212, "", 1, 0 +heaterDuty = scalar, U08, 1213, "%", 1, 0 +pumpDuty = scalar, U08, 1214, "%", 1, 0 +tempC = scalar, U16, 1216, "C", 1, 0 +nernstVoltage = scalar, U16, 1218, "V", 0.001, 0 +esr = scalar, U16, 1220, "", 1, 0 +; total TS size = 1224 time = { timeNow } @@ -4721,7 +4754,6 @@ entry = hellenBoardId, "Detected Board ID", int, "%d" entry = clutchUpState, "clutch: up", int, "%d" entry = clutchDownState, "clutch: down", int, "%d" entry = brakePedalState, "brake: down", int, "%d" -entry = isSynchronizedPhase, "isSynchronizedPhase", int, "%d" entry = egt1, "egt1", float, "%.3f" entry = egt2, "egt2", float, "%.3f" entry = desiredRpmLimit, "User-defined RPM hard limit", int, "%d" @@ -4762,6 +4794,7 @@ entry = triggerStateIndex, "triggerStateIndex", int, "%d" entry = vvtCounter, "vvtCounter", int, "%d" entry = camResyncCounter, "camResyncCounter", int, "%d" entry = vvtStateIndex, "vvtStateIndex", int, "%d" +entry = m_hasSynchronizedPhase, "m_hasSynchronizedPhase", int, "%d" entry = wallFuelCorrection, "fuel injection time correction to account for wall wetting effect for current cycle", float, "%.3f" entry = wallFuel, "Amount of fuel on the wall, in ms of injector open time for each injector.", float, "%.3f" entry = idleState, "idleState", int, "%d" @@ -4966,6 +4999,7 @@ menuDialog = main subMenu = tps_accel_stateDialog, "tps_accel_state" subMenu = trigger_centralDialog, "trigger_central" subMenu = trigger_stateDialog, "trigger_state" + subMenu = trigger_state_primaryDialog, "trigger_state_primary" subMenu = wall_fuel_stateDialog, "wall_fuel_state" subMenu = idle_stateDialog, "idle_state" subMenu = ignition_stateDialog, "ignition_state" @@ -5414,7 +5448,6 @@ indicatorPanel = engine_stateIndicatorPanel, 2 indicator = {clutchUpState}, "clutchUpState No", "clutchUpState Yes" indicator = {clutchDownState}, "clutchDownState No", "clutchDownState Yes" indicator = {brakePedalState}, "brakePedalState No", "brakePedalState Yes" - indicator = {isSynchronizedPhase}, "isSynchronizedPhase No", "isSynchronizedPhase Yes" dialog = engine_stateDialog, "engine_state" panel = engine_stateIndicatorPanel @@ -5523,6 +5556,12 @@ dialog = trigger_stateDialog, "trigger_state" liveGraph = trigger_state_3_Graph, "Graph", South graphLine = vvtStateIndex +indicatorPanel = trigger_state_primaryIndicatorPanel, 2 + indicator = {m_hasSynchronizedPhase}, "m_hasSynchronizedPhase No", "m_hasSynchronizedPhase Yes" + +dialog = trigger_state_primaryDialog, "trigger_state_primary" + panel = trigger_state_primaryIndicatorPanel + dialog = wall_fuel_stateDialog, "wall_fuel_state" liveGraph = wall_fuel_state_1_Graph, "Graph", South diff --git a/firmware/tunerstudio/generated/rusefi_kin.ini b/firmware/tunerstudio/generated/rusefi_kin.ini index 35d056261b..a276012a56 100644 --- a/firmware/tunerstudio/generated/rusefi_kin.ini +++ b/firmware/tunerstudio/generated/rusefi_kin.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.08.24.kin.498118091" + signature = "rusEFI 2022.08.24.kin.450718162" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.08.24.kin.498118091" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.08.24.kin.450718162" ; 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 Wed Aug 24 16:15:09 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Wed Aug 24 22:14:48 UTC 2022 pageSize = 21300 page = 1 @@ -2109,7 +2109,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1220 + ochBlockSize = 1224 ; ; see TunerStudioOutputChannels struct @@ -2990,35 +2990,35 @@ hellenBoardId = scalar, S16, 990, "id", 1, 0 clutchUpState = bits, U32, 992, [0:0] clutchDownState = bits, U32, 992, [1:1] brakePedalState = bits, U32, 992, [2:2] -isSynchronizedPhase = bits, U32, 992, [3:3] -unusedBit_23_4 = bits, U32, 992, [4:4] -unusedBit_23_5 = bits, U32, 992, [5:5] -unusedBit_23_6 = bits, U32, 992, [6:6] -unusedBit_23_7 = bits, U32, 992, [7:7] -unusedBit_23_8 = bits, U32, 992, [8:8] -unusedBit_23_9 = bits, U32, 992, [9:9] -unusedBit_23_10 = bits, U32, 992, [10:10] -unusedBit_23_11 = bits, U32, 992, [11:11] -unusedBit_23_12 = bits, U32, 992, [12:12] -unusedBit_23_13 = bits, U32, 992, [13:13] -unusedBit_23_14 = bits, U32, 992, [14:14] -unusedBit_23_15 = bits, U32, 992, [15:15] -unusedBit_23_16 = bits, U32, 992, [16:16] -unusedBit_23_17 = bits, U32, 992, [17:17] -unusedBit_23_18 = bits, U32, 992, [18:18] -unusedBit_23_19 = bits, U32, 992, [19:19] -unusedBit_23_20 = bits, U32, 992, [20:20] -unusedBit_23_21 = bits, U32, 992, [21:21] -unusedBit_23_22 = bits, U32, 992, [22:22] -unusedBit_23_23 = bits, U32, 992, [23:23] -unusedBit_23_24 = bits, U32, 992, [24:24] -unusedBit_23_25 = bits, U32, 992, [25:25] -unusedBit_23_26 = bits, U32, 992, [26:26] -unusedBit_23_27 = bits, U32, 992, [27:27] -unusedBit_23_28 = bits, U32, 992, [28:28] -unusedBit_23_29 = bits, U32, 992, [29:29] -unusedBit_23_30 = bits, U32, 992, [30:30] -unusedBit_23_31 = bits, U32, 992, [31:31] +unusedBit_22_3 = bits, U32, 992, [3:3] +unusedBit_22_4 = bits, U32, 992, [4:4] +unusedBit_22_5 = bits, U32, 992, [5:5] +unusedBit_22_6 = bits, U32, 992, [6:6] +unusedBit_22_7 = bits, U32, 992, [7:7] +unusedBit_22_8 = bits, U32, 992, [8:8] +unusedBit_22_9 = bits, U32, 992, [9:9] +unusedBit_22_10 = bits, U32, 992, [10:10] +unusedBit_22_11 = bits, U32, 992, [11:11] +unusedBit_22_12 = bits, U32, 992, [12:12] +unusedBit_22_13 = bits, U32, 992, [13:13] +unusedBit_22_14 = bits, U32, 992, [14:14] +unusedBit_22_15 = bits, U32, 992, [15:15] +unusedBit_22_16 = bits, U32, 992, [16:16] +unusedBit_22_17 = bits, U32, 992, [17:17] +unusedBit_22_18 = bits, U32, 992, [18:18] +unusedBit_22_19 = bits, U32, 992, [19:19] +unusedBit_22_20 = bits, U32, 992, [20:20] +unusedBit_22_21 = bits, U32, 992, [21:21] +unusedBit_22_22 = bits, U32, 992, [22:22] +unusedBit_22_23 = bits, U32, 992, [23:23] +unusedBit_22_24 = bits, U32, 992, [24:24] +unusedBit_22_25 = bits, U32, 992, [25:25] +unusedBit_22_26 = bits, U32, 992, [26:26] +unusedBit_22_27 = bits, U32, 992, [27:27] +unusedBit_22_28 = bits, U32, 992, [28:28] +unusedBit_22_29 = bits, U32, 992, [29:29] +unusedBit_22_30 = bits, U32, 992, [30:30] +unusedBit_22_31 = bits, U32, 992, [31:31] egt1 = scalar, F32, 996, "", 1, 0 egt2 = scalar, F32, 1000, "", 1, 0 desiredRpmLimit = scalar, S16, 1004, "rpm", 1, 0 @@ -3089,70 +3089,103 @@ vvtCounter = scalar, U08, 1117, "", 1, 0 camResyncCounter = scalar, U08, 1118, "", 1, 0 vvtStateIndex = scalar, U08, 1119, "", 1, 0 ; total TS size = 1120 -wallFuelCorrection = scalar, F32, 1120, "", 1, 0 -wallFuel = scalar, F32, 1124, "", 1, 0 -; total TS size = 1128 -idleState = bits, S32, 1128, [0:2], "not important" -currentIdlePosition = scalar, F32, 1132 -baseIdlePosition = scalar, F32, 1136 -iacByTpsTaper = scalar, F32, 1140 -throttlePedalUpState = scalar, S32, 1144, "", 1, 0 -mightResetPid = bits, U32, 1148, [0:0] -shouldResetPid = bits, U32, 1148, [1:1] -wasResetPid = bits, U32, 1148, [2:2] -mustResetPid = bits, U32, 1148, [3:3] -isCoasting = bits, U32, 1148, [4:4] -useIacTableForCoasting = bits, U32, 1148, [5:5] -notIdling = bits, U32, 1148, [6:6] -needReset = bits, U32, 1148, [7:7] -isInDeadZone = bits, U32, 1148, [8:8] -isBlipping = bits, U32, 1148, [9:9] -useClosedLoop = bits, U32, 1148, [10:10] -badTps = bits, U32, 1148, [11:11] -looksLikeRunning = bits, U32, 1148, [12:12] -looksLikeCoasting = bits, U32, 1148, [13:13] -looksLikeCrankToIdle = bits, U32, 1148, [14:14] -useInstantRpmForIdle = bits, U32, 1148, [15:15] -isVerboseIAC = bits, U32, 1148, [16:16] -unusedBit_22_17 = bits, U32, 1148, [17:17] -unusedBit_22_18 = bits, U32, 1148, [18:18] -unusedBit_22_19 = bits, U32, 1148, [19:19] -unusedBit_22_20 = bits, U32, 1148, [20:20] -unusedBit_22_21 = bits, U32, 1148, [21:21] -unusedBit_22_22 = bits, U32, 1148, [22:22] -unusedBit_22_23 = bits, U32, 1148, [23:23] -unusedBit_22_24 = bits, U32, 1148, [24:24] -unusedBit_22_25 = bits, U32, 1148, [25:25] -unusedBit_22_26 = bits, U32, 1148, [26:26] -unusedBit_22_27 = bits, U32, 1148, [27:27] -unusedBit_22_28 = bits, U32, 1148, [28:28] -unusedBit_22_29 = bits, U32, 1148, [29:29] -unusedBit_22_30 = bits, U32, 1148, [30:30] -unusedBit_22_31 = bits, U32, 1148, [31:31] -targetRpmByClt = scalar, S32, 1152, "", 1, 0 -targetRpmAcBump = scalar, S32, 1156, "", 1, 0 -iacByRpmTaper = scalar, F32, 1160 -luaAdd = scalar, F32, 1164 -; total TS size = 1168 -baseDwell = scalar, F32, 1168, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 1172, "", 1, 0 -luaTimingAdd = scalar, F32, 1176, "", 1, 0 -luaTimingMult = scalar, F32, 1180, "", 1, 0 -; total TS size = 1184 -idlePosition = scalar, F32, 1184, "", 1, 0 -trim = scalar, F32, 1188, "", 1, 0 -luaAdjustment = scalar, F32, 1192, "", 1, 0 -etbFeedForward = scalar, F32, 1196 -etbIntegralError = scalar, F32, 1200, "", 1, 0 -etbCurrentTarget = scalar, F32, 1204, "%", 1, 0 -; total TS size = 1208 -faultCode = scalar, U08, 1208, "", 1, 0 -heaterDuty = scalar, U08, 1209, "%", 1, 0 -pumpDuty = scalar, U08, 1210, "%", 1, 0 -tempC = scalar, U16, 1212, "C", 1, 0 -nernstVoltage = scalar, U16, 1214, "V", 0.001, 0 -esr = scalar, U16, 1216, "", 1, 0 -; total TS size = 1220 +m_hasSynchronizedPhase = bits, U32, 1120, [0:0] +unusedBit_1_1 = bits, U32, 1120, [1:1] +unusedBit_1_2 = bits, U32, 1120, [2:2] +unusedBit_1_3 = bits, U32, 1120, [3:3] +unusedBit_1_4 = bits, U32, 1120, [4:4] +unusedBit_1_5 = bits, U32, 1120, [5:5] +unusedBit_1_6 = bits, U32, 1120, [6:6] +unusedBit_1_7 = bits, U32, 1120, [7:7] +unusedBit_1_8 = bits, U32, 1120, [8:8] +unusedBit_1_9 = bits, U32, 1120, [9:9] +unusedBit_1_10 = bits, U32, 1120, [10:10] +unusedBit_1_11 = bits, U32, 1120, [11:11] +unusedBit_1_12 = bits, U32, 1120, [12:12] +unusedBit_1_13 = bits, U32, 1120, [13:13] +unusedBit_1_14 = bits, U32, 1120, [14:14] +unusedBit_1_15 = bits, U32, 1120, [15:15] +unusedBit_1_16 = bits, U32, 1120, [16:16] +unusedBit_1_17 = bits, U32, 1120, [17:17] +unusedBit_1_18 = bits, U32, 1120, [18:18] +unusedBit_1_19 = bits, U32, 1120, [19:19] +unusedBit_1_20 = bits, U32, 1120, [20:20] +unusedBit_1_21 = bits, U32, 1120, [21:21] +unusedBit_1_22 = bits, U32, 1120, [22:22] +unusedBit_1_23 = bits, U32, 1120, [23:23] +unusedBit_1_24 = bits, U32, 1120, [24:24] +unusedBit_1_25 = bits, U32, 1120, [25:25] +unusedBit_1_26 = bits, U32, 1120, [26:26] +unusedBit_1_27 = bits, U32, 1120, [27:27] +unusedBit_1_28 = bits, U32, 1120, [28:28] +unusedBit_1_29 = bits, U32, 1120, [29:29] +unusedBit_1_30 = bits, U32, 1120, [30:30] +unusedBit_1_31 = bits, U32, 1120, [31:31] +; total TS size = 1124 +wallFuelCorrection = scalar, F32, 1124, "", 1, 0 +wallFuel = scalar, F32, 1128, "", 1, 0 +; total TS size = 1132 +idleState = bits, S32, 1132, [0:2], "not important" +currentIdlePosition = scalar, F32, 1136 +baseIdlePosition = scalar, F32, 1140 +iacByTpsTaper = scalar, F32, 1144 +throttlePedalUpState = scalar, S32, 1148, "", 1, 0 +mightResetPid = bits, U32, 1152, [0:0] +shouldResetPid = bits, U32, 1152, [1:1] +wasResetPid = bits, U32, 1152, [2:2] +mustResetPid = bits, U32, 1152, [3:3] +isCoasting = bits, U32, 1152, [4:4] +useIacTableForCoasting = bits, U32, 1152, [5:5] +notIdling = bits, U32, 1152, [6:6] +needReset = bits, U32, 1152, [7:7] +isInDeadZone = bits, U32, 1152, [8:8] +isBlipping = bits, U32, 1152, [9:9] +useClosedLoop = bits, U32, 1152, [10:10] +badTps = bits, U32, 1152, [11:11] +looksLikeRunning = bits, U32, 1152, [12:12] +looksLikeCoasting = bits, U32, 1152, [13:13] +looksLikeCrankToIdle = bits, U32, 1152, [14:14] +useInstantRpmForIdle = bits, U32, 1152, [15:15] +isVerboseIAC = bits, U32, 1152, [16:16] +unusedBit_22_17 = bits, U32, 1152, [17:17] +unusedBit_22_18 = bits, U32, 1152, [18:18] +unusedBit_22_19 = bits, U32, 1152, [19:19] +unusedBit_22_20 = bits, U32, 1152, [20:20] +unusedBit_22_21 = bits, U32, 1152, [21:21] +unusedBit_22_22 = bits, U32, 1152, [22:22] +unusedBit_22_23 = bits, U32, 1152, [23:23] +unusedBit_22_24 = bits, U32, 1152, [24:24] +unusedBit_22_25 = bits, U32, 1152, [25:25] +unusedBit_22_26 = bits, U32, 1152, [26:26] +unusedBit_22_27 = bits, U32, 1152, [27:27] +unusedBit_22_28 = bits, U32, 1152, [28:28] +unusedBit_22_29 = bits, U32, 1152, [29:29] +unusedBit_22_30 = bits, U32, 1152, [30:30] +unusedBit_22_31 = bits, U32, 1152, [31:31] +targetRpmByClt = scalar, S32, 1156, "", 1, 0 +targetRpmAcBump = scalar, S32, 1160, "", 1, 0 +iacByRpmTaper = scalar, F32, 1164 +luaAdd = scalar, F32, 1168 +; total TS size = 1172 +baseDwell = scalar, F32, 1172, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 1176, "", 1, 0 +luaTimingAdd = scalar, F32, 1180, "", 1, 0 +luaTimingMult = scalar, F32, 1184, "", 1, 0 +; total TS size = 1188 +idlePosition = scalar, F32, 1188, "", 1, 0 +trim = scalar, F32, 1192, "", 1, 0 +luaAdjustment = scalar, F32, 1196, "", 1, 0 +etbFeedForward = scalar, F32, 1200 +etbIntegralError = scalar, F32, 1204, "", 1, 0 +etbCurrentTarget = scalar, F32, 1208, "%", 1, 0 +; total TS size = 1212 +faultCode = scalar, U08, 1212, "", 1, 0 +heaterDuty = scalar, U08, 1213, "%", 1, 0 +pumpDuty = scalar, U08, 1214, "%", 1, 0 +tempC = scalar, U16, 1216, "C", 1, 0 +nernstVoltage = scalar, U16, 1218, "V", 0.001, 0 +esr = scalar, U16, 1220, "", 1, 0 +; total TS size = 1224 time = { timeNow } @@ -4721,7 +4754,6 @@ entry = hellenBoardId, "Detected Board ID", int, "%d" entry = clutchUpState, "clutch: up", int, "%d" entry = clutchDownState, "clutch: down", int, "%d" entry = brakePedalState, "brake: down", int, "%d" -entry = isSynchronizedPhase, "isSynchronizedPhase", int, "%d" entry = egt1, "egt1", float, "%.3f" entry = egt2, "egt2", float, "%.3f" entry = desiredRpmLimit, "User-defined RPM hard limit", int, "%d" @@ -4762,6 +4794,7 @@ entry = triggerStateIndex, "triggerStateIndex", int, "%d" entry = vvtCounter, "vvtCounter", int, "%d" entry = camResyncCounter, "camResyncCounter", int, "%d" entry = vvtStateIndex, "vvtStateIndex", int, "%d" +entry = m_hasSynchronizedPhase, "m_hasSynchronizedPhase", int, "%d" entry = wallFuelCorrection, "fuel injection time correction to account for wall wetting effect for current cycle", float, "%.3f" entry = wallFuel, "Amount of fuel on the wall, in ms of injector open time for each injector.", float, "%.3f" entry = idleState, "idleState", int, "%d" @@ -4966,6 +4999,7 @@ menuDialog = main subMenu = tps_accel_stateDialog, "tps_accel_state" subMenu = trigger_centralDialog, "trigger_central" subMenu = trigger_stateDialog, "trigger_state" + subMenu = trigger_state_primaryDialog, "trigger_state_primary" subMenu = wall_fuel_stateDialog, "wall_fuel_state" subMenu = idle_stateDialog, "idle_state" subMenu = ignition_stateDialog, "ignition_state" @@ -5418,7 +5452,6 @@ indicatorPanel = engine_stateIndicatorPanel, 2 indicator = {clutchUpState}, "clutchUpState No", "clutchUpState Yes" indicator = {clutchDownState}, "clutchDownState No", "clutchDownState Yes" indicator = {brakePedalState}, "brakePedalState No", "brakePedalState Yes" - indicator = {isSynchronizedPhase}, "isSynchronizedPhase No", "isSynchronizedPhase Yes" dialog = engine_stateDialog, "engine_state" panel = engine_stateIndicatorPanel @@ -5527,6 +5560,12 @@ dialog = trigger_stateDialog, "trigger_state" liveGraph = trigger_state_3_Graph, "Graph", South graphLine = vvtStateIndex +indicatorPanel = trigger_state_primaryIndicatorPanel, 2 + indicator = {m_hasSynchronizedPhase}, "m_hasSynchronizedPhase No", "m_hasSynchronizedPhase Yes" + +dialog = trigger_state_primaryDialog, "trigger_state_primary" + panel = trigger_state_primaryIndicatorPanel + dialog = wall_fuel_stateDialog, "wall_fuel_state" liveGraph = wall_fuel_state_1_Graph, "Graph", South diff --git a/firmware/tunerstudio/generated/rusefi_mre_f4.ini b/firmware/tunerstudio/generated/rusefi_mre_f4.ini index 6e3fe082d2..f7d978987e 100644 --- a/firmware/tunerstudio/generated/rusefi_mre_f4.ini +++ b/firmware/tunerstudio/generated/rusefi_mre_f4.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.08.24.mre_f4.3132195825" + signature = "rusEFI 2022.08.24.mre_f4.3185330152" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.08.24.mre_f4.3132195825" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.08.24.mre_f4.3185330152" ; 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 Wed Aug 24 16:15:39 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Aug 24 22:15:17 UTC 2022 pageSize = 21300 page = 1 @@ -2109,7 +2109,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1220 + ochBlockSize = 1224 ; ; see TunerStudioOutputChannels struct @@ -2990,35 +2990,35 @@ hellenBoardId = scalar, S16, 990, "id", 1, 0 clutchUpState = bits, U32, 992, [0:0] clutchDownState = bits, U32, 992, [1:1] brakePedalState = bits, U32, 992, [2:2] -isSynchronizedPhase = bits, U32, 992, [3:3] -unusedBit_23_4 = bits, U32, 992, [4:4] -unusedBit_23_5 = bits, U32, 992, [5:5] -unusedBit_23_6 = bits, U32, 992, [6:6] -unusedBit_23_7 = bits, U32, 992, [7:7] -unusedBit_23_8 = bits, U32, 992, [8:8] -unusedBit_23_9 = bits, U32, 992, [9:9] -unusedBit_23_10 = bits, U32, 992, [10:10] -unusedBit_23_11 = bits, U32, 992, [11:11] -unusedBit_23_12 = bits, U32, 992, [12:12] -unusedBit_23_13 = bits, U32, 992, [13:13] -unusedBit_23_14 = bits, U32, 992, [14:14] -unusedBit_23_15 = bits, U32, 992, [15:15] -unusedBit_23_16 = bits, U32, 992, [16:16] -unusedBit_23_17 = bits, U32, 992, [17:17] -unusedBit_23_18 = bits, U32, 992, [18:18] -unusedBit_23_19 = bits, U32, 992, [19:19] -unusedBit_23_20 = bits, U32, 992, [20:20] -unusedBit_23_21 = bits, U32, 992, [21:21] -unusedBit_23_22 = bits, U32, 992, [22:22] -unusedBit_23_23 = bits, U32, 992, [23:23] -unusedBit_23_24 = bits, U32, 992, [24:24] -unusedBit_23_25 = bits, U32, 992, [25:25] -unusedBit_23_26 = bits, U32, 992, [26:26] -unusedBit_23_27 = bits, U32, 992, [27:27] -unusedBit_23_28 = bits, U32, 992, [28:28] -unusedBit_23_29 = bits, U32, 992, [29:29] -unusedBit_23_30 = bits, U32, 992, [30:30] -unusedBit_23_31 = bits, U32, 992, [31:31] +unusedBit_22_3 = bits, U32, 992, [3:3] +unusedBit_22_4 = bits, U32, 992, [4:4] +unusedBit_22_5 = bits, U32, 992, [5:5] +unusedBit_22_6 = bits, U32, 992, [6:6] +unusedBit_22_7 = bits, U32, 992, [7:7] +unusedBit_22_8 = bits, U32, 992, [8:8] +unusedBit_22_9 = bits, U32, 992, [9:9] +unusedBit_22_10 = bits, U32, 992, [10:10] +unusedBit_22_11 = bits, U32, 992, [11:11] +unusedBit_22_12 = bits, U32, 992, [12:12] +unusedBit_22_13 = bits, U32, 992, [13:13] +unusedBit_22_14 = bits, U32, 992, [14:14] +unusedBit_22_15 = bits, U32, 992, [15:15] +unusedBit_22_16 = bits, U32, 992, [16:16] +unusedBit_22_17 = bits, U32, 992, [17:17] +unusedBit_22_18 = bits, U32, 992, [18:18] +unusedBit_22_19 = bits, U32, 992, [19:19] +unusedBit_22_20 = bits, U32, 992, [20:20] +unusedBit_22_21 = bits, U32, 992, [21:21] +unusedBit_22_22 = bits, U32, 992, [22:22] +unusedBit_22_23 = bits, U32, 992, [23:23] +unusedBit_22_24 = bits, U32, 992, [24:24] +unusedBit_22_25 = bits, U32, 992, [25:25] +unusedBit_22_26 = bits, U32, 992, [26:26] +unusedBit_22_27 = bits, U32, 992, [27:27] +unusedBit_22_28 = bits, U32, 992, [28:28] +unusedBit_22_29 = bits, U32, 992, [29:29] +unusedBit_22_30 = bits, U32, 992, [30:30] +unusedBit_22_31 = bits, U32, 992, [31:31] egt1 = scalar, F32, 996, "", 1, 0 egt2 = scalar, F32, 1000, "", 1, 0 desiredRpmLimit = scalar, S16, 1004, "rpm", 1, 0 @@ -3089,70 +3089,103 @@ vvtCounter = scalar, U08, 1117, "", 1, 0 camResyncCounter = scalar, U08, 1118, "", 1, 0 vvtStateIndex = scalar, U08, 1119, "", 1, 0 ; total TS size = 1120 -wallFuelCorrection = scalar, F32, 1120, "", 1, 0 -wallFuel = scalar, F32, 1124, "", 1, 0 -; total TS size = 1128 -idleState = bits, S32, 1128, [0:2], "not important" -currentIdlePosition = scalar, F32, 1132 -baseIdlePosition = scalar, F32, 1136 -iacByTpsTaper = scalar, F32, 1140 -throttlePedalUpState = scalar, S32, 1144, "", 1, 0 -mightResetPid = bits, U32, 1148, [0:0] -shouldResetPid = bits, U32, 1148, [1:1] -wasResetPid = bits, U32, 1148, [2:2] -mustResetPid = bits, U32, 1148, [3:3] -isCoasting = bits, U32, 1148, [4:4] -useIacTableForCoasting = bits, U32, 1148, [5:5] -notIdling = bits, U32, 1148, [6:6] -needReset = bits, U32, 1148, [7:7] -isInDeadZone = bits, U32, 1148, [8:8] -isBlipping = bits, U32, 1148, [9:9] -useClosedLoop = bits, U32, 1148, [10:10] -badTps = bits, U32, 1148, [11:11] -looksLikeRunning = bits, U32, 1148, [12:12] -looksLikeCoasting = bits, U32, 1148, [13:13] -looksLikeCrankToIdle = bits, U32, 1148, [14:14] -useInstantRpmForIdle = bits, U32, 1148, [15:15] -isVerboseIAC = bits, U32, 1148, [16:16] -unusedBit_22_17 = bits, U32, 1148, [17:17] -unusedBit_22_18 = bits, U32, 1148, [18:18] -unusedBit_22_19 = bits, U32, 1148, [19:19] -unusedBit_22_20 = bits, U32, 1148, [20:20] -unusedBit_22_21 = bits, U32, 1148, [21:21] -unusedBit_22_22 = bits, U32, 1148, [22:22] -unusedBit_22_23 = bits, U32, 1148, [23:23] -unusedBit_22_24 = bits, U32, 1148, [24:24] -unusedBit_22_25 = bits, U32, 1148, [25:25] -unusedBit_22_26 = bits, U32, 1148, [26:26] -unusedBit_22_27 = bits, U32, 1148, [27:27] -unusedBit_22_28 = bits, U32, 1148, [28:28] -unusedBit_22_29 = bits, U32, 1148, [29:29] -unusedBit_22_30 = bits, U32, 1148, [30:30] -unusedBit_22_31 = bits, U32, 1148, [31:31] -targetRpmByClt = scalar, S32, 1152, "", 1, 0 -targetRpmAcBump = scalar, S32, 1156, "", 1, 0 -iacByRpmTaper = scalar, F32, 1160 -luaAdd = scalar, F32, 1164 -; total TS size = 1168 -baseDwell = scalar, F32, 1168, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 1172, "", 1, 0 -luaTimingAdd = scalar, F32, 1176, "", 1, 0 -luaTimingMult = scalar, F32, 1180, "", 1, 0 -; total TS size = 1184 -idlePosition = scalar, F32, 1184, "", 1, 0 -trim = scalar, F32, 1188, "", 1, 0 -luaAdjustment = scalar, F32, 1192, "", 1, 0 -etbFeedForward = scalar, F32, 1196 -etbIntegralError = scalar, F32, 1200, "", 1, 0 -etbCurrentTarget = scalar, F32, 1204, "%", 1, 0 -; total TS size = 1208 -faultCode = scalar, U08, 1208, "", 1, 0 -heaterDuty = scalar, U08, 1209, "%", 1, 0 -pumpDuty = scalar, U08, 1210, "%", 1, 0 -tempC = scalar, U16, 1212, "C", 1, 0 -nernstVoltage = scalar, U16, 1214, "V", 0.001, 0 -esr = scalar, U16, 1216, "", 1, 0 -; total TS size = 1220 +m_hasSynchronizedPhase = bits, U32, 1120, [0:0] +unusedBit_1_1 = bits, U32, 1120, [1:1] +unusedBit_1_2 = bits, U32, 1120, [2:2] +unusedBit_1_3 = bits, U32, 1120, [3:3] +unusedBit_1_4 = bits, U32, 1120, [4:4] +unusedBit_1_5 = bits, U32, 1120, [5:5] +unusedBit_1_6 = bits, U32, 1120, [6:6] +unusedBit_1_7 = bits, U32, 1120, [7:7] +unusedBit_1_8 = bits, U32, 1120, [8:8] +unusedBit_1_9 = bits, U32, 1120, [9:9] +unusedBit_1_10 = bits, U32, 1120, [10:10] +unusedBit_1_11 = bits, U32, 1120, [11:11] +unusedBit_1_12 = bits, U32, 1120, [12:12] +unusedBit_1_13 = bits, U32, 1120, [13:13] +unusedBit_1_14 = bits, U32, 1120, [14:14] +unusedBit_1_15 = bits, U32, 1120, [15:15] +unusedBit_1_16 = bits, U32, 1120, [16:16] +unusedBit_1_17 = bits, U32, 1120, [17:17] +unusedBit_1_18 = bits, U32, 1120, [18:18] +unusedBit_1_19 = bits, U32, 1120, [19:19] +unusedBit_1_20 = bits, U32, 1120, [20:20] +unusedBit_1_21 = bits, U32, 1120, [21:21] +unusedBit_1_22 = bits, U32, 1120, [22:22] +unusedBit_1_23 = bits, U32, 1120, [23:23] +unusedBit_1_24 = bits, U32, 1120, [24:24] +unusedBit_1_25 = bits, U32, 1120, [25:25] +unusedBit_1_26 = bits, U32, 1120, [26:26] +unusedBit_1_27 = bits, U32, 1120, [27:27] +unusedBit_1_28 = bits, U32, 1120, [28:28] +unusedBit_1_29 = bits, U32, 1120, [29:29] +unusedBit_1_30 = bits, U32, 1120, [30:30] +unusedBit_1_31 = bits, U32, 1120, [31:31] +; total TS size = 1124 +wallFuelCorrection = scalar, F32, 1124, "", 1, 0 +wallFuel = scalar, F32, 1128, "", 1, 0 +; total TS size = 1132 +idleState = bits, S32, 1132, [0:2], "not important" +currentIdlePosition = scalar, F32, 1136 +baseIdlePosition = scalar, F32, 1140 +iacByTpsTaper = scalar, F32, 1144 +throttlePedalUpState = scalar, S32, 1148, "", 1, 0 +mightResetPid = bits, U32, 1152, [0:0] +shouldResetPid = bits, U32, 1152, [1:1] +wasResetPid = bits, U32, 1152, [2:2] +mustResetPid = bits, U32, 1152, [3:3] +isCoasting = bits, U32, 1152, [4:4] +useIacTableForCoasting = bits, U32, 1152, [5:5] +notIdling = bits, U32, 1152, [6:6] +needReset = bits, U32, 1152, [7:7] +isInDeadZone = bits, U32, 1152, [8:8] +isBlipping = bits, U32, 1152, [9:9] +useClosedLoop = bits, U32, 1152, [10:10] +badTps = bits, U32, 1152, [11:11] +looksLikeRunning = bits, U32, 1152, [12:12] +looksLikeCoasting = bits, U32, 1152, [13:13] +looksLikeCrankToIdle = bits, U32, 1152, [14:14] +useInstantRpmForIdle = bits, U32, 1152, [15:15] +isVerboseIAC = bits, U32, 1152, [16:16] +unusedBit_22_17 = bits, U32, 1152, [17:17] +unusedBit_22_18 = bits, U32, 1152, [18:18] +unusedBit_22_19 = bits, U32, 1152, [19:19] +unusedBit_22_20 = bits, U32, 1152, [20:20] +unusedBit_22_21 = bits, U32, 1152, [21:21] +unusedBit_22_22 = bits, U32, 1152, [22:22] +unusedBit_22_23 = bits, U32, 1152, [23:23] +unusedBit_22_24 = bits, U32, 1152, [24:24] +unusedBit_22_25 = bits, U32, 1152, [25:25] +unusedBit_22_26 = bits, U32, 1152, [26:26] +unusedBit_22_27 = bits, U32, 1152, [27:27] +unusedBit_22_28 = bits, U32, 1152, [28:28] +unusedBit_22_29 = bits, U32, 1152, [29:29] +unusedBit_22_30 = bits, U32, 1152, [30:30] +unusedBit_22_31 = bits, U32, 1152, [31:31] +targetRpmByClt = scalar, S32, 1156, "", 1, 0 +targetRpmAcBump = scalar, S32, 1160, "", 1, 0 +iacByRpmTaper = scalar, F32, 1164 +luaAdd = scalar, F32, 1168 +; total TS size = 1172 +baseDwell = scalar, F32, 1172, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 1176, "", 1, 0 +luaTimingAdd = scalar, F32, 1180, "", 1, 0 +luaTimingMult = scalar, F32, 1184, "", 1, 0 +; total TS size = 1188 +idlePosition = scalar, F32, 1188, "", 1, 0 +trim = scalar, F32, 1192, "", 1, 0 +luaAdjustment = scalar, F32, 1196, "", 1, 0 +etbFeedForward = scalar, F32, 1200 +etbIntegralError = scalar, F32, 1204, "", 1, 0 +etbCurrentTarget = scalar, F32, 1208, "%", 1, 0 +; total TS size = 1212 +faultCode = scalar, U08, 1212, "", 1, 0 +heaterDuty = scalar, U08, 1213, "%", 1, 0 +pumpDuty = scalar, U08, 1214, "%", 1, 0 +tempC = scalar, U16, 1216, "C", 1, 0 +nernstVoltage = scalar, U16, 1218, "V", 0.001, 0 +esr = scalar, U16, 1220, "", 1, 0 +; total TS size = 1224 time = { timeNow } @@ -4721,7 +4754,6 @@ entry = hellenBoardId, "Detected Board ID", int, "%d" entry = clutchUpState, "clutch: up", int, "%d" entry = clutchDownState, "clutch: down", int, "%d" entry = brakePedalState, "brake: down", int, "%d" -entry = isSynchronizedPhase, "isSynchronizedPhase", int, "%d" entry = egt1, "egt1", float, "%.3f" entry = egt2, "egt2", float, "%.3f" entry = desiredRpmLimit, "User-defined RPM hard limit", int, "%d" @@ -4762,6 +4794,7 @@ entry = triggerStateIndex, "triggerStateIndex", int, "%d" entry = vvtCounter, "vvtCounter", int, "%d" entry = camResyncCounter, "camResyncCounter", int, "%d" entry = vvtStateIndex, "vvtStateIndex", int, "%d" +entry = m_hasSynchronizedPhase, "m_hasSynchronizedPhase", int, "%d" entry = wallFuelCorrection, "fuel injection time correction to account for wall wetting effect for current cycle", float, "%.3f" entry = wallFuel, "Amount of fuel on the wall, in ms of injector open time for each injector.", float, "%.3f" entry = idleState, "idleState", int, "%d" @@ -4966,6 +4999,7 @@ menuDialog = main subMenu = tps_accel_stateDialog, "tps_accel_state" subMenu = trigger_centralDialog, "trigger_central" subMenu = trigger_stateDialog, "trigger_state" + subMenu = trigger_state_primaryDialog, "trigger_state_primary" subMenu = wall_fuel_stateDialog, "wall_fuel_state" subMenu = idle_stateDialog, "idle_state" subMenu = ignition_stateDialog, "ignition_state" @@ -5415,7 +5449,6 @@ indicatorPanel = engine_stateIndicatorPanel, 2 indicator = {clutchUpState}, "clutchUpState No", "clutchUpState Yes" indicator = {clutchDownState}, "clutchDownState No", "clutchDownState Yes" indicator = {brakePedalState}, "brakePedalState No", "brakePedalState Yes" - indicator = {isSynchronizedPhase}, "isSynchronizedPhase No", "isSynchronizedPhase Yes" dialog = engine_stateDialog, "engine_state" panel = engine_stateIndicatorPanel @@ -5524,6 +5557,12 @@ dialog = trigger_stateDialog, "trigger_state" liveGraph = trigger_state_3_Graph, "Graph", South graphLine = vvtStateIndex +indicatorPanel = trigger_state_primaryIndicatorPanel, 2 + indicator = {m_hasSynchronizedPhase}, "m_hasSynchronizedPhase No", "m_hasSynchronizedPhase Yes" + +dialog = trigger_state_primaryDialog, "trigger_state_primary" + panel = trigger_state_primaryIndicatorPanel + dialog = wall_fuel_stateDialog, "wall_fuel_state" liveGraph = wall_fuel_state_1_Graph, "Graph", South diff --git a/firmware/tunerstudio/generated/rusefi_mre_f7.ini b/firmware/tunerstudio/generated/rusefi_mre_f7.ini index 258c8657af..677f8dcfc3 100644 --- a/firmware/tunerstudio/generated/rusefi_mre_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_mre_f7.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.08.24.mre_f7.3132195825" + signature = "rusEFI 2022.08.24.mre_f7.3185330152" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.08.24.mre_f7.3132195825" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.08.24.mre_f7.3185330152" ; 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 Wed Aug 24 16:15:37 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Aug 24 22:15:15 UTC 2022 pageSize = 21300 page = 1 @@ -2109,7 +2109,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1220 + ochBlockSize = 1224 ; ; see TunerStudioOutputChannels struct @@ -2990,35 +2990,35 @@ hellenBoardId = scalar, S16, 990, "id", 1, 0 clutchUpState = bits, U32, 992, [0:0] clutchDownState = bits, U32, 992, [1:1] brakePedalState = bits, U32, 992, [2:2] -isSynchronizedPhase = bits, U32, 992, [3:3] -unusedBit_23_4 = bits, U32, 992, [4:4] -unusedBit_23_5 = bits, U32, 992, [5:5] -unusedBit_23_6 = bits, U32, 992, [6:6] -unusedBit_23_7 = bits, U32, 992, [7:7] -unusedBit_23_8 = bits, U32, 992, [8:8] -unusedBit_23_9 = bits, U32, 992, [9:9] -unusedBit_23_10 = bits, U32, 992, [10:10] -unusedBit_23_11 = bits, U32, 992, [11:11] -unusedBit_23_12 = bits, U32, 992, [12:12] -unusedBit_23_13 = bits, U32, 992, [13:13] -unusedBit_23_14 = bits, U32, 992, [14:14] -unusedBit_23_15 = bits, U32, 992, [15:15] -unusedBit_23_16 = bits, U32, 992, [16:16] -unusedBit_23_17 = bits, U32, 992, [17:17] -unusedBit_23_18 = bits, U32, 992, [18:18] -unusedBit_23_19 = bits, U32, 992, [19:19] -unusedBit_23_20 = bits, U32, 992, [20:20] -unusedBit_23_21 = bits, U32, 992, [21:21] -unusedBit_23_22 = bits, U32, 992, [22:22] -unusedBit_23_23 = bits, U32, 992, [23:23] -unusedBit_23_24 = bits, U32, 992, [24:24] -unusedBit_23_25 = bits, U32, 992, [25:25] -unusedBit_23_26 = bits, U32, 992, [26:26] -unusedBit_23_27 = bits, U32, 992, [27:27] -unusedBit_23_28 = bits, U32, 992, [28:28] -unusedBit_23_29 = bits, U32, 992, [29:29] -unusedBit_23_30 = bits, U32, 992, [30:30] -unusedBit_23_31 = bits, U32, 992, [31:31] +unusedBit_22_3 = bits, U32, 992, [3:3] +unusedBit_22_4 = bits, U32, 992, [4:4] +unusedBit_22_5 = bits, U32, 992, [5:5] +unusedBit_22_6 = bits, U32, 992, [6:6] +unusedBit_22_7 = bits, U32, 992, [7:7] +unusedBit_22_8 = bits, U32, 992, [8:8] +unusedBit_22_9 = bits, U32, 992, [9:9] +unusedBit_22_10 = bits, U32, 992, [10:10] +unusedBit_22_11 = bits, U32, 992, [11:11] +unusedBit_22_12 = bits, U32, 992, [12:12] +unusedBit_22_13 = bits, U32, 992, [13:13] +unusedBit_22_14 = bits, U32, 992, [14:14] +unusedBit_22_15 = bits, U32, 992, [15:15] +unusedBit_22_16 = bits, U32, 992, [16:16] +unusedBit_22_17 = bits, U32, 992, [17:17] +unusedBit_22_18 = bits, U32, 992, [18:18] +unusedBit_22_19 = bits, U32, 992, [19:19] +unusedBit_22_20 = bits, U32, 992, [20:20] +unusedBit_22_21 = bits, U32, 992, [21:21] +unusedBit_22_22 = bits, U32, 992, [22:22] +unusedBit_22_23 = bits, U32, 992, [23:23] +unusedBit_22_24 = bits, U32, 992, [24:24] +unusedBit_22_25 = bits, U32, 992, [25:25] +unusedBit_22_26 = bits, U32, 992, [26:26] +unusedBit_22_27 = bits, U32, 992, [27:27] +unusedBit_22_28 = bits, U32, 992, [28:28] +unusedBit_22_29 = bits, U32, 992, [29:29] +unusedBit_22_30 = bits, U32, 992, [30:30] +unusedBit_22_31 = bits, U32, 992, [31:31] egt1 = scalar, F32, 996, "", 1, 0 egt2 = scalar, F32, 1000, "", 1, 0 desiredRpmLimit = scalar, S16, 1004, "rpm", 1, 0 @@ -3089,70 +3089,103 @@ vvtCounter = scalar, U08, 1117, "", 1, 0 camResyncCounter = scalar, U08, 1118, "", 1, 0 vvtStateIndex = scalar, U08, 1119, "", 1, 0 ; total TS size = 1120 -wallFuelCorrection = scalar, F32, 1120, "", 1, 0 -wallFuel = scalar, F32, 1124, "", 1, 0 -; total TS size = 1128 -idleState = bits, S32, 1128, [0:2], "not important" -currentIdlePosition = scalar, F32, 1132 -baseIdlePosition = scalar, F32, 1136 -iacByTpsTaper = scalar, F32, 1140 -throttlePedalUpState = scalar, S32, 1144, "", 1, 0 -mightResetPid = bits, U32, 1148, [0:0] -shouldResetPid = bits, U32, 1148, [1:1] -wasResetPid = bits, U32, 1148, [2:2] -mustResetPid = bits, U32, 1148, [3:3] -isCoasting = bits, U32, 1148, [4:4] -useIacTableForCoasting = bits, U32, 1148, [5:5] -notIdling = bits, U32, 1148, [6:6] -needReset = bits, U32, 1148, [7:7] -isInDeadZone = bits, U32, 1148, [8:8] -isBlipping = bits, U32, 1148, [9:9] -useClosedLoop = bits, U32, 1148, [10:10] -badTps = bits, U32, 1148, [11:11] -looksLikeRunning = bits, U32, 1148, [12:12] -looksLikeCoasting = bits, U32, 1148, [13:13] -looksLikeCrankToIdle = bits, U32, 1148, [14:14] -useInstantRpmForIdle = bits, U32, 1148, [15:15] -isVerboseIAC = bits, U32, 1148, [16:16] -unusedBit_22_17 = bits, U32, 1148, [17:17] -unusedBit_22_18 = bits, U32, 1148, [18:18] -unusedBit_22_19 = bits, U32, 1148, [19:19] -unusedBit_22_20 = bits, U32, 1148, [20:20] -unusedBit_22_21 = bits, U32, 1148, [21:21] -unusedBit_22_22 = bits, U32, 1148, [22:22] -unusedBit_22_23 = bits, U32, 1148, [23:23] -unusedBit_22_24 = bits, U32, 1148, [24:24] -unusedBit_22_25 = bits, U32, 1148, [25:25] -unusedBit_22_26 = bits, U32, 1148, [26:26] -unusedBit_22_27 = bits, U32, 1148, [27:27] -unusedBit_22_28 = bits, U32, 1148, [28:28] -unusedBit_22_29 = bits, U32, 1148, [29:29] -unusedBit_22_30 = bits, U32, 1148, [30:30] -unusedBit_22_31 = bits, U32, 1148, [31:31] -targetRpmByClt = scalar, S32, 1152, "", 1, 0 -targetRpmAcBump = scalar, S32, 1156, "", 1, 0 -iacByRpmTaper = scalar, F32, 1160 -luaAdd = scalar, F32, 1164 -; total TS size = 1168 -baseDwell = scalar, F32, 1168, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 1172, "", 1, 0 -luaTimingAdd = scalar, F32, 1176, "", 1, 0 -luaTimingMult = scalar, F32, 1180, "", 1, 0 -; total TS size = 1184 -idlePosition = scalar, F32, 1184, "", 1, 0 -trim = scalar, F32, 1188, "", 1, 0 -luaAdjustment = scalar, F32, 1192, "", 1, 0 -etbFeedForward = scalar, F32, 1196 -etbIntegralError = scalar, F32, 1200, "", 1, 0 -etbCurrentTarget = scalar, F32, 1204, "%", 1, 0 -; total TS size = 1208 -faultCode = scalar, U08, 1208, "", 1, 0 -heaterDuty = scalar, U08, 1209, "%", 1, 0 -pumpDuty = scalar, U08, 1210, "%", 1, 0 -tempC = scalar, U16, 1212, "C", 1, 0 -nernstVoltage = scalar, U16, 1214, "V", 0.001, 0 -esr = scalar, U16, 1216, "", 1, 0 -; total TS size = 1220 +m_hasSynchronizedPhase = bits, U32, 1120, [0:0] +unusedBit_1_1 = bits, U32, 1120, [1:1] +unusedBit_1_2 = bits, U32, 1120, [2:2] +unusedBit_1_3 = bits, U32, 1120, [3:3] +unusedBit_1_4 = bits, U32, 1120, [4:4] +unusedBit_1_5 = bits, U32, 1120, [5:5] +unusedBit_1_6 = bits, U32, 1120, [6:6] +unusedBit_1_7 = bits, U32, 1120, [7:7] +unusedBit_1_8 = bits, U32, 1120, [8:8] +unusedBit_1_9 = bits, U32, 1120, [9:9] +unusedBit_1_10 = bits, U32, 1120, [10:10] +unusedBit_1_11 = bits, U32, 1120, [11:11] +unusedBit_1_12 = bits, U32, 1120, [12:12] +unusedBit_1_13 = bits, U32, 1120, [13:13] +unusedBit_1_14 = bits, U32, 1120, [14:14] +unusedBit_1_15 = bits, U32, 1120, [15:15] +unusedBit_1_16 = bits, U32, 1120, [16:16] +unusedBit_1_17 = bits, U32, 1120, [17:17] +unusedBit_1_18 = bits, U32, 1120, [18:18] +unusedBit_1_19 = bits, U32, 1120, [19:19] +unusedBit_1_20 = bits, U32, 1120, [20:20] +unusedBit_1_21 = bits, U32, 1120, [21:21] +unusedBit_1_22 = bits, U32, 1120, [22:22] +unusedBit_1_23 = bits, U32, 1120, [23:23] +unusedBit_1_24 = bits, U32, 1120, [24:24] +unusedBit_1_25 = bits, U32, 1120, [25:25] +unusedBit_1_26 = bits, U32, 1120, [26:26] +unusedBit_1_27 = bits, U32, 1120, [27:27] +unusedBit_1_28 = bits, U32, 1120, [28:28] +unusedBit_1_29 = bits, U32, 1120, [29:29] +unusedBit_1_30 = bits, U32, 1120, [30:30] +unusedBit_1_31 = bits, U32, 1120, [31:31] +; total TS size = 1124 +wallFuelCorrection = scalar, F32, 1124, "", 1, 0 +wallFuel = scalar, F32, 1128, "", 1, 0 +; total TS size = 1132 +idleState = bits, S32, 1132, [0:2], "not important" +currentIdlePosition = scalar, F32, 1136 +baseIdlePosition = scalar, F32, 1140 +iacByTpsTaper = scalar, F32, 1144 +throttlePedalUpState = scalar, S32, 1148, "", 1, 0 +mightResetPid = bits, U32, 1152, [0:0] +shouldResetPid = bits, U32, 1152, [1:1] +wasResetPid = bits, U32, 1152, [2:2] +mustResetPid = bits, U32, 1152, [3:3] +isCoasting = bits, U32, 1152, [4:4] +useIacTableForCoasting = bits, U32, 1152, [5:5] +notIdling = bits, U32, 1152, [6:6] +needReset = bits, U32, 1152, [7:7] +isInDeadZone = bits, U32, 1152, [8:8] +isBlipping = bits, U32, 1152, [9:9] +useClosedLoop = bits, U32, 1152, [10:10] +badTps = bits, U32, 1152, [11:11] +looksLikeRunning = bits, U32, 1152, [12:12] +looksLikeCoasting = bits, U32, 1152, [13:13] +looksLikeCrankToIdle = bits, U32, 1152, [14:14] +useInstantRpmForIdle = bits, U32, 1152, [15:15] +isVerboseIAC = bits, U32, 1152, [16:16] +unusedBit_22_17 = bits, U32, 1152, [17:17] +unusedBit_22_18 = bits, U32, 1152, [18:18] +unusedBit_22_19 = bits, U32, 1152, [19:19] +unusedBit_22_20 = bits, U32, 1152, [20:20] +unusedBit_22_21 = bits, U32, 1152, [21:21] +unusedBit_22_22 = bits, U32, 1152, [22:22] +unusedBit_22_23 = bits, U32, 1152, [23:23] +unusedBit_22_24 = bits, U32, 1152, [24:24] +unusedBit_22_25 = bits, U32, 1152, [25:25] +unusedBit_22_26 = bits, U32, 1152, [26:26] +unusedBit_22_27 = bits, U32, 1152, [27:27] +unusedBit_22_28 = bits, U32, 1152, [28:28] +unusedBit_22_29 = bits, U32, 1152, [29:29] +unusedBit_22_30 = bits, U32, 1152, [30:30] +unusedBit_22_31 = bits, U32, 1152, [31:31] +targetRpmByClt = scalar, S32, 1156, "", 1, 0 +targetRpmAcBump = scalar, S32, 1160, "", 1, 0 +iacByRpmTaper = scalar, F32, 1164 +luaAdd = scalar, F32, 1168 +; total TS size = 1172 +baseDwell = scalar, F32, 1172, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 1176, "", 1, 0 +luaTimingAdd = scalar, F32, 1180, "", 1, 0 +luaTimingMult = scalar, F32, 1184, "", 1, 0 +; total TS size = 1188 +idlePosition = scalar, F32, 1188, "", 1, 0 +trim = scalar, F32, 1192, "", 1, 0 +luaAdjustment = scalar, F32, 1196, "", 1, 0 +etbFeedForward = scalar, F32, 1200 +etbIntegralError = scalar, F32, 1204, "", 1, 0 +etbCurrentTarget = scalar, F32, 1208, "%", 1, 0 +; total TS size = 1212 +faultCode = scalar, U08, 1212, "", 1, 0 +heaterDuty = scalar, U08, 1213, "%", 1, 0 +pumpDuty = scalar, U08, 1214, "%", 1, 0 +tempC = scalar, U16, 1216, "C", 1, 0 +nernstVoltage = scalar, U16, 1218, "V", 0.001, 0 +esr = scalar, U16, 1220, "", 1, 0 +; total TS size = 1224 time = { timeNow } @@ -4721,7 +4754,6 @@ entry = hellenBoardId, "Detected Board ID", int, "%d" entry = clutchUpState, "clutch: up", int, "%d" entry = clutchDownState, "clutch: down", int, "%d" entry = brakePedalState, "brake: down", int, "%d" -entry = isSynchronizedPhase, "isSynchronizedPhase", int, "%d" entry = egt1, "egt1", float, "%.3f" entry = egt2, "egt2", float, "%.3f" entry = desiredRpmLimit, "User-defined RPM hard limit", int, "%d" @@ -4762,6 +4794,7 @@ entry = triggerStateIndex, "triggerStateIndex", int, "%d" entry = vvtCounter, "vvtCounter", int, "%d" entry = camResyncCounter, "camResyncCounter", int, "%d" entry = vvtStateIndex, "vvtStateIndex", int, "%d" +entry = m_hasSynchronizedPhase, "m_hasSynchronizedPhase", int, "%d" entry = wallFuelCorrection, "fuel injection time correction to account for wall wetting effect for current cycle", float, "%.3f" entry = wallFuel, "Amount of fuel on the wall, in ms of injector open time for each injector.", float, "%.3f" entry = idleState, "idleState", int, "%d" @@ -4966,6 +4999,7 @@ menuDialog = main subMenu = tps_accel_stateDialog, "tps_accel_state" subMenu = trigger_centralDialog, "trigger_central" subMenu = trigger_stateDialog, "trigger_state" + subMenu = trigger_state_primaryDialog, "trigger_state_primary" subMenu = wall_fuel_stateDialog, "wall_fuel_state" subMenu = idle_stateDialog, "idle_state" subMenu = ignition_stateDialog, "ignition_state" @@ -5415,7 +5449,6 @@ indicatorPanel = engine_stateIndicatorPanel, 2 indicator = {clutchUpState}, "clutchUpState No", "clutchUpState Yes" indicator = {clutchDownState}, "clutchDownState No", "clutchDownState Yes" indicator = {brakePedalState}, "brakePedalState No", "brakePedalState Yes" - indicator = {isSynchronizedPhase}, "isSynchronizedPhase No", "isSynchronizedPhase Yes" dialog = engine_stateDialog, "engine_state" panel = engine_stateIndicatorPanel @@ -5524,6 +5557,12 @@ dialog = trigger_stateDialog, "trigger_state" liveGraph = trigger_state_3_Graph, "Graph", South graphLine = vvtStateIndex +indicatorPanel = trigger_state_primaryIndicatorPanel, 2 + indicator = {m_hasSynchronizedPhase}, "m_hasSynchronizedPhase No", "m_hasSynchronizedPhase Yes" + +dialog = trigger_state_primaryDialog, "trigger_state_primary" + panel = trigger_state_primaryIndicatorPanel + dialog = wall_fuel_stateDialog, "wall_fuel_state" liveGraph = wall_fuel_state_1_Graph, "Graph", South diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_405.ini b/firmware/tunerstudio/generated/rusefi_prometheus_405.ini index fff51fbbfc..3bf38ff6e7 100644 --- a/firmware/tunerstudio/generated/rusefi_prometheus_405.ini +++ b/firmware/tunerstudio/generated/rusefi_prometheus_405.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.08.24.prometheus_405.630052577" + signature = "rusEFI 2022.08.24.prometheus_405.585110264" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.08.24.prometheus_405.630052577" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.08.24.prometheus_405.585110264" ; 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 Wed Aug 24 16:15:47 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Aug 24 22:15:25 UTC 2022 pageSize = 21300 page = 1 @@ -2109,7 +2109,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1220 + ochBlockSize = 1224 ; ; see TunerStudioOutputChannels struct @@ -2990,35 +2990,35 @@ hellenBoardId = scalar, S16, 990, "id", 1, 0 clutchUpState = bits, U32, 992, [0:0] clutchDownState = bits, U32, 992, [1:1] brakePedalState = bits, U32, 992, [2:2] -isSynchronizedPhase = bits, U32, 992, [3:3] -unusedBit_23_4 = bits, U32, 992, [4:4] -unusedBit_23_5 = bits, U32, 992, [5:5] -unusedBit_23_6 = bits, U32, 992, [6:6] -unusedBit_23_7 = bits, U32, 992, [7:7] -unusedBit_23_8 = bits, U32, 992, [8:8] -unusedBit_23_9 = bits, U32, 992, [9:9] -unusedBit_23_10 = bits, U32, 992, [10:10] -unusedBit_23_11 = bits, U32, 992, [11:11] -unusedBit_23_12 = bits, U32, 992, [12:12] -unusedBit_23_13 = bits, U32, 992, [13:13] -unusedBit_23_14 = bits, U32, 992, [14:14] -unusedBit_23_15 = bits, U32, 992, [15:15] -unusedBit_23_16 = bits, U32, 992, [16:16] -unusedBit_23_17 = bits, U32, 992, [17:17] -unusedBit_23_18 = bits, U32, 992, [18:18] -unusedBit_23_19 = bits, U32, 992, [19:19] -unusedBit_23_20 = bits, U32, 992, [20:20] -unusedBit_23_21 = bits, U32, 992, [21:21] -unusedBit_23_22 = bits, U32, 992, [22:22] -unusedBit_23_23 = bits, U32, 992, [23:23] -unusedBit_23_24 = bits, U32, 992, [24:24] -unusedBit_23_25 = bits, U32, 992, [25:25] -unusedBit_23_26 = bits, U32, 992, [26:26] -unusedBit_23_27 = bits, U32, 992, [27:27] -unusedBit_23_28 = bits, U32, 992, [28:28] -unusedBit_23_29 = bits, U32, 992, [29:29] -unusedBit_23_30 = bits, U32, 992, [30:30] -unusedBit_23_31 = bits, U32, 992, [31:31] +unusedBit_22_3 = bits, U32, 992, [3:3] +unusedBit_22_4 = bits, U32, 992, [4:4] +unusedBit_22_5 = bits, U32, 992, [5:5] +unusedBit_22_6 = bits, U32, 992, [6:6] +unusedBit_22_7 = bits, U32, 992, [7:7] +unusedBit_22_8 = bits, U32, 992, [8:8] +unusedBit_22_9 = bits, U32, 992, [9:9] +unusedBit_22_10 = bits, U32, 992, [10:10] +unusedBit_22_11 = bits, U32, 992, [11:11] +unusedBit_22_12 = bits, U32, 992, [12:12] +unusedBit_22_13 = bits, U32, 992, [13:13] +unusedBit_22_14 = bits, U32, 992, [14:14] +unusedBit_22_15 = bits, U32, 992, [15:15] +unusedBit_22_16 = bits, U32, 992, [16:16] +unusedBit_22_17 = bits, U32, 992, [17:17] +unusedBit_22_18 = bits, U32, 992, [18:18] +unusedBit_22_19 = bits, U32, 992, [19:19] +unusedBit_22_20 = bits, U32, 992, [20:20] +unusedBit_22_21 = bits, U32, 992, [21:21] +unusedBit_22_22 = bits, U32, 992, [22:22] +unusedBit_22_23 = bits, U32, 992, [23:23] +unusedBit_22_24 = bits, U32, 992, [24:24] +unusedBit_22_25 = bits, U32, 992, [25:25] +unusedBit_22_26 = bits, U32, 992, [26:26] +unusedBit_22_27 = bits, U32, 992, [27:27] +unusedBit_22_28 = bits, U32, 992, [28:28] +unusedBit_22_29 = bits, U32, 992, [29:29] +unusedBit_22_30 = bits, U32, 992, [30:30] +unusedBit_22_31 = bits, U32, 992, [31:31] egt1 = scalar, F32, 996, "", 1, 0 egt2 = scalar, F32, 1000, "", 1, 0 desiredRpmLimit = scalar, S16, 1004, "rpm", 1, 0 @@ -3089,70 +3089,103 @@ vvtCounter = scalar, U08, 1117, "", 1, 0 camResyncCounter = scalar, U08, 1118, "", 1, 0 vvtStateIndex = scalar, U08, 1119, "", 1, 0 ; total TS size = 1120 -wallFuelCorrection = scalar, F32, 1120, "", 1, 0 -wallFuel = scalar, F32, 1124, "", 1, 0 -; total TS size = 1128 -idleState = bits, S32, 1128, [0:2], "not important" -currentIdlePosition = scalar, F32, 1132 -baseIdlePosition = scalar, F32, 1136 -iacByTpsTaper = scalar, F32, 1140 -throttlePedalUpState = scalar, S32, 1144, "", 1, 0 -mightResetPid = bits, U32, 1148, [0:0] -shouldResetPid = bits, U32, 1148, [1:1] -wasResetPid = bits, U32, 1148, [2:2] -mustResetPid = bits, U32, 1148, [3:3] -isCoasting = bits, U32, 1148, [4:4] -useIacTableForCoasting = bits, U32, 1148, [5:5] -notIdling = bits, U32, 1148, [6:6] -needReset = bits, U32, 1148, [7:7] -isInDeadZone = bits, U32, 1148, [8:8] -isBlipping = bits, U32, 1148, [9:9] -useClosedLoop = bits, U32, 1148, [10:10] -badTps = bits, U32, 1148, [11:11] -looksLikeRunning = bits, U32, 1148, [12:12] -looksLikeCoasting = bits, U32, 1148, [13:13] -looksLikeCrankToIdle = bits, U32, 1148, [14:14] -useInstantRpmForIdle = bits, U32, 1148, [15:15] -isVerboseIAC = bits, U32, 1148, [16:16] -unusedBit_22_17 = bits, U32, 1148, [17:17] -unusedBit_22_18 = bits, U32, 1148, [18:18] -unusedBit_22_19 = bits, U32, 1148, [19:19] -unusedBit_22_20 = bits, U32, 1148, [20:20] -unusedBit_22_21 = bits, U32, 1148, [21:21] -unusedBit_22_22 = bits, U32, 1148, [22:22] -unusedBit_22_23 = bits, U32, 1148, [23:23] -unusedBit_22_24 = bits, U32, 1148, [24:24] -unusedBit_22_25 = bits, U32, 1148, [25:25] -unusedBit_22_26 = bits, U32, 1148, [26:26] -unusedBit_22_27 = bits, U32, 1148, [27:27] -unusedBit_22_28 = bits, U32, 1148, [28:28] -unusedBit_22_29 = bits, U32, 1148, [29:29] -unusedBit_22_30 = bits, U32, 1148, [30:30] -unusedBit_22_31 = bits, U32, 1148, [31:31] -targetRpmByClt = scalar, S32, 1152, "", 1, 0 -targetRpmAcBump = scalar, S32, 1156, "", 1, 0 -iacByRpmTaper = scalar, F32, 1160 -luaAdd = scalar, F32, 1164 -; total TS size = 1168 -baseDwell = scalar, F32, 1168, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 1172, "", 1, 0 -luaTimingAdd = scalar, F32, 1176, "", 1, 0 -luaTimingMult = scalar, F32, 1180, "", 1, 0 -; total TS size = 1184 -idlePosition = scalar, F32, 1184, "", 1, 0 -trim = scalar, F32, 1188, "", 1, 0 -luaAdjustment = scalar, F32, 1192, "", 1, 0 -etbFeedForward = scalar, F32, 1196 -etbIntegralError = scalar, F32, 1200, "", 1, 0 -etbCurrentTarget = scalar, F32, 1204, "%", 1, 0 -; total TS size = 1208 -faultCode = scalar, U08, 1208, "", 1, 0 -heaterDuty = scalar, U08, 1209, "%", 1, 0 -pumpDuty = scalar, U08, 1210, "%", 1, 0 -tempC = scalar, U16, 1212, "C", 1, 0 -nernstVoltage = scalar, U16, 1214, "V", 0.001, 0 -esr = scalar, U16, 1216, "", 1, 0 -; total TS size = 1220 +m_hasSynchronizedPhase = bits, U32, 1120, [0:0] +unusedBit_1_1 = bits, U32, 1120, [1:1] +unusedBit_1_2 = bits, U32, 1120, [2:2] +unusedBit_1_3 = bits, U32, 1120, [3:3] +unusedBit_1_4 = bits, U32, 1120, [4:4] +unusedBit_1_5 = bits, U32, 1120, [5:5] +unusedBit_1_6 = bits, U32, 1120, [6:6] +unusedBit_1_7 = bits, U32, 1120, [7:7] +unusedBit_1_8 = bits, U32, 1120, [8:8] +unusedBit_1_9 = bits, U32, 1120, [9:9] +unusedBit_1_10 = bits, U32, 1120, [10:10] +unusedBit_1_11 = bits, U32, 1120, [11:11] +unusedBit_1_12 = bits, U32, 1120, [12:12] +unusedBit_1_13 = bits, U32, 1120, [13:13] +unusedBit_1_14 = bits, U32, 1120, [14:14] +unusedBit_1_15 = bits, U32, 1120, [15:15] +unusedBit_1_16 = bits, U32, 1120, [16:16] +unusedBit_1_17 = bits, U32, 1120, [17:17] +unusedBit_1_18 = bits, U32, 1120, [18:18] +unusedBit_1_19 = bits, U32, 1120, [19:19] +unusedBit_1_20 = bits, U32, 1120, [20:20] +unusedBit_1_21 = bits, U32, 1120, [21:21] +unusedBit_1_22 = bits, U32, 1120, [22:22] +unusedBit_1_23 = bits, U32, 1120, [23:23] +unusedBit_1_24 = bits, U32, 1120, [24:24] +unusedBit_1_25 = bits, U32, 1120, [25:25] +unusedBit_1_26 = bits, U32, 1120, [26:26] +unusedBit_1_27 = bits, U32, 1120, [27:27] +unusedBit_1_28 = bits, U32, 1120, [28:28] +unusedBit_1_29 = bits, U32, 1120, [29:29] +unusedBit_1_30 = bits, U32, 1120, [30:30] +unusedBit_1_31 = bits, U32, 1120, [31:31] +; total TS size = 1124 +wallFuelCorrection = scalar, F32, 1124, "", 1, 0 +wallFuel = scalar, F32, 1128, "", 1, 0 +; total TS size = 1132 +idleState = bits, S32, 1132, [0:2], "not important" +currentIdlePosition = scalar, F32, 1136 +baseIdlePosition = scalar, F32, 1140 +iacByTpsTaper = scalar, F32, 1144 +throttlePedalUpState = scalar, S32, 1148, "", 1, 0 +mightResetPid = bits, U32, 1152, [0:0] +shouldResetPid = bits, U32, 1152, [1:1] +wasResetPid = bits, U32, 1152, [2:2] +mustResetPid = bits, U32, 1152, [3:3] +isCoasting = bits, U32, 1152, [4:4] +useIacTableForCoasting = bits, U32, 1152, [5:5] +notIdling = bits, U32, 1152, [6:6] +needReset = bits, U32, 1152, [7:7] +isInDeadZone = bits, U32, 1152, [8:8] +isBlipping = bits, U32, 1152, [9:9] +useClosedLoop = bits, U32, 1152, [10:10] +badTps = bits, U32, 1152, [11:11] +looksLikeRunning = bits, U32, 1152, [12:12] +looksLikeCoasting = bits, U32, 1152, [13:13] +looksLikeCrankToIdle = bits, U32, 1152, [14:14] +useInstantRpmForIdle = bits, U32, 1152, [15:15] +isVerboseIAC = bits, U32, 1152, [16:16] +unusedBit_22_17 = bits, U32, 1152, [17:17] +unusedBit_22_18 = bits, U32, 1152, [18:18] +unusedBit_22_19 = bits, U32, 1152, [19:19] +unusedBit_22_20 = bits, U32, 1152, [20:20] +unusedBit_22_21 = bits, U32, 1152, [21:21] +unusedBit_22_22 = bits, U32, 1152, [22:22] +unusedBit_22_23 = bits, U32, 1152, [23:23] +unusedBit_22_24 = bits, U32, 1152, [24:24] +unusedBit_22_25 = bits, U32, 1152, [25:25] +unusedBit_22_26 = bits, U32, 1152, [26:26] +unusedBit_22_27 = bits, U32, 1152, [27:27] +unusedBit_22_28 = bits, U32, 1152, [28:28] +unusedBit_22_29 = bits, U32, 1152, [29:29] +unusedBit_22_30 = bits, U32, 1152, [30:30] +unusedBit_22_31 = bits, U32, 1152, [31:31] +targetRpmByClt = scalar, S32, 1156, "", 1, 0 +targetRpmAcBump = scalar, S32, 1160, "", 1, 0 +iacByRpmTaper = scalar, F32, 1164 +luaAdd = scalar, F32, 1168 +; total TS size = 1172 +baseDwell = scalar, F32, 1172, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 1176, "", 1, 0 +luaTimingAdd = scalar, F32, 1180, "", 1, 0 +luaTimingMult = scalar, F32, 1184, "", 1, 0 +; total TS size = 1188 +idlePosition = scalar, F32, 1188, "", 1, 0 +trim = scalar, F32, 1192, "", 1, 0 +luaAdjustment = scalar, F32, 1196, "", 1, 0 +etbFeedForward = scalar, F32, 1200 +etbIntegralError = scalar, F32, 1204, "", 1, 0 +etbCurrentTarget = scalar, F32, 1208, "%", 1, 0 +; total TS size = 1212 +faultCode = scalar, U08, 1212, "", 1, 0 +heaterDuty = scalar, U08, 1213, "%", 1, 0 +pumpDuty = scalar, U08, 1214, "%", 1, 0 +tempC = scalar, U16, 1216, "C", 1, 0 +nernstVoltage = scalar, U16, 1218, "V", 0.001, 0 +esr = scalar, U16, 1220, "", 1, 0 +; total TS size = 1224 time = { timeNow } @@ -4721,7 +4754,6 @@ entry = hellenBoardId, "Detected Board ID", int, "%d" entry = clutchUpState, "clutch: up", int, "%d" entry = clutchDownState, "clutch: down", int, "%d" entry = brakePedalState, "brake: down", int, "%d" -entry = isSynchronizedPhase, "isSynchronizedPhase", int, "%d" entry = egt1, "egt1", float, "%.3f" entry = egt2, "egt2", float, "%.3f" entry = desiredRpmLimit, "User-defined RPM hard limit", int, "%d" @@ -4762,6 +4794,7 @@ entry = triggerStateIndex, "triggerStateIndex", int, "%d" entry = vvtCounter, "vvtCounter", int, "%d" entry = camResyncCounter, "camResyncCounter", int, "%d" entry = vvtStateIndex, "vvtStateIndex", int, "%d" +entry = m_hasSynchronizedPhase, "m_hasSynchronizedPhase", int, "%d" entry = wallFuelCorrection, "fuel injection time correction to account for wall wetting effect for current cycle", float, "%.3f" entry = wallFuel, "Amount of fuel on the wall, in ms of injector open time for each injector.", float, "%.3f" entry = idleState, "idleState", int, "%d" @@ -4966,6 +4999,7 @@ menuDialog = main subMenu = tps_accel_stateDialog, "tps_accel_state" subMenu = trigger_centralDialog, "trigger_central" subMenu = trigger_stateDialog, "trigger_state" + subMenu = trigger_state_primaryDialog, "trigger_state_primary" subMenu = wall_fuel_stateDialog, "wall_fuel_state" subMenu = idle_stateDialog, "idle_state" subMenu = ignition_stateDialog, "ignition_state" @@ -5413,7 +5447,6 @@ indicatorPanel = engine_stateIndicatorPanel, 2 indicator = {clutchUpState}, "clutchUpState No", "clutchUpState Yes" indicator = {clutchDownState}, "clutchDownState No", "clutchDownState Yes" indicator = {brakePedalState}, "brakePedalState No", "brakePedalState Yes" - indicator = {isSynchronizedPhase}, "isSynchronizedPhase No", "isSynchronizedPhase Yes" dialog = engine_stateDialog, "engine_state" panel = engine_stateIndicatorPanel @@ -5522,6 +5555,12 @@ dialog = trigger_stateDialog, "trigger_state" liveGraph = trigger_state_3_Graph, "Graph", South graphLine = vvtStateIndex +indicatorPanel = trigger_state_primaryIndicatorPanel, 2 + indicator = {m_hasSynchronizedPhase}, "m_hasSynchronizedPhase No", "m_hasSynchronizedPhase Yes" + +dialog = trigger_state_primaryDialog, "trigger_state_primary" + panel = trigger_state_primaryIndicatorPanel + dialog = wall_fuel_stateDialog, "wall_fuel_state" liveGraph = wall_fuel_state_1_Graph, "Graph", South diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_469.ini b/firmware/tunerstudio/generated/rusefi_prometheus_469.ini index 1658ead727..ca7a8b1ead 100644 --- a/firmware/tunerstudio/generated/rusefi_prometheus_469.ini +++ b/firmware/tunerstudio/generated/rusefi_prometheus_469.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.08.24.prometheus_469.630052577" + signature = "rusEFI 2022.08.24.prometheus_469.585110264" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.08.24.prometheus_469.630052577" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.08.24.prometheus_469.585110264" ; 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 Wed Aug 24 16:15:45 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Aug 24 22:15:23 UTC 2022 pageSize = 21300 page = 1 @@ -2109,7 +2109,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1220 + ochBlockSize = 1224 ; ; see TunerStudioOutputChannels struct @@ -2990,35 +2990,35 @@ hellenBoardId = scalar, S16, 990, "id", 1, 0 clutchUpState = bits, U32, 992, [0:0] clutchDownState = bits, U32, 992, [1:1] brakePedalState = bits, U32, 992, [2:2] -isSynchronizedPhase = bits, U32, 992, [3:3] -unusedBit_23_4 = bits, U32, 992, [4:4] -unusedBit_23_5 = bits, U32, 992, [5:5] -unusedBit_23_6 = bits, U32, 992, [6:6] -unusedBit_23_7 = bits, U32, 992, [7:7] -unusedBit_23_8 = bits, U32, 992, [8:8] -unusedBit_23_9 = bits, U32, 992, [9:9] -unusedBit_23_10 = bits, U32, 992, [10:10] -unusedBit_23_11 = bits, U32, 992, [11:11] -unusedBit_23_12 = bits, U32, 992, [12:12] -unusedBit_23_13 = bits, U32, 992, [13:13] -unusedBit_23_14 = bits, U32, 992, [14:14] -unusedBit_23_15 = bits, U32, 992, [15:15] -unusedBit_23_16 = bits, U32, 992, [16:16] -unusedBit_23_17 = bits, U32, 992, [17:17] -unusedBit_23_18 = bits, U32, 992, [18:18] -unusedBit_23_19 = bits, U32, 992, [19:19] -unusedBit_23_20 = bits, U32, 992, [20:20] -unusedBit_23_21 = bits, U32, 992, [21:21] -unusedBit_23_22 = bits, U32, 992, [22:22] -unusedBit_23_23 = bits, U32, 992, [23:23] -unusedBit_23_24 = bits, U32, 992, [24:24] -unusedBit_23_25 = bits, U32, 992, [25:25] -unusedBit_23_26 = bits, U32, 992, [26:26] -unusedBit_23_27 = bits, U32, 992, [27:27] -unusedBit_23_28 = bits, U32, 992, [28:28] -unusedBit_23_29 = bits, U32, 992, [29:29] -unusedBit_23_30 = bits, U32, 992, [30:30] -unusedBit_23_31 = bits, U32, 992, [31:31] +unusedBit_22_3 = bits, U32, 992, [3:3] +unusedBit_22_4 = bits, U32, 992, [4:4] +unusedBit_22_5 = bits, U32, 992, [5:5] +unusedBit_22_6 = bits, U32, 992, [6:6] +unusedBit_22_7 = bits, U32, 992, [7:7] +unusedBit_22_8 = bits, U32, 992, [8:8] +unusedBit_22_9 = bits, U32, 992, [9:9] +unusedBit_22_10 = bits, U32, 992, [10:10] +unusedBit_22_11 = bits, U32, 992, [11:11] +unusedBit_22_12 = bits, U32, 992, [12:12] +unusedBit_22_13 = bits, U32, 992, [13:13] +unusedBit_22_14 = bits, U32, 992, [14:14] +unusedBit_22_15 = bits, U32, 992, [15:15] +unusedBit_22_16 = bits, U32, 992, [16:16] +unusedBit_22_17 = bits, U32, 992, [17:17] +unusedBit_22_18 = bits, U32, 992, [18:18] +unusedBit_22_19 = bits, U32, 992, [19:19] +unusedBit_22_20 = bits, U32, 992, [20:20] +unusedBit_22_21 = bits, U32, 992, [21:21] +unusedBit_22_22 = bits, U32, 992, [22:22] +unusedBit_22_23 = bits, U32, 992, [23:23] +unusedBit_22_24 = bits, U32, 992, [24:24] +unusedBit_22_25 = bits, U32, 992, [25:25] +unusedBit_22_26 = bits, U32, 992, [26:26] +unusedBit_22_27 = bits, U32, 992, [27:27] +unusedBit_22_28 = bits, U32, 992, [28:28] +unusedBit_22_29 = bits, U32, 992, [29:29] +unusedBit_22_30 = bits, U32, 992, [30:30] +unusedBit_22_31 = bits, U32, 992, [31:31] egt1 = scalar, F32, 996, "", 1, 0 egt2 = scalar, F32, 1000, "", 1, 0 desiredRpmLimit = scalar, S16, 1004, "rpm", 1, 0 @@ -3089,70 +3089,103 @@ vvtCounter = scalar, U08, 1117, "", 1, 0 camResyncCounter = scalar, U08, 1118, "", 1, 0 vvtStateIndex = scalar, U08, 1119, "", 1, 0 ; total TS size = 1120 -wallFuelCorrection = scalar, F32, 1120, "", 1, 0 -wallFuel = scalar, F32, 1124, "", 1, 0 -; total TS size = 1128 -idleState = bits, S32, 1128, [0:2], "not important" -currentIdlePosition = scalar, F32, 1132 -baseIdlePosition = scalar, F32, 1136 -iacByTpsTaper = scalar, F32, 1140 -throttlePedalUpState = scalar, S32, 1144, "", 1, 0 -mightResetPid = bits, U32, 1148, [0:0] -shouldResetPid = bits, U32, 1148, [1:1] -wasResetPid = bits, U32, 1148, [2:2] -mustResetPid = bits, U32, 1148, [3:3] -isCoasting = bits, U32, 1148, [4:4] -useIacTableForCoasting = bits, U32, 1148, [5:5] -notIdling = bits, U32, 1148, [6:6] -needReset = bits, U32, 1148, [7:7] -isInDeadZone = bits, U32, 1148, [8:8] -isBlipping = bits, U32, 1148, [9:9] -useClosedLoop = bits, U32, 1148, [10:10] -badTps = bits, U32, 1148, [11:11] -looksLikeRunning = bits, U32, 1148, [12:12] -looksLikeCoasting = bits, U32, 1148, [13:13] -looksLikeCrankToIdle = bits, U32, 1148, [14:14] -useInstantRpmForIdle = bits, U32, 1148, [15:15] -isVerboseIAC = bits, U32, 1148, [16:16] -unusedBit_22_17 = bits, U32, 1148, [17:17] -unusedBit_22_18 = bits, U32, 1148, [18:18] -unusedBit_22_19 = bits, U32, 1148, [19:19] -unusedBit_22_20 = bits, U32, 1148, [20:20] -unusedBit_22_21 = bits, U32, 1148, [21:21] -unusedBit_22_22 = bits, U32, 1148, [22:22] -unusedBit_22_23 = bits, U32, 1148, [23:23] -unusedBit_22_24 = bits, U32, 1148, [24:24] -unusedBit_22_25 = bits, U32, 1148, [25:25] -unusedBit_22_26 = bits, U32, 1148, [26:26] -unusedBit_22_27 = bits, U32, 1148, [27:27] -unusedBit_22_28 = bits, U32, 1148, [28:28] -unusedBit_22_29 = bits, U32, 1148, [29:29] -unusedBit_22_30 = bits, U32, 1148, [30:30] -unusedBit_22_31 = bits, U32, 1148, [31:31] -targetRpmByClt = scalar, S32, 1152, "", 1, 0 -targetRpmAcBump = scalar, S32, 1156, "", 1, 0 -iacByRpmTaper = scalar, F32, 1160 -luaAdd = scalar, F32, 1164 -; total TS size = 1168 -baseDwell = scalar, F32, 1168, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 1172, "", 1, 0 -luaTimingAdd = scalar, F32, 1176, "", 1, 0 -luaTimingMult = scalar, F32, 1180, "", 1, 0 -; total TS size = 1184 -idlePosition = scalar, F32, 1184, "", 1, 0 -trim = scalar, F32, 1188, "", 1, 0 -luaAdjustment = scalar, F32, 1192, "", 1, 0 -etbFeedForward = scalar, F32, 1196 -etbIntegralError = scalar, F32, 1200, "", 1, 0 -etbCurrentTarget = scalar, F32, 1204, "%", 1, 0 -; total TS size = 1208 -faultCode = scalar, U08, 1208, "", 1, 0 -heaterDuty = scalar, U08, 1209, "%", 1, 0 -pumpDuty = scalar, U08, 1210, "%", 1, 0 -tempC = scalar, U16, 1212, "C", 1, 0 -nernstVoltage = scalar, U16, 1214, "V", 0.001, 0 -esr = scalar, U16, 1216, "", 1, 0 -; total TS size = 1220 +m_hasSynchronizedPhase = bits, U32, 1120, [0:0] +unusedBit_1_1 = bits, U32, 1120, [1:1] +unusedBit_1_2 = bits, U32, 1120, [2:2] +unusedBit_1_3 = bits, U32, 1120, [3:3] +unusedBit_1_4 = bits, U32, 1120, [4:4] +unusedBit_1_5 = bits, U32, 1120, [5:5] +unusedBit_1_6 = bits, U32, 1120, [6:6] +unusedBit_1_7 = bits, U32, 1120, [7:7] +unusedBit_1_8 = bits, U32, 1120, [8:8] +unusedBit_1_9 = bits, U32, 1120, [9:9] +unusedBit_1_10 = bits, U32, 1120, [10:10] +unusedBit_1_11 = bits, U32, 1120, [11:11] +unusedBit_1_12 = bits, U32, 1120, [12:12] +unusedBit_1_13 = bits, U32, 1120, [13:13] +unusedBit_1_14 = bits, U32, 1120, [14:14] +unusedBit_1_15 = bits, U32, 1120, [15:15] +unusedBit_1_16 = bits, U32, 1120, [16:16] +unusedBit_1_17 = bits, U32, 1120, [17:17] +unusedBit_1_18 = bits, U32, 1120, [18:18] +unusedBit_1_19 = bits, U32, 1120, [19:19] +unusedBit_1_20 = bits, U32, 1120, [20:20] +unusedBit_1_21 = bits, U32, 1120, [21:21] +unusedBit_1_22 = bits, U32, 1120, [22:22] +unusedBit_1_23 = bits, U32, 1120, [23:23] +unusedBit_1_24 = bits, U32, 1120, [24:24] +unusedBit_1_25 = bits, U32, 1120, [25:25] +unusedBit_1_26 = bits, U32, 1120, [26:26] +unusedBit_1_27 = bits, U32, 1120, [27:27] +unusedBit_1_28 = bits, U32, 1120, [28:28] +unusedBit_1_29 = bits, U32, 1120, [29:29] +unusedBit_1_30 = bits, U32, 1120, [30:30] +unusedBit_1_31 = bits, U32, 1120, [31:31] +; total TS size = 1124 +wallFuelCorrection = scalar, F32, 1124, "", 1, 0 +wallFuel = scalar, F32, 1128, "", 1, 0 +; total TS size = 1132 +idleState = bits, S32, 1132, [0:2], "not important" +currentIdlePosition = scalar, F32, 1136 +baseIdlePosition = scalar, F32, 1140 +iacByTpsTaper = scalar, F32, 1144 +throttlePedalUpState = scalar, S32, 1148, "", 1, 0 +mightResetPid = bits, U32, 1152, [0:0] +shouldResetPid = bits, U32, 1152, [1:1] +wasResetPid = bits, U32, 1152, [2:2] +mustResetPid = bits, U32, 1152, [3:3] +isCoasting = bits, U32, 1152, [4:4] +useIacTableForCoasting = bits, U32, 1152, [5:5] +notIdling = bits, U32, 1152, [6:6] +needReset = bits, U32, 1152, [7:7] +isInDeadZone = bits, U32, 1152, [8:8] +isBlipping = bits, U32, 1152, [9:9] +useClosedLoop = bits, U32, 1152, [10:10] +badTps = bits, U32, 1152, [11:11] +looksLikeRunning = bits, U32, 1152, [12:12] +looksLikeCoasting = bits, U32, 1152, [13:13] +looksLikeCrankToIdle = bits, U32, 1152, [14:14] +useInstantRpmForIdle = bits, U32, 1152, [15:15] +isVerboseIAC = bits, U32, 1152, [16:16] +unusedBit_22_17 = bits, U32, 1152, [17:17] +unusedBit_22_18 = bits, U32, 1152, [18:18] +unusedBit_22_19 = bits, U32, 1152, [19:19] +unusedBit_22_20 = bits, U32, 1152, [20:20] +unusedBit_22_21 = bits, U32, 1152, [21:21] +unusedBit_22_22 = bits, U32, 1152, [22:22] +unusedBit_22_23 = bits, U32, 1152, [23:23] +unusedBit_22_24 = bits, U32, 1152, [24:24] +unusedBit_22_25 = bits, U32, 1152, [25:25] +unusedBit_22_26 = bits, U32, 1152, [26:26] +unusedBit_22_27 = bits, U32, 1152, [27:27] +unusedBit_22_28 = bits, U32, 1152, [28:28] +unusedBit_22_29 = bits, U32, 1152, [29:29] +unusedBit_22_30 = bits, U32, 1152, [30:30] +unusedBit_22_31 = bits, U32, 1152, [31:31] +targetRpmByClt = scalar, S32, 1156, "", 1, 0 +targetRpmAcBump = scalar, S32, 1160, "", 1, 0 +iacByRpmTaper = scalar, F32, 1164 +luaAdd = scalar, F32, 1168 +; total TS size = 1172 +baseDwell = scalar, F32, 1172, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 1176, "", 1, 0 +luaTimingAdd = scalar, F32, 1180, "", 1, 0 +luaTimingMult = scalar, F32, 1184, "", 1, 0 +; total TS size = 1188 +idlePosition = scalar, F32, 1188, "", 1, 0 +trim = scalar, F32, 1192, "", 1, 0 +luaAdjustment = scalar, F32, 1196, "", 1, 0 +etbFeedForward = scalar, F32, 1200 +etbIntegralError = scalar, F32, 1204, "", 1, 0 +etbCurrentTarget = scalar, F32, 1208, "%", 1, 0 +; total TS size = 1212 +faultCode = scalar, U08, 1212, "", 1, 0 +heaterDuty = scalar, U08, 1213, "%", 1, 0 +pumpDuty = scalar, U08, 1214, "%", 1, 0 +tempC = scalar, U16, 1216, "C", 1, 0 +nernstVoltage = scalar, U16, 1218, "V", 0.001, 0 +esr = scalar, U16, 1220, "", 1, 0 +; total TS size = 1224 time = { timeNow } @@ -4721,7 +4754,6 @@ entry = hellenBoardId, "Detected Board ID", int, "%d" entry = clutchUpState, "clutch: up", int, "%d" entry = clutchDownState, "clutch: down", int, "%d" entry = brakePedalState, "brake: down", int, "%d" -entry = isSynchronizedPhase, "isSynchronizedPhase", int, "%d" entry = egt1, "egt1", float, "%.3f" entry = egt2, "egt2", float, "%.3f" entry = desiredRpmLimit, "User-defined RPM hard limit", int, "%d" @@ -4762,6 +4794,7 @@ entry = triggerStateIndex, "triggerStateIndex", int, "%d" entry = vvtCounter, "vvtCounter", int, "%d" entry = camResyncCounter, "camResyncCounter", int, "%d" entry = vvtStateIndex, "vvtStateIndex", int, "%d" +entry = m_hasSynchronizedPhase, "m_hasSynchronizedPhase", int, "%d" entry = wallFuelCorrection, "fuel injection time correction to account for wall wetting effect for current cycle", float, "%.3f" entry = wallFuel, "Amount of fuel on the wall, in ms of injector open time for each injector.", float, "%.3f" entry = idleState, "idleState", int, "%d" @@ -4966,6 +4999,7 @@ menuDialog = main subMenu = tps_accel_stateDialog, "tps_accel_state" subMenu = trigger_centralDialog, "trigger_central" subMenu = trigger_stateDialog, "trigger_state" + subMenu = trigger_state_primaryDialog, "trigger_state_primary" subMenu = wall_fuel_stateDialog, "wall_fuel_state" subMenu = idle_stateDialog, "idle_state" subMenu = ignition_stateDialog, "ignition_state" @@ -5413,7 +5447,6 @@ indicatorPanel = engine_stateIndicatorPanel, 2 indicator = {clutchUpState}, "clutchUpState No", "clutchUpState Yes" indicator = {clutchDownState}, "clutchDownState No", "clutchDownState Yes" indicator = {brakePedalState}, "brakePedalState No", "brakePedalState Yes" - indicator = {isSynchronizedPhase}, "isSynchronizedPhase No", "isSynchronizedPhase Yes" dialog = engine_stateDialog, "engine_state" panel = engine_stateIndicatorPanel @@ -5522,6 +5555,12 @@ dialog = trigger_stateDialog, "trigger_state" liveGraph = trigger_state_3_Graph, "Graph", South graphLine = vvtStateIndex +indicatorPanel = trigger_state_primaryIndicatorPanel, 2 + indicator = {m_hasSynchronizedPhase}, "m_hasSynchronizedPhase No", "m_hasSynchronizedPhase Yes" + +dialog = trigger_state_primaryDialog, "trigger_state_primary" + panel = trigger_state_primaryIndicatorPanel + dialog = wall_fuel_stateDialog, "wall_fuel_state" liveGraph = wall_fuel_state_1_Graph, "Graph", South diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f4.ini b/firmware/tunerstudio/generated/rusefi_proteus_f4.ini index a8fc0add42..89a8a556cd 100644 --- a/firmware/tunerstudio/generated/rusefi_proteus_f4.ini +++ b/firmware/tunerstudio/generated/rusefi_proteus_f4.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.08.24.proteus_f4.3500853361" + signature = "rusEFI 2022.08.24.proteus_f4.3620146280" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.08.24.proteus_f4.3500853361" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.08.24.proteus_f4.3620146280" ; 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 Wed Aug 24 16:15:50 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Aug 24 22:15:28 UTC 2022 pageSize = 21300 page = 1 @@ -2109,7 +2109,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1220 + ochBlockSize = 1224 ; ; see TunerStudioOutputChannels struct @@ -2990,35 +2990,35 @@ hellenBoardId = scalar, S16, 990, "id", 1, 0 clutchUpState = bits, U32, 992, [0:0] clutchDownState = bits, U32, 992, [1:1] brakePedalState = bits, U32, 992, [2:2] -isSynchronizedPhase = bits, U32, 992, [3:3] -unusedBit_23_4 = bits, U32, 992, [4:4] -unusedBit_23_5 = bits, U32, 992, [5:5] -unusedBit_23_6 = bits, U32, 992, [6:6] -unusedBit_23_7 = bits, U32, 992, [7:7] -unusedBit_23_8 = bits, U32, 992, [8:8] -unusedBit_23_9 = bits, U32, 992, [9:9] -unusedBit_23_10 = bits, U32, 992, [10:10] -unusedBit_23_11 = bits, U32, 992, [11:11] -unusedBit_23_12 = bits, U32, 992, [12:12] -unusedBit_23_13 = bits, U32, 992, [13:13] -unusedBit_23_14 = bits, U32, 992, [14:14] -unusedBit_23_15 = bits, U32, 992, [15:15] -unusedBit_23_16 = bits, U32, 992, [16:16] -unusedBit_23_17 = bits, U32, 992, [17:17] -unusedBit_23_18 = bits, U32, 992, [18:18] -unusedBit_23_19 = bits, U32, 992, [19:19] -unusedBit_23_20 = bits, U32, 992, [20:20] -unusedBit_23_21 = bits, U32, 992, [21:21] -unusedBit_23_22 = bits, U32, 992, [22:22] -unusedBit_23_23 = bits, U32, 992, [23:23] -unusedBit_23_24 = bits, U32, 992, [24:24] -unusedBit_23_25 = bits, U32, 992, [25:25] -unusedBit_23_26 = bits, U32, 992, [26:26] -unusedBit_23_27 = bits, U32, 992, [27:27] -unusedBit_23_28 = bits, U32, 992, [28:28] -unusedBit_23_29 = bits, U32, 992, [29:29] -unusedBit_23_30 = bits, U32, 992, [30:30] -unusedBit_23_31 = bits, U32, 992, [31:31] +unusedBit_22_3 = bits, U32, 992, [3:3] +unusedBit_22_4 = bits, U32, 992, [4:4] +unusedBit_22_5 = bits, U32, 992, [5:5] +unusedBit_22_6 = bits, U32, 992, [6:6] +unusedBit_22_7 = bits, U32, 992, [7:7] +unusedBit_22_8 = bits, U32, 992, [8:8] +unusedBit_22_9 = bits, U32, 992, [9:9] +unusedBit_22_10 = bits, U32, 992, [10:10] +unusedBit_22_11 = bits, U32, 992, [11:11] +unusedBit_22_12 = bits, U32, 992, [12:12] +unusedBit_22_13 = bits, U32, 992, [13:13] +unusedBit_22_14 = bits, U32, 992, [14:14] +unusedBit_22_15 = bits, U32, 992, [15:15] +unusedBit_22_16 = bits, U32, 992, [16:16] +unusedBit_22_17 = bits, U32, 992, [17:17] +unusedBit_22_18 = bits, U32, 992, [18:18] +unusedBit_22_19 = bits, U32, 992, [19:19] +unusedBit_22_20 = bits, U32, 992, [20:20] +unusedBit_22_21 = bits, U32, 992, [21:21] +unusedBit_22_22 = bits, U32, 992, [22:22] +unusedBit_22_23 = bits, U32, 992, [23:23] +unusedBit_22_24 = bits, U32, 992, [24:24] +unusedBit_22_25 = bits, U32, 992, [25:25] +unusedBit_22_26 = bits, U32, 992, [26:26] +unusedBit_22_27 = bits, U32, 992, [27:27] +unusedBit_22_28 = bits, U32, 992, [28:28] +unusedBit_22_29 = bits, U32, 992, [29:29] +unusedBit_22_30 = bits, U32, 992, [30:30] +unusedBit_22_31 = bits, U32, 992, [31:31] egt1 = scalar, F32, 996, "", 1, 0 egt2 = scalar, F32, 1000, "", 1, 0 desiredRpmLimit = scalar, S16, 1004, "rpm", 1, 0 @@ -3089,70 +3089,103 @@ vvtCounter = scalar, U08, 1117, "", 1, 0 camResyncCounter = scalar, U08, 1118, "", 1, 0 vvtStateIndex = scalar, U08, 1119, "", 1, 0 ; total TS size = 1120 -wallFuelCorrection = scalar, F32, 1120, "", 1, 0 -wallFuel = scalar, F32, 1124, "", 1, 0 -; total TS size = 1128 -idleState = bits, S32, 1128, [0:2], "not important" -currentIdlePosition = scalar, F32, 1132 -baseIdlePosition = scalar, F32, 1136 -iacByTpsTaper = scalar, F32, 1140 -throttlePedalUpState = scalar, S32, 1144, "", 1, 0 -mightResetPid = bits, U32, 1148, [0:0] -shouldResetPid = bits, U32, 1148, [1:1] -wasResetPid = bits, U32, 1148, [2:2] -mustResetPid = bits, U32, 1148, [3:3] -isCoasting = bits, U32, 1148, [4:4] -useIacTableForCoasting = bits, U32, 1148, [5:5] -notIdling = bits, U32, 1148, [6:6] -needReset = bits, U32, 1148, [7:7] -isInDeadZone = bits, U32, 1148, [8:8] -isBlipping = bits, U32, 1148, [9:9] -useClosedLoop = bits, U32, 1148, [10:10] -badTps = bits, U32, 1148, [11:11] -looksLikeRunning = bits, U32, 1148, [12:12] -looksLikeCoasting = bits, U32, 1148, [13:13] -looksLikeCrankToIdle = bits, U32, 1148, [14:14] -useInstantRpmForIdle = bits, U32, 1148, [15:15] -isVerboseIAC = bits, U32, 1148, [16:16] -unusedBit_22_17 = bits, U32, 1148, [17:17] -unusedBit_22_18 = bits, U32, 1148, [18:18] -unusedBit_22_19 = bits, U32, 1148, [19:19] -unusedBit_22_20 = bits, U32, 1148, [20:20] -unusedBit_22_21 = bits, U32, 1148, [21:21] -unusedBit_22_22 = bits, U32, 1148, [22:22] -unusedBit_22_23 = bits, U32, 1148, [23:23] -unusedBit_22_24 = bits, U32, 1148, [24:24] -unusedBit_22_25 = bits, U32, 1148, [25:25] -unusedBit_22_26 = bits, U32, 1148, [26:26] -unusedBit_22_27 = bits, U32, 1148, [27:27] -unusedBit_22_28 = bits, U32, 1148, [28:28] -unusedBit_22_29 = bits, U32, 1148, [29:29] -unusedBit_22_30 = bits, U32, 1148, [30:30] -unusedBit_22_31 = bits, U32, 1148, [31:31] -targetRpmByClt = scalar, S32, 1152, "", 1, 0 -targetRpmAcBump = scalar, S32, 1156, "", 1, 0 -iacByRpmTaper = scalar, F32, 1160 -luaAdd = scalar, F32, 1164 -; total TS size = 1168 -baseDwell = scalar, F32, 1168, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 1172, "", 1, 0 -luaTimingAdd = scalar, F32, 1176, "", 1, 0 -luaTimingMult = scalar, F32, 1180, "", 1, 0 -; total TS size = 1184 -idlePosition = scalar, F32, 1184, "", 1, 0 -trim = scalar, F32, 1188, "", 1, 0 -luaAdjustment = scalar, F32, 1192, "", 1, 0 -etbFeedForward = scalar, F32, 1196 -etbIntegralError = scalar, F32, 1200, "", 1, 0 -etbCurrentTarget = scalar, F32, 1204, "%", 1, 0 -; total TS size = 1208 -faultCode = scalar, U08, 1208, "", 1, 0 -heaterDuty = scalar, U08, 1209, "%", 1, 0 -pumpDuty = scalar, U08, 1210, "%", 1, 0 -tempC = scalar, U16, 1212, "C", 1, 0 -nernstVoltage = scalar, U16, 1214, "V", 0.001, 0 -esr = scalar, U16, 1216, "", 1, 0 -; total TS size = 1220 +m_hasSynchronizedPhase = bits, U32, 1120, [0:0] +unusedBit_1_1 = bits, U32, 1120, [1:1] +unusedBit_1_2 = bits, U32, 1120, [2:2] +unusedBit_1_3 = bits, U32, 1120, [3:3] +unusedBit_1_4 = bits, U32, 1120, [4:4] +unusedBit_1_5 = bits, U32, 1120, [5:5] +unusedBit_1_6 = bits, U32, 1120, [6:6] +unusedBit_1_7 = bits, U32, 1120, [7:7] +unusedBit_1_8 = bits, U32, 1120, [8:8] +unusedBit_1_9 = bits, U32, 1120, [9:9] +unusedBit_1_10 = bits, U32, 1120, [10:10] +unusedBit_1_11 = bits, U32, 1120, [11:11] +unusedBit_1_12 = bits, U32, 1120, [12:12] +unusedBit_1_13 = bits, U32, 1120, [13:13] +unusedBit_1_14 = bits, U32, 1120, [14:14] +unusedBit_1_15 = bits, U32, 1120, [15:15] +unusedBit_1_16 = bits, U32, 1120, [16:16] +unusedBit_1_17 = bits, U32, 1120, [17:17] +unusedBit_1_18 = bits, U32, 1120, [18:18] +unusedBit_1_19 = bits, U32, 1120, [19:19] +unusedBit_1_20 = bits, U32, 1120, [20:20] +unusedBit_1_21 = bits, U32, 1120, [21:21] +unusedBit_1_22 = bits, U32, 1120, [22:22] +unusedBit_1_23 = bits, U32, 1120, [23:23] +unusedBit_1_24 = bits, U32, 1120, [24:24] +unusedBit_1_25 = bits, U32, 1120, [25:25] +unusedBit_1_26 = bits, U32, 1120, [26:26] +unusedBit_1_27 = bits, U32, 1120, [27:27] +unusedBit_1_28 = bits, U32, 1120, [28:28] +unusedBit_1_29 = bits, U32, 1120, [29:29] +unusedBit_1_30 = bits, U32, 1120, [30:30] +unusedBit_1_31 = bits, U32, 1120, [31:31] +; total TS size = 1124 +wallFuelCorrection = scalar, F32, 1124, "", 1, 0 +wallFuel = scalar, F32, 1128, "", 1, 0 +; total TS size = 1132 +idleState = bits, S32, 1132, [0:2], "not important" +currentIdlePosition = scalar, F32, 1136 +baseIdlePosition = scalar, F32, 1140 +iacByTpsTaper = scalar, F32, 1144 +throttlePedalUpState = scalar, S32, 1148, "", 1, 0 +mightResetPid = bits, U32, 1152, [0:0] +shouldResetPid = bits, U32, 1152, [1:1] +wasResetPid = bits, U32, 1152, [2:2] +mustResetPid = bits, U32, 1152, [3:3] +isCoasting = bits, U32, 1152, [4:4] +useIacTableForCoasting = bits, U32, 1152, [5:5] +notIdling = bits, U32, 1152, [6:6] +needReset = bits, U32, 1152, [7:7] +isInDeadZone = bits, U32, 1152, [8:8] +isBlipping = bits, U32, 1152, [9:9] +useClosedLoop = bits, U32, 1152, [10:10] +badTps = bits, U32, 1152, [11:11] +looksLikeRunning = bits, U32, 1152, [12:12] +looksLikeCoasting = bits, U32, 1152, [13:13] +looksLikeCrankToIdle = bits, U32, 1152, [14:14] +useInstantRpmForIdle = bits, U32, 1152, [15:15] +isVerboseIAC = bits, U32, 1152, [16:16] +unusedBit_22_17 = bits, U32, 1152, [17:17] +unusedBit_22_18 = bits, U32, 1152, [18:18] +unusedBit_22_19 = bits, U32, 1152, [19:19] +unusedBit_22_20 = bits, U32, 1152, [20:20] +unusedBit_22_21 = bits, U32, 1152, [21:21] +unusedBit_22_22 = bits, U32, 1152, [22:22] +unusedBit_22_23 = bits, U32, 1152, [23:23] +unusedBit_22_24 = bits, U32, 1152, [24:24] +unusedBit_22_25 = bits, U32, 1152, [25:25] +unusedBit_22_26 = bits, U32, 1152, [26:26] +unusedBit_22_27 = bits, U32, 1152, [27:27] +unusedBit_22_28 = bits, U32, 1152, [28:28] +unusedBit_22_29 = bits, U32, 1152, [29:29] +unusedBit_22_30 = bits, U32, 1152, [30:30] +unusedBit_22_31 = bits, U32, 1152, [31:31] +targetRpmByClt = scalar, S32, 1156, "", 1, 0 +targetRpmAcBump = scalar, S32, 1160, "", 1, 0 +iacByRpmTaper = scalar, F32, 1164 +luaAdd = scalar, F32, 1168 +; total TS size = 1172 +baseDwell = scalar, F32, 1172, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 1176, "", 1, 0 +luaTimingAdd = scalar, F32, 1180, "", 1, 0 +luaTimingMult = scalar, F32, 1184, "", 1, 0 +; total TS size = 1188 +idlePosition = scalar, F32, 1188, "", 1, 0 +trim = scalar, F32, 1192, "", 1, 0 +luaAdjustment = scalar, F32, 1196, "", 1, 0 +etbFeedForward = scalar, F32, 1200 +etbIntegralError = scalar, F32, 1204, "", 1, 0 +etbCurrentTarget = scalar, F32, 1208, "%", 1, 0 +; total TS size = 1212 +faultCode = scalar, U08, 1212, "", 1, 0 +heaterDuty = scalar, U08, 1213, "%", 1, 0 +pumpDuty = scalar, U08, 1214, "%", 1, 0 +tempC = scalar, U16, 1216, "C", 1, 0 +nernstVoltage = scalar, U16, 1218, "V", 0.001, 0 +esr = scalar, U16, 1220, "", 1, 0 +; total TS size = 1224 time = { timeNow } @@ -4721,7 +4754,6 @@ entry = hellenBoardId, "Detected Board ID", int, "%d" entry = clutchUpState, "clutch: up", int, "%d" entry = clutchDownState, "clutch: down", int, "%d" entry = brakePedalState, "brake: down", int, "%d" -entry = isSynchronizedPhase, "isSynchronizedPhase", int, "%d" entry = egt1, "egt1", float, "%.3f" entry = egt2, "egt2", float, "%.3f" entry = desiredRpmLimit, "User-defined RPM hard limit", int, "%d" @@ -4762,6 +4794,7 @@ entry = triggerStateIndex, "triggerStateIndex", int, "%d" entry = vvtCounter, "vvtCounter", int, "%d" entry = camResyncCounter, "camResyncCounter", int, "%d" entry = vvtStateIndex, "vvtStateIndex", int, "%d" +entry = m_hasSynchronizedPhase, "m_hasSynchronizedPhase", int, "%d" entry = wallFuelCorrection, "fuel injection time correction to account for wall wetting effect for current cycle", float, "%.3f" entry = wallFuel, "Amount of fuel on the wall, in ms of injector open time for each injector.", float, "%.3f" entry = idleState, "idleState", int, "%d" @@ -4966,6 +4999,7 @@ menuDialog = main subMenu = tps_accel_stateDialog, "tps_accel_state" subMenu = trigger_centralDialog, "trigger_central" subMenu = trigger_stateDialog, "trigger_state" + subMenu = trigger_state_primaryDialog, "trigger_state_primary" subMenu = wall_fuel_stateDialog, "wall_fuel_state" subMenu = idle_stateDialog, "idle_state" subMenu = ignition_stateDialog, "ignition_state" @@ -5411,7 +5445,6 @@ indicatorPanel = engine_stateIndicatorPanel, 2 indicator = {clutchUpState}, "clutchUpState No", "clutchUpState Yes" indicator = {clutchDownState}, "clutchDownState No", "clutchDownState Yes" indicator = {brakePedalState}, "brakePedalState No", "brakePedalState Yes" - indicator = {isSynchronizedPhase}, "isSynchronizedPhase No", "isSynchronizedPhase Yes" dialog = engine_stateDialog, "engine_state" panel = engine_stateIndicatorPanel @@ -5520,6 +5553,12 @@ dialog = trigger_stateDialog, "trigger_state" liveGraph = trigger_state_3_Graph, "Graph", South graphLine = vvtStateIndex +indicatorPanel = trigger_state_primaryIndicatorPanel, 2 + indicator = {m_hasSynchronizedPhase}, "m_hasSynchronizedPhase No", "m_hasSynchronizedPhase Yes" + +dialog = trigger_state_primaryDialog, "trigger_state_primary" + panel = trigger_state_primaryIndicatorPanel + dialog = wall_fuel_stateDialog, "wall_fuel_state" liveGraph = wall_fuel_state_1_Graph, "Graph", South diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f7.ini b/firmware/tunerstudio/generated/rusefi_proteus_f7.ini index bc7448e2dc..6b7885a43c 100644 --- a/firmware/tunerstudio/generated/rusefi_proteus_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_proteus_f7.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.08.24.proteus_f7.3500853361" + signature = "rusEFI 2022.08.24.proteus_f7.3620146280" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.08.24.proteus_f7.3500853361" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.08.24.proteus_f7.3620146280" ; 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 Wed Aug 24 16:15:49 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Aug 24 22:15:26 UTC 2022 pageSize = 21300 page = 1 @@ -2109,7 +2109,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1220 + ochBlockSize = 1224 ; ; see TunerStudioOutputChannels struct @@ -2990,35 +2990,35 @@ hellenBoardId = scalar, S16, 990, "id", 1, 0 clutchUpState = bits, U32, 992, [0:0] clutchDownState = bits, U32, 992, [1:1] brakePedalState = bits, U32, 992, [2:2] -isSynchronizedPhase = bits, U32, 992, [3:3] -unusedBit_23_4 = bits, U32, 992, [4:4] -unusedBit_23_5 = bits, U32, 992, [5:5] -unusedBit_23_6 = bits, U32, 992, [6:6] -unusedBit_23_7 = bits, U32, 992, [7:7] -unusedBit_23_8 = bits, U32, 992, [8:8] -unusedBit_23_9 = bits, U32, 992, [9:9] -unusedBit_23_10 = bits, U32, 992, [10:10] -unusedBit_23_11 = bits, U32, 992, [11:11] -unusedBit_23_12 = bits, U32, 992, [12:12] -unusedBit_23_13 = bits, U32, 992, [13:13] -unusedBit_23_14 = bits, U32, 992, [14:14] -unusedBit_23_15 = bits, U32, 992, [15:15] -unusedBit_23_16 = bits, U32, 992, [16:16] -unusedBit_23_17 = bits, U32, 992, [17:17] -unusedBit_23_18 = bits, U32, 992, [18:18] -unusedBit_23_19 = bits, U32, 992, [19:19] -unusedBit_23_20 = bits, U32, 992, [20:20] -unusedBit_23_21 = bits, U32, 992, [21:21] -unusedBit_23_22 = bits, U32, 992, [22:22] -unusedBit_23_23 = bits, U32, 992, [23:23] -unusedBit_23_24 = bits, U32, 992, [24:24] -unusedBit_23_25 = bits, U32, 992, [25:25] -unusedBit_23_26 = bits, U32, 992, [26:26] -unusedBit_23_27 = bits, U32, 992, [27:27] -unusedBit_23_28 = bits, U32, 992, [28:28] -unusedBit_23_29 = bits, U32, 992, [29:29] -unusedBit_23_30 = bits, U32, 992, [30:30] -unusedBit_23_31 = bits, U32, 992, [31:31] +unusedBit_22_3 = bits, U32, 992, [3:3] +unusedBit_22_4 = bits, U32, 992, [4:4] +unusedBit_22_5 = bits, U32, 992, [5:5] +unusedBit_22_6 = bits, U32, 992, [6:6] +unusedBit_22_7 = bits, U32, 992, [7:7] +unusedBit_22_8 = bits, U32, 992, [8:8] +unusedBit_22_9 = bits, U32, 992, [9:9] +unusedBit_22_10 = bits, U32, 992, [10:10] +unusedBit_22_11 = bits, U32, 992, [11:11] +unusedBit_22_12 = bits, U32, 992, [12:12] +unusedBit_22_13 = bits, U32, 992, [13:13] +unusedBit_22_14 = bits, U32, 992, [14:14] +unusedBit_22_15 = bits, U32, 992, [15:15] +unusedBit_22_16 = bits, U32, 992, [16:16] +unusedBit_22_17 = bits, U32, 992, [17:17] +unusedBit_22_18 = bits, U32, 992, [18:18] +unusedBit_22_19 = bits, U32, 992, [19:19] +unusedBit_22_20 = bits, U32, 992, [20:20] +unusedBit_22_21 = bits, U32, 992, [21:21] +unusedBit_22_22 = bits, U32, 992, [22:22] +unusedBit_22_23 = bits, U32, 992, [23:23] +unusedBit_22_24 = bits, U32, 992, [24:24] +unusedBit_22_25 = bits, U32, 992, [25:25] +unusedBit_22_26 = bits, U32, 992, [26:26] +unusedBit_22_27 = bits, U32, 992, [27:27] +unusedBit_22_28 = bits, U32, 992, [28:28] +unusedBit_22_29 = bits, U32, 992, [29:29] +unusedBit_22_30 = bits, U32, 992, [30:30] +unusedBit_22_31 = bits, U32, 992, [31:31] egt1 = scalar, F32, 996, "", 1, 0 egt2 = scalar, F32, 1000, "", 1, 0 desiredRpmLimit = scalar, S16, 1004, "rpm", 1, 0 @@ -3089,70 +3089,103 @@ vvtCounter = scalar, U08, 1117, "", 1, 0 camResyncCounter = scalar, U08, 1118, "", 1, 0 vvtStateIndex = scalar, U08, 1119, "", 1, 0 ; total TS size = 1120 -wallFuelCorrection = scalar, F32, 1120, "", 1, 0 -wallFuel = scalar, F32, 1124, "", 1, 0 -; total TS size = 1128 -idleState = bits, S32, 1128, [0:2], "not important" -currentIdlePosition = scalar, F32, 1132 -baseIdlePosition = scalar, F32, 1136 -iacByTpsTaper = scalar, F32, 1140 -throttlePedalUpState = scalar, S32, 1144, "", 1, 0 -mightResetPid = bits, U32, 1148, [0:0] -shouldResetPid = bits, U32, 1148, [1:1] -wasResetPid = bits, U32, 1148, [2:2] -mustResetPid = bits, U32, 1148, [3:3] -isCoasting = bits, U32, 1148, [4:4] -useIacTableForCoasting = bits, U32, 1148, [5:5] -notIdling = bits, U32, 1148, [6:6] -needReset = bits, U32, 1148, [7:7] -isInDeadZone = bits, U32, 1148, [8:8] -isBlipping = bits, U32, 1148, [9:9] -useClosedLoop = bits, U32, 1148, [10:10] -badTps = bits, U32, 1148, [11:11] -looksLikeRunning = bits, U32, 1148, [12:12] -looksLikeCoasting = bits, U32, 1148, [13:13] -looksLikeCrankToIdle = bits, U32, 1148, [14:14] -useInstantRpmForIdle = bits, U32, 1148, [15:15] -isVerboseIAC = bits, U32, 1148, [16:16] -unusedBit_22_17 = bits, U32, 1148, [17:17] -unusedBit_22_18 = bits, U32, 1148, [18:18] -unusedBit_22_19 = bits, U32, 1148, [19:19] -unusedBit_22_20 = bits, U32, 1148, [20:20] -unusedBit_22_21 = bits, U32, 1148, [21:21] -unusedBit_22_22 = bits, U32, 1148, [22:22] -unusedBit_22_23 = bits, U32, 1148, [23:23] -unusedBit_22_24 = bits, U32, 1148, [24:24] -unusedBit_22_25 = bits, U32, 1148, [25:25] -unusedBit_22_26 = bits, U32, 1148, [26:26] -unusedBit_22_27 = bits, U32, 1148, [27:27] -unusedBit_22_28 = bits, U32, 1148, [28:28] -unusedBit_22_29 = bits, U32, 1148, [29:29] -unusedBit_22_30 = bits, U32, 1148, [30:30] -unusedBit_22_31 = bits, U32, 1148, [31:31] -targetRpmByClt = scalar, S32, 1152, "", 1, 0 -targetRpmAcBump = scalar, S32, 1156, "", 1, 0 -iacByRpmTaper = scalar, F32, 1160 -luaAdd = scalar, F32, 1164 -; total TS size = 1168 -baseDwell = scalar, F32, 1168, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 1172, "", 1, 0 -luaTimingAdd = scalar, F32, 1176, "", 1, 0 -luaTimingMult = scalar, F32, 1180, "", 1, 0 -; total TS size = 1184 -idlePosition = scalar, F32, 1184, "", 1, 0 -trim = scalar, F32, 1188, "", 1, 0 -luaAdjustment = scalar, F32, 1192, "", 1, 0 -etbFeedForward = scalar, F32, 1196 -etbIntegralError = scalar, F32, 1200, "", 1, 0 -etbCurrentTarget = scalar, F32, 1204, "%", 1, 0 -; total TS size = 1208 -faultCode = scalar, U08, 1208, "", 1, 0 -heaterDuty = scalar, U08, 1209, "%", 1, 0 -pumpDuty = scalar, U08, 1210, "%", 1, 0 -tempC = scalar, U16, 1212, "C", 1, 0 -nernstVoltage = scalar, U16, 1214, "V", 0.001, 0 -esr = scalar, U16, 1216, "", 1, 0 -; total TS size = 1220 +m_hasSynchronizedPhase = bits, U32, 1120, [0:0] +unusedBit_1_1 = bits, U32, 1120, [1:1] +unusedBit_1_2 = bits, U32, 1120, [2:2] +unusedBit_1_3 = bits, U32, 1120, [3:3] +unusedBit_1_4 = bits, U32, 1120, [4:4] +unusedBit_1_5 = bits, U32, 1120, [5:5] +unusedBit_1_6 = bits, U32, 1120, [6:6] +unusedBit_1_7 = bits, U32, 1120, [7:7] +unusedBit_1_8 = bits, U32, 1120, [8:8] +unusedBit_1_9 = bits, U32, 1120, [9:9] +unusedBit_1_10 = bits, U32, 1120, [10:10] +unusedBit_1_11 = bits, U32, 1120, [11:11] +unusedBit_1_12 = bits, U32, 1120, [12:12] +unusedBit_1_13 = bits, U32, 1120, [13:13] +unusedBit_1_14 = bits, U32, 1120, [14:14] +unusedBit_1_15 = bits, U32, 1120, [15:15] +unusedBit_1_16 = bits, U32, 1120, [16:16] +unusedBit_1_17 = bits, U32, 1120, [17:17] +unusedBit_1_18 = bits, U32, 1120, [18:18] +unusedBit_1_19 = bits, U32, 1120, [19:19] +unusedBit_1_20 = bits, U32, 1120, [20:20] +unusedBit_1_21 = bits, U32, 1120, [21:21] +unusedBit_1_22 = bits, U32, 1120, [22:22] +unusedBit_1_23 = bits, U32, 1120, [23:23] +unusedBit_1_24 = bits, U32, 1120, [24:24] +unusedBit_1_25 = bits, U32, 1120, [25:25] +unusedBit_1_26 = bits, U32, 1120, [26:26] +unusedBit_1_27 = bits, U32, 1120, [27:27] +unusedBit_1_28 = bits, U32, 1120, [28:28] +unusedBit_1_29 = bits, U32, 1120, [29:29] +unusedBit_1_30 = bits, U32, 1120, [30:30] +unusedBit_1_31 = bits, U32, 1120, [31:31] +; total TS size = 1124 +wallFuelCorrection = scalar, F32, 1124, "", 1, 0 +wallFuel = scalar, F32, 1128, "", 1, 0 +; total TS size = 1132 +idleState = bits, S32, 1132, [0:2], "not important" +currentIdlePosition = scalar, F32, 1136 +baseIdlePosition = scalar, F32, 1140 +iacByTpsTaper = scalar, F32, 1144 +throttlePedalUpState = scalar, S32, 1148, "", 1, 0 +mightResetPid = bits, U32, 1152, [0:0] +shouldResetPid = bits, U32, 1152, [1:1] +wasResetPid = bits, U32, 1152, [2:2] +mustResetPid = bits, U32, 1152, [3:3] +isCoasting = bits, U32, 1152, [4:4] +useIacTableForCoasting = bits, U32, 1152, [5:5] +notIdling = bits, U32, 1152, [6:6] +needReset = bits, U32, 1152, [7:7] +isInDeadZone = bits, U32, 1152, [8:8] +isBlipping = bits, U32, 1152, [9:9] +useClosedLoop = bits, U32, 1152, [10:10] +badTps = bits, U32, 1152, [11:11] +looksLikeRunning = bits, U32, 1152, [12:12] +looksLikeCoasting = bits, U32, 1152, [13:13] +looksLikeCrankToIdle = bits, U32, 1152, [14:14] +useInstantRpmForIdle = bits, U32, 1152, [15:15] +isVerboseIAC = bits, U32, 1152, [16:16] +unusedBit_22_17 = bits, U32, 1152, [17:17] +unusedBit_22_18 = bits, U32, 1152, [18:18] +unusedBit_22_19 = bits, U32, 1152, [19:19] +unusedBit_22_20 = bits, U32, 1152, [20:20] +unusedBit_22_21 = bits, U32, 1152, [21:21] +unusedBit_22_22 = bits, U32, 1152, [22:22] +unusedBit_22_23 = bits, U32, 1152, [23:23] +unusedBit_22_24 = bits, U32, 1152, [24:24] +unusedBit_22_25 = bits, U32, 1152, [25:25] +unusedBit_22_26 = bits, U32, 1152, [26:26] +unusedBit_22_27 = bits, U32, 1152, [27:27] +unusedBit_22_28 = bits, U32, 1152, [28:28] +unusedBit_22_29 = bits, U32, 1152, [29:29] +unusedBit_22_30 = bits, U32, 1152, [30:30] +unusedBit_22_31 = bits, U32, 1152, [31:31] +targetRpmByClt = scalar, S32, 1156, "", 1, 0 +targetRpmAcBump = scalar, S32, 1160, "", 1, 0 +iacByRpmTaper = scalar, F32, 1164 +luaAdd = scalar, F32, 1168 +; total TS size = 1172 +baseDwell = scalar, F32, 1172, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 1176, "", 1, 0 +luaTimingAdd = scalar, F32, 1180, "", 1, 0 +luaTimingMult = scalar, F32, 1184, "", 1, 0 +; total TS size = 1188 +idlePosition = scalar, F32, 1188, "", 1, 0 +trim = scalar, F32, 1192, "", 1, 0 +luaAdjustment = scalar, F32, 1196, "", 1, 0 +etbFeedForward = scalar, F32, 1200 +etbIntegralError = scalar, F32, 1204, "", 1, 0 +etbCurrentTarget = scalar, F32, 1208, "%", 1, 0 +; total TS size = 1212 +faultCode = scalar, U08, 1212, "", 1, 0 +heaterDuty = scalar, U08, 1213, "%", 1, 0 +pumpDuty = scalar, U08, 1214, "%", 1, 0 +tempC = scalar, U16, 1216, "C", 1, 0 +nernstVoltage = scalar, U16, 1218, "V", 0.001, 0 +esr = scalar, U16, 1220, "", 1, 0 +; total TS size = 1224 time = { timeNow } @@ -4721,7 +4754,6 @@ entry = hellenBoardId, "Detected Board ID", int, "%d" entry = clutchUpState, "clutch: up", int, "%d" entry = clutchDownState, "clutch: down", int, "%d" entry = brakePedalState, "brake: down", int, "%d" -entry = isSynchronizedPhase, "isSynchronizedPhase", int, "%d" entry = egt1, "egt1", float, "%.3f" entry = egt2, "egt2", float, "%.3f" entry = desiredRpmLimit, "User-defined RPM hard limit", int, "%d" @@ -4762,6 +4794,7 @@ entry = triggerStateIndex, "triggerStateIndex", int, "%d" entry = vvtCounter, "vvtCounter", int, "%d" entry = camResyncCounter, "camResyncCounter", int, "%d" entry = vvtStateIndex, "vvtStateIndex", int, "%d" +entry = m_hasSynchronizedPhase, "m_hasSynchronizedPhase", int, "%d" entry = wallFuelCorrection, "fuel injection time correction to account for wall wetting effect for current cycle", float, "%.3f" entry = wallFuel, "Amount of fuel on the wall, in ms of injector open time for each injector.", float, "%.3f" entry = idleState, "idleState", int, "%d" @@ -4966,6 +4999,7 @@ menuDialog = main subMenu = tps_accel_stateDialog, "tps_accel_state" subMenu = trigger_centralDialog, "trigger_central" subMenu = trigger_stateDialog, "trigger_state" + subMenu = trigger_state_primaryDialog, "trigger_state_primary" subMenu = wall_fuel_stateDialog, "wall_fuel_state" subMenu = idle_stateDialog, "idle_state" subMenu = ignition_stateDialog, "ignition_state" @@ -5411,7 +5445,6 @@ indicatorPanel = engine_stateIndicatorPanel, 2 indicator = {clutchUpState}, "clutchUpState No", "clutchUpState Yes" indicator = {clutchDownState}, "clutchDownState No", "clutchDownState Yes" indicator = {brakePedalState}, "brakePedalState No", "brakePedalState Yes" - indicator = {isSynchronizedPhase}, "isSynchronizedPhase No", "isSynchronizedPhase Yes" dialog = engine_stateDialog, "engine_state" panel = engine_stateIndicatorPanel @@ -5520,6 +5553,12 @@ dialog = trigger_stateDialog, "trigger_state" liveGraph = trigger_state_3_Graph, "Graph", South graphLine = vvtStateIndex +indicatorPanel = trigger_state_primaryIndicatorPanel, 2 + indicator = {m_hasSynchronizedPhase}, "m_hasSynchronizedPhase No", "m_hasSynchronizedPhase Yes" + +dialog = trigger_state_primaryDialog, "trigger_state_primary" + panel = trigger_state_primaryIndicatorPanel + dialog = wall_fuel_stateDialog, "wall_fuel_state" liveGraph = wall_fuel_state_1_Graph, "Graph", South diff --git a/firmware/tunerstudio/generated/rusefi_proteus_h7.ini b/firmware/tunerstudio/generated/rusefi_proteus_h7.ini index 612d668d4a..92fd7f5c60 100644 --- a/firmware/tunerstudio/generated/rusefi_proteus_h7.ini +++ b/firmware/tunerstudio/generated/rusefi_proteus_h7.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.08.24.proteus_h7.3500853361" + signature = "rusEFI 2022.08.24.proteus_h7.3620146280" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.08.24.proteus_h7.3500853361" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.08.24.proteus_h7.3620146280" ; 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 Wed Aug 24 16:15:52 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Aug 24 22:15:29 UTC 2022 pageSize = 21300 page = 1 @@ -2109,7 +2109,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1220 + ochBlockSize = 1224 ; ; see TunerStudioOutputChannels struct @@ -2990,35 +2990,35 @@ hellenBoardId = scalar, S16, 990, "id", 1, 0 clutchUpState = bits, U32, 992, [0:0] clutchDownState = bits, U32, 992, [1:1] brakePedalState = bits, U32, 992, [2:2] -isSynchronizedPhase = bits, U32, 992, [3:3] -unusedBit_23_4 = bits, U32, 992, [4:4] -unusedBit_23_5 = bits, U32, 992, [5:5] -unusedBit_23_6 = bits, U32, 992, [6:6] -unusedBit_23_7 = bits, U32, 992, [7:7] -unusedBit_23_8 = bits, U32, 992, [8:8] -unusedBit_23_9 = bits, U32, 992, [9:9] -unusedBit_23_10 = bits, U32, 992, [10:10] -unusedBit_23_11 = bits, U32, 992, [11:11] -unusedBit_23_12 = bits, U32, 992, [12:12] -unusedBit_23_13 = bits, U32, 992, [13:13] -unusedBit_23_14 = bits, U32, 992, [14:14] -unusedBit_23_15 = bits, U32, 992, [15:15] -unusedBit_23_16 = bits, U32, 992, [16:16] -unusedBit_23_17 = bits, U32, 992, [17:17] -unusedBit_23_18 = bits, U32, 992, [18:18] -unusedBit_23_19 = bits, U32, 992, [19:19] -unusedBit_23_20 = bits, U32, 992, [20:20] -unusedBit_23_21 = bits, U32, 992, [21:21] -unusedBit_23_22 = bits, U32, 992, [22:22] -unusedBit_23_23 = bits, U32, 992, [23:23] -unusedBit_23_24 = bits, U32, 992, [24:24] -unusedBit_23_25 = bits, U32, 992, [25:25] -unusedBit_23_26 = bits, U32, 992, [26:26] -unusedBit_23_27 = bits, U32, 992, [27:27] -unusedBit_23_28 = bits, U32, 992, [28:28] -unusedBit_23_29 = bits, U32, 992, [29:29] -unusedBit_23_30 = bits, U32, 992, [30:30] -unusedBit_23_31 = bits, U32, 992, [31:31] +unusedBit_22_3 = bits, U32, 992, [3:3] +unusedBit_22_4 = bits, U32, 992, [4:4] +unusedBit_22_5 = bits, U32, 992, [5:5] +unusedBit_22_6 = bits, U32, 992, [6:6] +unusedBit_22_7 = bits, U32, 992, [7:7] +unusedBit_22_8 = bits, U32, 992, [8:8] +unusedBit_22_9 = bits, U32, 992, [9:9] +unusedBit_22_10 = bits, U32, 992, [10:10] +unusedBit_22_11 = bits, U32, 992, [11:11] +unusedBit_22_12 = bits, U32, 992, [12:12] +unusedBit_22_13 = bits, U32, 992, [13:13] +unusedBit_22_14 = bits, U32, 992, [14:14] +unusedBit_22_15 = bits, U32, 992, [15:15] +unusedBit_22_16 = bits, U32, 992, [16:16] +unusedBit_22_17 = bits, U32, 992, [17:17] +unusedBit_22_18 = bits, U32, 992, [18:18] +unusedBit_22_19 = bits, U32, 992, [19:19] +unusedBit_22_20 = bits, U32, 992, [20:20] +unusedBit_22_21 = bits, U32, 992, [21:21] +unusedBit_22_22 = bits, U32, 992, [22:22] +unusedBit_22_23 = bits, U32, 992, [23:23] +unusedBit_22_24 = bits, U32, 992, [24:24] +unusedBit_22_25 = bits, U32, 992, [25:25] +unusedBit_22_26 = bits, U32, 992, [26:26] +unusedBit_22_27 = bits, U32, 992, [27:27] +unusedBit_22_28 = bits, U32, 992, [28:28] +unusedBit_22_29 = bits, U32, 992, [29:29] +unusedBit_22_30 = bits, U32, 992, [30:30] +unusedBit_22_31 = bits, U32, 992, [31:31] egt1 = scalar, F32, 996, "", 1, 0 egt2 = scalar, F32, 1000, "", 1, 0 desiredRpmLimit = scalar, S16, 1004, "rpm", 1, 0 @@ -3089,70 +3089,103 @@ vvtCounter = scalar, U08, 1117, "", 1, 0 camResyncCounter = scalar, U08, 1118, "", 1, 0 vvtStateIndex = scalar, U08, 1119, "", 1, 0 ; total TS size = 1120 -wallFuelCorrection = scalar, F32, 1120, "", 1, 0 -wallFuel = scalar, F32, 1124, "", 1, 0 -; total TS size = 1128 -idleState = bits, S32, 1128, [0:2], "not important" -currentIdlePosition = scalar, F32, 1132 -baseIdlePosition = scalar, F32, 1136 -iacByTpsTaper = scalar, F32, 1140 -throttlePedalUpState = scalar, S32, 1144, "", 1, 0 -mightResetPid = bits, U32, 1148, [0:0] -shouldResetPid = bits, U32, 1148, [1:1] -wasResetPid = bits, U32, 1148, [2:2] -mustResetPid = bits, U32, 1148, [3:3] -isCoasting = bits, U32, 1148, [4:4] -useIacTableForCoasting = bits, U32, 1148, [5:5] -notIdling = bits, U32, 1148, [6:6] -needReset = bits, U32, 1148, [7:7] -isInDeadZone = bits, U32, 1148, [8:8] -isBlipping = bits, U32, 1148, [9:9] -useClosedLoop = bits, U32, 1148, [10:10] -badTps = bits, U32, 1148, [11:11] -looksLikeRunning = bits, U32, 1148, [12:12] -looksLikeCoasting = bits, U32, 1148, [13:13] -looksLikeCrankToIdle = bits, U32, 1148, [14:14] -useInstantRpmForIdle = bits, U32, 1148, [15:15] -isVerboseIAC = bits, U32, 1148, [16:16] -unusedBit_22_17 = bits, U32, 1148, [17:17] -unusedBit_22_18 = bits, U32, 1148, [18:18] -unusedBit_22_19 = bits, U32, 1148, [19:19] -unusedBit_22_20 = bits, U32, 1148, [20:20] -unusedBit_22_21 = bits, U32, 1148, [21:21] -unusedBit_22_22 = bits, U32, 1148, [22:22] -unusedBit_22_23 = bits, U32, 1148, [23:23] -unusedBit_22_24 = bits, U32, 1148, [24:24] -unusedBit_22_25 = bits, U32, 1148, [25:25] -unusedBit_22_26 = bits, U32, 1148, [26:26] -unusedBit_22_27 = bits, U32, 1148, [27:27] -unusedBit_22_28 = bits, U32, 1148, [28:28] -unusedBit_22_29 = bits, U32, 1148, [29:29] -unusedBit_22_30 = bits, U32, 1148, [30:30] -unusedBit_22_31 = bits, U32, 1148, [31:31] -targetRpmByClt = scalar, S32, 1152, "", 1, 0 -targetRpmAcBump = scalar, S32, 1156, "", 1, 0 -iacByRpmTaper = scalar, F32, 1160 -luaAdd = scalar, F32, 1164 -; total TS size = 1168 -baseDwell = scalar, F32, 1168, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 1172, "", 1, 0 -luaTimingAdd = scalar, F32, 1176, "", 1, 0 -luaTimingMult = scalar, F32, 1180, "", 1, 0 -; total TS size = 1184 -idlePosition = scalar, F32, 1184, "", 1, 0 -trim = scalar, F32, 1188, "", 1, 0 -luaAdjustment = scalar, F32, 1192, "", 1, 0 -etbFeedForward = scalar, F32, 1196 -etbIntegralError = scalar, F32, 1200, "", 1, 0 -etbCurrentTarget = scalar, F32, 1204, "%", 1, 0 -; total TS size = 1208 -faultCode = scalar, U08, 1208, "", 1, 0 -heaterDuty = scalar, U08, 1209, "%", 1, 0 -pumpDuty = scalar, U08, 1210, "%", 1, 0 -tempC = scalar, U16, 1212, "C", 1, 0 -nernstVoltage = scalar, U16, 1214, "V", 0.001, 0 -esr = scalar, U16, 1216, "", 1, 0 -; total TS size = 1220 +m_hasSynchronizedPhase = bits, U32, 1120, [0:0] +unusedBit_1_1 = bits, U32, 1120, [1:1] +unusedBit_1_2 = bits, U32, 1120, [2:2] +unusedBit_1_3 = bits, U32, 1120, [3:3] +unusedBit_1_4 = bits, U32, 1120, [4:4] +unusedBit_1_5 = bits, U32, 1120, [5:5] +unusedBit_1_6 = bits, U32, 1120, [6:6] +unusedBit_1_7 = bits, U32, 1120, [7:7] +unusedBit_1_8 = bits, U32, 1120, [8:8] +unusedBit_1_9 = bits, U32, 1120, [9:9] +unusedBit_1_10 = bits, U32, 1120, [10:10] +unusedBit_1_11 = bits, U32, 1120, [11:11] +unusedBit_1_12 = bits, U32, 1120, [12:12] +unusedBit_1_13 = bits, U32, 1120, [13:13] +unusedBit_1_14 = bits, U32, 1120, [14:14] +unusedBit_1_15 = bits, U32, 1120, [15:15] +unusedBit_1_16 = bits, U32, 1120, [16:16] +unusedBit_1_17 = bits, U32, 1120, [17:17] +unusedBit_1_18 = bits, U32, 1120, [18:18] +unusedBit_1_19 = bits, U32, 1120, [19:19] +unusedBit_1_20 = bits, U32, 1120, [20:20] +unusedBit_1_21 = bits, U32, 1120, [21:21] +unusedBit_1_22 = bits, U32, 1120, [22:22] +unusedBit_1_23 = bits, U32, 1120, [23:23] +unusedBit_1_24 = bits, U32, 1120, [24:24] +unusedBit_1_25 = bits, U32, 1120, [25:25] +unusedBit_1_26 = bits, U32, 1120, [26:26] +unusedBit_1_27 = bits, U32, 1120, [27:27] +unusedBit_1_28 = bits, U32, 1120, [28:28] +unusedBit_1_29 = bits, U32, 1120, [29:29] +unusedBit_1_30 = bits, U32, 1120, [30:30] +unusedBit_1_31 = bits, U32, 1120, [31:31] +; total TS size = 1124 +wallFuelCorrection = scalar, F32, 1124, "", 1, 0 +wallFuel = scalar, F32, 1128, "", 1, 0 +; total TS size = 1132 +idleState = bits, S32, 1132, [0:2], "not important" +currentIdlePosition = scalar, F32, 1136 +baseIdlePosition = scalar, F32, 1140 +iacByTpsTaper = scalar, F32, 1144 +throttlePedalUpState = scalar, S32, 1148, "", 1, 0 +mightResetPid = bits, U32, 1152, [0:0] +shouldResetPid = bits, U32, 1152, [1:1] +wasResetPid = bits, U32, 1152, [2:2] +mustResetPid = bits, U32, 1152, [3:3] +isCoasting = bits, U32, 1152, [4:4] +useIacTableForCoasting = bits, U32, 1152, [5:5] +notIdling = bits, U32, 1152, [6:6] +needReset = bits, U32, 1152, [7:7] +isInDeadZone = bits, U32, 1152, [8:8] +isBlipping = bits, U32, 1152, [9:9] +useClosedLoop = bits, U32, 1152, [10:10] +badTps = bits, U32, 1152, [11:11] +looksLikeRunning = bits, U32, 1152, [12:12] +looksLikeCoasting = bits, U32, 1152, [13:13] +looksLikeCrankToIdle = bits, U32, 1152, [14:14] +useInstantRpmForIdle = bits, U32, 1152, [15:15] +isVerboseIAC = bits, U32, 1152, [16:16] +unusedBit_22_17 = bits, U32, 1152, [17:17] +unusedBit_22_18 = bits, U32, 1152, [18:18] +unusedBit_22_19 = bits, U32, 1152, [19:19] +unusedBit_22_20 = bits, U32, 1152, [20:20] +unusedBit_22_21 = bits, U32, 1152, [21:21] +unusedBit_22_22 = bits, U32, 1152, [22:22] +unusedBit_22_23 = bits, U32, 1152, [23:23] +unusedBit_22_24 = bits, U32, 1152, [24:24] +unusedBit_22_25 = bits, U32, 1152, [25:25] +unusedBit_22_26 = bits, U32, 1152, [26:26] +unusedBit_22_27 = bits, U32, 1152, [27:27] +unusedBit_22_28 = bits, U32, 1152, [28:28] +unusedBit_22_29 = bits, U32, 1152, [29:29] +unusedBit_22_30 = bits, U32, 1152, [30:30] +unusedBit_22_31 = bits, U32, 1152, [31:31] +targetRpmByClt = scalar, S32, 1156, "", 1, 0 +targetRpmAcBump = scalar, S32, 1160, "", 1, 0 +iacByRpmTaper = scalar, F32, 1164 +luaAdd = scalar, F32, 1168 +; total TS size = 1172 +baseDwell = scalar, F32, 1172, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 1176, "", 1, 0 +luaTimingAdd = scalar, F32, 1180, "", 1, 0 +luaTimingMult = scalar, F32, 1184, "", 1, 0 +; total TS size = 1188 +idlePosition = scalar, F32, 1188, "", 1, 0 +trim = scalar, F32, 1192, "", 1, 0 +luaAdjustment = scalar, F32, 1196, "", 1, 0 +etbFeedForward = scalar, F32, 1200 +etbIntegralError = scalar, F32, 1204, "", 1, 0 +etbCurrentTarget = scalar, F32, 1208, "%", 1, 0 +; total TS size = 1212 +faultCode = scalar, U08, 1212, "", 1, 0 +heaterDuty = scalar, U08, 1213, "%", 1, 0 +pumpDuty = scalar, U08, 1214, "%", 1, 0 +tempC = scalar, U16, 1216, "C", 1, 0 +nernstVoltage = scalar, U16, 1218, "V", 0.001, 0 +esr = scalar, U16, 1220, "", 1, 0 +; total TS size = 1224 time = { timeNow } @@ -4721,7 +4754,6 @@ entry = hellenBoardId, "Detected Board ID", int, "%d" entry = clutchUpState, "clutch: up", int, "%d" entry = clutchDownState, "clutch: down", int, "%d" entry = brakePedalState, "brake: down", int, "%d" -entry = isSynchronizedPhase, "isSynchronizedPhase", int, "%d" entry = egt1, "egt1", float, "%.3f" entry = egt2, "egt2", float, "%.3f" entry = desiredRpmLimit, "User-defined RPM hard limit", int, "%d" @@ -4762,6 +4794,7 @@ entry = triggerStateIndex, "triggerStateIndex", int, "%d" entry = vvtCounter, "vvtCounter", int, "%d" entry = camResyncCounter, "camResyncCounter", int, "%d" entry = vvtStateIndex, "vvtStateIndex", int, "%d" +entry = m_hasSynchronizedPhase, "m_hasSynchronizedPhase", int, "%d" entry = wallFuelCorrection, "fuel injection time correction to account for wall wetting effect for current cycle", float, "%.3f" entry = wallFuel, "Amount of fuel on the wall, in ms of injector open time for each injector.", float, "%.3f" entry = idleState, "idleState", int, "%d" @@ -4966,6 +4999,7 @@ menuDialog = main subMenu = tps_accel_stateDialog, "tps_accel_state" subMenu = trigger_centralDialog, "trigger_central" subMenu = trigger_stateDialog, "trigger_state" + subMenu = trigger_state_primaryDialog, "trigger_state_primary" subMenu = wall_fuel_stateDialog, "wall_fuel_state" subMenu = idle_stateDialog, "idle_state" subMenu = ignition_stateDialog, "ignition_state" @@ -5411,7 +5445,6 @@ indicatorPanel = engine_stateIndicatorPanel, 2 indicator = {clutchUpState}, "clutchUpState No", "clutchUpState Yes" indicator = {clutchDownState}, "clutchDownState No", "clutchDownState Yes" indicator = {brakePedalState}, "brakePedalState No", "brakePedalState Yes" - indicator = {isSynchronizedPhase}, "isSynchronizedPhase No", "isSynchronizedPhase Yes" dialog = engine_stateDialog, "engine_state" panel = engine_stateIndicatorPanel @@ -5520,6 +5553,12 @@ dialog = trigger_stateDialog, "trigger_state" liveGraph = trigger_state_3_Graph, "Graph", South graphLine = vvtStateIndex +indicatorPanel = trigger_state_primaryIndicatorPanel, 2 + indicator = {m_hasSynchronizedPhase}, "m_hasSynchronizedPhase No", "m_hasSynchronizedPhase Yes" + +dialog = trigger_state_primaryDialog, "trigger_state_primary" + panel = trigger_state_primaryIndicatorPanel + dialog = wall_fuel_stateDialog, "wall_fuel_state" liveGraph = wall_fuel_state_1_Graph, "Graph", South diff --git a/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini b/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini index 8a0c7dfca1..4efcf792e9 100644 --- a/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.08.24.subaru_eg33_f7.995801279" + signature = "rusEFI 2022.08.24.subaru_eg33_f7.1010269350" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.08.24.subaru_eg33_f7.995801279" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.08.24.subaru_eg33_f7.1010269350" ; 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 Wed Aug 24 16:15:12 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 Wed Aug 24 22:14:51 UTC 2022 pageSize = 21300 page = 1 @@ -2109,7 +2109,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1220 + ochBlockSize = 1224 ; ; see TunerStudioOutputChannels struct @@ -2990,35 +2990,35 @@ hellenBoardId = scalar, S16, 990, "id", 1, 0 clutchUpState = bits, U32, 992, [0:0] clutchDownState = bits, U32, 992, [1:1] brakePedalState = bits, U32, 992, [2:2] -isSynchronizedPhase = bits, U32, 992, [3:3] -unusedBit_23_4 = bits, U32, 992, [4:4] -unusedBit_23_5 = bits, U32, 992, [5:5] -unusedBit_23_6 = bits, U32, 992, [6:6] -unusedBit_23_7 = bits, U32, 992, [7:7] -unusedBit_23_8 = bits, U32, 992, [8:8] -unusedBit_23_9 = bits, U32, 992, [9:9] -unusedBit_23_10 = bits, U32, 992, [10:10] -unusedBit_23_11 = bits, U32, 992, [11:11] -unusedBit_23_12 = bits, U32, 992, [12:12] -unusedBit_23_13 = bits, U32, 992, [13:13] -unusedBit_23_14 = bits, U32, 992, [14:14] -unusedBit_23_15 = bits, U32, 992, [15:15] -unusedBit_23_16 = bits, U32, 992, [16:16] -unusedBit_23_17 = bits, U32, 992, [17:17] -unusedBit_23_18 = bits, U32, 992, [18:18] -unusedBit_23_19 = bits, U32, 992, [19:19] -unusedBit_23_20 = bits, U32, 992, [20:20] -unusedBit_23_21 = bits, U32, 992, [21:21] -unusedBit_23_22 = bits, U32, 992, [22:22] -unusedBit_23_23 = bits, U32, 992, [23:23] -unusedBit_23_24 = bits, U32, 992, [24:24] -unusedBit_23_25 = bits, U32, 992, [25:25] -unusedBit_23_26 = bits, U32, 992, [26:26] -unusedBit_23_27 = bits, U32, 992, [27:27] -unusedBit_23_28 = bits, U32, 992, [28:28] -unusedBit_23_29 = bits, U32, 992, [29:29] -unusedBit_23_30 = bits, U32, 992, [30:30] -unusedBit_23_31 = bits, U32, 992, [31:31] +unusedBit_22_3 = bits, U32, 992, [3:3] +unusedBit_22_4 = bits, U32, 992, [4:4] +unusedBit_22_5 = bits, U32, 992, [5:5] +unusedBit_22_6 = bits, U32, 992, [6:6] +unusedBit_22_7 = bits, U32, 992, [7:7] +unusedBit_22_8 = bits, U32, 992, [8:8] +unusedBit_22_9 = bits, U32, 992, [9:9] +unusedBit_22_10 = bits, U32, 992, [10:10] +unusedBit_22_11 = bits, U32, 992, [11:11] +unusedBit_22_12 = bits, U32, 992, [12:12] +unusedBit_22_13 = bits, U32, 992, [13:13] +unusedBit_22_14 = bits, U32, 992, [14:14] +unusedBit_22_15 = bits, U32, 992, [15:15] +unusedBit_22_16 = bits, U32, 992, [16:16] +unusedBit_22_17 = bits, U32, 992, [17:17] +unusedBit_22_18 = bits, U32, 992, [18:18] +unusedBit_22_19 = bits, U32, 992, [19:19] +unusedBit_22_20 = bits, U32, 992, [20:20] +unusedBit_22_21 = bits, U32, 992, [21:21] +unusedBit_22_22 = bits, U32, 992, [22:22] +unusedBit_22_23 = bits, U32, 992, [23:23] +unusedBit_22_24 = bits, U32, 992, [24:24] +unusedBit_22_25 = bits, U32, 992, [25:25] +unusedBit_22_26 = bits, U32, 992, [26:26] +unusedBit_22_27 = bits, U32, 992, [27:27] +unusedBit_22_28 = bits, U32, 992, [28:28] +unusedBit_22_29 = bits, U32, 992, [29:29] +unusedBit_22_30 = bits, U32, 992, [30:30] +unusedBit_22_31 = bits, U32, 992, [31:31] egt1 = scalar, F32, 996, "", 1, 0 egt2 = scalar, F32, 1000, "", 1, 0 desiredRpmLimit = scalar, S16, 1004, "rpm", 1, 0 @@ -3089,70 +3089,103 @@ vvtCounter = scalar, U08, 1117, "", 1, 0 camResyncCounter = scalar, U08, 1118, "", 1, 0 vvtStateIndex = scalar, U08, 1119, "", 1, 0 ; total TS size = 1120 -wallFuelCorrection = scalar, F32, 1120, "", 1, 0 -wallFuel = scalar, F32, 1124, "", 1, 0 -; total TS size = 1128 -idleState = bits, S32, 1128, [0:2], "not important" -currentIdlePosition = scalar, F32, 1132 -baseIdlePosition = scalar, F32, 1136 -iacByTpsTaper = scalar, F32, 1140 -throttlePedalUpState = scalar, S32, 1144, "", 1, 0 -mightResetPid = bits, U32, 1148, [0:0] -shouldResetPid = bits, U32, 1148, [1:1] -wasResetPid = bits, U32, 1148, [2:2] -mustResetPid = bits, U32, 1148, [3:3] -isCoasting = bits, U32, 1148, [4:4] -useIacTableForCoasting = bits, U32, 1148, [5:5] -notIdling = bits, U32, 1148, [6:6] -needReset = bits, U32, 1148, [7:7] -isInDeadZone = bits, U32, 1148, [8:8] -isBlipping = bits, U32, 1148, [9:9] -useClosedLoop = bits, U32, 1148, [10:10] -badTps = bits, U32, 1148, [11:11] -looksLikeRunning = bits, U32, 1148, [12:12] -looksLikeCoasting = bits, U32, 1148, [13:13] -looksLikeCrankToIdle = bits, U32, 1148, [14:14] -useInstantRpmForIdle = bits, U32, 1148, [15:15] -isVerboseIAC = bits, U32, 1148, [16:16] -unusedBit_22_17 = bits, U32, 1148, [17:17] -unusedBit_22_18 = bits, U32, 1148, [18:18] -unusedBit_22_19 = bits, U32, 1148, [19:19] -unusedBit_22_20 = bits, U32, 1148, [20:20] -unusedBit_22_21 = bits, U32, 1148, [21:21] -unusedBit_22_22 = bits, U32, 1148, [22:22] -unusedBit_22_23 = bits, U32, 1148, [23:23] -unusedBit_22_24 = bits, U32, 1148, [24:24] -unusedBit_22_25 = bits, U32, 1148, [25:25] -unusedBit_22_26 = bits, U32, 1148, [26:26] -unusedBit_22_27 = bits, U32, 1148, [27:27] -unusedBit_22_28 = bits, U32, 1148, [28:28] -unusedBit_22_29 = bits, U32, 1148, [29:29] -unusedBit_22_30 = bits, U32, 1148, [30:30] -unusedBit_22_31 = bits, U32, 1148, [31:31] -targetRpmByClt = scalar, S32, 1152, "", 1, 0 -targetRpmAcBump = scalar, S32, 1156, "", 1, 0 -iacByRpmTaper = scalar, F32, 1160 -luaAdd = scalar, F32, 1164 -; total TS size = 1168 -baseDwell = scalar, F32, 1168, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 1172, "", 1, 0 -luaTimingAdd = scalar, F32, 1176, "", 1, 0 -luaTimingMult = scalar, F32, 1180, "", 1, 0 -; total TS size = 1184 -idlePosition = scalar, F32, 1184, "", 1, 0 -trim = scalar, F32, 1188, "", 1, 0 -luaAdjustment = scalar, F32, 1192, "", 1, 0 -etbFeedForward = scalar, F32, 1196 -etbIntegralError = scalar, F32, 1200, "", 1, 0 -etbCurrentTarget = scalar, F32, 1204, "%", 1, 0 -; total TS size = 1208 -faultCode = scalar, U08, 1208, "", 1, 0 -heaterDuty = scalar, U08, 1209, "%", 1, 0 -pumpDuty = scalar, U08, 1210, "%", 1, 0 -tempC = scalar, U16, 1212, "C", 1, 0 -nernstVoltage = scalar, U16, 1214, "V", 0.001, 0 -esr = scalar, U16, 1216, "", 1, 0 -; total TS size = 1220 +m_hasSynchronizedPhase = bits, U32, 1120, [0:0] +unusedBit_1_1 = bits, U32, 1120, [1:1] +unusedBit_1_2 = bits, U32, 1120, [2:2] +unusedBit_1_3 = bits, U32, 1120, [3:3] +unusedBit_1_4 = bits, U32, 1120, [4:4] +unusedBit_1_5 = bits, U32, 1120, [5:5] +unusedBit_1_6 = bits, U32, 1120, [6:6] +unusedBit_1_7 = bits, U32, 1120, [7:7] +unusedBit_1_8 = bits, U32, 1120, [8:8] +unusedBit_1_9 = bits, U32, 1120, [9:9] +unusedBit_1_10 = bits, U32, 1120, [10:10] +unusedBit_1_11 = bits, U32, 1120, [11:11] +unusedBit_1_12 = bits, U32, 1120, [12:12] +unusedBit_1_13 = bits, U32, 1120, [13:13] +unusedBit_1_14 = bits, U32, 1120, [14:14] +unusedBit_1_15 = bits, U32, 1120, [15:15] +unusedBit_1_16 = bits, U32, 1120, [16:16] +unusedBit_1_17 = bits, U32, 1120, [17:17] +unusedBit_1_18 = bits, U32, 1120, [18:18] +unusedBit_1_19 = bits, U32, 1120, [19:19] +unusedBit_1_20 = bits, U32, 1120, [20:20] +unusedBit_1_21 = bits, U32, 1120, [21:21] +unusedBit_1_22 = bits, U32, 1120, [22:22] +unusedBit_1_23 = bits, U32, 1120, [23:23] +unusedBit_1_24 = bits, U32, 1120, [24:24] +unusedBit_1_25 = bits, U32, 1120, [25:25] +unusedBit_1_26 = bits, U32, 1120, [26:26] +unusedBit_1_27 = bits, U32, 1120, [27:27] +unusedBit_1_28 = bits, U32, 1120, [28:28] +unusedBit_1_29 = bits, U32, 1120, [29:29] +unusedBit_1_30 = bits, U32, 1120, [30:30] +unusedBit_1_31 = bits, U32, 1120, [31:31] +; total TS size = 1124 +wallFuelCorrection = scalar, F32, 1124, "", 1, 0 +wallFuel = scalar, F32, 1128, "", 1, 0 +; total TS size = 1132 +idleState = bits, S32, 1132, [0:2], "not important" +currentIdlePosition = scalar, F32, 1136 +baseIdlePosition = scalar, F32, 1140 +iacByTpsTaper = scalar, F32, 1144 +throttlePedalUpState = scalar, S32, 1148, "", 1, 0 +mightResetPid = bits, U32, 1152, [0:0] +shouldResetPid = bits, U32, 1152, [1:1] +wasResetPid = bits, U32, 1152, [2:2] +mustResetPid = bits, U32, 1152, [3:3] +isCoasting = bits, U32, 1152, [4:4] +useIacTableForCoasting = bits, U32, 1152, [5:5] +notIdling = bits, U32, 1152, [6:6] +needReset = bits, U32, 1152, [7:7] +isInDeadZone = bits, U32, 1152, [8:8] +isBlipping = bits, U32, 1152, [9:9] +useClosedLoop = bits, U32, 1152, [10:10] +badTps = bits, U32, 1152, [11:11] +looksLikeRunning = bits, U32, 1152, [12:12] +looksLikeCoasting = bits, U32, 1152, [13:13] +looksLikeCrankToIdle = bits, U32, 1152, [14:14] +useInstantRpmForIdle = bits, U32, 1152, [15:15] +isVerboseIAC = bits, U32, 1152, [16:16] +unusedBit_22_17 = bits, U32, 1152, [17:17] +unusedBit_22_18 = bits, U32, 1152, [18:18] +unusedBit_22_19 = bits, U32, 1152, [19:19] +unusedBit_22_20 = bits, U32, 1152, [20:20] +unusedBit_22_21 = bits, U32, 1152, [21:21] +unusedBit_22_22 = bits, U32, 1152, [22:22] +unusedBit_22_23 = bits, U32, 1152, [23:23] +unusedBit_22_24 = bits, U32, 1152, [24:24] +unusedBit_22_25 = bits, U32, 1152, [25:25] +unusedBit_22_26 = bits, U32, 1152, [26:26] +unusedBit_22_27 = bits, U32, 1152, [27:27] +unusedBit_22_28 = bits, U32, 1152, [28:28] +unusedBit_22_29 = bits, U32, 1152, [29:29] +unusedBit_22_30 = bits, U32, 1152, [30:30] +unusedBit_22_31 = bits, U32, 1152, [31:31] +targetRpmByClt = scalar, S32, 1156, "", 1, 0 +targetRpmAcBump = scalar, S32, 1160, "", 1, 0 +iacByRpmTaper = scalar, F32, 1164 +luaAdd = scalar, F32, 1168 +; total TS size = 1172 +baseDwell = scalar, F32, 1172, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 1176, "", 1, 0 +luaTimingAdd = scalar, F32, 1180, "", 1, 0 +luaTimingMult = scalar, F32, 1184, "", 1, 0 +; total TS size = 1188 +idlePosition = scalar, F32, 1188, "", 1, 0 +trim = scalar, F32, 1192, "", 1, 0 +luaAdjustment = scalar, F32, 1196, "", 1, 0 +etbFeedForward = scalar, F32, 1200 +etbIntegralError = scalar, F32, 1204, "", 1, 0 +etbCurrentTarget = scalar, F32, 1208, "%", 1, 0 +; total TS size = 1212 +faultCode = scalar, U08, 1212, "", 1, 0 +heaterDuty = scalar, U08, 1213, "%", 1, 0 +pumpDuty = scalar, U08, 1214, "%", 1, 0 +tempC = scalar, U16, 1216, "C", 1, 0 +nernstVoltage = scalar, U16, 1218, "V", 0.001, 0 +esr = scalar, U16, 1220, "", 1, 0 +; total TS size = 1224 time = { timeNow } @@ -4721,7 +4754,6 @@ entry = hellenBoardId, "Detected Board ID", int, "%d" entry = clutchUpState, "clutch: up", int, "%d" entry = clutchDownState, "clutch: down", int, "%d" entry = brakePedalState, "brake: down", int, "%d" -entry = isSynchronizedPhase, "isSynchronizedPhase", int, "%d" entry = egt1, "egt1", float, "%.3f" entry = egt2, "egt2", float, "%.3f" entry = desiredRpmLimit, "User-defined RPM hard limit", int, "%d" @@ -4762,6 +4794,7 @@ entry = triggerStateIndex, "triggerStateIndex", int, "%d" entry = vvtCounter, "vvtCounter", int, "%d" entry = camResyncCounter, "camResyncCounter", int, "%d" entry = vvtStateIndex, "vvtStateIndex", int, "%d" +entry = m_hasSynchronizedPhase, "m_hasSynchronizedPhase", int, "%d" entry = wallFuelCorrection, "fuel injection time correction to account for wall wetting effect for current cycle", float, "%.3f" entry = wallFuel, "Amount of fuel on the wall, in ms of injector open time for each injector.", float, "%.3f" entry = idleState, "idleState", int, "%d" @@ -4966,6 +4999,7 @@ menuDialog = main subMenu = tps_accel_stateDialog, "tps_accel_state" subMenu = trigger_centralDialog, "trigger_central" subMenu = trigger_stateDialog, "trigger_state" + subMenu = trigger_state_primaryDialog, "trigger_state_primary" subMenu = wall_fuel_stateDialog, "wall_fuel_state" subMenu = idle_stateDialog, "idle_state" subMenu = ignition_stateDialog, "ignition_state" @@ -5414,7 +5448,6 @@ indicatorPanel = engine_stateIndicatorPanel, 2 indicator = {clutchUpState}, "clutchUpState No", "clutchUpState Yes" indicator = {clutchDownState}, "clutchDownState No", "clutchDownState Yes" indicator = {brakePedalState}, "brakePedalState No", "brakePedalState Yes" - indicator = {isSynchronizedPhase}, "isSynchronizedPhase No", "isSynchronizedPhase Yes" dialog = engine_stateDialog, "engine_state" panel = engine_stateIndicatorPanel @@ -5523,6 +5556,12 @@ dialog = trigger_stateDialog, "trigger_state" liveGraph = trigger_state_3_Graph, "Graph", South graphLine = vvtStateIndex +indicatorPanel = trigger_state_primaryIndicatorPanel, 2 + indicator = {m_hasSynchronizedPhase}, "m_hasSynchronizedPhase No", "m_hasSynchronizedPhase Yes" + +dialog = trigger_state_primaryDialog, "trigger_state_primary" + panel = trigger_state_primaryIndicatorPanel + dialog = wall_fuel_stateDialog, "wall_fuel_state" liveGraph = wall_fuel_state_1_Graph, "Graph", South diff --git a/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini b/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini index 5341777342..bad4ff0859 100644 --- a/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini +++ b/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.08.24.tdg-pdm8.3748643155" + signature = "rusEFI 2022.08.24.tdg-pdm8.3624011082" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.08.24.tdg-pdm8.3748643155" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.08.24.tdg-pdm8.3624011082" ; 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 Wed Aug 24 16:15:59 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Aug 24 22:15:36 UTC 2022 pageSize = 21300 page = 1 @@ -2109,7 +2109,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1220 + ochBlockSize = 1224 ; ; see TunerStudioOutputChannels struct @@ -2990,35 +2990,35 @@ hellenBoardId = scalar, S16, 990, "id", 1, 0 clutchUpState = bits, U32, 992, [0:0] clutchDownState = bits, U32, 992, [1:1] brakePedalState = bits, U32, 992, [2:2] -isSynchronizedPhase = bits, U32, 992, [3:3] -unusedBit_23_4 = bits, U32, 992, [4:4] -unusedBit_23_5 = bits, U32, 992, [5:5] -unusedBit_23_6 = bits, U32, 992, [6:6] -unusedBit_23_7 = bits, U32, 992, [7:7] -unusedBit_23_8 = bits, U32, 992, [8:8] -unusedBit_23_9 = bits, U32, 992, [9:9] -unusedBit_23_10 = bits, U32, 992, [10:10] -unusedBit_23_11 = bits, U32, 992, [11:11] -unusedBit_23_12 = bits, U32, 992, [12:12] -unusedBit_23_13 = bits, U32, 992, [13:13] -unusedBit_23_14 = bits, U32, 992, [14:14] -unusedBit_23_15 = bits, U32, 992, [15:15] -unusedBit_23_16 = bits, U32, 992, [16:16] -unusedBit_23_17 = bits, U32, 992, [17:17] -unusedBit_23_18 = bits, U32, 992, [18:18] -unusedBit_23_19 = bits, U32, 992, [19:19] -unusedBit_23_20 = bits, U32, 992, [20:20] -unusedBit_23_21 = bits, U32, 992, [21:21] -unusedBit_23_22 = bits, U32, 992, [22:22] -unusedBit_23_23 = bits, U32, 992, [23:23] -unusedBit_23_24 = bits, U32, 992, [24:24] -unusedBit_23_25 = bits, U32, 992, [25:25] -unusedBit_23_26 = bits, U32, 992, [26:26] -unusedBit_23_27 = bits, U32, 992, [27:27] -unusedBit_23_28 = bits, U32, 992, [28:28] -unusedBit_23_29 = bits, U32, 992, [29:29] -unusedBit_23_30 = bits, U32, 992, [30:30] -unusedBit_23_31 = bits, U32, 992, [31:31] +unusedBit_22_3 = bits, U32, 992, [3:3] +unusedBit_22_4 = bits, U32, 992, [4:4] +unusedBit_22_5 = bits, U32, 992, [5:5] +unusedBit_22_6 = bits, U32, 992, [6:6] +unusedBit_22_7 = bits, U32, 992, [7:7] +unusedBit_22_8 = bits, U32, 992, [8:8] +unusedBit_22_9 = bits, U32, 992, [9:9] +unusedBit_22_10 = bits, U32, 992, [10:10] +unusedBit_22_11 = bits, U32, 992, [11:11] +unusedBit_22_12 = bits, U32, 992, [12:12] +unusedBit_22_13 = bits, U32, 992, [13:13] +unusedBit_22_14 = bits, U32, 992, [14:14] +unusedBit_22_15 = bits, U32, 992, [15:15] +unusedBit_22_16 = bits, U32, 992, [16:16] +unusedBit_22_17 = bits, U32, 992, [17:17] +unusedBit_22_18 = bits, U32, 992, [18:18] +unusedBit_22_19 = bits, U32, 992, [19:19] +unusedBit_22_20 = bits, U32, 992, [20:20] +unusedBit_22_21 = bits, U32, 992, [21:21] +unusedBit_22_22 = bits, U32, 992, [22:22] +unusedBit_22_23 = bits, U32, 992, [23:23] +unusedBit_22_24 = bits, U32, 992, [24:24] +unusedBit_22_25 = bits, U32, 992, [25:25] +unusedBit_22_26 = bits, U32, 992, [26:26] +unusedBit_22_27 = bits, U32, 992, [27:27] +unusedBit_22_28 = bits, U32, 992, [28:28] +unusedBit_22_29 = bits, U32, 992, [29:29] +unusedBit_22_30 = bits, U32, 992, [30:30] +unusedBit_22_31 = bits, U32, 992, [31:31] egt1 = scalar, F32, 996, "", 1, 0 egt2 = scalar, F32, 1000, "", 1, 0 desiredRpmLimit = scalar, S16, 1004, "rpm", 1, 0 @@ -3089,70 +3089,103 @@ vvtCounter = scalar, U08, 1117, "", 1, 0 camResyncCounter = scalar, U08, 1118, "", 1, 0 vvtStateIndex = scalar, U08, 1119, "", 1, 0 ; total TS size = 1120 -wallFuelCorrection = scalar, F32, 1120, "", 1, 0 -wallFuel = scalar, F32, 1124, "", 1, 0 -; total TS size = 1128 -idleState = bits, S32, 1128, [0:2], "not important" -currentIdlePosition = scalar, F32, 1132 -baseIdlePosition = scalar, F32, 1136 -iacByTpsTaper = scalar, F32, 1140 -throttlePedalUpState = scalar, S32, 1144, "", 1, 0 -mightResetPid = bits, U32, 1148, [0:0] -shouldResetPid = bits, U32, 1148, [1:1] -wasResetPid = bits, U32, 1148, [2:2] -mustResetPid = bits, U32, 1148, [3:3] -isCoasting = bits, U32, 1148, [4:4] -useIacTableForCoasting = bits, U32, 1148, [5:5] -notIdling = bits, U32, 1148, [6:6] -needReset = bits, U32, 1148, [7:7] -isInDeadZone = bits, U32, 1148, [8:8] -isBlipping = bits, U32, 1148, [9:9] -useClosedLoop = bits, U32, 1148, [10:10] -badTps = bits, U32, 1148, [11:11] -looksLikeRunning = bits, U32, 1148, [12:12] -looksLikeCoasting = bits, U32, 1148, [13:13] -looksLikeCrankToIdle = bits, U32, 1148, [14:14] -useInstantRpmForIdle = bits, U32, 1148, [15:15] -isVerboseIAC = bits, U32, 1148, [16:16] -unusedBit_22_17 = bits, U32, 1148, [17:17] -unusedBit_22_18 = bits, U32, 1148, [18:18] -unusedBit_22_19 = bits, U32, 1148, [19:19] -unusedBit_22_20 = bits, U32, 1148, [20:20] -unusedBit_22_21 = bits, U32, 1148, [21:21] -unusedBit_22_22 = bits, U32, 1148, [22:22] -unusedBit_22_23 = bits, U32, 1148, [23:23] -unusedBit_22_24 = bits, U32, 1148, [24:24] -unusedBit_22_25 = bits, U32, 1148, [25:25] -unusedBit_22_26 = bits, U32, 1148, [26:26] -unusedBit_22_27 = bits, U32, 1148, [27:27] -unusedBit_22_28 = bits, U32, 1148, [28:28] -unusedBit_22_29 = bits, U32, 1148, [29:29] -unusedBit_22_30 = bits, U32, 1148, [30:30] -unusedBit_22_31 = bits, U32, 1148, [31:31] -targetRpmByClt = scalar, S32, 1152, "", 1, 0 -targetRpmAcBump = scalar, S32, 1156, "", 1, 0 -iacByRpmTaper = scalar, F32, 1160 -luaAdd = scalar, F32, 1164 -; total TS size = 1168 -baseDwell = scalar, F32, 1168, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 1172, "", 1, 0 -luaTimingAdd = scalar, F32, 1176, "", 1, 0 -luaTimingMult = scalar, F32, 1180, "", 1, 0 -; total TS size = 1184 -idlePosition = scalar, F32, 1184, "", 1, 0 -trim = scalar, F32, 1188, "", 1, 0 -luaAdjustment = scalar, F32, 1192, "", 1, 0 -etbFeedForward = scalar, F32, 1196 -etbIntegralError = scalar, F32, 1200, "", 1, 0 -etbCurrentTarget = scalar, F32, 1204, "%", 1, 0 -; total TS size = 1208 -faultCode = scalar, U08, 1208, "", 1, 0 -heaterDuty = scalar, U08, 1209, "%", 1, 0 -pumpDuty = scalar, U08, 1210, "%", 1, 0 -tempC = scalar, U16, 1212, "C", 1, 0 -nernstVoltage = scalar, U16, 1214, "V", 0.001, 0 -esr = scalar, U16, 1216, "", 1, 0 -; total TS size = 1220 +m_hasSynchronizedPhase = bits, U32, 1120, [0:0] +unusedBit_1_1 = bits, U32, 1120, [1:1] +unusedBit_1_2 = bits, U32, 1120, [2:2] +unusedBit_1_3 = bits, U32, 1120, [3:3] +unusedBit_1_4 = bits, U32, 1120, [4:4] +unusedBit_1_5 = bits, U32, 1120, [5:5] +unusedBit_1_6 = bits, U32, 1120, [6:6] +unusedBit_1_7 = bits, U32, 1120, [7:7] +unusedBit_1_8 = bits, U32, 1120, [8:8] +unusedBit_1_9 = bits, U32, 1120, [9:9] +unusedBit_1_10 = bits, U32, 1120, [10:10] +unusedBit_1_11 = bits, U32, 1120, [11:11] +unusedBit_1_12 = bits, U32, 1120, [12:12] +unusedBit_1_13 = bits, U32, 1120, [13:13] +unusedBit_1_14 = bits, U32, 1120, [14:14] +unusedBit_1_15 = bits, U32, 1120, [15:15] +unusedBit_1_16 = bits, U32, 1120, [16:16] +unusedBit_1_17 = bits, U32, 1120, [17:17] +unusedBit_1_18 = bits, U32, 1120, [18:18] +unusedBit_1_19 = bits, U32, 1120, [19:19] +unusedBit_1_20 = bits, U32, 1120, [20:20] +unusedBit_1_21 = bits, U32, 1120, [21:21] +unusedBit_1_22 = bits, U32, 1120, [22:22] +unusedBit_1_23 = bits, U32, 1120, [23:23] +unusedBit_1_24 = bits, U32, 1120, [24:24] +unusedBit_1_25 = bits, U32, 1120, [25:25] +unusedBit_1_26 = bits, U32, 1120, [26:26] +unusedBit_1_27 = bits, U32, 1120, [27:27] +unusedBit_1_28 = bits, U32, 1120, [28:28] +unusedBit_1_29 = bits, U32, 1120, [29:29] +unusedBit_1_30 = bits, U32, 1120, [30:30] +unusedBit_1_31 = bits, U32, 1120, [31:31] +; total TS size = 1124 +wallFuelCorrection = scalar, F32, 1124, "", 1, 0 +wallFuel = scalar, F32, 1128, "", 1, 0 +; total TS size = 1132 +idleState = bits, S32, 1132, [0:2], "not important" +currentIdlePosition = scalar, F32, 1136 +baseIdlePosition = scalar, F32, 1140 +iacByTpsTaper = scalar, F32, 1144 +throttlePedalUpState = scalar, S32, 1148, "", 1, 0 +mightResetPid = bits, U32, 1152, [0:0] +shouldResetPid = bits, U32, 1152, [1:1] +wasResetPid = bits, U32, 1152, [2:2] +mustResetPid = bits, U32, 1152, [3:3] +isCoasting = bits, U32, 1152, [4:4] +useIacTableForCoasting = bits, U32, 1152, [5:5] +notIdling = bits, U32, 1152, [6:6] +needReset = bits, U32, 1152, [7:7] +isInDeadZone = bits, U32, 1152, [8:8] +isBlipping = bits, U32, 1152, [9:9] +useClosedLoop = bits, U32, 1152, [10:10] +badTps = bits, U32, 1152, [11:11] +looksLikeRunning = bits, U32, 1152, [12:12] +looksLikeCoasting = bits, U32, 1152, [13:13] +looksLikeCrankToIdle = bits, U32, 1152, [14:14] +useInstantRpmForIdle = bits, U32, 1152, [15:15] +isVerboseIAC = bits, U32, 1152, [16:16] +unusedBit_22_17 = bits, U32, 1152, [17:17] +unusedBit_22_18 = bits, U32, 1152, [18:18] +unusedBit_22_19 = bits, U32, 1152, [19:19] +unusedBit_22_20 = bits, U32, 1152, [20:20] +unusedBit_22_21 = bits, U32, 1152, [21:21] +unusedBit_22_22 = bits, U32, 1152, [22:22] +unusedBit_22_23 = bits, U32, 1152, [23:23] +unusedBit_22_24 = bits, U32, 1152, [24:24] +unusedBit_22_25 = bits, U32, 1152, [25:25] +unusedBit_22_26 = bits, U32, 1152, [26:26] +unusedBit_22_27 = bits, U32, 1152, [27:27] +unusedBit_22_28 = bits, U32, 1152, [28:28] +unusedBit_22_29 = bits, U32, 1152, [29:29] +unusedBit_22_30 = bits, U32, 1152, [30:30] +unusedBit_22_31 = bits, U32, 1152, [31:31] +targetRpmByClt = scalar, S32, 1156, "", 1, 0 +targetRpmAcBump = scalar, S32, 1160, "", 1, 0 +iacByRpmTaper = scalar, F32, 1164 +luaAdd = scalar, F32, 1168 +; total TS size = 1172 +baseDwell = scalar, F32, 1172, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 1176, "", 1, 0 +luaTimingAdd = scalar, F32, 1180, "", 1, 0 +luaTimingMult = scalar, F32, 1184, "", 1, 0 +; total TS size = 1188 +idlePosition = scalar, F32, 1188, "", 1, 0 +trim = scalar, F32, 1192, "", 1, 0 +luaAdjustment = scalar, F32, 1196, "", 1, 0 +etbFeedForward = scalar, F32, 1200 +etbIntegralError = scalar, F32, 1204, "", 1, 0 +etbCurrentTarget = scalar, F32, 1208, "%", 1, 0 +; total TS size = 1212 +faultCode = scalar, U08, 1212, "", 1, 0 +heaterDuty = scalar, U08, 1213, "%", 1, 0 +pumpDuty = scalar, U08, 1214, "%", 1, 0 +tempC = scalar, U16, 1216, "C", 1, 0 +nernstVoltage = scalar, U16, 1218, "V", 0.001, 0 +esr = scalar, U16, 1220, "", 1, 0 +; total TS size = 1224 time = { timeNow } @@ -4721,7 +4754,6 @@ entry = hellenBoardId, "Detected Board ID", int, "%d" entry = clutchUpState, "clutch: up", int, "%d" entry = clutchDownState, "clutch: down", int, "%d" entry = brakePedalState, "brake: down", int, "%d" -entry = isSynchronizedPhase, "isSynchronizedPhase", int, "%d" entry = egt1, "egt1", float, "%.3f" entry = egt2, "egt2", float, "%.3f" entry = desiredRpmLimit, "User-defined RPM hard limit", int, "%d" @@ -4762,6 +4794,7 @@ entry = triggerStateIndex, "triggerStateIndex", int, "%d" entry = vvtCounter, "vvtCounter", int, "%d" entry = camResyncCounter, "camResyncCounter", int, "%d" entry = vvtStateIndex, "vvtStateIndex", int, "%d" +entry = m_hasSynchronizedPhase, "m_hasSynchronizedPhase", int, "%d" entry = wallFuelCorrection, "fuel injection time correction to account for wall wetting effect for current cycle", float, "%.3f" entry = wallFuel, "Amount of fuel on the wall, in ms of injector open time for each injector.", float, "%.3f" entry = idleState, "idleState", int, "%d" @@ -4966,6 +4999,7 @@ menuDialog = main subMenu = tps_accel_stateDialog, "tps_accel_state" subMenu = trigger_centralDialog, "trigger_central" subMenu = trigger_stateDialog, "trigger_state" + subMenu = trigger_state_primaryDialog, "trigger_state_primary" subMenu = wall_fuel_stateDialog, "wall_fuel_state" subMenu = idle_stateDialog, "idle_state" subMenu = ignition_stateDialog, "ignition_state" @@ -5418,7 +5452,6 @@ indicatorPanel = engine_stateIndicatorPanel, 2 indicator = {clutchUpState}, "clutchUpState No", "clutchUpState Yes" indicator = {clutchDownState}, "clutchDownState No", "clutchDownState Yes" indicator = {brakePedalState}, "brakePedalState No", "brakePedalState Yes" - indicator = {isSynchronizedPhase}, "isSynchronizedPhase No", "isSynchronizedPhase Yes" dialog = engine_stateDialog, "engine_state" panel = engine_stateIndicatorPanel @@ -5527,6 +5560,12 @@ dialog = trigger_stateDialog, "trigger_state" liveGraph = trigger_state_3_Graph, "Graph", South graphLine = vvtStateIndex +indicatorPanel = trigger_state_primaryIndicatorPanel, 2 + indicator = {m_hasSynchronizedPhase}, "m_hasSynchronizedPhase No", "m_hasSynchronizedPhase Yes" + +dialog = trigger_state_primaryDialog, "trigger_state_primary" + panel = trigger_state_primaryIndicatorPanel + dialog = wall_fuel_stateDialog, "wall_fuel_state" liveGraph = wall_fuel_state_1_Graph, "Graph", South diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/EngineState.java b/java_console/models/src/main/java/com/rusefi/config/generated/EngineState.java index 218010b734..cdad22c81d 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/EngineState.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/EngineState.java @@ -1,6 +1,6 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/algo/engine_state.txt Wed Aug 24 16:15:07 UTC 2022 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/algo/engine_state.txt Wed Aug 24 22:14:46 UTC 2022 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -487,35 +487,35 @@ public class EngineState { public static final Field CLUTCHUPSTATE = Field.create("CLUTCHUPSTATE", 136, FieldType.BIT, 0); public static final Field CLUTCHDOWNSTATE = Field.create("CLUTCHDOWNSTATE", 136, FieldType.BIT, 1); public static final Field BRAKEPEDALSTATE = Field.create("BRAKEPEDALSTATE", 136, FieldType.BIT, 2); - public static final Field ISSYNCHRONIZEDPHASE = Field.create("ISSYNCHRONIZEDPHASE", 136, FieldType.BIT, 3); - public static final Field UNUSEDBIT_23_4 = Field.create("UNUSEDBIT_23_4", 136, FieldType.BIT, 4); - public static final Field UNUSEDBIT_23_5 = Field.create("UNUSEDBIT_23_5", 136, FieldType.BIT, 5); - public static final Field UNUSEDBIT_23_6 = Field.create("UNUSEDBIT_23_6", 136, FieldType.BIT, 6); - public static final Field UNUSEDBIT_23_7 = Field.create("UNUSEDBIT_23_7", 136, FieldType.BIT, 7); - public static final Field UNUSEDBIT_23_8 = Field.create("UNUSEDBIT_23_8", 136, FieldType.BIT, 8); - public static final Field UNUSEDBIT_23_9 = Field.create("UNUSEDBIT_23_9", 136, FieldType.BIT, 9); - public static final Field UNUSEDBIT_23_10 = Field.create("UNUSEDBIT_23_10", 136, FieldType.BIT, 10); - public static final Field UNUSEDBIT_23_11 = Field.create("UNUSEDBIT_23_11", 136, FieldType.BIT, 11); - public static final Field UNUSEDBIT_23_12 = Field.create("UNUSEDBIT_23_12", 136, FieldType.BIT, 12); - public static final Field UNUSEDBIT_23_13 = Field.create("UNUSEDBIT_23_13", 136, FieldType.BIT, 13); - public static final Field UNUSEDBIT_23_14 = Field.create("UNUSEDBIT_23_14", 136, FieldType.BIT, 14); - public static final Field UNUSEDBIT_23_15 = Field.create("UNUSEDBIT_23_15", 136, FieldType.BIT, 15); - public static final Field UNUSEDBIT_23_16 = Field.create("UNUSEDBIT_23_16", 136, FieldType.BIT, 16); - public static final Field UNUSEDBIT_23_17 = Field.create("UNUSEDBIT_23_17", 136, FieldType.BIT, 17); - public static final Field UNUSEDBIT_23_18 = Field.create("UNUSEDBIT_23_18", 136, FieldType.BIT, 18); - public static final Field UNUSEDBIT_23_19 = Field.create("UNUSEDBIT_23_19", 136, FieldType.BIT, 19); - public static final Field UNUSEDBIT_23_20 = Field.create("UNUSEDBIT_23_20", 136, FieldType.BIT, 20); - public static final Field UNUSEDBIT_23_21 = Field.create("UNUSEDBIT_23_21", 136, FieldType.BIT, 21); - public static final Field UNUSEDBIT_23_22 = Field.create("UNUSEDBIT_23_22", 136, FieldType.BIT, 22); - public static final Field UNUSEDBIT_23_23 = Field.create("UNUSEDBIT_23_23", 136, FieldType.BIT, 23); - public static final Field UNUSEDBIT_23_24 = Field.create("UNUSEDBIT_23_24", 136, FieldType.BIT, 24); - public static final Field UNUSEDBIT_23_25 = Field.create("UNUSEDBIT_23_25", 136, FieldType.BIT, 25); - public static final Field UNUSEDBIT_23_26 = Field.create("UNUSEDBIT_23_26", 136, FieldType.BIT, 26); - public static final Field UNUSEDBIT_23_27 = Field.create("UNUSEDBIT_23_27", 136, FieldType.BIT, 27); - public static final Field UNUSEDBIT_23_28 = Field.create("UNUSEDBIT_23_28", 136, FieldType.BIT, 28); - public static final Field UNUSEDBIT_23_29 = Field.create("UNUSEDBIT_23_29", 136, FieldType.BIT, 29); - public static final Field UNUSEDBIT_23_30 = Field.create("UNUSEDBIT_23_30", 136, FieldType.BIT, 30); - public static final Field UNUSEDBIT_23_31 = Field.create("UNUSEDBIT_23_31", 136, FieldType.BIT, 31); + public static final Field UNUSEDBIT_22_3 = Field.create("UNUSEDBIT_22_3", 136, FieldType.BIT, 3); + public static final Field UNUSEDBIT_22_4 = Field.create("UNUSEDBIT_22_4", 136, FieldType.BIT, 4); + public static final Field UNUSEDBIT_22_5 = Field.create("UNUSEDBIT_22_5", 136, FieldType.BIT, 5); + public static final Field UNUSEDBIT_22_6 = Field.create("UNUSEDBIT_22_6", 136, FieldType.BIT, 6); + public static final Field UNUSEDBIT_22_7 = Field.create("UNUSEDBIT_22_7", 136, FieldType.BIT, 7); + public static final Field UNUSEDBIT_22_8 = Field.create("UNUSEDBIT_22_8", 136, FieldType.BIT, 8); + public static final Field UNUSEDBIT_22_9 = Field.create("UNUSEDBIT_22_9", 136, FieldType.BIT, 9); + public static final Field UNUSEDBIT_22_10 = Field.create("UNUSEDBIT_22_10", 136, FieldType.BIT, 10); + public static final Field UNUSEDBIT_22_11 = Field.create("UNUSEDBIT_22_11", 136, FieldType.BIT, 11); + public static final Field UNUSEDBIT_22_12 = Field.create("UNUSEDBIT_22_12", 136, FieldType.BIT, 12); + public static final Field UNUSEDBIT_22_13 = Field.create("UNUSEDBIT_22_13", 136, FieldType.BIT, 13); + public static final Field UNUSEDBIT_22_14 = Field.create("UNUSEDBIT_22_14", 136, FieldType.BIT, 14); + public static final Field UNUSEDBIT_22_15 = Field.create("UNUSEDBIT_22_15", 136, FieldType.BIT, 15); + public static final Field UNUSEDBIT_22_16 = Field.create("UNUSEDBIT_22_16", 136, FieldType.BIT, 16); + public static final Field UNUSEDBIT_22_17 = Field.create("UNUSEDBIT_22_17", 136, FieldType.BIT, 17); + public static final Field UNUSEDBIT_22_18 = Field.create("UNUSEDBIT_22_18", 136, FieldType.BIT, 18); + public static final Field UNUSEDBIT_22_19 = Field.create("UNUSEDBIT_22_19", 136, FieldType.BIT, 19); + public static final Field UNUSEDBIT_22_20 = Field.create("UNUSEDBIT_22_20", 136, FieldType.BIT, 20); + public static final Field UNUSEDBIT_22_21 = Field.create("UNUSEDBIT_22_21", 136, FieldType.BIT, 21); + public static final Field UNUSEDBIT_22_22 = Field.create("UNUSEDBIT_22_22", 136, FieldType.BIT, 22); + public static final Field UNUSEDBIT_22_23 = Field.create("UNUSEDBIT_22_23", 136, FieldType.BIT, 23); + public static final Field UNUSEDBIT_22_24 = Field.create("UNUSEDBIT_22_24", 136, FieldType.BIT, 24); + public static final Field UNUSEDBIT_22_25 = Field.create("UNUSEDBIT_22_25", 136, FieldType.BIT, 25); + public static final Field UNUSEDBIT_22_26 = Field.create("UNUSEDBIT_22_26", 136, FieldType.BIT, 26); + public static final Field UNUSEDBIT_22_27 = Field.create("UNUSEDBIT_22_27", 136, FieldType.BIT, 27); + public static final Field UNUSEDBIT_22_28 = Field.create("UNUSEDBIT_22_28", 136, FieldType.BIT, 28); + public static final Field UNUSEDBIT_22_29 = Field.create("UNUSEDBIT_22_29", 136, FieldType.BIT, 29); + public static final Field UNUSEDBIT_22_30 = Field.create("UNUSEDBIT_22_30", 136, FieldType.BIT, 30); + public static final Field UNUSEDBIT_22_31 = Field.create("UNUSEDBIT_22_31", 136, FieldType.BIT, 31); public static final Field EGT1 = Field.create("EGT1", 140, FieldType.FLOAT); public static final Field EGT2 = Field.create("EGT2", 144, FieldType.FLOAT); public static final Field DESIREDRPMLIMIT = Field.create("DESIREDRPMLIMIT", 148, FieldType.INT16).setScale(1.0); @@ -622,35 +622,35 @@ public class EngineState { CLUTCHUPSTATE, CLUTCHDOWNSTATE, BRAKEPEDALSTATE, - ISSYNCHRONIZEDPHASE, - UNUSEDBIT_23_4, - UNUSEDBIT_23_5, - UNUSEDBIT_23_6, - UNUSEDBIT_23_7, - UNUSEDBIT_23_8, - UNUSEDBIT_23_9, - UNUSEDBIT_23_10, - UNUSEDBIT_23_11, - UNUSEDBIT_23_12, - UNUSEDBIT_23_13, - UNUSEDBIT_23_14, - UNUSEDBIT_23_15, - UNUSEDBIT_23_16, - UNUSEDBIT_23_17, - UNUSEDBIT_23_18, - UNUSEDBIT_23_19, - UNUSEDBIT_23_20, - UNUSEDBIT_23_21, - UNUSEDBIT_23_22, - UNUSEDBIT_23_23, - UNUSEDBIT_23_24, - UNUSEDBIT_23_25, - UNUSEDBIT_23_26, - UNUSEDBIT_23_27, - UNUSEDBIT_23_28, - UNUSEDBIT_23_29, - UNUSEDBIT_23_30, - UNUSEDBIT_23_31, + UNUSEDBIT_22_3, + UNUSEDBIT_22_4, + UNUSEDBIT_22_5, + UNUSEDBIT_22_6, + UNUSEDBIT_22_7, + UNUSEDBIT_22_8, + UNUSEDBIT_22_9, + UNUSEDBIT_22_10, + UNUSEDBIT_22_11, + UNUSEDBIT_22_12, + UNUSEDBIT_22_13, + UNUSEDBIT_22_14, + UNUSEDBIT_22_15, + UNUSEDBIT_22_16, + UNUSEDBIT_22_17, + UNUSEDBIT_22_18, + UNUSEDBIT_22_19, + UNUSEDBIT_22_20, + UNUSEDBIT_22_21, + UNUSEDBIT_22_22, + UNUSEDBIT_22_23, + UNUSEDBIT_22_24, + UNUSEDBIT_22_25, + UNUSEDBIT_22_26, + UNUSEDBIT_22_27, + UNUSEDBIT_22_28, + UNUSEDBIT_22_29, + UNUSEDBIT_22_30, + UNUSEDBIT_22_31, EGT1, EGT2, DESIREDRPMLIMIT, 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 ff73a05589..b472513574 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 Wed Aug 24 16:16:02 UTC 2022 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Aug 24 22:15:40 UTC 2022 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -1882,7 +1882,7 @@ public class Fields { public static final int servoOutputPins7_offset = 2086; public static final int servoOutputPins8_offset = 2088; public static final int showHumanReadableWarning_offset = 960; - public static final int SIGNATURE_HASH = 1969688327; + public static final int SIGNATURE_HASH = 1913309982; public static final int silentTriggerError_offset = 1360; public static final int skippedWheelOnCam_offset = 1360; public static final int slowAdcAlpha_offset = 1600; @@ -2373,10 +2373,10 @@ public class Fields { public static final int TS_RESPONSE_UNDERRUN = 0x80; public static final int TS_RESPONSE_UNRECOGNIZED_COMMAND = 0x83; public static final char TS_SET_LOGGER_SWITCH = 'l'; - public static final String TS_SIGNATURE = "rusEFI 2022.08.24.all.1969688327"; + public static final String TS_SIGNATURE = "rusEFI 2022.08.24.all.1913309982"; 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 = 1220; + public static final int TS_TOTAL_OUTPUT_SIZE = 1224; 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/TriggerStatePrimary.java b/java_console/models/src/main/java/com/rusefi/config/generated/TriggerStatePrimary.java new file mode 100644 index 0000000000..e4fc35b332 --- /dev/null +++ b/java_console/models/src/main/java/com/rusefi/config/generated/TriggerStatePrimary.java @@ -0,0 +1,455 @@ +package com.rusefi.config.generated; + +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/trigger/trigger_state_primary.txt Wed Aug 24 22:14:46 UTC 2022 + +// by class com.rusefi.output.FileJavaFieldsConsumer +import com.rusefi.config.*; + +public class TriggerStatePrimary { + public static final int ADC_CHANNEL_NONE = 0; + public static final int AFTERSTART_DECAY_CURVE_SIZE = 8; + public static final int AFTERSTART_ENRICH_CURVE_SIZE = 8; + public static final int AFTERSTART_HOLD_CURVE_SIZE = 8; + public static final int AUX_ANALOG_INPUT_COUNT = 8; + public static final int AUX_DIGITAL_VALVE_COUNT = 2; + public static final int BANKS_COUNT = 2; + public static final int BARO_CORR_SIZE = 4; + public static final int BLOCKING_FACTOR = 500; + public static final int BOOST_LOAD_COUNT = 8; + public static final int BOOST_RPM_COUNT = 8; + public static final int CAM_INPUTS_COUNT = 4; + public static final int CAMS_PER_BANK = 2; + public static final int CAN_DEFAULT_BASE = 0x200; + public static final int CAN_ECU_SERIAL_RX_ID = 0x100; + public static final int CAN_ECU_SERIAL_TX_ID = 0x102; + public static final String CAN_RX_PREFIX = "CAN_rx"; + public static final int CLT_CRANKING_CURVE_SIZE = 8; + public static final int CLT_CURVE_SIZE = 16; + public static final int CLT_LIMITER_CURVE_SIZE = 4; + public static final int CLT_TIMING_CURVE_SIZE = 8; + public static final String CMD_AC_RELAY_BENCH = "acrelaybench"; + public static final String CMD_ALTERNATOR_PIN = "set_alternator_pin"; + public static final String CMD_BOOST_PIN = "set_boost_pin"; + public static final String CMD_BURNCONFIG = "burnconfig"; + public static final String CMD_DATE = "date"; + public static final String CMD_DISABLE = "disable"; + public static final String CMD_ECU_UNLOCK = "unlock"; + public static final String CMD_ENABLE = "enable"; + public static final String CMD_ENGINE_TYPE = "engine_type"; + public static final String CMD_ENGINESNIFFERRPMTHRESHOLD = "engineSnifferRpmThreshold"; + public static final String CMD_ETB_DUTY = "set_etb_duty"; + public static final String CMD_EXTERNAL_STIMULATION = "ext_stimulation"; + public static final String CMD_FAN2_BENCH = "fan2bench"; + public static final String CMD_FAN_BENCH = "fanbench"; + public static final String CMD_FUEL_BENCH = "fuelbench"; + public static final String CMD_FUEL_PUMP_BENCH = "fuelpumpbench"; + public static final String CMD_FUNCTIONAL_TEST_MODE = "test_mode"; + public static final String CMD_GET = "get"; + public static final String CMD_HPFP_BENCH = "hpfpbench"; + public static final String CMD_IDLE_BENCH = "idlebench"; + public static final String CMD_IDLE_PIN = "set_idle_pin"; + public static final String CMD_IGNITION = "ignition"; + public static final String CMD_IGNITION_PIN = "set_ignition_pin"; + public static final String CMD_INJECTION = "injection"; + public static final String CMD_INJECTION_PIN = "set_injection_pin"; + public static final String CMD_LOGIC_PIN = "set_logic_input_pin"; + public static final String CMD_MIL_BENCH = "milbench"; + public static final String CMD_PINS = "pins"; + public static final String CMD_PWM = "pwm"; + public static final String CMD_REBOOT = "reboot"; + public static final String CMD_REBOOT_DFU = "reboot_dfu"; + public static final String CMD_REBOOT_OPENBLT = "reboot_openblt"; + public static final String CMD_RESET_ENGINE_SNIFFER = "reset_engine_chart"; + public static final String CMD_RPM = "rpm"; + public static final String CMD_SELF_STIMULATION = "self_stimulation"; + public static final String CMD_SET = "set"; + public static final String CMD_SPARK_BENCH = "sparkbench"; + public static final String CMD_STARTER_BENCH = "starterbench"; + public static final String CMD_TRIGGER_HW_INPUT = "trigger_hw_input"; + public static final String CMD_TRIGGER_PIN = "set_trigger_input_pin"; + public static final String CMD_TRIGGER_SIMULATOR_PIN = "set_trigger_simulator_pin"; + public static final String CMD_TRIGGERINFO = "triggerinfo"; + public static final String CMD_VSS_PIN = "vss_pin"; + public static final String CMD_WRITECONFIG = "writeconfig"; + public static final int COMPOSITE_PACKET_COUNT = 1000; + public static final int COMPOSITE_PACKET_SIZE = 5; + public static final String CONSOLE_DATA_PROTOCOL_TAG = " @"; + public static final int CRANKING_ADVANCE_CURVE_SIZE = 4; + public static final int CRANKING_CLT_IDLE_CURVE_SIZE = 8; + public static final int CRANKING_CURVE_SIZE = 8; + public static final String CRITICAL_PREFIX = "CRITICAL"; + public static final int DC_PER_STEPPER = 2; + public static final int DIGIPOT_COUNT = 4; + public static final int DWELL_CURVE_SIZE = 8; + public static final int EGT_CHANNEL_COUNT = 8; + public static final String ENGINE_MAKE_BMW = "BMW"; + public static final String ENGINE_MAKE_GM = "GM"; + public static final String ENGINE_MAKE_HONDA = "Honda"; + public static final String ENGINE_MAKE_Hyundai = "Hyundai"; + public static final String ENGINE_MAKE_LADA = "Lada"; + public static final String ENGINE_MAKE_MAZDA = "Mazda"; + public static final String ENGINE_MAKE_MERCEDES = "Mercedes"; + public static final String ENGINE_MAKE_NISSAN = "Nissan"; + public static final String ENGINE_MAKE_SUBARU = "Subaru"; + public static final String ENGINE_MAKE_TOYOTA = "Toyota"; + public static final String ENGINE_MAKE_VAG = "VAG"; + public static final int ENGINE_NOISE_CURVE_SIZE = 16; + public static final int ENGINE_SNIFFER_UNIT_US = 10; + public static final int ERROR_BUFFER_SIZE = 120; + public static final int ETB_BIAS_CURVE_LENGTH = 8; + public static final int ETB_COUNT = 2; + public static final int ETB_HW_MAX_FREQUENCY = 3000; + public static final int FLASH_DATA_VERSION = 10013; + public static final int FUEL_LEVEL_TABLE_COUNT = 8; + public static final int FUEL_LOAD_COUNT = 16; + public static final int FUEL_RPM_COUNT = 16; + public static final int GAP_TRACKING_LENGTH = 18; + public static final String GAUGE_COIL_DWELL_TIME = "dwell: coil charge time"; + public static final String GAUGE_NAME_ACCEL_ROLL = "Acceleration: Roll"; + public static final String GAUGE_NAME_ACCEL_X = "Acceleration: X"; + public static final String GAUGE_NAME_ACCEL_Y = "Acceleration: Y"; + public static final String GAUGE_NAME_ACCEL_YAW = "Acceleration: Yaw"; + public static final String GAUGE_NAME_ACCEL_Z = "Acceleration: Z"; + public static final String GAUGE_NAME_AFR = "Air/Fuel Ratio"; + public static final String GAUGE_NAME_AFR2 = "Air/Fuel Ratio 2"; + public static final String GAUGE_NAME_AIR_FLOW_ESTIMATE = "MAF estimate"; + public static final String GAUGE_NAME_AIR_FLOW_MEASURED = "MAF sensor"; + public static final String GAUGE_NAME_AIR_MASS = "air mass"; + public static final String GAUGE_NAME_AUX_LINEAR_1 = "Aux Linear 1"; + public static final String GAUGE_NAME_AUX_LINEAR_2 = "Aux Linear 2"; + public static final String GAUGE_NAME_AUX_TEMP1 = "Aux temp 1"; + public static final String GAUGE_NAME_AUX_TEMP2 = "Aux temp 2"; + public static final String GAUGE_NAME_BARO_PRESSURE = "Barometric pressure"; + public static final String GAUGE_NAME_BOOST_CLOSED_LOOP = "Boost Closed Loop"; + public static final String GAUGE_NAME_BOOST_OPEN_LOOP = "Boost Open Loop"; + public static final String GAUGE_NAME_BOOST_OUTPUT = "Boost Output"; + public static final String GAUGE_NAME_BOOST_TARGET = "Boost Target"; + public static final String GAUGE_NAME_CLT = "CLT"; + public static final String GAUGE_NAME_CPU_TEMP = "CPU Temperature"; + public static final String GAUGE_NAME_CURRENT_GEAR = "Current Gear"; + public static final String GAUGE_NAME_DEBUG_F1 = "debug f1"; + public static final String GAUGE_NAME_DEBUG_F2 = "debug f2: iTerm"; + public static final String GAUGE_NAME_DEBUG_F3 = "debug f3: prevError"; + public static final String GAUGE_NAME_DEBUG_F4 = "debug f4: iParam"; + public static final String GAUGE_NAME_DEBUG_F5 = "debug f5: dParam"; + public static final String GAUGE_NAME_DEBUG_F6 = "debug f6: dTerm"; + public static final String GAUGE_NAME_DEBUG_F7 = "debug f7"; + public static final String GAUGE_NAME_DEBUG_I1 = "debug i1: pParam"; + public static final String GAUGE_NAME_DEBUG_I2 = "debug i2: offset"; + public static final String GAUGE_NAME_DEBUG_I3 = "debug i3"; + public static final String GAUGE_NAME_DEBUG_I4 = "debug i4"; + public static final String GAUGE_NAME_DEBUG_I5 = "debug i5"; + public static final String GAUGE_NAME_DESIRED_GEAR = "Desired Gear"; + public static final String GAUGE_NAME_DETECTED_GEAR = "Detected Gear"; + public static final String GAUGE_NAME_DWELL_DUTY = "dwell: coil duty cycle"; + public static final String GAUGE_NAME_ECU_TEMPERATURE = "ECU temperature"; + public static final String GAUGE_NAME_ENGINE_CRC16 = "Engine CRC16"; + public static final String GAUGE_NAME_ETB_DUTY = "ETB Duty"; + public static final String GAUGE_NAME_ETB_ERROR = "ETB position error"; + public static final String GAUGE_NAME_ETB_TARGET = "ETB position target"; + public static final String GAUGE_NAME_FLEX = "Flex Ethanol %"; + public static final String GAUGE_NAME_FUEL_BARO_CORR = "fuel: Barometric pressure correction"; + public static final String GAUGE_NAME_FUEL_BASE = "fuel: base mass"; + public static final String GAUGE_NAME_FUEL_CHARGE_TEMP = "fuel: Estimated charge temperature"; + public static final String GAUGE_NAME_FUEL_CLT_CORR = "fuel: CLT correction"; + public static final String GAUGE_NAME_FUEL_CONSUMPTION = "fuel: Total consumed"; + public static final String GAUGE_NAME_FUEL_CRANKING = "fuel: cranking"; + public static final String GAUGE_NAME_FUEL_EL_EXTRA = "fuel: engine load acceleration extra fuel"; + public static final String GAUGE_NAME_FUEL_FLOW = "fuel: Flow rate"; + public static final String GAUGE_NAME_FUEL_IAT_CORR = "fuel: IAT correction"; + public static final String GAUGE_NAME_FUEL_INJ_DUTY = "fuel: injector duty cycle"; + public static final String GAUGE_NAME_FUEL_LAST_INJECTION = "fuel: Last injection"; + public static final String GAUGE_NAME_FUEL_LEVEL = "fuel level"; + public static final String GAUGE_NAME_FUEL_LOAD = "fuel: load"; + public static final String GAUGE_NAME_FUEL_PRESSURE_HIGH = "Fuel pressure (high)"; + public static final String GAUGE_NAME_FUEL_PRESSURE_HIGH_UNITS = "bar"; + public static final String GAUGE_NAME_FUEL_PRESSURE_LOW = "Fuel pressure (low)"; + public static final String GAUGE_NAME_FUEL_PRESSURE_LOW_UNITS = "kPa"; + public static final String GAUGE_NAME_FUEL_RUNNING = "fuel: running"; + public static final String GAUGE_NAME_FUEL_TPS_EXTRA = "fuel: TPS acceleration extra fuel ms"; + public static final String GAUGE_NAME_FUEL_TPS_ROC = "fuel: TPS change"; + public static final String GAUGE_NAME_FUEL_TRIM = "fuel: fuel trim"; + public static final String GAUGE_NAME_FUEL_TRIM_2 = "fuel: fuel trim 2"; + public static final String GAUGE_NAME_FUEL_VE = "fuel: VE"; + public static final String GAUGE_NAME_FUEL_WALL_AMOUNT = "fuel: wall amount"; + public static final String GAUGE_NAME_FUEL_WALL_CORRECTION = "fuel: wall correction"; + public static final String GAUGE_NAME_FW_VERSION = "ECU Software Version"; + public static final String GAUGE_NAME_GEAR_RATIO = "Gearbox Ratio"; + public static final String GAUGE_NAME_IAC = "Idle Air Valve"; + public static final String GAUGE_NAME_IAT = "IAT"; + public static final String GAUGE_NAME_IDLE_POSITION = "Idle position sensor"; + public static final String GAUGE_NAME_IGNITION_LOAD = "ign: load"; + public static final String GAUGE_NAME_INJECTOR_LAG = "fuel: injector lag"; + public static final String GAUGE_NAME_ISS = "Input Shaft Speed"; + public static final String GAUGE_NAME_KNOCK_1 = "knock 1"; + public static final String GAUGE_NAME_KNOCK_10 = "knock 10"; + public static final String GAUGE_NAME_KNOCK_11 = "knock 11"; + public static final String GAUGE_NAME_KNOCK_12 = "knock 12"; + public static final String GAUGE_NAME_KNOCK_2 = "knock 2"; + public static final String GAUGE_NAME_KNOCK_3 = "knock 3"; + public static final String GAUGE_NAME_KNOCK_4 = "knock 4"; + public static final String GAUGE_NAME_KNOCK_5 = "knock 5"; + public static final String GAUGE_NAME_KNOCK_6 = "knock 6"; + public static final String GAUGE_NAME_KNOCK_7 = "knock 7"; + public static final String GAUGE_NAME_KNOCK_8 = "knock 8"; + public static final String GAUGE_NAME_KNOCK_9 = "knock 9"; + public static final String GAUGE_NAME_KNOCK_COUNTER = "knock: count"; + public static final String GAUGE_NAME_KNOCK_LEVEL = "knock: current level"; + public static final String GAUGE_NAME_KNOCK_RETARD = "knock: retard"; + public static final String GAUGE_NAME_LAMBDA = "Lambda"; + public static final String GAUGE_NAME_LAMBDA2 = "Lambda 2"; + public static final String GAUGE_NAME_LAST_ERROR = "Last error"; + public static final String GAUGE_NAME_MAF = "MAF"; + public static final String GAUGE_NAME_MAP = "MAP"; + public static final String GAUGE_NAME_OIL_PRESSURE = "Oil Pressure"; + public static final String GAUGE_NAME_OIL_PRESSURE_UNITS = "kPa"; + public static final String GAUGE_NAME_RAW_FUEL_PRESSURE_HIGH = "Fuel pressure raw (high)"; + public static final String GAUGE_NAME_RAW_FUEL_PRESSURE_LOW = "Fuel pressure raw (low)"; + public static final String GAUGE_NAME_RPM = "RPM"; + public static final String GAUGE_NAME_TARGET_AFR = "fuel: target AFR"; + public static final String GAUGE_NAME_TARGET_LAMBDA = "fuel: target lambda"; + public static final String GAUGE_NAME_TC_RATIO = "Torque Converter Ratio"; + public static final String GAUGE_NAME_TCHARGE = "fuel: SD tCharge"; + public static final String GAUGE_NAME_THROTTLE_PEDAL = "Throttle pedal position"; + public static final String GAUGE_NAME_TIME = "Time"; + public static final String GAUGE_NAME_TIMING_ADVANCE = "timing"; + public static final String GAUGE_NAME_TPS = "TPS"; + public static final String GAUGE_NAME_TPS2 = "TPS2"; + public static final String GAUGE_NAME_TRG_ERR = "Trigger Error Counter"; + public static final String GAUGE_NAME_TRG_GAP = "Trigger Sync Latest Ratio"; + public static final String GAUGE_NAME_TUNE_CRC16 = "Tune CRC16"; + public static final String GAUGE_NAME_TURBO_SPEED = "Turbocharger Speed"; + public static final String GAUGE_NAME_UPTIME = "Uptime"; + public static final String GAUGE_NAME_VBAT = "VBatt"; + public static final String GAUGE_NAME_VERSION = "firmware"; + public static final String GAUGE_NAME_VVS = "Vehicle Speed"; + public static final String GAUGE_NAME_VVT_B1E = "VVT: bank 1 exhaust"; + public static final String GAUGE_NAME_VVT_B1I = "VVT: bank 1 intake"; + public static final String GAUGE_NAME_VVT_B2E = "VVT: bank 2 exhaust"; + public static final String GAUGE_NAME_VVT_B2I = "VVT: bank 2 intake"; + public static final String GAUGE_NAME_VVT_TARGET_B1E = "VVT: bank 1 exhaust target"; + public static final String GAUGE_NAME_VVT_TARGET_B1I = "VVT: bank 1 intake target"; + public static final String GAUGE_NAME_VVT_TARGET_B2E = "VVT: bank 2 exhaust target"; + public static final String GAUGE_NAME_VVT_TARGET_B2I = "VVT: bank 2 intake target"; + public static final String GAUGE_NAME_WARNING_COUNT = "Warning count"; + public static final String GAUGE_NAME_WARNING_COUNTER = "warning: counter"; + public static final String GAUGE_NAME_WARNING_LAST = "warning: last"; + public static final String GAUGE_NAME_WG_POSITION = "Wastegate position sensor"; + public static final int GEARS_COUNT = 8; + public static final int GPPWM_CHANNELS = 4; + public static final int GPPWM_LOAD_COUNT = 8; + public static final int GPPWM_NOTE_SIZE = 16; + public static final int GPPWM_RPM_COUNT = 8; + public static final int HPFP_COMPENSATION_SIZE = 10; + public static final int HPFP_DEADTIME_SIZE = 8; + public static final int HPFP_LOBE_PROFILE_SIZE = 16; + public static final int HPFP_TARGET_SIZE = 10; + public static final int HW_MAX_ADC_INDEX = 17; + public static final int IAC_PID_MULT_SIZE = 8; + public static final int IAT_CURVE_SIZE = 16; + public static final int IDLE_ADVANCE_CURVE_SIZE = 8; + public static final int IDLE_VE_SIZE = 4; + public static final int IGN_LOAD_COUNT = 16; + public static final int IGN_RPM_COUNT = 16; + public static final String INDICATOR_NAME_AC_SWITCH = "AC switch"; + public static final String INDICATOR_NAME_BRAKE_DOWN = "brake: down"; + public static final String INDICATOR_NAME_CLUTCH_DOWN = "clutch: down"; + public static final String INDICATOR_NAME_CLUTCH_UP = "clutch: up"; + public static final int LE_COMMAND_LENGTH = 200; + public static final String LOG_DELIMITER = "`"; + public static final int LOGIC_ANALYZER_CHANNEL_COUNT = 4; + public static final int LUA_ANALOG_INPUT_COUNT = 8; + public static final int LUA_PWM_COUNT = 8; + public static final int LUA_SCRIPT_SIZE = 8000; + public static final int MAF_DECODING_COUNT = 256; + public static final String MAIN_HELP_URL = "http://www.rusefi.com/"; + public static final int MAP_ANGLE_SIZE = 8; + public static final int MAP_WINDOW_SIZE = 8; + public static final int MAX_CYLINDER_COUNT = 12; + public static final int MLQ_FIELD_HEADER_SIZE = 55; + public static final int MLQ_HEADER_SIZE = 22; + public static final String MOCK_PPS_POSITION_COMMAND = "mock_pps_position"; + public static final String MOCK_PPS_VOLTAGE_COMMAND = "mock_pps_voltage"; + public static final int NARROW_BAND_WIDE_BAND_CONVERSION_SIZE = 8; + public static final int PACK_ADD_TEMPERATURE = 40; + public static final int PACK_MULT_AFR = 1000; + public static final int PACK_MULT_AFR_CFG = 10; + public static final int PACK_MULT_ANGLE = 50; + public static final int PACK_MULT_FUEL_FLOW = 200; + public static final int PACK_MULT_FUEL_MASS = 100; + public static final int PACK_MULT_HIGH_PRESSURE = 10; + public static final int PACK_MULT_LAMBDA = 10000; + public static final int PACK_MULT_LAMBDA_CFG = 147; + public static final int PACK_MULT_MASS_FLOW = 10; + public static final int PACK_MULT_MS = 300; + public static final int PACK_MULT_PERCENT = 100; + public static final int PACK_MULT_PRESSURE = 30; + public static final int PACK_MULT_TEMPERATURE = 100; + public static final int PACK_MULT_VOLTAGE = 1000; + public static final int PEDAL_TO_TPS_SIZE = 8; + public static final String PROTOCOL_ANALOG_CHART = "analog_chart"; + public static final String PROTOCOL_COIL1_SHORT_NAME = "c1"; + public static final String PROTOCOL_CRANK1 = "t1"; + public static final String PROTOCOL_CRANK2 = "t2"; + public static final String PROTOCOL_CRANK3 = "t3"; + public static final String PROTOCOL_ENGINE_SNIFFER = "wave_chart"; + public static final String PROTOCOL_ES_DOWN = "d"; + public static final String PROTOCOL_ES_UP = "u"; + public static final String PROTOCOL_HELLO_PREFIX = "***"; + public static final String PROTOCOL_HIP_NAME = "HIP"; + public static final String PROTOCOL_HPFP_NAME = "hpfp"; + public static final String PROTOCOL_INJ1_SHORT_NAME = "i1"; + public static final String PROTOCOL_MSG = "msg"; + public static final String PROTOCOL_OUTPIN = "outpin"; + public static final String PROTOCOL_SIGNATURE_PREFIX = "rusEFI "; + public static final String PROTOCOL_TACH_NAME = "tach"; + public static final String PROTOCOL_TEST_RESPONSE_TAG = "ts_p_alive"; + public static final String PROTOCOL_VERSION_TAG = "rusEfiVersion"; + public static final String PROTOCOL_VVT1_NAME = "VVT1"; + public static final String PROTOCOL_VVT2_NAME = "VVT2"; + public static final String PROTOCOL_VVT3_NAME = "VVT3"; + public static final String PROTOCOL_VVT4_NAME = "VVT4"; + public static final String PROTOCOL_WA_CHANNEL_1 = "input1"; + public static final String PROTOCOL_WA_CHANNEL_2 = "input2"; + public static final String PROTOCOL_WA_CHANNEL_3 = "input3"; + public static final String PROTOCOL_WA_CHANNEL_4 = "input4"; + public static final int SCRIPT_CURVE_16 = 16; + public static final int SCRIPT_CURVE_8 = 8; + public static final int SCRIPT_CURVE_COUNT = 6; + public static final int SCRIPT_SETTING_COUNT = 8; + public static final int SCRIPT_TABLE_8 = 8; + public static final int SCRIPT_TABLE_COUNT = 4; + public static final int SERVO_COUNT = 8; + public static final int STFT_BANK_COUNT = 2; + public static final int STFT_CELL_COUNT = 4; + public static final int TCU_GEAR_COUNT = 10; + public static final int TCU_MAGIC_SIZE = 8; + public static final int TCU_SOLENOID_COUNT = 6; + public static final int TOOTH_DATA_LENGTH = 2000; + public static final int TOOTH_PACKET_COUNT = 1000; + public static final int TOOTH_PACKET_SIZE = 2; + public static final String TOP_DEAD_CENTER_MESSAGE = "r"; + public static final int TORQUE_CURVE_SIZE = 6; + public static final int TPS_2_BYTE_PACKING_MULT = 100; + public static final int TPS_TPS_ACCEL_TABLE = 8; + public static final String TRIGGER_COMMENT = "#"; + public static final String TRIGGER_GAP_FROM = "gapFrom"; + public static final String TRIGGER_GAP_TO = "gapTo"; + public static final String TRIGGER_GAPS_COUNT = "gapsCount"; + public static final String TRIGGER_HARDCODED_OPERATION_MODE = "knownOperationMode"; + public static final String TRIGGER_HAS_SECOND_CHANNEL = "hasSecondChannel"; + public static final int TRIGGER_INPUT_PIN_COUNT = 2; + public static final String TRIGGER_IS_CRANK_KEY = "crankBased"; + public static final String TRIGGER_IS_SECOND_WHEEL_CAM = "isSecondWheelCam"; + public static final int TRIGGER_SIMULATOR_PIN_COUNT = 3; + public static final String TRIGGERS_FILE_NAME = "triggers.txt"; + public static final int TRIM_SIZE = 4; + public static final char TS_BURN_COMMAND = 'B'; + public static final char TS_CHUNK_WRITE_COMMAND = 'C'; + public static final char TS_COMMAND_F = 'F'; + public static final int TS_COMPOSITE_DISABLE = 2; + public static final int TS_COMPOSITE_ENABLE = 1; + public static final char TS_CRC_CHECK_COMMAND = 'k'; + public static final char TS_EXECUTE = 'E'; + public static final int TS_FILE_VERSION = 20210312; + public static final int TS_FILE_VERSION_OFFSET = 124; + public static final char TS_GET_COMPOSITE_BUFFER_DONE_DIFFERENTLY = '8'; + public static final char TS_GET_CONFIG_ERROR = 'e'; + public static final char TS_GET_FIRMWARE_VERSION = 'V'; + public static final char TS_GET_LOGGER_GET_BUFFER = 'L'; + public static final char TS_GET_OUTPUTS_SIZE = '4'; + public static final char TS_GET_PROTOCOL_VERSION_COMMAND_F = 'F'; + public static final char TS_GET_TEXT = 'G'; + public static final char TS_HELLO_COMMAND = 'S'; + public static final char TS_IO_TEST_COMMAND = 'Z'; + public static final char TS_ONLINE_PROTOCOL = 'z'; + public static final char TS_OUTPUT_COMMAND = 'O'; + public static final char TS_PAGE_COMMAND = 'P'; + public static final char TS_PERF_TRACE_BEGIN = '_'; + public static final char TS_PERF_TRACE_GET_BUFFER = 'b'; + public static final String TS_PROTOCOL = "001"; + public static final char TS_QUERY_COMMAND = 'Q'; + public static final char TS_READ_COMMAND = 'R'; + public static final int TS_RESPONSE_BURN_OK = 4; + public static final int TS_RESPONSE_COMMAND_OK = 7; + public static final int TS_RESPONSE_CRC_FAILURE = 0x82; + public static final int TS_RESPONSE_FRAMING_ERROR = 0x8D; + public static final int TS_RESPONSE_OK = 0; + public static final int TS_RESPONSE_OUT_OF_RANGE = 0x84; + 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 char TS_SINGLE_WRITE_COMMAND = 'W'; + public static final char TS_TEST_COMMAND = 't'; + public static final int VBAT_INJECTOR_CURVE_SIZE = 8; + public static final int VEHICLE_INFO_SIZE = 32; + public static final int VM_VVT_INACTIVE = 0; + public static final int VR_THRESHOLD_COUNT = 2; + public static final int WWAE_TABLE_SIZE = 8; + public static final Field M_HASSYNCHRONIZEDPHASE = Field.create("M_HASSYNCHRONIZEDPHASE", 0, FieldType.BIT, 0); + public static final Field UNUSEDBIT_1_1 = Field.create("UNUSEDBIT_1_1", 0, FieldType.BIT, 1); + public static final Field UNUSEDBIT_1_2 = Field.create("UNUSEDBIT_1_2", 0, FieldType.BIT, 2); + public static final Field UNUSEDBIT_1_3 = Field.create("UNUSEDBIT_1_3", 0, FieldType.BIT, 3); + public static final Field UNUSEDBIT_1_4 = Field.create("UNUSEDBIT_1_4", 0, FieldType.BIT, 4); + public static final Field UNUSEDBIT_1_5 = Field.create("UNUSEDBIT_1_5", 0, FieldType.BIT, 5); + public static final Field UNUSEDBIT_1_6 = Field.create("UNUSEDBIT_1_6", 0, FieldType.BIT, 6); + public static final Field UNUSEDBIT_1_7 = Field.create("UNUSEDBIT_1_7", 0, FieldType.BIT, 7); + public static final Field UNUSEDBIT_1_8 = Field.create("UNUSEDBIT_1_8", 0, FieldType.BIT, 8); + public static final Field UNUSEDBIT_1_9 = Field.create("UNUSEDBIT_1_9", 0, FieldType.BIT, 9); + public static final Field UNUSEDBIT_1_10 = Field.create("UNUSEDBIT_1_10", 0, FieldType.BIT, 10); + public static final Field UNUSEDBIT_1_11 = Field.create("UNUSEDBIT_1_11", 0, FieldType.BIT, 11); + public static final Field UNUSEDBIT_1_12 = Field.create("UNUSEDBIT_1_12", 0, FieldType.BIT, 12); + public static final Field UNUSEDBIT_1_13 = Field.create("UNUSEDBIT_1_13", 0, FieldType.BIT, 13); + public static final Field UNUSEDBIT_1_14 = Field.create("UNUSEDBIT_1_14", 0, FieldType.BIT, 14); + public static final Field UNUSEDBIT_1_15 = Field.create("UNUSEDBIT_1_15", 0, FieldType.BIT, 15); + public static final Field UNUSEDBIT_1_16 = Field.create("UNUSEDBIT_1_16", 0, FieldType.BIT, 16); + public static final Field UNUSEDBIT_1_17 = Field.create("UNUSEDBIT_1_17", 0, FieldType.BIT, 17); + public static final Field UNUSEDBIT_1_18 = Field.create("UNUSEDBIT_1_18", 0, FieldType.BIT, 18); + public static final Field UNUSEDBIT_1_19 = Field.create("UNUSEDBIT_1_19", 0, FieldType.BIT, 19); + public static final Field UNUSEDBIT_1_20 = Field.create("UNUSEDBIT_1_20", 0, FieldType.BIT, 20); + public static final Field UNUSEDBIT_1_21 = Field.create("UNUSEDBIT_1_21", 0, FieldType.BIT, 21); + public static final Field UNUSEDBIT_1_22 = Field.create("UNUSEDBIT_1_22", 0, FieldType.BIT, 22); + public static final Field UNUSEDBIT_1_23 = Field.create("UNUSEDBIT_1_23", 0, FieldType.BIT, 23); + public static final Field UNUSEDBIT_1_24 = Field.create("UNUSEDBIT_1_24", 0, FieldType.BIT, 24); + public static final Field UNUSEDBIT_1_25 = Field.create("UNUSEDBIT_1_25", 0, FieldType.BIT, 25); + public static final Field UNUSEDBIT_1_26 = Field.create("UNUSEDBIT_1_26", 0, FieldType.BIT, 26); + public static final Field UNUSEDBIT_1_27 = Field.create("UNUSEDBIT_1_27", 0, FieldType.BIT, 27); + public static final Field UNUSEDBIT_1_28 = Field.create("UNUSEDBIT_1_28", 0, FieldType.BIT, 28); + public static final Field UNUSEDBIT_1_29 = Field.create("UNUSEDBIT_1_29", 0, FieldType.BIT, 29); + public static final Field UNUSEDBIT_1_30 = Field.create("UNUSEDBIT_1_30", 0, FieldType.BIT, 30); + public static final Field UNUSEDBIT_1_31 = Field.create("UNUSEDBIT_1_31", 0, FieldType.BIT, 31); + public static final Field[] VALUES = { + M_HASSYNCHRONIZEDPHASE, + UNUSEDBIT_1_1, + UNUSEDBIT_1_2, + UNUSEDBIT_1_3, + UNUSEDBIT_1_4, + UNUSEDBIT_1_5, + UNUSEDBIT_1_6, + UNUSEDBIT_1_7, + UNUSEDBIT_1_8, + UNUSEDBIT_1_9, + UNUSEDBIT_1_10, + UNUSEDBIT_1_11, + UNUSEDBIT_1_12, + UNUSEDBIT_1_13, + UNUSEDBIT_1_14, + UNUSEDBIT_1_15, + UNUSEDBIT_1_16, + UNUSEDBIT_1_17, + UNUSEDBIT_1_18, + UNUSEDBIT_1_19, + UNUSEDBIT_1_20, + UNUSEDBIT_1_21, + UNUSEDBIT_1_22, + UNUSEDBIT_1_23, + UNUSEDBIT_1_24, + UNUSEDBIT_1_25, + UNUSEDBIT_1_26, + UNUSEDBIT_1_27, + UNUSEDBIT_1_28, + UNUSEDBIT_1_29, + UNUSEDBIT_1_30, + UNUSEDBIT_1_31, + }; +}