From 7b383c9253083580b4c7d7ef210abc9713d92042 Mon Sep 17 00:00:00 2001 From: GitHub gen-configs Action Date: Tue, 26 Dec 2023 22:49:00 +0000 Subject: [PATCH] Auto-generated configs and docs --- .../algo/rusefi_generated_cypress.h | 6 +- .../controllers/algo/rusefi_generated_kin.h | 6 +- .../algo/rusefi_generated_subaru_eg33_f7.h | 6 +- .../console/binary/generated/data_logs.ini | 1 + .../binary/generated/fancy_content.ini | 5 +- .../console/binary/generated/live_data_ids.h | 24 +- .../binary/generated/output_channels.ini | 277 ++++++++--------- .../generated/total_live_data_generated.h | 2 +- .../console/binary_log/log_fields_generated.h | 1 + .../controllers/algo/engine_state_generated.h | 158 +++++----- .../generated/rusefi_generated_alphax-2chan.h | 6 +- .../generated/rusefi_generated_alphax-4chan.h | 6 +- .../rusefi_generated_alphax-4chan_f7.h | 6 +- .../rusefi_generated_alphax-8chan-revA.h | 6 +- .../generated/rusefi_generated_alphax-8chan.h | 6 +- .../rusefi_generated_alphax-8chan_f7.h | 6 +- .../rusefi_generated_at_start_f435.h | 6 +- .../generated/rusefi_generated_atlas.h | 6 +- .../rusefi_generated_f407-discovery.h | 6 +- .../rusefi_generated_f429-discovery.h | 6 +- .../rusefi_generated_f469-discovery.h | 6 +- .../rusefi_generated_frankenso_na6.h | 6 +- .../rusefi_generated_hellen-112-17.h | 6 +- .../rusefi_generated_hellen-gm-e67.h | 6 +- .../rusefi_generated_hellen-honda-k.h | 6 +- .../generated/rusefi_generated_hellen-nb1.h | 6 +- .../rusefi_generated_hellen121nissan.h | 6 +- .../generated/rusefi_generated_hellen121vag.h | 6 +- .../generated/rusefi_generated_hellen128.h | 6 +- .../rusefi_generated_hellen154hyundai.h | 6 +- .../generated/rusefi_generated_hellen72.h | 6 +- .../generated/rusefi_generated_hellen81.h | 6 +- .../generated/rusefi_generated_hellen88bmw.h | 6 +- .../generated/rusefi_generated_hellenNA6.h | 6 +- .../generated/rusefi_generated_hellenNA8_96.h | 6 +- .../generated/rusefi_generated_m74_9.h | 6 +- .../generated/rusefi_generated_mre_f4.h | 6 +- .../generated/rusefi_generated_mre_f7.h | 6 +- .../generated/rusefi_generated_nucleo_h743.h | 6 +- .../rusefi_generated_prometheus_405.h | 6 +- .../rusefi_generated_prometheus_469.h | 6 +- .../generated/rusefi_generated_proteus_f4.h | 6 +- .../generated/rusefi_generated_proteus_f7.h | 6 +- .../generated/rusefi_generated_proteus_h7.h | 6 +- .../generated/rusefi_generated_s105.h | 6 +- .../rusefi_generated_small-can-board.h | 6 +- .../rusefi_generated_stm32f413_nucleo.h | 6 +- .../rusefi_generated_stm32f429_nucleo.h | 6 +- .../rusefi_generated_stm32f767_nucleo.h | 6 +- .../generated/rusefi_generated_t-b-g.h | 6 +- .../generated/rusefi_generated_tdg-pdm8.h | 6 +- .../generated/rusefi_generated_uaefi.h | 6 +- .../generated/signature_alphax-2chan.h | 4 +- .../generated/signature_alphax-4chan.h | 4 +- .../generated/signature_alphax-4chan_f7.h | 4 +- .../generated/signature_alphax-8chan-revA.h | 4 +- .../generated/signature_alphax-8chan.h | 4 +- .../generated/signature_alphax-8chan_f7.h | 4 +- .../generated/signature_at_start_f435.h | 4 +- .../controllers/generated/signature_atlas.h | 4 +- .../controllers/generated/signature_cypress.h | 4 +- .../generated/signature_f407-discovery.h | 4 +- .../generated/signature_f429-discovery.h | 4 +- .../generated/signature_f469-discovery.h | 4 +- .../generated/signature_frankenso_na6.h | 4 +- .../generated/signature_hellen-112-17.h | 4 +- .../generated/signature_hellen-gm-e67.h | 4 +- .../generated/signature_hellen-honda-k.h | 4 +- .../generated/signature_hellen-nb1.h | 4 +- .../generated/signature_hellen121nissan.h | 4 +- .../generated/signature_hellen121vag.h | 4 +- .../generated/signature_hellen128.h | 4 +- .../generated/signature_hellen154hyundai.h | 4 +- .../generated/signature_hellen72.h | 4 +- .../generated/signature_hellen81.h | 4 +- .../generated/signature_hellen88bmw.h | 4 +- .../generated/signature_hellenNA6.h | 4 +- .../generated/signature_hellenNA8_96.h | 4 +- .../controllers/generated/signature_kin.h | 4 +- .../controllers/generated/signature_m74_9.h | 4 +- .../controllers/generated/signature_mre_f4.h | 4 +- .../controllers/generated/signature_mre_f7.h | 4 +- .../generated/signature_nucleo_h743.h | 4 +- .../generated/signature_prometheus_405.h | 4 +- .../generated/signature_prometheus_469.h | 4 +- .../generated/signature_proteus_f4.h | 4 +- .../generated/signature_proteus_f7.h | 4 +- .../generated/signature_proteus_h7.h | 4 +- .../controllers/generated/signature_s105.h | 4 +- .../generated/signature_small-can-board.h | 4 +- .../generated/signature_stm32f413_nucleo.h | 4 +- .../generated/signature_stm32f429_nucleo.h | 4 +- .../generated/signature_stm32f767_nucleo.h | 4 +- .../generated/signature_subaru_eg33_f7.h | 4 +- .../controllers/generated/signature_t-b-g.h | 4 +- .../generated/signature_tdg-pdm8.h | 4 +- .../controllers/generated/signature_uaefi.h | 4 +- .../lua/generated/output_lookup_generated.cpp | 3 + .../generated/rusefi_alphax-2chan.ini | 291 +++++++++--------- .../generated/rusefi_alphax-4chan.ini | 291 +++++++++--------- .../generated/rusefi_alphax-4chan_f7.ini | 291 +++++++++--------- .../generated/rusefi_alphax-8chan-revA.ini | 291 +++++++++--------- .../generated/rusefi_alphax-8chan.ini | 291 +++++++++--------- .../generated/rusefi_alphax-8chan_f7.ini | 291 +++++++++--------- .../generated/rusefi_at_start_f435.ini | 291 +++++++++--------- .../tunerstudio/generated/rusefi_atlas.ini | 291 +++++++++--------- .../tunerstudio/generated/rusefi_cypress.ini | 291 +++++++++--------- .../generated/rusefi_f407-discovery.ini | 291 +++++++++--------- .../generated/rusefi_f429-discovery.ini | 291 +++++++++--------- .../generated/rusefi_f469-discovery.ini | 291 +++++++++--------- .../generated/rusefi_frankenso_na6.ini | 291 +++++++++--------- .../generated/rusefi_hellen-112-17.ini | 291 +++++++++--------- .../generated/rusefi_hellen-gm-e67.ini | 291 +++++++++--------- .../generated/rusefi_hellen-honda-k.ini | 291 +++++++++--------- .../generated/rusefi_hellen-nb1.ini | 291 +++++++++--------- .../generated/rusefi_hellen121nissan.ini | 291 +++++++++--------- .../generated/rusefi_hellen121vag.ini | 291 +++++++++--------- .../generated/rusefi_hellen128.ini | 291 +++++++++--------- .../generated/rusefi_hellen154hyundai.ini | 291 +++++++++--------- .../tunerstudio/generated/rusefi_hellen72.ini | 291 +++++++++--------- .../tunerstudio/generated/rusefi_hellen81.ini | 291 +++++++++--------- .../generated/rusefi_hellen88bmw.ini | 291 +++++++++--------- .../generated/rusefi_hellenNA6.ini | 291 +++++++++--------- .../generated/rusefi_hellenNA8_96.ini | 291 +++++++++--------- firmware/tunerstudio/generated/rusefi_kin.ini | 291 +++++++++--------- .../tunerstudio/generated/rusefi_m74_9.ini | 291 +++++++++--------- .../tunerstudio/generated/rusefi_mre_f4.ini | 291 +++++++++--------- .../tunerstudio/generated/rusefi_mre_f7.ini | 291 +++++++++--------- .../generated/rusefi_nucleo_h743.ini | 291 +++++++++--------- .../generated/rusefi_prometheus_405.ini | 291 +++++++++--------- .../generated/rusefi_prometheus_469.ini | 291 +++++++++--------- .../generated/rusefi_proteus_f4.ini | 291 +++++++++--------- .../generated/rusefi_proteus_f7.ini | 291 +++++++++--------- .../generated/rusefi_proteus_h7.ini | 291 +++++++++--------- .../tunerstudio/generated/rusefi_s105.ini | 291 +++++++++--------- .../generated/rusefi_small-can-board.ini | 291 +++++++++--------- .../generated/rusefi_stm32f413_nucleo.ini | 291 +++++++++--------- .../generated/rusefi_stm32f429_nucleo.ini | 291 +++++++++--------- .../generated/rusefi_stm32f767_nucleo.ini | 291 +++++++++--------- .../generated/rusefi_subaru_eg33_f7.ini | 291 +++++++++--------- .../tunerstudio/generated/rusefi_t-b-g.ini | 291 +++++++++--------- .../tunerstudio/generated/rusefi_tdg-pdm8.ini | 291 +++++++++--------- .../tunerstudio/generated/rusefi_uaefi.ini | 291 +++++++++--------- .../com/rusefi/config/generated/DcMotors.java | 10 +- .../config/generated/ElectronicThrottle.java | 36 +-- .../rusefi/config/generated/EngineState.java | 48 +-- .../com/rusefi/config/generated/Fields.java | 7 +- .../rusefi/config/generated/IdleState.java | 58 ++-- .../config/generated/LambdaMonitor.java | 10 +- .../rusefi/config/generated/SentState.java | 8 +- .../config/generated/TpsAccelState.java | 36 +-- .../config/generated/TriggerCentral.java | 38 +-- .../rusefi/config/generated/TriggerState.java | 26 +- .../config/generated/TriggerStatePrimary.java | 8 +- .../com/rusefi/config/generated/VvtState.java | 8 +- .../config/generated/WallFuelState.java | 6 +- .../config/generated/WidebandController.java | 18 +- 157 files changed, 7244 insertions(+), 7089 deletions(-) diff --git a/firmware/config/boards/cypress/config/controllers/algo/rusefi_generated_cypress.h b/firmware/config/boards/cypress/config/controllers/algo/rusefi_generated_cypress.h index aa47fc780b..85cf899b82 100644 --- a/firmware/config/boards/cypress/config/controllers/algo/rusefi_generated_cypress.h +++ b/firmware/config/boards/cypress/config/controllers/algo/rusefi_generated_cypress.h @@ -817,7 +817,7 @@ #define SentEtbType_NONE 0 #define show_Frankenso_presets true #define show_test_presets true -#define SIGNATURE_HASH 4218430649 +#define SIGNATURE_HASH 860584539 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1116,14 +1116,14 @@ #define ts_show_vr_threshold_2 true #define ts_show_vr_threshold_all true #define ts_show_vr_threshold_pins true -#define TS_SIGNATURE "rusEFI master.2023.12.26.cypress.4218430649" +#define TS_SIGNATURE "rusEFI master.2023.12.26.cypress.860584539" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' #define TS_TEST_COMMAND_char t -#define TS_TOTAL_OUTPUT_SIZE 1444 +#define TS_TOTAL_OUTPUT_SIZE 1448 #define TS_TRIGGER_SCOPE_CHANNEL_1_NAME "Channel 1" #define TS_TRIGGER_SCOPE_CHANNEL_2_NAME "Channel 2" #define TS_TRIGGER_SCOPE_DISABLE 5 diff --git a/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated_kin.h b/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated_kin.h index 689b9fb94c..06bc4f99ba 100644 --- a/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated_kin.h +++ b/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated_kin.h @@ -817,7 +817,7 @@ #define SentEtbType_NONE 0 #define show_Frankenso_presets true #define show_test_presets true -#define SIGNATURE_HASH 3114394391 +#define SIGNATURE_HASH 1905966581 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1116,14 +1116,14 @@ #define ts_show_vr_threshold_2 true #define ts_show_vr_threshold_all true #define ts_show_vr_threshold_pins true -#define TS_SIGNATURE "rusEFI master.2023.12.26.kin.3114394391" +#define TS_SIGNATURE "rusEFI master.2023.12.26.kin.1905966581" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' #define TS_TEST_COMMAND_char t -#define TS_TOTAL_OUTPUT_SIZE 1444 +#define TS_TOTAL_OUTPUT_SIZE 1448 #define TS_TRIGGER_SCOPE_CHANNEL_1_NAME "Channel 1" #define TS_TRIGGER_SCOPE_CHANNEL_2_NAME "Channel 2" #define TS_TRIGGER_SCOPE_DISABLE 5 diff --git a/firmware/config/boards/subaru_eg33/config/controllers/algo/rusefi_generated_subaru_eg33_f7.h b/firmware/config/boards/subaru_eg33/config/controllers/algo/rusefi_generated_subaru_eg33_f7.h index 61352900dc..61fc83e8dd 100644 --- a/firmware/config/boards/subaru_eg33/config/controllers/algo/rusefi_generated_subaru_eg33_f7.h +++ b/firmware/config/boards/subaru_eg33/config/controllers/algo/rusefi_generated_subaru_eg33_f7.h @@ -1055,7 +1055,7 @@ #define show_Frankenso_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 4244497326 +#define SIGNATURE_HASH 885439820 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1354,14 +1354,14 @@ #define ts_show_vr_threshold_2 true #define ts_show_vr_threshold_all true #define ts_show_vr_threshold_pins true -#define TS_SIGNATURE "rusEFI master.2023.12.26.subaru_eg33_f7.4244497326" +#define TS_SIGNATURE "rusEFI master.2023.12.26.subaru_eg33_f7.885439820" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' #define TS_TEST_COMMAND_char t -#define TS_TOTAL_OUTPUT_SIZE 1444 +#define TS_TOTAL_OUTPUT_SIZE 1448 #define TS_TRIGGER_SCOPE_CHANNEL_1_NAME "Channel 1" #define TS_TRIGGER_SCOPE_CHANNEL_2_NAME "Channel 2" #define TS_TRIGGER_SCOPE_DISABLE 5 diff --git a/firmware/console/binary/generated/data_logs.ini b/firmware/console/binary/generated/data_logs.ini index ce0e27e49d..b8f5c2888b 100644 --- a/firmware/console/binary/generated/data_logs.ini +++ b/firmware/console/binary/generated/data_logs.ini @@ -513,6 +513,7 @@ entry = brakePedalState, "Brake switch", int, "%d" entry = startStopState, "startStopState", int, "%d" entry = smartChipState, "smartChipState", int, "%d" entry = smartChipRestartCounter, "smartChipRestartCounter", int, "%d" +entry = smartChipAliveCounter, "smartChipAliveCounter", int, "%d" entry = startStopPhysicalState, "startStopPhysicalState", int, "%d" entry = acrStateDup, "acrStateDup", int, "%d" entry = acrEngineMovedRecently, "acrEngineMovedRecently", int, "%d" diff --git a/firmware/console/binary/generated/fancy_content.ini b/firmware/console/binary/generated/fancy_content.ini index cefa1d579f..133a183f1b 100644 --- a/firmware/console/binary/generated/fancy_content.ini +++ b/firmware/console/binary/generated/fancy_content.ini @@ -245,16 +245,17 @@ dialog = engine_stateDialog, "engine_state" graphLine = smartChipState graphLine = smartChipRestartCounter liveGraph = engine_state_5_Graph, "Graph", South + graphLine = smartChipAliveCounter graphLine = startStopStateToggleCounter graphLine = egtValue1 graphLine = egtValue2 - graphLine = desiredRpmLimit liveGraph = engine_state_6_Graph, "Graph", South + graphLine = desiredRpmLimit graphLine = fuelInjectionCounter graphLine = sparkCounter graphLine = fuelingLoad - graphLine = ignitionLoad liveGraph = engine_state_7_Graph, "Graph", South + graphLine = ignitionLoad graphLine = veTableYAxis indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/console/binary/generated/live_data_ids.h b/firmware/console/binary/generated/live_data_ids.h index 504dbed2e8..cc13cb98f4 100644 --- a/firmware/console/binary/generated/live_data_ids.h +++ b/firmware/console/binary/generated/live_data_ids.h @@ -45,15 +45,15 @@ LDS_lambda_monitor, #define FUEL_PUMP_CONTROL_BASE_ADDRESS 1040 #define MAIN_RELAY_BASE_ADDRESS 1044 #define ENGINE_STATE_BASE_ADDRESS 1048 -#define TPS_ACCEL_STATE_BASE_ADDRESS 1136 -#define TRIGGER_CENTRAL_BASE_ADDRESS 1184 -#define TRIGGER_STATE_BASE_ADDRESS 1244 -#define TRIGGER_STATE_PRIMARY_BASE_ADDRESS 1284 -#define WALL_FUEL_STATE_BASE_ADDRESS 1292 -#define IDLE_STATE_BASE_ADDRESS 1300 -#define ELECTRONIC_THROTTLE_BASE_ADDRESS 1348 -#define WIDEBAND_STATE_BASE_ADDRESS 1400 -#define DC_MOTORS_BASE_ADDRESS 1412 -#define SENT_STATE_BASE_ADDRESS 1424 -#define VVT_BASE_ADDRESS 1432 -#define LAMBDA_MONITOR_BASE_ADDRESS 1436 +#define TPS_ACCEL_STATE_BASE_ADDRESS 1140 +#define TRIGGER_CENTRAL_BASE_ADDRESS 1188 +#define TRIGGER_STATE_BASE_ADDRESS 1248 +#define TRIGGER_STATE_PRIMARY_BASE_ADDRESS 1288 +#define WALL_FUEL_STATE_BASE_ADDRESS 1296 +#define IDLE_STATE_BASE_ADDRESS 1304 +#define ELECTRONIC_THROTTLE_BASE_ADDRESS 1352 +#define WIDEBAND_STATE_BASE_ADDRESS 1404 +#define DC_MOTORS_BASE_ADDRESS 1416 +#define SENT_STATE_BASE_ADDRESS 1428 +#define VVT_BASE_ADDRESS 1436 +#define LAMBDA_MONITOR_BASE_ADDRESS 1440 diff --git a/firmware/console/binary/generated/output_channels.ini b/firmware/console/binary/generated/output_channels.ini index 86ac5ce61c..6da728ea42 100644 --- a/firmware/console/binary/generated/output_channels.ini +++ b/firmware/console/binary/generated/output_channels.ini @@ -641,142 +641,143 @@ brakePedalState = scalar, S08, 1092, "", 1, 0 startStopState = scalar, S08, 1093, "", 1, 0 smartChipState = scalar, S08, 1094, "", 1, 0 smartChipRestartCounter = scalar, S08, 1095, "", 1, 0 -startStopPhysicalState = bits, U32, 1096, [0:0] -acrStateDup = bits, U32, 1096, [1:1] -acrEngineMovedRecently = bits, U32, 1096, [2:2] -heaterControlEnabled = bits, U32, 1096, [3:3] -luaDigitalState0 = bits, U32, 1096, [4:4] -luaDigitalState1 = bits, U32, 1096, [5:5] -luaDigitalState2 = bits, U32, 1096, [6:6] -luaDigitalState3 = bits, U32, 1096, [7:7] -startStopStateToggleCounter = scalar, U32, 1100, "", 1, 0 -egtValue1 = scalar, F32, 1104, "", 1, 0 -egtValue2 = scalar, F32, 1108, "", 1, 0 -desiredRpmLimit = scalar, S16, 1112, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1116, "", 1, 0 -sparkCounter = scalar, U32, 1120, "", 1, 0 -fuelingLoad = scalar, F32, 1124, "", 1, 0 -ignitionLoad = scalar, F32, 1128, "", 1, 0 -veTableYAxis = scalar, U16, 1132, "%", 0.01, 0 -; total TS size = 1136 -tpsFrom = scalar, F32, 1136 -tpsTo = scalar, F32, 1140 -deltaTps = scalar, F32, 1144 -extraFuel = scalar, F32, 1148, "", 1, 0 -valueFromTable = scalar, F32, 1152, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1156, [0:0] -isBelowDecelThreshold = bits, U32, 1156, [1:1] -isTimeToResetAccumulator = bits, U32, 1156, [2:2] -isFractionalEnrichment = bits, U32, 1156, [3:3] -belowEpsilon = bits, U32, 1156, [4:4] -tooShort = bits, U32, 1156, [5:5] -fractionalInjFuel = scalar, F32, 1160, "", 1, 0 -accumulatedValue = scalar, F32, 1164, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1168, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1172, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1176, "", 1, 0 -cycleCnt = scalar, S32, 1180, "", 1, 0 -; total TS size = 1184 -hwEventCounters1 = scalar, U32, 1184, "", 1, 0 -hwEventCounters2 = scalar, U32, 1188, "", 1, 0 -hwEventCounters3 = scalar, U32, 1192, "", 1, 0 -hwEventCounters4 = scalar, U32, 1196, "", 1, 0 -hwEventCounters5 = scalar, U32, 1200, "", 1, 0 -hwEventCounters6 = scalar, U32, 1204, "", 1, 0 -vvtCamCounter = scalar, U32, 1208, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1212, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1216, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1220, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1221, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1224, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1228, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1232, "", 1, 0 -mapCamPrevToothAngle = scalar, F32, 1236, "deg", 1, 0 -isDecodingMapCam = bits, U32, 1240, [0:0] -; total TS size = 1244 -crankSynchronizationCounter0 = scalar, U32, 1244, "", 1, 0 -vvtSyncGapRatio0 = scalar, F32, 1248, "", 1, 0 -vvtToothDurations00 = scalar, U32, 1252, "us", 1, 0 -vvtCurrentPosition0 = scalar, F32, 1256, "sync: Primary Cam Position", 1, 0 -vvtToothPosition10 = scalar, F32, 1260, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition20 = scalar, F32, 1264, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition30 = scalar, F32, 1268, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition40 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio0 = scalar, F32, 1276, "", 1, 0 -triggerStateIndex0 = scalar, U08, 1280, "", 1, 0 -vvtStateIndex0 = scalar, U08, 1281, "", 1, 0 -; total TS size = 1284 -camResyncCounter = scalar, U08, 1284, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1288, [0:0] -; total TS size = 1292 -wallFuelCorrection = scalar, F32, 1292, "", 1, 0 -wallFuel = scalar, F32, 1296, "", 1, 0 -; total TS size = 1300 -idleState = bits, S32, 1300, [0:2], "not important" -currentIdlePosition = scalar, F32, 1304 -baseIdlePosition = scalar, F32, 1308 -idleClosedLoop = scalar, F32, 1312 -iacByTpsTaper = scalar, F32, 1316 -throttlePedalUpState = scalar, S32, 1320, "", 1, 0 -mightResetPid = bits, U32, 1324, [0:0] -shouldResetPid = bits, U32, 1324, [1:1] -wasResetPid = bits, U32, 1324, [2:2] -mustResetPid = bits, U32, 1324, [3:3] -isCranking = bits, U32, 1324, [4:4] -isIacTableForCoasting = bits, U32, 1324, [5:5] -notIdling = bits, U32, 1324, [6:6] -needReset = bits, U32, 1324, [7:7] -isInDeadZone = bits, U32, 1324, [8:8] -isBlipping = bits, U32, 1324, [9:9] -useClosedLoop = bits, U32, 1324, [10:10] -badTps = bits, U32, 1324, [11:11] -looksLikeRunning = bits, U32, 1324, [12:12] -looksLikeCoasting = bits, U32, 1324, [13:13] -looksLikeCrankToIdle = bits, U32, 1324, [14:14] -isIdleCoasting = bits, U32, 1324, [15:15] -isIdleClosedLoop = bits, U32, 1324, [16:16] -idleTarget = scalar, S32, 1328, "", 1, 0 -targetRpmByClt = scalar, S32, 1332, "", 1, 0 -targetRpmAc = scalar, S32, 1336, "", 1, 0 -iacByRpmTaper = scalar, F32, 1340 -luaAdd = scalar, F32, 1344 -; total TS size = 1348 -idlePosition0 = scalar, F32, 1348, "per", 1,0 -trim0 = scalar, F32, 1352, "", 1, 0 -luaAdjustment0 = scalar, F32, 1356, "per", 1,0 -m_wastegatePosition0 = scalar, F32, 1360, "per", 1,0 -etbFeedForward0 = scalar, F32, 1364 -etbIntegralError0 = scalar, F32, 1368, "", 1, 0 -etbCurrentTarget0 = scalar, F32, 1372, "%", 1, 0 -etbCurrentAdjustedTarget0 = scalar, F32, 1376, "%", 1, 0 -etbRevLimitActive0 = bits, U32, 1380, [0:0] -jamDetected0 = bits, U32, 1380, [1:1] -etbDutyRateOfChange0 = scalar, F32, 1384, "per", 1,0 -etbDutyAverage0 = scalar, F32, 1388, "per", 1,0 -etbTpsErrorCounter0 = scalar, U16, 1392, "count", 1,0 -etbPpsErrorCounter0 = scalar, U16, 1394, "count", 1,0 -etbErrorCode0 = scalar, S08, 1396, "", 1, 0 -jamTimer0 = scalar, U16, 1398, "sec", 0.01, 0 -; total TS size = 1400 -faultCode0 = scalar, U08, 1400, "", 1, 0 -heaterDuty0 = scalar, U08, 1401, "%", 1, 0 -pumpDuty0 = scalar, U08, 1402, "%", 1, 0 -tempC0 = scalar, U16, 1404, "C", 1, 0 -nernstVoltage0 = scalar, U16, 1406, "V", 0.001, 0 -esr0 = scalar, U16, 1408, "ohm", 1, 0 -; total TS size = 1412 -dcOutput0 = scalar, F32, 1412, "per", 1,0 -isEnabled0_int = scalar, U08, 1416, "per", 1,0 -isEnabled0 = bits, U32, 1420, [0:0] -; total TS size = 1424 -value0 = scalar, U16, 1424, "value", 1,0 -value1 = scalar, U16, 1426, "value", 1,0 -errorRate = scalar, F32, 1428, "ratio", 1,0 -; total TS size = 1432 -vvtTarget = scalar, U16, 1432, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1434, "%", 0.5, 0 +smartChipAliveCounter = scalar, S08, 1096, "", 1, 0 +startStopPhysicalState = bits, U32, 1100, [0:0] +acrStateDup = bits, U32, 1100, [1:1] +acrEngineMovedRecently = bits, U32, 1100, [2:2] +heaterControlEnabled = bits, U32, 1100, [3:3] +luaDigitalState0 = bits, U32, 1100, [4:4] +luaDigitalState1 = bits, U32, 1100, [5:5] +luaDigitalState2 = bits, U32, 1100, [6:6] +luaDigitalState3 = bits, U32, 1100, [7:7] +startStopStateToggleCounter = scalar, U32, 1104, "", 1, 0 +egtValue1 = scalar, F32, 1108, "", 1, 0 +egtValue2 = scalar, F32, 1112, "", 1, 0 +desiredRpmLimit = scalar, S16, 1116, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 1120, "", 1, 0 +sparkCounter = scalar, U32, 1124, "", 1, 0 +fuelingLoad = scalar, F32, 1128, "", 1, 0 +ignitionLoad = scalar, F32, 1132, "", 1, 0 +veTableYAxis = scalar, U16, 1136, "%", 0.01, 0 +; total TS size = 1140 +tpsFrom = scalar, F32, 1140 +tpsTo = scalar, F32, 1144 +deltaTps = scalar, F32, 1148 +extraFuel = scalar, F32, 1152, "", 1, 0 +valueFromTable = scalar, F32, 1156, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1160, [0:0] +isBelowDecelThreshold = bits, U32, 1160, [1:1] +isTimeToResetAccumulator = bits, U32, 1160, [2:2] +isFractionalEnrichment = bits, U32, 1160, [3:3] +belowEpsilon = bits, U32, 1160, [4:4] +tooShort = bits, U32, 1160, [5:5] +fractionalInjFuel = scalar, F32, 1164, "", 1, 0 +accumulatedValue = scalar, F32, 1168, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1172, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1176, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1180, "", 1, 0 +cycleCnt = scalar, S32, 1184, "", 1, 0 +; total TS size = 1188 +hwEventCounters1 = scalar, U32, 1188, "", 1, 0 +hwEventCounters2 = scalar, U32, 1192, "", 1, 0 +hwEventCounters3 = scalar, U32, 1196, "", 1, 0 +hwEventCounters4 = scalar, U32, 1200, "", 1, 0 +hwEventCounters5 = scalar, U32, 1204, "", 1, 0 +hwEventCounters6 = scalar, U32, 1208, "", 1, 0 +vvtCamCounter = scalar, U32, 1212, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1216, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1220, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1224, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1225, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1228, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1232, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1236, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1240, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1244, [0:0] +; total TS size = 1248 +crankSynchronizationCounter0 = scalar, U32, 1248, "", 1, 0 +vvtSyncGapRatio0 = scalar, F32, 1252, "", 1, 0 +vvtToothDurations00 = scalar, U32, 1256, "us", 1, 0 +vvtCurrentPosition0 = scalar, F32, 1260, "sync: Primary Cam Position", 1, 0 +vvtToothPosition10 = scalar, F32, 1264, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition20 = scalar, F32, 1268, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition30 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition40 = scalar, F32, 1276, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio0 = scalar, F32, 1280, "", 1, 0 +triggerStateIndex0 = scalar, U08, 1284, "", 1, 0 +vvtStateIndex0 = scalar, U08, 1285, "", 1, 0 +; total TS size = 1288 +camResyncCounter = scalar, U08, 1288, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1292, [0:0] +; total TS size = 1296 +wallFuelCorrection = scalar, F32, 1296, "", 1, 0 +wallFuel = scalar, F32, 1300, "", 1, 0 +; total TS size = 1304 +idleState = bits, S32, 1304, [0:2], "not important" +currentIdlePosition = scalar, F32, 1308 +baseIdlePosition = scalar, F32, 1312 +idleClosedLoop = scalar, F32, 1316 +iacByTpsTaper = scalar, F32, 1320 +throttlePedalUpState = scalar, S32, 1324, "", 1, 0 +mightResetPid = bits, U32, 1328, [0:0] +shouldResetPid = bits, U32, 1328, [1:1] +wasResetPid = bits, U32, 1328, [2:2] +mustResetPid = bits, U32, 1328, [3:3] +isCranking = bits, U32, 1328, [4:4] +isIacTableForCoasting = bits, U32, 1328, [5:5] +notIdling = bits, U32, 1328, [6:6] +needReset = bits, U32, 1328, [7:7] +isInDeadZone = bits, U32, 1328, [8:8] +isBlipping = bits, U32, 1328, [9:9] +useClosedLoop = bits, U32, 1328, [10:10] +badTps = bits, U32, 1328, [11:11] +looksLikeRunning = bits, U32, 1328, [12:12] +looksLikeCoasting = bits, U32, 1328, [13:13] +looksLikeCrankToIdle = bits, U32, 1328, [14:14] +isIdleCoasting = bits, U32, 1328, [15:15] +isIdleClosedLoop = bits, U32, 1328, [16:16] +idleTarget = scalar, S32, 1332, "", 1, 0 +targetRpmByClt = scalar, S32, 1336, "", 1, 0 +targetRpmAc = scalar, S32, 1340, "", 1, 0 +iacByRpmTaper = scalar, F32, 1344 +luaAdd = scalar, F32, 1348 +; total TS size = 1352 +idlePosition0 = scalar, F32, 1352, "per", 1,0 +trim0 = scalar, F32, 1356, "", 1, 0 +luaAdjustment0 = scalar, F32, 1360, "per", 1,0 +m_wastegatePosition0 = scalar, F32, 1364, "per", 1,0 +etbFeedForward0 = scalar, F32, 1368 +etbIntegralError0 = scalar, F32, 1372, "", 1, 0 +etbCurrentTarget0 = scalar, F32, 1376, "%", 1, 0 +etbCurrentAdjustedTarget0 = scalar, F32, 1380, "%", 1, 0 +etbRevLimitActive0 = bits, U32, 1384, [0:0] +jamDetected0 = bits, U32, 1384, [1:1] +etbDutyRateOfChange0 = scalar, F32, 1388, "per", 1,0 +etbDutyAverage0 = scalar, F32, 1392, "per", 1,0 +etbTpsErrorCounter0 = scalar, U16, 1396, "count", 1,0 +etbPpsErrorCounter0 = scalar, U16, 1398, "count", 1,0 +etbErrorCode0 = scalar, S08, 1400, "", 1, 0 +jamTimer0 = scalar, U16, 1402, "sec", 0.01, 0 +; total TS size = 1404 +faultCode0 = scalar, U08, 1404, "", 1, 0 +heaterDuty0 = scalar, U08, 1405, "%", 1, 0 +pumpDuty0 = scalar, U08, 1406, "%", 1, 0 +tempC0 = scalar, U16, 1408, "C", 1, 0 +nernstVoltage0 = scalar, U16, 1410, "V", 0.001, 0 +esr0 = scalar, U16, 1412, "ohm", 1, 0 +; total TS size = 1416 +dcOutput0 = scalar, F32, 1416, "per", 1,0 +isEnabled0_int = scalar, U08, 1420, "per", 1,0 +isEnabled0 = bits, U32, 1424, [0:0] +; total TS size = 1428 +value0 = scalar, U16, 1428, "value", 1,0 +value1 = scalar, U16, 1430, "value", 1,0 +errorRate = scalar, F32, 1432, "ratio", 1,0 ; total TS size = 1436 -lambdaCurrentlyGood = bits, U32, 1436, [0:0] -lambdaMonitorCut = bits, U32, 1436, [1:1] -lambdaTimeSinceGood = scalar, U16, 1440, "sec", 0.01, 0 -; total TS size = 1444 +vvtTarget = scalar, U16, 1436, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1438, "%", 0.5, 0 +; total TS size = 1440 +lambdaCurrentlyGood = bits, U32, 1440, [0:0] +lambdaMonitorCut = bits, U32, 1440, [1:1] +lambdaTimeSinceGood = scalar, U16, 1444, "sec", 0.01, 0 +; total TS size = 1448 diff --git a/firmware/console/binary/generated/total_live_data_generated.h b/firmware/console/binary/generated/total_live_data_generated.h index 175a646759..91d717cdbd 100644 --- a/firmware/console/binary/generated/total_live_data_generated.h +++ b/firmware/console/binary/generated/total_live_data_generated.h @@ -1,2 +1,2 @@ // generated by gen_live_documentation.sh / LiveDataProcessor.java -#define TS_TOTAL_OUTPUT_SIZE 1444 \ No newline at end of file +#define TS_TOTAL_OUTPUT_SIZE 1448 \ No newline at end of file diff --git a/firmware/console/binary_log/log_fields_generated.h b/firmware/console/binary_log/log_fields_generated.h index d77e9b6d2b..971ad9de00 100644 --- a/firmware/console/binary_log/log_fields_generated.h +++ b/firmware/console/binary_log/log_fields_generated.h @@ -388,6 +388,7 @@ static constexpr LogField fields[] = { {engine->engineState.startStopState, "startStopState", "", 0}, {engine->engineState.smartChipState, "smartChipState", "", 0}, {engine->engineState.smartChipRestartCounter, "smartChipRestartCounter", "", 0}, + {engine->engineState.smartChipAliveCounter, "smartChipAliveCounter", "", 0}, {engine->engineState.startStopStateToggleCounter, "startStopStateToggleCounter", "", 0}, {engine->engineState.egtValue1, "egtValue1", "", 0}, {engine->engineState.egtValue2, "egtValue2", "", 0}, diff --git a/firmware/controllers/algo/engine_state_generated.h b/firmware/controllers/algo/engine_state_generated.h index 6f742a3318..0b66d05673 100644 --- a/firmware/controllers/algo/engine_state_generated.h +++ b/firmware/controllers/algo/engine_state_generated.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool config_definition_base.jar based on (unknown script) controllers/algo/engine_state.txt Thu Dec 21 05:28:46 UTC 2023 +// this section was generated automatically by rusEFI tool config_definition_base.jar based on (unknown script) controllers/algo/engine_state.txt Tue Dec 26 22:46:57 UTC 2023 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -222,158 +222,168 @@ struct engine_state_s { */ int8_t smartChipRestartCounter = (int8_t)0; /** - offset 48 bit 0 */ + * offset 48 + */ + int8_t smartChipAliveCounter = (int8_t)0; + /** + * need 4 byte alignment + units + * offset 49 + */ + uint8_t alignmentFill_at_49[3]; + /** + offset 52 bit 0 */ bool startStopPhysicalState : 1 {}; /** - offset 48 bit 1 */ + offset 52 bit 1 */ bool acrStateDup : 1 {}; /** - offset 48 bit 2 */ + offset 52 bit 2 */ bool acrEngineMovedRecently : 1 {}; /** - offset 48 bit 3 */ + offset 52 bit 3 */ bool heaterControlEnabled : 1 {}; /** - offset 48 bit 4 */ + offset 52 bit 4 */ bool luaDigitalState0 : 1 {}; /** - offset 48 bit 5 */ + offset 52 bit 5 */ bool luaDigitalState1 : 1 {}; /** - offset 48 bit 6 */ + offset 52 bit 6 */ bool luaDigitalState2 : 1 {}; /** - offset 48 bit 7 */ + offset 52 bit 7 */ bool luaDigitalState3 : 1 {}; /** - offset 48 bit 8 */ - bool unusedBit_19_8 : 1 {}; + offset 52 bit 8 */ + bool unusedBit_21_8 : 1 {}; /** - offset 48 bit 9 */ - bool unusedBit_19_9 : 1 {}; + offset 52 bit 9 */ + bool unusedBit_21_9 : 1 {}; /** - offset 48 bit 10 */ - bool unusedBit_19_10 : 1 {}; + offset 52 bit 10 */ + bool unusedBit_21_10 : 1 {}; /** - offset 48 bit 11 */ - bool unusedBit_19_11 : 1 {}; + offset 52 bit 11 */ + bool unusedBit_21_11 : 1 {}; /** - offset 48 bit 12 */ - bool unusedBit_19_12 : 1 {}; + offset 52 bit 12 */ + bool unusedBit_21_12 : 1 {}; /** - offset 48 bit 13 */ - bool unusedBit_19_13 : 1 {}; + offset 52 bit 13 */ + bool unusedBit_21_13 : 1 {}; /** - offset 48 bit 14 */ - bool unusedBit_19_14 : 1 {}; + offset 52 bit 14 */ + bool unusedBit_21_14 : 1 {}; /** - offset 48 bit 15 */ - bool unusedBit_19_15 : 1 {}; + offset 52 bit 15 */ + bool unusedBit_21_15 : 1 {}; /** - offset 48 bit 16 */ - bool unusedBit_19_16 : 1 {}; + offset 52 bit 16 */ + bool unusedBit_21_16 : 1 {}; /** - offset 48 bit 17 */ - bool unusedBit_19_17 : 1 {}; + offset 52 bit 17 */ + bool unusedBit_21_17 : 1 {}; /** - offset 48 bit 18 */ - bool unusedBit_19_18 : 1 {}; + offset 52 bit 18 */ + bool unusedBit_21_18 : 1 {}; /** - offset 48 bit 19 */ - bool unusedBit_19_19 : 1 {}; + offset 52 bit 19 */ + bool unusedBit_21_19 : 1 {}; /** - offset 48 bit 20 */ - bool unusedBit_19_20 : 1 {}; + offset 52 bit 20 */ + bool unusedBit_21_20 : 1 {}; /** - offset 48 bit 21 */ - bool unusedBit_19_21 : 1 {}; + offset 52 bit 21 */ + bool unusedBit_21_21 : 1 {}; /** - offset 48 bit 22 */ - bool unusedBit_19_22 : 1 {}; + offset 52 bit 22 */ + bool unusedBit_21_22 : 1 {}; /** - offset 48 bit 23 */ - bool unusedBit_19_23 : 1 {}; + offset 52 bit 23 */ + bool unusedBit_21_23 : 1 {}; /** - offset 48 bit 24 */ - bool unusedBit_19_24 : 1 {}; + offset 52 bit 24 */ + bool unusedBit_21_24 : 1 {}; /** - offset 48 bit 25 */ - bool unusedBit_19_25 : 1 {}; + offset 52 bit 25 */ + bool unusedBit_21_25 : 1 {}; /** - offset 48 bit 26 */ - bool unusedBit_19_26 : 1 {}; + offset 52 bit 26 */ + bool unusedBit_21_26 : 1 {}; /** - offset 48 bit 27 */ - bool unusedBit_19_27 : 1 {}; + offset 52 bit 27 */ + bool unusedBit_21_27 : 1 {}; /** - offset 48 bit 28 */ - bool unusedBit_19_28 : 1 {}; + offset 52 bit 28 */ + bool unusedBit_21_28 : 1 {}; /** - offset 48 bit 29 */ - bool unusedBit_19_29 : 1 {}; + offset 52 bit 29 */ + bool unusedBit_21_29 : 1 {}; /** - offset 48 bit 30 */ - bool unusedBit_19_30 : 1 {}; + offset 52 bit 30 */ + bool unusedBit_21_30 : 1 {}; /** - offset 48 bit 31 */ - bool unusedBit_19_31 : 1 {}; - /** - * offset 52 - */ - uint32_t startStopStateToggleCounter = (uint32_t)0; + offset 52 bit 31 */ + bool unusedBit_21_31 : 1 {}; /** * offset 56 */ - float egtValue1 = (float)0; + uint32_t startStopStateToggleCounter = (uint32_t)0; /** * offset 60 */ + float egtValue1 = (float)0; + /** + * offset 64 + */ float egtValue2 = (float)0; /** * User-defined RPM hard limit rpm - * offset 64 + * offset 68 */ int16_t desiredRpmLimit = (int16_t)0; /** * need 4 byte alignment units - * offset 66 + * offset 70 */ - uint8_t alignmentFill_at_66[2]; + uint8_t alignmentFill_at_70[2]; /** * Fuel: Injection counter - * offset 68 + * offset 72 */ uint32_t fuelInjectionCounter = (uint32_t)0; /** * Ign: Spark counter - * offset 72 + * offset 76 */ uint32_t sparkCounter = (uint32_t)0; /** * @@GAUGE_NAME_FUEL_LOAD@@ - * offset 76 + * offset 80 */ float fuelingLoad = (float)0; /** * @@GAUGE_NAME_IGNITION_LOAD@@ - * offset 80 + * offset 84 */ float ignitionLoad = (float)0; /** % - * offset 84 + * offset 88 */ scaled_channel veTableYAxis = (uint16_t)0; /** * need 4 byte alignment units - * offset 86 + * offset 90 */ - uint8_t alignmentFill_at_86[2]; + uint8_t alignmentFill_at_90[2]; }; -static_assert(sizeof(engine_state_s) == 88); +static_assert(sizeof(engine_state_s) == 92); // end -// this section was generated automatically by rusEFI tool config_definition_base.jar based on (unknown script) controllers/algo/engine_state.txt Thu Dec 21 05:28:46 UTC 2023 +// this section was generated automatically by rusEFI tool config_definition_base.jar based on (unknown script) controllers/algo/engine_state.txt Tue Dec 26 22:46:57 UTC 2023 diff --git a/firmware/controllers/generated/rusefi_generated_alphax-2chan.h b/firmware/controllers/generated/rusefi_generated_alphax-2chan.h index 273f8cf625..a35c15c321 100644 --- a/firmware/controllers/generated/rusefi_generated_alphax-2chan.h +++ b/firmware/controllers/generated/rusefi_generated_alphax-2chan.h @@ -1145,7 +1145,7 @@ #define show_Frankenso_presets true #define show_Hellen_presets true #define show_test_presets true -#define SIGNATURE_HASH 2332397758 +#define SIGNATURE_HASH 1128189532 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1444,14 +1444,14 @@ #define ts_show_vr_threshold_2 false #define ts_show_vr_threshold_all true #define ts_show_vr_threshold_pins false -#define TS_SIGNATURE "rusEFI master.2023.12.26.alphax-2chan.2332397758" +#define TS_SIGNATURE "rusEFI master.2023.12.26.alphax-2chan.1128189532" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' #define TS_TEST_COMMAND_char t -#define TS_TOTAL_OUTPUT_SIZE 1444 +#define TS_TOTAL_OUTPUT_SIZE 1448 #define TS_TRIGGER_SCOPE_CHANNEL_1_NAME "Channel 1" #define TS_TRIGGER_SCOPE_CHANNEL_2_NAME "Channel 2" #define TS_TRIGGER_SCOPE_DISABLE 5 diff --git a/firmware/controllers/generated/rusefi_generated_alphax-4chan.h b/firmware/controllers/generated/rusefi_generated_alphax-4chan.h index 1402fc21bc..5a3502ae6f 100644 --- a/firmware/controllers/generated/rusefi_generated_alphax-4chan.h +++ b/firmware/controllers/generated/rusefi_generated_alphax-4chan.h @@ -1146,7 +1146,7 @@ #define show_Frankenso_presets true #define show_Hellen_presets true #define show_test_presets true -#define SIGNATURE_HASH 3897622086 +#define SIGNATURE_HASH 543924388 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1445,14 +1445,14 @@ #define ts_show_vr_threshold_2 true #define ts_show_vr_threshold_all true #define ts_show_vr_threshold_pins false -#define TS_SIGNATURE "rusEFI master.2023.12.26.alphax-4chan.3897622086" +#define TS_SIGNATURE "rusEFI master.2023.12.26.alphax-4chan.543924388" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' #define TS_TEST_COMMAND_char t -#define TS_TOTAL_OUTPUT_SIZE 1444 +#define TS_TOTAL_OUTPUT_SIZE 1448 #define TS_TRIGGER_SCOPE_CHANNEL_1_NAME "C2/C3 Crank VR" #define TS_TRIGGER_SCOPE_CHANNEL_2_NAME "E5/E6 Cam VR" #define TS_TRIGGER_SCOPE_DISABLE 5 diff --git a/firmware/controllers/generated/rusefi_generated_alphax-4chan_f7.h b/firmware/controllers/generated/rusefi_generated_alphax-4chan_f7.h index 266fa6ea4c..d135e268d9 100644 --- a/firmware/controllers/generated/rusefi_generated_alphax-4chan_f7.h +++ b/firmware/controllers/generated/rusefi_generated_alphax-4chan_f7.h @@ -1146,7 +1146,7 @@ #define show_Frankenso_presets true #define show_Hellen_presets true #define show_test_presets true -#define SIGNATURE_HASH 3897622086 +#define SIGNATURE_HASH 543924388 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1445,14 +1445,14 @@ #define ts_show_vr_threshold_2 true #define ts_show_vr_threshold_all true #define ts_show_vr_threshold_pins false -#define TS_SIGNATURE "rusEFI master.2023.12.26.alphax-4chan_f7.3897622086" +#define TS_SIGNATURE "rusEFI master.2023.12.26.alphax-4chan_f7.543924388" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' #define TS_TEST_COMMAND_char t -#define TS_TOTAL_OUTPUT_SIZE 1444 +#define TS_TOTAL_OUTPUT_SIZE 1448 #define TS_TRIGGER_SCOPE_CHANNEL_1_NAME "C2/C3 Crank VR" #define TS_TRIGGER_SCOPE_CHANNEL_2_NAME "E5/E6 Cam VR" #define TS_TRIGGER_SCOPE_DISABLE 5 diff --git a/firmware/controllers/generated/rusefi_generated_alphax-8chan-revA.h b/firmware/controllers/generated/rusefi_generated_alphax-8chan-revA.h index f904455e91..e6cf81f4d8 100644 --- a/firmware/controllers/generated/rusefi_generated_alphax-8chan-revA.h +++ b/firmware/controllers/generated/rusefi_generated_alphax-8chan-revA.h @@ -1147,7 +1147,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 3397647034 +#define SIGNATURE_HASH 45655128 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1446,14 +1446,14 @@ #define ts_show_vr_threshold_2 true #define ts_show_vr_threshold_all true #define ts_show_vr_threshold_pins true -#define TS_SIGNATURE "rusEFI master.2023.12.26.alphax-8chan-revA.3397647034" +#define TS_SIGNATURE "rusEFI master.2023.12.26.alphax-8chan-revA.45655128" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' #define TS_TEST_COMMAND_char t -#define TS_TOTAL_OUTPUT_SIZE 1444 +#define TS_TOTAL_OUTPUT_SIZE 1448 #define TS_TRIGGER_SCOPE_CHANNEL_1_NAME "Channel 1" #define TS_TRIGGER_SCOPE_CHANNEL_2_NAME "Channel 2" #define TS_TRIGGER_SCOPE_DISABLE 5 diff --git a/firmware/controllers/generated/rusefi_generated_alphax-8chan.h b/firmware/controllers/generated/rusefi_generated_alphax-8chan.h index 486cf8bdf2..671d01e0eb 100644 --- a/firmware/controllers/generated/rusefi_generated_alphax-8chan.h +++ b/firmware/controllers/generated/rusefi_generated_alphax-8chan.h @@ -1147,7 +1147,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 354930457 +#define SIGNATURE_HASH 3709637115 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1446,14 +1446,14 @@ #define ts_show_vr_threshold_2 true #define ts_show_vr_threshold_all true #define ts_show_vr_threshold_pins true -#define TS_SIGNATURE "rusEFI master.2023.12.26.alphax-8chan.354930457" +#define TS_SIGNATURE "rusEFI master.2023.12.26.alphax-8chan.3709637115" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' #define TS_TEST_COMMAND_char t -#define TS_TOTAL_OUTPUT_SIZE 1444 +#define TS_TOTAL_OUTPUT_SIZE 1448 #define TS_TRIGGER_SCOPE_CHANNEL_1_NAME "Channel 1" #define TS_TRIGGER_SCOPE_CHANNEL_2_NAME "Channel 2" #define TS_TRIGGER_SCOPE_DISABLE 5 diff --git a/firmware/controllers/generated/rusefi_generated_alphax-8chan_f7.h b/firmware/controllers/generated/rusefi_generated_alphax-8chan_f7.h index 345010f4e7..23f91ac2cd 100644 --- a/firmware/controllers/generated/rusefi_generated_alphax-8chan_f7.h +++ b/firmware/controllers/generated/rusefi_generated_alphax-8chan_f7.h @@ -1147,7 +1147,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 354930457 +#define SIGNATURE_HASH 3709637115 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1446,14 +1446,14 @@ #define ts_show_vr_threshold_2 true #define ts_show_vr_threshold_all true #define ts_show_vr_threshold_pins true -#define TS_SIGNATURE "rusEFI master.2023.12.26.alphax-8chan_f7.354930457" +#define TS_SIGNATURE "rusEFI master.2023.12.26.alphax-8chan_f7.3709637115" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' #define TS_TEST_COMMAND_char t -#define TS_TOTAL_OUTPUT_SIZE 1444 +#define TS_TOTAL_OUTPUT_SIZE 1448 #define TS_TRIGGER_SCOPE_CHANNEL_1_NAME "Channel 1" #define TS_TRIGGER_SCOPE_CHANNEL_2_NAME "Channel 2" #define TS_TRIGGER_SCOPE_DISABLE 5 diff --git a/firmware/controllers/generated/rusefi_generated_at_start_f435.h b/firmware/controllers/generated/rusefi_generated_at_start_f435.h index f347e980c3..94d6b4cf5b 100644 --- a/firmware/controllers/generated/rusefi_generated_at_start_f435.h +++ b/firmware/controllers/generated/rusefi_generated_at_start_f435.h @@ -1143,7 +1143,7 @@ #define SentEtbType_NONE 0 #define show_Frankenso_presets true #define show_test_presets true -#define SIGNATURE_HASH 4218430649 +#define SIGNATURE_HASH 860584539 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1442,14 +1442,14 @@ #define ts_show_vr_threshold_2 true #define ts_show_vr_threshold_all true #define ts_show_vr_threshold_pins true -#define TS_SIGNATURE "rusEFI master.2023.12.26.at_start_f435.4218430649" +#define TS_SIGNATURE "rusEFI master.2023.12.26.at_start_f435.860584539" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' #define TS_TEST_COMMAND_char t -#define TS_TOTAL_OUTPUT_SIZE 1444 +#define TS_TOTAL_OUTPUT_SIZE 1448 #define TS_TRIGGER_SCOPE_CHANNEL_1_NAME "Channel 1" #define TS_TRIGGER_SCOPE_CHANNEL_2_NAME "Channel 2" #define TS_TRIGGER_SCOPE_DISABLE 5 diff --git a/firmware/controllers/generated/rusefi_generated_atlas.h b/firmware/controllers/generated/rusefi_generated_atlas.h index b660f6df78..f64ea89557 100644 --- a/firmware/controllers/generated/rusefi_generated_atlas.h +++ b/firmware/controllers/generated/rusefi_generated_atlas.h @@ -1143,7 +1143,7 @@ #define SentEtbType_NONE 0 #define show_Frankenso_presets true #define show_test_presets true -#define SIGNATURE_HASH 3212308727 +#define SIGNATURE_HASH 2001514005 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1442,14 +1442,14 @@ #define ts_show_vr_threshold_2 true #define ts_show_vr_threshold_all true #define ts_show_vr_threshold_pins true -#define TS_SIGNATURE "rusEFI master.2023.12.26.atlas.3212308727" +#define TS_SIGNATURE "rusEFI master.2023.12.26.atlas.2001514005" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' #define TS_TEST_COMMAND_char t -#define TS_TOTAL_OUTPUT_SIZE 1444 +#define TS_TOTAL_OUTPUT_SIZE 1448 #define TS_TRIGGER_SCOPE_CHANNEL_1_NAME "Channel 1" #define TS_TRIGGER_SCOPE_CHANNEL_2_NAME "Channel 2" #define TS_TRIGGER_SCOPE_DISABLE 5 diff --git a/firmware/controllers/generated/rusefi_generated_f407-discovery.h b/firmware/controllers/generated/rusefi_generated_f407-discovery.h index de73c87501..67a7cd887c 100644 --- a/firmware/controllers/generated/rusefi_generated_f407-discovery.h +++ b/firmware/controllers/generated/rusefi_generated_f407-discovery.h @@ -1143,7 +1143,7 @@ #define SentEtbType_NONE 0 #define show_Frankenso_presets true #define show_test_presets true -#define SIGNATURE_HASH 2110701098 +#define SIGNATURE_HASH 3052789960 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1442,14 +1442,14 @@ #define ts_show_vr_threshold_2 true #define ts_show_vr_threshold_all true #define ts_show_vr_threshold_pins true -#define TS_SIGNATURE "rusEFI master.2023.12.26.f407-discovery.2110701098" +#define TS_SIGNATURE "rusEFI master.2023.12.26.f407-discovery.3052789960" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' #define TS_TEST_COMMAND_char t -#define TS_TOTAL_OUTPUT_SIZE 1444 +#define TS_TOTAL_OUTPUT_SIZE 1448 #define TS_TRIGGER_SCOPE_CHANNEL_1_NAME "Channel 1" #define TS_TRIGGER_SCOPE_CHANNEL_2_NAME "Channel 2" #define TS_TRIGGER_SCOPE_DISABLE 5 diff --git a/firmware/controllers/generated/rusefi_generated_f429-discovery.h b/firmware/controllers/generated/rusefi_generated_f429-discovery.h index de79dba85e..03208cbf14 100644 --- a/firmware/controllers/generated/rusefi_generated_f429-discovery.h +++ b/firmware/controllers/generated/rusefi_generated_f429-discovery.h @@ -1143,7 +1143,7 @@ #define SentEtbType_NONE 0 #define show_Frankenso_presets true #define show_test_presets true -#define SIGNATURE_HASH 4218430649 +#define SIGNATURE_HASH 860584539 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1442,14 +1442,14 @@ #define ts_show_vr_threshold_2 true #define ts_show_vr_threshold_all true #define ts_show_vr_threshold_pins true -#define TS_SIGNATURE "rusEFI master.2023.12.26.f429-discovery.4218430649" +#define TS_SIGNATURE "rusEFI master.2023.12.26.f429-discovery.860584539" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' #define TS_TEST_COMMAND_char t -#define TS_TOTAL_OUTPUT_SIZE 1444 +#define TS_TOTAL_OUTPUT_SIZE 1448 #define TS_TRIGGER_SCOPE_CHANNEL_1_NAME "Channel 1" #define TS_TRIGGER_SCOPE_CHANNEL_2_NAME "Channel 2" #define TS_TRIGGER_SCOPE_DISABLE 5 diff --git a/firmware/controllers/generated/rusefi_generated_f469-discovery.h b/firmware/controllers/generated/rusefi_generated_f469-discovery.h index b475b75104..b5e4a3bf30 100644 --- a/firmware/controllers/generated/rusefi_generated_f469-discovery.h +++ b/firmware/controllers/generated/rusefi_generated_f469-discovery.h @@ -1143,7 +1143,7 @@ #define SentEtbType_NONE 0 #define show_Frankenso_presets true #define show_test_presets true -#define SIGNATURE_HASH 3383173674 +#define SIGNATURE_HASH 27032776 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1442,14 +1442,14 @@ #define ts_show_vr_threshold_2 true #define ts_show_vr_threshold_all true #define ts_show_vr_threshold_pins true -#define TS_SIGNATURE "rusEFI master.2023.12.26.f469-discovery.3383173674" +#define TS_SIGNATURE "rusEFI master.2023.12.26.f469-discovery.27032776" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' #define TS_TEST_COMMAND_char t -#define TS_TOTAL_OUTPUT_SIZE 1444 +#define TS_TOTAL_OUTPUT_SIZE 1448 #define TS_TRIGGER_SCOPE_CHANNEL_1_NAME "Channel 1" #define TS_TRIGGER_SCOPE_CHANNEL_2_NAME "Channel 2" #define TS_TRIGGER_SCOPE_DISABLE 5 diff --git a/firmware/controllers/generated/rusefi_generated_frankenso_na6.h b/firmware/controllers/generated/rusefi_generated_frankenso_na6.h index 1d5e6373aa..bbf2d05668 100644 --- a/firmware/controllers/generated/rusefi_generated_frankenso_na6.h +++ b/firmware/controllers/generated/rusefi_generated_frankenso_na6.h @@ -1144,7 +1144,7 @@ #define show_Frankenso_presets true #define show_microRusEFI_presets false #define show_test_presets true -#define SIGNATURE_HASH 3642934387 +#define SIGNATURE_HASH 286890641 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1443,14 +1443,14 @@ #define ts_show_vr_threshold_2 true #define ts_show_vr_threshold_all true #define ts_show_vr_threshold_pins true -#define TS_SIGNATURE "rusEFI master.2023.12.26.frankenso_na6.3642934387" +#define TS_SIGNATURE "rusEFI master.2023.12.26.frankenso_na6.286890641" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' #define TS_TEST_COMMAND_char t -#define TS_TOTAL_OUTPUT_SIZE 1444 +#define TS_TOTAL_OUTPUT_SIZE 1448 #define TS_TRIGGER_SCOPE_CHANNEL_1_NAME "Channel 1" #define TS_TRIGGER_SCOPE_CHANNEL_2_NAME "Channel 2" #define TS_TRIGGER_SCOPE_DISABLE 5 diff --git a/firmware/controllers/generated/rusefi_generated_hellen-112-17.h b/firmware/controllers/generated/rusefi_generated_hellen-112-17.h index f95af3fd17..d48c4a2b58 100644 --- a/firmware/controllers/generated/rusefi_generated_hellen-112-17.h +++ b/firmware/controllers/generated/rusefi_generated_hellen-112-17.h @@ -1147,7 +1147,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 565227687 +#define SIGNATURE_HASH 3918261829 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1446,14 +1446,14 @@ #define ts_show_vr_threshold_2 true #define ts_show_vr_threshold_all false #define ts_show_vr_threshold_pins true -#define TS_SIGNATURE "rusEFI master.2023.12.26.hellen-112-17.565227687" +#define TS_SIGNATURE "rusEFI master.2023.12.26.hellen-112-17.3918261829" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' #define TS_TEST_COMMAND_char t -#define TS_TOTAL_OUTPUT_SIZE 1444 +#define TS_TOTAL_OUTPUT_SIZE 1448 #define TS_TRIGGER_SCOPE_CHANNEL_1_NAME "Channel 1" #define TS_TRIGGER_SCOPE_CHANNEL_2_NAME "Channel 2" #define TS_TRIGGER_SCOPE_DISABLE 5 diff --git a/firmware/controllers/generated/rusefi_generated_hellen-gm-e67.h b/firmware/controllers/generated/rusefi_generated_hellen-gm-e67.h index 2b28cbf06d..e0d130e3f5 100644 --- a/firmware/controllers/generated/rusefi_generated_hellen-gm-e67.h +++ b/firmware/controllers/generated/rusefi_generated_hellen-gm-e67.h @@ -1146,7 +1146,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 1266848329 +#define SIGNATURE_HASH 2209991851 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1445,14 +1445,14 @@ #define ts_show_vr_threshold_2 true #define ts_show_vr_threshold_all true #define ts_show_vr_threshold_pins true -#define TS_SIGNATURE "rusEFI master.2023.12.26.hellen-gm-e67.1266848329" +#define TS_SIGNATURE "rusEFI master.2023.12.26.hellen-gm-e67.2209991851" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' #define TS_TEST_COMMAND_char t -#define TS_TOTAL_OUTPUT_SIZE 1444 +#define TS_TOTAL_OUTPUT_SIZE 1448 #define TS_TRIGGER_SCOPE_CHANNEL_1_NAME "Channel 1" #define TS_TRIGGER_SCOPE_CHANNEL_2_NAME "Channel 2" #define TS_TRIGGER_SCOPE_DISABLE 5 diff --git a/firmware/controllers/generated/rusefi_generated_hellen-honda-k.h b/firmware/controllers/generated/rusefi_generated_hellen-honda-k.h index 00b9675031..74161a8ff9 100644 --- a/firmware/controllers/generated/rusefi_generated_hellen-honda-k.h +++ b/firmware/controllers/generated/rusefi_generated_hellen-honda-k.h @@ -1146,7 +1146,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 579869338 +#define SIGNATURE_HASH 3937092728 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1446,14 +1446,14 @@ #define ts_show_vr_threshold_2 true #define ts_show_vr_threshold_all false #define ts_show_vr_threshold_pins true -#define TS_SIGNATURE "rusEFI master.2023.12.26.hellen-honda-k.579869338" +#define TS_SIGNATURE "rusEFI master.2023.12.26.hellen-honda-k.3937092728" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' #define TS_TEST_COMMAND_char t -#define TS_TOTAL_OUTPUT_SIZE 1444 +#define TS_TOTAL_OUTPUT_SIZE 1448 #define TS_TRIGGER_SCOPE_CHANNEL_1_NAME "Channel 1" #define TS_TRIGGER_SCOPE_CHANNEL_2_NAME "Channel 2" #define TS_TRIGGER_SCOPE_DISABLE 5 diff --git a/firmware/controllers/generated/rusefi_generated_hellen-nb1.h b/firmware/controllers/generated/rusefi_generated_hellen-nb1.h index 194e351415..e981b3c5a5 100644 --- a/firmware/controllers/generated/rusefi_generated_hellen-nb1.h +++ b/firmware/controllers/generated/rusefi_generated_hellen-nb1.h @@ -1147,7 +1147,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 2494704046 +#define SIGNATURE_HASH 1552512844 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1446,14 +1446,14 @@ #define ts_show_vr_threshold_2 true #define ts_show_vr_threshold_all true #define ts_show_vr_threshold_pins true -#define TS_SIGNATURE "rusEFI master.2023.12.26.hellen-nb1.2494704046" +#define TS_SIGNATURE "rusEFI master.2023.12.26.hellen-nb1.1552512844" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' #define TS_TEST_COMMAND_char t -#define TS_TOTAL_OUTPUT_SIZE 1444 +#define TS_TOTAL_OUTPUT_SIZE 1448 #define TS_TRIGGER_SCOPE_CHANNEL_1_NAME "Channel 1" #define TS_TRIGGER_SCOPE_CHANNEL_2_NAME "Channel 2" #define TS_TRIGGER_SCOPE_DISABLE 5 diff --git a/firmware/controllers/generated/rusefi_generated_hellen121nissan.h b/firmware/controllers/generated/rusefi_generated_hellen121nissan.h index 4c8bd211a3..f0a68addc4 100644 --- a/firmware/controllers/generated/rusefi_generated_hellen121nissan.h +++ b/firmware/controllers/generated/rusefi_generated_hellen121nissan.h @@ -1146,7 +1146,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 1648804493 +#define SIGNATURE_HASH 2860358767 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1445,14 +1445,14 @@ #define ts_show_vr_threshold_2 true #define ts_show_vr_threshold_all false #define ts_show_vr_threshold_pins true -#define TS_SIGNATURE "rusEFI master.2023.12.26.hellen121nissan.1648804493" +#define TS_SIGNATURE "rusEFI master.2023.12.26.hellen121nissan.2860358767" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' #define TS_TEST_COMMAND_char t -#define TS_TOTAL_OUTPUT_SIZE 1444 +#define TS_TOTAL_OUTPUT_SIZE 1448 #define TS_TRIGGER_SCOPE_CHANNEL_1_NAME "Channel 1" #define TS_TRIGGER_SCOPE_CHANNEL_2_NAME "Channel 2" #define TS_TRIGGER_SCOPE_DISABLE 5 diff --git a/firmware/controllers/generated/rusefi_generated_hellen121vag.h b/firmware/controllers/generated/rusefi_generated_hellen121vag.h index 395295a71d..2a3c59699f 100644 --- a/firmware/controllers/generated/rusefi_generated_hellen121vag.h +++ b/firmware/controllers/generated/rusefi_generated_hellen121vag.h @@ -1146,7 +1146,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 2341535225 +#define SIGNATURE_HASH 1135321883 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1445,14 +1445,14 @@ #define ts_show_vr_threshold_2 true #define ts_show_vr_threshold_all true #define ts_show_vr_threshold_pins true -#define TS_SIGNATURE "rusEFI master.2023.12.26.hellen121vag.2341535225" +#define TS_SIGNATURE "rusEFI master.2023.12.26.hellen121vag.1135321883" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' #define TS_TEST_COMMAND_char t -#define TS_TOTAL_OUTPUT_SIZE 1444 +#define TS_TOTAL_OUTPUT_SIZE 1448 #define TS_TRIGGER_SCOPE_CHANNEL_1_NAME "Channel 1" #define TS_TRIGGER_SCOPE_CHANNEL_2_NAME "Channel 2" #define TS_TRIGGER_SCOPE_DISABLE 5 diff --git a/firmware/controllers/generated/rusefi_generated_hellen128.h b/firmware/controllers/generated/rusefi_generated_hellen128.h index 9cf9f613ec..2df9a2ae3f 100644 --- a/firmware/controllers/generated/rusefi_generated_hellen128.h +++ b/firmware/controllers/generated/rusefi_generated_hellen128.h @@ -1146,7 +1146,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 883074003 +#define SIGNATURE_HASH 4237950257 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1445,14 +1445,14 @@ #define ts_show_vr_threshold_2 true #define ts_show_vr_threshold_all true #define ts_show_vr_threshold_pins true -#define TS_SIGNATURE "rusEFI master.2023.12.26.hellen128.883074003" +#define TS_SIGNATURE "rusEFI master.2023.12.26.hellen128.4237950257" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' #define TS_TEST_COMMAND_char t -#define TS_TOTAL_OUTPUT_SIZE 1444 +#define TS_TOTAL_OUTPUT_SIZE 1448 #define TS_TRIGGER_SCOPE_CHANNEL_1_NAME "Channel 1" #define TS_TRIGGER_SCOPE_CHANNEL_2_NAME "Channel 2" #define TS_TRIGGER_SCOPE_DISABLE 5 diff --git a/firmware/controllers/generated/rusefi_generated_hellen154hyundai.h b/firmware/controllers/generated/rusefi_generated_hellen154hyundai.h index c31f2b1173..2011c3329a 100644 --- a/firmware/controllers/generated/rusefi_generated_hellen154hyundai.h +++ b/firmware/controllers/generated/rusefi_generated_hellen154hyundai.h @@ -1146,7 +1146,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 3386060805 +#define SIGNATURE_HASH 32009959 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1445,14 +1445,14 @@ #define ts_show_vr_threshold_2 true #define ts_show_vr_threshold_all false #define ts_show_vr_threshold_pins true -#define TS_SIGNATURE "rusEFI master.2023.12.26.hellen154hyundai.3386060805" +#define TS_SIGNATURE "rusEFI master.2023.12.26.hellen154hyundai.32009959" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' #define TS_TEST_COMMAND_char t -#define TS_TOTAL_OUTPUT_SIZE 1444 +#define TS_TOTAL_OUTPUT_SIZE 1448 #define TS_TRIGGER_SCOPE_CHANNEL_1_NAME "Channel 1" #define TS_TRIGGER_SCOPE_CHANNEL_2_NAME "Channel 2" #define TS_TRIGGER_SCOPE_DISABLE 5 diff --git a/firmware/controllers/generated/rusefi_generated_hellen72.h b/firmware/controllers/generated/rusefi_generated_hellen72.h index b588bc8e6b..b930bdb3cf 100644 --- a/firmware/controllers/generated/rusefi_generated_hellen72.h +++ b/firmware/controllers/generated/rusefi_generated_hellen72.h @@ -1146,7 +1146,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 2536776340 +#define SIGNATURE_HASH 1594850422 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1445,14 +1445,14 @@ #define ts_show_vr_threshold_2 true #define ts_show_vr_threshold_all true #define ts_show_vr_threshold_pins true -#define TS_SIGNATURE "rusEFI master.2023.12.26.hellen72.2536776340" +#define TS_SIGNATURE "rusEFI master.2023.12.26.hellen72.1594850422" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' #define TS_TEST_COMMAND_char t -#define TS_TOTAL_OUTPUT_SIZE 1444 +#define TS_TOTAL_OUTPUT_SIZE 1448 #define TS_TRIGGER_SCOPE_CHANNEL_1_NAME "Channel 1" #define TS_TRIGGER_SCOPE_CHANNEL_2_NAME "Channel 2" #define TS_TRIGGER_SCOPE_DISABLE 5 diff --git a/firmware/controllers/generated/rusefi_generated_hellen81.h b/firmware/controllers/generated/rusefi_generated_hellen81.h index b5c9144ed2..c92ce2c7ab 100644 --- a/firmware/controllers/generated/rusefi_generated_hellen81.h +++ b/firmware/controllers/generated/rusefi_generated_hellen81.h @@ -1145,7 +1145,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 639882966 +#define SIGNATURE_HASH 3994585140 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1444,14 +1444,14 @@ #define ts_show_vr_threshold_2 true #define ts_show_vr_threshold_all true #define ts_show_vr_threshold_pins true -#define TS_SIGNATURE "rusEFI master.2023.12.26.hellen81.639882966" +#define TS_SIGNATURE "rusEFI master.2023.12.26.hellen81.3994585140" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' #define TS_TEST_COMMAND_char t -#define TS_TOTAL_OUTPUT_SIZE 1444 +#define TS_TOTAL_OUTPUT_SIZE 1448 #define TS_TRIGGER_SCOPE_CHANNEL_1_NAME "Channel 1" #define TS_TRIGGER_SCOPE_CHANNEL_2_NAME "Channel 2" #define TS_TRIGGER_SCOPE_DISABLE 5 diff --git a/firmware/controllers/generated/rusefi_generated_hellen88bmw.h b/firmware/controllers/generated/rusefi_generated_hellen88bmw.h index 89827f4229..072fc10c46 100644 --- a/firmware/controllers/generated/rusefi_generated_hellen88bmw.h +++ b/firmware/controllers/generated/rusefi_generated_hellen88bmw.h @@ -1146,7 +1146,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 357935485 +#define SIGNATURE_HASH 3715037087 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1445,14 +1445,14 @@ #define ts_show_vr_threshold_2 true #define ts_show_vr_threshold_all true #define ts_show_vr_threshold_pins true -#define TS_SIGNATURE "rusEFI master.2023.12.26.hellen88bmw.357935485" +#define TS_SIGNATURE "rusEFI master.2023.12.26.hellen88bmw.3715037087" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' #define TS_TEST_COMMAND_char t -#define TS_TOTAL_OUTPUT_SIZE 1444 +#define TS_TOTAL_OUTPUT_SIZE 1448 #define TS_TRIGGER_SCOPE_CHANNEL_1_NAME "Channel 1" #define TS_TRIGGER_SCOPE_CHANNEL_2_NAME "Channel 2" #define TS_TRIGGER_SCOPE_DISABLE 5 diff --git a/firmware/controllers/generated/rusefi_generated_hellenNA6.h b/firmware/controllers/generated/rusefi_generated_hellenNA6.h index b3e6327ad9..27e2499c2a 100644 --- a/firmware/controllers/generated/rusefi_generated_hellenNA6.h +++ b/firmware/controllers/generated/rusefi_generated_hellenNA6.h @@ -1147,7 +1147,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 276674717 +#define SIGNATURE_HASH 3628525183 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1446,14 +1446,14 @@ #define ts_show_vr_threshold_2 true #define ts_show_vr_threshold_all true #define ts_show_vr_threshold_pins true -#define TS_SIGNATURE "rusEFI master.2023.12.26.hellenNA6.276674717" +#define TS_SIGNATURE "rusEFI master.2023.12.26.hellenNA6.3628525183" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' #define TS_TEST_COMMAND_char t -#define TS_TOTAL_OUTPUT_SIZE 1444 +#define TS_TOTAL_OUTPUT_SIZE 1448 #define TS_TRIGGER_SCOPE_CHANNEL_1_NAME "Channel 1" #define TS_TRIGGER_SCOPE_CHANNEL_2_NAME "Channel 2" #define TS_TRIGGER_SCOPE_DISABLE 5 diff --git a/firmware/controllers/generated/rusefi_generated_hellenNA8_96.h b/firmware/controllers/generated/rusefi_generated_hellenNA8_96.h index dd7648aeb4..f4752b170c 100644 --- a/firmware/controllers/generated/rusefi_generated_hellenNA8_96.h +++ b/firmware/controllers/generated/rusefi_generated_hellenNA8_96.h @@ -1148,7 +1148,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 1994172498 +#define SIGNATURE_HASH 3202873008 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1447,14 +1447,14 @@ #define ts_show_vr_threshold_2 true #define ts_show_vr_threshold_all true #define ts_show_vr_threshold_pins true -#define TS_SIGNATURE "rusEFI master.2023.12.26.hellenNA8_96.1994172498" +#define TS_SIGNATURE "rusEFI master.2023.12.26.hellenNA8_96.3202873008" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' #define TS_TEST_COMMAND_char t -#define TS_TOTAL_OUTPUT_SIZE 1444 +#define TS_TOTAL_OUTPUT_SIZE 1448 #define TS_TRIGGER_SCOPE_CHANNEL_1_NAME "Channel 1" #define TS_TRIGGER_SCOPE_CHANNEL_2_NAME "Channel 2" #define TS_TRIGGER_SCOPE_DISABLE 5 diff --git a/firmware/controllers/generated/rusefi_generated_m74_9.h b/firmware/controllers/generated/rusefi_generated_m74_9.h index 2168aa88cd..c677ce7de9 100644 --- a/firmware/controllers/generated/rusefi_generated_m74_9.h +++ b/firmware/controllers/generated/rusefi_generated_m74_9.h @@ -1146,7 +1146,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 1937674899 +#define SIGNATURE_HASH 3141913713 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1446,14 +1446,14 @@ #define ts_show_vr_threshold_2 true #define ts_show_vr_threshold_all true #define ts_show_vr_threshold_pins true -#define TS_SIGNATURE "rusEFI master.2023.12.26.m74_9.1937674899" +#define TS_SIGNATURE "rusEFI master.2023.12.26.m74_9.3141913713" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' #define TS_TEST_COMMAND_char t -#define TS_TOTAL_OUTPUT_SIZE 1444 +#define TS_TOTAL_OUTPUT_SIZE 1448 #define TS_TRIGGER_SCOPE_CHANNEL_1_NAME "Channel 1" #define TS_TRIGGER_SCOPE_CHANNEL_2_NAME "Channel 2" #define TS_TRIGGER_SCOPE_DISABLE 5 diff --git a/firmware/controllers/generated/rusefi_generated_mre_f4.h b/firmware/controllers/generated/rusefi_generated_mre_f4.h index f54b2cfdab..6c3f6cecaf 100644 --- a/firmware/controllers/generated/rusefi_generated_mre_f4.h +++ b/firmware/controllers/generated/rusefi_generated_mre_f4.h @@ -1145,7 +1145,7 @@ #define show_Frankenso_presets false #define show_microRusEFI_presets true #define show_test_presets false -#define SIGNATURE_HASH 3625831737 +#define SIGNATURE_HASH 270963675 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1444,14 +1444,14 @@ #define ts_show_vr_threshold_2 true #define ts_show_vr_threshold_all true #define ts_show_vr_threshold_pins true -#define TS_SIGNATURE "rusEFI master.2023.12.26.mre_f4.3625831737" +#define TS_SIGNATURE "rusEFI master.2023.12.26.mre_f4.270963675" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' #define TS_TEST_COMMAND_char t -#define TS_TOTAL_OUTPUT_SIZE 1444 +#define TS_TOTAL_OUTPUT_SIZE 1448 #define TS_TRIGGER_SCOPE_CHANNEL_1_NAME "Channel 1" #define TS_TRIGGER_SCOPE_CHANNEL_2_NAME "Channel 2" #define TS_TRIGGER_SCOPE_DISABLE 5 diff --git a/firmware/controllers/generated/rusefi_generated_mre_f7.h b/firmware/controllers/generated/rusefi_generated_mre_f7.h index 7205ce49ab..ce1abf1bdb 100644 --- a/firmware/controllers/generated/rusefi_generated_mre_f7.h +++ b/firmware/controllers/generated/rusefi_generated_mre_f7.h @@ -1145,7 +1145,7 @@ #define show_Frankenso_presets false #define show_microRusEFI_presets true #define show_test_presets false -#define SIGNATURE_HASH 3625831737 +#define SIGNATURE_HASH 270963675 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1444,14 +1444,14 @@ #define ts_show_vr_threshold_2 true #define ts_show_vr_threshold_all true #define ts_show_vr_threshold_pins true -#define TS_SIGNATURE "rusEFI master.2023.12.26.mre_f7.3625831737" +#define TS_SIGNATURE "rusEFI master.2023.12.26.mre_f7.270963675" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' #define TS_TEST_COMMAND_char t -#define TS_TOTAL_OUTPUT_SIZE 1444 +#define TS_TOTAL_OUTPUT_SIZE 1448 #define TS_TRIGGER_SCOPE_CHANNEL_1_NAME "Channel 1" #define TS_TRIGGER_SCOPE_CHANNEL_2_NAME "Channel 2" #define TS_TRIGGER_SCOPE_DISABLE 5 diff --git a/firmware/controllers/generated/rusefi_generated_nucleo_h743.h b/firmware/controllers/generated/rusefi_generated_nucleo_h743.h index 8d06f3ec2a..f0970a1b5f 100644 --- a/firmware/controllers/generated/rusefi_generated_nucleo_h743.h +++ b/firmware/controllers/generated/rusefi_generated_nucleo_h743.h @@ -1143,7 +1143,7 @@ #define SentEtbType_NONE 0 #define show_Frankenso_presets true #define show_test_presets true -#define SIGNATURE_HASH 4218430649 +#define SIGNATURE_HASH 860584539 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1442,14 +1442,14 @@ #define ts_show_vr_threshold_2 true #define ts_show_vr_threshold_all true #define ts_show_vr_threshold_pins true -#define TS_SIGNATURE "rusEFI master.2023.12.26.nucleo_h743.4218430649" +#define TS_SIGNATURE "rusEFI master.2023.12.26.nucleo_h743.860584539" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' #define TS_TEST_COMMAND_char t -#define TS_TOTAL_OUTPUT_SIZE 1444 +#define TS_TOTAL_OUTPUT_SIZE 1448 #define TS_TRIGGER_SCOPE_CHANNEL_1_NAME "Channel 1" #define TS_TRIGGER_SCOPE_CHANNEL_2_NAME "Channel 2" #define TS_TRIGGER_SCOPE_DISABLE 5 diff --git a/firmware/controllers/generated/rusefi_generated_prometheus_405.h b/firmware/controllers/generated/rusefi_generated_prometheus_405.h index e98b5dea21..9fab8e4710 100644 --- a/firmware/controllers/generated/rusefi_generated_prometheus_405.h +++ b/firmware/controllers/generated/rusefi_generated_prometheus_405.h @@ -1143,7 +1143,7 @@ #define SentEtbType_NONE 0 #define show_Frankenso_presets true #define show_test_presets true -#define SIGNATURE_HASH 3420776745 +#define SIGNATURE_HASH 64993227 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1442,14 +1442,14 @@ #define ts_show_vr_threshold_2 true #define ts_show_vr_threshold_all true #define ts_show_vr_threshold_pins true -#define TS_SIGNATURE "rusEFI master.2023.12.26.prometheus_405.3420776745" +#define TS_SIGNATURE "rusEFI master.2023.12.26.prometheus_405.64993227" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' #define TS_TEST_COMMAND_char t -#define TS_TOTAL_OUTPUT_SIZE 1444 +#define TS_TOTAL_OUTPUT_SIZE 1448 #define TS_TRIGGER_SCOPE_CHANNEL_1_NAME "Channel 1" #define TS_TRIGGER_SCOPE_CHANNEL_2_NAME "Channel 2" #define TS_TRIGGER_SCOPE_DISABLE 5 diff --git a/firmware/controllers/generated/rusefi_generated_prometheus_469.h b/firmware/controllers/generated/rusefi_generated_prometheus_469.h index 4fb94a4c3d..e092a6994b 100644 --- a/firmware/controllers/generated/rusefi_generated_prometheus_469.h +++ b/firmware/controllers/generated/rusefi_generated_prometheus_469.h @@ -1143,7 +1143,7 @@ #define SentEtbType_NONE 0 #define show_Frankenso_presets true #define show_test_presets true -#define SIGNATURE_HASH 3420776745 +#define SIGNATURE_HASH 64993227 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1442,14 +1442,14 @@ #define ts_show_vr_threshold_2 true #define ts_show_vr_threshold_all true #define ts_show_vr_threshold_pins true -#define TS_SIGNATURE "rusEFI master.2023.12.26.prometheus_469.3420776745" +#define TS_SIGNATURE "rusEFI master.2023.12.26.prometheus_469.64993227" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' #define TS_TEST_COMMAND_char t -#define TS_TOTAL_OUTPUT_SIZE 1444 +#define TS_TOTAL_OUTPUT_SIZE 1448 #define TS_TRIGGER_SCOPE_CHANNEL_1_NAME "Channel 1" #define TS_TRIGGER_SCOPE_CHANNEL_2_NAME "Channel 2" #define TS_TRIGGER_SCOPE_DISABLE 5 diff --git a/firmware/controllers/generated/rusefi_generated_proteus_f4.h b/firmware/controllers/generated/rusefi_generated_proteus_f4.h index ab2a64dd33..78a55416e7 100644 --- a/firmware/controllers/generated/rusefi_generated_proteus_f4.h +++ b/firmware/controllers/generated/rusefi_generated_proteus_f4.h @@ -1145,7 +1145,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets true #define show_test_presets false -#define SIGNATURE_HASH 4217625283 +#define SIGNATURE_HASH 861439009 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1444,14 +1444,14 @@ #define ts_show_vr_threshold_2 true #define ts_show_vr_threshold_all true #define ts_show_vr_threshold_pins true -#define TS_SIGNATURE "rusEFI master.2023.12.26.proteus_f4.4217625283" +#define TS_SIGNATURE "rusEFI master.2023.12.26.proteus_f4.861439009" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' #define TS_TEST_COMMAND_char t -#define TS_TOTAL_OUTPUT_SIZE 1444 +#define TS_TOTAL_OUTPUT_SIZE 1448 #define TS_TRIGGER_SCOPE_CHANNEL_1_NAME "Channel 1" #define TS_TRIGGER_SCOPE_CHANNEL_2_NAME "Channel 2" #define TS_TRIGGER_SCOPE_DISABLE 5 diff --git a/firmware/controllers/generated/rusefi_generated_proteus_f7.h b/firmware/controllers/generated/rusefi_generated_proteus_f7.h index e4522057a2..70bfc26e53 100644 --- a/firmware/controllers/generated/rusefi_generated_proteus_f7.h +++ b/firmware/controllers/generated/rusefi_generated_proteus_f7.h @@ -1145,7 +1145,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets true #define show_test_presets false -#define SIGNATURE_HASH 4217625283 +#define SIGNATURE_HASH 861439009 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1444,14 +1444,14 @@ #define ts_show_vr_threshold_2 true #define ts_show_vr_threshold_all true #define ts_show_vr_threshold_pins true -#define TS_SIGNATURE "rusEFI master.2023.12.26.proteus_f7.4217625283" +#define TS_SIGNATURE "rusEFI master.2023.12.26.proteus_f7.861439009" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' #define TS_TEST_COMMAND_char t -#define TS_TOTAL_OUTPUT_SIZE 1444 +#define TS_TOTAL_OUTPUT_SIZE 1448 #define TS_TRIGGER_SCOPE_CHANNEL_1_NAME "Channel 1" #define TS_TRIGGER_SCOPE_CHANNEL_2_NAME "Channel 2" #define TS_TRIGGER_SCOPE_DISABLE 5 diff --git a/firmware/controllers/generated/rusefi_generated_proteus_h7.h b/firmware/controllers/generated/rusefi_generated_proteus_h7.h index 22cd3cfac6..739baba82a 100644 --- a/firmware/controllers/generated/rusefi_generated_proteus_h7.h +++ b/firmware/controllers/generated/rusefi_generated_proteus_h7.h @@ -1145,7 +1145,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets true #define show_test_presets false -#define SIGNATURE_HASH 4217625283 +#define SIGNATURE_HASH 861439009 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1444,14 +1444,14 @@ #define ts_show_vr_threshold_2 true #define ts_show_vr_threshold_all true #define ts_show_vr_threshold_pins true -#define TS_SIGNATURE "rusEFI master.2023.12.26.proteus_h7.4217625283" +#define TS_SIGNATURE "rusEFI master.2023.12.26.proteus_h7.861439009" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' #define TS_TEST_COMMAND_char t -#define TS_TOTAL_OUTPUT_SIZE 1444 +#define TS_TOTAL_OUTPUT_SIZE 1448 #define TS_TRIGGER_SCOPE_CHANNEL_1_NAME "Channel 1" #define TS_TRIGGER_SCOPE_CHANNEL_2_NAME "Channel 2" #define TS_TRIGGER_SCOPE_DISABLE 5 diff --git a/firmware/controllers/generated/rusefi_generated_s105.h b/firmware/controllers/generated/rusefi_generated_s105.h index 4bf94cf1c5..71b8552a8f 100644 --- a/firmware/controllers/generated/rusefi_generated_s105.h +++ b/firmware/controllers/generated/rusefi_generated_s105.h @@ -1146,7 +1146,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 2489042143 +#define SIGNATURE_HASH 1549834813 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1446,14 +1446,14 @@ #define ts_show_vr_threshold_2 true #define ts_show_vr_threshold_all true #define ts_show_vr_threshold_pins true -#define TS_SIGNATURE "rusEFI master.2023.12.26.s105.2489042143" +#define TS_SIGNATURE "rusEFI master.2023.12.26.s105.1549834813" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' #define TS_TEST_COMMAND_char t -#define TS_TOTAL_OUTPUT_SIZE 1444 +#define TS_TOTAL_OUTPUT_SIZE 1448 #define TS_TRIGGER_SCOPE_CHANNEL_1_NAME "Channel 1" #define TS_TRIGGER_SCOPE_CHANNEL_2_NAME "Channel 2" #define TS_TRIGGER_SCOPE_DISABLE 5 diff --git a/firmware/controllers/generated/rusefi_generated_small-can-board.h b/firmware/controllers/generated/rusefi_generated_small-can-board.h index 616d56e1e4..55b9b92e91 100644 --- a/firmware/controllers/generated/rusefi_generated_small-can-board.h +++ b/firmware/controllers/generated/rusefi_generated_small-can-board.h @@ -1144,7 +1144,7 @@ #define show_Frankenso_presets true #define show_small_can_board_presets true #define show_test_presets true -#define SIGNATURE_HASH 3318868016 +#define SIGNATURE_HASH 233486034 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1443,14 +1443,14 @@ #define ts_show_vr_threshold_2 true #define ts_show_vr_threshold_all true #define ts_show_vr_threshold_pins true -#define TS_SIGNATURE "rusEFI master.2023.12.26.small-can-board.3318868016" +#define TS_SIGNATURE "rusEFI master.2023.12.26.small-can-board.233486034" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' #define TS_TEST_COMMAND_char t -#define TS_TOTAL_OUTPUT_SIZE 1444 +#define TS_TOTAL_OUTPUT_SIZE 1448 #define TS_TRIGGER_SCOPE_CHANNEL_1_NAME "Channel 1" #define TS_TRIGGER_SCOPE_CHANNEL_2_NAME "Channel 2" #define TS_TRIGGER_SCOPE_DISABLE 5 diff --git a/firmware/controllers/generated/rusefi_generated_stm32f413_nucleo.h b/firmware/controllers/generated/rusefi_generated_stm32f413_nucleo.h index 8bb5671f75..1e1285a18f 100644 --- a/firmware/controllers/generated/rusefi_generated_stm32f413_nucleo.h +++ b/firmware/controllers/generated/rusefi_generated_stm32f413_nucleo.h @@ -1143,7 +1143,7 @@ #define SentEtbType_NONE 0 #define show_Frankenso_presets true #define show_test_presets true -#define SIGNATURE_HASH 4218430649 +#define SIGNATURE_HASH 860584539 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1442,14 +1442,14 @@ #define ts_show_vr_threshold_2 true #define ts_show_vr_threshold_all true #define ts_show_vr_threshold_pins true -#define TS_SIGNATURE "rusEFI master.2023.12.26.stm32f413_nucleo.4218430649" +#define TS_SIGNATURE "rusEFI master.2023.12.26.stm32f413_nucleo.860584539" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' #define TS_TEST_COMMAND_char t -#define TS_TOTAL_OUTPUT_SIZE 1444 +#define TS_TOTAL_OUTPUT_SIZE 1448 #define TS_TRIGGER_SCOPE_CHANNEL_1_NAME "Channel 1" #define TS_TRIGGER_SCOPE_CHANNEL_2_NAME "Channel 2" #define TS_TRIGGER_SCOPE_DISABLE 5 diff --git a/firmware/controllers/generated/rusefi_generated_stm32f429_nucleo.h b/firmware/controllers/generated/rusefi_generated_stm32f429_nucleo.h index 68b415b3b2..8fb76bd92f 100644 --- a/firmware/controllers/generated/rusefi_generated_stm32f429_nucleo.h +++ b/firmware/controllers/generated/rusefi_generated_stm32f429_nucleo.h @@ -1143,7 +1143,7 @@ #define SentEtbType_NONE 0 #define show_Frankenso_presets true #define show_test_presets true -#define SIGNATURE_HASH 4218430649 +#define SIGNATURE_HASH 860584539 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1442,14 +1442,14 @@ #define ts_show_vr_threshold_2 true #define ts_show_vr_threshold_all true #define ts_show_vr_threshold_pins true -#define TS_SIGNATURE "rusEFI master.2023.12.26.stm32f429_nucleo.4218430649" +#define TS_SIGNATURE "rusEFI master.2023.12.26.stm32f429_nucleo.860584539" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' #define TS_TEST_COMMAND_char t -#define TS_TOTAL_OUTPUT_SIZE 1444 +#define TS_TOTAL_OUTPUT_SIZE 1448 #define TS_TRIGGER_SCOPE_CHANNEL_1_NAME "Channel 1" #define TS_TRIGGER_SCOPE_CHANNEL_2_NAME "Channel 2" #define TS_TRIGGER_SCOPE_DISABLE 5 diff --git a/firmware/controllers/generated/rusefi_generated_stm32f767_nucleo.h b/firmware/controllers/generated/rusefi_generated_stm32f767_nucleo.h index 76378f0bdf..87791d615e 100644 --- a/firmware/controllers/generated/rusefi_generated_stm32f767_nucleo.h +++ b/firmware/controllers/generated/rusefi_generated_stm32f767_nucleo.h @@ -1143,7 +1143,7 @@ #define SentEtbType_NONE 0 #define show_Frankenso_presets true #define show_test_presets true -#define SIGNATURE_HASH 4218430649 +#define SIGNATURE_HASH 860584539 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1442,14 +1442,14 @@ #define ts_show_vr_threshold_2 true #define ts_show_vr_threshold_all true #define ts_show_vr_threshold_pins true -#define TS_SIGNATURE "rusEFI master.2023.12.26.stm32f767_nucleo.4218430649" +#define TS_SIGNATURE "rusEFI master.2023.12.26.stm32f767_nucleo.860584539" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' #define TS_TEST_COMMAND_char t -#define TS_TOTAL_OUTPUT_SIZE 1444 +#define TS_TOTAL_OUTPUT_SIZE 1448 #define TS_TRIGGER_SCOPE_CHANNEL_1_NAME "Channel 1" #define TS_TRIGGER_SCOPE_CHANNEL_2_NAME "Channel 2" #define TS_TRIGGER_SCOPE_DISABLE 5 diff --git a/firmware/controllers/generated/rusefi_generated_t-b-g.h b/firmware/controllers/generated/rusefi_generated_t-b-g.h index 00862e57f6..b18af76c3b 100644 --- a/firmware/controllers/generated/rusefi_generated_t-b-g.h +++ b/firmware/controllers/generated/rusefi_generated_t-b-g.h @@ -1143,7 +1143,7 @@ #define SentEtbType_NONE 0 #define show_Frankenso_presets true #define show_test_presets true -#define SIGNATURE_HASH 4218430649 +#define SIGNATURE_HASH 860584539 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1442,14 +1442,14 @@ #define ts_show_vr_threshold_2 true #define ts_show_vr_threshold_all true #define ts_show_vr_threshold_pins true -#define TS_SIGNATURE "rusEFI master.2023.12.26.t-b-g.4218430649" +#define TS_SIGNATURE "rusEFI master.2023.12.26.t-b-g.860584539" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' #define TS_TEST_COMMAND_char t -#define TS_TOTAL_OUTPUT_SIZE 1444 +#define TS_TOTAL_OUTPUT_SIZE 1448 #define TS_TRIGGER_SCOPE_CHANNEL_1_NAME "Channel 1" #define TS_TRIGGER_SCOPE_CHANNEL_2_NAME "Channel 2" #define TS_TRIGGER_SCOPE_DISABLE 5 diff --git a/firmware/controllers/generated/rusefi_generated_tdg-pdm8.h b/firmware/controllers/generated/rusefi_generated_tdg-pdm8.h index f037b581d1..5990d6d01b 100644 --- a/firmware/controllers/generated/rusefi_generated_tdg-pdm8.h +++ b/firmware/controllers/generated/rusefi_generated_tdg-pdm8.h @@ -1143,7 +1143,7 @@ #define SentEtbType_NONE 0 #define show_Frankenso_presets true #define show_test_presets true -#define SIGNATURE_HASH 1910376603 +#define SIGNATURE_HASH 3118814841 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1442,14 +1442,14 @@ #define ts_show_vr_threshold_2 true #define ts_show_vr_threshold_all true #define ts_show_vr_threshold_pins true -#define TS_SIGNATURE "rusEFI master.2023.12.26.tdg-pdm8.1910376603" +#define TS_SIGNATURE "rusEFI master.2023.12.26.tdg-pdm8.3118814841" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' #define TS_TEST_COMMAND_char t -#define TS_TOTAL_OUTPUT_SIZE 1444 +#define TS_TOTAL_OUTPUT_SIZE 1448 #define TS_TRIGGER_SCOPE_CHANNEL_1_NAME "Channel 1" #define TS_TRIGGER_SCOPE_CHANNEL_2_NAME "Channel 2" #define TS_TRIGGER_SCOPE_DISABLE 5 diff --git a/firmware/controllers/generated/rusefi_generated_uaefi.h b/firmware/controllers/generated/rusefi_generated_uaefi.h index b856b94c55..c3ec64fe37 100644 --- a/firmware/controllers/generated/rusefi_generated_uaefi.h +++ b/firmware/controllers/generated/rusefi_generated_uaefi.h @@ -1147,7 +1147,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 983659470 +#define SIGNATURE_HASH 4070190380 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1446,14 +1446,14 @@ #define ts_show_vr_threshold_2 true #define ts_show_vr_threshold_all false #define ts_show_vr_threshold_pins true -#define TS_SIGNATURE "rusEFI master.2023.12.26.uaefi.983659470" +#define TS_SIGNATURE "rusEFI master.2023.12.26.uaefi.4070190380" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' #define TS_TEST_COMMAND_char t -#define TS_TOTAL_OUTPUT_SIZE 1444 +#define TS_TOTAL_OUTPUT_SIZE 1448 #define TS_TRIGGER_SCOPE_CHANNEL_1_NAME "Channel 1" #define TS_TRIGGER_SCOPE_CHANNEL_2_NAME "Channel 2" #define TS_TRIGGER_SCOPE_DISABLE 5 diff --git a/firmware/controllers/generated/signature_alphax-2chan.h b/firmware/controllers/generated/signature_alphax-2chan.h index 9c13dfcebe..2577a61f4b 100644 --- a/firmware/controllers/generated/signature_alphax-2chan.h +++ b/firmware/controllers/generated/signature_alphax-2chan.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 2332397758 -#define TS_SIGNATURE "rusEFI master.2023.12.26.alphax-2chan.2332397758" +#define SIGNATURE_HASH 1128189532 +#define TS_SIGNATURE "rusEFI master.2023.12.26.alphax-2chan.1128189532" diff --git a/firmware/controllers/generated/signature_alphax-4chan.h b/firmware/controllers/generated/signature_alphax-4chan.h index 4ea6c81d17..9a35a3ee29 100644 --- a/firmware/controllers/generated/signature_alphax-4chan.h +++ b/firmware/controllers/generated/signature_alphax-4chan.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 3897622086 -#define TS_SIGNATURE "rusEFI master.2023.12.26.alphax-4chan.3897622086" +#define SIGNATURE_HASH 543924388 +#define TS_SIGNATURE "rusEFI master.2023.12.26.alphax-4chan.543924388" diff --git a/firmware/controllers/generated/signature_alphax-4chan_f7.h b/firmware/controllers/generated/signature_alphax-4chan_f7.h index 0747918af8..a8bbbe7a90 100644 --- a/firmware/controllers/generated/signature_alphax-4chan_f7.h +++ b/firmware/controllers/generated/signature_alphax-4chan_f7.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 3897622086 -#define TS_SIGNATURE "rusEFI master.2023.12.26.alphax-4chan_f7.3897622086" +#define SIGNATURE_HASH 543924388 +#define TS_SIGNATURE "rusEFI master.2023.12.26.alphax-4chan_f7.543924388" diff --git a/firmware/controllers/generated/signature_alphax-8chan-revA.h b/firmware/controllers/generated/signature_alphax-8chan-revA.h index ca1574018b..6671e1b94b 100644 --- a/firmware/controllers/generated/signature_alphax-8chan-revA.h +++ b/firmware/controllers/generated/signature_alphax-8chan-revA.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 3397647034 -#define TS_SIGNATURE "rusEFI master.2023.12.26.alphax-8chan-revA.3397647034" +#define SIGNATURE_HASH 45655128 +#define TS_SIGNATURE "rusEFI master.2023.12.26.alphax-8chan-revA.45655128" diff --git a/firmware/controllers/generated/signature_alphax-8chan.h b/firmware/controllers/generated/signature_alphax-8chan.h index f1672ca3d4..f864a671eb 100644 --- a/firmware/controllers/generated/signature_alphax-8chan.h +++ b/firmware/controllers/generated/signature_alphax-8chan.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 354930457 -#define TS_SIGNATURE "rusEFI master.2023.12.26.alphax-8chan.354930457" +#define SIGNATURE_HASH 3709637115 +#define TS_SIGNATURE "rusEFI master.2023.12.26.alphax-8chan.3709637115" diff --git a/firmware/controllers/generated/signature_alphax-8chan_f7.h b/firmware/controllers/generated/signature_alphax-8chan_f7.h index e3139975b4..4895eb62bb 100644 --- a/firmware/controllers/generated/signature_alphax-8chan_f7.h +++ b/firmware/controllers/generated/signature_alphax-8chan_f7.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 354930457 -#define TS_SIGNATURE "rusEFI master.2023.12.26.alphax-8chan_f7.354930457" +#define SIGNATURE_HASH 3709637115 +#define TS_SIGNATURE "rusEFI master.2023.12.26.alphax-8chan_f7.3709637115" diff --git a/firmware/controllers/generated/signature_at_start_f435.h b/firmware/controllers/generated/signature_at_start_f435.h index 373296d932..7b5d5869db 100644 --- a/firmware/controllers/generated/signature_at_start_f435.h +++ b/firmware/controllers/generated/signature_at_start_f435.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 4218430649 -#define TS_SIGNATURE "rusEFI master.2023.12.26.at_start_f435.4218430649" +#define SIGNATURE_HASH 860584539 +#define TS_SIGNATURE "rusEFI master.2023.12.26.at_start_f435.860584539" diff --git a/firmware/controllers/generated/signature_atlas.h b/firmware/controllers/generated/signature_atlas.h index 8f53a22b12..c8b6e362fe 100644 --- a/firmware/controllers/generated/signature_atlas.h +++ b/firmware/controllers/generated/signature_atlas.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 3212308727 -#define TS_SIGNATURE "rusEFI master.2023.12.26.atlas.3212308727" +#define SIGNATURE_HASH 2001514005 +#define TS_SIGNATURE "rusEFI master.2023.12.26.atlas.2001514005" diff --git a/firmware/controllers/generated/signature_cypress.h b/firmware/controllers/generated/signature_cypress.h index 516c2c2c40..dd78c3c068 100644 --- a/firmware/controllers/generated/signature_cypress.h +++ b/firmware/controllers/generated/signature_cypress.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition.jar based on hellen_cypress_gen_config.bat by SignatureConsumer // -#define SIGNATURE_HASH 4218430649 -#define TS_SIGNATURE "rusEFI master.2023.12.26.cypress.4218430649" +#define SIGNATURE_HASH 860584539 +#define TS_SIGNATURE "rusEFI master.2023.12.26.cypress.860584539" diff --git a/firmware/controllers/generated/signature_f407-discovery.h b/firmware/controllers/generated/signature_f407-discovery.h index 8385287891..0bdb39e381 100644 --- a/firmware/controllers/generated/signature_f407-discovery.h +++ b/firmware/controllers/generated/signature_f407-discovery.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 2110701098 -#define TS_SIGNATURE "rusEFI master.2023.12.26.f407-discovery.2110701098" +#define SIGNATURE_HASH 3052789960 +#define TS_SIGNATURE "rusEFI master.2023.12.26.f407-discovery.3052789960" diff --git a/firmware/controllers/generated/signature_f429-discovery.h b/firmware/controllers/generated/signature_f429-discovery.h index f83bcba55c..3b8686b3e3 100644 --- a/firmware/controllers/generated/signature_f429-discovery.h +++ b/firmware/controllers/generated/signature_f429-discovery.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 4218430649 -#define TS_SIGNATURE "rusEFI master.2023.12.26.f429-discovery.4218430649" +#define SIGNATURE_HASH 860584539 +#define TS_SIGNATURE "rusEFI master.2023.12.26.f429-discovery.860584539" diff --git a/firmware/controllers/generated/signature_f469-discovery.h b/firmware/controllers/generated/signature_f469-discovery.h index cc1c372694..77c00f73f0 100644 --- a/firmware/controllers/generated/signature_f469-discovery.h +++ b/firmware/controllers/generated/signature_f469-discovery.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 3383173674 -#define TS_SIGNATURE "rusEFI master.2023.12.26.f469-discovery.3383173674" +#define SIGNATURE_HASH 27032776 +#define TS_SIGNATURE "rusEFI master.2023.12.26.f469-discovery.27032776" diff --git a/firmware/controllers/generated/signature_frankenso_na6.h b/firmware/controllers/generated/signature_frankenso_na6.h index 7727ccc73e..86b5164c25 100644 --- a/firmware/controllers/generated/signature_frankenso_na6.h +++ b/firmware/controllers/generated/signature_frankenso_na6.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 3642934387 -#define TS_SIGNATURE "rusEFI master.2023.12.26.frankenso_na6.3642934387" +#define SIGNATURE_HASH 286890641 +#define TS_SIGNATURE "rusEFI master.2023.12.26.frankenso_na6.286890641" diff --git a/firmware/controllers/generated/signature_hellen-112-17.h b/firmware/controllers/generated/signature_hellen-112-17.h index 9de1cb7e65..9cd86fcc73 100644 --- a/firmware/controllers/generated/signature_hellen-112-17.h +++ b/firmware/controllers/generated/signature_hellen-112-17.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 565227687 -#define TS_SIGNATURE "rusEFI master.2023.12.26.hellen-112-17.565227687" +#define SIGNATURE_HASH 3918261829 +#define TS_SIGNATURE "rusEFI master.2023.12.26.hellen-112-17.3918261829" diff --git a/firmware/controllers/generated/signature_hellen-gm-e67.h b/firmware/controllers/generated/signature_hellen-gm-e67.h index b4b52fc06b..d3e05d298b 100644 --- a/firmware/controllers/generated/signature_hellen-gm-e67.h +++ b/firmware/controllers/generated/signature_hellen-gm-e67.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 1266848329 -#define TS_SIGNATURE "rusEFI master.2023.12.26.hellen-gm-e67.1266848329" +#define SIGNATURE_HASH 2209991851 +#define TS_SIGNATURE "rusEFI master.2023.12.26.hellen-gm-e67.2209991851" diff --git a/firmware/controllers/generated/signature_hellen-honda-k.h b/firmware/controllers/generated/signature_hellen-honda-k.h index 205e6b76a4..79d1d180e0 100644 --- a/firmware/controllers/generated/signature_hellen-honda-k.h +++ b/firmware/controllers/generated/signature_hellen-honda-k.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 579869338 -#define TS_SIGNATURE "rusEFI master.2023.12.26.hellen-honda-k.579869338" +#define SIGNATURE_HASH 3937092728 +#define TS_SIGNATURE "rusEFI master.2023.12.26.hellen-honda-k.3937092728" diff --git a/firmware/controllers/generated/signature_hellen-nb1.h b/firmware/controllers/generated/signature_hellen-nb1.h index f6279b0cca..5204d1bcda 100644 --- a/firmware/controllers/generated/signature_hellen-nb1.h +++ b/firmware/controllers/generated/signature_hellen-nb1.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 2494704046 -#define TS_SIGNATURE "rusEFI master.2023.12.26.hellen-nb1.2494704046" +#define SIGNATURE_HASH 1552512844 +#define TS_SIGNATURE "rusEFI master.2023.12.26.hellen-nb1.1552512844" diff --git a/firmware/controllers/generated/signature_hellen121nissan.h b/firmware/controllers/generated/signature_hellen121nissan.h index 60b3307e03..14b2a89673 100644 --- a/firmware/controllers/generated/signature_hellen121nissan.h +++ b/firmware/controllers/generated/signature_hellen121nissan.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 1648804493 -#define TS_SIGNATURE "rusEFI master.2023.12.26.hellen121nissan.1648804493" +#define SIGNATURE_HASH 2860358767 +#define TS_SIGNATURE "rusEFI master.2023.12.26.hellen121nissan.2860358767" diff --git a/firmware/controllers/generated/signature_hellen121vag.h b/firmware/controllers/generated/signature_hellen121vag.h index c5847e575a..3eff9963f3 100644 --- a/firmware/controllers/generated/signature_hellen121vag.h +++ b/firmware/controllers/generated/signature_hellen121vag.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 2341535225 -#define TS_SIGNATURE "rusEFI master.2023.12.26.hellen121vag.2341535225" +#define SIGNATURE_HASH 1135321883 +#define TS_SIGNATURE "rusEFI master.2023.12.26.hellen121vag.1135321883" diff --git a/firmware/controllers/generated/signature_hellen128.h b/firmware/controllers/generated/signature_hellen128.h index 80d2b381c3..e0e83f3e64 100644 --- a/firmware/controllers/generated/signature_hellen128.h +++ b/firmware/controllers/generated/signature_hellen128.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 883074003 -#define TS_SIGNATURE "rusEFI master.2023.12.26.hellen128.883074003" +#define SIGNATURE_HASH 4237950257 +#define TS_SIGNATURE "rusEFI master.2023.12.26.hellen128.4237950257" diff --git a/firmware/controllers/generated/signature_hellen154hyundai.h b/firmware/controllers/generated/signature_hellen154hyundai.h index 2bca6e9a18..fe2c1cc5de 100644 --- a/firmware/controllers/generated/signature_hellen154hyundai.h +++ b/firmware/controllers/generated/signature_hellen154hyundai.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 3386060805 -#define TS_SIGNATURE "rusEFI master.2023.12.26.hellen154hyundai.3386060805" +#define SIGNATURE_HASH 32009959 +#define TS_SIGNATURE "rusEFI master.2023.12.26.hellen154hyundai.32009959" diff --git a/firmware/controllers/generated/signature_hellen72.h b/firmware/controllers/generated/signature_hellen72.h index 104cbca65a..901d6ada19 100644 --- a/firmware/controllers/generated/signature_hellen72.h +++ b/firmware/controllers/generated/signature_hellen72.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 2536776340 -#define TS_SIGNATURE "rusEFI master.2023.12.26.hellen72.2536776340" +#define SIGNATURE_HASH 1594850422 +#define TS_SIGNATURE "rusEFI master.2023.12.26.hellen72.1594850422" diff --git a/firmware/controllers/generated/signature_hellen81.h b/firmware/controllers/generated/signature_hellen81.h index e257e068ff..dab75a2b5f 100644 --- a/firmware/controllers/generated/signature_hellen81.h +++ b/firmware/controllers/generated/signature_hellen81.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 639882966 -#define TS_SIGNATURE "rusEFI master.2023.12.26.hellen81.639882966" +#define SIGNATURE_HASH 3994585140 +#define TS_SIGNATURE "rusEFI master.2023.12.26.hellen81.3994585140" diff --git a/firmware/controllers/generated/signature_hellen88bmw.h b/firmware/controllers/generated/signature_hellen88bmw.h index 678fe16a78..80f8b47c12 100644 --- a/firmware/controllers/generated/signature_hellen88bmw.h +++ b/firmware/controllers/generated/signature_hellen88bmw.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 357935485 -#define TS_SIGNATURE "rusEFI master.2023.12.26.hellen88bmw.357935485" +#define SIGNATURE_HASH 3715037087 +#define TS_SIGNATURE "rusEFI master.2023.12.26.hellen88bmw.3715037087" diff --git a/firmware/controllers/generated/signature_hellenNA6.h b/firmware/controllers/generated/signature_hellenNA6.h index 3feb6b87fb..1ea5b67dca 100644 --- a/firmware/controllers/generated/signature_hellenNA6.h +++ b/firmware/controllers/generated/signature_hellenNA6.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 276674717 -#define TS_SIGNATURE "rusEFI master.2023.12.26.hellenNA6.276674717" +#define SIGNATURE_HASH 3628525183 +#define TS_SIGNATURE "rusEFI master.2023.12.26.hellenNA6.3628525183" diff --git a/firmware/controllers/generated/signature_hellenNA8_96.h b/firmware/controllers/generated/signature_hellenNA8_96.h index f5e58be669..08ff82836c 100644 --- a/firmware/controllers/generated/signature_hellenNA8_96.h +++ b/firmware/controllers/generated/signature_hellenNA8_96.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 1994172498 -#define TS_SIGNATURE "rusEFI master.2023.12.26.hellenNA8_96.1994172498" +#define SIGNATURE_HASH 3202873008 +#define TS_SIGNATURE "rusEFI master.2023.12.26.hellenNA8_96.3202873008" diff --git a/firmware/controllers/generated/signature_kin.h b/firmware/controllers/generated/signature_kin.h index 91d61fc07e..d83e6669c3 100644 --- a/firmware/controllers/generated/signature_kin.h +++ b/firmware/controllers/generated/signature_kin.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition.jar based on kinetis_gen_config.bat by SignatureConsumer // -#define SIGNATURE_HASH 3114394391 -#define TS_SIGNATURE "rusEFI master.2023.12.26.kin.3114394391" +#define SIGNATURE_HASH 1905966581 +#define TS_SIGNATURE "rusEFI master.2023.12.26.kin.1905966581" diff --git a/firmware/controllers/generated/signature_m74_9.h b/firmware/controllers/generated/signature_m74_9.h index 45e5e8ba1b..21f372af84 100644 --- a/firmware/controllers/generated/signature_m74_9.h +++ b/firmware/controllers/generated/signature_m74_9.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 1937674899 -#define TS_SIGNATURE "rusEFI master.2023.12.26.m74_9.1937674899" +#define SIGNATURE_HASH 3141913713 +#define TS_SIGNATURE "rusEFI master.2023.12.26.m74_9.3141913713" diff --git a/firmware/controllers/generated/signature_mre_f4.h b/firmware/controllers/generated/signature_mre_f4.h index aed50e2cfe..20b28138d9 100644 --- a/firmware/controllers/generated/signature_mre_f4.h +++ b/firmware/controllers/generated/signature_mre_f4.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 3625831737 -#define TS_SIGNATURE "rusEFI master.2023.12.26.mre_f4.3625831737" +#define SIGNATURE_HASH 270963675 +#define TS_SIGNATURE "rusEFI master.2023.12.26.mre_f4.270963675" diff --git a/firmware/controllers/generated/signature_mre_f7.h b/firmware/controllers/generated/signature_mre_f7.h index 280aca9351..5d55538487 100644 --- a/firmware/controllers/generated/signature_mre_f7.h +++ b/firmware/controllers/generated/signature_mre_f7.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 3625831737 -#define TS_SIGNATURE "rusEFI master.2023.12.26.mre_f7.3625831737" +#define SIGNATURE_HASH 270963675 +#define TS_SIGNATURE "rusEFI master.2023.12.26.mre_f7.270963675" diff --git a/firmware/controllers/generated/signature_nucleo_h743.h b/firmware/controllers/generated/signature_nucleo_h743.h index fe95cd78e1..5a40d29397 100644 --- a/firmware/controllers/generated/signature_nucleo_h743.h +++ b/firmware/controllers/generated/signature_nucleo_h743.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 4218430649 -#define TS_SIGNATURE "rusEFI master.2023.12.26.nucleo_h743.4218430649" +#define SIGNATURE_HASH 860584539 +#define TS_SIGNATURE "rusEFI master.2023.12.26.nucleo_h743.860584539" diff --git a/firmware/controllers/generated/signature_prometheus_405.h b/firmware/controllers/generated/signature_prometheus_405.h index 3c2309e18b..e5d98f6050 100644 --- a/firmware/controllers/generated/signature_prometheus_405.h +++ b/firmware/controllers/generated/signature_prometheus_405.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 3420776745 -#define TS_SIGNATURE "rusEFI master.2023.12.26.prometheus_405.3420776745" +#define SIGNATURE_HASH 64993227 +#define TS_SIGNATURE "rusEFI master.2023.12.26.prometheus_405.64993227" diff --git a/firmware/controllers/generated/signature_prometheus_469.h b/firmware/controllers/generated/signature_prometheus_469.h index 76963d6174..205e6b5494 100644 --- a/firmware/controllers/generated/signature_prometheus_469.h +++ b/firmware/controllers/generated/signature_prometheus_469.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 3420776745 -#define TS_SIGNATURE "rusEFI master.2023.12.26.prometheus_469.3420776745" +#define SIGNATURE_HASH 64993227 +#define TS_SIGNATURE "rusEFI master.2023.12.26.prometheus_469.64993227" diff --git a/firmware/controllers/generated/signature_proteus_f4.h b/firmware/controllers/generated/signature_proteus_f4.h index 3f8a56ad3e..b7da1a1edf 100644 --- a/firmware/controllers/generated/signature_proteus_f4.h +++ b/firmware/controllers/generated/signature_proteus_f4.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 4217625283 -#define TS_SIGNATURE "rusEFI master.2023.12.26.proteus_f4.4217625283" +#define SIGNATURE_HASH 861439009 +#define TS_SIGNATURE "rusEFI master.2023.12.26.proteus_f4.861439009" diff --git a/firmware/controllers/generated/signature_proteus_f7.h b/firmware/controllers/generated/signature_proteus_f7.h index 5694a8d520..1f9e1e5fcb 100644 --- a/firmware/controllers/generated/signature_proteus_f7.h +++ b/firmware/controllers/generated/signature_proteus_f7.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 4217625283 -#define TS_SIGNATURE "rusEFI master.2023.12.26.proteus_f7.4217625283" +#define SIGNATURE_HASH 861439009 +#define TS_SIGNATURE "rusEFI master.2023.12.26.proteus_f7.861439009" diff --git a/firmware/controllers/generated/signature_proteus_h7.h b/firmware/controllers/generated/signature_proteus_h7.h index c9d8f1a8ad..166b1e2aa7 100644 --- a/firmware/controllers/generated/signature_proteus_h7.h +++ b/firmware/controllers/generated/signature_proteus_h7.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 4217625283 -#define TS_SIGNATURE "rusEFI master.2023.12.26.proteus_h7.4217625283" +#define SIGNATURE_HASH 861439009 +#define TS_SIGNATURE "rusEFI master.2023.12.26.proteus_h7.861439009" diff --git a/firmware/controllers/generated/signature_s105.h b/firmware/controllers/generated/signature_s105.h index f0480642ff..75866b52de 100644 --- a/firmware/controllers/generated/signature_s105.h +++ b/firmware/controllers/generated/signature_s105.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 2489042143 -#define TS_SIGNATURE "rusEFI master.2023.12.26.s105.2489042143" +#define SIGNATURE_HASH 1549834813 +#define TS_SIGNATURE "rusEFI master.2023.12.26.s105.1549834813" diff --git a/firmware/controllers/generated/signature_small-can-board.h b/firmware/controllers/generated/signature_small-can-board.h index 5c63330131..4513e6d3c4 100644 --- a/firmware/controllers/generated/signature_small-can-board.h +++ b/firmware/controllers/generated/signature_small-can-board.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 3318868016 -#define TS_SIGNATURE "rusEFI master.2023.12.26.small-can-board.3318868016" +#define SIGNATURE_HASH 233486034 +#define TS_SIGNATURE "rusEFI master.2023.12.26.small-can-board.233486034" diff --git a/firmware/controllers/generated/signature_stm32f413_nucleo.h b/firmware/controllers/generated/signature_stm32f413_nucleo.h index d6b9e67aa8..0a2eee3382 100644 --- a/firmware/controllers/generated/signature_stm32f413_nucleo.h +++ b/firmware/controllers/generated/signature_stm32f413_nucleo.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 4218430649 -#define TS_SIGNATURE "rusEFI master.2023.12.26.stm32f413_nucleo.4218430649" +#define SIGNATURE_HASH 860584539 +#define TS_SIGNATURE "rusEFI master.2023.12.26.stm32f413_nucleo.860584539" diff --git a/firmware/controllers/generated/signature_stm32f429_nucleo.h b/firmware/controllers/generated/signature_stm32f429_nucleo.h index 7692a30998..11c9074b86 100644 --- a/firmware/controllers/generated/signature_stm32f429_nucleo.h +++ b/firmware/controllers/generated/signature_stm32f429_nucleo.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 4218430649 -#define TS_SIGNATURE "rusEFI master.2023.12.26.stm32f429_nucleo.4218430649" +#define SIGNATURE_HASH 860584539 +#define TS_SIGNATURE "rusEFI master.2023.12.26.stm32f429_nucleo.860584539" diff --git a/firmware/controllers/generated/signature_stm32f767_nucleo.h b/firmware/controllers/generated/signature_stm32f767_nucleo.h index 6d33b3f895..d83f587f23 100644 --- a/firmware/controllers/generated/signature_stm32f767_nucleo.h +++ b/firmware/controllers/generated/signature_stm32f767_nucleo.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 4218430649 -#define TS_SIGNATURE "rusEFI master.2023.12.26.stm32f767_nucleo.4218430649" +#define SIGNATURE_HASH 860584539 +#define TS_SIGNATURE "rusEFI master.2023.12.26.stm32f767_nucleo.860584539" diff --git a/firmware/controllers/generated/signature_subaru_eg33_f7.h b/firmware/controllers/generated/signature_subaru_eg33_f7.h index 7dab26a457..25894fd81c 100644 --- a/firmware/controllers/generated/signature_subaru_eg33_f7.h +++ b/firmware/controllers/generated/signature_subaru_eg33_f7.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition.jar based on config/boards/subaru_eg33/config/gen_subaru_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 4244497326 -#define TS_SIGNATURE "rusEFI master.2023.12.26.subaru_eg33_f7.4244497326" +#define SIGNATURE_HASH 885439820 +#define TS_SIGNATURE "rusEFI master.2023.12.26.subaru_eg33_f7.885439820" diff --git a/firmware/controllers/generated/signature_t-b-g.h b/firmware/controllers/generated/signature_t-b-g.h index 5d5aeca0a3..8534b60008 100644 --- a/firmware/controllers/generated/signature_t-b-g.h +++ b/firmware/controllers/generated/signature_t-b-g.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 4218430649 -#define TS_SIGNATURE "rusEFI master.2023.12.26.t-b-g.4218430649" +#define SIGNATURE_HASH 860584539 +#define TS_SIGNATURE "rusEFI master.2023.12.26.t-b-g.860584539" diff --git a/firmware/controllers/generated/signature_tdg-pdm8.h b/firmware/controllers/generated/signature_tdg-pdm8.h index ce990f7a38..426d45ddd1 100644 --- a/firmware/controllers/generated/signature_tdg-pdm8.h +++ b/firmware/controllers/generated/signature_tdg-pdm8.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 1910376603 -#define TS_SIGNATURE "rusEFI master.2023.12.26.tdg-pdm8.1910376603" +#define SIGNATURE_HASH 3118814841 +#define TS_SIGNATURE "rusEFI master.2023.12.26.tdg-pdm8.3118814841" diff --git a/firmware/controllers/generated/signature_uaefi.h b/firmware/controllers/generated/signature_uaefi.h index 4734fa69de..fa4e9aad55 100644 --- a/firmware/controllers/generated/signature_uaefi.h +++ b/firmware/controllers/generated/signature_uaefi.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 983659470 -#define TS_SIGNATURE "rusEFI master.2023.12.26.uaefi.983659470" +#define SIGNATURE_HASH 4070190380 +#define TS_SIGNATURE "rusEFI master.2023.12.26.uaefi.4070190380" diff --git a/firmware/controllers/lua/generated/output_lookup_generated.cpp b/firmware/controllers/lua/generated/output_lookup_generated.cpp index c7384dfe02..98a67aded4 100644 --- a/firmware/controllers/lua/generated/output_lookup_generated.cpp +++ b/firmware/controllers/lua/generated/output_lookup_generated.cpp @@ -1082,6 +1082,9 @@ float getOutputValueByName(const char *name) { // smartChipRestartCounter case 1192769173: return engine->engineState.smartChipRestartCounter; +// smartChipAliveCounter + case -1945673215: + return engine->engineState.smartChipAliveCounter; // startStopPhysicalState case -1943724937: return engine->engineState.startStopPhysicalState; diff --git a/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini b/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini index 16c1d6ecfe..dce4769226 100644 --- a/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini +++ b/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.12.26.alphax-2chan.2332397758" + signature = "rusEFI master.2023.12.26.alphax-2chan.1128189532" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.12.26.alphax-2chan.2332397758" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.12.26.alphax-2chan.1128189532" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -92,7 +92,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","INVALID","B4 - O2","On-board MAP","INVALID","B5 - TPS","A2 Battery Sense","C7 - CAM Hall/Digital","X7 - AIN4","X1 - AIN1","INVALID","INVALID","B2 - MAP","B7 - CLT","B3 - IAT","X3 - AIN2" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Tue Dec 26 01:36:39 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Tue Dec 26 22:47:10 UTC 2023 pageSize = 22088 page = 1 @@ -2373,7 +2373,7 @@ lambdaMaxDeviationRpmBins = array, U16, 22078, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1444 + ochBlockSize = 1448 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3027,145 +3027,146 @@ brakePedalState = scalar, S08, 1092, "", 1, 0 startStopState = scalar, S08, 1093, "", 1, 0 smartChipState = scalar, S08, 1094, "", 1, 0 smartChipRestartCounter = scalar, S08, 1095, "", 1, 0 -startStopPhysicalState = bits, U32, 1096, [0:0] -acrStateDup = bits, U32, 1096, [1:1] -acrEngineMovedRecently = bits, U32, 1096, [2:2] -heaterControlEnabled = bits, U32, 1096, [3:3] -luaDigitalState0 = bits, U32, 1096, [4:4] -luaDigitalState1 = bits, U32, 1096, [5:5] -luaDigitalState2 = bits, U32, 1096, [6:6] -luaDigitalState3 = bits, U32, 1096, [7:7] -startStopStateToggleCounter = scalar, U32, 1100, "", 1, 0 -egtValue1 = scalar, F32, 1104, "", 1, 0 -egtValue2 = scalar, F32, 1108, "", 1, 0 -desiredRpmLimit = scalar, S16, 1112, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1116, "", 1, 0 -sparkCounter = scalar, U32, 1120, "", 1, 0 -fuelingLoad = scalar, F32, 1124, "", 1, 0 -ignitionLoad = scalar, F32, 1128, "", 1, 0 -veTableYAxis = scalar, U16, 1132, "%", 0.01, 0 -; total TS size = 1136 -tpsFrom = scalar, F32, 1136 -tpsTo = scalar, F32, 1140 -deltaTps = scalar, F32, 1144 -extraFuel = scalar, F32, 1148, "", 1, 0 -valueFromTable = scalar, F32, 1152, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1156, [0:0] -isBelowDecelThreshold = bits, U32, 1156, [1:1] -isTimeToResetAccumulator = bits, U32, 1156, [2:2] -isFractionalEnrichment = bits, U32, 1156, [3:3] -belowEpsilon = bits, U32, 1156, [4:4] -tooShort = bits, U32, 1156, [5:5] -fractionalInjFuel = scalar, F32, 1160, "", 1, 0 -accumulatedValue = scalar, F32, 1164, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1168, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1172, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1176, "", 1, 0 -cycleCnt = scalar, S32, 1180, "", 1, 0 -; total TS size = 1184 -hwEventCounters1 = scalar, U32, 1184, "", 1, 0 -hwEventCounters2 = scalar, U32, 1188, "", 1, 0 -hwEventCounters3 = scalar, U32, 1192, "", 1, 0 -hwEventCounters4 = scalar, U32, 1196, "", 1, 0 -hwEventCounters5 = scalar, U32, 1200, "", 1, 0 -hwEventCounters6 = scalar, U32, 1204, "", 1, 0 -vvtCamCounter = scalar, U32, 1208, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1212, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1216, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1220, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1221, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1224, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1228, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1232, "", 1, 0 -mapCamPrevToothAngle = scalar, F32, 1236, "deg", 1, 0 -isDecodingMapCam = bits, U32, 1240, [0:0] -; total TS size = 1244 -crankSynchronizationCounter0 = scalar, U32, 1244, "", 1, 0 -vvtSyncGapRatio0 = scalar, F32, 1248, "", 1, 0 -vvtToothDurations00 = scalar, U32, 1252, "us", 1, 0 -vvtCurrentPosition0 = scalar, F32, 1256, "sync: Primary Cam Position", 1, 0 -vvtToothPosition10 = scalar, F32, 1260, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition20 = scalar, F32, 1264, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition30 = scalar, F32, 1268, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition40 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio0 = scalar, F32, 1276, "", 1, 0 -triggerStateIndex0 = scalar, U08, 1280, "", 1, 0 -vvtStateIndex0 = scalar, U08, 1281, "", 1, 0 -; total TS size = 1284 -camResyncCounter = scalar, U08, 1284, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1288, [0:0] -; total TS size = 1292 -wallFuelCorrection = scalar, F32, 1292, "", 1, 0 -wallFuel = scalar, F32, 1296, "", 1, 0 -; total TS size = 1300 -idleState = bits, S32, 1300, [0:2], "not important" -currentIdlePosition = scalar, F32, 1304 -baseIdlePosition = scalar, F32, 1308 -idleClosedLoop = scalar, F32, 1312 -iacByTpsTaper = scalar, F32, 1316 -throttlePedalUpState = scalar, S32, 1320, "", 1, 0 -mightResetPid = bits, U32, 1324, [0:0] -shouldResetPid = bits, U32, 1324, [1:1] -wasResetPid = bits, U32, 1324, [2:2] -mustResetPid = bits, U32, 1324, [3:3] -isCranking = bits, U32, 1324, [4:4] -isIacTableForCoasting = bits, U32, 1324, [5:5] -notIdling = bits, U32, 1324, [6:6] -needReset = bits, U32, 1324, [7:7] -isInDeadZone = bits, U32, 1324, [8:8] -isBlipping = bits, U32, 1324, [9:9] -useClosedLoop = bits, U32, 1324, [10:10] -badTps = bits, U32, 1324, [11:11] -looksLikeRunning = bits, U32, 1324, [12:12] -looksLikeCoasting = bits, U32, 1324, [13:13] -looksLikeCrankToIdle = bits, U32, 1324, [14:14] -isIdleCoasting = bits, U32, 1324, [15:15] -isIdleClosedLoop = bits, U32, 1324, [16:16] -idleTarget = scalar, S32, 1328, "", 1, 0 -targetRpmByClt = scalar, S32, 1332, "", 1, 0 -targetRpmAc = scalar, S32, 1336, "", 1, 0 -iacByRpmTaper = scalar, F32, 1340 -luaAdd = scalar, F32, 1344 -; total TS size = 1348 -idlePosition0 = scalar, F32, 1348, "per", 1,0 -trim0 = scalar, F32, 1352, "", 1, 0 -luaAdjustment0 = scalar, F32, 1356, "per", 1,0 -m_wastegatePosition0 = scalar, F32, 1360, "per", 1,0 -etbFeedForward0 = scalar, F32, 1364 -etbIntegralError0 = scalar, F32, 1368, "", 1, 0 -etbCurrentTarget0 = scalar, F32, 1372, "%", 1, 0 -etbCurrentAdjustedTarget0 = scalar, F32, 1376, "%", 1, 0 -etbRevLimitActive0 = bits, U32, 1380, [0:0] -jamDetected0 = bits, U32, 1380, [1:1] -etbDutyRateOfChange0 = scalar, F32, 1384, "per", 1,0 -etbDutyAverage0 = scalar, F32, 1388, "per", 1,0 -etbTpsErrorCounter0 = scalar, U16, 1392, "count", 1,0 -etbPpsErrorCounter0 = scalar, U16, 1394, "count", 1,0 -etbErrorCode0 = scalar, S08, 1396, "", 1, 0 -jamTimer0 = scalar, U16, 1398, "sec", 0.01, 0 -; total TS size = 1400 -faultCode0 = scalar, U08, 1400, "", 1, 0 -heaterDuty0 = scalar, U08, 1401, "%", 1, 0 -pumpDuty0 = scalar, U08, 1402, "%", 1, 0 -tempC0 = scalar, U16, 1404, "C", 1, 0 -nernstVoltage0 = scalar, U16, 1406, "V", 0.001, 0 -esr0 = scalar, U16, 1408, "ohm", 1, 0 -; total TS size = 1412 -dcOutput0 = scalar, F32, 1412, "per", 1,0 -isEnabled0_int = scalar, U08, 1416, "per", 1,0 -isEnabled0 = bits, U32, 1420, [0:0] -; total TS size = 1424 -value0 = scalar, U16, 1424, "value", 1,0 -value1 = scalar, U16, 1426, "value", 1,0 -errorRate = scalar, F32, 1428, "ratio", 1,0 -; total TS size = 1432 -vvtTarget = scalar, U16, 1432, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1434, "%", 0.5, 0 +smartChipAliveCounter = scalar, S08, 1096, "", 1, 0 +startStopPhysicalState = bits, U32, 1100, [0:0] +acrStateDup = bits, U32, 1100, [1:1] +acrEngineMovedRecently = bits, U32, 1100, [2:2] +heaterControlEnabled = bits, U32, 1100, [3:3] +luaDigitalState0 = bits, U32, 1100, [4:4] +luaDigitalState1 = bits, U32, 1100, [5:5] +luaDigitalState2 = bits, U32, 1100, [6:6] +luaDigitalState3 = bits, U32, 1100, [7:7] +startStopStateToggleCounter = scalar, U32, 1104, "", 1, 0 +egtValue1 = scalar, F32, 1108, "", 1, 0 +egtValue2 = scalar, F32, 1112, "", 1, 0 +desiredRpmLimit = scalar, S16, 1116, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 1120, "", 1, 0 +sparkCounter = scalar, U32, 1124, "", 1, 0 +fuelingLoad = scalar, F32, 1128, "", 1, 0 +ignitionLoad = scalar, F32, 1132, "", 1, 0 +veTableYAxis = scalar, U16, 1136, "%", 0.01, 0 +; total TS size = 1140 +tpsFrom = scalar, F32, 1140 +tpsTo = scalar, F32, 1144 +deltaTps = scalar, F32, 1148 +extraFuel = scalar, F32, 1152, "", 1, 0 +valueFromTable = scalar, F32, 1156, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1160, [0:0] +isBelowDecelThreshold = bits, U32, 1160, [1:1] +isTimeToResetAccumulator = bits, U32, 1160, [2:2] +isFractionalEnrichment = bits, U32, 1160, [3:3] +belowEpsilon = bits, U32, 1160, [4:4] +tooShort = bits, U32, 1160, [5:5] +fractionalInjFuel = scalar, F32, 1164, "", 1, 0 +accumulatedValue = scalar, F32, 1168, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1172, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1176, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1180, "", 1, 0 +cycleCnt = scalar, S32, 1184, "", 1, 0 +; total TS size = 1188 +hwEventCounters1 = scalar, U32, 1188, "", 1, 0 +hwEventCounters2 = scalar, U32, 1192, "", 1, 0 +hwEventCounters3 = scalar, U32, 1196, "", 1, 0 +hwEventCounters4 = scalar, U32, 1200, "", 1, 0 +hwEventCounters5 = scalar, U32, 1204, "", 1, 0 +hwEventCounters6 = scalar, U32, 1208, "", 1, 0 +vvtCamCounter = scalar, U32, 1212, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1216, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1220, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1224, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1225, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1228, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1232, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1236, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1240, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1244, [0:0] +; total TS size = 1248 +crankSynchronizationCounter0 = scalar, U32, 1248, "", 1, 0 +vvtSyncGapRatio0 = scalar, F32, 1252, "", 1, 0 +vvtToothDurations00 = scalar, U32, 1256, "us", 1, 0 +vvtCurrentPosition0 = scalar, F32, 1260, "sync: Primary Cam Position", 1, 0 +vvtToothPosition10 = scalar, F32, 1264, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition20 = scalar, F32, 1268, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition30 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition40 = scalar, F32, 1276, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio0 = scalar, F32, 1280, "", 1, 0 +triggerStateIndex0 = scalar, U08, 1284, "", 1, 0 +vvtStateIndex0 = scalar, U08, 1285, "", 1, 0 +; total TS size = 1288 +camResyncCounter = scalar, U08, 1288, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1292, [0:0] +; total TS size = 1296 +wallFuelCorrection = scalar, F32, 1296, "", 1, 0 +wallFuel = scalar, F32, 1300, "", 1, 0 +; total TS size = 1304 +idleState = bits, S32, 1304, [0:2], "not important" +currentIdlePosition = scalar, F32, 1308 +baseIdlePosition = scalar, F32, 1312 +idleClosedLoop = scalar, F32, 1316 +iacByTpsTaper = scalar, F32, 1320 +throttlePedalUpState = scalar, S32, 1324, "", 1, 0 +mightResetPid = bits, U32, 1328, [0:0] +shouldResetPid = bits, U32, 1328, [1:1] +wasResetPid = bits, U32, 1328, [2:2] +mustResetPid = bits, U32, 1328, [3:3] +isCranking = bits, U32, 1328, [4:4] +isIacTableForCoasting = bits, U32, 1328, [5:5] +notIdling = bits, U32, 1328, [6:6] +needReset = bits, U32, 1328, [7:7] +isInDeadZone = bits, U32, 1328, [8:8] +isBlipping = bits, U32, 1328, [9:9] +useClosedLoop = bits, U32, 1328, [10:10] +badTps = bits, U32, 1328, [11:11] +looksLikeRunning = bits, U32, 1328, [12:12] +looksLikeCoasting = bits, U32, 1328, [13:13] +looksLikeCrankToIdle = bits, U32, 1328, [14:14] +isIdleCoasting = bits, U32, 1328, [15:15] +isIdleClosedLoop = bits, U32, 1328, [16:16] +idleTarget = scalar, S32, 1332, "", 1, 0 +targetRpmByClt = scalar, S32, 1336, "", 1, 0 +targetRpmAc = scalar, S32, 1340, "", 1, 0 +iacByRpmTaper = scalar, F32, 1344 +luaAdd = scalar, F32, 1348 +; total TS size = 1352 +idlePosition0 = scalar, F32, 1352, "per", 1,0 +trim0 = scalar, F32, 1356, "", 1, 0 +luaAdjustment0 = scalar, F32, 1360, "per", 1,0 +m_wastegatePosition0 = scalar, F32, 1364, "per", 1,0 +etbFeedForward0 = scalar, F32, 1368 +etbIntegralError0 = scalar, F32, 1372, "", 1, 0 +etbCurrentTarget0 = scalar, F32, 1376, "%", 1, 0 +etbCurrentAdjustedTarget0 = scalar, F32, 1380, "%", 1, 0 +etbRevLimitActive0 = bits, U32, 1384, [0:0] +jamDetected0 = bits, U32, 1384, [1:1] +etbDutyRateOfChange0 = scalar, F32, 1388, "per", 1,0 +etbDutyAverage0 = scalar, F32, 1392, "per", 1,0 +etbTpsErrorCounter0 = scalar, U16, 1396, "count", 1,0 +etbPpsErrorCounter0 = scalar, U16, 1398, "count", 1,0 +etbErrorCode0 = scalar, S08, 1400, "", 1, 0 +jamTimer0 = scalar, U16, 1402, "sec", 0.01, 0 +; total TS size = 1404 +faultCode0 = scalar, U08, 1404, "", 1, 0 +heaterDuty0 = scalar, U08, 1405, "%", 1, 0 +pumpDuty0 = scalar, U08, 1406, "%", 1, 0 +tempC0 = scalar, U16, 1408, "C", 1, 0 +nernstVoltage0 = scalar, U16, 1410, "V", 0.001, 0 +esr0 = scalar, U16, 1412, "ohm", 1, 0 +; total TS size = 1416 +dcOutput0 = scalar, F32, 1416, "per", 1,0 +isEnabled0_int = scalar, U08, 1420, "per", 1,0 +isEnabled0 = bits, U32, 1424, [0:0] +; total TS size = 1428 +value0 = scalar, U16, 1428, "value", 1,0 +value1 = scalar, U16, 1430, "value", 1,0 +errorRate = scalar, F32, 1432, "ratio", 1,0 ; total TS size = 1436 -lambdaCurrentlyGood = bits, U32, 1436, [0:0] -lambdaMonitorCut = bits, U32, 1436, [1:1] -lambdaTimeSinceGood = scalar, U16, 1440, "sec", 0.01, 0 -; total TS size = 1444 +vvtTarget = scalar, U16, 1436, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1438, "%", 0.5, 0 +; total TS size = 1440 +lambdaCurrentlyGood = bits, U32, 1440, [0:0] +lambdaMonitorCut = bits, U32, 1440, [1:1] +lambdaTimeSinceGood = scalar, U16, 1444, "sec", 0.01, 0 +; total TS size = 1448 time = { timeNow } @@ -5237,6 +5238,7 @@ entry = brakePedalState, "Brake switch", int, "%d" entry = startStopState, "startStopState", int, "%d" entry = smartChipState, "smartChipState", int, "%d" entry = smartChipRestartCounter, "smartChipRestartCounter", int, "%d" +entry = smartChipAliveCounter, "smartChipAliveCounter", int, "%d" entry = startStopPhysicalState, "startStopPhysicalState", int, "%d" entry = acrStateDup, "acrStateDup", int, "%d" entry = acrEngineMovedRecently, "acrEngineMovedRecently", int, "%d" @@ -6200,16 +6202,17 @@ dialog = engine_stateDialog, "engine_state" graphLine = smartChipState graphLine = smartChipRestartCounter liveGraph = engine_state_5_Graph, "Graph", South + graphLine = smartChipAliveCounter graphLine = startStopStateToggleCounter graphLine = egtValue1 graphLine = egtValue2 - graphLine = desiredRpmLimit liveGraph = engine_state_6_Graph, "Graph", South + graphLine = desiredRpmLimit graphLine = fuelInjectionCounter graphLine = sparkCounter graphLine = fuelingLoad - graphLine = ignitionLoad liveGraph = engine_state_7_Graph, "Graph", South + graphLine = ignitionLoad graphLine = veTableYAxis indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini b/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini index 5763b2e314..b62ccc3a97 100644 --- a/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini +++ b/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.12.26.alphax-4chan.3897622086" + signature = "rusEFI master.2023.12.26.alphax-4chan.543924388" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.12.26.alphax-4chan.3897622086" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.12.26.alphax-4chan.543924388" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -92,7 +92,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","INVALID","B4 - O2","On-board MAP","D5 - PPS","B5 - TPS","F7 - Ignition Key Voltage","C7 - CAM Hall/Digital","INVALID","D4 - TPS2","INVALID","X5 - AIN3","B2 - MAP","B7 - CLT","B3 - IAT","F6 - PPS2","X7 - AIN4","INVALID","INVALID","INVALID","X3 - AIN2","X1 - AIN1 and D5 on older boards" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Tue Dec 26 01:36:42 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Tue Dec 26 22:47:13 UTC 2023 pageSize = 22088 page = 1 @@ -2373,7 +2373,7 @@ lambdaMaxDeviationRpmBins = array, U16, 22078, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1444 + ochBlockSize = 1448 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3027,145 +3027,146 @@ brakePedalState = scalar, S08, 1092, "", 1, 0 startStopState = scalar, S08, 1093, "", 1, 0 smartChipState = scalar, S08, 1094, "", 1, 0 smartChipRestartCounter = scalar, S08, 1095, "", 1, 0 -startStopPhysicalState = bits, U32, 1096, [0:0] -acrStateDup = bits, U32, 1096, [1:1] -acrEngineMovedRecently = bits, U32, 1096, [2:2] -heaterControlEnabled = bits, U32, 1096, [3:3] -luaDigitalState0 = bits, U32, 1096, [4:4] -luaDigitalState1 = bits, U32, 1096, [5:5] -luaDigitalState2 = bits, U32, 1096, [6:6] -luaDigitalState3 = bits, U32, 1096, [7:7] -startStopStateToggleCounter = scalar, U32, 1100, "", 1, 0 -egtValue1 = scalar, F32, 1104, "", 1, 0 -egtValue2 = scalar, F32, 1108, "", 1, 0 -desiredRpmLimit = scalar, S16, 1112, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1116, "", 1, 0 -sparkCounter = scalar, U32, 1120, "", 1, 0 -fuelingLoad = scalar, F32, 1124, "", 1, 0 -ignitionLoad = scalar, F32, 1128, "", 1, 0 -veTableYAxis = scalar, U16, 1132, "%", 0.01, 0 -; total TS size = 1136 -tpsFrom = scalar, F32, 1136 -tpsTo = scalar, F32, 1140 -deltaTps = scalar, F32, 1144 -extraFuel = scalar, F32, 1148, "", 1, 0 -valueFromTable = scalar, F32, 1152, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1156, [0:0] -isBelowDecelThreshold = bits, U32, 1156, [1:1] -isTimeToResetAccumulator = bits, U32, 1156, [2:2] -isFractionalEnrichment = bits, U32, 1156, [3:3] -belowEpsilon = bits, U32, 1156, [4:4] -tooShort = bits, U32, 1156, [5:5] -fractionalInjFuel = scalar, F32, 1160, "", 1, 0 -accumulatedValue = scalar, F32, 1164, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1168, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1172, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1176, "", 1, 0 -cycleCnt = scalar, S32, 1180, "", 1, 0 -; total TS size = 1184 -hwEventCounters1 = scalar, U32, 1184, "", 1, 0 -hwEventCounters2 = scalar, U32, 1188, "", 1, 0 -hwEventCounters3 = scalar, U32, 1192, "", 1, 0 -hwEventCounters4 = scalar, U32, 1196, "", 1, 0 -hwEventCounters5 = scalar, U32, 1200, "", 1, 0 -hwEventCounters6 = scalar, U32, 1204, "", 1, 0 -vvtCamCounter = scalar, U32, 1208, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1212, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1216, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1220, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1221, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1224, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1228, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1232, "", 1, 0 -mapCamPrevToothAngle = scalar, F32, 1236, "deg", 1, 0 -isDecodingMapCam = bits, U32, 1240, [0:0] -; total TS size = 1244 -crankSynchronizationCounter0 = scalar, U32, 1244, "", 1, 0 -vvtSyncGapRatio0 = scalar, F32, 1248, "", 1, 0 -vvtToothDurations00 = scalar, U32, 1252, "us", 1, 0 -vvtCurrentPosition0 = scalar, F32, 1256, "sync: Primary Cam Position", 1, 0 -vvtToothPosition10 = scalar, F32, 1260, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition20 = scalar, F32, 1264, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition30 = scalar, F32, 1268, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition40 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio0 = scalar, F32, 1276, "", 1, 0 -triggerStateIndex0 = scalar, U08, 1280, "", 1, 0 -vvtStateIndex0 = scalar, U08, 1281, "", 1, 0 -; total TS size = 1284 -camResyncCounter = scalar, U08, 1284, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1288, [0:0] -; total TS size = 1292 -wallFuelCorrection = scalar, F32, 1292, "", 1, 0 -wallFuel = scalar, F32, 1296, "", 1, 0 -; total TS size = 1300 -idleState = bits, S32, 1300, [0:2], "not important" -currentIdlePosition = scalar, F32, 1304 -baseIdlePosition = scalar, F32, 1308 -idleClosedLoop = scalar, F32, 1312 -iacByTpsTaper = scalar, F32, 1316 -throttlePedalUpState = scalar, S32, 1320, "", 1, 0 -mightResetPid = bits, U32, 1324, [0:0] -shouldResetPid = bits, U32, 1324, [1:1] -wasResetPid = bits, U32, 1324, [2:2] -mustResetPid = bits, U32, 1324, [3:3] -isCranking = bits, U32, 1324, [4:4] -isIacTableForCoasting = bits, U32, 1324, [5:5] -notIdling = bits, U32, 1324, [6:6] -needReset = bits, U32, 1324, [7:7] -isInDeadZone = bits, U32, 1324, [8:8] -isBlipping = bits, U32, 1324, [9:9] -useClosedLoop = bits, U32, 1324, [10:10] -badTps = bits, U32, 1324, [11:11] -looksLikeRunning = bits, U32, 1324, [12:12] -looksLikeCoasting = bits, U32, 1324, [13:13] -looksLikeCrankToIdle = bits, U32, 1324, [14:14] -isIdleCoasting = bits, U32, 1324, [15:15] -isIdleClosedLoop = bits, U32, 1324, [16:16] -idleTarget = scalar, S32, 1328, "", 1, 0 -targetRpmByClt = scalar, S32, 1332, "", 1, 0 -targetRpmAc = scalar, S32, 1336, "", 1, 0 -iacByRpmTaper = scalar, F32, 1340 -luaAdd = scalar, F32, 1344 -; total TS size = 1348 -idlePosition0 = scalar, F32, 1348, "per", 1,0 -trim0 = scalar, F32, 1352, "", 1, 0 -luaAdjustment0 = scalar, F32, 1356, "per", 1,0 -m_wastegatePosition0 = scalar, F32, 1360, "per", 1,0 -etbFeedForward0 = scalar, F32, 1364 -etbIntegralError0 = scalar, F32, 1368, "", 1, 0 -etbCurrentTarget0 = scalar, F32, 1372, "%", 1, 0 -etbCurrentAdjustedTarget0 = scalar, F32, 1376, "%", 1, 0 -etbRevLimitActive0 = bits, U32, 1380, [0:0] -jamDetected0 = bits, U32, 1380, [1:1] -etbDutyRateOfChange0 = scalar, F32, 1384, "per", 1,0 -etbDutyAverage0 = scalar, F32, 1388, "per", 1,0 -etbTpsErrorCounter0 = scalar, U16, 1392, "count", 1,0 -etbPpsErrorCounter0 = scalar, U16, 1394, "count", 1,0 -etbErrorCode0 = scalar, S08, 1396, "", 1, 0 -jamTimer0 = scalar, U16, 1398, "sec", 0.01, 0 -; total TS size = 1400 -faultCode0 = scalar, U08, 1400, "", 1, 0 -heaterDuty0 = scalar, U08, 1401, "%", 1, 0 -pumpDuty0 = scalar, U08, 1402, "%", 1, 0 -tempC0 = scalar, U16, 1404, "C", 1, 0 -nernstVoltage0 = scalar, U16, 1406, "V", 0.001, 0 -esr0 = scalar, U16, 1408, "ohm", 1, 0 -; total TS size = 1412 -dcOutput0 = scalar, F32, 1412, "per", 1,0 -isEnabled0_int = scalar, U08, 1416, "per", 1,0 -isEnabled0 = bits, U32, 1420, [0:0] -; total TS size = 1424 -value0 = scalar, U16, 1424, "value", 1,0 -value1 = scalar, U16, 1426, "value", 1,0 -errorRate = scalar, F32, 1428, "ratio", 1,0 -; total TS size = 1432 -vvtTarget = scalar, U16, 1432, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1434, "%", 0.5, 0 +smartChipAliveCounter = scalar, S08, 1096, "", 1, 0 +startStopPhysicalState = bits, U32, 1100, [0:0] +acrStateDup = bits, U32, 1100, [1:1] +acrEngineMovedRecently = bits, U32, 1100, [2:2] +heaterControlEnabled = bits, U32, 1100, [3:3] +luaDigitalState0 = bits, U32, 1100, [4:4] +luaDigitalState1 = bits, U32, 1100, [5:5] +luaDigitalState2 = bits, U32, 1100, [6:6] +luaDigitalState3 = bits, U32, 1100, [7:7] +startStopStateToggleCounter = scalar, U32, 1104, "", 1, 0 +egtValue1 = scalar, F32, 1108, "", 1, 0 +egtValue2 = scalar, F32, 1112, "", 1, 0 +desiredRpmLimit = scalar, S16, 1116, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 1120, "", 1, 0 +sparkCounter = scalar, U32, 1124, "", 1, 0 +fuelingLoad = scalar, F32, 1128, "", 1, 0 +ignitionLoad = scalar, F32, 1132, "", 1, 0 +veTableYAxis = scalar, U16, 1136, "%", 0.01, 0 +; total TS size = 1140 +tpsFrom = scalar, F32, 1140 +tpsTo = scalar, F32, 1144 +deltaTps = scalar, F32, 1148 +extraFuel = scalar, F32, 1152, "", 1, 0 +valueFromTable = scalar, F32, 1156, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1160, [0:0] +isBelowDecelThreshold = bits, U32, 1160, [1:1] +isTimeToResetAccumulator = bits, U32, 1160, [2:2] +isFractionalEnrichment = bits, U32, 1160, [3:3] +belowEpsilon = bits, U32, 1160, [4:4] +tooShort = bits, U32, 1160, [5:5] +fractionalInjFuel = scalar, F32, 1164, "", 1, 0 +accumulatedValue = scalar, F32, 1168, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1172, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1176, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1180, "", 1, 0 +cycleCnt = scalar, S32, 1184, "", 1, 0 +; total TS size = 1188 +hwEventCounters1 = scalar, U32, 1188, "", 1, 0 +hwEventCounters2 = scalar, U32, 1192, "", 1, 0 +hwEventCounters3 = scalar, U32, 1196, "", 1, 0 +hwEventCounters4 = scalar, U32, 1200, "", 1, 0 +hwEventCounters5 = scalar, U32, 1204, "", 1, 0 +hwEventCounters6 = scalar, U32, 1208, "", 1, 0 +vvtCamCounter = scalar, U32, 1212, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1216, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1220, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1224, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1225, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1228, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1232, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1236, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1240, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1244, [0:0] +; total TS size = 1248 +crankSynchronizationCounter0 = scalar, U32, 1248, "", 1, 0 +vvtSyncGapRatio0 = scalar, F32, 1252, "", 1, 0 +vvtToothDurations00 = scalar, U32, 1256, "us", 1, 0 +vvtCurrentPosition0 = scalar, F32, 1260, "sync: Primary Cam Position", 1, 0 +vvtToothPosition10 = scalar, F32, 1264, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition20 = scalar, F32, 1268, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition30 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition40 = scalar, F32, 1276, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio0 = scalar, F32, 1280, "", 1, 0 +triggerStateIndex0 = scalar, U08, 1284, "", 1, 0 +vvtStateIndex0 = scalar, U08, 1285, "", 1, 0 +; total TS size = 1288 +camResyncCounter = scalar, U08, 1288, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1292, [0:0] +; total TS size = 1296 +wallFuelCorrection = scalar, F32, 1296, "", 1, 0 +wallFuel = scalar, F32, 1300, "", 1, 0 +; total TS size = 1304 +idleState = bits, S32, 1304, [0:2], "not important" +currentIdlePosition = scalar, F32, 1308 +baseIdlePosition = scalar, F32, 1312 +idleClosedLoop = scalar, F32, 1316 +iacByTpsTaper = scalar, F32, 1320 +throttlePedalUpState = scalar, S32, 1324, "", 1, 0 +mightResetPid = bits, U32, 1328, [0:0] +shouldResetPid = bits, U32, 1328, [1:1] +wasResetPid = bits, U32, 1328, [2:2] +mustResetPid = bits, U32, 1328, [3:3] +isCranking = bits, U32, 1328, [4:4] +isIacTableForCoasting = bits, U32, 1328, [5:5] +notIdling = bits, U32, 1328, [6:6] +needReset = bits, U32, 1328, [7:7] +isInDeadZone = bits, U32, 1328, [8:8] +isBlipping = bits, U32, 1328, [9:9] +useClosedLoop = bits, U32, 1328, [10:10] +badTps = bits, U32, 1328, [11:11] +looksLikeRunning = bits, U32, 1328, [12:12] +looksLikeCoasting = bits, U32, 1328, [13:13] +looksLikeCrankToIdle = bits, U32, 1328, [14:14] +isIdleCoasting = bits, U32, 1328, [15:15] +isIdleClosedLoop = bits, U32, 1328, [16:16] +idleTarget = scalar, S32, 1332, "", 1, 0 +targetRpmByClt = scalar, S32, 1336, "", 1, 0 +targetRpmAc = scalar, S32, 1340, "", 1, 0 +iacByRpmTaper = scalar, F32, 1344 +luaAdd = scalar, F32, 1348 +; total TS size = 1352 +idlePosition0 = scalar, F32, 1352, "per", 1,0 +trim0 = scalar, F32, 1356, "", 1, 0 +luaAdjustment0 = scalar, F32, 1360, "per", 1,0 +m_wastegatePosition0 = scalar, F32, 1364, "per", 1,0 +etbFeedForward0 = scalar, F32, 1368 +etbIntegralError0 = scalar, F32, 1372, "", 1, 0 +etbCurrentTarget0 = scalar, F32, 1376, "%", 1, 0 +etbCurrentAdjustedTarget0 = scalar, F32, 1380, "%", 1, 0 +etbRevLimitActive0 = bits, U32, 1384, [0:0] +jamDetected0 = bits, U32, 1384, [1:1] +etbDutyRateOfChange0 = scalar, F32, 1388, "per", 1,0 +etbDutyAverage0 = scalar, F32, 1392, "per", 1,0 +etbTpsErrorCounter0 = scalar, U16, 1396, "count", 1,0 +etbPpsErrorCounter0 = scalar, U16, 1398, "count", 1,0 +etbErrorCode0 = scalar, S08, 1400, "", 1, 0 +jamTimer0 = scalar, U16, 1402, "sec", 0.01, 0 +; total TS size = 1404 +faultCode0 = scalar, U08, 1404, "", 1, 0 +heaterDuty0 = scalar, U08, 1405, "%", 1, 0 +pumpDuty0 = scalar, U08, 1406, "%", 1, 0 +tempC0 = scalar, U16, 1408, "C", 1, 0 +nernstVoltage0 = scalar, U16, 1410, "V", 0.001, 0 +esr0 = scalar, U16, 1412, "ohm", 1, 0 +; total TS size = 1416 +dcOutput0 = scalar, F32, 1416, "per", 1,0 +isEnabled0_int = scalar, U08, 1420, "per", 1,0 +isEnabled0 = bits, U32, 1424, [0:0] +; total TS size = 1428 +value0 = scalar, U16, 1428, "value", 1,0 +value1 = scalar, U16, 1430, "value", 1,0 +errorRate = scalar, F32, 1432, "ratio", 1,0 ; total TS size = 1436 -lambdaCurrentlyGood = bits, U32, 1436, [0:0] -lambdaMonitorCut = bits, U32, 1436, [1:1] -lambdaTimeSinceGood = scalar, U16, 1440, "sec", 0.01, 0 -; total TS size = 1444 +vvtTarget = scalar, U16, 1436, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1438, "%", 0.5, 0 +; total TS size = 1440 +lambdaCurrentlyGood = bits, U32, 1440, [0:0] +lambdaMonitorCut = bits, U32, 1440, [1:1] +lambdaTimeSinceGood = scalar, U16, 1444, "sec", 0.01, 0 +; total TS size = 1448 time = { timeNow } @@ -5237,6 +5238,7 @@ entry = brakePedalState, "Brake switch", int, "%d" entry = startStopState, "startStopState", int, "%d" entry = smartChipState, "smartChipState", int, "%d" entry = smartChipRestartCounter, "smartChipRestartCounter", int, "%d" +entry = smartChipAliveCounter, "smartChipAliveCounter", int, "%d" entry = startStopPhysicalState, "startStopPhysicalState", int, "%d" entry = acrStateDup, "acrStateDup", int, "%d" entry = acrEngineMovedRecently, "acrEngineMovedRecently", int, "%d" @@ -6203,16 +6205,17 @@ dialog = engine_stateDialog, "engine_state" graphLine = smartChipState graphLine = smartChipRestartCounter liveGraph = engine_state_5_Graph, "Graph", South + graphLine = smartChipAliveCounter graphLine = startStopStateToggleCounter graphLine = egtValue1 graphLine = egtValue2 - graphLine = desiredRpmLimit liveGraph = engine_state_6_Graph, "Graph", South + graphLine = desiredRpmLimit graphLine = fuelInjectionCounter graphLine = sparkCounter graphLine = fuelingLoad - graphLine = ignitionLoad liveGraph = engine_state_7_Graph, "Graph", South + graphLine = ignitionLoad graphLine = veTableYAxis indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_alphax-4chan_f7.ini b/firmware/tunerstudio/generated/rusefi_alphax-4chan_f7.ini index 35701cc767..4d9f2f2540 100644 --- a/firmware/tunerstudio/generated/rusefi_alphax-4chan_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_alphax-4chan_f7.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.12.26.alphax-4chan_f7.3897622086" + signature = "rusEFI master.2023.12.26.alphax-4chan_f7.543924388" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.12.26.alphax-4chan_f7.3897622086" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.12.26.alphax-4chan_f7.543924388" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -92,7 +92,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","INVALID","B4 - O2","On-board MAP","D5 - PPS","B5 - TPS","F7 - Ignition Key Voltage","C7 - CAM Hall/Digital","INVALID","D4 - TPS2","INVALID","X5 - AIN3","B2 - MAP","B7 - CLT","B3 - IAT","F6 - PPS2","X7 - AIN4","INVALID","INVALID","INVALID","X3 - AIN2","X1 - AIN1 and D5 on older boards" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Tue Dec 26 01:36:45 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Tue Dec 26 22:47:15 UTC 2023 pageSize = 22088 page = 1 @@ -2373,7 +2373,7 @@ lambdaMaxDeviationRpmBins = array, U16, 22078, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1444 + ochBlockSize = 1448 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3027,145 +3027,146 @@ brakePedalState = scalar, S08, 1092, "", 1, 0 startStopState = scalar, S08, 1093, "", 1, 0 smartChipState = scalar, S08, 1094, "", 1, 0 smartChipRestartCounter = scalar, S08, 1095, "", 1, 0 -startStopPhysicalState = bits, U32, 1096, [0:0] -acrStateDup = bits, U32, 1096, [1:1] -acrEngineMovedRecently = bits, U32, 1096, [2:2] -heaterControlEnabled = bits, U32, 1096, [3:3] -luaDigitalState0 = bits, U32, 1096, [4:4] -luaDigitalState1 = bits, U32, 1096, [5:5] -luaDigitalState2 = bits, U32, 1096, [6:6] -luaDigitalState3 = bits, U32, 1096, [7:7] -startStopStateToggleCounter = scalar, U32, 1100, "", 1, 0 -egtValue1 = scalar, F32, 1104, "", 1, 0 -egtValue2 = scalar, F32, 1108, "", 1, 0 -desiredRpmLimit = scalar, S16, 1112, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1116, "", 1, 0 -sparkCounter = scalar, U32, 1120, "", 1, 0 -fuelingLoad = scalar, F32, 1124, "", 1, 0 -ignitionLoad = scalar, F32, 1128, "", 1, 0 -veTableYAxis = scalar, U16, 1132, "%", 0.01, 0 -; total TS size = 1136 -tpsFrom = scalar, F32, 1136 -tpsTo = scalar, F32, 1140 -deltaTps = scalar, F32, 1144 -extraFuel = scalar, F32, 1148, "", 1, 0 -valueFromTable = scalar, F32, 1152, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1156, [0:0] -isBelowDecelThreshold = bits, U32, 1156, [1:1] -isTimeToResetAccumulator = bits, U32, 1156, [2:2] -isFractionalEnrichment = bits, U32, 1156, [3:3] -belowEpsilon = bits, U32, 1156, [4:4] -tooShort = bits, U32, 1156, [5:5] -fractionalInjFuel = scalar, F32, 1160, "", 1, 0 -accumulatedValue = scalar, F32, 1164, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1168, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1172, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1176, "", 1, 0 -cycleCnt = scalar, S32, 1180, "", 1, 0 -; total TS size = 1184 -hwEventCounters1 = scalar, U32, 1184, "", 1, 0 -hwEventCounters2 = scalar, U32, 1188, "", 1, 0 -hwEventCounters3 = scalar, U32, 1192, "", 1, 0 -hwEventCounters4 = scalar, U32, 1196, "", 1, 0 -hwEventCounters5 = scalar, U32, 1200, "", 1, 0 -hwEventCounters6 = scalar, U32, 1204, "", 1, 0 -vvtCamCounter = scalar, U32, 1208, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1212, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1216, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1220, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1221, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1224, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1228, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1232, "", 1, 0 -mapCamPrevToothAngle = scalar, F32, 1236, "deg", 1, 0 -isDecodingMapCam = bits, U32, 1240, [0:0] -; total TS size = 1244 -crankSynchronizationCounter0 = scalar, U32, 1244, "", 1, 0 -vvtSyncGapRatio0 = scalar, F32, 1248, "", 1, 0 -vvtToothDurations00 = scalar, U32, 1252, "us", 1, 0 -vvtCurrentPosition0 = scalar, F32, 1256, "sync: Primary Cam Position", 1, 0 -vvtToothPosition10 = scalar, F32, 1260, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition20 = scalar, F32, 1264, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition30 = scalar, F32, 1268, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition40 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio0 = scalar, F32, 1276, "", 1, 0 -triggerStateIndex0 = scalar, U08, 1280, "", 1, 0 -vvtStateIndex0 = scalar, U08, 1281, "", 1, 0 -; total TS size = 1284 -camResyncCounter = scalar, U08, 1284, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1288, [0:0] -; total TS size = 1292 -wallFuelCorrection = scalar, F32, 1292, "", 1, 0 -wallFuel = scalar, F32, 1296, "", 1, 0 -; total TS size = 1300 -idleState = bits, S32, 1300, [0:2], "not important" -currentIdlePosition = scalar, F32, 1304 -baseIdlePosition = scalar, F32, 1308 -idleClosedLoop = scalar, F32, 1312 -iacByTpsTaper = scalar, F32, 1316 -throttlePedalUpState = scalar, S32, 1320, "", 1, 0 -mightResetPid = bits, U32, 1324, [0:0] -shouldResetPid = bits, U32, 1324, [1:1] -wasResetPid = bits, U32, 1324, [2:2] -mustResetPid = bits, U32, 1324, [3:3] -isCranking = bits, U32, 1324, [4:4] -isIacTableForCoasting = bits, U32, 1324, [5:5] -notIdling = bits, U32, 1324, [6:6] -needReset = bits, U32, 1324, [7:7] -isInDeadZone = bits, U32, 1324, [8:8] -isBlipping = bits, U32, 1324, [9:9] -useClosedLoop = bits, U32, 1324, [10:10] -badTps = bits, U32, 1324, [11:11] -looksLikeRunning = bits, U32, 1324, [12:12] -looksLikeCoasting = bits, U32, 1324, [13:13] -looksLikeCrankToIdle = bits, U32, 1324, [14:14] -isIdleCoasting = bits, U32, 1324, [15:15] -isIdleClosedLoop = bits, U32, 1324, [16:16] -idleTarget = scalar, S32, 1328, "", 1, 0 -targetRpmByClt = scalar, S32, 1332, "", 1, 0 -targetRpmAc = scalar, S32, 1336, "", 1, 0 -iacByRpmTaper = scalar, F32, 1340 -luaAdd = scalar, F32, 1344 -; total TS size = 1348 -idlePosition0 = scalar, F32, 1348, "per", 1,0 -trim0 = scalar, F32, 1352, "", 1, 0 -luaAdjustment0 = scalar, F32, 1356, "per", 1,0 -m_wastegatePosition0 = scalar, F32, 1360, "per", 1,0 -etbFeedForward0 = scalar, F32, 1364 -etbIntegralError0 = scalar, F32, 1368, "", 1, 0 -etbCurrentTarget0 = scalar, F32, 1372, "%", 1, 0 -etbCurrentAdjustedTarget0 = scalar, F32, 1376, "%", 1, 0 -etbRevLimitActive0 = bits, U32, 1380, [0:0] -jamDetected0 = bits, U32, 1380, [1:1] -etbDutyRateOfChange0 = scalar, F32, 1384, "per", 1,0 -etbDutyAverage0 = scalar, F32, 1388, "per", 1,0 -etbTpsErrorCounter0 = scalar, U16, 1392, "count", 1,0 -etbPpsErrorCounter0 = scalar, U16, 1394, "count", 1,0 -etbErrorCode0 = scalar, S08, 1396, "", 1, 0 -jamTimer0 = scalar, U16, 1398, "sec", 0.01, 0 -; total TS size = 1400 -faultCode0 = scalar, U08, 1400, "", 1, 0 -heaterDuty0 = scalar, U08, 1401, "%", 1, 0 -pumpDuty0 = scalar, U08, 1402, "%", 1, 0 -tempC0 = scalar, U16, 1404, "C", 1, 0 -nernstVoltage0 = scalar, U16, 1406, "V", 0.001, 0 -esr0 = scalar, U16, 1408, "ohm", 1, 0 -; total TS size = 1412 -dcOutput0 = scalar, F32, 1412, "per", 1,0 -isEnabled0_int = scalar, U08, 1416, "per", 1,0 -isEnabled0 = bits, U32, 1420, [0:0] -; total TS size = 1424 -value0 = scalar, U16, 1424, "value", 1,0 -value1 = scalar, U16, 1426, "value", 1,0 -errorRate = scalar, F32, 1428, "ratio", 1,0 -; total TS size = 1432 -vvtTarget = scalar, U16, 1432, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1434, "%", 0.5, 0 +smartChipAliveCounter = scalar, S08, 1096, "", 1, 0 +startStopPhysicalState = bits, U32, 1100, [0:0] +acrStateDup = bits, U32, 1100, [1:1] +acrEngineMovedRecently = bits, U32, 1100, [2:2] +heaterControlEnabled = bits, U32, 1100, [3:3] +luaDigitalState0 = bits, U32, 1100, [4:4] +luaDigitalState1 = bits, U32, 1100, [5:5] +luaDigitalState2 = bits, U32, 1100, [6:6] +luaDigitalState3 = bits, U32, 1100, [7:7] +startStopStateToggleCounter = scalar, U32, 1104, "", 1, 0 +egtValue1 = scalar, F32, 1108, "", 1, 0 +egtValue2 = scalar, F32, 1112, "", 1, 0 +desiredRpmLimit = scalar, S16, 1116, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 1120, "", 1, 0 +sparkCounter = scalar, U32, 1124, "", 1, 0 +fuelingLoad = scalar, F32, 1128, "", 1, 0 +ignitionLoad = scalar, F32, 1132, "", 1, 0 +veTableYAxis = scalar, U16, 1136, "%", 0.01, 0 +; total TS size = 1140 +tpsFrom = scalar, F32, 1140 +tpsTo = scalar, F32, 1144 +deltaTps = scalar, F32, 1148 +extraFuel = scalar, F32, 1152, "", 1, 0 +valueFromTable = scalar, F32, 1156, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1160, [0:0] +isBelowDecelThreshold = bits, U32, 1160, [1:1] +isTimeToResetAccumulator = bits, U32, 1160, [2:2] +isFractionalEnrichment = bits, U32, 1160, [3:3] +belowEpsilon = bits, U32, 1160, [4:4] +tooShort = bits, U32, 1160, [5:5] +fractionalInjFuel = scalar, F32, 1164, "", 1, 0 +accumulatedValue = scalar, F32, 1168, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1172, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1176, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1180, "", 1, 0 +cycleCnt = scalar, S32, 1184, "", 1, 0 +; total TS size = 1188 +hwEventCounters1 = scalar, U32, 1188, "", 1, 0 +hwEventCounters2 = scalar, U32, 1192, "", 1, 0 +hwEventCounters3 = scalar, U32, 1196, "", 1, 0 +hwEventCounters4 = scalar, U32, 1200, "", 1, 0 +hwEventCounters5 = scalar, U32, 1204, "", 1, 0 +hwEventCounters6 = scalar, U32, 1208, "", 1, 0 +vvtCamCounter = scalar, U32, 1212, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1216, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1220, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1224, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1225, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1228, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1232, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1236, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1240, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1244, [0:0] +; total TS size = 1248 +crankSynchronizationCounter0 = scalar, U32, 1248, "", 1, 0 +vvtSyncGapRatio0 = scalar, F32, 1252, "", 1, 0 +vvtToothDurations00 = scalar, U32, 1256, "us", 1, 0 +vvtCurrentPosition0 = scalar, F32, 1260, "sync: Primary Cam Position", 1, 0 +vvtToothPosition10 = scalar, F32, 1264, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition20 = scalar, F32, 1268, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition30 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition40 = scalar, F32, 1276, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio0 = scalar, F32, 1280, "", 1, 0 +triggerStateIndex0 = scalar, U08, 1284, "", 1, 0 +vvtStateIndex0 = scalar, U08, 1285, "", 1, 0 +; total TS size = 1288 +camResyncCounter = scalar, U08, 1288, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1292, [0:0] +; total TS size = 1296 +wallFuelCorrection = scalar, F32, 1296, "", 1, 0 +wallFuel = scalar, F32, 1300, "", 1, 0 +; total TS size = 1304 +idleState = bits, S32, 1304, [0:2], "not important" +currentIdlePosition = scalar, F32, 1308 +baseIdlePosition = scalar, F32, 1312 +idleClosedLoop = scalar, F32, 1316 +iacByTpsTaper = scalar, F32, 1320 +throttlePedalUpState = scalar, S32, 1324, "", 1, 0 +mightResetPid = bits, U32, 1328, [0:0] +shouldResetPid = bits, U32, 1328, [1:1] +wasResetPid = bits, U32, 1328, [2:2] +mustResetPid = bits, U32, 1328, [3:3] +isCranking = bits, U32, 1328, [4:4] +isIacTableForCoasting = bits, U32, 1328, [5:5] +notIdling = bits, U32, 1328, [6:6] +needReset = bits, U32, 1328, [7:7] +isInDeadZone = bits, U32, 1328, [8:8] +isBlipping = bits, U32, 1328, [9:9] +useClosedLoop = bits, U32, 1328, [10:10] +badTps = bits, U32, 1328, [11:11] +looksLikeRunning = bits, U32, 1328, [12:12] +looksLikeCoasting = bits, U32, 1328, [13:13] +looksLikeCrankToIdle = bits, U32, 1328, [14:14] +isIdleCoasting = bits, U32, 1328, [15:15] +isIdleClosedLoop = bits, U32, 1328, [16:16] +idleTarget = scalar, S32, 1332, "", 1, 0 +targetRpmByClt = scalar, S32, 1336, "", 1, 0 +targetRpmAc = scalar, S32, 1340, "", 1, 0 +iacByRpmTaper = scalar, F32, 1344 +luaAdd = scalar, F32, 1348 +; total TS size = 1352 +idlePosition0 = scalar, F32, 1352, "per", 1,0 +trim0 = scalar, F32, 1356, "", 1, 0 +luaAdjustment0 = scalar, F32, 1360, "per", 1,0 +m_wastegatePosition0 = scalar, F32, 1364, "per", 1,0 +etbFeedForward0 = scalar, F32, 1368 +etbIntegralError0 = scalar, F32, 1372, "", 1, 0 +etbCurrentTarget0 = scalar, F32, 1376, "%", 1, 0 +etbCurrentAdjustedTarget0 = scalar, F32, 1380, "%", 1, 0 +etbRevLimitActive0 = bits, U32, 1384, [0:0] +jamDetected0 = bits, U32, 1384, [1:1] +etbDutyRateOfChange0 = scalar, F32, 1388, "per", 1,0 +etbDutyAverage0 = scalar, F32, 1392, "per", 1,0 +etbTpsErrorCounter0 = scalar, U16, 1396, "count", 1,0 +etbPpsErrorCounter0 = scalar, U16, 1398, "count", 1,0 +etbErrorCode0 = scalar, S08, 1400, "", 1, 0 +jamTimer0 = scalar, U16, 1402, "sec", 0.01, 0 +; total TS size = 1404 +faultCode0 = scalar, U08, 1404, "", 1, 0 +heaterDuty0 = scalar, U08, 1405, "%", 1, 0 +pumpDuty0 = scalar, U08, 1406, "%", 1, 0 +tempC0 = scalar, U16, 1408, "C", 1, 0 +nernstVoltage0 = scalar, U16, 1410, "V", 0.001, 0 +esr0 = scalar, U16, 1412, "ohm", 1, 0 +; total TS size = 1416 +dcOutput0 = scalar, F32, 1416, "per", 1,0 +isEnabled0_int = scalar, U08, 1420, "per", 1,0 +isEnabled0 = bits, U32, 1424, [0:0] +; total TS size = 1428 +value0 = scalar, U16, 1428, "value", 1,0 +value1 = scalar, U16, 1430, "value", 1,0 +errorRate = scalar, F32, 1432, "ratio", 1,0 ; total TS size = 1436 -lambdaCurrentlyGood = bits, U32, 1436, [0:0] -lambdaMonitorCut = bits, U32, 1436, [1:1] -lambdaTimeSinceGood = scalar, U16, 1440, "sec", 0.01, 0 -; total TS size = 1444 +vvtTarget = scalar, U16, 1436, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1438, "%", 0.5, 0 +; total TS size = 1440 +lambdaCurrentlyGood = bits, U32, 1440, [0:0] +lambdaMonitorCut = bits, U32, 1440, [1:1] +lambdaTimeSinceGood = scalar, U16, 1444, "sec", 0.01, 0 +; total TS size = 1448 time = { timeNow } @@ -5237,6 +5238,7 @@ entry = brakePedalState, "Brake switch", int, "%d" entry = startStopState, "startStopState", int, "%d" entry = smartChipState, "smartChipState", int, "%d" entry = smartChipRestartCounter, "smartChipRestartCounter", int, "%d" +entry = smartChipAliveCounter, "smartChipAliveCounter", int, "%d" entry = startStopPhysicalState, "startStopPhysicalState", int, "%d" entry = acrStateDup, "acrStateDup", int, "%d" entry = acrEngineMovedRecently, "acrEngineMovedRecently", int, "%d" @@ -6203,16 +6205,17 @@ dialog = engine_stateDialog, "engine_state" graphLine = smartChipState graphLine = smartChipRestartCounter liveGraph = engine_state_5_Graph, "Graph", South + graphLine = smartChipAliveCounter graphLine = startStopStateToggleCounter graphLine = egtValue1 graphLine = egtValue2 - graphLine = desiredRpmLimit liveGraph = engine_state_6_Graph, "Graph", South + graphLine = desiredRpmLimit graphLine = fuelInjectionCounter graphLine = sparkCounter graphLine = fuelingLoad - graphLine = ignitionLoad liveGraph = engine_state_7_Graph, "Graph", South + graphLine = ignitionLoad graphLine = veTableYAxis indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_alphax-8chan-revA.ini b/firmware/tunerstudio/generated/rusefi_alphax-8chan-revA.ini index e4f99e7168..04613e135a 100644 --- a/firmware/tunerstudio/generated/rusefi_alphax-8chan-revA.ini +++ b/firmware/tunerstudio/generated/rusefi_alphax-8chan-revA.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.12.26.alphax-8chan-revA.3397647034" + signature = "rusEFI master.2023.12.26.alphax-8chan-revA.45655128" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.12.26.alphax-8chan-revA.3397647034" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.12.26.alphax-8chan-revA.45655128" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -92,7 +92,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","INVALID","INVALID","INVALID","17A - PPS","23C - TPS","Battery Sense","INVALID","15D - AN5","24C - TPS2","14A - Analog 1","22A - Analog 22","On-board MAP","16A - CLT","15A - IAT","31C - PPS2","33A - AN3","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","16D - AN6","INVALID","INVALID","INVALID","INVALID","7C - AT4","INVALID","6C - AT3","14D - AN4" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Tue Dec 26 01:36:53 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Tue Dec 26 22:47:24 UTC 2023 pageSize = 22088 page = 1 @@ -2373,7 +2373,7 @@ lambdaMaxDeviationRpmBins = array, U16, 22078, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1444 + ochBlockSize = 1448 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3027,145 +3027,146 @@ brakePedalState = scalar, S08, 1092, "", 1, 0 startStopState = scalar, S08, 1093, "", 1, 0 smartChipState = scalar, S08, 1094, "", 1, 0 smartChipRestartCounter = scalar, S08, 1095, "", 1, 0 -startStopPhysicalState = bits, U32, 1096, [0:0] -acrStateDup = bits, U32, 1096, [1:1] -acrEngineMovedRecently = bits, U32, 1096, [2:2] -heaterControlEnabled = bits, U32, 1096, [3:3] -luaDigitalState0 = bits, U32, 1096, [4:4] -luaDigitalState1 = bits, U32, 1096, [5:5] -luaDigitalState2 = bits, U32, 1096, [6:6] -luaDigitalState3 = bits, U32, 1096, [7:7] -startStopStateToggleCounter = scalar, U32, 1100, "", 1, 0 -egtValue1 = scalar, F32, 1104, "", 1, 0 -egtValue2 = scalar, F32, 1108, "", 1, 0 -desiredRpmLimit = scalar, S16, 1112, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1116, "", 1, 0 -sparkCounter = scalar, U32, 1120, "", 1, 0 -fuelingLoad = scalar, F32, 1124, "", 1, 0 -ignitionLoad = scalar, F32, 1128, "", 1, 0 -veTableYAxis = scalar, U16, 1132, "%", 0.01, 0 -; total TS size = 1136 -tpsFrom = scalar, F32, 1136 -tpsTo = scalar, F32, 1140 -deltaTps = scalar, F32, 1144 -extraFuel = scalar, F32, 1148, "", 1, 0 -valueFromTable = scalar, F32, 1152, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1156, [0:0] -isBelowDecelThreshold = bits, U32, 1156, [1:1] -isTimeToResetAccumulator = bits, U32, 1156, [2:2] -isFractionalEnrichment = bits, U32, 1156, [3:3] -belowEpsilon = bits, U32, 1156, [4:4] -tooShort = bits, U32, 1156, [5:5] -fractionalInjFuel = scalar, F32, 1160, "", 1, 0 -accumulatedValue = scalar, F32, 1164, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1168, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1172, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1176, "", 1, 0 -cycleCnt = scalar, S32, 1180, "", 1, 0 -; total TS size = 1184 -hwEventCounters1 = scalar, U32, 1184, "", 1, 0 -hwEventCounters2 = scalar, U32, 1188, "", 1, 0 -hwEventCounters3 = scalar, U32, 1192, "", 1, 0 -hwEventCounters4 = scalar, U32, 1196, "", 1, 0 -hwEventCounters5 = scalar, U32, 1200, "", 1, 0 -hwEventCounters6 = scalar, U32, 1204, "", 1, 0 -vvtCamCounter = scalar, U32, 1208, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1212, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1216, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1220, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1221, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1224, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1228, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1232, "", 1, 0 -mapCamPrevToothAngle = scalar, F32, 1236, "deg", 1, 0 -isDecodingMapCam = bits, U32, 1240, [0:0] -; total TS size = 1244 -crankSynchronizationCounter0 = scalar, U32, 1244, "", 1, 0 -vvtSyncGapRatio0 = scalar, F32, 1248, "", 1, 0 -vvtToothDurations00 = scalar, U32, 1252, "us", 1, 0 -vvtCurrentPosition0 = scalar, F32, 1256, "sync: Primary Cam Position", 1, 0 -vvtToothPosition10 = scalar, F32, 1260, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition20 = scalar, F32, 1264, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition30 = scalar, F32, 1268, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition40 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio0 = scalar, F32, 1276, "", 1, 0 -triggerStateIndex0 = scalar, U08, 1280, "", 1, 0 -vvtStateIndex0 = scalar, U08, 1281, "", 1, 0 -; total TS size = 1284 -camResyncCounter = scalar, U08, 1284, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1288, [0:0] -; total TS size = 1292 -wallFuelCorrection = scalar, F32, 1292, "", 1, 0 -wallFuel = scalar, F32, 1296, "", 1, 0 -; total TS size = 1300 -idleState = bits, S32, 1300, [0:2], "not important" -currentIdlePosition = scalar, F32, 1304 -baseIdlePosition = scalar, F32, 1308 -idleClosedLoop = scalar, F32, 1312 -iacByTpsTaper = scalar, F32, 1316 -throttlePedalUpState = scalar, S32, 1320, "", 1, 0 -mightResetPid = bits, U32, 1324, [0:0] -shouldResetPid = bits, U32, 1324, [1:1] -wasResetPid = bits, U32, 1324, [2:2] -mustResetPid = bits, U32, 1324, [3:3] -isCranking = bits, U32, 1324, [4:4] -isIacTableForCoasting = bits, U32, 1324, [5:5] -notIdling = bits, U32, 1324, [6:6] -needReset = bits, U32, 1324, [7:7] -isInDeadZone = bits, U32, 1324, [8:8] -isBlipping = bits, U32, 1324, [9:9] -useClosedLoop = bits, U32, 1324, [10:10] -badTps = bits, U32, 1324, [11:11] -looksLikeRunning = bits, U32, 1324, [12:12] -looksLikeCoasting = bits, U32, 1324, [13:13] -looksLikeCrankToIdle = bits, U32, 1324, [14:14] -isIdleCoasting = bits, U32, 1324, [15:15] -isIdleClosedLoop = bits, U32, 1324, [16:16] -idleTarget = scalar, S32, 1328, "", 1, 0 -targetRpmByClt = scalar, S32, 1332, "", 1, 0 -targetRpmAc = scalar, S32, 1336, "", 1, 0 -iacByRpmTaper = scalar, F32, 1340 -luaAdd = scalar, F32, 1344 -; total TS size = 1348 -idlePosition0 = scalar, F32, 1348, "per", 1,0 -trim0 = scalar, F32, 1352, "", 1, 0 -luaAdjustment0 = scalar, F32, 1356, "per", 1,0 -m_wastegatePosition0 = scalar, F32, 1360, "per", 1,0 -etbFeedForward0 = scalar, F32, 1364 -etbIntegralError0 = scalar, F32, 1368, "", 1, 0 -etbCurrentTarget0 = scalar, F32, 1372, "%", 1, 0 -etbCurrentAdjustedTarget0 = scalar, F32, 1376, "%", 1, 0 -etbRevLimitActive0 = bits, U32, 1380, [0:0] -jamDetected0 = bits, U32, 1380, [1:1] -etbDutyRateOfChange0 = scalar, F32, 1384, "per", 1,0 -etbDutyAverage0 = scalar, F32, 1388, "per", 1,0 -etbTpsErrorCounter0 = scalar, U16, 1392, "count", 1,0 -etbPpsErrorCounter0 = scalar, U16, 1394, "count", 1,0 -etbErrorCode0 = scalar, S08, 1396, "", 1, 0 -jamTimer0 = scalar, U16, 1398, "sec", 0.01, 0 -; total TS size = 1400 -faultCode0 = scalar, U08, 1400, "", 1, 0 -heaterDuty0 = scalar, U08, 1401, "%", 1, 0 -pumpDuty0 = scalar, U08, 1402, "%", 1, 0 -tempC0 = scalar, U16, 1404, "C", 1, 0 -nernstVoltage0 = scalar, U16, 1406, "V", 0.001, 0 -esr0 = scalar, U16, 1408, "ohm", 1, 0 -; total TS size = 1412 -dcOutput0 = scalar, F32, 1412, "per", 1,0 -isEnabled0_int = scalar, U08, 1416, "per", 1,0 -isEnabled0 = bits, U32, 1420, [0:0] -; total TS size = 1424 -value0 = scalar, U16, 1424, "value", 1,0 -value1 = scalar, U16, 1426, "value", 1,0 -errorRate = scalar, F32, 1428, "ratio", 1,0 -; total TS size = 1432 -vvtTarget = scalar, U16, 1432, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1434, "%", 0.5, 0 +smartChipAliveCounter = scalar, S08, 1096, "", 1, 0 +startStopPhysicalState = bits, U32, 1100, [0:0] +acrStateDup = bits, U32, 1100, [1:1] +acrEngineMovedRecently = bits, U32, 1100, [2:2] +heaterControlEnabled = bits, U32, 1100, [3:3] +luaDigitalState0 = bits, U32, 1100, [4:4] +luaDigitalState1 = bits, U32, 1100, [5:5] +luaDigitalState2 = bits, U32, 1100, [6:6] +luaDigitalState3 = bits, U32, 1100, [7:7] +startStopStateToggleCounter = scalar, U32, 1104, "", 1, 0 +egtValue1 = scalar, F32, 1108, "", 1, 0 +egtValue2 = scalar, F32, 1112, "", 1, 0 +desiredRpmLimit = scalar, S16, 1116, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 1120, "", 1, 0 +sparkCounter = scalar, U32, 1124, "", 1, 0 +fuelingLoad = scalar, F32, 1128, "", 1, 0 +ignitionLoad = scalar, F32, 1132, "", 1, 0 +veTableYAxis = scalar, U16, 1136, "%", 0.01, 0 +; total TS size = 1140 +tpsFrom = scalar, F32, 1140 +tpsTo = scalar, F32, 1144 +deltaTps = scalar, F32, 1148 +extraFuel = scalar, F32, 1152, "", 1, 0 +valueFromTable = scalar, F32, 1156, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1160, [0:0] +isBelowDecelThreshold = bits, U32, 1160, [1:1] +isTimeToResetAccumulator = bits, U32, 1160, [2:2] +isFractionalEnrichment = bits, U32, 1160, [3:3] +belowEpsilon = bits, U32, 1160, [4:4] +tooShort = bits, U32, 1160, [5:5] +fractionalInjFuel = scalar, F32, 1164, "", 1, 0 +accumulatedValue = scalar, F32, 1168, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1172, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1176, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1180, "", 1, 0 +cycleCnt = scalar, S32, 1184, "", 1, 0 +; total TS size = 1188 +hwEventCounters1 = scalar, U32, 1188, "", 1, 0 +hwEventCounters2 = scalar, U32, 1192, "", 1, 0 +hwEventCounters3 = scalar, U32, 1196, "", 1, 0 +hwEventCounters4 = scalar, U32, 1200, "", 1, 0 +hwEventCounters5 = scalar, U32, 1204, "", 1, 0 +hwEventCounters6 = scalar, U32, 1208, "", 1, 0 +vvtCamCounter = scalar, U32, 1212, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1216, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1220, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1224, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1225, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1228, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1232, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1236, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1240, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1244, [0:0] +; total TS size = 1248 +crankSynchronizationCounter0 = scalar, U32, 1248, "", 1, 0 +vvtSyncGapRatio0 = scalar, F32, 1252, "", 1, 0 +vvtToothDurations00 = scalar, U32, 1256, "us", 1, 0 +vvtCurrentPosition0 = scalar, F32, 1260, "sync: Primary Cam Position", 1, 0 +vvtToothPosition10 = scalar, F32, 1264, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition20 = scalar, F32, 1268, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition30 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition40 = scalar, F32, 1276, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio0 = scalar, F32, 1280, "", 1, 0 +triggerStateIndex0 = scalar, U08, 1284, "", 1, 0 +vvtStateIndex0 = scalar, U08, 1285, "", 1, 0 +; total TS size = 1288 +camResyncCounter = scalar, U08, 1288, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1292, [0:0] +; total TS size = 1296 +wallFuelCorrection = scalar, F32, 1296, "", 1, 0 +wallFuel = scalar, F32, 1300, "", 1, 0 +; total TS size = 1304 +idleState = bits, S32, 1304, [0:2], "not important" +currentIdlePosition = scalar, F32, 1308 +baseIdlePosition = scalar, F32, 1312 +idleClosedLoop = scalar, F32, 1316 +iacByTpsTaper = scalar, F32, 1320 +throttlePedalUpState = scalar, S32, 1324, "", 1, 0 +mightResetPid = bits, U32, 1328, [0:0] +shouldResetPid = bits, U32, 1328, [1:1] +wasResetPid = bits, U32, 1328, [2:2] +mustResetPid = bits, U32, 1328, [3:3] +isCranking = bits, U32, 1328, [4:4] +isIacTableForCoasting = bits, U32, 1328, [5:5] +notIdling = bits, U32, 1328, [6:6] +needReset = bits, U32, 1328, [7:7] +isInDeadZone = bits, U32, 1328, [8:8] +isBlipping = bits, U32, 1328, [9:9] +useClosedLoop = bits, U32, 1328, [10:10] +badTps = bits, U32, 1328, [11:11] +looksLikeRunning = bits, U32, 1328, [12:12] +looksLikeCoasting = bits, U32, 1328, [13:13] +looksLikeCrankToIdle = bits, U32, 1328, [14:14] +isIdleCoasting = bits, U32, 1328, [15:15] +isIdleClosedLoop = bits, U32, 1328, [16:16] +idleTarget = scalar, S32, 1332, "", 1, 0 +targetRpmByClt = scalar, S32, 1336, "", 1, 0 +targetRpmAc = scalar, S32, 1340, "", 1, 0 +iacByRpmTaper = scalar, F32, 1344 +luaAdd = scalar, F32, 1348 +; total TS size = 1352 +idlePosition0 = scalar, F32, 1352, "per", 1,0 +trim0 = scalar, F32, 1356, "", 1, 0 +luaAdjustment0 = scalar, F32, 1360, "per", 1,0 +m_wastegatePosition0 = scalar, F32, 1364, "per", 1,0 +etbFeedForward0 = scalar, F32, 1368 +etbIntegralError0 = scalar, F32, 1372, "", 1, 0 +etbCurrentTarget0 = scalar, F32, 1376, "%", 1, 0 +etbCurrentAdjustedTarget0 = scalar, F32, 1380, "%", 1, 0 +etbRevLimitActive0 = bits, U32, 1384, [0:0] +jamDetected0 = bits, U32, 1384, [1:1] +etbDutyRateOfChange0 = scalar, F32, 1388, "per", 1,0 +etbDutyAverage0 = scalar, F32, 1392, "per", 1,0 +etbTpsErrorCounter0 = scalar, U16, 1396, "count", 1,0 +etbPpsErrorCounter0 = scalar, U16, 1398, "count", 1,0 +etbErrorCode0 = scalar, S08, 1400, "", 1, 0 +jamTimer0 = scalar, U16, 1402, "sec", 0.01, 0 +; total TS size = 1404 +faultCode0 = scalar, U08, 1404, "", 1, 0 +heaterDuty0 = scalar, U08, 1405, "%", 1, 0 +pumpDuty0 = scalar, U08, 1406, "%", 1, 0 +tempC0 = scalar, U16, 1408, "C", 1, 0 +nernstVoltage0 = scalar, U16, 1410, "V", 0.001, 0 +esr0 = scalar, U16, 1412, "ohm", 1, 0 +; total TS size = 1416 +dcOutput0 = scalar, F32, 1416, "per", 1,0 +isEnabled0_int = scalar, U08, 1420, "per", 1,0 +isEnabled0 = bits, U32, 1424, [0:0] +; total TS size = 1428 +value0 = scalar, U16, 1428, "value", 1,0 +value1 = scalar, U16, 1430, "value", 1,0 +errorRate = scalar, F32, 1432, "ratio", 1,0 ; total TS size = 1436 -lambdaCurrentlyGood = bits, U32, 1436, [0:0] -lambdaMonitorCut = bits, U32, 1436, [1:1] -lambdaTimeSinceGood = scalar, U16, 1440, "sec", 0.01, 0 -; total TS size = 1444 +vvtTarget = scalar, U16, 1436, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1438, "%", 0.5, 0 +; total TS size = 1440 +lambdaCurrentlyGood = bits, U32, 1440, [0:0] +lambdaMonitorCut = bits, U32, 1440, [1:1] +lambdaTimeSinceGood = scalar, U16, 1444, "sec", 0.01, 0 +; total TS size = 1448 time = { timeNow } @@ -5237,6 +5238,7 @@ entry = brakePedalState, "Brake switch", int, "%d" entry = startStopState, "startStopState", int, "%d" entry = smartChipState, "smartChipState", int, "%d" entry = smartChipRestartCounter, "smartChipRestartCounter", int, "%d" +entry = smartChipAliveCounter, "smartChipAliveCounter", int, "%d" entry = startStopPhysicalState, "startStopPhysicalState", int, "%d" entry = acrStateDup, "acrStateDup", int, "%d" entry = acrEngineMovedRecently, "acrEngineMovedRecently", int, "%d" @@ -6204,16 +6206,17 @@ dialog = engine_stateDialog, "engine_state" graphLine = smartChipState graphLine = smartChipRestartCounter liveGraph = engine_state_5_Graph, "Graph", South + graphLine = smartChipAliveCounter graphLine = startStopStateToggleCounter graphLine = egtValue1 graphLine = egtValue2 - graphLine = desiredRpmLimit liveGraph = engine_state_6_Graph, "Graph", South + graphLine = desiredRpmLimit graphLine = fuelInjectionCounter graphLine = sparkCounter graphLine = fuelingLoad - graphLine = ignitionLoad liveGraph = engine_state_7_Graph, "Graph", South + graphLine = ignitionLoad graphLine = veTableYAxis indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_alphax-8chan.ini b/firmware/tunerstudio/generated/rusefi_alphax-8chan.ini index 2d32bb2b3a..f74ba0552c 100644 --- a/firmware/tunerstudio/generated/rusefi_alphax-8chan.ini +++ b/firmware/tunerstudio/generated/rusefi_alphax-8chan.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.12.26.alphax-8chan.354930457" + signature = "rusEFI master.2023.12.26.alphax-8chan.3709637115" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.12.26.alphax-8chan.354930457" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.12.26.alphax-8chan.3709637115" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -92,7 +92,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","INVALID","3A - Aux Analog 2","On-board MAP","32A - PPS Sensor Input","31A - TPS Sensor Input","24 - Ignition Key Voltage","INVALID","INVALID","19A - Aux Analog 6","1A - Aux Analog 1","2A - Aux Analog 4","INVALID","29A - CLT Sensor Input","27A - IAT Sensor Input","INVALID","12A - Aux Analog 8","INVALID","11A - Aux Analog 3","INVALID","34A - PPS2 Sensor Input","33A - TPS2 Sensor Input","INVALID","INVALID","INVALID","4A - Aux Analog 7","INVALID","10A - Aux Analog 5","INVALID","28A - Aux Temp 2","28A - Aux Temp 1","INVALID","20A - Aux Analog 9" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Tue Dec 26 01:36:47 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Tue Dec 26 22:47:18 UTC 2023 pageSize = 22104 page = 1 @@ -2376,7 +2376,7 @@ lambdaMaxDeviationRpmBins = array, U16, 22094, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1444 + ochBlockSize = 1448 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3030,145 +3030,146 @@ brakePedalState = scalar, S08, 1092, "", 1, 0 startStopState = scalar, S08, 1093, "", 1, 0 smartChipState = scalar, S08, 1094, "", 1, 0 smartChipRestartCounter = scalar, S08, 1095, "", 1, 0 -startStopPhysicalState = bits, U32, 1096, [0:0] -acrStateDup = bits, U32, 1096, [1:1] -acrEngineMovedRecently = bits, U32, 1096, [2:2] -heaterControlEnabled = bits, U32, 1096, [3:3] -luaDigitalState0 = bits, U32, 1096, [4:4] -luaDigitalState1 = bits, U32, 1096, [5:5] -luaDigitalState2 = bits, U32, 1096, [6:6] -luaDigitalState3 = bits, U32, 1096, [7:7] -startStopStateToggleCounter = scalar, U32, 1100, "", 1, 0 -egtValue1 = scalar, F32, 1104, "", 1, 0 -egtValue2 = scalar, F32, 1108, "", 1, 0 -desiredRpmLimit = scalar, S16, 1112, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1116, "", 1, 0 -sparkCounter = scalar, U32, 1120, "", 1, 0 -fuelingLoad = scalar, F32, 1124, "", 1, 0 -ignitionLoad = scalar, F32, 1128, "", 1, 0 -veTableYAxis = scalar, U16, 1132, "%", 0.01, 0 -; total TS size = 1136 -tpsFrom = scalar, F32, 1136 -tpsTo = scalar, F32, 1140 -deltaTps = scalar, F32, 1144 -extraFuel = scalar, F32, 1148, "", 1, 0 -valueFromTable = scalar, F32, 1152, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1156, [0:0] -isBelowDecelThreshold = bits, U32, 1156, [1:1] -isTimeToResetAccumulator = bits, U32, 1156, [2:2] -isFractionalEnrichment = bits, U32, 1156, [3:3] -belowEpsilon = bits, U32, 1156, [4:4] -tooShort = bits, U32, 1156, [5:5] -fractionalInjFuel = scalar, F32, 1160, "", 1, 0 -accumulatedValue = scalar, F32, 1164, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1168, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1172, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1176, "", 1, 0 -cycleCnt = scalar, S32, 1180, "", 1, 0 -; total TS size = 1184 -hwEventCounters1 = scalar, U32, 1184, "", 1, 0 -hwEventCounters2 = scalar, U32, 1188, "", 1, 0 -hwEventCounters3 = scalar, U32, 1192, "", 1, 0 -hwEventCounters4 = scalar, U32, 1196, "", 1, 0 -hwEventCounters5 = scalar, U32, 1200, "", 1, 0 -hwEventCounters6 = scalar, U32, 1204, "", 1, 0 -vvtCamCounter = scalar, U32, 1208, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1212, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1216, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1220, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1221, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1224, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1228, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1232, "", 1, 0 -mapCamPrevToothAngle = scalar, F32, 1236, "deg", 1, 0 -isDecodingMapCam = bits, U32, 1240, [0:0] -; total TS size = 1244 -crankSynchronizationCounter0 = scalar, U32, 1244, "", 1, 0 -vvtSyncGapRatio0 = scalar, F32, 1248, "", 1, 0 -vvtToothDurations00 = scalar, U32, 1252, "us", 1, 0 -vvtCurrentPosition0 = scalar, F32, 1256, "sync: Primary Cam Position", 1, 0 -vvtToothPosition10 = scalar, F32, 1260, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition20 = scalar, F32, 1264, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition30 = scalar, F32, 1268, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition40 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio0 = scalar, F32, 1276, "", 1, 0 -triggerStateIndex0 = scalar, U08, 1280, "", 1, 0 -vvtStateIndex0 = scalar, U08, 1281, "", 1, 0 -; total TS size = 1284 -camResyncCounter = scalar, U08, 1284, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1288, [0:0] -; total TS size = 1292 -wallFuelCorrection = scalar, F32, 1292, "", 1, 0 -wallFuel = scalar, F32, 1296, "", 1, 0 -; total TS size = 1300 -idleState = bits, S32, 1300, [0:2], "not important" -currentIdlePosition = scalar, F32, 1304 -baseIdlePosition = scalar, F32, 1308 -idleClosedLoop = scalar, F32, 1312 -iacByTpsTaper = scalar, F32, 1316 -throttlePedalUpState = scalar, S32, 1320, "", 1, 0 -mightResetPid = bits, U32, 1324, [0:0] -shouldResetPid = bits, U32, 1324, [1:1] -wasResetPid = bits, U32, 1324, [2:2] -mustResetPid = bits, U32, 1324, [3:3] -isCranking = bits, U32, 1324, [4:4] -isIacTableForCoasting = bits, U32, 1324, [5:5] -notIdling = bits, U32, 1324, [6:6] -needReset = bits, U32, 1324, [7:7] -isInDeadZone = bits, U32, 1324, [8:8] -isBlipping = bits, U32, 1324, [9:9] -useClosedLoop = bits, U32, 1324, [10:10] -badTps = bits, U32, 1324, [11:11] -looksLikeRunning = bits, U32, 1324, [12:12] -looksLikeCoasting = bits, U32, 1324, [13:13] -looksLikeCrankToIdle = bits, U32, 1324, [14:14] -isIdleCoasting = bits, U32, 1324, [15:15] -isIdleClosedLoop = bits, U32, 1324, [16:16] -idleTarget = scalar, S32, 1328, "", 1, 0 -targetRpmByClt = scalar, S32, 1332, "", 1, 0 -targetRpmAc = scalar, S32, 1336, "", 1, 0 -iacByRpmTaper = scalar, F32, 1340 -luaAdd = scalar, F32, 1344 -; total TS size = 1348 -idlePosition0 = scalar, F32, 1348, "per", 1,0 -trim0 = scalar, F32, 1352, "", 1, 0 -luaAdjustment0 = scalar, F32, 1356, "per", 1,0 -m_wastegatePosition0 = scalar, F32, 1360, "per", 1,0 -etbFeedForward0 = scalar, F32, 1364 -etbIntegralError0 = scalar, F32, 1368, "", 1, 0 -etbCurrentTarget0 = scalar, F32, 1372, "%", 1, 0 -etbCurrentAdjustedTarget0 = scalar, F32, 1376, "%", 1, 0 -etbRevLimitActive0 = bits, U32, 1380, [0:0] -jamDetected0 = bits, U32, 1380, [1:1] -etbDutyRateOfChange0 = scalar, F32, 1384, "per", 1,0 -etbDutyAverage0 = scalar, F32, 1388, "per", 1,0 -etbTpsErrorCounter0 = scalar, U16, 1392, "count", 1,0 -etbPpsErrorCounter0 = scalar, U16, 1394, "count", 1,0 -etbErrorCode0 = scalar, S08, 1396, "", 1, 0 -jamTimer0 = scalar, U16, 1398, "sec", 0.01, 0 -; total TS size = 1400 -faultCode0 = scalar, U08, 1400, "", 1, 0 -heaterDuty0 = scalar, U08, 1401, "%", 1, 0 -pumpDuty0 = scalar, U08, 1402, "%", 1, 0 -tempC0 = scalar, U16, 1404, "C", 1, 0 -nernstVoltage0 = scalar, U16, 1406, "V", 0.001, 0 -esr0 = scalar, U16, 1408, "ohm", 1, 0 -; total TS size = 1412 -dcOutput0 = scalar, F32, 1412, "per", 1,0 -isEnabled0_int = scalar, U08, 1416, "per", 1,0 -isEnabled0 = bits, U32, 1420, [0:0] -; total TS size = 1424 -value0 = scalar, U16, 1424, "value", 1,0 -value1 = scalar, U16, 1426, "value", 1,0 -errorRate = scalar, F32, 1428, "ratio", 1,0 -; total TS size = 1432 -vvtTarget = scalar, U16, 1432, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1434, "%", 0.5, 0 +smartChipAliveCounter = scalar, S08, 1096, "", 1, 0 +startStopPhysicalState = bits, U32, 1100, [0:0] +acrStateDup = bits, U32, 1100, [1:1] +acrEngineMovedRecently = bits, U32, 1100, [2:2] +heaterControlEnabled = bits, U32, 1100, [3:3] +luaDigitalState0 = bits, U32, 1100, [4:4] +luaDigitalState1 = bits, U32, 1100, [5:5] +luaDigitalState2 = bits, U32, 1100, [6:6] +luaDigitalState3 = bits, U32, 1100, [7:7] +startStopStateToggleCounter = scalar, U32, 1104, "", 1, 0 +egtValue1 = scalar, F32, 1108, "", 1, 0 +egtValue2 = scalar, F32, 1112, "", 1, 0 +desiredRpmLimit = scalar, S16, 1116, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 1120, "", 1, 0 +sparkCounter = scalar, U32, 1124, "", 1, 0 +fuelingLoad = scalar, F32, 1128, "", 1, 0 +ignitionLoad = scalar, F32, 1132, "", 1, 0 +veTableYAxis = scalar, U16, 1136, "%", 0.01, 0 +; total TS size = 1140 +tpsFrom = scalar, F32, 1140 +tpsTo = scalar, F32, 1144 +deltaTps = scalar, F32, 1148 +extraFuel = scalar, F32, 1152, "", 1, 0 +valueFromTable = scalar, F32, 1156, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1160, [0:0] +isBelowDecelThreshold = bits, U32, 1160, [1:1] +isTimeToResetAccumulator = bits, U32, 1160, [2:2] +isFractionalEnrichment = bits, U32, 1160, [3:3] +belowEpsilon = bits, U32, 1160, [4:4] +tooShort = bits, U32, 1160, [5:5] +fractionalInjFuel = scalar, F32, 1164, "", 1, 0 +accumulatedValue = scalar, F32, 1168, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1172, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1176, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1180, "", 1, 0 +cycleCnt = scalar, S32, 1184, "", 1, 0 +; total TS size = 1188 +hwEventCounters1 = scalar, U32, 1188, "", 1, 0 +hwEventCounters2 = scalar, U32, 1192, "", 1, 0 +hwEventCounters3 = scalar, U32, 1196, "", 1, 0 +hwEventCounters4 = scalar, U32, 1200, "", 1, 0 +hwEventCounters5 = scalar, U32, 1204, "", 1, 0 +hwEventCounters6 = scalar, U32, 1208, "", 1, 0 +vvtCamCounter = scalar, U32, 1212, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1216, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1220, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1224, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1225, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1228, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1232, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1236, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1240, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1244, [0:0] +; total TS size = 1248 +crankSynchronizationCounter0 = scalar, U32, 1248, "", 1, 0 +vvtSyncGapRatio0 = scalar, F32, 1252, "", 1, 0 +vvtToothDurations00 = scalar, U32, 1256, "us", 1, 0 +vvtCurrentPosition0 = scalar, F32, 1260, "sync: Primary Cam Position", 1, 0 +vvtToothPosition10 = scalar, F32, 1264, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition20 = scalar, F32, 1268, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition30 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition40 = scalar, F32, 1276, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio0 = scalar, F32, 1280, "", 1, 0 +triggerStateIndex0 = scalar, U08, 1284, "", 1, 0 +vvtStateIndex0 = scalar, U08, 1285, "", 1, 0 +; total TS size = 1288 +camResyncCounter = scalar, U08, 1288, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1292, [0:0] +; total TS size = 1296 +wallFuelCorrection = scalar, F32, 1296, "", 1, 0 +wallFuel = scalar, F32, 1300, "", 1, 0 +; total TS size = 1304 +idleState = bits, S32, 1304, [0:2], "not important" +currentIdlePosition = scalar, F32, 1308 +baseIdlePosition = scalar, F32, 1312 +idleClosedLoop = scalar, F32, 1316 +iacByTpsTaper = scalar, F32, 1320 +throttlePedalUpState = scalar, S32, 1324, "", 1, 0 +mightResetPid = bits, U32, 1328, [0:0] +shouldResetPid = bits, U32, 1328, [1:1] +wasResetPid = bits, U32, 1328, [2:2] +mustResetPid = bits, U32, 1328, [3:3] +isCranking = bits, U32, 1328, [4:4] +isIacTableForCoasting = bits, U32, 1328, [5:5] +notIdling = bits, U32, 1328, [6:6] +needReset = bits, U32, 1328, [7:7] +isInDeadZone = bits, U32, 1328, [8:8] +isBlipping = bits, U32, 1328, [9:9] +useClosedLoop = bits, U32, 1328, [10:10] +badTps = bits, U32, 1328, [11:11] +looksLikeRunning = bits, U32, 1328, [12:12] +looksLikeCoasting = bits, U32, 1328, [13:13] +looksLikeCrankToIdle = bits, U32, 1328, [14:14] +isIdleCoasting = bits, U32, 1328, [15:15] +isIdleClosedLoop = bits, U32, 1328, [16:16] +idleTarget = scalar, S32, 1332, "", 1, 0 +targetRpmByClt = scalar, S32, 1336, "", 1, 0 +targetRpmAc = scalar, S32, 1340, "", 1, 0 +iacByRpmTaper = scalar, F32, 1344 +luaAdd = scalar, F32, 1348 +; total TS size = 1352 +idlePosition0 = scalar, F32, 1352, "per", 1,0 +trim0 = scalar, F32, 1356, "", 1, 0 +luaAdjustment0 = scalar, F32, 1360, "per", 1,0 +m_wastegatePosition0 = scalar, F32, 1364, "per", 1,0 +etbFeedForward0 = scalar, F32, 1368 +etbIntegralError0 = scalar, F32, 1372, "", 1, 0 +etbCurrentTarget0 = scalar, F32, 1376, "%", 1, 0 +etbCurrentAdjustedTarget0 = scalar, F32, 1380, "%", 1, 0 +etbRevLimitActive0 = bits, U32, 1384, [0:0] +jamDetected0 = bits, U32, 1384, [1:1] +etbDutyRateOfChange0 = scalar, F32, 1388, "per", 1,0 +etbDutyAverage0 = scalar, F32, 1392, "per", 1,0 +etbTpsErrorCounter0 = scalar, U16, 1396, "count", 1,0 +etbPpsErrorCounter0 = scalar, U16, 1398, "count", 1,0 +etbErrorCode0 = scalar, S08, 1400, "", 1, 0 +jamTimer0 = scalar, U16, 1402, "sec", 0.01, 0 +; total TS size = 1404 +faultCode0 = scalar, U08, 1404, "", 1, 0 +heaterDuty0 = scalar, U08, 1405, "%", 1, 0 +pumpDuty0 = scalar, U08, 1406, "%", 1, 0 +tempC0 = scalar, U16, 1408, "C", 1, 0 +nernstVoltage0 = scalar, U16, 1410, "V", 0.001, 0 +esr0 = scalar, U16, 1412, "ohm", 1, 0 +; total TS size = 1416 +dcOutput0 = scalar, F32, 1416, "per", 1,0 +isEnabled0_int = scalar, U08, 1420, "per", 1,0 +isEnabled0 = bits, U32, 1424, [0:0] +; total TS size = 1428 +value0 = scalar, U16, 1428, "value", 1,0 +value1 = scalar, U16, 1430, "value", 1,0 +errorRate = scalar, F32, 1432, "ratio", 1,0 ; total TS size = 1436 -lambdaCurrentlyGood = bits, U32, 1436, [0:0] -lambdaMonitorCut = bits, U32, 1436, [1:1] -lambdaTimeSinceGood = scalar, U16, 1440, "sec", 0.01, 0 -; total TS size = 1444 +vvtTarget = scalar, U16, 1436, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1438, "%", 0.5, 0 +; total TS size = 1440 +lambdaCurrentlyGood = bits, U32, 1440, [0:0] +lambdaMonitorCut = bits, U32, 1440, [1:1] +lambdaTimeSinceGood = scalar, U16, 1444, "sec", 0.01, 0 +; total TS size = 1448 time = { timeNow } @@ -5240,6 +5241,7 @@ entry = brakePedalState, "Brake switch", int, "%d" entry = startStopState, "startStopState", int, "%d" entry = smartChipState, "smartChipState", int, "%d" entry = smartChipRestartCounter, "smartChipRestartCounter", int, "%d" +entry = smartChipAliveCounter, "smartChipAliveCounter", int, "%d" entry = startStopPhysicalState, "startStopPhysicalState", int, "%d" entry = acrStateDup, "acrStateDup", int, "%d" entry = acrEngineMovedRecently, "acrEngineMovedRecently", int, "%d" @@ -6207,16 +6209,17 @@ dialog = engine_stateDialog, "engine_state" graphLine = smartChipState graphLine = smartChipRestartCounter liveGraph = engine_state_5_Graph, "Graph", South + graphLine = smartChipAliveCounter graphLine = startStopStateToggleCounter graphLine = egtValue1 graphLine = egtValue2 - graphLine = desiredRpmLimit liveGraph = engine_state_6_Graph, "Graph", South + graphLine = desiredRpmLimit graphLine = fuelInjectionCounter graphLine = sparkCounter graphLine = fuelingLoad - graphLine = ignitionLoad liveGraph = engine_state_7_Graph, "Graph", South + graphLine = ignitionLoad graphLine = veTableYAxis indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_alphax-8chan_f7.ini b/firmware/tunerstudio/generated/rusefi_alphax-8chan_f7.ini index b105994fc3..f743582088 100644 --- a/firmware/tunerstudio/generated/rusefi_alphax-8chan_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_alphax-8chan_f7.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.12.26.alphax-8chan_f7.354930457" + signature = "rusEFI master.2023.12.26.alphax-8chan_f7.3709637115" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.12.26.alphax-8chan_f7.354930457" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.12.26.alphax-8chan_f7.3709637115" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -92,7 +92,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","INVALID","3A - Aux Analog 2","On-board MAP","32A - PPS Sensor Input","31A - TPS Sensor Input","24 - Ignition Key Voltage","INVALID","INVALID","19A - Aux Analog 6","1A - Aux Analog 1","2A - Aux Analog 4","INVALID","29A - CLT Sensor Input","27A - IAT Sensor Input","INVALID","12A - Aux Analog 8","INVALID","11A - Aux Analog 3","INVALID","34A - PPS2 Sensor Input","33A - TPS2 Sensor Input","INVALID","INVALID","INVALID","4A - Aux Analog 7","INVALID","10A - Aux Analog 5","INVALID","28A - Aux Temp 2","28A - Aux Temp 1","INVALID","20A - Aux Analog 9" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Tue Dec 26 01:36:50 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Tue Dec 26 22:47:21 UTC 2023 pageSize = 22104 page = 1 @@ -2376,7 +2376,7 @@ lambdaMaxDeviationRpmBins = array, U16, 22094, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1444 + ochBlockSize = 1448 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3030,145 +3030,146 @@ brakePedalState = scalar, S08, 1092, "", 1, 0 startStopState = scalar, S08, 1093, "", 1, 0 smartChipState = scalar, S08, 1094, "", 1, 0 smartChipRestartCounter = scalar, S08, 1095, "", 1, 0 -startStopPhysicalState = bits, U32, 1096, [0:0] -acrStateDup = bits, U32, 1096, [1:1] -acrEngineMovedRecently = bits, U32, 1096, [2:2] -heaterControlEnabled = bits, U32, 1096, [3:3] -luaDigitalState0 = bits, U32, 1096, [4:4] -luaDigitalState1 = bits, U32, 1096, [5:5] -luaDigitalState2 = bits, U32, 1096, [6:6] -luaDigitalState3 = bits, U32, 1096, [7:7] -startStopStateToggleCounter = scalar, U32, 1100, "", 1, 0 -egtValue1 = scalar, F32, 1104, "", 1, 0 -egtValue2 = scalar, F32, 1108, "", 1, 0 -desiredRpmLimit = scalar, S16, 1112, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1116, "", 1, 0 -sparkCounter = scalar, U32, 1120, "", 1, 0 -fuelingLoad = scalar, F32, 1124, "", 1, 0 -ignitionLoad = scalar, F32, 1128, "", 1, 0 -veTableYAxis = scalar, U16, 1132, "%", 0.01, 0 -; total TS size = 1136 -tpsFrom = scalar, F32, 1136 -tpsTo = scalar, F32, 1140 -deltaTps = scalar, F32, 1144 -extraFuel = scalar, F32, 1148, "", 1, 0 -valueFromTable = scalar, F32, 1152, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1156, [0:0] -isBelowDecelThreshold = bits, U32, 1156, [1:1] -isTimeToResetAccumulator = bits, U32, 1156, [2:2] -isFractionalEnrichment = bits, U32, 1156, [3:3] -belowEpsilon = bits, U32, 1156, [4:4] -tooShort = bits, U32, 1156, [5:5] -fractionalInjFuel = scalar, F32, 1160, "", 1, 0 -accumulatedValue = scalar, F32, 1164, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1168, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1172, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1176, "", 1, 0 -cycleCnt = scalar, S32, 1180, "", 1, 0 -; total TS size = 1184 -hwEventCounters1 = scalar, U32, 1184, "", 1, 0 -hwEventCounters2 = scalar, U32, 1188, "", 1, 0 -hwEventCounters3 = scalar, U32, 1192, "", 1, 0 -hwEventCounters4 = scalar, U32, 1196, "", 1, 0 -hwEventCounters5 = scalar, U32, 1200, "", 1, 0 -hwEventCounters6 = scalar, U32, 1204, "", 1, 0 -vvtCamCounter = scalar, U32, 1208, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1212, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1216, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1220, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1221, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1224, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1228, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1232, "", 1, 0 -mapCamPrevToothAngle = scalar, F32, 1236, "deg", 1, 0 -isDecodingMapCam = bits, U32, 1240, [0:0] -; total TS size = 1244 -crankSynchronizationCounter0 = scalar, U32, 1244, "", 1, 0 -vvtSyncGapRatio0 = scalar, F32, 1248, "", 1, 0 -vvtToothDurations00 = scalar, U32, 1252, "us", 1, 0 -vvtCurrentPosition0 = scalar, F32, 1256, "sync: Primary Cam Position", 1, 0 -vvtToothPosition10 = scalar, F32, 1260, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition20 = scalar, F32, 1264, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition30 = scalar, F32, 1268, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition40 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio0 = scalar, F32, 1276, "", 1, 0 -triggerStateIndex0 = scalar, U08, 1280, "", 1, 0 -vvtStateIndex0 = scalar, U08, 1281, "", 1, 0 -; total TS size = 1284 -camResyncCounter = scalar, U08, 1284, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1288, [0:0] -; total TS size = 1292 -wallFuelCorrection = scalar, F32, 1292, "", 1, 0 -wallFuel = scalar, F32, 1296, "", 1, 0 -; total TS size = 1300 -idleState = bits, S32, 1300, [0:2], "not important" -currentIdlePosition = scalar, F32, 1304 -baseIdlePosition = scalar, F32, 1308 -idleClosedLoop = scalar, F32, 1312 -iacByTpsTaper = scalar, F32, 1316 -throttlePedalUpState = scalar, S32, 1320, "", 1, 0 -mightResetPid = bits, U32, 1324, [0:0] -shouldResetPid = bits, U32, 1324, [1:1] -wasResetPid = bits, U32, 1324, [2:2] -mustResetPid = bits, U32, 1324, [3:3] -isCranking = bits, U32, 1324, [4:4] -isIacTableForCoasting = bits, U32, 1324, [5:5] -notIdling = bits, U32, 1324, [6:6] -needReset = bits, U32, 1324, [7:7] -isInDeadZone = bits, U32, 1324, [8:8] -isBlipping = bits, U32, 1324, [9:9] -useClosedLoop = bits, U32, 1324, [10:10] -badTps = bits, U32, 1324, [11:11] -looksLikeRunning = bits, U32, 1324, [12:12] -looksLikeCoasting = bits, U32, 1324, [13:13] -looksLikeCrankToIdle = bits, U32, 1324, [14:14] -isIdleCoasting = bits, U32, 1324, [15:15] -isIdleClosedLoop = bits, U32, 1324, [16:16] -idleTarget = scalar, S32, 1328, "", 1, 0 -targetRpmByClt = scalar, S32, 1332, "", 1, 0 -targetRpmAc = scalar, S32, 1336, "", 1, 0 -iacByRpmTaper = scalar, F32, 1340 -luaAdd = scalar, F32, 1344 -; total TS size = 1348 -idlePosition0 = scalar, F32, 1348, "per", 1,0 -trim0 = scalar, F32, 1352, "", 1, 0 -luaAdjustment0 = scalar, F32, 1356, "per", 1,0 -m_wastegatePosition0 = scalar, F32, 1360, "per", 1,0 -etbFeedForward0 = scalar, F32, 1364 -etbIntegralError0 = scalar, F32, 1368, "", 1, 0 -etbCurrentTarget0 = scalar, F32, 1372, "%", 1, 0 -etbCurrentAdjustedTarget0 = scalar, F32, 1376, "%", 1, 0 -etbRevLimitActive0 = bits, U32, 1380, [0:0] -jamDetected0 = bits, U32, 1380, [1:1] -etbDutyRateOfChange0 = scalar, F32, 1384, "per", 1,0 -etbDutyAverage0 = scalar, F32, 1388, "per", 1,0 -etbTpsErrorCounter0 = scalar, U16, 1392, "count", 1,0 -etbPpsErrorCounter0 = scalar, U16, 1394, "count", 1,0 -etbErrorCode0 = scalar, S08, 1396, "", 1, 0 -jamTimer0 = scalar, U16, 1398, "sec", 0.01, 0 -; total TS size = 1400 -faultCode0 = scalar, U08, 1400, "", 1, 0 -heaterDuty0 = scalar, U08, 1401, "%", 1, 0 -pumpDuty0 = scalar, U08, 1402, "%", 1, 0 -tempC0 = scalar, U16, 1404, "C", 1, 0 -nernstVoltage0 = scalar, U16, 1406, "V", 0.001, 0 -esr0 = scalar, U16, 1408, "ohm", 1, 0 -; total TS size = 1412 -dcOutput0 = scalar, F32, 1412, "per", 1,0 -isEnabled0_int = scalar, U08, 1416, "per", 1,0 -isEnabled0 = bits, U32, 1420, [0:0] -; total TS size = 1424 -value0 = scalar, U16, 1424, "value", 1,0 -value1 = scalar, U16, 1426, "value", 1,0 -errorRate = scalar, F32, 1428, "ratio", 1,0 -; total TS size = 1432 -vvtTarget = scalar, U16, 1432, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1434, "%", 0.5, 0 +smartChipAliveCounter = scalar, S08, 1096, "", 1, 0 +startStopPhysicalState = bits, U32, 1100, [0:0] +acrStateDup = bits, U32, 1100, [1:1] +acrEngineMovedRecently = bits, U32, 1100, [2:2] +heaterControlEnabled = bits, U32, 1100, [3:3] +luaDigitalState0 = bits, U32, 1100, [4:4] +luaDigitalState1 = bits, U32, 1100, [5:5] +luaDigitalState2 = bits, U32, 1100, [6:6] +luaDigitalState3 = bits, U32, 1100, [7:7] +startStopStateToggleCounter = scalar, U32, 1104, "", 1, 0 +egtValue1 = scalar, F32, 1108, "", 1, 0 +egtValue2 = scalar, F32, 1112, "", 1, 0 +desiredRpmLimit = scalar, S16, 1116, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 1120, "", 1, 0 +sparkCounter = scalar, U32, 1124, "", 1, 0 +fuelingLoad = scalar, F32, 1128, "", 1, 0 +ignitionLoad = scalar, F32, 1132, "", 1, 0 +veTableYAxis = scalar, U16, 1136, "%", 0.01, 0 +; total TS size = 1140 +tpsFrom = scalar, F32, 1140 +tpsTo = scalar, F32, 1144 +deltaTps = scalar, F32, 1148 +extraFuel = scalar, F32, 1152, "", 1, 0 +valueFromTable = scalar, F32, 1156, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1160, [0:0] +isBelowDecelThreshold = bits, U32, 1160, [1:1] +isTimeToResetAccumulator = bits, U32, 1160, [2:2] +isFractionalEnrichment = bits, U32, 1160, [3:3] +belowEpsilon = bits, U32, 1160, [4:4] +tooShort = bits, U32, 1160, [5:5] +fractionalInjFuel = scalar, F32, 1164, "", 1, 0 +accumulatedValue = scalar, F32, 1168, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1172, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1176, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1180, "", 1, 0 +cycleCnt = scalar, S32, 1184, "", 1, 0 +; total TS size = 1188 +hwEventCounters1 = scalar, U32, 1188, "", 1, 0 +hwEventCounters2 = scalar, U32, 1192, "", 1, 0 +hwEventCounters3 = scalar, U32, 1196, "", 1, 0 +hwEventCounters4 = scalar, U32, 1200, "", 1, 0 +hwEventCounters5 = scalar, U32, 1204, "", 1, 0 +hwEventCounters6 = scalar, U32, 1208, "", 1, 0 +vvtCamCounter = scalar, U32, 1212, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1216, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1220, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1224, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1225, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1228, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1232, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1236, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1240, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1244, [0:0] +; total TS size = 1248 +crankSynchronizationCounter0 = scalar, U32, 1248, "", 1, 0 +vvtSyncGapRatio0 = scalar, F32, 1252, "", 1, 0 +vvtToothDurations00 = scalar, U32, 1256, "us", 1, 0 +vvtCurrentPosition0 = scalar, F32, 1260, "sync: Primary Cam Position", 1, 0 +vvtToothPosition10 = scalar, F32, 1264, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition20 = scalar, F32, 1268, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition30 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition40 = scalar, F32, 1276, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio0 = scalar, F32, 1280, "", 1, 0 +triggerStateIndex0 = scalar, U08, 1284, "", 1, 0 +vvtStateIndex0 = scalar, U08, 1285, "", 1, 0 +; total TS size = 1288 +camResyncCounter = scalar, U08, 1288, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1292, [0:0] +; total TS size = 1296 +wallFuelCorrection = scalar, F32, 1296, "", 1, 0 +wallFuel = scalar, F32, 1300, "", 1, 0 +; total TS size = 1304 +idleState = bits, S32, 1304, [0:2], "not important" +currentIdlePosition = scalar, F32, 1308 +baseIdlePosition = scalar, F32, 1312 +idleClosedLoop = scalar, F32, 1316 +iacByTpsTaper = scalar, F32, 1320 +throttlePedalUpState = scalar, S32, 1324, "", 1, 0 +mightResetPid = bits, U32, 1328, [0:0] +shouldResetPid = bits, U32, 1328, [1:1] +wasResetPid = bits, U32, 1328, [2:2] +mustResetPid = bits, U32, 1328, [3:3] +isCranking = bits, U32, 1328, [4:4] +isIacTableForCoasting = bits, U32, 1328, [5:5] +notIdling = bits, U32, 1328, [6:6] +needReset = bits, U32, 1328, [7:7] +isInDeadZone = bits, U32, 1328, [8:8] +isBlipping = bits, U32, 1328, [9:9] +useClosedLoop = bits, U32, 1328, [10:10] +badTps = bits, U32, 1328, [11:11] +looksLikeRunning = bits, U32, 1328, [12:12] +looksLikeCoasting = bits, U32, 1328, [13:13] +looksLikeCrankToIdle = bits, U32, 1328, [14:14] +isIdleCoasting = bits, U32, 1328, [15:15] +isIdleClosedLoop = bits, U32, 1328, [16:16] +idleTarget = scalar, S32, 1332, "", 1, 0 +targetRpmByClt = scalar, S32, 1336, "", 1, 0 +targetRpmAc = scalar, S32, 1340, "", 1, 0 +iacByRpmTaper = scalar, F32, 1344 +luaAdd = scalar, F32, 1348 +; total TS size = 1352 +idlePosition0 = scalar, F32, 1352, "per", 1,0 +trim0 = scalar, F32, 1356, "", 1, 0 +luaAdjustment0 = scalar, F32, 1360, "per", 1,0 +m_wastegatePosition0 = scalar, F32, 1364, "per", 1,0 +etbFeedForward0 = scalar, F32, 1368 +etbIntegralError0 = scalar, F32, 1372, "", 1, 0 +etbCurrentTarget0 = scalar, F32, 1376, "%", 1, 0 +etbCurrentAdjustedTarget0 = scalar, F32, 1380, "%", 1, 0 +etbRevLimitActive0 = bits, U32, 1384, [0:0] +jamDetected0 = bits, U32, 1384, [1:1] +etbDutyRateOfChange0 = scalar, F32, 1388, "per", 1,0 +etbDutyAverage0 = scalar, F32, 1392, "per", 1,0 +etbTpsErrorCounter0 = scalar, U16, 1396, "count", 1,0 +etbPpsErrorCounter0 = scalar, U16, 1398, "count", 1,0 +etbErrorCode0 = scalar, S08, 1400, "", 1, 0 +jamTimer0 = scalar, U16, 1402, "sec", 0.01, 0 +; total TS size = 1404 +faultCode0 = scalar, U08, 1404, "", 1, 0 +heaterDuty0 = scalar, U08, 1405, "%", 1, 0 +pumpDuty0 = scalar, U08, 1406, "%", 1, 0 +tempC0 = scalar, U16, 1408, "C", 1, 0 +nernstVoltage0 = scalar, U16, 1410, "V", 0.001, 0 +esr0 = scalar, U16, 1412, "ohm", 1, 0 +; total TS size = 1416 +dcOutput0 = scalar, F32, 1416, "per", 1,0 +isEnabled0_int = scalar, U08, 1420, "per", 1,0 +isEnabled0 = bits, U32, 1424, [0:0] +; total TS size = 1428 +value0 = scalar, U16, 1428, "value", 1,0 +value1 = scalar, U16, 1430, "value", 1,0 +errorRate = scalar, F32, 1432, "ratio", 1,0 ; total TS size = 1436 -lambdaCurrentlyGood = bits, U32, 1436, [0:0] -lambdaMonitorCut = bits, U32, 1436, [1:1] -lambdaTimeSinceGood = scalar, U16, 1440, "sec", 0.01, 0 -; total TS size = 1444 +vvtTarget = scalar, U16, 1436, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1438, "%", 0.5, 0 +; total TS size = 1440 +lambdaCurrentlyGood = bits, U32, 1440, [0:0] +lambdaMonitorCut = bits, U32, 1440, [1:1] +lambdaTimeSinceGood = scalar, U16, 1444, "sec", 0.01, 0 +; total TS size = 1448 time = { timeNow } @@ -5240,6 +5241,7 @@ entry = brakePedalState, "Brake switch", int, "%d" entry = startStopState, "startStopState", int, "%d" entry = smartChipState, "smartChipState", int, "%d" entry = smartChipRestartCounter, "smartChipRestartCounter", int, "%d" +entry = smartChipAliveCounter, "smartChipAliveCounter", int, "%d" entry = startStopPhysicalState, "startStopPhysicalState", int, "%d" entry = acrStateDup, "acrStateDup", int, "%d" entry = acrEngineMovedRecently, "acrEngineMovedRecently", int, "%d" @@ -6207,16 +6209,17 @@ dialog = engine_stateDialog, "engine_state" graphLine = smartChipState graphLine = smartChipRestartCounter liveGraph = engine_state_5_Graph, "Graph", South + graphLine = smartChipAliveCounter graphLine = startStopStateToggleCounter graphLine = egtValue1 graphLine = egtValue2 - graphLine = desiredRpmLimit liveGraph = engine_state_6_Graph, "Graph", South + graphLine = desiredRpmLimit graphLine = fuelInjectionCounter graphLine = sparkCounter graphLine = fuelingLoad - graphLine = ignitionLoad liveGraph = engine_state_7_Graph, "Graph", South + graphLine = ignitionLoad graphLine = veTableYAxis indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_at_start_f435.ini b/firmware/tunerstudio/generated/rusefi_at_start_f435.ini index 13728ab5b0..55b0df99dd 100644 --- a/firmware/tunerstudio/generated/rusefi_at_start_f435.ini +++ b/firmware/tunerstudio/generated/rusefi_at_start_f435.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.12.26.at_start_f435.4218430649" + signature = "rusEFI master.2023.12.26.at_start_f435.860584539" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.12.26.at_start_f435.4218430649" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.12.26.at_start_f435.860584539" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -92,7 +92,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="Disabled", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PB0", "PB1", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Tue Dec 26 01:38:23 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Tue Dec 26 22:48:55 UTC 2023 pageSize = 22088 page = 1 @@ -2373,7 +2373,7 @@ lambdaMaxDeviationRpmBins = array, U16, 22078, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1444 + ochBlockSize = 1448 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3027,145 +3027,146 @@ brakePedalState = scalar, S08, 1092, "", 1, 0 startStopState = scalar, S08, 1093, "", 1, 0 smartChipState = scalar, S08, 1094, "", 1, 0 smartChipRestartCounter = scalar, S08, 1095, "", 1, 0 -startStopPhysicalState = bits, U32, 1096, [0:0] -acrStateDup = bits, U32, 1096, [1:1] -acrEngineMovedRecently = bits, U32, 1096, [2:2] -heaterControlEnabled = bits, U32, 1096, [3:3] -luaDigitalState0 = bits, U32, 1096, [4:4] -luaDigitalState1 = bits, U32, 1096, [5:5] -luaDigitalState2 = bits, U32, 1096, [6:6] -luaDigitalState3 = bits, U32, 1096, [7:7] -startStopStateToggleCounter = scalar, U32, 1100, "", 1, 0 -egtValue1 = scalar, F32, 1104, "", 1, 0 -egtValue2 = scalar, F32, 1108, "", 1, 0 -desiredRpmLimit = scalar, S16, 1112, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1116, "", 1, 0 -sparkCounter = scalar, U32, 1120, "", 1, 0 -fuelingLoad = scalar, F32, 1124, "", 1, 0 -ignitionLoad = scalar, F32, 1128, "", 1, 0 -veTableYAxis = scalar, U16, 1132, "%", 0.01, 0 -; total TS size = 1136 -tpsFrom = scalar, F32, 1136 -tpsTo = scalar, F32, 1140 -deltaTps = scalar, F32, 1144 -extraFuel = scalar, F32, 1148, "", 1, 0 -valueFromTable = scalar, F32, 1152, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1156, [0:0] -isBelowDecelThreshold = bits, U32, 1156, [1:1] -isTimeToResetAccumulator = bits, U32, 1156, [2:2] -isFractionalEnrichment = bits, U32, 1156, [3:3] -belowEpsilon = bits, U32, 1156, [4:4] -tooShort = bits, U32, 1156, [5:5] -fractionalInjFuel = scalar, F32, 1160, "", 1, 0 -accumulatedValue = scalar, F32, 1164, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1168, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1172, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1176, "", 1, 0 -cycleCnt = scalar, S32, 1180, "", 1, 0 -; total TS size = 1184 -hwEventCounters1 = scalar, U32, 1184, "", 1, 0 -hwEventCounters2 = scalar, U32, 1188, "", 1, 0 -hwEventCounters3 = scalar, U32, 1192, "", 1, 0 -hwEventCounters4 = scalar, U32, 1196, "", 1, 0 -hwEventCounters5 = scalar, U32, 1200, "", 1, 0 -hwEventCounters6 = scalar, U32, 1204, "", 1, 0 -vvtCamCounter = scalar, U32, 1208, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1212, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1216, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1220, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1221, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1224, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1228, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1232, "", 1, 0 -mapCamPrevToothAngle = scalar, F32, 1236, "deg", 1, 0 -isDecodingMapCam = bits, U32, 1240, [0:0] -; total TS size = 1244 -crankSynchronizationCounter0 = scalar, U32, 1244, "", 1, 0 -vvtSyncGapRatio0 = scalar, F32, 1248, "", 1, 0 -vvtToothDurations00 = scalar, U32, 1252, "us", 1, 0 -vvtCurrentPosition0 = scalar, F32, 1256, "sync: Primary Cam Position", 1, 0 -vvtToothPosition10 = scalar, F32, 1260, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition20 = scalar, F32, 1264, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition30 = scalar, F32, 1268, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition40 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio0 = scalar, F32, 1276, "", 1, 0 -triggerStateIndex0 = scalar, U08, 1280, "", 1, 0 -vvtStateIndex0 = scalar, U08, 1281, "", 1, 0 -; total TS size = 1284 -camResyncCounter = scalar, U08, 1284, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1288, [0:0] -; total TS size = 1292 -wallFuelCorrection = scalar, F32, 1292, "", 1, 0 -wallFuel = scalar, F32, 1296, "", 1, 0 -; total TS size = 1300 -idleState = bits, S32, 1300, [0:2], "not important" -currentIdlePosition = scalar, F32, 1304 -baseIdlePosition = scalar, F32, 1308 -idleClosedLoop = scalar, F32, 1312 -iacByTpsTaper = scalar, F32, 1316 -throttlePedalUpState = scalar, S32, 1320, "", 1, 0 -mightResetPid = bits, U32, 1324, [0:0] -shouldResetPid = bits, U32, 1324, [1:1] -wasResetPid = bits, U32, 1324, [2:2] -mustResetPid = bits, U32, 1324, [3:3] -isCranking = bits, U32, 1324, [4:4] -isIacTableForCoasting = bits, U32, 1324, [5:5] -notIdling = bits, U32, 1324, [6:6] -needReset = bits, U32, 1324, [7:7] -isInDeadZone = bits, U32, 1324, [8:8] -isBlipping = bits, U32, 1324, [9:9] -useClosedLoop = bits, U32, 1324, [10:10] -badTps = bits, U32, 1324, [11:11] -looksLikeRunning = bits, U32, 1324, [12:12] -looksLikeCoasting = bits, U32, 1324, [13:13] -looksLikeCrankToIdle = bits, U32, 1324, [14:14] -isIdleCoasting = bits, U32, 1324, [15:15] -isIdleClosedLoop = bits, U32, 1324, [16:16] -idleTarget = scalar, S32, 1328, "", 1, 0 -targetRpmByClt = scalar, S32, 1332, "", 1, 0 -targetRpmAc = scalar, S32, 1336, "", 1, 0 -iacByRpmTaper = scalar, F32, 1340 -luaAdd = scalar, F32, 1344 -; total TS size = 1348 -idlePosition0 = scalar, F32, 1348, "per", 1,0 -trim0 = scalar, F32, 1352, "", 1, 0 -luaAdjustment0 = scalar, F32, 1356, "per", 1,0 -m_wastegatePosition0 = scalar, F32, 1360, "per", 1,0 -etbFeedForward0 = scalar, F32, 1364 -etbIntegralError0 = scalar, F32, 1368, "", 1, 0 -etbCurrentTarget0 = scalar, F32, 1372, "%", 1, 0 -etbCurrentAdjustedTarget0 = scalar, F32, 1376, "%", 1, 0 -etbRevLimitActive0 = bits, U32, 1380, [0:0] -jamDetected0 = bits, U32, 1380, [1:1] -etbDutyRateOfChange0 = scalar, F32, 1384, "per", 1,0 -etbDutyAverage0 = scalar, F32, 1388, "per", 1,0 -etbTpsErrorCounter0 = scalar, U16, 1392, "count", 1,0 -etbPpsErrorCounter0 = scalar, U16, 1394, "count", 1,0 -etbErrorCode0 = scalar, S08, 1396, "", 1, 0 -jamTimer0 = scalar, U16, 1398, "sec", 0.01, 0 -; total TS size = 1400 -faultCode0 = scalar, U08, 1400, "", 1, 0 -heaterDuty0 = scalar, U08, 1401, "%", 1, 0 -pumpDuty0 = scalar, U08, 1402, "%", 1, 0 -tempC0 = scalar, U16, 1404, "C", 1, 0 -nernstVoltage0 = scalar, U16, 1406, "V", 0.001, 0 -esr0 = scalar, U16, 1408, "ohm", 1, 0 -; total TS size = 1412 -dcOutput0 = scalar, F32, 1412, "per", 1,0 -isEnabled0_int = scalar, U08, 1416, "per", 1,0 -isEnabled0 = bits, U32, 1420, [0:0] -; total TS size = 1424 -value0 = scalar, U16, 1424, "value", 1,0 -value1 = scalar, U16, 1426, "value", 1,0 -errorRate = scalar, F32, 1428, "ratio", 1,0 -; total TS size = 1432 -vvtTarget = scalar, U16, 1432, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1434, "%", 0.5, 0 +smartChipAliveCounter = scalar, S08, 1096, "", 1, 0 +startStopPhysicalState = bits, U32, 1100, [0:0] +acrStateDup = bits, U32, 1100, [1:1] +acrEngineMovedRecently = bits, U32, 1100, [2:2] +heaterControlEnabled = bits, U32, 1100, [3:3] +luaDigitalState0 = bits, U32, 1100, [4:4] +luaDigitalState1 = bits, U32, 1100, [5:5] +luaDigitalState2 = bits, U32, 1100, [6:6] +luaDigitalState3 = bits, U32, 1100, [7:7] +startStopStateToggleCounter = scalar, U32, 1104, "", 1, 0 +egtValue1 = scalar, F32, 1108, "", 1, 0 +egtValue2 = scalar, F32, 1112, "", 1, 0 +desiredRpmLimit = scalar, S16, 1116, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 1120, "", 1, 0 +sparkCounter = scalar, U32, 1124, "", 1, 0 +fuelingLoad = scalar, F32, 1128, "", 1, 0 +ignitionLoad = scalar, F32, 1132, "", 1, 0 +veTableYAxis = scalar, U16, 1136, "%", 0.01, 0 +; total TS size = 1140 +tpsFrom = scalar, F32, 1140 +tpsTo = scalar, F32, 1144 +deltaTps = scalar, F32, 1148 +extraFuel = scalar, F32, 1152, "", 1, 0 +valueFromTable = scalar, F32, 1156, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1160, [0:0] +isBelowDecelThreshold = bits, U32, 1160, [1:1] +isTimeToResetAccumulator = bits, U32, 1160, [2:2] +isFractionalEnrichment = bits, U32, 1160, [3:3] +belowEpsilon = bits, U32, 1160, [4:4] +tooShort = bits, U32, 1160, [5:5] +fractionalInjFuel = scalar, F32, 1164, "", 1, 0 +accumulatedValue = scalar, F32, 1168, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1172, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1176, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1180, "", 1, 0 +cycleCnt = scalar, S32, 1184, "", 1, 0 +; total TS size = 1188 +hwEventCounters1 = scalar, U32, 1188, "", 1, 0 +hwEventCounters2 = scalar, U32, 1192, "", 1, 0 +hwEventCounters3 = scalar, U32, 1196, "", 1, 0 +hwEventCounters4 = scalar, U32, 1200, "", 1, 0 +hwEventCounters5 = scalar, U32, 1204, "", 1, 0 +hwEventCounters6 = scalar, U32, 1208, "", 1, 0 +vvtCamCounter = scalar, U32, 1212, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1216, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1220, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1224, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1225, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1228, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1232, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1236, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1240, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1244, [0:0] +; total TS size = 1248 +crankSynchronizationCounter0 = scalar, U32, 1248, "", 1, 0 +vvtSyncGapRatio0 = scalar, F32, 1252, "", 1, 0 +vvtToothDurations00 = scalar, U32, 1256, "us", 1, 0 +vvtCurrentPosition0 = scalar, F32, 1260, "sync: Primary Cam Position", 1, 0 +vvtToothPosition10 = scalar, F32, 1264, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition20 = scalar, F32, 1268, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition30 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition40 = scalar, F32, 1276, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio0 = scalar, F32, 1280, "", 1, 0 +triggerStateIndex0 = scalar, U08, 1284, "", 1, 0 +vvtStateIndex0 = scalar, U08, 1285, "", 1, 0 +; total TS size = 1288 +camResyncCounter = scalar, U08, 1288, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1292, [0:0] +; total TS size = 1296 +wallFuelCorrection = scalar, F32, 1296, "", 1, 0 +wallFuel = scalar, F32, 1300, "", 1, 0 +; total TS size = 1304 +idleState = bits, S32, 1304, [0:2], "not important" +currentIdlePosition = scalar, F32, 1308 +baseIdlePosition = scalar, F32, 1312 +idleClosedLoop = scalar, F32, 1316 +iacByTpsTaper = scalar, F32, 1320 +throttlePedalUpState = scalar, S32, 1324, "", 1, 0 +mightResetPid = bits, U32, 1328, [0:0] +shouldResetPid = bits, U32, 1328, [1:1] +wasResetPid = bits, U32, 1328, [2:2] +mustResetPid = bits, U32, 1328, [3:3] +isCranking = bits, U32, 1328, [4:4] +isIacTableForCoasting = bits, U32, 1328, [5:5] +notIdling = bits, U32, 1328, [6:6] +needReset = bits, U32, 1328, [7:7] +isInDeadZone = bits, U32, 1328, [8:8] +isBlipping = bits, U32, 1328, [9:9] +useClosedLoop = bits, U32, 1328, [10:10] +badTps = bits, U32, 1328, [11:11] +looksLikeRunning = bits, U32, 1328, [12:12] +looksLikeCoasting = bits, U32, 1328, [13:13] +looksLikeCrankToIdle = bits, U32, 1328, [14:14] +isIdleCoasting = bits, U32, 1328, [15:15] +isIdleClosedLoop = bits, U32, 1328, [16:16] +idleTarget = scalar, S32, 1332, "", 1, 0 +targetRpmByClt = scalar, S32, 1336, "", 1, 0 +targetRpmAc = scalar, S32, 1340, "", 1, 0 +iacByRpmTaper = scalar, F32, 1344 +luaAdd = scalar, F32, 1348 +; total TS size = 1352 +idlePosition0 = scalar, F32, 1352, "per", 1,0 +trim0 = scalar, F32, 1356, "", 1, 0 +luaAdjustment0 = scalar, F32, 1360, "per", 1,0 +m_wastegatePosition0 = scalar, F32, 1364, "per", 1,0 +etbFeedForward0 = scalar, F32, 1368 +etbIntegralError0 = scalar, F32, 1372, "", 1, 0 +etbCurrentTarget0 = scalar, F32, 1376, "%", 1, 0 +etbCurrentAdjustedTarget0 = scalar, F32, 1380, "%", 1, 0 +etbRevLimitActive0 = bits, U32, 1384, [0:0] +jamDetected0 = bits, U32, 1384, [1:1] +etbDutyRateOfChange0 = scalar, F32, 1388, "per", 1,0 +etbDutyAverage0 = scalar, F32, 1392, "per", 1,0 +etbTpsErrorCounter0 = scalar, U16, 1396, "count", 1,0 +etbPpsErrorCounter0 = scalar, U16, 1398, "count", 1,0 +etbErrorCode0 = scalar, S08, 1400, "", 1, 0 +jamTimer0 = scalar, U16, 1402, "sec", 0.01, 0 +; total TS size = 1404 +faultCode0 = scalar, U08, 1404, "", 1, 0 +heaterDuty0 = scalar, U08, 1405, "%", 1, 0 +pumpDuty0 = scalar, U08, 1406, "%", 1, 0 +tempC0 = scalar, U16, 1408, "C", 1, 0 +nernstVoltage0 = scalar, U16, 1410, "V", 0.001, 0 +esr0 = scalar, U16, 1412, "ohm", 1, 0 +; total TS size = 1416 +dcOutput0 = scalar, F32, 1416, "per", 1,0 +isEnabled0_int = scalar, U08, 1420, "per", 1,0 +isEnabled0 = bits, U32, 1424, [0:0] +; total TS size = 1428 +value0 = scalar, U16, 1428, "value", 1,0 +value1 = scalar, U16, 1430, "value", 1,0 +errorRate = scalar, F32, 1432, "ratio", 1,0 ; total TS size = 1436 -lambdaCurrentlyGood = bits, U32, 1436, [0:0] -lambdaMonitorCut = bits, U32, 1436, [1:1] -lambdaTimeSinceGood = scalar, U16, 1440, "sec", 0.01, 0 -; total TS size = 1444 +vvtTarget = scalar, U16, 1436, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1438, "%", 0.5, 0 +; total TS size = 1440 +lambdaCurrentlyGood = bits, U32, 1440, [0:0] +lambdaMonitorCut = bits, U32, 1440, [1:1] +lambdaTimeSinceGood = scalar, U16, 1444, "sec", 0.01, 0 +; total TS size = 1448 time = { timeNow } @@ -5237,6 +5238,7 @@ entry = brakePedalState, "Brake switch", int, "%d" entry = startStopState, "startStopState", int, "%d" entry = smartChipState, "smartChipState", int, "%d" entry = smartChipRestartCounter, "smartChipRestartCounter", int, "%d" +entry = smartChipAliveCounter, "smartChipAliveCounter", int, "%d" entry = startStopPhysicalState, "startStopPhysicalState", int, "%d" entry = acrStateDup, "acrStateDup", int, "%d" entry = acrEngineMovedRecently, "acrEngineMovedRecently", int, "%d" @@ -6202,16 +6204,17 @@ dialog = engine_stateDialog, "engine_state" graphLine = smartChipState graphLine = smartChipRestartCounter liveGraph = engine_state_5_Graph, "Graph", South + graphLine = smartChipAliveCounter graphLine = startStopStateToggleCounter graphLine = egtValue1 graphLine = egtValue2 - graphLine = desiredRpmLimit liveGraph = engine_state_6_Graph, "Graph", South + graphLine = desiredRpmLimit graphLine = fuelInjectionCounter graphLine = sparkCounter graphLine = fuelingLoad - graphLine = ignitionLoad liveGraph = engine_state_7_Graph, "Graph", South + graphLine = ignitionLoad graphLine = veTableYAxis indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_atlas.ini b/firmware/tunerstudio/generated/rusefi_atlas.ini index 3e2ea82010..ac54c64610 100644 --- a/firmware/tunerstudio/generated/rusefi_atlas.ini +++ b/firmware/tunerstudio/generated/rusefi_atlas.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.12.26.atlas.3212308727" + signature = "rusEFI master.2023.12.26.atlas.2001514005" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.12.26.atlas.3212308727" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.12.26.atlas.2001514005" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -92,7 +92,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="Disabled", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PB0", "PB1", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Tue Dec 26 01:38:16 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Tue Dec 26 22:48:48 UTC 2023 pageSize = 21588 page = 1 @@ -2373,7 +2373,7 @@ lambdaMaxDeviationRpmBins = array, U16, 21578, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1444 + ochBlockSize = 1448 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3027,145 +3027,146 @@ brakePedalState = scalar, S08, 1092, "", 1, 0 startStopState = scalar, S08, 1093, "", 1, 0 smartChipState = scalar, S08, 1094, "", 1, 0 smartChipRestartCounter = scalar, S08, 1095, "", 1, 0 -startStopPhysicalState = bits, U32, 1096, [0:0] -acrStateDup = bits, U32, 1096, [1:1] -acrEngineMovedRecently = bits, U32, 1096, [2:2] -heaterControlEnabled = bits, U32, 1096, [3:3] -luaDigitalState0 = bits, U32, 1096, [4:4] -luaDigitalState1 = bits, U32, 1096, [5:5] -luaDigitalState2 = bits, U32, 1096, [6:6] -luaDigitalState3 = bits, U32, 1096, [7:7] -startStopStateToggleCounter = scalar, U32, 1100, "", 1, 0 -egtValue1 = scalar, F32, 1104, "", 1, 0 -egtValue2 = scalar, F32, 1108, "", 1, 0 -desiredRpmLimit = scalar, S16, 1112, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1116, "", 1, 0 -sparkCounter = scalar, U32, 1120, "", 1, 0 -fuelingLoad = scalar, F32, 1124, "", 1, 0 -ignitionLoad = scalar, F32, 1128, "", 1, 0 -veTableYAxis = scalar, U16, 1132, "%", 0.01, 0 -; total TS size = 1136 -tpsFrom = scalar, F32, 1136 -tpsTo = scalar, F32, 1140 -deltaTps = scalar, F32, 1144 -extraFuel = scalar, F32, 1148, "", 1, 0 -valueFromTable = scalar, F32, 1152, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1156, [0:0] -isBelowDecelThreshold = bits, U32, 1156, [1:1] -isTimeToResetAccumulator = bits, U32, 1156, [2:2] -isFractionalEnrichment = bits, U32, 1156, [3:3] -belowEpsilon = bits, U32, 1156, [4:4] -tooShort = bits, U32, 1156, [5:5] -fractionalInjFuel = scalar, F32, 1160, "", 1, 0 -accumulatedValue = scalar, F32, 1164, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1168, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1172, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1176, "", 1, 0 -cycleCnt = scalar, S32, 1180, "", 1, 0 -; total TS size = 1184 -hwEventCounters1 = scalar, U32, 1184, "", 1, 0 -hwEventCounters2 = scalar, U32, 1188, "", 1, 0 -hwEventCounters3 = scalar, U32, 1192, "", 1, 0 -hwEventCounters4 = scalar, U32, 1196, "", 1, 0 -hwEventCounters5 = scalar, U32, 1200, "", 1, 0 -hwEventCounters6 = scalar, U32, 1204, "", 1, 0 -vvtCamCounter = scalar, U32, 1208, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1212, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1216, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1220, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1221, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1224, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1228, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1232, "", 1, 0 -mapCamPrevToothAngle = scalar, F32, 1236, "deg", 1, 0 -isDecodingMapCam = bits, U32, 1240, [0:0] -; total TS size = 1244 -crankSynchronizationCounter0 = scalar, U32, 1244, "", 1, 0 -vvtSyncGapRatio0 = scalar, F32, 1248, "", 1, 0 -vvtToothDurations00 = scalar, U32, 1252, "us", 1, 0 -vvtCurrentPosition0 = scalar, F32, 1256, "sync: Primary Cam Position", 1, 0 -vvtToothPosition10 = scalar, F32, 1260, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition20 = scalar, F32, 1264, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition30 = scalar, F32, 1268, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition40 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio0 = scalar, F32, 1276, "", 1, 0 -triggerStateIndex0 = scalar, U08, 1280, "", 1, 0 -vvtStateIndex0 = scalar, U08, 1281, "", 1, 0 -; total TS size = 1284 -camResyncCounter = scalar, U08, 1284, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1288, [0:0] -; total TS size = 1292 -wallFuelCorrection = scalar, F32, 1292, "", 1, 0 -wallFuel = scalar, F32, 1296, "", 1, 0 -; total TS size = 1300 -idleState = bits, S32, 1300, [0:2], "not important" -currentIdlePosition = scalar, F32, 1304 -baseIdlePosition = scalar, F32, 1308 -idleClosedLoop = scalar, F32, 1312 -iacByTpsTaper = scalar, F32, 1316 -throttlePedalUpState = scalar, S32, 1320, "", 1, 0 -mightResetPid = bits, U32, 1324, [0:0] -shouldResetPid = bits, U32, 1324, [1:1] -wasResetPid = bits, U32, 1324, [2:2] -mustResetPid = bits, U32, 1324, [3:3] -isCranking = bits, U32, 1324, [4:4] -isIacTableForCoasting = bits, U32, 1324, [5:5] -notIdling = bits, U32, 1324, [6:6] -needReset = bits, U32, 1324, [7:7] -isInDeadZone = bits, U32, 1324, [8:8] -isBlipping = bits, U32, 1324, [9:9] -useClosedLoop = bits, U32, 1324, [10:10] -badTps = bits, U32, 1324, [11:11] -looksLikeRunning = bits, U32, 1324, [12:12] -looksLikeCoasting = bits, U32, 1324, [13:13] -looksLikeCrankToIdle = bits, U32, 1324, [14:14] -isIdleCoasting = bits, U32, 1324, [15:15] -isIdleClosedLoop = bits, U32, 1324, [16:16] -idleTarget = scalar, S32, 1328, "", 1, 0 -targetRpmByClt = scalar, S32, 1332, "", 1, 0 -targetRpmAc = scalar, S32, 1336, "", 1, 0 -iacByRpmTaper = scalar, F32, 1340 -luaAdd = scalar, F32, 1344 -; total TS size = 1348 -idlePosition0 = scalar, F32, 1348, "per", 1,0 -trim0 = scalar, F32, 1352, "", 1, 0 -luaAdjustment0 = scalar, F32, 1356, "per", 1,0 -m_wastegatePosition0 = scalar, F32, 1360, "per", 1,0 -etbFeedForward0 = scalar, F32, 1364 -etbIntegralError0 = scalar, F32, 1368, "", 1, 0 -etbCurrentTarget0 = scalar, F32, 1372, "%", 1, 0 -etbCurrentAdjustedTarget0 = scalar, F32, 1376, "%", 1, 0 -etbRevLimitActive0 = bits, U32, 1380, [0:0] -jamDetected0 = bits, U32, 1380, [1:1] -etbDutyRateOfChange0 = scalar, F32, 1384, "per", 1,0 -etbDutyAverage0 = scalar, F32, 1388, "per", 1,0 -etbTpsErrorCounter0 = scalar, U16, 1392, "count", 1,0 -etbPpsErrorCounter0 = scalar, U16, 1394, "count", 1,0 -etbErrorCode0 = scalar, S08, 1396, "", 1, 0 -jamTimer0 = scalar, U16, 1398, "sec", 0.01, 0 -; total TS size = 1400 -faultCode0 = scalar, U08, 1400, "", 1, 0 -heaterDuty0 = scalar, U08, 1401, "%", 1, 0 -pumpDuty0 = scalar, U08, 1402, "%", 1, 0 -tempC0 = scalar, U16, 1404, "C", 1, 0 -nernstVoltage0 = scalar, U16, 1406, "V", 0.001, 0 -esr0 = scalar, U16, 1408, "ohm", 1, 0 -; total TS size = 1412 -dcOutput0 = scalar, F32, 1412, "per", 1,0 -isEnabled0_int = scalar, U08, 1416, "per", 1,0 -isEnabled0 = bits, U32, 1420, [0:0] -; total TS size = 1424 -value0 = scalar, U16, 1424, "value", 1,0 -value1 = scalar, U16, 1426, "value", 1,0 -errorRate = scalar, F32, 1428, "ratio", 1,0 -; total TS size = 1432 -vvtTarget = scalar, U16, 1432, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1434, "%", 0.5, 0 +smartChipAliveCounter = scalar, S08, 1096, "", 1, 0 +startStopPhysicalState = bits, U32, 1100, [0:0] +acrStateDup = bits, U32, 1100, [1:1] +acrEngineMovedRecently = bits, U32, 1100, [2:2] +heaterControlEnabled = bits, U32, 1100, [3:3] +luaDigitalState0 = bits, U32, 1100, [4:4] +luaDigitalState1 = bits, U32, 1100, [5:5] +luaDigitalState2 = bits, U32, 1100, [6:6] +luaDigitalState3 = bits, U32, 1100, [7:7] +startStopStateToggleCounter = scalar, U32, 1104, "", 1, 0 +egtValue1 = scalar, F32, 1108, "", 1, 0 +egtValue2 = scalar, F32, 1112, "", 1, 0 +desiredRpmLimit = scalar, S16, 1116, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 1120, "", 1, 0 +sparkCounter = scalar, U32, 1124, "", 1, 0 +fuelingLoad = scalar, F32, 1128, "", 1, 0 +ignitionLoad = scalar, F32, 1132, "", 1, 0 +veTableYAxis = scalar, U16, 1136, "%", 0.01, 0 +; total TS size = 1140 +tpsFrom = scalar, F32, 1140 +tpsTo = scalar, F32, 1144 +deltaTps = scalar, F32, 1148 +extraFuel = scalar, F32, 1152, "", 1, 0 +valueFromTable = scalar, F32, 1156, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1160, [0:0] +isBelowDecelThreshold = bits, U32, 1160, [1:1] +isTimeToResetAccumulator = bits, U32, 1160, [2:2] +isFractionalEnrichment = bits, U32, 1160, [3:3] +belowEpsilon = bits, U32, 1160, [4:4] +tooShort = bits, U32, 1160, [5:5] +fractionalInjFuel = scalar, F32, 1164, "", 1, 0 +accumulatedValue = scalar, F32, 1168, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1172, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1176, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1180, "", 1, 0 +cycleCnt = scalar, S32, 1184, "", 1, 0 +; total TS size = 1188 +hwEventCounters1 = scalar, U32, 1188, "", 1, 0 +hwEventCounters2 = scalar, U32, 1192, "", 1, 0 +hwEventCounters3 = scalar, U32, 1196, "", 1, 0 +hwEventCounters4 = scalar, U32, 1200, "", 1, 0 +hwEventCounters5 = scalar, U32, 1204, "", 1, 0 +hwEventCounters6 = scalar, U32, 1208, "", 1, 0 +vvtCamCounter = scalar, U32, 1212, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1216, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1220, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1224, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1225, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1228, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1232, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1236, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1240, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1244, [0:0] +; total TS size = 1248 +crankSynchronizationCounter0 = scalar, U32, 1248, "", 1, 0 +vvtSyncGapRatio0 = scalar, F32, 1252, "", 1, 0 +vvtToothDurations00 = scalar, U32, 1256, "us", 1, 0 +vvtCurrentPosition0 = scalar, F32, 1260, "sync: Primary Cam Position", 1, 0 +vvtToothPosition10 = scalar, F32, 1264, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition20 = scalar, F32, 1268, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition30 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition40 = scalar, F32, 1276, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio0 = scalar, F32, 1280, "", 1, 0 +triggerStateIndex0 = scalar, U08, 1284, "", 1, 0 +vvtStateIndex0 = scalar, U08, 1285, "", 1, 0 +; total TS size = 1288 +camResyncCounter = scalar, U08, 1288, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1292, [0:0] +; total TS size = 1296 +wallFuelCorrection = scalar, F32, 1296, "", 1, 0 +wallFuel = scalar, F32, 1300, "", 1, 0 +; total TS size = 1304 +idleState = bits, S32, 1304, [0:2], "not important" +currentIdlePosition = scalar, F32, 1308 +baseIdlePosition = scalar, F32, 1312 +idleClosedLoop = scalar, F32, 1316 +iacByTpsTaper = scalar, F32, 1320 +throttlePedalUpState = scalar, S32, 1324, "", 1, 0 +mightResetPid = bits, U32, 1328, [0:0] +shouldResetPid = bits, U32, 1328, [1:1] +wasResetPid = bits, U32, 1328, [2:2] +mustResetPid = bits, U32, 1328, [3:3] +isCranking = bits, U32, 1328, [4:4] +isIacTableForCoasting = bits, U32, 1328, [5:5] +notIdling = bits, U32, 1328, [6:6] +needReset = bits, U32, 1328, [7:7] +isInDeadZone = bits, U32, 1328, [8:8] +isBlipping = bits, U32, 1328, [9:9] +useClosedLoop = bits, U32, 1328, [10:10] +badTps = bits, U32, 1328, [11:11] +looksLikeRunning = bits, U32, 1328, [12:12] +looksLikeCoasting = bits, U32, 1328, [13:13] +looksLikeCrankToIdle = bits, U32, 1328, [14:14] +isIdleCoasting = bits, U32, 1328, [15:15] +isIdleClosedLoop = bits, U32, 1328, [16:16] +idleTarget = scalar, S32, 1332, "", 1, 0 +targetRpmByClt = scalar, S32, 1336, "", 1, 0 +targetRpmAc = scalar, S32, 1340, "", 1, 0 +iacByRpmTaper = scalar, F32, 1344 +luaAdd = scalar, F32, 1348 +; total TS size = 1352 +idlePosition0 = scalar, F32, 1352, "per", 1,0 +trim0 = scalar, F32, 1356, "", 1, 0 +luaAdjustment0 = scalar, F32, 1360, "per", 1,0 +m_wastegatePosition0 = scalar, F32, 1364, "per", 1,0 +etbFeedForward0 = scalar, F32, 1368 +etbIntegralError0 = scalar, F32, 1372, "", 1, 0 +etbCurrentTarget0 = scalar, F32, 1376, "%", 1, 0 +etbCurrentAdjustedTarget0 = scalar, F32, 1380, "%", 1, 0 +etbRevLimitActive0 = bits, U32, 1384, [0:0] +jamDetected0 = bits, U32, 1384, [1:1] +etbDutyRateOfChange0 = scalar, F32, 1388, "per", 1,0 +etbDutyAverage0 = scalar, F32, 1392, "per", 1,0 +etbTpsErrorCounter0 = scalar, U16, 1396, "count", 1,0 +etbPpsErrorCounter0 = scalar, U16, 1398, "count", 1,0 +etbErrorCode0 = scalar, S08, 1400, "", 1, 0 +jamTimer0 = scalar, U16, 1402, "sec", 0.01, 0 +; total TS size = 1404 +faultCode0 = scalar, U08, 1404, "", 1, 0 +heaterDuty0 = scalar, U08, 1405, "%", 1, 0 +pumpDuty0 = scalar, U08, 1406, "%", 1, 0 +tempC0 = scalar, U16, 1408, "C", 1, 0 +nernstVoltage0 = scalar, U16, 1410, "V", 0.001, 0 +esr0 = scalar, U16, 1412, "ohm", 1, 0 +; total TS size = 1416 +dcOutput0 = scalar, F32, 1416, "per", 1,0 +isEnabled0_int = scalar, U08, 1420, "per", 1,0 +isEnabled0 = bits, U32, 1424, [0:0] +; total TS size = 1428 +value0 = scalar, U16, 1428, "value", 1,0 +value1 = scalar, U16, 1430, "value", 1,0 +errorRate = scalar, F32, 1432, "ratio", 1,0 ; total TS size = 1436 -lambdaCurrentlyGood = bits, U32, 1436, [0:0] -lambdaMonitorCut = bits, U32, 1436, [1:1] -lambdaTimeSinceGood = scalar, U16, 1440, "sec", 0.01, 0 -; total TS size = 1444 +vvtTarget = scalar, U16, 1436, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1438, "%", 0.5, 0 +; total TS size = 1440 +lambdaCurrentlyGood = bits, U32, 1440, [0:0] +lambdaMonitorCut = bits, U32, 1440, [1:1] +lambdaTimeSinceGood = scalar, U16, 1444, "sec", 0.01, 0 +; total TS size = 1448 time = { timeNow } @@ -5237,6 +5238,7 @@ entry = brakePedalState, "Brake switch", int, "%d" entry = startStopState, "startStopState", int, "%d" entry = smartChipState, "smartChipState", int, "%d" entry = smartChipRestartCounter, "smartChipRestartCounter", int, "%d" +entry = smartChipAliveCounter, "smartChipAliveCounter", int, "%d" entry = startStopPhysicalState, "startStopPhysicalState", int, "%d" entry = acrStateDup, "acrStateDup", int, "%d" entry = acrEngineMovedRecently, "acrEngineMovedRecently", int, "%d" @@ -6202,16 +6204,17 @@ dialog = engine_stateDialog, "engine_state" graphLine = smartChipState graphLine = smartChipRestartCounter liveGraph = engine_state_5_Graph, "Graph", South + graphLine = smartChipAliveCounter graphLine = startStopStateToggleCounter graphLine = egtValue1 graphLine = egtValue2 - graphLine = desiredRpmLimit liveGraph = engine_state_6_Graph, "Graph", South + graphLine = desiredRpmLimit graphLine = fuelInjectionCounter graphLine = sparkCounter graphLine = fuelingLoad - graphLine = ignitionLoad liveGraph = engine_state_7_Graph, "Graph", South + graphLine = ignitionLoad graphLine = veTableYAxis indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_cypress.ini b/firmware/tunerstudio/generated/rusefi_cypress.ini index c1d99a8bee..5403cd7c8b 100644 --- a/firmware/tunerstudio/generated/rusefi_cypress.ini +++ b/firmware/tunerstudio/generated/rusefi_cypress.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.12.26.cypress.4218430649" + signature = "rusEFI master.2023.12.26.cypress.860584539" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.12.26.cypress.4218430649" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.12.26.cypress.860584539" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -92,7 +92,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="Disabled", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PB0", "PB1", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Tue Dec 26 01:36:36 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Tue Dec 26 22:47:06 UTC 2023 pageSize = 22088 page = 1 @@ -2373,7 +2373,7 @@ lambdaMaxDeviationRpmBins = array, U16, 22078, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1444 + ochBlockSize = 1448 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3027,145 +3027,146 @@ brakePedalState = scalar, S08, 1092, "", 1, 0 startStopState = scalar, S08, 1093, "", 1, 0 smartChipState = scalar, S08, 1094, "", 1, 0 smartChipRestartCounter = scalar, S08, 1095, "", 1, 0 -startStopPhysicalState = bits, U32, 1096, [0:0] -acrStateDup = bits, U32, 1096, [1:1] -acrEngineMovedRecently = bits, U32, 1096, [2:2] -heaterControlEnabled = bits, U32, 1096, [3:3] -luaDigitalState0 = bits, U32, 1096, [4:4] -luaDigitalState1 = bits, U32, 1096, [5:5] -luaDigitalState2 = bits, U32, 1096, [6:6] -luaDigitalState3 = bits, U32, 1096, [7:7] -startStopStateToggleCounter = scalar, U32, 1100, "", 1, 0 -egtValue1 = scalar, F32, 1104, "", 1, 0 -egtValue2 = scalar, F32, 1108, "", 1, 0 -desiredRpmLimit = scalar, S16, 1112, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1116, "", 1, 0 -sparkCounter = scalar, U32, 1120, "", 1, 0 -fuelingLoad = scalar, F32, 1124, "", 1, 0 -ignitionLoad = scalar, F32, 1128, "", 1, 0 -veTableYAxis = scalar, U16, 1132, "%", 0.01, 0 -; total TS size = 1136 -tpsFrom = scalar, F32, 1136 -tpsTo = scalar, F32, 1140 -deltaTps = scalar, F32, 1144 -extraFuel = scalar, F32, 1148, "", 1, 0 -valueFromTable = scalar, F32, 1152, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1156, [0:0] -isBelowDecelThreshold = bits, U32, 1156, [1:1] -isTimeToResetAccumulator = bits, U32, 1156, [2:2] -isFractionalEnrichment = bits, U32, 1156, [3:3] -belowEpsilon = bits, U32, 1156, [4:4] -tooShort = bits, U32, 1156, [5:5] -fractionalInjFuel = scalar, F32, 1160, "", 1, 0 -accumulatedValue = scalar, F32, 1164, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1168, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1172, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1176, "", 1, 0 -cycleCnt = scalar, S32, 1180, "", 1, 0 -; total TS size = 1184 -hwEventCounters1 = scalar, U32, 1184, "", 1, 0 -hwEventCounters2 = scalar, U32, 1188, "", 1, 0 -hwEventCounters3 = scalar, U32, 1192, "", 1, 0 -hwEventCounters4 = scalar, U32, 1196, "", 1, 0 -hwEventCounters5 = scalar, U32, 1200, "", 1, 0 -hwEventCounters6 = scalar, U32, 1204, "", 1, 0 -vvtCamCounter = scalar, U32, 1208, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1212, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1216, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1220, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1221, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1224, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1228, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1232, "", 1, 0 -mapCamPrevToothAngle = scalar, F32, 1236, "deg", 1, 0 -isDecodingMapCam = bits, U32, 1240, [0:0] -; total TS size = 1244 -crankSynchronizationCounter0 = scalar, U32, 1244, "", 1, 0 -vvtSyncGapRatio0 = scalar, F32, 1248, "", 1, 0 -vvtToothDurations00 = scalar, U32, 1252, "us", 1, 0 -vvtCurrentPosition0 = scalar, F32, 1256, "sync: Primary Cam Position", 1, 0 -vvtToothPosition10 = scalar, F32, 1260, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition20 = scalar, F32, 1264, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition30 = scalar, F32, 1268, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition40 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio0 = scalar, F32, 1276, "", 1, 0 -triggerStateIndex0 = scalar, U08, 1280, "", 1, 0 -vvtStateIndex0 = scalar, U08, 1281, "", 1, 0 -; total TS size = 1284 -camResyncCounter = scalar, U08, 1284, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1288, [0:0] -; total TS size = 1292 -wallFuelCorrection = scalar, F32, 1292, "", 1, 0 -wallFuel = scalar, F32, 1296, "", 1, 0 -; total TS size = 1300 -idleState = bits, S32, 1300, [0:2], "not important" -currentIdlePosition = scalar, F32, 1304 -baseIdlePosition = scalar, F32, 1308 -idleClosedLoop = scalar, F32, 1312 -iacByTpsTaper = scalar, F32, 1316 -throttlePedalUpState = scalar, S32, 1320, "", 1, 0 -mightResetPid = bits, U32, 1324, [0:0] -shouldResetPid = bits, U32, 1324, [1:1] -wasResetPid = bits, U32, 1324, [2:2] -mustResetPid = bits, U32, 1324, [3:3] -isCranking = bits, U32, 1324, [4:4] -isIacTableForCoasting = bits, U32, 1324, [5:5] -notIdling = bits, U32, 1324, [6:6] -needReset = bits, U32, 1324, [7:7] -isInDeadZone = bits, U32, 1324, [8:8] -isBlipping = bits, U32, 1324, [9:9] -useClosedLoop = bits, U32, 1324, [10:10] -badTps = bits, U32, 1324, [11:11] -looksLikeRunning = bits, U32, 1324, [12:12] -looksLikeCoasting = bits, U32, 1324, [13:13] -looksLikeCrankToIdle = bits, U32, 1324, [14:14] -isIdleCoasting = bits, U32, 1324, [15:15] -isIdleClosedLoop = bits, U32, 1324, [16:16] -idleTarget = scalar, S32, 1328, "", 1, 0 -targetRpmByClt = scalar, S32, 1332, "", 1, 0 -targetRpmAc = scalar, S32, 1336, "", 1, 0 -iacByRpmTaper = scalar, F32, 1340 -luaAdd = scalar, F32, 1344 -; total TS size = 1348 -idlePosition0 = scalar, F32, 1348, "per", 1,0 -trim0 = scalar, F32, 1352, "", 1, 0 -luaAdjustment0 = scalar, F32, 1356, "per", 1,0 -m_wastegatePosition0 = scalar, F32, 1360, "per", 1,0 -etbFeedForward0 = scalar, F32, 1364 -etbIntegralError0 = scalar, F32, 1368, "", 1, 0 -etbCurrentTarget0 = scalar, F32, 1372, "%", 1, 0 -etbCurrentAdjustedTarget0 = scalar, F32, 1376, "%", 1, 0 -etbRevLimitActive0 = bits, U32, 1380, [0:0] -jamDetected0 = bits, U32, 1380, [1:1] -etbDutyRateOfChange0 = scalar, F32, 1384, "per", 1,0 -etbDutyAverage0 = scalar, F32, 1388, "per", 1,0 -etbTpsErrorCounter0 = scalar, U16, 1392, "count", 1,0 -etbPpsErrorCounter0 = scalar, U16, 1394, "count", 1,0 -etbErrorCode0 = scalar, S08, 1396, "", 1, 0 -jamTimer0 = scalar, U16, 1398, "sec", 0.01, 0 -; total TS size = 1400 -faultCode0 = scalar, U08, 1400, "", 1, 0 -heaterDuty0 = scalar, U08, 1401, "%", 1, 0 -pumpDuty0 = scalar, U08, 1402, "%", 1, 0 -tempC0 = scalar, U16, 1404, "C", 1, 0 -nernstVoltage0 = scalar, U16, 1406, "V", 0.001, 0 -esr0 = scalar, U16, 1408, "ohm", 1, 0 -; total TS size = 1412 -dcOutput0 = scalar, F32, 1412, "per", 1,0 -isEnabled0_int = scalar, U08, 1416, "per", 1,0 -isEnabled0 = bits, U32, 1420, [0:0] -; total TS size = 1424 -value0 = scalar, U16, 1424, "value", 1,0 -value1 = scalar, U16, 1426, "value", 1,0 -errorRate = scalar, F32, 1428, "ratio", 1,0 -; total TS size = 1432 -vvtTarget = scalar, U16, 1432, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1434, "%", 0.5, 0 +smartChipAliveCounter = scalar, S08, 1096, "", 1, 0 +startStopPhysicalState = bits, U32, 1100, [0:0] +acrStateDup = bits, U32, 1100, [1:1] +acrEngineMovedRecently = bits, U32, 1100, [2:2] +heaterControlEnabled = bits, U32, 1100, [3:3] +luaDigitalState0 = bits, U32, 1100, [4:4] +luaDigitalState1 = bits, U32, 1100, [5:5] +luaDigitalState2 = bits, U32, 1100, [6:6] +luaDigitalState3 = bits, U32, 1100, [7:7] +startStopStateToggleCounter = scalar, U32, 1104, "", 1, 0 +egtValue1 = scalar, F32, 1108, "", 1, 0 +egtValue2 = scalar, F32, 1112, "", 1, 0 +desiredRpmLimit = scalar, S16, 1116, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 1120, "", 1, 0 +sparkCounter = scalar, U32, 1124, "", 1, 0 +fuelingLoad = scalar, F32, 1128, "", 1, 0 +ignitionLoad = scalar, F32, 1132, "", 1, 0 +veTableYAxis = scalar, U16, 1136, "%", 0.01, 0 +; total TS size = 1140 +tpsFrom = scalar, F32, 1140 +tpsTo = scalar, F32, 1144 +deltaTps = scalar, F32, 1148 +extraFuel = scalar, F32, 1152, "", 1, 0 +valueFromTable = scalar, F32, 1156, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1160, [0:0] +isBelowDecelThreshold = bits, U32, 1160, [1:1] +isTimeToResetAccumulator = bits, U32, 1160, [2:2] +isFractionalEnrichment = bits, U32, 1160, [3:3] +belowEpsilon = bits, U32, 1160, [4:4] +tooShort = bits, U32, 1160, [5:5] +fractionalInjFuel = scalar, F32, 1164, "", 1, 0 +accumulatedValue = scalar, F32, 1168, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1172, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1176, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1180, "", 1, 0 +cycleCnt = scalar, S32, 1184, "", 1, 0 +; total TS size = 1188 +hwEventCounters1 = scalar, U32, 1188, "", 1, 0 +hwEventCounters2 = scalar, U32, 1192, "", 1, 0 +hwEventCounters3 = scalar, U32, 1196, "", 1, 0 +hwEventCounters4 = scalar, U32, 1200, "", 1, 0 +hwEventCounters5 = scalar, U32, 1204, "", 1, 0 +hwEventCounters6 = scalar, U32, 1208, "", 1, 0 +vvtCamCounter = scalar, U32, 1212, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1216, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1220, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1224, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1225, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1228, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1232, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1236, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1240, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1244, [0:0] +; total TS size = 1248 +crankSynchronizationCounter0 = scalar, U32, 1248, "", 1, 0 +vvtSyncGapRatio0 = scalar, F32, 1252, "", 1, 0 +vvtToothDurations00 = scalar, U32, 1256, "us", 1, 0 +vvtCurrentPosition0 = scalar, F32, 1260, "sync: Primary Cam Position", 1, 0 +vvtToothPosition10 = scalar, F32, 1264, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition20 = scalar, F32, 1268, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition30 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition40 = scalar, F32, 1276, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio0 = scalar, F32, 1280, "", 1, 0 +triggerStateIndex0 = scalar, U08, 1284, "", 1, 0 +vvtStateIndex0 = scalar, U08, 1285, "", 1, 0 +; total TS size = 1288 +camResyncCounter = scalar, U08, 1288, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1292, [0:0] +; total TS size = 1296 +wallFuelCorrection = scalar, F32, 1296, "", 1, 0 +wallFuel = scalar, F32, 1300, "", 1, 0 +; total TS size = 1304 +idleState = bits, S32, 1304, [0:2], "not important" +currentIdlePosition = scalar, F32, 1308 +baseIdlePosition = scalar, F32, 1312 +idleClosedLoop = scalar, F32, 1316 +iacByTpsTaper = scalar, F32, 1320 +throttlePedalUpState = scalar, S32, 1324, "", 1, 0 +mightResetPid = bits, U32, 1328, [0:0] +shouldResetPid = bits, U32, 1328, [1:1] +wasResetPid = bits, U32, 1328, [2:2] +mustResetPid = bits, U32, 1328, [3:3] +isCranking = bits, U32, 1328, [4:4] +isIacTableForCoasting = bits, U32, 1328, [5:5] +notIdling = bits, U32, 1328, [6:6] +needReset = bits, U32, 1328, [7:7] +isInDeadZone = bits, U32, 1328, [8:8] +isBlipping = bits, U32, 1328, [9:9] +useClosedLoop = bits, U32, 1328, [10:10] +badTps = bits, U32, 1328, [11:11] +looksLikeRunning = bits, U32, 1328, [12:12] +looksLikeCoasting = bits, U32, 1328, [13:13] +looksLikeCrankToIdle = bits, U32, 1328, [14:14] +isIdleCoasting = bits, U32, 1328, [15:15] +isIdleClosedLoop = bits, U32, 1328, [16:16] +idleTarget = scalar, S32, 1332, "", 1, 0 +targetRpmByClt = scalar, S32, 1336, "", 1, 0 +targetRpmAc = scalar, S32, 1340, "", 1, 0 +iacByRpmTaper = scalar, F32, 1344 +luaAdd = scalar, F32, 1348 +; total TS size = 1352 +idlePosition0 = scalar, F32, 1352, "per", 1,0 +trim0 = scalar, F32, 1356, "", 1, 0 +luaAdjustment0 = scalar, F32, 1360, "per", 1,0 +m_wastegatePosition0 = scalar, F32, 1364, "per", 1,0 +etbFeedForward0 = scalar, F32, 1368 +etbIntegralError0 = scalar, F32, 1372, "", 1, 0 +etbCurrentTarget0 = scalar, F32, 1376, "%", 1, 0 +etbCurrentAdjustedTarget0 = scalar, F32, 1380, "%", 1, 0 +etbRevLimitActive0 = bits, U32, 1384, [0:0] +jamDetected0 = bits, U32, 1384, [1:1] +etbDutyRateOfChange0 = scalar, F32, 1388, "per", 1,0 +etbDutyAverage0 = scalar, F32, 1392, "per", 1,0 +etbTpsErrorCounter0 = scalar, U16, 1396, "count", 1,0 +etbPpsErrorCounter0 = scalar, U16, 1398, "count", 1,0 +etbErrorCode0 = scalar, S08, 1400, "", 1, 0 +jamTimer0 = scalar, U16, 1402, "sec", 0.01, 0 +; total TS size = 1404 +faultCode0 = scalar, U08, 1404, "", 1, 0 +heaterDuty0 = scalar, U08, 1405, "%", 1, 0 +pumpDuty0 = scalar, U08, 1406, "%", 1, 0 +tempC0 = scalar, U16, 1408, "C", 1, 0 +nernstVoltage0 = scalar, U16, 1410, "V", 0.001, 0 +esr0 = scalar, U16, 1412, "ohm", 1, 0 +; total TS size = 1416 +dcOutput0 = scalar, F32, 1416, "per", 1,0 +isEnabled0_int = scalar, U08, 1420, "per", 1,0 +isEnabled0 = bits, U32, 1424, [0:0] +; total TS size = 1428 +value0 = scalar, U16, 1428, "value", 1,0 +value1 = scalar, U16, 1430, "value", 1,0 +errorRate = scalar, F32, 1432, "ratio", 1,0 ; total TS size = 1436 -lambdaCurrentlyGood = bits, U32, 1436, [0:0] -lambdaMonitorCut = bits, U32, 1436, [1:1] -lambdaTimeSinceGood = scalar, U16, 1440, "sec", 0.01, 0 -; total TS size = 1444 +vvtTarget = scalar, U16, 1436, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1438, "%", 0.5, 0 +; total TS size = 1440 +lambdaCurrentlyGood = bits, U32, 1440, [0:0] +lambdaMonitorCut = bits, U32, 1440, [1:1] +lambdaTimeSinceGood = scalar, U16, 1444, "sec", 0.01, 0 +; total TS size = 1448 time = { timeNow } @@ -5237,6 +5238,7 @@ entry = brakePedalState, "Brake switch", int, "%d" entry = startStopState, "startStopState", int, "%d" entry = smartChipState, "smartChipState", int, "%d" entry = smartChipRestartCounter, "smartChipRestartCounter", int, "%d" +entry = smartChipAliveCounter, "smartChipAliveCounter", int, "%d" entry = startStopPhysicalState, "startStopPhysicalState", int, "%d" entry = acrStateDup, "acrStateDup", int, "%d" entry = acrEngineMovedRecently, "acrEngineMovedRecently", int, "%d" @@ -6202,16 +6204,17 @@ dialog = engine_stateDialog, "engine_state" graphLine = smartChipState graphLine = smartChipRestartCounter liveGraph = engine_state_5_Graph, "Graph", South + graphLine = smartChipAliveCounter graphLine = startStopStateToggleCounter graphLine = egtValue1 graphLine = egtValue2 - graphLine = desiredRpmLimit liveGraph = engine_state_6_Graph, "Graph", South + graphLine = desiredRpmLimit graphLine = fuelInjectionCounter graphLine = sparkCounter graphLine = fuelingLoad - graphLine = ignitionLoad liveGraph = engine_state_7_Graph, "Graph", South + graphLine = ignitionLoad graphLine = veTableYAxis indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_f407-discovery.ini b/firmware/tunerstudio/generated/rusefi_f407-discovery.ini index d298cdb9e3..d504a19a93 100644 --- a/firmware/tunerstudio/generated/rusefi_f407-discovery.ini +++ b/firmware/tunerstudio/generated/rusefi_f407-discovery.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.12.26.f407-discovery.2110701098" + signature = "rusEFI master.2023.12.26.f407-discovery.3052789960" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.12.26.f407-discovery.2110701098" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.12.26.f407-discovery.3052789960" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -92,7 +92,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="Disabled", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PB0", "PB1", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Tue Dec 26 01:38:21 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Tue Dec 26 22:48:53 UTC 2023 pageSize = 22088 page = 1 @@ -2373,7 +2373,7 @@ lambdaMaxDeviationRpmBins = array, U16, 22078, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1444 + ochBlockSize = 1448 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3027,145 +3027,146 @@ brakePedalState = scalar, S08, 1092, "", 1, 0 startStopState = scalar, S08, 1093, "", 1, 0 smartChipState = scalar, S08, 1094, "", 1, 0 smartChipRestartCounter = scalar, S08, 1095, "", 1, 0 -startStopPhysicalState = bits, U32, 1096, [0:0] -acrStateDup = bits, U32, 1096, [1:1] -acrEngineMovedRecently = bits, U32, 1096, [2:2] -heaterControlEnabled = bits, U32, 1096, [3:3] -luaDigitalState0 = bits, U32, 1096, [4:4] -luaDigitalState1 = bits, U32, 1096, [5:5] -luaDigitalState2 = bits, U32, 1096, [6:6] -luaDigitalState3 = bits, U32, 1096, [7:7] -startStopStateToggleCounter = scalar, U32, 1100, "", 1, 0 -egtValue1 = scalar, F32, 1104, "", 1, 0 -egtValue2 = scalar, F32, 1108, "", 1, 0 -desiredRpmLimit = scalar, S16, 1112, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1116, "", 1, 0 -sparkCounter = scalar, U32, 1120, "", 1, 0 -fuelingLoad = scalar, F32, 1124, "", 1, 0 -ignitionLoad = scalar, F32, 1128, "", 1, 0 -veTableYAxis = scalar, U16, 1132, "%", 0.01, 0 -; total TS size = 1136 -tpsFrom = scalar, F32, 1136 -tpsTo = scalar, F32, 1140 -deltaTps = scalar, F32, 1144 -extraFuel = scalar, F32, 1148, "", 1, 0 -valueFromTable = scalar, F32, 1152, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1156, [0:0] -isBelowDecelThreshold = bits, U32, 1156, [1:1] -isTimeToResetAccumulator = bits, U32, 1156, [2:2] -isFractionalEnrichment = bits, U32, 1156, [3:3] -belowEpsilon = bits, U32, 1156, [4:4] -tooShort = bits, U32, 1156, [5:5] -fractionalInjFuel = scalar, F32, 1160, "", 1, 0 -accumulatedValue = scalar, F32, 1164, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1168, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1172, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1176, "", 1, 0 -cycleCnt = scalar, S32, 1180, "", 1, 0 -; total TS size = 1184 -hwEventCounters1 = scalar, U32, 1184, "", 1, 0 -hwEventCounters2 = scalar, U32, 1188, "", 1, 0 -hwEventCounters3 = scalar, U32, 1192, "", 1, 0 -hwEventCounters4 = scalar, U32, 1196, "", 1, 0 -hwEventCounters5 = scalar, U32, 1200, "", 1, 0 -hwEventCounters6 = scalar, U32, 1204, "", 1, 0 -vvtCamCounter = scalar, U32, 1208, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1212, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1216, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1220, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1221, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1224, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1228, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1232, "", 1, 0 -mapCamPrevToothAngle = scalar, F32, 1236, "deg", 1, 0 -isDecodingMapCam = bits, U32, 1240, [0:0] -; total TS size = 1244 -crankSynchronizationCounter0 = scalar, U32, 1244, "", 1, 0 -vvtSyncGapRatio0 = scalar, F32, 1248, "", 1, 0 -vvtToothDurations00 = scalar, U32, 1252, "us", 1, 0 -vvtCurrentPosition0 = scalar, F32, 1256, "sync: Primary Cam Position", 1, 0 -vvtToothPosition10 = scalar, F32, 1260, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition20 = scalar, F32, 1264, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition30 = scalar, F32, 1268, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition40 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio0 = scalar, F32, 1276, "", 1, 0 -triggerStateIndex0 = scalar, U08, 1280, "", 1, 0 -vvtStateIndex0 = scalar, U08, 1281, "", 1, 0 -; total TS size = 1284 -camResyncCounter = scalar, U08, 1284, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1288, [0:0] -; total TS size = 1292 -wallFuelCorrection = scalar, F32, 1292, "", 1, 0 -wallFuel = scalar, F32, 1296, "", 1, 0 -; total TS size = 1300 -idleState = bits, S32, 1300, [0:2], "not important" -currentIdlePosition = scalar, F32, 1304 -baseIdlePosition = scalar, F32, 1308 -idleClosedLoop = scalar, F32, 1312 -iacByTpsTaper = scalar, F32, 1316 -throttlePedalUpState = scalar, S32, 1320, "", 1, 0 -mightResetPid = bits, U32, 1324, [0:0] -shouldResetPid = bits, U32, 1324, [1:1] -wasResetPid = bits, U32, 1324, [2:2] -mustResetPid = bits, U32, 1324, [3:3] -isCranking = bits, U32, 1324, [4:4] -isIacTableForCoasting = bits, U32, 1324, [5:5] -notIdling = bits, U32, 1324, [6:6] -needReset = bits, U32, 1324, [7:7] -isInDeadZone = bits, U32, 1324, [8:8] -isBlipping = bits, U32, 1324, [9:9] -useClosedLoop = bits, U32, 1324, [10:10] -badTps = bits, U32, 1324, [11:11] -looksLikeRunning = bits, U32, 1324, [12:12] -looksLikeCoasting = bits, U32, 1324, [13:13] -looksLikeCrankToIdle = bits, U32, 1324, [14:14] -isIdleCoasting = bits, U32, 1324, [15:15] -isIdleClosedLoop = bits, U32, 1324, [16:16] -idleTarget = scalar, S32, 1328, "", 1, 0 -targetRpmByClt = scalar, S32, 1332, "", 1, 0 -targetRpmAc = scalar, S32, 1336, "", 1, 0 -iacByRpmTaper = scalar, F32, 1340 -luaAdd = scalar, F32, 1344 -; total TS size = 1348 -idlePosition0 = scalar, F32, 1348, "per", 1,0 -trim0 = scalar, F32, 1352, "", 1, 0 -luaAdjustment0 = scalar, F32, 1356, "per", 1,0 -m_wastegatePosition0 = scalar, F32, 1360, "per", 1,0 -etbFeedForward0 = scalar, F32, 1364 -etbIntegralError0 = scalar, F32, 1368, "", 1, 0 -etbCurrentTarget0 = scalar, F32, 1372, "%", 1, 0 -etbCurrentAdjustedTarget0 = scalar, F32, 1376, "%", 1, 0 -etbRevLimitActive0 = bits, U32, 1380, [0:0] -jamDetected0 = bits, U32, 1380, [1:1] -etbDutyRateOfChange0 = scalar, F32, 1384, "per", 1,0 -etbDutyAverage0 = scalar, F32, 1388, "per", 1,0 -etbTpsErrorCounter0 = scalar, U16, 1392, "count", 1,0 -etbPpsErrorCounter0 = scalar, U16, 1394, "count", 1,0 -etbErrorCode0 = scalar, S08, 1396, "", 1, 0 -jamTimer0 = scalar, U16, 1398, "sec", 0.01, 0 -; total TS size = 1400 -faultCode0 = scalar, U08, 1400, "", 1, 0 -heaterDuty0 = scalar, U08, 1401, "%", 1, 0 -pumpDuty0 = scalar, U08, 1402, "%", 1, 0 -tempC0 = scalar, U16, 1404, "C", 1, 0 -nernstVoltage0 = scalar, U16, 1406, "V", 0.001, 0 -esr0 = scalar, U16, 1408, "ohm", 1, 0 -; total TS size = 1412 -dcOutput0 = scalar, F32, 1412, "per", 1,0 -isEnabled0_int = scalar, U08, 1416, "per", 1,0 -isEnabled0 = bits, U32, 1420, [0:0] -; total TS size = 1424 -value0 = scalar, U16, 1424, "value", 1,0 -value1 = scalar, U16, 1426, "value", 1,0 -errorRate = scalar, F32, 1428, "ratio", 1,0 -; total TS size = 1432 -vvtTarget = scalar, U16, 1432, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1434, "%", 0.5, 0 +smartChipAliveCounter = scalar, S08, 1096, "", 1, 0 +startStopPhysicalState = bits, U32, 1100, [0:0] +acrStateDup = bits, U32, 1100, [1:1] +acrEngineMovedRecently = bits, U32, 1100, [2:2] +heaterControlEnabled = bits, U32, 1100, [3:3] +luaDigitalState0 = bits, U32, 1100, [4:4] +luaDigitalState1 = bits, U32, 1100, [5:5] +luaDigitalState2 = bits, U32, 1100, [6:6] +luaDigitalState3 = bits, U32, 1100, [7:7] +startStopStateToggleCounter = scalar, U32, 1104, "", 1, 0 +egtValue1 = scalar, F32, 1108, "", 1, 0 +egtValue2 = scalar, F32, 1112, "", 1, 0 +desiredRpmLimit = scalar, S16, 1116, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 1120, "", 1, 0 +sparkCounter = scalar, U32, 1124, "", 1, 0 +fuelingLoad = scalar, F32, 1128, "", 1, 0 +ignitionLoad = scalar, F32, 1132, "", 1, 0 +veTableYAxis = scalar, U16, 1136, "%", 0.01, 0 +; total TS size = 1140 +tpsFrom = scalar, F32, 1140 +tpsTo = scalar, F32, 1144 +deltaTps = scalar, F32, 1148 +extraFuel = scalar, F32, 1152, "", 1, 0 +valueFromTable = scalar, F32, 1156, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1160, [0:0] +isBelowDecelThreshold = bits, U32, 1160, [1:1] +isTimeToResetAccumulator = bits, U32, 1160, [2:2] +isFractionalEnrichment = bits, U32, 1160, [3:3] +belowEpsilon = bits, U32, 1160, [4:4] +tooShort = bits, U32, 1160, [5:5] +fractionalInjFuel = scalar, F32, 1164, "", 1, 0 +accumulatedValue = scalar, F32, 1168, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1172, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1176, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1180, "", 1, 0 +cycleCnt = scalar, S32, 1184, "", 1, 0 +; total TS size = 1188 +hwEventCounters1 = scalar, U32, 1188, "", 1, 0 +hwEventCounters2 = scalar, U32, 1192, "", 1, 0 +hwEventCounters3 = scalar, U32, 1196, "", 1, 0 +hwEventCounters4 = scalar, U32, 1200, "", 1, 0 +hwEventCounters5 = scalar, U32, 1204, "", 1, 0 +hwEventCounters6 = scalar, U32, 1208, "", 1, 0 +vvtCamCounter = scalar, U32, 1212, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1216, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1220, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1224, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1225, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1228, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1232, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1236, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1240, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1244, [0:0] +; total TS size = 1248 +crankSynchronizationCounter0 = scalar, U32, 1248, "", 1, 0 +vvtSyncGapRatio0 = scalar, F32, 1252, "", 1, 0 +vvtToothDurations00 = scalar, U32, 1256, "us", 1, 0 +vvtCurrentPosition0 = scalar, F32, 1260, "sync: Primary Cam Position", 1, 0 +vvtToothPosition10 = scalar, F32, 1264, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition20 = scalar, F32, 1268, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition30 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition40 = scalar, F32, 1276, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio0 = scalar, F32, 1280, "", 1, 0 +triggerStateIndex0 = scalar, U08, 1284, "", 1, 0 +vvtStateIndex0 = scalar, U08, 1285, "", 1, 0 +; total TS size = 1288 +camResyncCounter = scalar, U08, 1288, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1292, [0:0] +; total TS size = 1296 +wallFuelCorrection = scalar, F32, 1296, "", 1, 0 +wallFuel = scalar, F32, 1300, "", 1, 0 +; total TS size = 1304 +idleState = bits, S32, 1304, [0:2], "not important" +currentIdlePosition = scalar, F32, 1308 +baseIdlePosition = scalar, F32, 1312 +idleClosedLoop = scalar, F32, 1316 +iacByTpsTaper = scalar, F32, 1320 +throttlePedalUpState = scalar, S32, 1324, "", 1, 0 +mightResetPid = bits, U32, 1328, [0:0] +shouldResetPid = bits, U32, 1328, [1:1] +wasResetPid = bits, U32, 1328, [2:2] +mustResetPid = bits, U32, 1328, [3:3] +isCranking = bits, U32, 1328, [4:4] +isIacTableForCoasting = bits, U32, 1328, [5:5] +notIdling = bits, U32, 1328, [6:6] +needReset = bits, U32, 1328, [7:7] +isInDeadZone = bits, U32, 1328, [8:8] +isBlipping = bits, U32, 1328, [9:9] +useClosedLoop = bits, U32, 1328, [10:10] +badTps = bits, U32, 1328, [11:11] +looksLikeRunning = bits, U32, 1328, [12:12] +looksLikeCoasting = bits, U32, 1328, [13:13] +looksLikeCrankToIdle = bits, U32, 1328, [14:14] +isIdleCoasting = bits, U32, 1328, [15:15] +isIdleClosedLoop = bits, U32, 1328, [16:16] +idleTarget = scalar, S32, 1332, "", 1, 0 +targetRpmByClt = scalar, S32, 1336, "", 1, 0 +targetRpmAc = scalar, S32, 1340, "", 1, 0 +iacByRpmTaper = scalar, F32, 1344 +luaAdd = scalar, F32, 1348 +; total TS size = 1352 +idlePosition0 = scalar, F32, 1352, "per", 1,0 +trim0 = scalar, F32, 1356, "", 1, 0 +luaAdjustment0 = scalar, F32, 1360, "per", 1,0 +m_wastegatePosition0 = scalar, F32, 1364, "per", 1,0 +etbFeedForward0 = scalar, F32, 1368 +etbIntegralError0 = scalar, F32, 1372, "", 1, 0 +etbCurrentTarget0 = scalar, F32, 1376, "%", 1, 0 +etbCurrentAdjustedTarget0 = scalar, F32, 1380, "%", 1, 0 +etbRevLimitActive0 = bits, U32, 1384, [0:0] +jamDetected0 = bits, U32, 1384, [1:1] +etbDutyRateOfChange0 = scalar, F32, 1388, "per", 1,0 +etbDutyAverage0 = scalar, F32, 1392, "per", 1,0 +etbTpsErrorCounter0 = scalar, U16, 1396, "count", 1,0 +etbPpsErrorCounter0 = scalar, U16, 1398, "count", 1,0 +etbErrorCode0 = scalar, S08, 1400, "", 1, 0 +jamTimer0 = scalar, U16, 1402, "sec", 0.01, 0 +; total TS size = 1404 +faultCode0 = scalar, U08, 1404, "", 1, 0 +heaterDuty0 = scalar, U08, 1405, "%", 1, 0 +pumpDuty0 = scalar, U08, 1406, "%", 1, 0 +tempC0 = scalar, U16, 1408, "C", 1, 0 +nernstVoltage0 = scalar, U16, 1410, "V", 0.001, 0 +esr0 = scalar, U16, 1412, "ohm", 1, 0 +; total TS size = 1416 +dcOutput0 = scalar, F32, 1416, "per", 1,0 +isEnabled0_int = scalar, U08, 1420, "per", 1,0 +isEnabled0 = bits, U32, 1424, [0:0] +; total TS size = 1428 +value0 = scalar, U16, 1428, "value", 1,0 +value1 = scalar, U16, 1430, "value", 1,0 +errorRate = scalar, F32, 1432, "ratio", 1,0 ; total TS size = 1436 -lambdaCurrentlyGood = bits, U32, 1436, [0:0] -lambdaMonitorCut = bits, U32, 1436, [1:1] -lambdaTimeSinceGood = scalar, U16, 1440, "sec", 0.01, 0 -; total TS size = 1444 +vvtTarget = scalar, U16, 1436, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1438, "%", 0.5, 0 +; total TS size = 1440 +lambdaCurrentlyGood = bits, U32, 1440, [0:0] +lambdaMonitorCut = bits, U32, 1440, [1:1] +lambdaTimeSinceGood = scalar, U16, 1444, "sec", 0.01, 0 +; total TS size = 1448 time = { timeNow } @@ -5238,6 +5239,7 @@ entry = brakePedalState, "Brake switch", int, "%d" entry = startStopState, "startStopState", int, "%d" entry = smartChipState, "smartChipState", int, "%d" entry = smartChipRestartCounter, "smartChipRestartCounter", int, "%d" +entry = smartChipAliveCounter, "smartChipAliveCounter", int, "%d" entry = startStopPhysicalState, "startStopPhysicalState", int, "%d" entry = acrStateDup, "acrStateDup", int, "%d" entry = acrEngineMovedRecently, "acrEngineMovedRecently", int, "%d" @@ -6205,16 +6207,17 @@ dialog = engine_stateDialog, "engine_state" graphLine = smartChipState graphLine = smartChipRestartCounter liveGraph = engine_state_5_Graph, "Graph", South + graphLine = smartChipAliveCounter graphLine = startStopStateToggleCounter graphLine = egtValue1 graphLine = egtValue2 - graphLine = desiredRpmLimit liveGraph = engine_state_6_Graph, "Graph", South + graphLine = desiredRpmLimit graphLine = fuelInjectionCounter graphLine = sparkCounter graphLine = fuelingLoad - graphLine = ignitionLoad liveGraph = engine_state_7_Graph, "Graph", South + graphLine = ignitionLoad graphLine = veTableYAxis indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_f429-discovery.ini b/firmware/tunerstudio/generated/rusefi_f429-discovery.ini index 3abfbb50ed..6447174781 100644 --- a/firmware/tunerstudio/generated/rusefi_f429-discovery.ini +++ b/firmware/tunerstudio/generated/rusefi_f429-discovery.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.12.26.f429-discovery.4218430649" + signature = "rusEFI master.2023.12.26.f429-discovery.860584539" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.12.26.f429-discovery.4218430649" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.12.26.f429-discovery.860584539" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -92,7 +92,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="Disabled", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PB0", "PB1", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Tue Dec 26 01:38:02 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Tue Dec 26 22:48:33 UTC 2023 pageSize = 22088 page = 1 @@ -2373,7 +2373,7 @@ lambdaMaxDeviationRpmBins = array, U16, 22078, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1444 + ochBlockSize = 1448 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3027,145 +3027,146 @@ brakePedalState = scalar, S08, 1092, "", 1, 0 startStopState = scalar, S08, 1093, "", 1, 0 smartChipState = scalar, S08, 1094, "", 1, 0 smartChipRestartCounter = scalar, S08, 1095, "", 1, 0 -startStopPhysicalState = bits, U32, 1096, [0:0] -acrStateDup = bits, U32, 1096, [1:1] -acrEngineMovedRecently = bits, U32, 1096, [2:2] -heaterControlEnabled = bits, U32, 1096, [3:3] -luaDigitalState0 = bits, U32, 1096, [4:4] -luaDigitalState1 = bits, U32, 1096, [5:5] -luaDigitalState2 = bits, U32, 1096, [6:6] -luaDigitalState3 = bits, U32, 1096, [7:7] -startStopStateToggleCounter = scalar, U32, 1100, "", 1, 0 -egtValue1 = scalar, F32, 1104, "", 1, 0 -egtValue2 = scalar, F32, 1108, "", 1, 0 -desiredRpmLimit = scalar, S16, 1112, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1116, "", 1, 0 -sparkCounter = scalar, U32, 1120, "", 1, 0 -fuelingLoad = scalar, F32, 1124, "", 1, 0 -ignitionLoad = scalar, F32, 1128, "", 1, 0 -veTableYAxis = scalar, U16, 1132, "%", 0.01, 0 -; total TS size = 1136 -tpsFrom = scalar, F32, 1136 -tpsTo = scalar, F32, 1140 -deltaTps = scalar, F32, 1144 -extraFuel = scalar, F32, 1148, "", 1, 0 -valueFromTable = scalar, F32, 1152, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1156, [0:0] -isBelowDecelThreshold = bits, U32, 1156, [1:1] -isTimeToResetAccumulator = bits, U32, 1156, [2:2] -isFractionalEnrichment = bits, U32, 1156, [3:3] -belowEpsilon = bits, U32, 1156, [4:4] -tooShort = bits, U32, 1156, [5:5] -fractionalInjFuel = scalar, F32, 1160, "", 1, 0 -accumulatedValue = scalar, F32, 1164, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1168, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1172, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1176, "", 1, 0 -cycleCnt = scalar, S32, 1180, "", 1, 0 -; total TS size = 1184 -hwEventCounters1 = scalar, U32, 1184, "", 1, 0 -hwEventCounters2 = scalar, U32, 1188, "", 1, 0 -hwEventCounters3 = scalar, U32, 1192, "", 1, 0 -hwEventCounters4 = scalar, U32, 1196, "", 1, 0 -hwEventCounters5 = scalar, U32, 1200, "", 1, 0 -hwEventCounters6 = scalar, U32, 1204, "", 1, 0 -vvtCamCounter = scalar, U32, 1208, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1212, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1216, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1220, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1221, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1224, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1228, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1232, "", 1, 0 -mapCamPrevToothAngle = scalar, F32, 1236, "deg", 1, 0 -isDecodingMapCam = bits, U32, 1240, [0:0] -; total TS size = 1244 -crankSynchronizationCounter0 = scalar, U32, 1244, "", 1, 0 -vvtSyncGapRatio0 = scalar, F32, 1248, "", 1, 0 -vvtToothDurations00 = scalar, U32, 1252, "us", 1, 0 -vvtCurrentPosition0 = scalar, F32, 1256, "sync: Primary Cam Position", 1, 0 -vvtToothPosition10 = scalar, F32, 1260, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition20 = scalar, F32, 1264, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition30 = scalar, F32, 1268, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition40 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio0 = scalar, F32, 1276, "", 1, 0 -triggerStateIndex0 = scalar, U08, 1280, "", 1, 0 -vvtStateIndex0 = scalar, U08, 1281, "", 1, 0 -; total TS size = 1284 -camResyncCounter = scalar, U08, 1284, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1288, [0:0] -; total TS size = 1292 -wallFuelCorrection = scalar, F32, 1292, "", 1, 0 -wallFuel = scalar, F32, 1296, "", 1, 0 -; total TS size = 1300 -idleState = bits, S32, 1300, [0:2], "not important" -currentIdlePosition = scalar, F32, 1304 -baseIdlePosition = scalar, F32, 1308 -idleClosedLoop = scalar, F32, 1312 -iacByTpsTaper = scalar, F32, 1316 -throttlePedalUpState = scalar, S32, 1320, "", 1, 0 -mightResetPid = bits, U32, 1324, [0:0] -shouldResetPid = bits, U32, 1324, [1:1] -wasResetPid = bits, U32, 1324, [2:2] -mustResetPid = bits, U32, 1324, [3:3] -isCranking = bits, U32, 1324, [4:4] -isIacTableForCoasting = bits, U32, 1324, [5:5] -notIdling = bits, U32, 1324, [6:6] -needReset = bits, U32, 1324, [7:7] -isInDeadZone = bits, U32, 1324, [8:8] -isBlipping = bits, U32, 1324, [9:9] -useClosedLoop = bits, U32, 1324, [10:10] -badTps = bits, U32, 1324, [11:11] -looksLikeRunning = bits, U32, 1324, [12:12] -looksLikeCoasting = bits, U32, 1324, [13:13] -looksLikeCrankToIdle = bits, U32, 1324, [14:14] -isIdleCoasting = bits, U32, 1324, [15:15] -isIdleClosedLoop = bits, U32, 1324, [16:16] -idleTarget = scalar, S32, 1328, "", 1, 0 -targetRpmByClt = scalar, S32, 1332, "", 1, 0 -targetRpmAc = scalar, S32, 1336, "", 1, 0 -iacByRpmTaper = scalar, F32, 1340 -luaAdd = scalar, F32, 1344 -; total TS size = 1348 -idlePosition0 = scalar, F32, 1348, "per", 1,0 -trim0 = scalar, F32, 1352, "", 1, 0 -luaAdjustment0 = scalar, F32, 1356, "per", 1,0 -m_wastegatePosition0 = scalar, F32, 1360, "per", 1,0 -etbFeedForward0 = scalar, F32, 1364 -etbIntegralError0 = scalar, F32, 1368, "", 1, 0 -etbCurrentTarget0 = scalar, F32, 1372, "%", 1, 0 -etbCurrentAdjustedTarget0 = scalar, F32, 1376, "%", 1, 0 -etbRevLimitActive0 = bits, U32, 1380, [0:0] -jamDetected0 = bits, U32, 1380, [1:1] -etbDutyRateOfChange0 = scalar, F32, 1384, "per", 1,0 -etbDutyAverage0 = scalar, F32, 1388, "per", 1,0 -etbTpsErrorCounter0 = scalar, U16, 1392, "count", 1,0 -etbPpsErrorCounter0 = scalar, U16, 1394, "count", 1,0 -etbErrorCode0 = scalar, S08, 1396, "", 1, 0 -jamTimer0 = scalar, U16, 1398, "sec", 0.01, 0 -; total TS size = 1400 -faultCode0 = scalar, U08, 1400, "", 1, 0 -heaterDuty0 = scalar, U08, 1401, "%", 1, 0 -pumpDuty0 = scalar, U08, 1402, "%", 1, 0 -tempC0 = scalar, U16, 1404, "C", 1, 0 -nernstVoltage0 = scalar, U16, 1406, "V", 0.001, 0 -esr0 = scalar, U16, 1408, "ohm", 1, 0 -; total TS size = 1412 -dcOutput0 = scalar, F32, 1412, "per", 1,0 -isEnabled0_int = scalar, U08, 1416, "per", 1,0 -isEnabled0 = bits, U32, 1420, [0:0] -; total TS size = 1424 -value0 = scalar, U16, 1424, "value", 1,0 -value1 = scalar, U16, 1426, "value", 1,0 -errorRate = scalar, F32, 1428, "ratio", 1,0 -; total TS size = 1432 -vvtTarget = scalar, U16, 1432, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1434, "%", 0.5, 0 +smartChipAliveCounter = scalar, S08, 1096, "", 1, 0 +startStopPhysicalState = bits, U32, 1100, [0:0] +acrStateDup = bits, U32, 1100, [1:1] +acrEngineMovedRecently = bits, U32, 1100, [2:2] +heaterControlEnabled = bits, U32, 1100, [3:3] +luaDigitalState0 = bits, U32, 1100, [4:4] +luaDigitalState1 = bits, U32, 1100, [5:5] +luaDigitalState2 = bits, U32, 1100, [6:6] +luaDigitalState3 = bits, U32, 1100, [7:7] +startStopStateToggleCounter = scalar, U32, 1104, "", 1, 0 +egtValue1 = scalar, F32, 1108, "", 1, 0 +egtValue2 = scalar, F32, 1112, "", 1, 0 +desiredRpmLimit = scalar, S16, 1116, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 1120, "", 1, 0 +sparkCounter = scalar, U32, 1124, "", 1, 0 +fuelingLoad = scalar, F32, 1128, "", 1, 0 +ignitionLoad = scalar, F32, 1132, "", 1, 0 +veTableYAxis = scalar, U16, 1136, "%", 0.01, 0 +; total TS size = 1140 +tpsFrom = scalar, F32, 1140 +tpsTo = scalar, F32, 1144 +deltaTps = scalar, F32, 1148 +extraFuel = scalar, F32, 1152, "", 1, 0 +valueFromTable = scalar, F32, 1156, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1160, [0:0] +isBelowDecelThreshold = bits, U32, 1160, [1:1] +isTimeToResetAccumulator = bits, U32, 1160, [2:2] +isFractionalEnrichment = bits, U32, 1160, [3:3] +belowEpsilon = bits, U32, 1160, [4:4] +tooShort = bits, U32, 1160, [5:5] +fractionalInjFuel = scalar, F32, 1164, "", 1, 0 +accumulatedValue = scalar, F32, 1168, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1172, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1176, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1180, "", 1, 0 +cycleCnt = scalar, S32, 1184, "", 1, 0 +; total TS size = 1188 +hwEventCounters1 = scalar, U32, 1188, "", 1, 0 +hwEventCounters2 = scalar, U32, 1192, "", 1, 0 +hwEventCounters3 = scalar, U32, 1196, "", 1, 0 +hwEventCounters4 = scalar, U32, 1200, "", 1, 0 +hwEventCounters5 = scalar, U32, 1204, "", 1, 0 +hwEventCounters6 = scalar, U32, 1208, "", 1, 0 +vvtCamCounter = scalar, U32, 1212, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1216, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1220, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1224, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1225, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1228, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1232, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1236, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1240, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1244, [0:0] +; total TS size = 1248 +crankSynchronizationCounter0 = scalar, U32, 1248, "", 1, 0 +vvtSyncGapRatio0 = scalar, F32, 1252, "", 1, 0 +vvtToothDurations00 = scalar, U32, 1256, "us", 1, 0 +vvtCurrentPosition0 = scalar, F32, 1260, "sync: Primary Cam Position", 1, 0 +vvtToothPosition10 = scalar, F32, 1264, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition20 = scalar, F32, 1268, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition30 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition40 = scalar, F32, 1276, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio0 = scalar, F32, 1280, "", 1, 0 +triggerStateIndex0 = scalar, U08, 1284, "", 1, 0 +vvtStateIndex0 = scalar, U08, 1285, "", 1, 0 +; total TS size = 1288 +camResyncCounter = scalar, U08, 1288, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1292, [0:0] +; total TS size = 1296 +wallFuelCorrection = scalar, F32, 1296, "", 1, 0 +wallFuel = scalar, F32, 1300, "", 1, 0 +; total TS size = 1304 +idleState = bits, S32, 1304, [0:2], "not important" +currentIdlePosition = scalar, F32, 1308 +baseIdlePosition = scalar, F32, 1312 +idleClosedLoop = scalar, F32, 1316 +iacByTpsTaper = scalar, F32, 1320 +throttlePedalUpState = scalar, S32, 1324, "", 1, 0 +mightResetPid = bits, U32, 1328, [0:0] +shouldResetPid = bits, U32, 1328, [1:1] +wasResetPid = bits, U32, 1328, [2:2] +mustResetPid = bits, U32, 1328, [3:3] +isCranking = bits, U32, 1328, [4:4] +isIacTableForCoasting = bits, U32, 1328, [5:5] +notIdling = bits, U32, 1328, [6:6] +needReset = bits, U32, 1328, [7:7] +isInDeadZone = bits, U32, 1328, [8:8] +isBlipping = bits, U32, 1328, [9:9] +useClosedLoop = bits, U32, 1328, [10:10] +badTps = bits, U32, 1328, [11:11] +looksLikeRunning = bits, U32, 1328, [12:12] +looksLikeCoasting = bits, U32, 1328, [13:13] +looksLikeCrankToIdle = bits, U32, 1328, [14:14] +isIdleCoasting = bits, U32, 1328, [15:15] +isIdleClosedLoop = bits, U32, 1328, [16:16] +idleTarget = scalar, S32, 1332, "", 1, 0 +targetRpmByClt = scalar, S32, 1336, "", 1, 0 +targetRpmAc = scalar, S32, 1340, "", 1, 0 +iacByRpmTaper = scalar, F32, 1344 +luaAdd = scalar, F32, 1348 +; total TS size = 1352 +idlePosition0 = scalar, F32, 1352, "per", 1,0 +trim0 = scalar, F32, 1356, "", 1, 0 +luaAdjustment0 = scalar, F32, 1360, "per", 1,0 +m_wastegatePosition0 = scalar, F32, 1364, "per", 1,0 +etbFeedForward0 = scalar, F32, 1368 +etbIntegralError0 = scalar, F32, 1372, "", 1, 0 +etbCurrentTarget0 = scalar, F32, 1376, "%", 1, 0 +etbCurrentAdjustedTarget0 = scalar, F32, 1380, "%", 1, 0 +etbRevLimitActive0 = bits, U32, 1384, [0:0] +jamDetected0 = bits, U32, 1384, [1:1] +etbDutyRateOfChange0 = scalar, F32, 1388, "per", 1,0 +etbDutyAverage0 = scalar, F32, 1392, "per", 1,0 +etbTpsErrorCounter0 = scalar, U16, 1396, "count", 1,0 +etbPpsErrorCounter0 = scalar, U16, 1398, "count", 1,0 +etbErrorCode0 = scalar, S08, 1400, "", 1, 0 +jamTimer0 = scalar, U16, 1402, "sec", 0.01, 0 +; total TS size = 1404 +faultCode0 = scalar, U08, 1404, "", 1, 0 +heaterDuty0 = scalar, U08, 1405, "%", 1, 0 +pumpDuty0 = scalar, U08, 1406, "%", 1, 0 +tempC0 = scalar, U16, 1408, "C", 1, 0 +nernstVoltage0 = scalar, U16, 1410, "V", 0.001, 0 +esr0 = scalar, U16, 1412, "ohm", 1, 0 +; total TS size = 1416 +dcOutput0 = scalar, F32, 1416, "per", 1,0 +isEnabled0_int = scalar, U08, 1420, "per", 1,0 +isEnabled0 = bits, U32, 1424, [0:0] +; total TS size = 1428 +value0 = scalar, U16, 1428, "value", 1,0 +value1 = scalar, U16, 1430, "value", 1,0 +errorRate = scalar, F32, 1432, "ratio", 1,0 ; total TS size = 1436 -lambdaCurrentlyGood = bits, U32, 1436, [0:0] -lambdaMonitorCut = bits, U32, 1436, [1:1] -lambdaTimeSinceGood = scalar, U16, 1440, "sec", 0.01, 0 -; total TS size = 1444 +vvtTarget = scalar, U16, 1436, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1438, "%", 0.5, 0 +; total TS size = 1440 +lambdaCurrentlyGood = bits, U32, 1440, [0:0] +lambdaMonitorCut = bits, U32, 1440, [1:1] +lambdaTimeSinceGood = scalar, U16, 1444, "sec", 0.01, 0 +; total TS size = 1448 time = { timeNow } @@ -5237,6 +5238,7 @@ entry = brakePedalState, "Brake switch", int, "%d" entry = startStopState, "startStopState", int, "%d" entry = smartChipState, "smartChipState", int, "%d" entry = smartChipRestartCounter, "smartChipRestartCounter", int, "%d" +entry = smartChipAliveCounter, "smartChipAliveCounter", int, "%d" entry = startStopPhysicalState, "startStopPhysicalState", int, "%d" entry = acrStateDup, "acrStateDup", int, "%d" entry = acrEngineMovedRecently, "acrEngineMovedRecently", int, "%d" @@ -6202,16 +6204,17 @@ dialog = engine_stateDialog, "engine_state" graphLine = smartChipState graphLine = smartChipRestartCounter liveGraph = engine_state_5_Graph, "Graph", South + graphLine = smartChipAliveCounter graphLine = startStopStateToggleCounter graphLine = egtValue1 graphLine = egtValue2 - graphLine = desiredRpmLimit liveGraph = engine_state_6_Graph, "Graph", South + graphLine = desiredRpmLimit graphLine = fuelInjectionCounter graphLine = sparkCounter graphLine = fuelingLoad - graphLine = ignitionLoad liveGraph = engine_state_7_Graph, "Graph", South + graphLine = ignitionLoad graphLine = veTableYAxis indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_f469-discovery.ini b/firmware/tunerstudio/generated/rusefi_f469-discovery.ini index d22e949baf..f00755d82d 100644 --- a/firmware/tunerstudio/generated/rusefi_f469-discovery.ini +++ b/firmware/tunerstudio/generated/rusefi_f469-discovery.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.12.26.f469-discovery.3383173674" + signature = "rusEFI master.2023.12.26.f469-discovery.27032776" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.12.26.f469-discovery.3383173674" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.12.26.f469-discovery.27032776" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -92,7 +92,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="Disabled", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PB0", "PB1", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Tue Dec 26 01:38:04 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Tue Dec 26 22:48:35 UTC 2023 pageSize = 22088 page = 1 @@ -2373,7 +2373,7 @@ lambdaMaxDeviationRpmBins = array, U16, 22078, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1444 + ochBlockSize = 1448 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3027,145 +3027,146 @@ brakePedalState = scalar, S08, 1092, "", 1, 0 startStopState = scalar, S08, 1093, "", 1, 0 smartChipState = scalar, S08, 1094, "", 1, 0 smartChipRestartCounter = scalar, S08, 1095, "", 1, 0 -startStopPhysicalState = bits, U32, 1096, [0:0] -acrStateDup = bits, U32, 1096, [1:1] -acrEngineMovedRecently = bits, U32, 1096, [2:2] -heaterControlEnabled = bits, U32, 1096, [3:3] -luaDigitalState0 = bits, U32, 1096, [4:4] -luaDigitalState1 = bits, U32, 1096, [5:5] -luaDigitalState2 = bits, U32, 1096, [6:6] -luaDigitalState3 = bits, U32, 1096, [7:7] -startStopStateToggleCounter = scalar, U32, 1100, "", 1, 0 -egtValue1 = scalar, F32, 1104, "", 1, 0 -egtValue2 = scalar, F32, 1108, "", 1, 0 -desiredRpmLimit = scalar, S16, 1112, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1116, "", 1, 0 -sparkCounter = scalar, U32, 1120, "", 1, 0 -fuelingLoad = scalar, F32, 1124, "", 1, 0 -ignitionLoad = scalar, F32, 1128, "", 1, 0 -veTableYAxis = scalar, U16, 1132, "%", 0.01, 0 -; total TS size = 1136 -tpsFrom = scalar, F32, 1136 -tpsTo = scalar, F32, 1140 -deltaTps = scalar, F32, 1144 -extraFuel = scalar, F32, 1148, "", 1, 0 -valueFromTable = scalar, F32, 1152, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1156, [0:0] -isBelowDecelThreshold = bits, U32, 1156, [1:1] -isTimeToResetAccumulator = bits, U32, 1156, [2:2] -isFractionalEnrichment = bits, U32, 1156, [3:3] -belowEpsilon = bits, U32, 1156, [4:4] -tooShort = bits, U32, 1156, [5:5] -fractionalInjFuel = scalar, F32, 1160, "", 1, 0 -accumulatedValue = scalar, F32, 1164, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1168, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1172, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1176, "", 1, 0 -cycleCnt = scalar, S32, 1180, "", 1, 0 -; total TS size = 1184 -hwEventCounters1 = scalar, U32, 1184, "", 1, 0 -hwEventCounters2 = scalar, U32, 1188, "", 1, 0 -hwEventCounters3 = scalar, U32, 1192, "", 1, 0 -hwEventCounters4 = scalar, U32, 1196, "", 1, 0 -hwEventCounters5 = scalar, U32, 1200, "", 1, 0 -hwEventCounters6 = scalar, U32, 1204, "", 1, 0 -vvtCamCounter = scalar, U32, 1208, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1212, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1216, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1220, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1221, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1224, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1228, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1232, "", 1, 0 -mapCamPrevToothAngle = scalar, F32, 1236, "deg", 1, 0 -isDecodingMapCam = bits, U32, 1240, [0:0] -; total TS size = 1244 -crankSynchronizationCounter0 = scalar, U32, 1244, "", 1, 0 -vvtSyncGapRatio0 = scalar, F32, 1248, "", 1, 0 -vvtToothDurations00 = scalar, U32, 1252, "us", 1, 0 -vvtCurrentPosition0 = scalar, F32, 1256, "sync: Primary Cam Position", 1, 0 -vvtToothPosition10 = scalar, F32, 1260, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition20 = scalar, F32, 1264, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition30 = scalar, F32, 1268, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition40 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio0 = scalar, F32, 1276, "", 1, 0 -triggerStateIndex0 = scalar, U08, 1280, "", 1, 0 -vvtStateIndex0 = scalar, U08, 1281, "", 1, 0 -; total TS size = 1284 -camResyncCounter = scalar, U08, 1284, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1288, [0:0] -; total TS size = 1292 -wallFuelCorrection = scalar, F32, 1292, "", 1, 0 -wallFuel = scalar, F32, 1296, "", 1, 0 -; total TS size = 1300 -idleState = bits, S32, 1300, [0:2], "not important" -currentIdlePosition = scalar, F32, 1304 -baseIdlePosition = scalar, F32, 1308 -idleClosedLoop = scalar, F32, 1312 -iacByTpsTaper = scalar, F32, 1316 -throttlePedalUpState = scalar, S32, 1320, "", 1, 0 -mightResetPid = bits, U32, 1324, [0:0] -shouldResetPid = bits, U32, 1324, [1:1] -wasResetPid = bits, U32, 1324, [2:2] -mustResetPid = bits, U32, 1324, [3:3] -isCranking = bits, U32, 1324, [4:4] -isIacTableForCoasting = bits, U32, 1324, [5:5] -notIdling = bits, U32, 1324, [6:6] -needReset = bits, U32, 1324, [7:7] -isInDeadZone = bits, U32, 1324, [8:8] -isBlipping = bits, U32, 1324, [9:9] -useClosedLoop = bits, U32, 1324, [10:10] -badTps = bits, U32, 1324, [11:11] -looksLikeRunning = bits, U32, 1324, [12:12] -looksLikeCoasting = bits, U32, 1324, [13:13] -looksLikeCrankToIdle = bits, U32, 1324, [14:14] -isIdleCoasting = bits, U32, 1324, [15:15] -isIdleClosedLoop = bits, U32, 1324, [16:16] -idleTarget = scalar, S32, 1328, "", 1, 0 -targetRpmByClt = scalar, S32, 1332, "", 1, 0 -targetRpmAc = scalar, S32, 1336, "", 1, 0 -iacByRpmTaper = scalar, F32, 1340 -luaAdd = scalar, F32, 1344 -; total TS size = 1348 -idlePosition0 = scalar, F32, 1348, "per", 1,0 -trim0 = scalar, F32, 1352, "", 1, 0 -luaAdjustment0 = scalar, F32, 1356, "per", 1,0 -m_wastegatePosition0 = scalar, F32, 1360, "per", 1,0 -etbFeedForward0 = scalar, F32, 1364 -etbIntegralError0 = scalar, F32, 1368, "", 1, 0 -etbCurrentTarget0 = scalar, F32, 1372, "%", 1, 0 -etbCurrentAdjustedTarget0 = scalar, F32, 1376, "%", 1, 0 -etbRevLimitActive0 = bits, U32, 1380, [0:0] -jamDetected0 = bits, U32, 1380, [1:1] -etbDutyRateOfChange0 = scalar, F32, 1384, "per", 1,0 -etbDutyAverage0 = scalar, F32, 1388, "per", 1,0 -etbTpsErrorCounter0 = scalar, U16, 1392, "count", 1,0 -etbPpsErrorCounter0 = scalar, U16, 1394, "count", 1,0 -etbErrorCode0 = scalar, S08, 1396, "", 1, 0 -jamTimer0 = scalar, U16, 1398, "sec", 0.01, 0 -; total TS size = 1400 -faultCode0 = scalar, U08, 1400, "", 1, 0 -heaterDuty0 = scalar, U08, 1401, "%", 1, 0 -pumpDuty0 = scalar, U08, 1402, "%", 1, 0 -tempC0 = scalar, U16, 1404, "C", 1, 0 -nernstVoltage0 = scalar, U16, 1406, "V", 0.001, 0 -esr0 = scalar, U16, 1408, "ohm", 1, 0 -; total TS size = 1412 -dcOutput0 = scalar, F32, 1412, "per", 1,0 -isEnabled0_int = scalar, U08, 1416, "per", 1,0 -isEnabled0 = bits, U32, 1420, [0:0] -; total TS size = 1424 -value0 = scalar, U16, 1424, "value", 1,0 -value1 = scalar, U16, 1426, "value", 1,0 -errorRate = scalar, F32, 1428, "ratio", 1,0 -; total TS size = 1432 -vvtTarget = scalar, U16, 1432, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1434, "%", 0.5, 0 +smartChipAliveCounter = scalar, S08, 1096, "", 1, 0 +startStopPhysicalState = bits, U32, 1100, [0:0] +acrStateDup = bits, U32, 1100, [1:1] +acrEngineMovedRecently = bits, U32, 1100, [2:2] +heaterControlEnabled = bits, U32, 1100, [3:3] +luaDigitalState0 = bits, U32, 1100, [4:4] +luaDigitalState1 = bits, U32, 1100, [5:5] +luaDigitalState2 = bits, U32, 1100, [6:6] +luaDigitalState3 = bits, U32, 1100, [7:7] +startStopStateToggleCounter = scalar, U32, 1104, "", 1, 0 +egtValue1 = scalar, F32, 1108, "", 1, 0 +egtValue2 = scalar, F32, 1112, "", 1, 0 +desiredRpmLimit = scalar, S16, 1116, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 1120, "", 1, 0 +sparkCounter = scalar, U32, 1124, "", 1, 0 +fuelingLoad = scalar, F32, 1128, "", 1, 0 +ignitionLoad = scalar, F32, 1132, "", 1, 0 +veTableYAxis = scalar, U16, 1136, "%", 0.01, 0 +; total TS size = 1140 +tpsFrom = scalar, F32, 1140 +tpsTo = scalar, F32, 1144 +deltaTps = scalar, F32, 1148 +extraFuel = scalar, F32, 1152, "", 1, 0 +valueFromTable = scalar, F32, 1156, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1160, [0:0] +isBelowDecelThreshold = bits, U32, 1160, [1:1] +isTimeToResetAccumulator = bits, U32, 1160, [2:2] +isFractionalEnrichment = bits, U32, 1160, [3:3] +belowEpsilon = bits, U32, 1160, [4:4] +tooShort = bits, U32, 1160, [5:5] +fractionalInjFuel = scalar, F32, 1164, "", 1, 0 +accumulatedValue = scalar, F32, 1168, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1172, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1176, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1180, "", 1, 0 +cycleCnt = scalar, S32, 1184, "", 1, 0 +; total TS size = 1188 +hwEventCounters1 = scalar, U32, 1188, "", 1, 0 +hwEventCounters2 = scalar, U32, 1192, "", 1, 0 +hwEventCounters3 = scalar, U32, 1196, "", 1, 0 +hwEventCounters4 = scalar, U32, 1200, "", 1, 0 +hwEventCounters5 = scalar, U32, 1204, "", 1, 0 +hwEventCounters6 = scalar, U32, 1208, "", 1, 0 +vvtCamCounter = scalar, U32, 1212, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1216, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1220, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1224, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1225, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1228, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1232, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1236, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1240, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1244, [0:0] +; total TS size = 1248 +crankSynchronizationCounter0 = scalar, U32, 1248, "", 1, 0 +vvtSyncGapRatio0 = scalar, F32, 1252, "", 1, 0 +vvtToothDurations00 = scalar, U32, 1256, "us", 1, 0 +vvtCurrentPosition0 = scalar, F32, 1260, "sync: Primary Cam Position", 1, 0 +vvtToothPosition10 = scalar, F32, 1264, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition20 = scalar, F32, 1268, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition30 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition40 = scalar, F32, 1276, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio0 = scalar, F32, 1280, "", 1, 0 +triggerStateIndex0 = scalar, U08, 1284, "", 1, 0 +vvtStateIndex0 = scalar, U08, 1285, "", 1, 0 +; total TS size = 1288 +camResyncCounter = scalar, U08, 1288, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1292, [0:0] +; total TS size = 1296 +wallFuelCorrection = scalar, F32, 1296, "", 1, 0 +wallFuel = scalar, F32, 1300, "", 1, 0 +; total TS size = 1304 +idleState = bits, S32, 1304, [0:2], "not important" +currentIdlePosition = scalar, F32, 1308 +baseIdlePosition = scalar, F32, 1312 +idleClosedLoop = scalar, F32, 1316 +iacByTpsTaper = scalar, F32, 1320 +throttlePedalUpState = scalar, S32, 1324, "", 1, 0 +mightResetPid = bits, U32, 1328, [0:0] +shouldResetPid = bits, U32, 1328, [1:1] +wasResetPid = bits, U32, 1328, [2:2] +mustResetPid = bits, U32, 1328, [3:3] +isCranking = bits, U32, 1328, [4:4] +isIacTableForCoasting = bits, U32, 1328, [5:5] +notIdling = bits, U32, 1328, [6:6] +needReset = bits, U32, 1328, [7:7] +isInDeadZone = bits, U32, 1328, [8:8] +isBlipping = bits, U32, 1328, [9:9] +useClosedLoop = bits, U32, 1328, [10:10] +badTps = bits, U32, 1328, [11:11] +looksLikeRunning = bits, U32, 1328, [12:12] +looksLikeCoasting = bits, U32, 1328, [13:13] +looksLikeCrankToIdle = bits, U32, 1328, [14:14] +isIdleCoasting = bits, U32, 1328, [15:15] +isIdleClosedLoop = bits, U32, 1328, [16:16] +idleTarget = scalar, S32, 1332, "", 1, 0 +targetRpmByClt = scalar, S32, 1336, "", 1, 0 +targetRpmAc = scalar, S32, 1340, "", 1, 0 +iacByRpmTaper = scalar, F32, 1344 +luaAdd = scalar, F32, 1348 +; total TS size = 1352 +idlePosition0 = scalar, F32, 1352, "per", 1,0 +trim0 = scalar, F32, 1356, "", 1, 0 +luaAdjustment0 = scalar, F32, 1360, "per", 1,0 +m_wastegatePosition0 = scalar, F32, 1364, "per", 1,0 +etbFeedForward0 = scalar, F32, 1368 +etbIntegralError0 = scalar, F32, 1372, "", 1, 0 +etbCurrentTarget0 = scalar, F32, 1376, "%", 1, 0 +etbCurrentAdjustedTarget0 = scalar, F32, 1380, "%", 1, 0 +etbRevLimitActive0 = bits, U32, 1384, [0:0] +jamDetected0 = bits, U32, 1384, [1:1] +etbDutyRateOfChange0 = scalar, F32, 1388, "per", 1,0 +etbDutyAverage0 = scalar, F32, 1392, "per", 1,0 +etbTpsErrorCounter0 = scalar, U16, 1396, "count", 1,0 +etbPpsErrorCounter0 = scalar, U16, 1398, "count", 1,0 +etbErrorCode0 = scalar, S08, 1400, "", 1, 0 +jamTimer0 = scalar, U16, 1402, "sec", 0.01, 0 +; total TS size = 1404 +faultCode0 = scalar, U08, 1404, "", 1, 0 +heaterDuty0 = scalar, U08, 1405, "%", 1, 0 +pumpDuty0 = scalar, U08, 1406, "%", 1, 0 +tempC0 = scalar, U16, 1408, "C", 1, 0 +nernstVoltage0 = scalar, U16, 1410, "V", 0.001, 0 +esr0 = scalar, U16, 1412, "ohm", 1, 0 +; total TS size = 1416 +dcOutput0 = scalar, F32, 1416, "per", 1,0 +isEnabled0_int = scalar, U08, 1420, "per", 1,0 +isEnabled0 = bits, U32, 1424, [0:0] +; total TS size = 1428 +value0 = scalar, U16, 1428, "value", 1,0 +value1 = scalar, U16, 1430, "value", 1,0 +errorRate = scalar, F32, 1432, "ratio", 1,0 ; total TS size = 1436 -lambdaCurrentlyGood = bits, U32, 1436, [0:0] -lambdaMonitorCut = bits, U32, 1436, [1:1] -lambdaTimeSinceGood = scalar, U16, 1440, "sec", 0.01, 0 -; total TS size = 1444 +vvtTarget = scalar, U16, 1436, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1438, "%", 0.5, 0 +; total TS size = 1440 +lambdaCurrentlyGood = bits, U32, 1440, [0:0] +lambdaMonitorCut = bits, U32, 1440, [1:1] +lambdaTimeSinceGood = scalar, U16, 1444, "sec", 0.01, 0 +; total TS size = 1448 time = { timeNow } @@ -5237,6 +5238,7 @@ entry = brakePedalState, "Brake switch", int, "%d" entry = startStopState, "startStopState", int, "%d" entry = smartChipState, "smartChipState", int, "%d" entry = smartChipRestartCounter, "smartChipRestartCounter", int, "%d" +entry = smartChipAliveCounter, "smartChipAliveCounter", int, "%d" entry = startStopPhysicalState, "startStopPhysicalState", int, "%d" entry = acrStateDup, "acrStateDup", int, "%d" entry = acrEngineMovedRecently, "acrEngineMovedRecently", int, "%d" @@ -6202,16 +6204,17 @@ dialog = engine_stateDialog, "engine_state" graphLine = smartChipState graphLine = smartChipRestartCounter liveGraph = engine_state_5_Graph, "Graph", South + graphLine = smartChipAliveCounter graphLine = startStopStateToggleCounter graphLine = egtValue1 graphLine = egtValue2 - graphLine = desiredRpmLimit liveGraph = engine_state_6_Graph, "Graph", South + graphLine = desiredRpmLimit graphLine = fuelInjectionCounter graphLine = sparkCounter graphLine = fuelingLoad - graphLine = ignitionLoad liveGraph = engine_state_7_Graph, "Graph", South + graphLine = ignitionLoad graphLine = veTableYAxis indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini b/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini index 3198df483b..b83b6c240b 100644 --- a/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini +++ b/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.12.26.frankenso_na6.3642934387" + signature = "rusEFI master.2023.12.26.frankenso_na6.286890641" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.12.26.frankenso_na6.3642934387" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.12.26.frankenso_na6.286890641" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -92,7 +92,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","Analog 3O","Analog 3L","Analog 3M","Analog 3J","Analog 3I","INVALID","Analog 3H","Analog 3G","INVALID","INVALID","INVALID","Analog 3P","Analog 3Q","Analog 3N","Analog VBatt","Analog 3E" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Tue Dec 26 01:37:47 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Tue Dec 26 22:48:18 UTC 2023 pageSize = 22088 page = 1 @@ -2373,7 +2373,7 @@ lambdaMaxDeviationRpmBins = array, U16, 22078, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1444 + ochBlockSize = 1448 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3027,145 +3027,146 @@ brakePedalState = scalar, S08, 1092, "", 1, 0 startStopState = scalar, S08, 1093, "", 1, 0 smartChipState = scalar, S08, 1094, "", 1, 0 smartChipRestartCounter = scalar, S08, 1095, "", 1, 0 -startStopPhysicalState = bits, U32, 1096, [0:0] -acrStateDup = bits, U32, 1096, [1:1] -acrEngineMovedRecently = bits, U32, 1096, [2:2] -heaterControlEnabled = bits, U32, 1096, [3:3] -luaDigitalState0 = bits, U32, 1096, [4:4] -luaDigitalState1 = bits, U32, 1096, [5:5] -luaDigitalState2 = bits, U32, 1096, [6:6] -luaDigitalState3 = bits, U32, 1096, [7:7] -startStopStateToggleCounter = scalar, U32, 1100, "", 1, 0 -egtValue1 = scalar, F32, 1104, "", 1, 0 -egtValue2 = scalar, F32, 1108, "", 1, 0 -desiredRpmLimit = scalar, S16, 1112, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1116, "", 1, 0 -sparkCounter = scalar, U32, 1120, "", 1, 0 -fuelingLoad = scalar, F32, 1124, "", 1, 0 -ignitionLoad = scalar, F32, 1128, "", 1, 0 -veTableYAxis = scalar, U16, 1132, "%", 0.01, 0 -; total TS size = 1136 -tpsFrom = scalar, F32, 1136 -tpsTo = scalar, F32, 1140 -deltaTps = scalar, F32, 1144 -extraFuel = scalar, F32, 1148, "", 1, 0 -valueFromTable = scalar, F32, 1152, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1156, [0:0] -isBelowDecelThreshold = bits, U32, 1156, [1:1] -isTimeToResetAccumulator = bits, U32, 1156, [2:2] -isFractionalEnrichment = bits, U32, 1156, [3:3] -belowEpsilon = bits, U32, 1156, [4:4] -tooShort = bits, U32, 1156, [5:5] -fractionalInjFuel = scalar, F32, 1160, "", 1, 0 -accumulatedValue = scalar, F32, 1164, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1168, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1172, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1176, "", 1, 0 -cycleCnt = scalar, S32, 1180, "", 1, 0 -; total TS size = 1184 -hwEventCounters1 = scalar, U32, 1184, "", 1, 0 -hwEventCounters2 = scalar, U32, 1188, "", 1, 0 -hwEventCounters3 = scalar, U32, 1192, "", 1, 0 -hwEventCounters4 = scalar, U32, 1196, "", 1, 0 -hwEventCounters5 = scalar, U32, 1200, "", 1, 0 -hwEventCounters6 = scalar, U32, 1204, "", 1, 0 -vvtCamCounter = scalar, U32, 1208, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1212, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1216, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1220, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1221, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1224, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1228, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1232, "", 1, 0 -mapCamPrevToothAngle = scalar, F32, 1236, "deg", 1, 0 -isDecodingMapCam = bits, U32, 1240, [0:0] -; total TS size = 1244 -crankSynchronizationCounter0 = scalar, U32, 1244, "", 1, 0 -vvtSyncGapRatio0 = scalar, F32, 1248, "", 1, 0 -vvtToothDurations00 = scalar, U32, 1252, "us", 1, 0 -vvtCurrentPosition0 = scalar, F32, 1256, "sync: Primary Cam Position", 1, 0 -vvtToothPosition10 = scalar, F32, 1260, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition20 = scalar, F32, 1264, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition30 = scalar, F32, 1268, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition40 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio0 = scalar, F32, 1276, "", 1, 0 -triggerStateIndex0 = scalar, U08, 1280, "", 1, 0 -vvtStateIndex0 = scalar, U08, 1281, "", 1, 0 -; total TS size = 1284 -camResyncCounter = scalar, U08, 1284, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1288, [0:0] -; total TS size = 1292 -wallFuelCorrection = scalar, F32, 1292, "", 1, 0 -wallFuel = scalar, F32, 1296, "", 1, 0 -; total TS size = 1300 -idleState = bits, S32, 1300, [0:2], "not important" -currentIdlePosition = scalar, F32, 1304 -baseIdlePosition = scalar, F32, 1308 -idleClosedLoop = scalar, F32, 1312 -iacByTpsTaper = scalar, F32, 1316 -throttlePedalUpState = scalar, S32, 1320, "", 1, 0 -mightResetPid = bits, U32, 1324, [0:0] -shouldResetPid = bits, U32, 1324, [1:1] -wasResetPid = bits, U32, 1324, [2:2] -mustResetPid = bits, U32, 1324, [3:3] -isCranking = bits, U32, 1324, [4:4] -isIacTableForCoasting = bits, U32, 1324, [5:5] -notIdling = bits, U32, 1324, [6:6] -needReset = bits, U32, 1324, [7:7] -isInDeadZone = bits, U32, 1324, [8:8] -isBlipping = bits, U32, 1324, [9:9] -useClosedLoop = bits, U32, 1324, [10:10] -badTps = bits, U32, 1324, [11:11] -looksLikeRunning = bits, U32, 1324, [12:12] -looksLikeCoasting = bits, U32, 1324, [13:13] -looksLikeCrankToIdle = bits, U32, 1324, [14:14] -isIdleCoasting = bits, U32, 1324, [15:15] -isIdleClosedLoop = bits, U32, 1324, [16:16] -idleTarget = scalar, S32, 1328, "", 1, 0 -targetRpmByClt = scalar, S32, 1332, "", 1, 0 -targetRpmAc = scalar, S32, 1336, "", 1, 0 -iacByRpmTaper = scalar, F32, 1340 -luaAdd = scalar, F32, 1344 -; total TS size = 1348 -idlePosition0 = scalar, F32, 1348, "per", 1,0 -trim0 = scalar, F32, 1352, "", 1, 0 -luaAdjustment0 = scalar, F32, 1356, "per", 1,0 -m_wastegatePosition0 = scalar, F32, 1360, "per", 1,0 -etbFeedForward0 = scalar, F32, 1364 -etbIntegralError0 = scalar, F32, 1368, "", 1, 0 -etbCurrentTarget0 = scalar, F32, 1372, "%", 1, 0 -etbCurrentAdjustedTarget0 = scalar, F32, 1376, "%", 1, 0 -etbRevLimitActive0 = bits, U32, 1380, [0:0] -jamDetected0 = bits, U32, 1380, [1:1] -etbDutyRateOfChange0 = scalar, F32, 1384, "per", 1,0 -etbDutyAverage0 = scalar, F32, 1388, "per", 1,0 -etbTpsErrorCounter0 = scalar, U16, 1392, "count", 1,0 -etbPpsErrorCounter0 = scalar, U16, 1394, "count", 1,0 -etbErrorCode0 = scalar, S08, 1396, "", 1, 0 -jamTimer0 = scalar, U16, 1398, "sec", 0.01, 0 -; total TS size = 1400 -faultCode0 = scalar, U08, 1400, "", 1, 0 -heaterDuty0 = scalar, U08, 1401, "%", 1, 0 -pumpDuty0 = scalar, U08, 1402, "%", 1, 0 -tempC0 = scalar, U16, 1404, "C", 1, 0 -nernstVoltage0 = scalar, U16, 1406, "V", 0.001, 0 -esr0 = scalar, U16, 1408, "ohm", 1, 0 -; total TS size = 1412 -dcOutput0 = scalar, F32, 1412, "per", 1,0 -isEnabled0_int = scalar, U08, 1416, "per", 1,0 -isEnabled0 = bits, U32, 1420, [0:0] -; total TS size = 1424 -value0 = scalar, U16, 1424, "value", 1,0 -value1 = scalar, U16, 1426, "value", 1,0 -errorRate = scalar, F32, 1428, "ratio", 1,0 -; total TS size = 1432 -vvtTarget = scalar, U16, 1432, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1434, "%", 0.5, 0 +smartChipAliveCounter = scalar, S08, 1096, "", 1, 0 +startStopPhysicalState = bits, U32, 1100, [0:0] +acrStateDup = bits, U32, 1100, [1:1] +acrEngineMovedRecently = bits, U32, 1100, [2:2] +heaterControlEnabled = bits, U32, 1100, [3:3] +luaDigitalState0 = bits, U32, 1100, [4:4] +luaDigitalState1 = bits, U32, 1100, [5:5] +luaDigitalState2 = bits, U32, 1100, [6:6] +luaDigitalState3 = bits, U32, 1100, [7:7] +startStopStateToggleCounter = scalar, U32, 1104, "", 1, 0 +egtValue1 = scalar, F32, 1108, "", 1, 0 +egtValue2 = scalar, F32, 1112, "", 1, 0 +desiredRpmLimit = scalar, S16, 1116, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 1120, "", 1, 0 +sparkCounter = scalar, U32, 1124, "", 1, 0 +fuelingLoad = scalar, F32, 1128, "", 1, 0 +ignitionLoad = scalar, F32, 1132, "", 1, 0 +veTableYAxis = scalar, U16, 1136, "%", 0.01, 0 +; total TS size = 1140 +tpsFrom = scalar, F32, 1140 +tpsTo = scalar, F32, 1144 +deltaTps = scalar, F32, 1148 +extraFuel = scalar, F32, 1152, "", 1, 0 +valueFromTable = scalar, F32, 1156, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1160, [0:0] +isBelowDecelThreshold = bits, U32, 1160, [1:1] +isTimeToResetAccumulator = bits, U32, 1160, [2:2] +isFractionalEnrichment = bits, U32, 1160, [3:3] +belowEpsilon = bits, U32, 1160, [4:4] +tooShort = bits, U32, 1160, [5:5] +fractionalInjFuel = scalar, F32, 1164, "", 1, 0 +accumulatedValue = scalar, F32, 1168, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1172, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1176, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1180, "", 1, 0 +cycleCnt = scalar, S32, 1184, "", 1, 0 +; total TS size = 1188 +hwEventCounters1 = scalar, U32, 1188, "", 1, 0 +hwEventCounters2 = scalar, U32, 1192, "", 1, 0 +hwEventCounters3 = scalar, U32, 1196, "", 1, 0 +hwEventCounters4 = scalar, U32, 1200, "", 1, 0 +hwEventCounters5 = scalar, U32, 1204, "", 1, 0 +hwEventCounters6 = scalar, U32, 1208, "", 1, 0 +vvtCamCounter = scalar, U32, 1212, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1216, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1220, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1224, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1225, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1228, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1232, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1236, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1240, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1244, [0:0] +; total TS size = 1248 +crankSynchronizationCounter0 = scalar, U32, 1248, "", 1, 0 +vvtSyncGapRatio0 = scalar, F32, 1252, "", 1, 0 +vvtToothDurations00 = scalar, U32, 1256, "us", 1, 0 +vvtCurrentPosition0 = scalar, F32, 1260, "sync: Primary Cam Position", 1, 0 +vvtToothPosition10 = scalar, F32, 1264, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition20 = scalar, F32, 1268, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition30 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition40 = scalar, F32, 1276, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio0 = scalar, F32, 1280, "", 1, 0 +triggerStateIndex0 = scalar, U08, 1284, "", 1, 0 +vvtStateIndex0 = scalar, U08, 1285, "", 1, 0 +; total TS size = 1288 +camResyncCounter = scalar, U08, 1288, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1292, [0:0] +; total TS size = 1296 +wallFuelCorrection = scalar, F32, 1296, "", 1, 0 +wallFuel = scalar, F32, 1300, "", 1, 0 +; total TS size = 1304 +idleState = bits, S32, 1304, [0:2], "not important" +currentIdlePosition = scalar, F32, 1308 +baseIdlePosition = scalar, F32, 1312 +idleClosedLoop = scalar, F32, 1316 +iacByTpsTaper = scalar, F32, 1320 +throttlePedalUpState = scalar, S32, 1324, "", 1, 0 +mightResetPid = bits, U32, 1328, [0:0] +shouldResetPid = bits, U32, 1328, [1:1] +wasResetPid = bits, U32, 1328, [2:2] +mustResetPid = bits, U32, 1328, [3:3] +isCranking = bits, U32, 1328, [4:4] +isIacTableForCoasting = bits, U32, 1328, [5:5] +notIdling = bits, U32, 1328, [6:6] +needReset = bits, U32, 1328, [7:7] +isInDeadZone = bits, U32, 1328, [8:8] +isBlipping = bits, U32, 1328, [9:9] +useClosedLoop = bits, U32, 1328, [10:10] +badTps = bits, U32, 1328, [11:11] +looksLikeRunning = bits, U32, 1328, [12:12] +looksLikeCoasting = bits, U32, 1328, [13:13] +looksLikeCrankToIdle = bits, U32, 1328, [14:14] +isIdleCoasting = bits, U32, 1328, [15:15] +isIdleClosedLoop = bits, U32, 1328, [16:16] +idleTarget = scalar, S32, 1332, "", 1, 0 +targetRpmByClt = scalar, S32, 1336, "", 1, 0 +targetRpmAc = scalar, S32, 1340, "", 1, 0 +iacByRpmTaper = scalar, F32, 1344 +luaAdd = scalar, F32, 1348 +; total TS size = 1352 +idlePosition0 = scalar, F32, 1352, "per", 1,0 +trim0 = scalar, F32, 1356, "", 1, 0 +luaAdjustment0 = scalar, F32, 1360, "per", 1,0 +m_wastegatePosition0 = scalar, F32, 1364, "per", 1,0 +etbFeedForward0 = scalar, F32, 1368 +etbIntegralError0 = scalar, F32, 1372, "", 1, 0 +etbCurrentTarget0 = scalar, F32, 1376, "%", 1, 0 +etbCurrentAdjustedTarget0 = scalar, F32, 1380, "%", 1, 0 +etbRevLimitActive0 = bits, U32, 1384, [0:0] +jamDetected0 = bits, U32, 1384, [1:1] +etbDutyRateOfChange0 = scalar, F32, 1388, "per", 1,0 +etbDutyAverage0 = scalar, F32, 1392, "per", 1,0 +etbTpsErrorCounter0 = scalar, U16, 1396, "count", 1,0 +etbPpsErrorCounter0 = scalar, U16, 1398, "count", 1,0 +etbErrorCode0 = scalar, S08, 1400, "", 1, 0 +jamTimer0 = scalar, U16, 1402, "sec", 0.01, 0 +; total TS size = 1404 +faultCode0 = scalar, U08, 1404, "", 1, 0 +heaterDuty0 = scalar, U08, 1405, "%", 1, 0 +pumpDuty0 = scalar, U08, 1406, "%", 1, 0 +tempC0 = scalar, U16, 1408, "C", 1, 0 +nernstVoltage0 = scalar, U16, 1410, "V", 0.001, 0 +esr0 = scalar, U16, 1412, "ohm", 1, 0 +; total TS size = 1416 +dcOutput0 = scalar, F32, 1416, "per", 1,0 +isEnabled0_int = scalar, U08, 1420, "per", 1,0 +isEnabled0 = bits, U32, 1424, [0:0] +; total TS size = 1428 +value0 = scalar, U16, 1428, "value", 1,0 +value1 = scalar, U16, 1430, "value", 1,0 +errorRate = scalar, F32, 1432, "ratio", 1,0 ; total TS size = 1436 -lambdaCurrentlyGood = bits, U32, 1436, [0:0] -lambdaMonitorCut = bits, U32, 1436, [1:1] -lambdaTimeSinceGood = scalar, U16, 1440, "sec", 0.01, 0 -; total TS size = 1444 +vvtTarget = scalar, U16, 1436, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1438, "%", 0.5, 0 +; total TS size = 1440 +lambdaCurrentlyGood = bits, U32, 1440, [0:0] +lambdaMonitorCut = bits, U32, 1440, [1:1] +lambdaTimeSinceGood = scalar, U16, 1444, "sec", 0.01, 0 +; total TS size = 1448 time = { timeNow } @@ -5237,6 +5238,7 @@ entry = brakePedalState, "Brake switch", int, "%d" entry = startStopState, "startStopState", int, "%d" entry = smartChipState, "smartChipState", int, "%d" entry = smartChipRestartCounter, "smartChipRestartCounter", int, "%d" +entry = smartChipAliveCounter, "smartChipAliveCounter", int, "%d" entry = startStopPhysicalState, "startStopPhysicalState", int, "%d" entry = acrStateDup, "acrStateDup", int, "%d" entry = acrEngineMovedRecently, "acrEngineMovedRecently", int, "%d" @@ -6202,16 +6204,17 @@ dialog = engine_stateDialog, "engine_state" graphLine = smartChipState graphLine = smartChipRestartCounter liveGraph = engine_state_5_Graph, "Graph", South + graphLine = smartChipAliveCounter graphLine = startStopStateToggleCounter graphLine = egtValue1 graphLine = egtValue2 - graphLine = desiredRpmLimit liveGraph = engine_state_6_Graph, "Graph", South + graphLine = desiredRpmLimit graphLine = fuelInjectionCounter graphLine = sparkCounter graphLine = fuelingLoad - graphLine = ignitionLoad liveGraph = engine_state_7_Graph, "Graph", South + graphLine = ignitionLoad graphLine = veTableYAxis indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_hellen-112-17.ini b/firmware/tunerstudio/generated/rusefi_hellen-112-17.ini index 7760fc2293..55a8db28ca 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen-112-17.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen-112-17.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.12.26.hellen-112-17.565227687" + signature = "rusEFI master.2023.12.26.hellen-112-17.3918261829" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.12.26.hellen-112-17.565227687" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.12.26.hellen-112-17.3918261829" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -92,7 +92,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","B20 TPS Throttle Position 2","A14 Analog Input","INVALID","A21 PPS1","B03 TPS Throttle Position 1","INVALID","A07 TODO","A19 Analog Input","A10 Analog Input","INVALID","B19 MAP","A09 Analog Input","B15 CLT","B27 IAT","A11 Analog Input","A12 Analog Input" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Tue Dec 26 01:37:13 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Tue Dec 26 22:47:45 UTC 2023 pageSize = 22088 page = 1 @@ -2373,7 +2373,7 @@ lambdaMaxDeviationRpmBins = array, U16, 22078, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1444 + ochBlockSize = 1448 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3027,145 +3027,146 @@ brakePedalState = scalar, S08, 1092, "", 1, 0 startStopState = scalar, S08, 1093, "", 1, 0 smartChipState = scalar, S08, 1094, "", 1, 0 smartChipRestartCounter = scalar, S08, 1095, "", 1, 0 -startStopPhysicalState = bits, U32, 1096, [0:0] -acrStateDup = bits, U32, 1096, [1:1] -acrEngineMovedRecently = bits, U32, 1096, [2:2] -heaterControlEnabled = bits, U32, 1096, [3:3] -luaDigitalState0 = bits, U32, 1096, [4:4] -luaDigitalState1 = bits, U32, 1096, [5:5] -luaDigitalState2 = bits, U32, 1096, [6:6] -luaDigitalState3 = bits, U32, 1096, [7:7] -startStopStateToggleCounter = scalar, U32, 1100, "", 1, 0 -egtValue1 = scalar, F32, 1104, "", 1, 0 -egtValue2 = scalar, F32, 1108, "", 1, 0 -desiredRpmLimit = scalar, S16, 1112, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1116, "", 1, 0 -sparkCounter = scalar, U32, 1120, "", 1, 0 -fuelingLoad = scalar, F32, 1124, "", 1, 0 -ignitionLoad = scalar, F32, 1128, "", 1, 0 -veTableYAxis = scalar, U16, 1132, "%", 0.01, 0 -; total TS size = 1136 -tpsFrom = scalar, F32, 1136 -tpsTo = scalar, F32, 1140 -deltaTps = scalar, F32, 1144 -extraFuel = scalar, F32, 1148, "", 1, 0 -valueFromTable = scalar, F32, 1152, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1156, [0:0] -isBelowDecelThreshold = bits, U32, 1156, [1:1] -isTimeToResetAccumulator = bits, U32, 1156, [2:2] -isFractionalEnrichment = bits, U32, 1156, [3:3] -belowEpsilon = bits, U32, 1156, [4:4] -tooShort = bits, U32, 1156, [5:5] -fractionalInjFuel = scalar, F32, 1160, "", 1, 0 -accumulatedValue = scalar, F32, 1164, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1168, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1172, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1176, "", 1, 0 -cycleCnt = scalar, S32, 1180, "", 1, 0 -; total TS size = 1184 -hwEventCounters1 = scalar, U32, 1184, "", 1, 0 -hwEventCounters2 = scalar, U32, 1188, "", 1, 0 -hwEventCounters3 = scalar, U32, 1192, "", 1, 0 -hwEventCounters4 = scalar, U32, 1196, "", 1, 0 -hwEventCounters5 = scalar, U32, 1200, "", 1, 0 -hwEventCounters6 = scalar, U32, 1204, "", 1, 0 -vvtCamCounter = scalar, U32, 1208, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1212, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1216, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1220, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1221, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1224, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1228, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1232, "", 1, 0 -mapCamPrevToothAngle = scalar, F32, 1236, "deg", 1, 0 -isDecodingMapCam = bits, U32, 1240, [0:0] -; total TS size = 1244 -crankSynchronizationCounter0 = scalar, U32, 1244, "", 1, 0 -vvtSyncGapRatio0 = scalar, F32, 1248, "", 1, 0 -vvtToothDurations00 = scalar, U32, 1252, "us", 1, 0 -vvtCurrentPosition0 = scalar, F32, 1256, "sync: Primary Cam Position", 1, 0 -vvtToothPosition10 = scalar, F32, 1260, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition20 = scalar, F32, 1264, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition30 = scalar, F32, 1268, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition40 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio0 = scalar, F32, 1276, "", 1, 0 -triggerStateIndex0 = scalar, U08, 1280, "", 1, 0 -vvtStateIndex0 = scalar, U08, 1281, "", 1, 0 -; total TS size = 1284 -camResyncCounter = scalar, U08, 1284, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1288, [0:0] -; total TS size = 1292 -wallFuelCorrection = scalar, F32, 1292, "", 1, 0 -wallFuel = scalar, F32, 1296, "", 1, 0 -; total TS size = 1300 -idleState = bits, S32, 1300, [0:2], "not important" -currentIdlePosition = scalar, F32, 1304 -baseIdlePosition = scalar, F32, 1308 -idleClosedLoop = scalar, F32, 1312 -iacByTpsTaper = scalar, F32, 1316 -throttlePedalUpState = scalar, S32, 1320, "", 1, 0 -mightResetPid = bits, U32, 1324, [0:0] -shouldResetPid = bits, U32, 1324, [1:1] -wasResetPid = bits, U32, 1324, [2:2] -mustResetPid = bits, U32, 1324, [3:3] -isCranking = bits, U32, 1324, [4:4] -isIacTableForCoasting = bits, U32, 1324, [5:5] -notIdling = bits, U32, 1324, [6:6] -needReset = bits, U32, 1324, [7:7] -isInDeadZone = bits, U32, 1324, [8:8] -isBlipping = bits, U32, 1324, [9:9] -useClosedLoop = bits, U32, 1324, [10:10] -badTps = bits, U32, 1324, [11:11] -looksLikeRunning = bits, U32, 1324, [12:12] -looksLikeCoasting = bits, U32, 1324, [13:13] -looksLikeCrankToIdle = bits, U32, 1324, [14:14] -isIdleCoasting = bits, U32, 1324, [15:15] -isIdleClosedLoop = bits, U32, 1324, [16:16] -idleTarget = scalar, S32, 1328, "", 1, 0 -targetRpmByClt = scalar, S32, 1332, "", 1, 0 -targetRpmAc = scalar, S32, 1336, "", 1, 0 -iacByRpmTaper = scalar, F32, 1340 -luaAdd = scalar, F32, 1344 -; total TS size = 1348 -idlePosition0 = scalar, F32, 1348, "per", 1,0 -trim0 = scalar, F32, 1352, "", 1, 0 -luaAdjustment0 = scalar, F32, 1356, "per", 1,0 -m_wastegatePosition0 = scalar, F32, 1360, "per", 1,0 -etbFeedForward0 = scalar, F32, 1364 -etbIntegralError0 = scalar, F32, 1368, "", 1, 0 -etbCurrentTarget0 = scalar, F32, 1372, "%", 1, 0 -etbCurrentAdjustedTarget0 = scalar, F32, 1376, "%", 1, 0 -etbRevLimitActive0 = bits, U32, 1380, [0:0] -jamDetected0 = bits, U32, 1380, [1:1] -etbDutyRateOfChange0 = scalar, F32, 1384, "per", 1,0 -etbDutyAverage0 = scalar, F32, 1388, "per", 1,0 -etbTpsErrorCounter0 = scalar, U16, 1392, "count", 1,0 -etbPpsErrorCounter0 = scalar, U16, 1394, "count", 1,0 -etbErrorCode0 = scalar, S08, 1396, "", 1, 0 -jamTimer0 = scalar, U16, 1398, "sec", 0.01, 0 -; total TS size = 1400 -faultCode0 = scalar, U08, 1400, "", 1, 0 -heaterDuty0 = scalar, U08, 1401, "%", 1, 0 -pumpDuty0 = scalar, U08, 1402, "%", 1, 0 -tempC0 = scalar, U16, 1404, "C", 1, 0 -nernstVoltage0 = scalar, U16, 1406, "V", 0.001, 0 -esr0 = scalar, U16, 1408, "ohm", 1, 0 -; total TS size = 1412 -dcOutput0 = scalar, F32, 1412, "per", 1,0 -isEnabled0_int = scalar, U08, 1416, "per", 1,0 -isEnabled0 = bits, U32, 1420, [0:0] -; total TS size = 1424 -value0 = scalar, U16, 1424, "value", 1,0 -value1 = scalar, U16, 1426, "value", 1,0 -errorRate = scalar, F32, 1428, "ratio", 1,0 -; total TS size = 1432 -vvtTarget = scalar, U16, 1432, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1434, "%", 0.5, 0 +smartChipAliveCounter = scalar, S08, 1096, "", 1, 0 +startStopPhysicalState = bits, U32, 1100, [0:0] +acrStateDup = bits, U32, 1100, [1:1] +acrEngineMovedRecently = bits, U32, 1100, [2:2] +heaterControlEnabled = bits, U32, 1100, [3:3] +luaDigitalState0 = bits, U32, 1100, [4:4] +luaDigitalState1 = bits, U32, 1100, [5:5] +luaDigitalState2 = bits, U32, 1100, [6:6] +luaDigitalState3 = bits, U32, 1100, [7:7] +startStopStateToggleCounter = scalar, U32, 1104, "", 1, 0 +egtValue1 = scalar, F32, 1108, "", 1, 0 +egtValue2 = scalar, F32, 1112, "", 1, 0 +desiredRpmLimit = scalar, S16, 1116, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 1120, "", 1, 0 +sparkCounter = scalar, U32, 1124, "", 1, 0 +fuelingLoad = scalar, F32, 1128, "", 1, 0 +ignitionLoad = scalar, F32, 1132, "", 1, 0 +veTableYAxis = scalar, U16, 1136, "%", 0.01, 0 +; total TS size = 1140 +tpsFrom = scalar, F32, 1140 +tpsTo = scalar, F32, 1144 +deltaTps = scalar, F32, 1148 +extraFuel = scalar, F32, 1152, "", 1, 0 +valueFromTable = scalar, F32, 1156, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1160, [0:0] +isBelowDecelThreshold = bits, U32, 1160, [1:1] +isTimeToResetAccumulator = bits, U32, 1160, [2:2] +isFractionalEnrichment = bits, U32, 1160, [3:3] +belowEpsilon = bits, U32, 1160, [4:4] +tooShort = bits, U32, 1160, [5:5] +fractionalInjFuel = scalar, F32, 1164, "", 1, 0 +accumulatedValue = scalar, F32, 1168, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1172, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1176, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1180, "", 1, 0 +cycleCnt = scalar, S32, 1184, "", 1, 0 +; total TS size = 1188 +hwEventCounters1 = scalar, U32, 1188, "", 1, 0 +hwEventCounters2 = scalar, U32, 1192, "", 1, 0 +hwEventCounters3 = scalar, U32, 1196, "", 1, 0 +hwEventCounters4 = scalar, U32, 1200, "", 1, 0 +hwEventCounters5 = scalar, U32, 1204, "", 1, 0 +hwEventCounters6 = scalar, U32, 1208, "", 1, 0 +vvtCamCounter = scalar, U32, 1212, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1216, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1220, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1224, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1225, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1228, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1232, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1236, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1240, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1244, [0:0] +; total TS size = 1248 +crankSynchronizationCounter0 = scalar, U32, 1248, "", 1, 0 +vvtSyncGapRatio0 = scalar, F32, 1252, "", 1, 0 +vvtToothDurations00 = scalar, U32, 1256, "us", 1, 0 +vvtCurrentPosition0 = scalar, F32, 1260, "sync: Primary Cam Position", 1, 0 +vvtToothPosition10 = scalar, F32, 1264, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition20 = scalar, F32, 1268, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition30 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition40 = scalar, F32, 1276, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio0 = scalar, F32, 1280, "", 1, 0 +triggerStateIndex0 = scalar, U08, 1284, "", 1, 0 +vvtStateIndex0 = scalar, U08, 1285, "", 1, 0 +; total TS size = 1288 +camResyncCounter = scalar, U08, 1288, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1292, [0:0] +; total TS size = 1296 +wallFuelCorrection = scalar, F32, 1296, "", 1, 0 +wallFuel = scalar, F32, 1300, "", 1, 0 +; total TS size = 1304 +idleState = bits, S32, 1304, [0:2], "not important" +currentIdlePosition = scalar, F32, 1308 +baseIdlePosition = scalar, F32, 1312 +idleClosedLoop = scalar, F32, 1316 +iacByTpsTaper = scalar, F32, 1320 +throttlePedalUpState = scalar, S32, 1324, "", 1, 0 +mightResetPid = bits, U32, 1328, [0:0] +shouldResetPid = bits, U32, 1328, [1:1] +wasResetPid = bits, U32, 1328, [2:2] +mustResetPid = bits, U32, 1328, [3:3] +isCranking = bits, U32, 1328, [4:4] +isIacTableForCoasting = bits, U32, 1328, [5:5] +notIdling = bits, U32, 1328, [6:6] +needReset = bits, U32, 1328, [7:7] +isInDeadZone = bits, U32, 1328, [8:8] +isBlipping = bits, U32, 1328, [9:9] +useClosedLoop = bits, U32, 1328, [10:10] +badTps = bits, U32, 1328, [11:11] +looksLikeRunning = bits, U32, 1328, [12:12] +looksLikeCoasting = bits, U32, 1328, [13:13] +looksLikeCrankToIdle = bits, U32, 1328, [14:14] +isIdleCoasting = bits, U32, 1328, [15:15] +isIdleClosedLoop = bits, U32, 1328, [16:16] +idleTarget = scalar, S32, 1332, "", 1, 0 +targetRpmByClt = scalar, S32, 1336, "", 1, 0 +targetRpmAc = scalar, S32, 1340, "", 1, 0 +iacByRpmTaper = scalar, F32, 1344 +luaAdd = scalar, F32, 1348 +; total TS size = 1352 +idlePosition0 = scalar, F32, 1352, "per", 1,0 +trim0 = scalar, F32, 1356, "", 1, 0 +luaAdjustment0 = scalar, F32, 1360, "per", 1,0 +m_wastegatePosition0 = scalar, F32, 1364, "per", 1,0 +etbFeedForward0 = scalar, F32, 1368 +etbIntegralError0 = scalar, F32, 1372, "", 1, 0 +etbCurrentTarget0 = scalar, F32, 1376, "%", 1, 0 +etbCurrentAdjustedTarget0 = scalar, F32, 1380, "%", 1, 0 +etbRevLimitActive0 = bits, U32, 1384, [0:0] +jamDetected0 = bits, U32, 1384, [1:1] +etbDutyRateOfChange0 = scalar, F32, 1388, "per", 1,0 +etbDutyAverage0 = scalar, F32, 1392, "per", 1,0 +etbTpsErrorCounter0 = scalar, U16, 1396, "count", 1,0 +etbPpsErrorCounter0 = scalar, U16, 1398, "count", 1,0 +etbErrorCode0 = scalar, S08, 1400, "", 1, 0 +jamTimer0 = scalar, U16, 1402, "sec", 0.01, 0 +; total TS size = 1404 +faultCode0 = scalar, U08, 1404, "", 1, 0 +heaterDuty0 = scalar, U08, 1405, "%", 1, 0 +pumpDuty0 = scalar, U08, 1406, "%", 1, 0 +tempC0 = scalar, U16, 1408, "C", 1, 0 +nernstVoltage0 = scalar, U16, 1410, "V", 0.001, 0 +esr0 = scalar, U16, 1412, "ohm", 1, 0 +; total TS size = 1416 +dcOutput0 = scalar, F32, 1416, "per", 1,0 +isEnabled0_int = scalar, U08, 1420, "per", 1,0 +isEnabled0 = bits, U32, 1424, [0:0] +; total TS size = 1428 +value0 = scalar, U16, 1428, "value", 1,0 +value1 = scalar, U16, 1430, "value", 1,0 +errorRate = scalar, F32, 1432, "ratio", 1,0 ; total TS size = 1436 -lambdaCurrentlyGood = bits, U32, 1436, [0:0] -lambdaMonitorCut = bits, U32, 1436, [1:1] -lambdaTimeSinceGood = scalar, U16, 1440, "sec", 0.01, 0 -; total TS size = 1444 +vvtTarget = scalar, U16, 1436, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1438, "%", 0.5, 0 +; total TS size = 1440 +lambdaCurrentlyGood = bits, U32, 1440, [0:0] +lambdaMonitorCut = bits, U32, 1440, [1:1] +lambdaTimeSinceGood = scalar, U16, 1444, "sec", 0.01, 0 +; total TS size = 1448 time = { timeNow } @@ -5237,6 +5238,7 @@ entry = brakePedalState, "Brake switch", int, "%d" entry = startStopState, "startStopState", int, "%d" entry = smartChipState, "smartChipState", int, "%d" entry = smartChipRestartCounter, "smartChipRestartCounter", int, "%d" +entry = smartChipAliveCounter, "smartChipAliveCounter", int, "%d" entry = startStopPhysicalState, "startStopPhysicalState", int, "%d" entry = acrStateDup, "acrStateDup", int, "%d" entry = acrEngineMovedRecently, "acrEngineMovedRecently", int, "%d" @@ -6201,16 +6203,17 @@ dialog = engine_stateDialog, "engine_state" graphLine = smartChipState graphLine = smartChipRestartCounter liveGraph = engine_state_5_Graph, "Graph", South + graphLine = smartChipAliveCounter graphLine = startStopStateToggleCounter graphLine = egtValue1 graphLine = egtValue2 - graphLine = desiredRpmLimit liveGraph = engine_state_6_Graph, "Graph", South + graphLine = desiredRpmLimit graphLine = fuelInjectionCounter graphLine = sparkCounter graphLine = fuelingLoad - graphLine = ignitionLoad liveGraph = engine_state_7_Graph, "Graph", South + graphLine = ignitionLoad graphLine = veTableYAxis indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_hellen-gm-e67.ini b/firmware/tunerstudio/generated/rusefi_hellen-gm-e67.ini index a1c997c271..88c34429cb 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen-gm-e67.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen-gm-e67.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.12.26.hellen-gm-e67.1266848329" + signature = "rusEFI master.2023.12.26.hellen-gm-e67.2209991851" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.12.26.hellen-gm-e67.1266848329" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.12.26.hellen-gm-e67.2209991851" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -92,7 +92,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","INVALID","C2-60 - Oil Pressure","C3-58 - Baro","C1-47 - PPS1","C2-64 - TPS1","C1-19 Battery Sense","C1-45 Secondary Fuel Level","C3-57 - A/C Pressure","C2-66 - TPS2","C1-44 Primary Fuel Level","C2-65 - Trans Fluids","C3-59 - MAP","C3-55 - CLT","C3-56 - IAT","C1-49 - PPS2","C1-46 Vac Sense" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Tue Dec 26 01:37:24 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Tue Dec 26 22:47:56 UTC 2023 pageSize = 22088 page = 1 @@ -2373,7 +2373,7 @@ lambdaMaxDeviationRpmBins = array, U16, 22078, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1444 + ochBlockSize = 1448 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3027,145 +3027,146 @@ brakePedalState = scalar, S08, 1092, "", 1, 0 startStopState = scalar, S08, 1093, "", 1, 0 smartChipState = scalar, S08, 1094, "", 1, 0 smartChipRestartCounter = scalar, S08, 1095, "", 1, 0 -startStopPhysicalState = bits, U32, 1096, [0:0] -acrStateDup = bits, U32, 1096, [1:1] -acrEngineMovedRecently = bits, U32, 1096, [2:2] -heaterControlEnabled = bits, U32, 1096, [3:3] -luaDigitalState0 = bits, U32, 1096, [4:4] -luaDigitalState1 = bits, U32, 1096, [5:5] -luaDigitalState2 = bits, U32, 1096, [6:6] -luaDigitalState3 = bits, U32, 1096, [7:7] -startStopStateToggleCounter = scalar, U32, 1100, "", 1, 0 -egtValue1 = scalar, F32, 1104, "", 1, 0 -egtValue2 = scalar, F32, 1108, "", 1, 0 -desiredRpmLimit = scalar, S16, 1112, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1116, "", 1, 0 -sparkCounter = scalar, U32, 1120, "", 1, 0 -fuelingLoad = scalar, F32, 1124, "", 1, 0 -ignitionLoad = scalar, F32, 1128, "", 1, 0 -veTableYAxis = scalar, U16, 1132, "%", 0.01, 0 -; total TS size = 1136 -tpsFrom = scalar, F32, 1136 -tpsTo = scalar, F32, 1140 -deltaTps = scalar, F32, 1144 -extraFuel = scalar, F32, 1148, "", 1, 0 -valueFromTable = scalar, F32, 1152, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1156, [0:0] -isBelowDecelThreshold = bits, U32, 1156, [1:1] -isTimeToResetAccumulator = bits, U32, 1156, [2:2] -isFractionalEnrichment = bits, U32, 1156, [3:3] -belowEpsilon = bits, U32, 1156, [4:4] -tooShort = bits, U32, 1156, [5:5] -fractionalInjFuel = scalar, F32, 1160, "", 1, 0 -accumulatedValue = scalar, F32, 1164, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1168, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1172, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1176, "", 1, 0 -cycleCnt = scalar, S32, 1180, "", 1, 0 -; total TS size = 1184 -hwEventCounters1 = scalar, U32, 1184, "", 1, 0 -hwEventCounters2 = scalar, U32, 1188, "", 1, 0 -hwEventCounters3 = scalar, U32, 1192, "", 1, 0 -hwEventCounters4 = scalar, U32, 1196, "", 1, 0 -hwEventCounters5 = scalar, U32, 1200, "", 1, 0 -hwEventCounters6 = scalar, U32, 1204, "", 1, 0 -vvtCamCounter = scalar, U32, 1208, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1212, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1216, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1220, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1221, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1224, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1228, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1232, "", 1, 0 -mapCamPrevToothAngle = scalar, F32, 1236, "deg", 1, 0 -isDecodingMapCam = bits, U32, 1240, [0:0] -; total TS size = 1244 -crankSynchronizationCounter0 = scalar, U32, 1244, "", 1, 0 -vvtSyncGapRatio0 = scalar, F32, 1248, "", 1, 0 -vvtToothDurations00 = scalar, U32, 1252, "us", 1, 0 -vvtCurrentPosition0 = scalar, F32, 1256, "sync: Primary Cam Position", 1, 0 -vvtToothPosition10 = scalar, F32, 1260, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition20 = scalar, F32, 1264, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition30 = scalar, F32, 1268, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition40 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio0 = scalar, F32, 1276, "", 1, 0 -triggerStateIndex0 = scalar, U08, 1280, "", 1, 0 -vvtStateIndex0 = scalar, U08, 1281, "", 1, 0 -; total TS size = 1284 -camResyncCounter = scalar, U08, 1284, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1288, [0:0] -; total TS size = 1292 -wallFuelCorrection = scalar, F32, 1292, "", 1, 0 -wallFuel = scalar, F32, 1296, "", 1, 0 -; total TS size = 1300 -idleState = bits, S32, 1300, [0:2], "not important" -currentIdlePosition = scalar, F32, 1304 -baseIdlePosition = scalar, F32, 1308 -idleClosedLoop = scalar, F32, 1312 -iacByTpsTaper = scalar, F32, 1316 -throttlePedalUpState = scalar, S32, 1320, "", 1, 0 -mightResetPid = bits, U32, 1324, [0:0] -shouldResetPid = bits, U32, 1324, [1:1] -wasResetPid = bits, U32, 1324, [2:2] -mustResetPid = bits, U32, 1324, [3:3] -isCranking = bits, U32, 1324, [4:4] -isIacTableForCoasting = bits, U32, 1324, [5:5] -notIdling = bits, U32, 1324, [6:6] -needReset = bits, U32, 1324, [7:7] -isInDeadZone = bits, U32, 1324, [8:8] -isBlipping = bits, U32, 1324, [9:9] -useClosedLoop = bits, U32, 1324, [10:10] -badTps = bits, U32, 1324, [11:11] -looksLikeRunning = bits, U32, 1324, [12:12] -looksLikeCoasting = bits, U32, 1324, [13:13] -looksLikeCrankToIdle = bits, U32, 1324, [14:14] -isIdleCoasting = bits, U32, 1324, [15:15] -isIdleClosedLoop = bits, U32, 1324, [16:16] -idleTarget = scalar, S32, 1328, "", 1, 0 -targetRpmByClt = scalar, S32, 1332, "", 1, 0 -targetRpmAc = scalar, S32, 1336, "", 1, 0 -iacByRpmTaper = scalar, F32, 1340 -luaAdd = scalar, F32, 1344 -; total TS size = 1348 -idlePosition0 = scalar, F32, 1348, "per", 1,0 -trim0 = scalar, F32, 1352, "", 1, 0 -luaAdjustment0 = scalar, F32, 1356, "per", 1,0 -m_wastegatePosition0 = scalar, F32, 1360, "per", 1,0 -etbFeedForward0 = scalar, F32, 1364 -etbIntegralError0 = scalar, F32, 1368, "", 1, 0 -etbCurrentTarget0 = scalar, F32, 1372, "%", 1, 0 -etbCurrentAdjustedTarget0 = scalar, F32, 1376, "%", 1, 0 -etbRevLimitActive0 = bits, U32, 1380, [0:0] -jamDetected0 = bits, U32, 1380, [1:1] -etbDutyRateOfChange0 = scalar, F32, 1384, "per", 1,0 -etbDutyAverage0 = scalar, F32, 1388, "per", 1,0 -etbTpsErrorCounter0 = scalar, U16, 1392, "count", 1,0 -etbPpsErrorCounter0 = scalar, U16, 1394, "count", 1,0 -etbErrorCode0 = scalar, S08, 1396, "", 1, 0 -jamTimer0 = scalar, U16, 1398, "sec", 0.01, 0 -; total TS size = 1400 -faultCode0 = scalar, U08, 1400, "", 1, 0 -heaterDuty0 = scalar, U08, 1401, "%", 1, 0 -pumpDuty0 = scalar, U08, 1402, "%", 1, 0 -tempC0 = scalar, U16, 1404, "C", 1, 0 -nernstVoltage0 = scalar, U16, 1406, "V", 0.001, 0 -esr0 = scalar, U16, 1408, "ohm", 1, 0 -; total TS size = 1412 -dcOutput0 = scalar, F32, 1412, "per", 1,0 -isEnabled0_int = scalar, U08, 1416, "per", 1,0 -isEnabled0 = bits, U32, 1420, [0:0] -; total TS size = 1424 -value0 = scalar, U16, 1424, "value", 1,0 -value1 = scalar, U16, 1426, "value", 1,0 -errorRate = scalar, F32, 1428, "ratio", 1,0 -; total TS size = 1432 -vvtTarget = scalar, U16, 1432, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1434, "%", 0.5, 0 +smartChipAliveCounter = scalar, S08, 1096, "", 1, 0 +startStopPhysicalState = bits, U32, 1100, [0:0] +acrStateDup = bits, U32, 1100, [1:1] +acrEngineMovedRecently = bits, U32, 1100, [2:2] +heaterControlEnabled = bits, U32, 1100, [3:3] +luaDigitalState0 = bits, U32, 1100, [4:4] +luaDigitalState1 = bits, U32, 1100, [5:5] +luaDigitalState2 = bits, U32, 1100, [6:6] +luaDigitalState3 = bits, U32, 1100, [7:7] +startStopStateToggleCounter = scalar, U32, 1104, "", 1, 0 +egtValue1 = scalar, F32, 1108, "", 1, 0 +egtValue2 = scalar, F32, 1112, "", 1, 0 +desiredRpmLimit = scalar, S16, 1116, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 1120, "", 1, 0 +sparkCounter = scalar, U32, 1124, "", 1, 0 +fuelingLoad = scalar, F32, 1128, "", 1, 0 +ignitionLoad = scalar, F32, 1132, "", 1, 0 +veTableYAxis = scalar, U16, 1136, "%", 0.01, 0 +; total TS size = 1140 +tpsFrom = scalar, F32, 1140 +tpsTo = scalar, F32, 1144 +deltaTps = scalar, F32, 1148 +extraFuel = scalar, F32, 1152, "", 1, 0 +valueFromTable = scalar, F32, 1156, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1160, [0:0] +isBelowDecelThreshold = bits, U32, 1160, [1:1] +isTimeToResetAccumulator = bits, U32, 1160, [2:2] +isFractionalEnrichment = bits, U32, 1160, [3:3] +belowEpsilon = bits, U32, 1160, [4:4] +tooShort = bits, U32, 1160, [5:5] +fractionalInjFuel = scalar, F32, 1164, "", 1, 0 +accumulatedValue = scalar, F32, 1168, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1172, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1176, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1180, "", 1, 0 +cycleCnt = scalar, S32, 1184, "", 1, 0 +; total TS size = 1188 +hwEventCounters1 = scalar, U32, 1188, "", 1, 0 +hwEventCounters2 = scalar, U32, 1192, "", 1, 0 +hwEventCounters3 = scalar, U32, 1196, "", 1, 0 +hwEventCounters4 = scalar, U32, 1200, "", 1, 0 +hwEventCounters5 = scalar, U32, 1204, "", 1, 0 +hwEventCounters6 = scalar, U32, 1208, "", 1, 0 +vvtCamCounter = scalar, U32, 1212, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1216, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1220, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1224, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1225, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1228, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1232, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1236, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1240, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1244, [0:0] +; total TS size = 1248 +crankSynchronizationCounter0 = scalar, U32, 1248, "", 1, 0 +vvtSyncGapRatio0 = scalar, F32, 1252, "", 1, 0 +vvtToothDurations00 = scalar, U32, 1256, "us", 1, 0 +vvtCurrentPosition0 = scalar, F32, 1260, "sync: Primary Cam Position", 1, 0 +vvtToothPosition10 = scalar, F32, 1264, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition20 = scalar, F32, 1268, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition30 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition40 = scalar, F32, 1276, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio0 = scalar, F32, 1280, "", 1, 0 +triggerStateIndex0 = scalar, U08, 1284, "", 1, 0 +vvtStateIndex0 = scalar, U08, 1285, "", 1, 0 +; total TS size = 1288 +camResyncCounter = scalar, U08, 1288, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1292, [0:0] +; total TS size = 1296 +wallFuelCorrection = scalar, F32, 1296, "", 1, 0 +wallFuel = scalar, F32, 1300, "", 1, 0 +; total TS size = 1304 +idleState = bits, S32, 1304, [0:2], "not important" +currentIdlePosition = scalar, F32, 1308 +baseIdlePosition = scalar, F32, 1312 +idleClosedLoop = scalar, F32, 1316 +iacByTpsTaper = scalar, F32, 1320 +throttlePedalUpState = scalar, S32, 1324, "", 1, 0 +mightResetPid = bits, U32, 1328, [0:0] +shouldResetPid = bits, U32, 1328, [1:1] +wasResetPid = bits, U32, 1328, [2:2] +mustResetPid = bits, U32, 1328, [3:3] +isCranking = bits, U32, 1328, [4:4] +isIacTableForCoasting = bits, U32, 1328, [5:5] +notIdling = bits, U32, 1328, [6:6] +needReset = bits, U32, 1328, [7:7] +isInDeadZone = bits, U32, 1328, [8:8] +isBlipping = bits, U32, 1328, [9:9] +useClosedLoop = bits, U32, 1328, [10:10] +badTps = bits, U32, 1328, [11:11] +looksLikeRunning = bits, U32, 1328, [12:12] +looksLikeCoasting = bits, U32, 1328, [13:13] +looksLikeCrankToIdle = bits, U32, 1328, [14:14] +isIdleCoasting = bits, U32, 1328, [15:15] +isIdleClosedLoop = bits, U32, 1328, [16:16] +idleTarget = scalar, S32, 1332, "", 1, 0 +targetRpmByClt = scalar, S32, 1336, "", 1, 0 +targetRpmAc = scalar, S32, 1340, "", 1, 0 +iacByRpmTaper = scalar, F32, 1344 +luaAdd = scalar, F32, 1348 +; total TS size = 1352 +idlePosition0 = scalar, F32, 1352, "per", 1,0 +trim0 = scalar, F32, 1356, "", 1, 0 +luaAdjustment0 = scalar, F32, 1360, "per", 1,0 +m_wastegatePosition0 = scalar, F32, 1364, "per", 1,0 +etbFeedForward0 = scalar, F32, 1368 +etbIntegralError0 = scalar, F32, 1372, "", 1, 0 +etbCurrentTarget0 = scalar, F32, 1376, "%", 1, 0 +etbCurrentAdjustedTarget0 = scalar, F32, 1380, "%", 1, 0 +etbRevLimitActive0 = bits, U32, 1384, [0:0] +jamDetected0 = bits, U32, 1384, [1:1] +etbDutyRateOfChange0 = scalar, F32, 1388, "per", 1,0 +etbDutyAverage0 = scalar, F32, 1392, "per", 1,0 +etbTpsErrorCounter0 = scalar, U16, 1396, "count", 1,0 +etbPpsErrorCounter0 = scalar, U16, 1398, "count", 1,0 +etbErrorCode0 = scalar, S08, 1400, "", 1, 0 +jamTimer0 = scalar, U16, 1402, "sec", 0.01, 0 +; total TS size = 1404 +faultCode0 = scalar, U08, 1404, "", 1, 0 +heaterDuty0 = scalar, U08, 1405, "%", 1, 0 +pumpDuty0 = scalar, U08, 1406, "%", 1, 0 +tempC0 = scalar, U16, 1408, "C", 1, 0 +nernstVoltage0 = scalar, U16, 1410, "V", 0.001, 0 +esr0 = scalar, U16, 1412, "ohm", 1, 0 +; total TS size = 1416 +dcOutput0 = scalar, F32, 1416, "per", 1,0 +isEnabled0_int = scalar, U08, 1420, "per", 1,0 +isEnabled0 = bits, U32, 1424, [0:0] +; total TS size = 1428 +value0 = scalar, U16, 1428, "value", 1,0 +value1 = scalar, U16, 1430, "value", 1,0 +errorRate = scalar, F32, 1432, "ratio", 1,0 ; total TS size = 1436 -lambdaCurrentlyGood = bits, U32, 1436, [0:0] -lambdaMonitorCut = bits, U32, 1436, [1:1] -lambdaTimeSinceGood = scalar, U16, 1440, "sec", 0.01, 0 -; total TS size = 1444 +vvtTarget = scalar, U16, 1436, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1438, "%", 0.5, 0 +; total TS size = 1440 +lambdaCurrentlyGood = bits, U32, 1440, [0:0] +lambdaMonitorCut = bits, U32, 1440, [1:1] +lambdaTimeSinceGood = scalar, U16, 1444, "sec", 0.01, 0 +; total TS size = 1448 time = { timeNow } @@ -5237,6 +5238,7 @@ entry = brakePedalState, "Brake switch", int, "%d" entry = startStopState, "startStopState", int, "%d" entry = smartChipState, "smartChipState", int, "%d" entry = smartChipRestartCounter, "smartChipRestartCounter", int, "%d" +entry = smartChipAliveCounter, "smartChipAliveCounter", int, "%d" entry = startStopPhysicalState, "startStopPhysicalState", int, "%d" entry = acrStateDup, "acrStateDup", int, "%d" entry = acrEngineMovedRecently, "acrEngineMovedRecently", int, "%d" @@ -6203,16 +6205,17 @@ dialog = engine_stateDialog, "engine_state" graphLine = smartChipState graphLine = smartChipRestartCounter liveGraph = engine_state_5_Graph, "Graph", South + graphLine = smartChipAliveCounter graphLine = startStopStateToggleCounter graphLine = egtValue1 graphLine = egtValue2 - graphLine = desiredRpmLimit liveGraph = engine_state_6_Graph, "Graph", South + graphLine = desiredRpmLimit graphLine = fuelInjectionCounter graphLine = sparkCounter graphLine = fuelingLoad - graphLine = ignitionLoad liveGraph = engine_state_7_Graph, "Graph", South + graphLine = ignitionLoad graphLine = veTableYAxis indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_hellen-honda-k.ini b/firmware/tunerstudio/generated/rusefi_hellen-honda-k.ini index 7595b674ee..9e0d7a79dd 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen-honda-k.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen-honda-k.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.12.26.hellen-honda-k.579869338" + signature = "rusEFI master.2023.12.26.hellen-honda-k.3937092728" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.12.26.hellen-honda-k.579869338" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.12.26.hellen-honda-k.3937092728" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -92,7 +92,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","INVALID","INVALID","INVALID","INVALID","A15 TPS","E9 Ignition Key Voltage","INVALID","INVALID","Aux Analog 1","INVALID","A19 - MAP","INVALID","B8 - CLT","B17 IAT","Aux Analog 2","Aux Analog 3" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Tue Dec 26 01:37:03 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Tue Dec 26 22:47:35 UTC 2023 pageSize = 22760 page = 1 @@ -2373,7 +2373,7 @@ lambdaMaxDeviationRpmBins = array, U16, 22750, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1444 + ochBlockSize = 1448 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3027,145 +3027,146 @@ brakePedalState = scalar, S08, 1092, "", 1, 0 startStopState = scalar, S08, 1093, "", 1, 0 smartChipState = scalar, S08, 1094, "", 1, 0 smartChipRestartCounter = scalar, S08, 1095, "", 1, 0 -startStopPhysicalState = bits, U32, 1096, [0:0] -acrStateDup = bits, U32, 1096, [1:1] -acrEngineMovedRecently = bits, U32, 1096, [2:2] -heaterControlEnabled = bits, U32, 1096, [3:3] -luaDigitalState0 = bits, U32, 1096, [4:4] -luaDigitalState1 = bits, U32, 1096, [5:5] -luaDigitalState2 = bits, U32, 1096, [6:6] -luaDigitalState3 = bits, U32, 1096, [7:7] -startStopStateToggleCounter = scalar, U32, 1100, "", 1, 0 -egtValue1 = scalar, F32, 1104, "", 1, 0 -egtValue2 = scalar, F32, 1108, "", 1, 0 -desiredRpmLimit = scalar, S16, 1112, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1116, "", 1, 0 -sparkCounter = scalar, U32, 1120, "", 1, 0 -fuelingLoad = scalar, F32, 1124, "", 1, 0 -ignitionLoad = scalar, F32, 1128, "", 1, 0 -veTableYAxis = scalar, U16, 1132, "%", 0.01, 0 -; total TS size = 1136 -tpsFrom = scalar, F32, 1136 -tpsTo = scalar, F32, 1140 -deltaTps = scalar, F32, 1144 -extraFuel = scalar, F32, 1148, "", 1, 0 -valueFromTable = scalar, F32, 1152, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1156, [0:0] -isBelowDecelThreshold = bits, U32, 1156, [1:1] -isTimeToResetAccumulator = bits, U32, 1156, [2:2] -isFractionalEnrichment = bits, U32, 1156, [3:3] -belowEpsilon = bits, U32, 1156, [4:4] -tooShort = bits, U32, 1156, [5:5] -fractionalInjFuel = scalar, F32, 1160, "", 1, 0 -accumulatedValue = scalar, F32, 1164, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1168, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1172, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1176, "", 1, 0 -cycleCnt = scalar, S32, 1180, "", 1, 0 -; total TS size = 1184 -hwEventCounters1 = scalar, U32, 1184, "", 1, 0 -hwEventCounters2 = scalar, U32, 1188, "", 1, 0 -hwEventCounters3 = scalar, U32, 1192, "", 1, 0 -hwEventCounters4 = scalar, U32, 1196, "", 1, 0 -hwEventCounters5 = scalar, U32, 1200, "", 1, 0 -hwEventCounters6 = scalar, U32, 1204, "", 1, 0 -vvtCamCounter = scalar, U32, 1208, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1212, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1216, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1220, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1221, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1224, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1228, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1232, "", 1, 0 -mapCamPrevToothAngle = scalar, F32, 1236, "deg", 1, 0 -isDecodingMapCam = bits, U32, 1240, [0:0] -; total TS size = 1244 -crankSynchronizationCounter0 = scalar, U32, 1244, "", 1, 0 -vvtSyncGapRatio0 = scalar, F32, 1248, "", 1, 0 -vvtToothDurations00 = scalar, U32, 1252, "us", 1, 0 -vvtCurrentPosition0 = scalar, F32, 1256, "sync: Primary Cam Position", 1, 0 -vvtToothPosition10 = scalar, F32, 1260, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition20 = scalar, F32, 1264, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition30 = scalar, F32, 1268, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition40 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio0 = scalar, F32, 1276, "", 1, 0 -triggerStateIndex0 = scalar, U08, 1280, "", 1, 0 -vvtStateIndex0 = scalar, U08, 1281, "", 1, 0 -; total TS size = 1284 -camResyncCounter = scalar, U08, 1284, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1288, [0:0] -; total TS size = 1292 -wallFuelCorrection = scalar, F32, 1292, "", 1, 0 -wallFuel = scalar, F32, 1296, "", 1, 0 -; total TS size = 1300 -idleState = bits, S32, 1300, [0:2], "not important" -currentIdlePosition = scalar, F32, 1304 -baseIdlePosition = scalar, F32, 1308 -idleClosedLoop = scalar, F32, 1312 -iacByTpsTaper = scalar, F32, 1316 -throttlePedalUpState = scalar, S32, 1320, "", 1, 0 -mightResetPid = bits, U32, 1324, [0:0] -shouldResetPid = bits, U32, 1324, [1:1] -wasResetPid = bits, U32, 1324, [2:2] -mustResetPid = bits, U32, 1324, [3:3] -isCranking = bits, U32, 1324, [4:4] -isIacTableForCoasting = bits, U32, 1324, [5:5] -notIdling = bits, U32, 1324, [6:6] -needReset = bits, U32, 1324, [7:7] -isInDeadZone = bits, U32, 1324, [8:8] -isBlipping = bits, U32, 1324, [9:9] -useClosedLoop = bits, U32, 1324, [10:10] -badTps = bits, U32, 1324, [11:11] -looksLikeRunning = bits, U32, 1324, [12:12] -looksLikeCoasting = bits, U32, 1324, [13:13] -looksLikeCrankToIdle = bits, U32, 1324, [14:14] -isIdleCoasting = bits, U32, 1324, [15:15] -isIdleClosedLoop = bits, U32, 1324, [16:16] -idleTarget = scalar, S32, 1328, "", 1, 0 -targetRpmByClt = scalar, S32, 1332, "", 1, 0 -targetRpmAc = scalar, S32, 1336, "", 1, 0 -iacByRpmTaper = scalar, F32, 1340 -luaAdd = scalar, F32, 1344 -; total TS size = 1348 -idlePosition0 = scalar, F32, 1348, "per", 1,0 -trim0 = scalar, F32, 1352, "", 1, 0 -luaAdjustment0 = scalar, F32, 1356, "per", 1,0 -m_wastegatePosition0 = scalar, F32, 1360, "per", 1,0 -etbFeedForward0 = scalar, F32, 1364 -etbIntegralError0 = scalar, F32, 1368, "", 1, 0 -etbCurrentTarget0 = scalar, F32, 1372, "%", 1, 0 -etbCurrentAdjustedTarget0 = scalar, F32, 1376, "%", 1, 0 -etbRevLimitActive0 = bits, U32, 1380, [0:0] -jamDetected0 = bits, U32, 1380, [1:1] -etbDutyRateOfChange0 = scalar, F32, 1384, "per", 1,0 -etbDutyAverage0 = scalar, F32, 1388, "per", 1,0 -etbTpsErrorCounter0 = scalar, U16, 1392, "count", 1,0 -etbPpsErrorCounter0 = scalar, U16, 1394, "count", 1,0 -etbErrorCode0 = scalar, S08, 1396, "", 1, 0 -jamTimer0 = scalar, U16, 1398, "sec", 0.01, 0 -; total TS size = 1400 -faultCode0 = scalar, U08, 1400, "", 1, 0 -heaterDuty0 = scalar, U08, 1401, "%", 1, 0 -pumpDuty0 = scalar, U08, 1402, "%", 1, 0 -tempC0 = scalar, U16, 1404, "C", 1, 0 -nernstVoltage0 = scalar, U16, 1406, "V", 0.001, 0 -esr0 = scalar, U16, 1408, "ohm", 1, 0 -; total TS size = 1412 -dcOutput0 = scalar, F32, 1412, "per", 1,0 -isEnabled0_int = scalar, U08, 1416, "per", 1,0 -isEnabled0 = bits, U32, 1420, [0:0] -; total TS size = 1424 -value0 = scalar, U16, 1424, "value", 1,0 -value1 = scalar, U16, 1426, "value", 1,0 -errorRate = scalar, F32, 1428, "ratio", 1,0 -; total TS size = 1432 -vvtTarget = scalar, U16, 1432, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1434, "%", 0.5, 0 +smartChipAliveCounter = scalar, S08, 1096, "", 1, 0 +startStopPhysicalState = bits, U32, 1100, [0:0] +acrStateDup = bits, U32, 1100, [1:1] +acrEngineMovedRecently = bits, U32, 1100, [2:2] +heaterControlEnabled = bits, U32, 1100, [3:3] +luaDigitalState0 = bits, U32, 1100, [4:4] +luaDigitalState1 = bits, U32, 1100, [5:5] +luaDigitalState2 = bits, U32, 1100, [6:6] +luaDigitalState3 = bits, U32, 1100, [7:7] +startStopStateToggleCounter = scalar, U32, 1104, "", 1, 0 +egtValue1 = scalar, F32, 1108, "", 1, 0 +egtValue2 = scalar, F32, 1112, "", 1, 0 +desiredRpmLimit = scalar, S16, 1116, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 1120, "", 1, 0 +sparkCounter = scalar, U32, 1124, "", 1, 0 +fuelingLoad = scalar, F32, 1128, "", 1, 0 +ignitionLoad = scalar, F32, 1132, "", 1, 0 +veTableYAxis = scalar, U16, 1136, "%", 0.01, 0 +; total TS size = 1140 +tpsFrom = scalar, F32, 1140 +tpsTo = scalar, F32, 1144 +deltaTps = scalar, F32, 1148 +extraFuel = scalar, F32, 1152, "", 1, 0 +valueFromTable = scalar, F32, 1156, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1160, [0:0] +isBelowDecelThreshold = bits, U32, 1160, [1:1] +isTimeToResetAccumulator = bits, U32, 1160, [2:2] +isFractionalEnrichment = bits, U32, 1160, [3:3] +belowEpsilon = bits, U32, 1160, [4:4] +tooShort = bits, U32, 1160, [5:5] +fractionalInjFuel = scalar, F32, 1164, "", 1, 0 +accumulatedValue = scalar, F32, 1168, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1172, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1176, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1180, "", 1, 0 +cycleCnt = scalar, S32, 1184, "", 1, 0 +; total TS size = 1188 +hwEventCounters1 = scalar, U32, 1188, "", 1, 0 +hwEventCounters2 = scalar, U32, 1192, "", 1, 0 +hwEventCounters3 = scalar, U32, 1196, "", 1, 0 +hwEventCounters4 = scalar, U32, 1200, "", 1, 0 +hwEventCounters5 = scalar, U32, 1204, "", 1, 0 +hwEventCounters6 = scalar, U32, 1208, "", 1, 0 +vvtCamCounter = scalar, U32, 1212, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1216, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1220, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1224, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1225, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1228, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1232, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1236, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1240, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1244, [0:0] +; total TS size = 1248 +crankSynchronizationCounter0 = scalar, U32, 1248, "", 1, 0 +vvtSyncGapRatio0 = scalar, F32, 1252, "", 1, 0 +vvtToothDurations00 = scalar, U32, 1256, "us", 1, 0 +vvtCurrentPosition0 = scalar, F32, 1260, "sync: Primary Cam Position", 1, 0 +vvtToothPosition10 = scalar, F32, 1264, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition20 = scalar, F32, 1268, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition30 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition40 = scalar, F32, 1276, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio0 = scalar, F32, 1280, "", 1, 0 +triggerStateIndex0 = scalar, U08, 1284, "", 1, 0 +vvtStateIndex0 = scalar, U08, 1285, "", 1, 0 +; total TS size = 1288 +camResyncCounter = scalar, U08, 1288, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1292, [0:0] +; total TS size = 1296 +wallFuelCorrection = scalar, F32, 1296, "", 1, 0 +wallFuel = scalar, F32, 1300, "", 1, 0 +; total TS size = 1304 +idleState = bits, S32, 1304, [0:2], "not important" +currentIdlePosition = scalar, F32, 1308 +baseIdlePosition = scalar, F32, 1312 +idleClosedLoop = scalar, F32, 1316 +iacByTpsTaper = scalar, F32, 1320 +throttlePedalUpState = scalar, S32, 1324, "", 1, 0 +mightResetPid = bits, U32, 1328, [0:0] +shouldResetPid = bits, U32, 1328, [1:1] +wasResetPid = bits, U32, 1328, [2:2] +mustResetPid = bits, U32, 1328, [3:3] +isCranking = bits, U32, 1328, [4:4] +isIacTableForCoasting = bits, U32, 1328, [5:5] +notIdling = bits, U32, 1328, [6:6] +needReset = bits, U32, 1328, [7:7] +isInDeadZone = bits, U32, 1328, [8:8] +isBlipping = bits, U32, 1328, [9:9] +useClosedLoop = bits, U32, 1328, [10:10] +badTps = bits, U32, 1328, [11:11] +looksLikeRunning = bits, U32, 1328, [12:12] +looksLikeCoasting = bits, U32, 1328, [13:13] +looksLikeCrankToIdle = bits, U32, 1328, [14:14] +isIdleCoasting = bits, U32, 1328, [15:15] +isIdleClosedLoop = bits, U32, 1328, [16:16] +idleTarget = scalar, S32, 1332, "", 1, 0 +targetRpmByClt = scalar, S32, 1336, "", 1, 0 +targetRpmAc = scalar, S32, 1340, "", 1, 0 +iacByRpmTaper = scalar, F32, 1344 +luaAdd = scalar, F32, 1348 +; total TS size = 1352 +idlePosition0 = scalar, F32, 1352, "per", 1,0 +trim0 = scalar, F32, 1356, "", 1, 0 +luaAdjustment0 = scalar, F32, 1360, "per", 1,0 +m_wastegatePosition0 = scalar, F32, 1364, "per", 1,0 +etbFeedForward0 = scalar, F32, 1368 +etbIntegralError0 = scalar, F32, 1372, "", 1, 0 +etbCurrentTarget0 = scalar, F32, 1376, "%", 1, 0 +etbCurrentAdjustedTarget0 = scalar, F32, 1380, "%", 1, 0 +etbRevLimitActive0 = bits, U32, 1384, [0:0] +jamDetected0 = bits, U32, 1384, [1:1] +etbDutyRateOfChange0 = scalar, F32, 1388, "per", 1,0 +etbDutyAverage0 = scalar, F32, 1392, "per", 1,0 +etbTpsErrorCounter0 = scalar, U16, 1396, "count", 1,0 +etbPpsErrorCounter0 = scalar, U16, 1398, "count", 1,0 +etbErrorCode0 = scalar, S08, 1400, "", 1, 0 +jamTimer0 = scalar, U16, 1402, "sec", 0.01, 0 +; total TS size = 1404 +faultCode0 = scalar, U08, 1404, "", 1, 0 +heaterDuty0 = scalar, U08, 1405, "%", 1, 0 +pumpDuty0 = scalar, U08, 1406, "%", 1, 0 +tempC0 = scalar, U16, 1408, "C", 1, 0 +nernstVoltage0 = scalar, U16, 1410, "V", 0.001, 0 +esr0 = scalar, U16, 1412, "ohm", 1, 0 +; total TS size = 1416 +dcOutput0 = scalar, F32, 1416, "per", 1,0 +isEnabled0_int = scalar, U08, 1420, "per", 1,0 +isEnabled0 = bits, U32, 1424, [0:0] +; total TS size = 1428 +value0 = scalar, U16, 1428, "value", 1,0 +value1 = scalar, U16, 1430, "value", 1,0 +errorRate = scalar, F32, 1432, "ratio", 1,0 ; total TS size = 1436 -lambdaCurrentlyGood = bits, U32, 1436, [0:0] -lambdaMonitorCut = bits, U32, 1436, [1:1] -lambdaTimeSinceGood = scalar, U16, 1440, "sec", 0.01, 0 -; total TS size = 1444 +vvtTarget = scalar, U16, 1436, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1438, "%", 0.5, 0 +; total TS size = 1440 +lambdaCurrentlyGood = bits, U32, 1440, [0:0] +lambdaMonitorCut = bits, U32, 1440, [1:1] +lambdaTimeSinceGood = scalar, U16, 1444, "sec", 0.01, 0 +; total TS size = 1448 time = { timeNow } @@ -5237,6 +5238,7 @@ entry = brakePedalState, "Brake switch", int, "%d" entry = startStopState, "startStopState", int, "%d" entry = smartChipState, "smartChipState", int, "%d" entry = smartChipRestartCounter, "smartChipRestartCounter", int, "%d" +entry = smartChipAliveCounter, "smartChipAliveCounter", int, "%d" entry = startStopPhysicalState, "startStopPhysicalState", int, "%d" entry = acrStateDup, "acrStateDup", int, "%d" entry = acrEngineMovedRecently, "acrEngineMovedRecently", int, "%d" @@ -6201,16 +6203,17 @@ dialog = engine_stateDialog, "engine_state" graphLine = smartChipState graphLine = smartChipRestartCounter liveGraph = engine_state_5_Graph, "Graph", South + graphLine = smartChipAliveCounter graphLine = startStopStateToggleCounter graphLine = egtValue1 graphLine = egtValue2 - graphLine = desiredRpmLimit liveGraph = engine_state_6_Graph, "Graph", South + graphLine = desiredRpmLimit graphLine = fuelInjectionCounter graphLine = sparkCounter graphLine = fuelingLoad - graphLine = ignitionLoad liveGraph = engine_state_7_Graph, "Graph", South + graphLine = ignitionLoad graphLine = veTableYAxis indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini b/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini index fa06e57308..b0810ab497 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.12.26.hellen-nb1.2494704046" + signature = "rusEFI master.2023.12.26.hellen-nb1.1552512844" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.12.26.hellen-nb1.2494704046" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.12.26.hellen-nb1.1552512844" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -92,7 +92,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","2C - O2S","TPS1","intMAP","1G - Steering/RES2","3E - TPS","1B - Battery Sense","2H - CAM","3S - EGR BOOST IN","2A - Pressure Input","2J - CRANK","2L - MAF","3D - MAP","2E - Coolant","2B - IAT","4C - IN TEMP/PPS2","1P - AC Switch" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Tue Dec 26 01:37:21 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Tue Dec 26 22:47:53 UTC 2023 pageSize = 22088 page = 1 @@ -2373,7 +2373,7 @@ lambdaMaxDeviationRpmBins = array, U16, 22078, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1444 + ochBlockSize = 1448 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3027,145 +3027,146 @@ brakePedalState = scalar, S08, 1092, "", 1, 0 startStopState = scalar, S08, 1093, "", 1, 0 smartChipState = scalar, S08, 1094, "", 1, 0 smartChipRestartCounter = scalar, S08, 1095, "", 1, 0 -startStopPhysicalState = bits, U32, 1096, [0:0] -acrStateDup = bits, U32, 1096, [1:1] -acrEngineMovedRecently = bits, U32, 1096, [2:2] -heaterControlEnabled = bits, U32, 1096, [3:3] -luaDigitalState0 = bits, U32, 1096, [4:4] -luaDigitalState1 = bits, U32, 1096, [5:5] -luaDigitalState2 = bits, U32, 1096, [6:6] -luaDigitalState3 = bits, U32, 1096, [7:7] -startStopStateToggleCounter = scalar, U32, 1100, "", 1, 0 -egtValue1 = scalar, F32, 1104, "", 1, 0 -egtValue2 = scalar, F32, 1108, "", 1, 0 -desiredRpmLimit = scalar, S16, 1112, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1116, "", 1, 0 -sparkCounter = scalar, U32, 1120, "", 1, 0 -fuelingLoad = scalar, F32, 1124, "", 1, 0 -ignitionLoad = scalar, F32, 1128, "", 1, 0 -veTableYAxis = scalar, U16, 1132, "%", 0.01, 0 -; total TS size = 1136 -tpsFrom = scalar, F32, 1136 -tpsTo = scalar, F32, 1140 -deltaTps = scalar, F32, 1144 -extraFuel = scalar, F32, 1148, "", 1, 0 -valueFromTable = scalar, F32, 1152, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1156, [0:0] -isBelowDecelThreshold = bits, U32, 1156, [1:1] -isTimeToResetAccumulator = bits, U32, 1156, [2:2] -isFractionalEnrichment = bits, U32, 1156, [3:3] -belowEpsilon = bits, U32, 1156, [4:4] -tooShort = bits, U32, 1156, [5:5] -fractionalInjFuel = scalar, F32, 1160, "", 1, 0 -accumulatedValue = scalar, F32, 1164, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1168, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1172, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1176, "", 1, 0 -cycleCnt = scalar, S32, 1180, "", 1, 0 -; total TS size = 1184 -hwEventCounters1 = scalar, U32, 1184, "", 1, 0 -hwEventCounters2 = scalar, U32, 1188, "", 1, 0 -hwEventCounters3 = scalar, U32, 1192, "", 1, 0 -hwEventCounters4 = scalar, U32, 1196, "", 1, 0 -hwEventCounters5 = scalar, U32, 1200, "", 1, 0 -hwEventCounters6 = scalar, U32, 1204, "", 1, 0 -vvtCamCounter = scalar, U32, 1208, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1212, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1216, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1220, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1221, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1224, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1228, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1232, "", 1, 0 -mapCamPrevToothAngle = scalar, F32, 1236, "deg", 1, 0 -isDecodingMapCam = bits, U32, 1240, [0:0] -; total TS size = 1244 -crankSynchronizationCounter0 = scalar, U32, 1244, "", 1, 0 -vvtSyncGapRatio0 = scalar, F32, 1248, "", 1, 0 -vvtToothDurations00 = scalar, U32, 1252, "us", 1, 0 -vvtCurrentPosition0 = scalar, F32, 1256, "sync: Primary Cam Position", 1, 0 -vvtToothPosition10 = scalar, F32, 1260, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition20 = scalar, F32, 1264, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition30 = scalar, F32, 1268, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition40 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio0 = scalar, F32, 1276, "", 1, 0 -triggerStateIndex0 = scalar, U08, 1280, "", 1, 0 -vvtStateIndex0 = scalar, U08, 1281, "", 1, 0 -; total TS size = 1284 -camResyncCounter = scalar, U08, 1284, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1288, [0:0] -; total TS size = 1292 -wallFuelCorrection = scalar, F32, 1292, "", 1, 0 -wallFuel = scalar, F32, 1296, "", 1, 0 -; total TS size = 1300 -idleState = bits, S32, 1300, [0:2], "not important" -currentIdlePosition = scalar, F32, 1304 -baseIdlePosition = scalar, F32, 1308 -idleClosedLoop = scalar, F32, 1312 -iacByTpsTaper = scalar, F32, 1316 -throttlePedalUpState = scalar, S32, 1320, "", 1, 0 -mightResetPid = bits, U32, 1324, [0:0] -shouldResetPid = bits, U32, 1324, [1:1] -wasResetPid = bits, U32, 1324, [2:2] -mustResetPid = bits, U32, 1324, [3:3] -isCranking = bits, U32, 1324, [4:4] -isIacTableForCoasting = bits, U32, 1324, [5:5] -notIdling = bits, U32, 1324, [6:6] -needReset = bits, U32, 1324, [7:7] -isInDeadZone = bits, U32, 1324, [8:8] -isBlipping = bits, U32, 1324, [9:9] -useClosedLoop = bits, U32, 1324, [10:10] -badTps = bits, U32, 1324, [11:11] -looksLikeRunning = bits, U32, 1324, [12:12] -looksLikeCoasting = bits, U32, 1324, [13:13] -looksLikeCrankToIdle = bits, U32, 1324, [14:14] -isIdleCoasting = bits, U32, 1324, [15:15] -isIdleClosedLoop = bits, U32, 1324, [16:16] -idleTarget = scalar, S32, 1328, "", 1, 0 -targetRpmByClt = scalar, S32, 1332, "", 1, 0 -targetRpmAc = scalar, S32, 1336, "", 1, 0 -iacByRpmTaper = scalar, F32, 1340 -luaAdd = scalar, F32, 1344 -; total TS size = 1348 -idlePosition0 = scalar, F32, 1348, "per", 1,0 -trim0 = scalar, F32, 1352, "", 1, 0 -luaAdjustment0 = scalar, F32, 1356, "per", 1,0 -m_wastegatePosition0 = scalar, F32, 1360, "per", 1,0 -etbFeedForward0 = scalar, F32, 1364 -etbIntegralError0 = scalar, F32, 1368, "", 1, 0 -etbCurrentTarget0 = scalar, F32, 1372, "%", 1, 0 -etbCurrentAdjustedTarget0 = scalar, F32, 1376, "%", 1, 0 -etbRevLimitActive0 = bits, U32, 1380, [0:0] -jamDetected0 = bits, U32, 1380, [1:1] -etbDutyRateOfChange0 = scalar, F32, 1384, "per", 1,0 -etbDutyAverage0 = scalar, F32, 1388, "per", 1,0 -etbTpsErrorCounter0 = scalar, U16, 1392, "count", 1,0 -etbPpsErrorCounter0 = scalar, U16, 1394, "count", 1,0 -etbErrorCode0 = scalar, S08, 1396, "", 1, 0 -jamTimer0 = scalar, U16, 1398, "sec", 0.01, 0 -; total TS size = 1400 -faultCode0 = scalar, U08, 1400, "", 1, 0 -heaterDuty0 = scalar, U08, 1401, "%", 1, 0 -pumpDuty0 = scalar, U08, 1402, "%", 1, 0 -tempC0 = scalar, U16, 1404, "C", 1, 0 -nernstVoltage0 = scalar, U16, 1406, "V", 0.001, 0 -esr0 = scalar, U16, 1408, "ohm", 1, 0 -; total TS size = 1412 -dcOutput0 = scalar, F32, 1412, "per", 1,0 -isEnabled0_int = scalar, U08, 1416, "per", 1,0 -isEnabled0 = bits, U32, 1420, [0:0] -; total TS size = 1424 -value0 = scalar, U16, 1424, "value", 1,0 -value1 = scalar, U16, 1426, "value", 1,0 -errorRate = scalar, F32, 1428, "ratio", 1,0 -; total TS size = 1432 -vvtTarget = scalar, U16, 1432, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1434, "%", 0.5, 0 +smartChipAliveCounter = scalar, S08, 1096, "", 1, 0 +startStopPhysicalState = bits, U32, 1100, [0:0] +acrStateDup = bits, U32, 1100, [1:1] +acrEngineMovedRecently = bits, U32, 1100, [2:2] +heaterControlEnabled = bits, U32, 1100, [3:3] +luaDigitalState0 = bits, U32, 1100, [4:4] +luaDigitalState1 = bits, U32, 1100, [5:5] +luaDigitalState2 = bits, U32, 1100, [6:6] +luaDigitalState3 = bits, U32, 1100, [7:7] +startStopStateToggleCounter = scalar, U32, 1104, "", 1, 0 +egtValue1 = scalar, F32, 1108, "", 1, 0 +egtValue2 = scalar, F32, 1112, "", 1, 0 +desiredRpmLimit = scalar, S16, 1116, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 1120, "", 1, 0 +sparkCounter = scalar, U32, 1124, "", 1, 0 +fuelingLoad = scalar, F32, 1128, "", 1, 0 +ignitionLoad = scalar, F32, 1132, "", 1, 0 +veTableYAxis = scalar, U16, 1136, "%", 0.01, 0 +; total TS size = 1140 +tpsFrom = scalar, F32, 1140 +tpsTo = scalar, F32, 1144 +deltaTps = scalar, F32, 1148 +extraFuel = scalar, F32, 1152, "", 1, 0 +valueFromTable = scalar, F32, 1156, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1160, [0:0] +isBelowDecelThreshold = bits, U32, 1160, [1:1] +isTimeToResetAccumulator = bits, U32, 1160, [2:2] +isFractionalEnrichment = bits, U32, 1160, [3:3] +belowEpsilon = bits, U32, 1160, [4:4] +tooShort = bits, U32, 1160, [5:5] +fractionalInjFuel = scalar, F32, 1164, "", 1, 0 +accumulatedValue = scalar, F32, 1168, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1172, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1176, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1180, "", 1, 0 +cycleCnt = scalar, S32, 1184, "", 1, 0 +; total TS size = 1188 +hwEventCounters1 = scalar, U32, 1188, "", 1, 0 +hwEventCounters2 = scalar, U32, 1192, "", 1, 0 +hwEventCounters3 = scalar, U32, 1196, "", 1, 0 +hwEventCounters4 = scalar, U32, 1200, "", 1, 0 +hwEventCounters5 = scalar, U32, 1204, "", 1, 0 +hwEventCounters6 = scalar, U32, 1208, "", 1, 0 +vvtCamCounter = scalar, U32, 1212, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1216, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1220, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1224, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1225, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1228, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1232, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1236, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1240, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1244, [0:0] +; total TS size = 1248 +crankSynchronizationCounter0 = scalar, U32, 1248, "", 1, 0 +vvtSyncGapRatio0 = scalar, F32, 1252, "", 1, 0 +vvtToothDurations00 = scalar, U32, 1256, "us", 1, 0 +vvtCurrentPosition0 = scalar, F32, 1260, "sync: Primary Cam Position", 1, 0 +vvtToothPosition10 = scalar, F32, 1264, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition20 = scalar, F32, 1268, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition30 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition40 = scalar, F32, 1276, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio0 = scalar, F32, 1280, "", 1, 0 +triggerStateIndex0 = scalar, U08, 1284, "", 1, 0 +vvtStateIndex0 = scalar, U08, 1285, "", 1, 0 +; total TS size = 1288 +camResyncCounter = scalar, U08, 1288, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1292, [0:0] +; total TS size = 1296 +wallFuelCorrection = scalar, F32, 1296, "", 1, 0 +wallFuel = scalar, F32, 1300, "", 1, 0 +; total TS size = 1304 +idleState = bits, S32, 1304, [0:2], "not important" +currentIdlePosition = scalar, F32, 1308 +baseIdlePosition = scalar, F32, 1312 +idleClosedLoop = scalar, F32, 1316 +iacByTpsTaper = scalar, F32, 1320 +throttlePedalUpState = scalar, S32, 1324, "", 1, 0 +mightResetPid = bits, U32, 1328, [0:0] +shouldResetPid = bits, U32, 1328, [1:1] +wasResetPid = bits, U32, 1328, [2:2] +mustResetPid = bits, U32, 1328, [3:3] +isCranking = bits, U32, 1328, [4:4] +isIacTableForCoasting = bits, U32, 1328, [5:5] +notIdling = bits, U32, 1328, [6:6] +needReset = bits, U32, 1328, [7:7] +isInDeadZone = bits, U32, 1328, [8:8] +isBlipping = bits, U32, 1328, [9:9] +useClosedLoop = bits, U32, 1328, [10:10] +badTps = bits, U32, 1328, [11:11] +looksLikeRunning = bits, U32, 1328, [12:12] +looksLikeCoasting = bits, U32, 1328, [13:13] +looksLikeCrankToIdle = bits, U32, 1328, [14:14] +isIdleCoasting = bits, U32, 1328, [15:15] +isIdleClosedLoop = bits, U32, 1328, [16:16] +idleTarget = scalar, S32, 1332, "", 1, 0 +targetRpmByClt = scalar, S32, 1336, "", 1, 0 +targetRpmAc = scalar, S32, 1340, "", 1, 0 +iacByRpmTaper = scalar, F32, 1344 +luaAdd = scalar, F32, 1348 +; total TS size = 1352 +idlePosition0 = scalar, F32, 1352, "per", 1,0 +trim0 = scalar, F32, 1356, "", 1, 0 +luaAdjustment0 = scalar, F32, 1360, "per", 1,0 +m_wastegatePosition0 = scalar, F32, 1364, "per", 1,0 +etbFeedForward0 = scalar, F32, 1368 +etbIntegralError0 = scalar, F32, 1372, "", 1, 0 +etbCurrentTarget0 = scalar, F32, 1376, "%", 1, 0 +etbCurrentAdjustedTarget0 = scalar, F32, 1380, "%", 1, 0 +etbRevLimitActive0 = bits, U32, 1384, [0:0] +jamDetected0 = bits, U32, 1384, [1:1] +etbDutyRateOfChange0 = scalar, F32, 1388, "per", 1,0 +etbDutyAverage0 = scalar, F32, 1392, "per", 1,0 +etbTpsErrorCounter0 = scalar, U16, 1396, "count", 1,0 +etbPpsErrorCounter0 = scalar, U16, 1398, "count", 1,0 +etbErrorCode0 = scalar, S08, 1400, "", 1, 0 +jamTimer0 = scalar, U16, 1402, "sec", 0.01, 0 +; total TS size = 1404 +faultCode0 = scalar, U08, 1404, "", 1, 0 +heaterDuty0 = scalar, U08, 1405, "%", 1, 0 +pumpDuty0 = scalar, U08, 1406, "%", 1, 0 +tempC0 = scalar, U16, 1408, "C", 1, 0 +nernstVoltage0 = scalar, U16, 1410, "V", 0.001, 0 +esr0 = scalar, U16, 1412, "ohm", 1, 0 +; total TS size = 1416 +dcOutput0 = scalar, F32, 1416, "per", 1,0 +isEnabled0_int = scalar, U08, 1420, "per", 1,0 +isEnabled0 = bits, U32, 1424, [0:0] +; total TS size = 1428 +value0 = scalar, U16, 1428, "value", 1,0 +value1 = scalar, U16, 1430, "value", 1,0 +errorRate = scalar, F32, 1432, "ratio", 1,0 ; total TS size = 1436 -lambdaCurrentlyGood = bits, U32, 1436, [0:0] -lambdaMonitorCut = bits, U32, 1436, [1:1] -lambdaTimeSinceGood = scalar, U16, 1440, "sec", 0.01, 0 -; total TS size = 1444 +vvtTarget = scalar, U16, 1436, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1438, "%", 0.5, 0 +; total TS size = 1440 +lambdaCurrentlyGood = bits, U32, 1440, [0:0] +lambdaMonitorCut = bits, U32, 1440, [1:1] +lambdaTimeSinceGood = scalar, U16, 1444, "sec", 0.01, 0 +; total TS size = 1448 time = { timeNow } @@ -5237,6 +5238,7 @@ entry = brakePedalState, "Brake switch", int, "%d" entry = startStopState, "startStopState", int, "%d" entry = smartChipState, "smartChipState", int, "%d" entry = smartChipRestartCounter, "smartChipRestartCounter", int, "%d" +entry = smartChipAliveCounter, "smartChipAliveCounter", int, "%d" entry = startStopPhysicalState, "startStopPhysicalState", int, "%d" entry = acrStateDup, "acrStateDup", int, "%d" entry = acrEngineMovedRecently, "acrEngineMovedRecently", int, "%d" @@ -6203,16 +6205,17 @@ dialog = engine_stateDialog, "engine_state" graphLine = smartChipState graphLine = smartChipRestartCounter liveGraph = engine_state_5_Graph, "Graph", South + graphLine = smartChipAliveCounter graphLine = startStopStateToggleCounter graphLine = egtValue1 graphLine = egtValue2 - graphLine = desiredRpmLimit liveGraph = engine_state_6_Graph, "Graph", South + graphLine = desiredRpmLimit graphLine = fuelInjectionCounter graphLine = sparkCounter graphLine = fuelingLoad - graphLine = ignitionLoad liveGraph = engine_state_7_Graph, "Graph", South + graphLine = ignitionLoad graphLine = veTableYAxis indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini b/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini index 68d97c0314..f0f9588f6a 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.12.26.hellen121nissan.1648804493" + signature = "rusEFI master.2023.12.26.hellen121nissan.2860358767" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.12.26.hellen121nissan.1648804493" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.12.26.hellen121nissan.2860358767" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -92,7 +92,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","51 - MAF","INVALID","Aux P68","106 - PPS 1","50 - TPS 1","109 Ignition Key Voltage","INVALID","INVALID","69 - TPS 2","INVALID","Aux P66","Aux P67","73 - CLT","34 - IAT","98 - PPS 2" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Tue Dec 26 01:37:00 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Tue Dec 26 22:47:32 UTC 2023 pageSize = 22088 page = 1 @@ -2373,7 +2373,7 @@ lambdaMaxDeviationRpmBins = array, U16, 22078, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1444 + ochBlockSize = 1448 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3027,145 +3027,146 @@ brakePedalState = scalar, S08, 1092, "", 1, 0 startStopState = scalar, S08, 1093, "", 1, 0 smartChipState = scalar, S08, 1094, "", 1, 0 smartChipRestartCounter = scalar, S08, 1095, "", 1, 0 -startStopPhysicalState = bits, U32, 1096, [0:0] -acrStateDup = bits, U32, 1096, [1:1] -acrEngineMovedRecently = bits, U32, 1096, [2:2] -heaterControlEnabled = bits, U32, 1096, [3:3] -luaDigitalState0 = bits, U32, 1096, [4:4] -luaDigitalState1 = bits, U32, 1096, [5:5] -luaDigitalState2 = bits, U32, 1096, [6:6] -luaDigitalState3 = bits, U32, 1096, [7:7] -startStopStateToggleCounter = scalar, U32, 1100, "", 1, 0 -egtValue1 = scalar, F32, 1104, "", 1, 0 -egtValue2 = scalar, F32, 1108, "", 1, 0 -desiredRpmLimit = scalar, S16, 1112, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1116, "", 1, 0 -sparkCounter = scalar, U32, 1120, "", 1, 0 -fuelingLoad = scalar, F32, 1124, "", 1, 0 -ignitionLoad = scalar, F32, 1128, "", 1, 0 -veTableYAxis = scalar, U16, 1132, "%", 0.01, 0 -; total TS size = 1136 -tpsFrom = scalar, F32, 1136 -tpsTo = scalar, F32, 1140 -deltaTps = scalar, F32, 1144 -extraFuel = scalar, F32, 1148, "", 1, 0 -valueFromTable = scalar, F32, 1152, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1156, [0:0] -isBelowDecelThreshold = bits, U32, 1156, [1:1] -isTimeToResetAccumulator = bits, U32, 1156, [2:2] -isFractionalEnrichment = bits, U32, 1156, [3:3] -belowEpsilon = bits, U32, 1156, [4:4] -tooShort = bits, U32, 1156, [5:5] -fractionalInjFuel = scalar, F32, 1160, "", 1, 0 -accumulatedValue = scalar, F32, 1164, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1168, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1172, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1176, "", 1, 0 -cycleCnt = scalar, S32, 1180, "", 1, 0 -; total TS size = 1184 -hwEventCounters1 = scalar, U32, 1184, "", 1, 0 -hwEventCounters2 = scalar, U32, 1188, "", 1, 0 -hwEventCounters3 = scalar, U32, 1192, "", 1, 0 -hwEventCounters4 = scalar, U32, 1196, "", 1, 0 -hwEventCounters5 = scalar, U32, 1200, "", 1, 0 -hwEventCounters6 = scalar, U32, 1204, "", 1, 0 -vvtCamCounter = scalar, U32, 1208, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1212, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1216, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1220, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1221, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1224, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1228, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1232, "", 1, 0 -mapCamPrevToothAngle = scalar, F32, 1236, "deg", 1, 0 -isDecodingMapCam = bits, U32, 1240, [0:0] -; total TS size = 1244 -crankSynchronizationCounter0 = scalar, U32, 1244, "", 1, 0 -vvtSyncGapRatio0 = scalar, F32, 1248, "", 1, 0 -vvtToothDurations00 = scalar, U32, 1252, "us", 1, 0 -vvtCurrentPosition0 = scalar, F32, 1256, "sync: Primary Cam Position", 1, 0 -vvtToothPosition10 = scalar, F32, 1260, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition20 = scalar, F32, 1264, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition30 = scalar, F32, 1268, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition40 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio0 = scalar, F32, 1276, "", 1, 0 -triggerStateIndex0 = scalar, U08, 1280, "", 1, 0 -vvtStateIndex0 = scalar, U08, 1281, "", 1, 0 -; total TS size = 1284 -camResyncCounter = scalar, U08, 1284, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1288, [0:0] -; total TS size = 1292 -wallFuelCorrection = scalar, F32, 1292, "", 1, 0 -wallFuel = scalar, F32, 1296, "", 1, 0 -; total TS size = 1300 -idleState = bits, S32, 1300, [0:2], "not important" -currentIdlePosition = scalar, F32, 1304 -baseIdlePosition = scalar, F32, 1308 -idleClosedLoop = scalar, F32, 1312 -iacByTpsTaper = scalar, F32, 1316 -throttlePedalUpState = scalar, S32, 1320, "", 1, 0 -mightResetPid = bits, U32, 1324, [0:0] -shouldResetPid = bits, U32, 1324, [1:1] -wasResetPid = bits, U32, 1324, [2:2] -mustResetPid = bits, U32, 1324, [3:3] -isCranking = bits, U32, 1324, [4:4] -isIacTableForCoasting = bits, U32, 1324, [5:5] -notIdling = bits, U32, 1324, [6:6] -needReset = bits, U32, 1324, [7:7] -isInDeadZone = bits, U32, 1324, [8:8] -isBlipping = bits, U32, 1324, [9:9] -useClosedLoop = bits, U32, 1324, [10:10] -badTps = bits, U32, 1324, [11:11] -looksLikeRunning = bits, U32, 1324, [12:12] -looksLikeCoasting = bits, U32, 1324, [13:13] -looksLikeCrankToIdle = bits, U32, 1324, [14:14] -isIdleCoasting = bits, U32, 1324, [15:15] -isIdleClosedLoop = bits, U32, 1324, [16:16] -idleTarget = scalar, S32, 1328, "", 1, 0 -targetRpmByClt = scalar, S32, 1332, "", 1, 0 -targetRpmAc = scalar, S32, 1336, "", 1, 0 -iacByRpmTaper = scalar, F32, 1340 -luaAdd = scalar, F32, 1344 -; total TS size = 1348 -idlePosition0 = scalar, F32, 1348, "per", 1,0 -trim0 = scalar, F32, 1352, "", 1, 0 -luaAdjustment0 = scalar, F32, 1356, "per", 1,0 -m_wastegatePosition0 = scalar, F32, 1360, "per", 1,0 -etbFeedForward0 = scalar, F32, 1364 -etbIntegralError0 = scalar, F32, 1368, "", 1, 0 -etbCurrentTarget0 = scalar, F32, 1372, "%", 1, 0 -etbCurrentAdjustedTarget0 = scalar, F32, 1376, "%", 1, 0 -etbRevLimitActive0 = bits, U32, 1380, [0:0] -jamDetected0 = bits, U32, 1380, [1:1] -etbDutyRateOfChange0 = scalar, F32, 1384, "per", 1,0 -etbDutyAverage0 = scalar, F32, 1388, "per", 1,0 -etbTpsErrorCounter0 = scalar, U16, 1392, "count", 1,0 -etbPpsErrorCounter0 = scalar, U16, 1394, "count", 1,0 -etbErrorCode0 = scalar, S08, 1396, "", 1, 0 -jamTimer0 = scalar, U16, 1398, "sec", 0.01, 0 -; total TS size = 1400 -faultCode0 = scalar, U08, 1400, "", 1, 0 -heaterDuty0 = scalar, U08, 1401, "%", 1, 0 -pumpDuty0 = scalar, U08, 1402, "%", 1, 0 -tempC0 = scalar, U16, 1404, "C", 1, 0 -nernstVoltage0 = scalar, U16, 1406, "V", 0.001, 0 -esr0 = scalar, U16, 1408, "ohm", 1, 0 -; total TS size = 1412 -dcOutput0 = scalar, F32, 1412, "per", 1,0 -isEnabled0_int = scalar, U08, 1416, "per", 1,0 -isEnabled0 = bits, U32, 1420, [0:0] -; total TS size = 1424 -value0 = scalar, U16, 1424, "value", 1,0 -value1 = scalar, U16, 1426, "value", 1,0 -errorRate = scalar, F32, 1428, "ratio", 1,0 -; total TS size = 1432 -vvtTarget = scalar, U16, 1432, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1434, "%", 0.5, 0 +smartChipAliveCounter = scalar, S08, 1096, "", 1, 0 +startStopPhysicalState = bits, U32, 1100, [0:0] +acrStateDup = bits, U32, 1100, [1:1] +acrEngineMovedRecently = bits, U32, 1100, [2:2] +heaterControlEnabled = bits, U32, 1100, [3:3] +luaDigitalState0 = bits, U32, 1100, [4:4] +luaDigitalState1 = bits, U32, 1100, [5:5] +luaDigitalState2 = bits, U32, 1100, [6:6] +luaDigitalState3 = bits, U32, 1100, [7:7] +startStopStateToggleCounter = scalar, U32, 1104, "", 1, 0 +egtValue1 = scalar, F32, 1108, "", 1, 0 +egtValue2 = scalar, F32, 1112, "", 1, 0 +desiredRpmLimit = scalar, S16, 1116, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 1120, "", 1, 0 +sparkCounter = scalar, U32, 1124, "", 1, 0 +fuelingLoad = scalar, F32, 1128, "", 1, 0 +ignitionLoad = scalar, F32, 1132, "", 1, 0 +veTableYAxis = scalar, U16, 1136, "%", 0.01, 0 +; total TS size = 1140 +tpsFrom = scalar, F32, 1140 +tpsTo = scalar, F32, 1144 +deltaTps = scalar, F32, 1148 +extraFuel = scalar, F32, 1152, "", 1, 0 +valueFromTable = scalar, F32, 1156, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1160, [0:0] +isBelowDecelThreshold = bits, U32, 1160, [1:1] +isTimeToResetAccumulator = bits, U32, 1160, [2:2] +isFractionalEnrichment = bits, U32, 1160, [3:3] +belowEpsilon = bits, U32, 1160, [4:4] +tooShort = bits, U32, 1160, [5:5] +fractionalInjFuel = scalar, F32, 1164, "", 1, 0 +accumulatedValue = scalar, F32, 1168, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1172, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1176, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1180, "", 1, 0 +cycleCnt = scalar, S32, 1184, "", 1, 0 +; total TS size = 1188 +hwEventCounters1 = scalar, U32, 1188, "", 1, 0 +hwEventCounters2 = scalar, U32, 1192, "", 1, 0 +hwEventCounters3 = scalar, U32, 1196, "", 1, 0 +hwEventCounters4 = scalar, U32, 1200, "", 1, 0 +hwEventCounters5 = scalar, U32, 1204, "", 1, 0 +hwEventCounters6 = scalar, U32, 1208, "", 1, 0 +vvtCamCounter = scalar, U32, 1212, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1216, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1220, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1224, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1225, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1228, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1232, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1236, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1240, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1244, [0:0] +; total TS size = 1248 +crankSynchronizationCounter0 = scalar, U32, 1248, "", 1, 0 +vvtSyncGapRatio0 = scalar, F32, 1252, "", 1, 0 +vvtToothDurations00 = scalar, U32, 1256, "us", 1, 0 +vvtCurrentPosition0 = scalar, F32, 1260, "sync: Primary Cam Position", 1, 0 +vvtToothPosition10 = scalar, F32, 1264, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition20 = scalar, F32, 1268, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition30 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition40 = scalar, F32, 1276, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio0 = scalar, F32, 1280, "", 1, 0 +triggerStateIndex0 = scalar, U08, 1284, "", 1, 0 +vvtStateIndex0 = scalar, U08, 1285, "", 1, 0 +; total TS size = 1288 +camResyncCounter = scalar, U08, 1288, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1292, [0:0] +; total TS size = 1296 +wallFuelCorrection = scalar, F32, 1296, "", 1, 0 +wallFuel = scalar, F32, 1300, "", 1, 0 +; total TS size = 1304 +idleState = bits, S32, 1304, [0:2], "not important" +currentIdlePosition = scalar, F32, 1308 +baseIdlePosition = scalar, F32, 1312 +idleClosedLoop = scalar, F32, 1316 +iacByTpsTaper = scalar, F32, 1320 +throttlePedalUpState = scalar, S32, 1324, "", 1, 0 +mightResetPid = bits, U32, 1328, [0:0] +shouldResetPid = bits, U32, 1328, [1:1] +wasResetPid = bits, U32, 1328, [2:2] +mustResetPid = bits, U32, 1328, [3:3] +isCranking = bits, U32, 1328, [4:4] +isIacTableForCoasting = bits, U32, 1328, [5:5] +notIdling = bits, U32, 1328, [6:6] +needReset = bits, U32, 1328, [7:7] +isInDeadZone = bits, U32, 1328, [8:8] +isBlipping = bits, U32, 1328, [9:9] +useClosedLoop = bits, U32, 1328, [10:10] +badTps = bits, U32, 1328, [11:11] +looksLikeRunning = bits, U32, 1328, [12:12] +looksLikeCoasting = bits, U32, 1328, [13:13] +looksLikeCrankToIdle = bits, U32, 1328, [14:14] +isIdleCoasting = bits, U32, 1328, [15:15] +isIdleClosedLoop = bits, U32, 1328, [16:16] +idleTarget = scalar, S32, 1332, "", 1, 0 +targetRpmByClt = scalar, S32, 1336, "", 1, 0 +targetRpmAc = scalar, S32, 1340, "", 1, 0 +iacByRpmTaper = scalar, F32, 1344 +luaAdd = scalar, F32, 1348 +; total TS size = 1352 +idlePosition0 = scalar, F32, 1352, "per", 1,0 +trim0 = scalar, F32, 1356, "", 1, 0 +luaAdjustment0 = scalar, F32, 1360, "per", 1,0 +m_wastegatePosition0 = scalar, F32, 1364, "per", 1,0 +etbFeedForward0 = scalar, F32, 1368 +etbIntegralError0 = scalar, F32, 1372, "", 1, 0 +etbCurrentTarget0 = scalar, F32, 1376, "%", 1, 0 +etbCurrentAdjustedTarget0 = scalar, F32, 1380, "%", 1, 0 +etbRevLimitActive0 = bits, U32, 1384, [0:0] +jamDetected0 = bits, U32, 1384, [1:1] +etbDutyRateOfChange0 = scalar, F32, 1388, "per", 1,0 +etbDutyAverage0 = scalar, F32, 1392, "per", 1,0 +etbTpsErrorCounter0 = scalar, U16, 1396, "count", 1,0 +etbPpsErrorCounter0 = scalar, U16, 1398, "count", 1,0 +etbErrorCode0 = scalar, S08, 1400, "", 1, 0 +jamTimer0 = scalar, U16, 1402, "sec", 0.01, 0 +; total TS size = 1404 +faultCode0 = scalar, U08, 1404, "", 1, 0 +heaterDuty0 = scalar, U08, 1405, "%", 1, 0 +pumpDuty0 = scalar, U08, 1406, "%", 1, 0 +tempC0 = scalar, U16, 1408, "C", 1, 0 +nernstVoltage0 = scalar, U16, 1410, "V", 0.001, 0 +esr0 = scalar, U16, 1412, "ohm", 1, 0 +; total TS size = 1416 +dcOutput0 = scalar, F32, 1416, "per", 1,0 +isEnabled0_int = scalar, U08, 1420, "per", 1,0 +isEnabled0 = bits, U32, 1424, [0:0] +; total TS size = 1428 +value0 = scalar, U16, 1428, "value", 1,0 +value1 = scalar, U16, 1430, "value", 1,0 +errorRate = scalar, F32, 1432, "ratio", 1,0 ; total TS size = 1436 -lambdaCurrentlyGood = bits, U32, 1436, [0:0] -lambdaMonitorCut = bits, U32, 1436, [1:1] -lambdaTimeSinceGood = scalar, U16, 1440, "sec", 0.01, 0 -; total TS size = 1444 +vvtTarget = scalar, U16, 1436, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1438, "%", 0.5, 0 +; total TS size = 1440 +lambdaCurrentlyGood = bits, U32, 1440, [0:0] +lambdaMonitorCut = bits, U32, 1440, [1:1] +lambdaTimeSinceGood = scalar, U16, 1444, "sec", 0.01, 0 +; total TS size = 1448 time = { timeNow } @@ -5237,6 +5238,7 @@ entry = brakePedalState, "Brake switch", int, "%d" entry = startStopState, "startStopState", int, "%d" entry = smartChipState, "smartChipState", int, "%d" entry = smartChipRestartCounter, "smartChipRestartCounter", int, "%d" +entry = smartChipAliveCounter, "smartChipAliveCounter", int, "%d" entry = startStopPhysicalState, "startStopPhysicalState", int, "%d" entry = acrStateDup, "acrStateDup", int, "%d" entry = acrEngineMovedRecently, "acrEngineMovedRecently", int, "%d" @@ -6201,16 +6203,17 @@ dialog = engine_stateDialog, "engine_state" graphLine = smartChipState graphLine = smartChipRestartCounter liveGraph = engine_state_5_Graph, "Graph", South + graphLine = smartChipAliveCounter graphLine = startStopStateToggleCounter graphLine = egtValue1 graphLine = egtValue2 - graphLine = desiredRpmLimit liveGraph = engine_state_6_Graph, "Graph", South + graphLine = desiredRpmLimit graphLine = fuelInjectionCounter graphLine = sparkCounter graphLine = fuelingLoad - graphLine = ignitionLoad liveGraph = engine_state_7_Graph, "Graph", South + graphLine = ignitionLoad graphLine = veTableYAxis indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_hellen121vag.ini b/firmware/tunerstudio/generated/rusefi_hellen121vag.ini index 7ff0cff70a..6d9c2ce649 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen121vag.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen121vag.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.12.26.hellen121vag.2341535225" + signature = "rusEFI master.2023.12.26.hellen121vag.1135321883" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.12.26.hellen121vag.2341535225" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.12.26.hellen121vag.1135321883" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -92,7 +92,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","14 - O2","INVALID","INVALID","34 In PPS1","92 - TPS 1","106 - KNOCK","86 - CAM1","87 - CAM2","84 - TPS2","INVALID","29 In Maf","101 - MAP2","93 - CLT","85 - IAT","35 In PPS2" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Tue Dec 26 01:36:58 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Tue Dec 26 22:47:29 UTC 2023 pageSize = 22088 page = 1 @@ -2373,7 +2373,7 @@ lambdaMaxDeviationRpmBins = array, U16, 22078, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1444 + ochBlockSize = 1448 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3027,145 +3027,146 @@ brakePedalState = scalar, S08, 1092, "", 1, 0 startStopState = scalar, S08, 1093, "", 1, 0 smartChipState = scalar, S08, 1094, "", 1, 0 smartChipRestartCounter = scalar, S08, 1095, "", 1, 0 -startStopPhysicalState = bits, U32, 1096, [0:0] -acrStateDup = bits, U32, 1096, [1:1] -acrEngineMovedRecently = bits, U32, 1096, [2:2] -heaterControlEnabled = bits, U32, 1096, [3:3] -luaDigitalState0 = bits, U32, 1096, [4:4] -luaDigitalState1 = bits, U32, 1096, [5:5] -luaDigitalState2 = bits, U32, 1096, [6:6] -luaDigitalState3 = bits, U32, 1096, [7:7] -startStopStateToggleCounter = scalar, U32, 1100, "", 1, 0 -egtValue1 = scalar, F32, 1104, "", 1, 0 -egtValue2 = scalar, F32, 1108, "", 1, 0 -desiredRpmLimit = scalar, S16, 1112, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1116, "", 1, 0 -sparkCounter = scalar, U32, 1120, "", 1, 0 -fuelingLoad = scalar, F32, 1124, "", 1, 0 -ignitionLoad = scalar, F32, 1128, "", 1, 0 -veTableYAxis = scalar, U16, 1132, "%", 0.01, 0 -; total TS size = 1136 -tpsFrom = scalar, F32, 1136 -tpsTo = scalar, F32, 1140 -deltaTps = scalar, F32, 1144 -extraFuel = scalar, F32, 1148, "", 1, 0 -valueFromTable = scalar, F32, 1152, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1156, [0:0] -isBelowDecelThreshold = bits, U32, 1156, [1:1] -isTimeToResetAccumulator = bits, U32, 1156, [2:2] -isFractionalEnrichment = bits, U32, 1156, [3:3] -belowEpsilon = bits, U32, 1156, [4:4] -tooShort = bits, U32, 1156, [5:5] -fractionalInjFuel = scalar, F32, 1160, "", 1, 0 -accumulatedValue = scalar, F32, 1164, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1168, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1172, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1176, "", 1, 0 -cycleCnt = scalar, S32, 1180, "", 1, 0 -; total TS size = 1184 -hwEventCounters1 = scalar, U32, 1184, "", 1, 0 -hwEventCounters2 = scalar, U32, 1188, "", 1, 0 -hwEventCounters3 = scalar, U32, 1192, "", 1, 0 -hwEventCounters4 = scalar, U32, 1196, "", 1, 0 -hwEventCounters5 = scalar, U32, 1200, "", 1, 0 -hwEventCounters6 = scalar, U32, 1204, "", 1, 0 -vvtCamCounter = scalar, U32, 1208, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1212, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1216, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1220, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1221, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1224, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1228, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1232, "", 1, 0 -mapCamPrevToothAngle = scalar, F32, 1236, "deg", 1, 0 -isDecodingMapCam = bits, U32, 1240, [0:0] -; total TS size = 1244 -crankSynchronizationCounter0 = scalar, U32, 1244, "", 1, 0 -vvtSyncGapRatio0 = scalar, F32, 1248, "", 1, 0 -vvtToothDurations00 = scalar, U32, 1252, "us", 1, 0 -vvtCurrentPosition0 = scalar, F32, 1256, "sync: Primary Cam Position", 1, 0 -vvtToothPosition10 = scalar, F32, 1260, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition20 = scalar, F32, 1264, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition30 = scalar, F32, 1268, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition40 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio0 = scalar, F32, 1276, "", 1, 0 -triggerStateIndex0 = scalar, U08, 1280, "", 1, 0 -vvtStateIndex0 = scalar, U08, 1281, "", 1, 0 -; total TS size = 1284 -camResyncCounter = scalar, U08, 1284, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1288, [0:0] -; total TS size = 1292 -wallFuelCorrection = scalar, F32, 1292, "", 1, 0 -wallFuel = scalar, F32, 1296, "", 1, 0 -; total TS size = 1300 -idleState = bits, S32, 1300, [0:2], "not important" -currentIdlePosition = scalar, F32, 1304 -baseIdlePosition = scalar, F32, 1308 -idleClosedLoop = scalar, F32, 1312 -iacByTpsTaper = scalar, F32, 1316 -throttlePedalUpState = scalar, S32, 1320, "", 1, 0 -mightResetPid = bits, U32, 1324, [0:0] -shouldResetPid = bits, U32, 1324, [1:1] -wasResetPid = bits, U32, 1324, [2:2] -mustResetPid = bits, U32, 1324, [3:3] -isCranking = bits, U32, 1324, [4:4] -isIacTableForCoasting = bits, U32, 1324, [5:5] -notIdling = bits, U32, 1324, [6:6] -needReset = bits, U32, 1324, [7:7] -isInDeadZone = bits, U32, 1324, [8:8] -isBlipping = bits, U32, 1324, [9:9] -useClosedLoop = bits, U32, 1324, [10:10] -badTps = bits, U32, 1324, [11:11] -looksLikeRunning = bits, U32, 1324, [12:12] -looksLikeCoasting = bits, U32, 1324, [13:13] -looksLikeCrankToIdle = bits, U32, 1324, [14:14] -isIdleCoasting = bits, U32, 1324, [15:15] -isIdleClosedLoop = bits, U32, 1324, [16:16] -idleTarget = scalar, S32, 1328, "", 1, 0 -targetRpmByClt = scalar, S32, 1332, "", 1, 0 -targetRpmAc = scalar, S32, 1336, "", 1, 0 -iacByRpmTaper = scalar, F32, 1340 -luaAdd = scalar, F32, 1344 -; total TS size = 1348 -idlePosition0 = scalar, F32, 1348, "per", 1,0 -trim0 = scalar, F32, 1352, "", 1, 0 -luaAdjustment0 = scalar, F32, 1356, "per", 1,0 -m_wastegatePosition0 = scalar, F32, 1360, "per", 1,0 -etbFeedForward0 = scalar, F32, 1364 -etbIntegralError0 = scalar, F32, 1368, "", 1, 0 -etbCurrentTarget0 = scalar, F32, 1372, "%", 1, 0 -etbCurrentAdjustedTarget0 = scalar, F32, 1376, "%", 1, 0 -etbRevLimitActive0 = bits, U32, 1380, [0:0] -jamDetected0 = bits, U32, 1380, [1:1] -etbDutyRateOfChange0 = scalar, F32, 1384, "per", 1,0 -etbDutyAverage0 = scalar, F32, 1388, "per", 1,0 -etbTpsErrorCounter0 = scalar, U16, 1392, "count", 1,0 -etbPpsErrorCounter0 = scalar, U16, 1394, "count", 1,0 -etbErrorCode0 = scalar, S08, 1396, "", 1, 0 -jamTimer0 = scalar, U16, 1398, "sec", 0.01, 0 -; total TS size = 1400 -faultCode0 = scalar, U08, 1400, "", 1, 0 -heaterDuty0 = scalar, U08, 1401, "%", 1, 0 -pumpDuty0 = scalar, U08, 1402, "%", 1, 0 -tempC0 = scalar, U16, 1404, "C", 1, 0 -nernstVoltage0 = scalar, U16, 1406, "V", 0.001, 0 -esr0 = scalar, U16, 1408, "ohm", 1, 0 -; total TS size = 1412 -dcOutput0 = scalar, F32, 1412, "per", 1,0 -isEnabled0_int = scalar, U08, 1416, "per", 1,0 -isEnabled0 = bits, U32, 1420, [0:0] -; total TS size = 1424 -value0 = scalar, U16, 1424, "value", 1,0 -value1 = scalar, U16, 1426, "value", 1,0 -errorRate = scalar, F32, 1428, "ratio", 1,0 -; total TS size = 1432 -vvtTarget = scalar, U16, 1432, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1434, "%", 0.5, 0 +smartChipAliveCounter = scalar, S08, 1096, "", 1, 0 +startStopPhysicalState = bits, U32, 1100, [0:0] +acrStateDup = bits, U32, 1100, [1:1] +acrEngineMovedRecently = bits, U32, 1100, [2:2] +heaterControlEnabled = bits, U32, 1100, [3:3] +luaDigitalState0 = bits, U32, 1100, [4:4] +luaDigitalState1 = bits, U32, 1100, [5:5] +luaDigitalState2 = bits, U32, 1100, [6:6] +luaDigitalState3 = bits, U32, 1100, [7:7] +startStopStateToggleCounter = scalar, U32, 1104, "", 1, 0 +egtValue1 = scalar, F32, 1108, "", 1, 0 +egtValue2 = scalar, F32, 1112, "", 1, 0 +desiredRpmLimit = scalar, S16, 1116, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 1120, "", 1, 0 +sparkCounter = scalar, U32, 1124, "", 1, 0 +fuelingLoad = scalar, F32, 1128, "", 1, 0 +ignitionLoad = scalar, F32, 1132, "", 1, 0 +veTableYAxis = scalar, U16, 1136, "%", 0.01, 0 +; total TS size = 1140 +tpsFrom = scalar, F32, 1140 +tpsTo = scalar, F32, 1144 +deltaTps = scalar, F32, 1148 +extraFuel = scalar, F32, 1152, "", 1, 0 +valueFromTable = scalar, F32, 1156, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1160, [0:0] +isBelowDecelThreshold = bits, U32, 1160, [1:1] +isTimeToResetAccumulator = bits, U32, 1160, [2:2] +isFractionalEnrichment = bits, U32, 1160, [3:3] +belowEpsilon = bits, U32, 1160, [4:4] +tooShort = bits, U32, 1160, [5:5] +fractionalInjFuel = scalar, F32, 1164, "", 1, 0 +accumulatedValue = scalar, F32, 1168, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1172, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1176, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1180, "", 1, 0 +cycleCnt = scalar, S32, 1184, "", 1, 0 +; total TS size = 1188 +hwEventCounters1 = scalar, U32, 1188, "", 1, 0 +hwEventCounters2 = scalar, U32, 1192, "", 1, 0 +hwEventCounters3 = scalar, U32, 1196, "", 1, 0 +hwEventCounters4 = scalar, U32, 1200, "", 1, 0 +hwEventCounters5 = scalar, U32, 1204, "", 1, 0 +hwEventCounters6 = scalar, U32, 1208, "", 1, 0 +vvtCamCounter = scalar, U32, 1212, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1216, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1220, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1224, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1225, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1228, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1232, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1236, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1240, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1244, [0:0] +; total TS size = 1248 +crankSynchronizationCounter0 = scalar, U32, 1248, "", 1, 0 +vvtSyncGapRatio0 = scalar, F32, 1252, "", 1, 0 +vvtToothDurations00 = scalar, U32, 1256, "us", 1, 0 +vvtCurrentPosition0 = scalar, F32, 1260, "sync: Primary Cam Position", 1, 0 +vvtToothPosition10 = scalar, F32, 1264, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition20 = scalar, F32, 1268, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition30 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition40 = scalar, F32, 1276, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio0 = scalar, F32, 1280, "", 1, 0 +triggerStateIndex0 = scalar, U08, 1284, "", 1, 0 +vvtStateIndex0 = scalar, U08, 1285, "", 1, 0 +; total TS size = 1288 +camResyncCounter = scalar, U08, 1288, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1292, [0:0] +; total TS size = 1296 +wallFuelCorrection = scalar, F32, 1296, "", 1, 0 +wallFuel = scalar, F32, 1300, "", 1, 0 +; total TS size = 1304 +idleState = bits, S32, 1304, [0:2], "not important" +currentIdlePosition = scalar, F32, 1308 +baseIdlePosition = scalar, F32, 1312 +idleClosedLoop = scalar, F32, 1316 +iacByTpsTaper = scalar, F32, 1320 +throttlePedalUpState = scalar, S32, 1324, "", 1, 0 +mightResetPid = bits, U32, 1328, [0:0] +shouldResetPid = bits, U32, 1328, [1:1] +wasResetPid = bits, U32, 1328, [2:2] +mustResetPid = bits, U32, 1328, [3:3] +isCranking = bits, U32, 1328, [4:4] +isIacTableForCoasting = bits, U32, 1328, [5:5] +notIdling = bits, U32, 1328, [6:6] +needReset = bits, U32, 1328, [7:7] +isInDeadZone = bits, U32, 1328, [8:8] +isBlipping = bits, U32, 1328, [9:9] +useClosedLoop = bits, U32, 1328, [10:10] +badTps = bits, U32, 1328, [11:11] +looksLikeRunning = bits, U32, 1328, [12:12] +looksLikeCoasting = bits, U32, 1328, [13:13] +looksLikeCrankToIdle = bits, U32, 1328, [14:14] +isIdleCoasting = bits, U32, 1328, [15:15] +isIdleClosedLoop = bits, U32, 1328, [16:16] +idleTarget = scalar, S32, 1332, "", 1, 0 +targetRpmByClt = scalar, S32, 1336, "", 1, 0 +targetRpmAc = scalar, S32, 1340, "", 1, 0 +iacByRpmTaper = scalar, F32, 1344 +luaAdd = scalar, F32, 1348 +; total TS size = 1352 +idlePosition0 = scalar, F32, 1352, "per", 1,0 +trim0 = scalar, F32, 1356, "", 1, 0 +luaAdjustment0 = scalar, F32, 1360, "per", 1,0 +m_wastegatePosition0 = scalar, F32, 1364, "per", 1,0 +etbFeedForward0 = scalar, F32, 1368 +etbIntegralError0 = scalar, F32, 1372, "", 1, 0 +etbCurrentTarget0 = scalar, F32, 1376, "%", 1, 0 +etbCurrentAdjustedTarget0 = scalar, F32, 1380, "%", 1, 0 +etbRevLimitActive0 = bits, U32, 1384, [0:0] +jamDetected0 = bits, U32, 1384, [1:1] +etbDutyRateOfChange0 = scalar, F32, 1388, "per", 1,0 +etbDutyAverage0 = scalar, F32, 1392, "per", 1,0 +etbTpsErrorCounter0 = scalar, U16, 1396, "count", 1,0 +etbPpsErrorCounter0 = scalar, U16, 1398, "count", 1,0 +etbErrorCode0 = scalar, S08, 1400, "", 1, 0 +jamTimer0 = scalar, U16, 1402, "sec", 0.01, 0 +; total TS size = 1404 +faultCode0 = scalar, U08, 1404, "", 1, 0 +heaterDuty0 = scalar, U08, 1405, "%", 1, 0 +pumpDuty0 = scalar, U08, 1406, "%", 1, 0 +tempC0 = scalar, U16, 1408, "C", 1, 0 +nernstVoltage0 = scalar, U16, 1410, "V", 0.001, 0 +esr0 = scalar, U16, 1412, "ohm", 1, 0 +; total TS size = 1416 +dcOutput0 = scalar, F32, 1416, "per", 1,0 +isEnabled0_int = scalar, U08, 1420, "per", 1,0 +isEnabled0 = bits, U32, 1424, [0:0] +; total TS size = 1428 +value0 = scalar, U16, 1428, "value", 1,0 +value1 = scalar, U16, 1430, "value", 1,0 +errorRate = scalar, F32, 1432, "ratio", 1,0 ; total TS size = 1436 -lambdaCurrentlyGood = bits, U32, 1436, [0:0] -lambdaMonitorCut = bits, U32, 1436, [1:1] -lambdaTimeSinceGood = scalar, U16, 1440, "sec", 0.01, 0 -; total TS size = 1444 +vvtTarget = scalar, U16, 1436, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1438, "%", 0.5, 0 +; total TS size = 1440 +lambdaCurrentlyGood = bits, U32, 1440, [0:0] +lambdaMonitorCut = bits, U32, 1440, [1:1] +lambdaTimeSinceGood = scalar, U16, 1444, "sec", 0.01, 0 +; total TS size = 1448 time = { timeNow } @@ -5237,6 +5238,7 @@ entry = brakePedalState, "Brake switch", int, "%d" entry = startStopState, "startStopState", int, "%d" entry = smartChipState, "smartChipState", int, "%d" entry = smartChipRestartCounter, "smartChipRestartCounter", int, "%d" +entry = smartChipAliveCounter, "smartChipAliveCounter", int, "%d" entry = startStopPhysicalState, "startStopPhysicalState", int, "%d" entry = acrStateDup, "acrStateDup", int, "%d" entry = acrEngineMovedRecently, "acrEngineMovedRecently", int, "%d" @@ -6203,16 +6205,17 @@ dialog = engine_stateDialog, "engine_state" graphLine = smartChipState graphLine = smartChipRestartCounter liveGraph = engine_state_5_Graph, "Graph", South + graphLine = smartChipAliveCounter graphLine = startStopStateToggleCounter graphLine = egtValue1 graphLine = egtValue2 - graphLine = desiredRpmLimit liveGraph = engine_state_6_Graph, "Graph", South + graphLine = desiredRpmLimit graphLine = fuelInjectionCounter graphLine = sparkCounter graphLine = fuelingLoad - graphLine = ignitionLoad liveGraph = engine_state_7_Graph, "Graph", South + graphLine = ignitionLoad graphLine = veTableYAxis indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_hellen128.ini b/firmware/tunerstudio/generated/rusefi_hellen128.ini index 6a67f2074c..9e767e211c 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen128.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen128.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.12.26.hellen128.883074003" + signature = "rusEFI master.2023.12.26.hellen128.4237950257" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.12.26.hellen128.883074003" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.12.26.hellen128.4237950257" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -92,7 +92,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","P36_IN_O2S","P32_IN_O2S2","P40_IN_MAP3","C24 - PPS1","E31 - TPS1","Battery Sense","E40 - IN_CAM","P30_IN_AUX4","E34 - TPS2","E37 - Crank Input","E47 - MAF","E23 - MAP","E29 - Coolant Temp","E45 - IAT","C25 - PPS2","P41_IN_AUX3" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Tue Dec 26 01:36:55 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Tue Dec 26 22:47:26 UTC 2023 pageSize = 22088 page = 1 @@ -2373,7 +2373,7 @@ lambdaMaxDeviationRpmBins = array, U16, 22078, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1444 + ochBlockSize = 1448 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3027,145 +3027,146 @@ brakePedalState = scalar, S08, 1092, "", 1, 0 startStopState = scalar, S08, 1093, "", 1, 0 smartChipState = scalar, S08, 1094, "", 1, 0 smartChipRestartCounter = scalar, S08, 1095, "", 1, 0 -startStopPhysicalState = bits, U32, 1096, [0:0] -acrStateDup = bits, U32, 1096, [1:1] -acrEngineMovedRecently = bits, U32, 1096, [2:2] -heaterControlEnabled = bits, U32, 1096, [3:3] -luaDigitalState0 = bits, U32, 1096, [4:4] -luaDigitalState1 = bits, U32, 1096, [5:5] -luaDigitalState2 = bits, U32, 1096, [6:6] -luaDigitalState3 = bits, U32, 1096, [7:7] -startStopStateToggleCounter = scalar, U32, 1100, "", 1, 0 -egtValue1 = scalar, F32, 1104, "", 1, 0 -egtValue2 = scalar, F32, 1108, "", 1, 0 -desiredRpmLimit = scalar, S16, 1112, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1116, "", 1, 0 -sparkCounter = scalar, U32, 1120, "", 1, 0 -fuelingLoad = scalar, F32, 1124, "", 1, 0 -ignitionLoad = scalar, F32, 1128, "", 1, 0 -veTableYAxis = scalar, U16, 1132, "%", 0.01, 0 -; total TS size = 1136 -tpsFrom = scalar, F32, 1136 -tpsTo = scalar, F32, 1140 -deltaTps = scalar, F32, 1144 -extraFuel = scalar, F32, 1148, "", 1, 0 -valueFromTable = scalar, F32, 1152, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1156, [0:0] -isBelowDecelThreshold = bits, U32, 1156, [1:1] -isTimeToResetAccumulator = bits, U32, 1156, [2:2] -isFractionalEnrichment = bits, U32, 1156, [3:3] -belowEpsilon = bits, U32, 1156, [4:4] -tooShort = bits, U32, 1156, [5:5] -fractionalInjFuel = scalar, F32, 1160, "", 1, 0 -accumulatedValue = scalar, F32, 1164, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1168, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1172, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1176, "", 1, 0 -cycleCnt = scalar, S32, 1180, "", 1, 0 -; total TS size = 1184 -hwEventCounters1 = scalar, U32, 1184, "", 1, 0 -hwEventCounters2 = scalar, U32, 1188, "", 1, 0 -hwEventCounters3 = scalar, U32, 1192, "", 1, 0 -hwEventCounters4 = scalar, U32, 1196, "", 1, 0 -hwEventCounters5 = scalar, U32, 1200, "", 1, 0 -hwEventCounters6 = scalar, U32, 1204, "", 1, 0 -vvtCamCounter = scalar, U32, 1208, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1212, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1216, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1220, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1221, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1224, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1228, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1232, "", 1, 0 -mapCamPrevToothAngle = scalar, F32, 1236, "deg", 1, 0 -isDecodingMapCam = bits, U32, 1240, [0:0] -; total TS size = 1244 -crankSynchronizationCounter0 = scalar, U32, 1244, "", 1, 0 -vvtSyncGapRatio0 = scalar, F32, 1248, "", 1, 0 -vvtToothDurations00 = scalar, U32, 1252, "us", 1, 0 -vvtCurrentPosition0 = scalar, F32, 1256, "sync: Primary Cam Position", 1, 0 -vvtToothPosition10 = scalar, F32, 1260, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition20 = scalar, F32, 1264, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition30 = scalar, F32, 1268, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition40 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio0 = scalar, F32, 1276, "", 1, 0 -triggerStateIndex0 = scalar, U08, 1280, "", 1, 0 -vvtStateIndex0 = scalar, U08, 1281, "", 1, 0 -; total TS size = 1284 -camResyncCounter = scalar, U08, 1284, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1288, [0:0] -; total TS size = 1292 -wallFuelCorrection = scalar, F32, 1292, "", 1, 0 -wallFuel = scalar, F32, 1296, "", 1, 0 -; total TS size = 1300 -idleState = bits, S32, 1300, [0:2], "not important" -currentIdlePosition = scalar, F32, 1304 -baseIdlePosition = scalar, F32, 1308 -idleClosedLoop = scalar, F32, 1312 -iacByTpsTaper = scalar, F32, 1316 -throttlePedalUpState = scalar, S32, 1320, "", 1, 0 -mightResetPid = bits, U32, 1324, [0:0] -shouldResetPid = bits, U32, 1324, [1:1] -wasResetPid = bits, U32, 1324, [2:2] -mustResetPid = bits, U32, 1324, [3:3] -isCranking = bits, U32, 1324, [4:4] -isIacTableForCoasting = bits, U32, 1324, [5:5] -notIdling = bits, U32, 1324, [6:6] -needReset = bits, U32, 1324, [7:7] -isInDeadZone = bits, U32, 1324, [8:8] -isBlipping = bits, U32, 1324, [9:9] -useClosedLoop = bits, U32, 1324, [10:10] -badTps = bits, U32, 1324, [11:11] -looksLikeRunning = bits, U32, 1324, [12:12] -looksLikeCoasting = bits, U32, 1324, [13:13] -looksLikeCrankToIdle = bits, U32, 1324, [14:14] -isIdleCoasting = bits, U32, 1324, [15:15] -isIdleClosedLoop = bits, U32, 1324, [16:16] -idleTarget = scalar, S32, 1328, "", 1, 0 -targetRpmByClt = scalar, S32, 1332, "", 1, 0 -targetRpmAc = scalar, S32, 1336, "", 1, 0 -iacByRpmTaper = scalar, F32, 1340 -luaAdd = scalar, F32, 1344 -; total TS size = 1348 -idlePosition0 = scalar, F32, 1348, "per", 1,0 -trim0 = scalar, F32, 1352, "", 1, 0 -luaAdjustment0 = scalar, F32, 1356, "per", 1,0 -m_wastegatePosition0 = scalar, F32, 1360, "per", 1,0 -etbFeedForward0 = scalar, F32, 1364 -etbIntegralError0 = scalar, F32, 1368, "", 1, 0 -etbCurrentTarget0 = scalar, F32, 1372, "%", 1, 0 -etbCurrentAdjustedTarget0 = scalar, F32, 1376, "%", 1, 0 -etbRevLimitActive0 = bits, U32, 1380, [0:0] -jamDetected0 = bits, U32, 1380, [1:1] -etbDutyRateOfChange0 = scalar, F32, 1384, "per", 1,0 -etbDutyAverage0 = scalar, F32, 1388, "per", 1,0 -etbTpsErrorCounter0 = scalar, U16, 1392, "count", 1,0 -etbPpsErrorCounter0 = scalar, U16, 1394, "count", 1,0 -etbErrorCode0 = scalar, S08, 1396, "", 1, 0 -jamTimer0 = scalar, U16, 1398, "sec", 0.01, 0 -; total TS size = 1400 -faultCode0 = scalar, U08, 1400, "", 1, 0 -heaterDuty0 = scalar, U08, 1401, "%", 1, 0 -pumpDuty0 = scalar, U08, 1402, "%", 1, 0 -tempC0 = scalar, U16, 1404, "C", 1, 0 -nernstVoltage0 = scalar, U16, 1406, "V", 0.001, 0 -esr0 = scalar, U16, 1408, "ohm", 1, 0 -; total TS size = 1412 -dcOutput0 = scalar, F32, 1412, "per", 1,0 -isEnabled0_int = scalar, U08, 1416, "per", 1,0 -isEnabled0 = bits, U32, 1420, [0:0] -; total TS size = 1424 -value0 = scalar, U16, 1424, "value", 1,0 -value1 = scalar, U16, 1426, "value", 1,0 -errorRate = scalar, F32, 1428, "ratio", 1,0 -; total TS size = 1432 -vvtTarget = scalar, U16, 1432, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1434, "%", 0.5, 0 +smartChipAliveCounter = scalar, S08, 1096, "", 1, 0 +startStopPhysicalState = bits, U32, 1100, [0:0] +acrStateDup = bits, U32, 1100, [1:1] +acrEngineMovedRecently = bits, U32, 1100, [2:2] +heaterControlEnabled = bits, U32, 1100, [3:3] +luaDigitalState0 = bits, U32, 1100, [4:4] +luaDigitalState1 = bits, U32, 1100, [5:5] +luaDigitalState2 = bits, U32, 1100, [6:6] +luaDigitalState3 = bits, U32, 1100, [7:7] +startStopStateToggleCounter = scalar, U32, 1104, "", 1, 0 +egtValue1 = scalar, F32, 1108, "", 1, 0 +egtValue2 = scalar, F32, 1112, "", 1, 0 +desiredRpmLimit = scalar, S16, 1116, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 1120, "", 1, 0 +sparkCounter = scalar, U32, 1124, "", 1, 0 +fuelingLoad = scalar, F32, 1128, "", 1, 0 +ignitionLoad = scalar, F32, 1132, "", 1, 0 +veTableYAxis = scalar, U16, 1136, "%", 0.01, 0 +; total TS size = 1140 +tpsFrom = scalar, F32, 1140 +tpsTo = scalar, F32, 1144 +deltaTps = scalar, F32, 1148 +extraFuel = scalar, F32, 1152, "", 1, 0 +valueFromTable = scalar, F32, 1156, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1160, [0:0] +isBelowDecelThreshold = bits, U32, 1160, [1:1] +isTimeToResetAccumulator = bits, U32, 1160, [2:2] +isFractionalEnrichment = bits, U32, 1160, [3:3] +belowEpsilon = bits, U32, 1160, [4:4] +tooShort = bits, U32, 1160, [5:5] +fractionalInjFuel = scalar, F32, 1164, "", 1, 0 +accumulatedValue = scalar, F32, 1168, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1172, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1176, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1180, "", 1, 0 +cycleCnt = scalar, S32, 1184, "", 1, 0 +; total TS size = 1188 +hwEventCounters1 = scalar, U32, 1188, "", 1, 0 +hwEventCounters2 = scalar, U32, 1192, "", 1, 0 +hwEventCounters3 = scalar, U32, 1196, "", 1, 0 +hwEventCounters4 = scalar, U32, 1200, "", 1, 0 +hwEventCounters5 = scalar, U32, 1204, "", 1, 0 +hwEventCounters6 = scalar, U32, 1208, "", 1, 0 +vvtCamCounter = scalar, U32, 1212, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1216, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1220, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1224, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1225, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1228, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1232, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1236, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1240, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1244, [0:0] +; total TS size = 1248 +crankSynchronizationCounter0 = scalar, U32, 1248, "", 1, 0 +vvtSyncGapRatio0 = scalar, F32, 1252, "", 1, 0 +vvtToothDurations00 = scalar, U32, 1256, "us", 1, 0 +vvtCurrentPosition0 = scalar, F32, 1260, "sync: Primary Cam Position", 1, 0 +vvtToothPosition10 = scalar, F32, 1264, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition20 = scalar, F32, 1268, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition30 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition40 = scalar, F32, 1276, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio0 = scalar, F32, 1280, "", 1, 0 +triggerStateIndex0 = scalar, U08, 1284, "", 1, 0 +vvtStateIndex0 = scalar, U08, 1285, "", 1, 0 +; total TS size = 1288 +camResyncCounter = scalar, U08, 1288, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1292, [0:0] +; total TS size = 1296 +wallFuelCorrection = scalar, F32, 1296, "", 1, 0 +wallFuel = scalar, F32, 1300, "", 1, 0 +; total TS size = 1304 +idleState = bits, S32, 1304, [0:2], "not important" +currentIdlePosition = scalar, F32, 1308 +baseIdlePosition = scalar, F32, 1312 +idleClosedLoop = scalar, F32, 1316 +iacByTpsTaper = scalar, F32, 1320 +throttlePedalUpState = scalar, S32, 1324, "", 1, 0 +mightResetPid = bits, U32, 1328, [0:0] +shouldResetPid = bits, U32, 1328, [1:1] +wasResetPid = bits, U32, 1328, [2:2] +mustResetPid = bits, U32, 1328, [3:3] +isCranking = bits, U32, 1328, [4:4] +isIacTableForCoasting = bits, U32, 1328, [5:5] +notIdling = bits, U32, 1328, [6:6] +needReset = bits, U32, 1328, [7:7] +isInDeadZone = bits, U32, 1328, [8:8] +isBlipping = bits, U32, 1328, [9:9] +useClosedLoop = bits, U32, 1328, [10:10] +badTps = bits, U32, 1328, [11:11] +looksLikeRunning = bits, U32, 1328, [12:12] +looksLikeCoasting = bits, U32, 1328, [13:13] +looksLikeCrankToIdle = bits, U32, 1328, [14:14] +isIdleCoasting = bits, U32, 1328, [15:15] +isIdleClosedLoop = bits, U32, 1328, [16:16] +idleTarget = scalar, S32, 1332, "", 1, 0 +targetRpmByClt = scalar, S32, 1336, "", 1, 0 +targetRpmAc = scalar, S32, 1340, "", 1, 0 +iacByRpmTaper = scalar, F32, 1344 +luaAdd = scalar, F32, 1348 +; total TS size = 1352 +idlePosition0 = scalar, F32, 1352, "per", 1,0 +trim0 = scalar, F32, 1356, "", 1, 0 +luaAdjustment0 = scalar, F32, 1360, "per", 1,0 +m_wastegatePosition0 = scalar, F32, 1364, "per", 1,0 +etbFeedForward0 = scalar, F32, 1368 +etbIntegralError0 = scalar, F32, 1372, "", 1, 0 +etbCurrentTarget0 = scalar, F32, 1376, "%", 1, 0 +etbCurrentAdjustedTarget0 = scalar, F32, 1380, "%", 1, 0 +etbRevLimitActive0 = bits, U32, 1384, [0:0] +jamDetected0 = bits, U32, 1384, [1:1] +etbDutyRateOfChange0 = scalar, F32, 1388, "per", 1,0 +etbDutyAverage0 = scalar, F32, 1392, "per", 1,0 +etbTpsErrorCounter0 = scalar, U16, 1396, "count", 1,0 +etbPpsErrorCounter0 = scalar, U16, 1398, "count", 1,0 +etbErrorCode0 = scalar, S08, 1400, "", 1, 0 +jamTimer0 = scalar, U16, 1402, "sec", 0.01, 0 +; total TS size = 1404 +faultCode0 = scalar, U08, 1404, "", 1, 0 +heaterDuty0 = scalar, U08, 1405, "%", 1, 0 +pumpDuty0 = scalar, U08, 1406, "%", 1, 0 +tempC0 = scalar, U16, 1408, "C", 1, 0 +nernstVoltage0 = scalar, U16, 1410, "V", 0.001, 0 +esr0 = scalar, U16, 1412, "ohm", 1, 0 +; total TS size = 1416 +dcOutput0 = scalar, F32, 1416, "per", 1,0 +isEnabled0_int = scalar, U08, 1420, "per", 1,0 +isEnabled0 = bits, U32, 1424, [0:0] +; total TS size = 1428 +value0 = scalar, U16, 1428, "value", 1,0 +value1 = scalar, U16, 1430, "value", 1,0 +errorRate = scalar, F32, 1432, "ratio", 1,0 ; total TS size = 1436 -lambdaCurrentlyGood = bits, U32, 1436, [0:0] -lambdaMonitorCut = bits, U32, 1436, [1:1] -lambdaTimeSinceGood = scalar, U16, 1440, "sec", 0.01, 0 -; total TS size = 1444 +vvtTarget = scalar, U16, 1436, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1438, "%", 0.5, 0 +; total TS size = 1440 +lambdaCurrentlyGood = bits, U32, 1440, [0:0] +lambdaMonitorCut = bits, U32, 1440, [1:1] +lambdaTimeSinceGood = scalar, U16, 1444, "sec", 0.01, 0 +; total TS size = 1448 time = { timeNow } @@ -5237,6 +5238,7 @@ entry = brakePedalState, "Brake switch", int, "%d" entry = startStopState, "startStopState", int, "%d" entry = smartChipState, "smartChipState", int, "%d" entry = smartChipRestartCounter, "smartChipRestartCounter", int, "%d" +entry = smartChipAliveCounter, "smartChipAliveCounter", int, "%d" entry = startStopPhysicalState, "startStopPhysicalState", int, "%d" entry = acrStateDup, "acrStateDup", int, "%d" entry = acrEngineMovedRecently, "acrEngineMovedRecently", int, "%d" @@ -6203,16 +6205,17 @@ dialog = engine_stateDialog, "engine_state" graphLine = smartChipState graphLine = smartChipRestartCounter liveGraph = engine_state_5_Graph, "Graph", South + graphLine = smartChipAliveCounter graphLine = startStopStateToggleCounter graphLine = egtValue1 graphLine = egtValue2 - graphLine = desiredRpmLimit liveGraph = engine_state_6_Graph, "Graph", South + graphLine = desiredRpmLimit graphLine = fuelInjectionCounter graphLine = sparkCounter graphLine = fuelingLoad - graphLine = ignitionLoad liveGraph = engine_state_7_Graph, "Graph", South + graphLine = ignitionLoad graphLine = veTableYAxis indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini b/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini index 1ed080fc09..9f99a12b66 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.12.26.hellen154hyundai.3386060805" + signature = "rusEFI master.2023.12.26.hellen154hyundai.32009959" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.12.26.hellen154hyundai.3386060805" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.12.26.hellen154hyundai.32009959" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -92,7 +92,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","K21 Ambient Temperature","K58 Oil Temp","K54 A/C pressure","PPS 1","TPS 1","K2 Ignition Key Voltage","X10 AIN2","INVALID","TPS 2","X11 AIN1","Map Sensor K31","K10 Sensor","CLT","IAT","PPS 2" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Tue Dec 26 01:37:06 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Tue Dec 26 22:47:37 UTC 2023 pageSize = 22088 page = 1 @@ -2373,7 +2373,7 @@ lambdaMaxDeviationRpmBins = array, U16, 22078, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1444 + ochBlockSize = 1448 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3027,145 +3027,146 @@ brakePedalState = scalar, S08, 1092, "", 1, 0 startStopState = scalar, S08, 1093, "", 1, 0 smartChipState = scalar, S08, 1094, "", 1, 0 smartChipRestartCounter = scalar, S08, 1095, "", 1, 0 -startStopPhysicalState = bits, U32, 1096, [0:0] -acrStateDup = bits, U32, 1096, [1:1] -acrEngineMovedRecently = bits, U32, 1096, [2:2] -heaterControlEnabled = bits, U32, 1096, [3:3] -luaDigitalState0 = bits, U32, 1096, [4:4] -luaDigitalState1 = bits, U32, 1096, [5:5] -luaDigitalState2 = bits, U32, 1096, [6:6] -luaDigitalState3 = bits, U32, 1096, [7:7] -startStopStateToggleCounter = scalar, U32, 1100, "", 1, 0 -egtValue1 = scalar, F32, 1104, "", 1, 0 -egtValue2 = scalar, F32, 1108, "", 1, 0 -desiredRpmLimit = scalar, S16, 1112, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1116, "", 1, 0 -sparkCounter = scalar, U32, 1120, "", 1, 0 -fuelingLoad = scalar, F32, 1124, "", 1, 0 -ignitionLoad = scalar, F32, 1128, "", 1, 0 -veTableYAxis = scalar, U16, 1132, "%", 0.01, 0 -; total TS size = 1136 -tpsFrom = scalar, F32, 1136 -tpsTo = scalar, F32, 1140 -deltaTps = scalar, F32, 1144 -extraFuel = scalar, F32, 1148, "", 1, 0 -valueFromTable = scalar, F32, 1152, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1156, [0:0] -isBelowDecelThreshold = bits, U32, 1156, [1:1] -isTimeToResetAccumulator = bits, U32, 1156, [2:2] -isFractionalEnrichment = bits, U32, 1156, [3:3] -belowEpsilon = bits, U32, 1156, [4:4] -tooShort = bits, U32, 1156, [5:5] -fractionalInjFuel = scalar, F32, 1160, "", 1, 0 -accumulatedValue = scalar, F32, 1164, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1168, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1172, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1176, "", 1, 0 -cycleCnt = scalar, S32, 1180, "", 1, 0 -; total TS size = 1184 -hwEventCounters1 = scalar, U32, 1184, "", 1, 0 -hwEventCounters2 = scalar, U32, 1188, "", 1, 0 -hwEventCounters3 = scalar, U32, 1192, "", 1, 0 -hwEventCounters4 = scalar, U32, 1196, "", 1, 0 -hwEventCounters5 = scalar, U32, 1200, "", 1, 0 -hwEventCounters6 = scalar, U32, 1204, "", 1, 0 -vvtCamCounter = scalar, U32, 1208, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1212, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1216, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1220, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1221, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1224, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1228, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1232, "", 1, 0 -mapCamPrevToothAngle = scalar, F32, 1236, "deg", 1, 0 -isDecodingMapCam = bits, U32, 1240, [0:0] -; total TS size = 1244 -crankSynchronizationCounter0 = scalar, U32, 1244, "", 1, 0 -vvtSyncGapRatio0 = scalar, F32, 1248, "", 1, 0 -vvtToothDurations00 = scalar, U32, 1252, "us", 1, 0 -vvtCurrentPosition0 = scalar, F32, 1256, "sync: Primary Cam Position", 1, 0 -vvtToothPosition10 = scalar, F32, 1260, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition20 = scalar, F32, 1264, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition30 = scalar, F32, 1268, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition40 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio0 = scalar, F32, 1276, "", 1, 0 -triggerStateIndex0 = scalar, U08, 1280, "", 1, 0 -vvtStateIndex0 = scalar, U08, 1281, "", 1, 0 -; total TS size = 1284 -camResyncCounter = scalar, U08, 1284, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1288, [0:0] -; total TS size = 1292 -wallFuelCorrection = scalar, F32, 1292, "", 1, 0 -wallFuel = scalar, F32, 1296, "", 1, 0 -; total TS size = 1300 -idleState = bits, S32, 1300, [0:2], "not important" -currentIdlePosition = scalar, F32, 1304 -baseIdlePosition = scalar, F32, 1308 -idleClosedLoop = scalar, F32, 1312 -iacByTpsTaper = scalar, F32, 1316 -throttlePedalUpState = scalar, S32, 1320, "", 1, 0 -mightResetPid = bits, U32, 1324, [0:0] -shouldResetPid = bits, U32, 1324, [1:1] -wasResetPid = bits, U32, 1324, [2:2] -mustResetPid = bits, U32, 1324, [3:3] -isCranking = bits, U32, 1324, [4:4] -isIacTableForCoasting = bits, U32, 1324, [5:5] -notIdling = bits, U32, 1324, [6:6] -needReset = bits, U32, 1324, [7:7] -isInDeadZone = bits, U32, 1324, [8:8] -isBlipping = bits, U32, 1324, [9:9] -useClosedLoop = bits, U32, 1324, [10:10] -badTps = bits, U32, 1324, [11:11] -looksLikeRunning = bits, U32, 1324, [12:12] -looksLikeCoasting = bits, U32, 1324, [13:13] -looksLikeCrankToIdle = bits, U32, 1324, [14:14] -isIdleCoasting = bits, U32, 1324, [15:15] -isIdleClosedLoop = bits, U32, 1324, [16:16] -idleTarget = scalar, S32, 1328, "", 1, 0 -targetRpmByClt = scalar, S32, 1332, "", 1, 0 -targetRpmAc = scalar, S32, 1336, "", 1, 0 -iacByRpmTaper = scalar, F32, 1340 -luaAdd = scalar, F32, 1344 -; total TS size = 1348 -idlePosition0 = scalar, F32, 1348, "per", 1,0 -trim0 = scalar, F32, 1352, "", 1, 0 -luaAdjustment0 = scalar, F32, 1356, "per", 1,0 -m_wastegatePosition0 = scalar, F32, 1360, "per", 1,0 -etbFeedForward0 = scalar, F32, 1364 -etbIntegralError0 = scalar, F32, 1368, "", 1, 0 -etbCurrentTarget0 = scalar, F32, 1372, "%", 1, 0 -etbCurrentAdjustedTarget0 = scalar, F32, 1376, "%", 1, 0 -etbRevLimitActive0 = bits, U32, 1380, [0:0] -jamDetected0 = bits, U32, 1380, [1:1] -etbDutyRateOfChange0 = scalar, F32, 1384, "per", 1,0 -etbDutyAverage0 = scalar, F32, 1388, "per", 1,0 -etbTpsErrorCounter0 = scalar, U16, 1392, "count", 1,0 -etbPpsErrorCounter0 = scalar, U16, 1394, "count", 1,0 -etbErrorCode0 = scalar, S08, 1396, "", 1, 0 -jamTimer0 = scalar, U16, 1398, "sec", 0.01, 0 -; total TS size = 1400 -faultCode0 = scalar, U08, 1400, "", 1, 0 -heaterDuty0 = scalar, U08, 1401, "%", 1, 0 -pumpDuty0 = scalar, U08, 1402, "%", 1, 0 -tempC0 = scalar, U16, 1404, "C", 1, 0 -nernstVoltage0 = scalar, U16, 1406, "V", 0.001, 0 -esr0 = scalar, U16, 1408, "ohm", 1, 0 -; total TS size = 1412 -dcOutput0 = scalar, F32, 1412, "per", 1,0 -isEnabled0_int = scalar, U08, 1416, "per", 1,0 -isEnabled0 = bits, U32, 1420, [0:0] -; total TS size = 1424 -value0 = scalar, U16, 1424, "value", 1,0 -value1 = scalar, U16, 1426, "value", 1,0 -errorRate = scalar, F32, 1428, "ratio", 1,0 -; total TS size = 1432 -vvtTarget = scalar, U16, 1432, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1434, "%", 0.5, 0 +smartChipAliveCounter = scalar, S08, 1096, "", 1, 0 +startStopPhysicalState = bits, U32, 1100, [0:0] +acrStateDup = bits, U32, 1100, [1:1] +acrEngineMovedRecently = bits, U32, 1100, [2:2] +heaterControlEnabled = bits, U32, 1100, [3:3] +luaDigitalState0 = bits, U32, 1100, [4:4] +luaDigitalState1 = bits, U32, 1100, [5:5] +luaDigitalState2 = bits, U32, 1100, [6:6] +luaDigitalState3 = bits, U32, 1100, [7:7] +startStopStateToggleCounter = scalar, U32, 1104, "", 1, 0 +egtValue1 = scalar, F32, 1108, "", 1, 0 +egtValue2 = scalar, F32, 1112, "", 1, 0 +desiredRpmLimit = scalar, S16, 1116, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 1120, "", 1, 0 +sparkCounter = scalar, U32, 1124, "", 1, 0 +fuelingLoad = scalar, F32, 1128, "", 1, 0 +ignitionLoad = scalar, F32, 1132, "", 1, 0 +veTableYAxis = scalar, U16, 1136, "%", 0.01, 0 +; total TS size = 1140 +tpsFrom = scalar, F32, 1140 +tpsTo = scalar, F32, 1144 +deltaTps = scalar, F32, 1148 +extraFuel = scalar, F32, 1152, "", 1, 0 +valueFromTable = scalar, F32, 1156, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1160, [0:0] +isBelowDecelThreshold = bits, U32, 1160, [1:1] +isTimeToResetAccumulator = bits, U32, 1160, [2:2] +isFractionalEnrichment = bits, U32, 1160, [3:3] +belowEpsilon = bits, U32, 1160, [4:4] +tooShort = bits, U32, 1160, [5:5] +fractionalInjFuel = scalar, F32, 1164, "", 1, 0 +accumulatedValue = scalar, F32, 1168, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1172, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1176, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1180, "", 1, 0 +cycleCnt = scalar, S32, 1184, "", 1, 0 +; total TS size = 1188 +hwEventCounters1 = scalar, U32, 1188, "", 1, 0 +hwEventCounters2 = scalar, U32, 1192, "", 1, 0 +hwEventCounters3 = scalar, U32, 1196, "", 1, 0 +hwEventCounters4 = scalar, U32, 1200, "", 1, 0 +hwEventCounters5 = scalar, U32, 1204, "", 1, 0 +hwEventCounters6 = scalar, U32, 1208, "", 1, 0 +vvtCamCounter = scalar, U32, 1212, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1216, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1220, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1224, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1225, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1228, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1232, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1236, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1240, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1244, [0:0] +; total TS size = 1248 +crankSynchronizationCounter0 = scalar, U32, 1248, "", 1, 0 +vvtSyncGapRatio0 = scalar, F32, 1252, "", 1, 0 +vvtToothDurations00 = scalar, U32, 1256, "us", 1, 0 +vvtCurrentPosition0 = scalar, F32, 1260, "sync: Primary Cam Position", 1, 0 +vvtToothPosition10 = scalar, F32, 1264, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition20 = scalar, F32, 1268, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition30 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition40 = scalar, F32, 1276, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio0 = scalar, F32, 1280, "", 1, 0 +triggerStateIndex0 = scalar, U08, 1284, "", 1, 0 +vvtStateIndex0 = scalar, U08, 1285, "", 1, 0 +; total TS size = 1288 +camResyncCounter = scalar, U08, 1288, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1292, [0:0] +; total TS size = 1296 +wallFuelCorrection = scalar, F32, 1296, "", 1, 0 +wallFuel = scalar, F32, 1300, "", 1, 0 +; total TS size = 1304 +idleState = bits, S32, 1304, [0:2], "not important" +currentIdlePosition = scalar, F32, 1308 +baseIdlePosition = scalar, F32, 1312 +idleClosedLoop = scalar, F32, 1316 +iacByTpsTaper = scalar, F32, 1320 +throttlePedalUpState = scalar, S32, 1324, "", 1, 0 +mightResetPid = bits, U32, 1328, [0:0] +shouldResetPid = bits, U32, 1328, [1:1] +wasResetPid = bits, U32, 1328, [2:2] +mustResetPid = bits, U32, 1328, [3:3] +isCranking = bits, U32, 1328, [4:4] +isIacTableForCoasting = bits, U32, 1328, [5:5] +notIdling = bits, U32, 1328, [6:6] +needReset = bits, U32, 1328, [7:7] +isInDeadZone = bits, U32, 1328, [8:8] +isBlipping = bits, U32, 1328, [9:9] +useClosedLoop = bits, U32, 1328, [10:10] +badTps = bits, U32, 1328, [11:11] +looksLikeRunning = bits, U32, 1328, [12:12] +looksLikeCoasting = bits, U32, 1328, [13:13] +looksLikeCrankToIdle = bits, U32, 1328, [14:14] +isIdleCoasting = bits, U32, 1328, [15:15] +isIdleClosedLoop = bits, U32, 1328, [16:16] +idleTarget = scalar, S32, 1332, "", 1, 0 +targetRpmByClt = scalar, S32, 1336, "", 1, 0 +targetRpmAc = scalar, S32, 1340, "", 1, 0 +iacByRpmTaper = scalar, F32, 1344 +luaAdd = scalar, F32, 1348 +; total TS size = 1352 +idlePosition0 = scalar, F32, 1352, "per", 1,0 +trim0 = scalar, F32, 1356, "", 1, 0 +luaAdjustment0 = scalar, F32, 1360, "per", 1,0 +m_wastegatePosition0 = scalar, F32, 1364, "per", 1,0 +etbFeedForward0 = scalar, F32, 1368 +etbIntegralError0 = scalar, F32, 1372, "", 1, 0 +etbCurrentTarget0 = scalar, F32, 1376, "%", 1, 0 +etbCurrentAdjustedTarget0 = scalar, F32, 1380, "%", 1, 0 +etbRevLimitActive0 = bits, U32, 1384, [0:0] +jamDetected0 = bits, U32, 1384, [1:1] +etbDutyRateOfChange0 = scalar, F32, 1388, "per", 1,0 +etbDutyAverage0 = scalar, F32, 1392, "per", 1,0 +etbTpsErrorCounter0 = scalar, U16, 1396, "count", 1,0 +etbPpsErrorCounter0 = scalar, U16, 1398, "count", 1,0 +etbErrorCode0 = scalar, S08, 1400, "", 1, 0 +jamTimer0 = scalar, U16, 1402, "sec", 0.01, 0 +; total TS size = 1404 +faultCode0 = scalar, U08, 1404, "", 1, 0 +heaterDuty0 = scalar, U08, 1405, "%", 1, 0 +pumpDuty0 = scalar, U08, 1406, "%", 1, 0 +tempC0 = scalar, U16, 1408, "C", 1, 0 +nernstVoltage0 = scalar, U16, 1410, "V", 0.001, 0 +esr0 = scalar, U16, 1412, "ohm", 1, 0 +; total TS size = 1416 +dcOutput0 = scalar, F32, 1416, "per", 1,0 +isEnabled0_int = scalar, U08, 1420, "per", 1,0 +isEnabled0 = bits, U32, 1424, [0:0] +; total TS size = 1428 +value0 = scalar, U16, 1428, "value", 1,0 +value1 = scalar, U16, 1430, "value", 1,0 +errorRate = scalar, F32, 1432, "ratio", 1,0 ; total TS size = 1436 -lambdaCurrentlyGood = bits, U32, 1436, [0:0] -lambdaMonitorCut = bits, U32, 1436, [1:1] -lambdaTimeSinceGood = scalar, U16, 1440, "sec", 0.01, 0 -; total TS size = 1444 +vvtTarget = scalar, U16, 1436, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1438, "%", 0.5, 0 +; total TS size = 1440 +lambdaCurrentlyGood = bits, U32, 1440, [0:0] +lambdaMonitorCut = bits, U32, 1440, [1:1] +lambdaTimeSinceGood = scalar, U16, 1444, "sec", 0.01, 0 +; total TS size = 1448 time = { timeNow } @@ -5237,6 +5238,7 @@ entry = brakePedalState, "Brake switch", int, "%d" entry = startStopState, "startStopState", int, "%d" entry = smartChipState, "smartChipState", int, "%d" entry = smartChipRestartCounter, "smartChipRestartCounter", int, "%d" +entry = smartChipAliveCounter, "smartChipAliveCounter", int, "%d" entry = startStopPhysicalState, "startStopPhysicalState", int, "%d" entry = acrStateDup, "acrStateDup", int, "%d" entry = acrEngineMovedRecently, "acrEngineMovedRecently", int, "%d" @@ -6201,16 +6203,17 @@ dialog = engine_stateDialog, "engine_state" graphLine = smartChipState graphLine = smartChipRestartCounter liveGraph = engine_state_5_Graph, "Graph", South + graphLine = smartChipAliveCounter graphLine = startStopStateToggleCounter graphLine = egtValue1 graphLine = egtValue2 - graphLine = desiredRpmLimit liveGraph = engine_state_6_Graph, "Graph", South + graphLine = desiredRpmLimit graphLine = fuelInjectionCounter graphLine = sparkCounter graphLine = fuelingLoad - graphLine = ignitionLoad liveGraph = engine_state_7_Graph, "Graph", South + graphLine = ignitionLoad graphLine = veTableYAxis indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_hellen72.ini b/firmware/tunerstudio/generated/rusefi_hellen72.ini index d20029f0c9..d88dc7647a 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen72.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen72.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.12.26.hellen72.2536776340" + signature = "rusEFI master.2023.12.26.hellen72.1594850422" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.12.26.hellen72.2536776340" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.12.26.hellen72.1594850422" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -92,7 +92,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","5N - TPS2","3L - IGN_7 / AFR","intMAP (A15)","5P - PPS1","4V - TPS (A17)","4S/4T - Alternator voltage","3V - CAM (A19)","4J - VTCS/AUX4 (A20)","4F - AC_PRES/AUX1 (A23)","3Y - CRANK (A24)","4X - MAF (A9)","4U - MAP2/Ign8 (A10)","4P - CLT (A11)","4N - IAT (A14)","5M - PPS2 OR TEMPERATURE SENSOR","4AE - EGR/MAP4 (A22)" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Tue Dec 26 01:37:16 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Tue Dec 26 22:47:48 UTC 2023 pageSize = 22088 page = 1 @@ -2373,7 +2373,7 @@ lambdaMaxDeviationRpmBins = array, U16, 22078, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1444 + ochBlockSize = 1448 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3027,145 +3027,146 @@ brakePedalState = scalar, S08, 1092, "", 1, 0 startStopState = scalar, S08, 1093, "", 1, 0 smartChipState = scalar, S08, 1094, "", 1, 0 smartChipRestartCounter = scalar, S08, 1095, "", 1, 0 -startStopPhysicalState = bits, U32, 1096, [0:0] -acrStateDup = bits, U32, 1096, [1:1] -acrEngineMovedRecently = bits, U32, 1096, [2:2] -heaterControlEnabled = bits, U32, 1096, [3:3] -luaDigitalState0 = bits, U32, 1096, [4:4] -luaDigitalState1 = bits, U32, 1096, [5:5] -luaDigitalState2 = bits, U32, 1096, [6:6] -luaDigitalState3 = bits, U32, 1096, [7:7] -startStopStateToggleCounter = scalar, U32, 1100, "", 1, 0 -egtValue1 = scalar, F32, 1104, "", 1, 0 -egtValue2 = scalar, F32, 1108, "", 1, 0 -desiredRpmLimit = scalar, S16, 1112, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1116, "", 1, 0 -sparkCounter = scalar, U32, 1120, "", 1, 0 -fuelingLoad = scalar, F32, 1124, "", 1, 0 -ignitionLoad = scalar, F32, 1128, "", 1, 0 -veTableYAxis = scalar, U16, 1132, "%", 0.01, 0 -; total TS size = 1136 -tpsFrom = scalar, F32, 1136 -tpsTo = scalar, F32, 1140 -deltaTps = scalar, F32, 1144 -extraFuel = scalar, F32, 1148, "", 1, 0 -valueFromTable = scalar, F32, 1152, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1156, [0:0] -isBelowDecelThreshold = bits, U32, 1156, [1:1] -isTimeToResetAccumulator = bits, U32, 1156, [2:2] -isFractionalEnrichment = bits, U32, 1156, [3:3] -belowEpsilon = bits, U32, 1156, [4:4] -tooShort = bits, U32, 1156, [5:5] -fractionalInjFuel = scalar, F32, 1160, "", 1, 0 -accumulatedValue = scalar, F32, 1164, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1168, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1172, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1176, "", 1, 0 -cycleCnt = scalar, S32, 1180, "", 1, 0 -; total TS size = 1184 -hwEventCounters1 = scalar, U32, 1184, "", 1, 0 -hwEventCounters2 = scalar, U32, 1188, "", 1, 0 -hwEventCounters3 = scalar, U32, 1192, "", 1, 0 -hwEventCounters4 = scalar, U32, 1196, "", 1, 0 -hwEventCounters5 = scalar, U32, 1200, "", 1, 0 -hwEventCounters6 = scalar, U32, 1204, "", 1, 0 -vvtCamCounter = scalar, U32, 1208, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1212, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1216, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1220, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1221, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1224, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1228, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1232, "", 1, 0 -mapCamPrevToothAngle = scalar, F32, 1236, "deg", 1, 0 -isDecodingMapCam = bits, U32, 1240, [0:0] -; total TS size = 1244 -crankSynchronizationCounter0 = scalar, U32, 1244, "", 1, 0 -vvtSyncGapRatio0 = scalar, F32, 1248, "", 1, 0 -vvtToothDurations00 = scalar, U32, 1252, "us", 1, 0 -vvtCurrentPosition0 = scalar, F32, 1256, "sync: Primary Cam Position", 1, 0 -vvtToothPosition10 = scalar, F32, 1260, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition20 = scalar, F32, 1264, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition30 = scalar, F32, 1268, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition40 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio0 = scalar, F32, 1276, "", 1, 0 -triggerStateIndex0 = scalar, U08, 1280, "", 1, 0 -vvtStateIndex0 = scalar, U08, 1281, "", 1, 0 -; total TS size = 1284 -camResyncCounter = scalar, U08, 1284, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1288, [0:0] -; total TS size = 1292 -wallFuelCorrection = scalar, F32, 1292, "", 1, 0 -wallFuel = scalar, F32, 1296, "", 1, 0 -; total TS size = 1300 -idleState = bits, S32, 1300, [0:2], "not important" -currentIdlePosition = scalar, F32, 1304 -baseIdlePosition = scalar, F32, 1308 -idleClosedLoop = scalar, F32, 1312 -iacByTpsTaper = scalar, F32, 1316 -throttlePedalUpState = scalar, S32, 1320, "", 1, 0 -mightResetPid = bits, U32, 1324, [0:0] -shouldResetPid = bits, U32, 1324, [1:1] -wasResetPid = bits, U32, 1324, [2:2] -mustResetPid = bits, U32, 1324, [3:3] -isCranking = bits, U32, 1324, [4:4] -isIacTableForCoasting = bits, U32, 1324, [5:5] -notIdling = bits, U32, 1324, [6:6] -needReset = bits, U32, 1324, [7:7] -isInDeadZone = bits, U32, 1324, [8:8] -isBlipping = bits, U32, 1324, [9:9] -useClosedLoop = bits, U32, 1324, [10:10] -badTps = bits, U32, 1324, [11:11] -looksLikeRunning = bits, U32, 1324, [12:12] -looksLikeCoasting = bits, U32, 1324, [13:13] -looksLikeCrankToIdle = bits, U32, 1324, [14:14] -isIdleCoasting = bits, U32, 1324, [15:15] -isIdleClosedLoop = bits, U32, 1324, [16:16] -idleTarget = scalar, S32, 1328, "", 1, 0 -targetRpmByClt = scalar, S32, 1332, "", 1, 0 -targetRpmAc = scalar, S32, 1336, "", 1, 0 -iacByRpmTaper = scalar, F32, 1340 -luaAdd = scalar, F32, 1344 -; total TS size = 1348 -idlePosition0 = scalar, F32, 1348, "per", 1,0 -trim0 = scalar, F32, 1352, "", 1, 0 -luaAdjustment0 = scalar, F32, 1356, "per", 1,0 -m_wastegatePosition0 = scalar, F32, 1360, "per", 1,0 -etbFeedForward0 = scalar, F32, 1364 -etbIntegralError0 = scalar, F32, 1368, "", 1, 0 -etbCurrentTarget0 = scalar, F32, 1372, "%", 1, 0 -etbCurrentAdjustedTarget0 = scalar, F32, 1376, "%", 1, 0 -etbRevLimitActive0 = bits, U32, 1380, [0:0] -jamDetected0 = bits, U32, 1380, [1:1] -etbDutyRateOfChange0 = scalar, F32, 1384, "per", 1,0 -etbDutyAverage0 = scalar, F32, 1388, "per", 1,0 -etbTpsErrorCounter0 = scalar, U16, 1392, "count", 1,0 -etbPpsErrorCounter0 = scalar, U16, 1394, "count", 1,0 -etbErrorCode0 = scalar, S08, 1396, "", 1, 0 -jamTimer0 = scalar, U16, 1398, "sec", 0.01, 0 -; total TS size = 1400 -faultCode0 = scalar, U08, 1400, "", 1, 0 -heaterDuty0 = scalar, U08, 1401, "%", 1, 0 -pumpDuty0 = scalar, U08, 1402, "%", 1, 0 -tempC0 = scalar, U16, 1404, "C", 1, 0 -nernstVoltage0 = scalar, U16, 1406, "V", 0.001, 0 -esr0 = scalar, U16, 1408, "ohm", 1, 0 -; total TS size = 1412 -dcOutput0 = scalar, F32, 1412, "per", 1,0 -isEnabled0_int = scalar, U08, 1416, "per", 1,0 -isEnabled0 = bits, U32, 1420, [0:0] -; total TS size = 1424 -value0 = scalar, U16, 1424, "value", 1,0 -value1 = scalar, U16, 1426, "value", 1,0 -errorRate = scalar, F32, 1428, "ratio", 1,0 -; total TS size = 1432 -vvtTarget = scalar, U16, 1432, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1434, "%", 0.5, 0 +smartChipAliveCounter = scalar, S08, 1096, "", 1, 0 +startStopPhysicalState = bits, U32, 1100, [0:0] +acrStateDup = bits, U32, 1100, [1:1] +acrEngineMovedRecently = bits, U32, 1100, [2:2] +heaterControlEnabled = bits, U32, 1100, [3:3] +luaDigitalState0 = bits, U32, 1100, [4:4] +luaDigitalState1 = bits, U32, 1100, [5:5] +luaDigitalState2 = bits, U32, 1100, [6:6] +luaDigitalState3 = bits, U32, 1100, [7:7] +startStopStateToggleCounter = scalar, U32, 1104, "", 1, 0 +egtValue1 = scalar, F32, 1108, "", 1, 0 +egtValue2 = scalar, F32, 1112, "", 1, 0 +desiredRpmLimit = scalar, S16, 1116, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 1120, "", 1, 0 +sparkCounter = scalar, U32, 1124, "", 1, 0 +fuelingLoad = scalar, F32, 1128, "", 1, 0 +ignitionLoad = scalar, F32, 1132, "", 1, 0 +veTableYAxis = scalar, U16, 1136, "%", 0.01, 0 +; total TS size = 1140 +tpsFrom = scalar, F32, 1140 +tpsTo = scalar, F32, 1144 +deltaTps = scalar, F32, 1148 +extraFuel = scalar, F32, 1152, "", 1, 0 +valueFromTable = scalar, F32, 1156, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1160, [0:0] +isBelowDecelThreshold = bits, U32, 1160, [1:1] +isTimeToResetAccumulator = bits, U32, 1160, [2:2] +isFractionalEnrichment = bits, U32, 1160, [3:3] +belowEpsilon = bits, U32, 1160, [4:4] +tooShort = bits, U32, 1160, [5:5] +fractionalInjFuel = scalar, F32, 1164, "", 1, 0 +accumulatedValue = scalar, F32, 1168, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1172, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1176, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1180, "", 1, 0 +cycleCnt = scalar, S32, 1184, "", 1, 0 +; total TS size = 1188 +hwEventCounters1 = scalar, U32, 1188, "", 1, 0 +hwEventCounters2 = scalar, U32, 1192, "", 1, 0 +hwEventCounters3 = scalar, U32, 1196, "", 1, 0 +hwEventCounters4 = scalar, U32, 1200, "", 1, 0 +hwEventCounters5 = scalar, U32, 1204, "", 1, 0 +hwEventCounters6 = scalar, U32, 1208, "", 1, 0 +vvtCamCounter = scalar, U32, 1212, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1216, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1220, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1224, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1225, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1228, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1232, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1236, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1240, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1244, [0:0] +; total TS size = 1248 +crankSynchronizationCounter0 = scalar, U32, 1248, "", 1, 0 +vvtSyncGapRatio0 = scalar, F32, 1252, "", 1, 0 +vvtToothDurations00 = scalar, U32, 1256, "us", 1, 0 +vvtCurrentPosition0 = scalar, F32, 1260, "sync: Primary Cam Position", 1, 0 +vvtToothPosition10 = scalar, F32, 1264, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition20 = scalar, F32, 1268, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition30 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition40 = scalar, F32, 1276, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio0 = scalar, F32, 1280, "", 1, 0 +triggerStateIndex0 = scalar, U08, 1284, "", 1, 0 +vvtStateIndex0 = scalar, U08, 1285, "", 1, 0 +; total TS size = 1288 +camResyncCounter = scalar, U08, 1288, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1292, [0:0] +; total TS size = 1296 +wallFuelCorrection = scalar, F32, 1296, "", 1, 0 +wallFuel = scalar, F32, 1300, "", 1, 0 +; total TS size = 1304 +idleState = bits, S32, 1304, [0:2], "not important" +currentIdlePosition = scalar, F32, 1308 +baseIdlePosition = scalar, F32, 1312 +idleClosedLoop = scalar, F32, 1316 +iacByTpsTaper = scalar, F32, 1320 +throttlePedalUpState = scalar, S32, 1324, "", 1, 0 +mightResetPid = bits, U32, 1328, [0:0] +shouldResetPid = bits, U32, 1328, [1:1] +wasResetPid = bits, U32, 1328, [2:2] +mustResetPid = bits, U32, 1328, [3:3] +isCranking = bits, U32, 1328, [4:4] +isIacTableForCoasting = bits, U32, 1328, [5:5] +notIdling = bits, U32, 1328, [6:6] +needReset = bits, U32, 1328, [7:7] +isInDeadZone = bits, U32, 1328, [8:8] +isBlipping = bits, U32, 1328, [9:9] +useClosedLoop = bits, U32, 1328, [10:10] +badTps = bits, U32, 1328, [11:11] +looksLikeRunning = bits, U32, 1328, [12:12] +looksLikeCoasting = bits, U32, 1328, [13:13] +looksLikeCrankToIdle = bits, U32, 1328, [14:14] +isIdleCoasting = bits, U32, 1328, [15:15] +isIdleClosedLoop = bits, U32, 1328, [16:16] +idleTarget = scalar, S32, 1332, "", 1, 0 +targetRpmByClt = scalar, S32, 1336, "", 1, 0 +targetRpmAc = scalar, S32, 1340, "", 1, 0 +iacByRpmTaper = scalar, F32, 1344 +luaAdd = scalar, F32, 1348 +; total TS size = 1352 +idlePosition0 = scalar, F32, 1352, "per", 1,0 +trim0 = scalar, F32, 1356, "", 1, 0 +luaAdjustment0 = scalar, F32, 1360, "per", 1,0 +m_wastegatePosition0 = scalar, F32, 1364, "per", 1,0 +etbFeedForward0 = scalar, F32, 1368 +etbIntegralError0 = scalar, F32, 1372, "", 1, 0 +etbCurrentTarget0 = scalar, F32, 1376, "%", 1, 0 +etbCurrentAdjustedTarget0 = scalar, F32, 1380, "%", 1, 0 +etbRevLimitActive0 = bits, U32, 1384, [0:0] +jamDetected0 = bits, U32, 1384, [1:1] +etbDutyRateOfChange0 = scalar, F32, 1388, "per", 1,0 +etbDutyAverage0 = scalar, F32, 1392, "per", 1,0 +etbTpsErrorCounter0 = scalar, U16, 1396, "count", 1,0 +etbPpsErrorCounter0 = scalar, U16, 1398, "count", 1,0 +etbErrorCode0 = scalar, S08, 1400, "", 1, 0 +jamTimer0 = scalar, U16, 1402, "sec", 0.01, 0 +; total TS size = 1404 +faultCode0 = scalar, U08, 1404, "", 1, 0 +heaterDuty0 = scalar, U08, 1405, "%", 1, 0 +pumpDuty0 = scalar, U08, 1406, "%", 1, 0 +tempC0 = scalar, U16, 1408, "C", 1, 0 +nernstVoltage0 = scalar, U16, 1410, "V", 0.001, 0 +esr0 = scalar, U16, 1412, "ohm", 1, 0 +; total TS size = 1416 +dcOutput0 = scalar, F32, 1416, "per", 1,0 +isEnabled0_int = scalar, U08, 1420, "per", 1,0 +isEnabled0 = bits, U32, 1424, [0:0] +; total TS size = 1428 +value0 = scalar, U16, 1428, "value", 1,0 +value1 = scalar, U16, 1430, "value", 1,0 +errorRate = scalar, F32, 1432, "ratio", 1,0 ; total TS size = 1436 -lambdaCurrentlyGood = bits, U32, 1436, [0:0] -lambdaMonitorCut = bits, U32, 1436, [1:1] -lambdaTimeSinceGood = scalar, U16, 1440, "sec", 0.01, 0 -; total TS size = 1444 +vvtTarget = scalar, U16, 1436, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1438, "%", 0.5, 0 +; total TS size = 1440 +lambdaCurrentlyGood = bits, U32, 1440, [0:0] +lambdaMonitorCut = bits, U32, 1440, [1:1] +lambdaTimeSinceGood = scalar, U16, 1444, "sec", 0.01, 0 +; total TS size = 1448 time = { timeNow } @@ -5237,6 +5238,7 @@ entry = brakePedalState, "Brake switch", int, "%d" entry = startStopState, "startStopState", int, "%d" entry = smartChipState, "smartChipState", int, "%d" entry = smartChipRestartCounter, "smartChipRestartCounter", int, "%d" +entry = smartChipAliveCounter, "smartChipAliveCounter", int, "%d" entry = startStopPhysicalState, "startStopPhysicalState", int, "%d" entry = acrStateDup, "acrStateDup", int, "%d" entry = acrEngineMovedRecently, "acrEngineMovedRecently", int, "%d" @@ -6203,16 +6205,17 @@ dialog = engine_stateDialog, "engine_state" graphLine = smartChipState graphLine = smartChipRestartCounter liveGraph = engine_state_5_Graph, "Graph", South + graphLine = smartChipAliveCounter graphLine = startStopStateToggleCounter graphLine = egtValue1 graphLine = egtValue2 - graphLine = desiredRpmLimit liveGraph = engine_state_6_Graph, "Graph", South + graphLine = desiredRpmLimit graphLine = fuelInjectionCounter graphLine = sparkCounter graphLine = fuelingLoad - graphLine = ignitionLoad liveGraph = engine_state_7_Graph, "Graph", South + graphLine = ignitionLoad graphLine = veTableYAxis indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_hellen81.ini b/firmware/tunerstudio/generated/rusefi_hellen81.ini index 96f23a4cd2..3d976b4ed1 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen81.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen81.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.12.26.hellen81.639882966" + signature = "rusEFI master.2023.12.26.hellen81.3994585140" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.12.26.hellen81.639882966" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.12.26.hellen81.3994585140" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -92,7 +92,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","18 - IN_O2S","55 - IN_O2S2","41 - IN_MAP3","78 - IN_PPS","16 - IN_TPS","13 - IN_VIGN","79 - IN_CAM","77 - IN_AUX4","74 - IN_AUX1","15 - IN_CRANK (A24)","37 - IN_MAP1","38 - IN_MAP2","39 - IN_CLT","40 - IN_IAT","75 - IN_AUX2","76 - IN_AUX3" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Tue Dec 26 01:37:18 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Tue Dec 26 22:47:50 UTC 2023 pageSize = 22088 page = 1 @@ -2373,7 +2373,7 @@ lambdaMaxDeviationRpmBins = array, U16, 22078, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1444 + ochBlockSize = 1448 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3027,145 +3027,146 @@ brakePedalState = scalar, S08, 1092, "", 1, 0 startStopState = scalar, S08, 1093, "", 1, 0 smartChipState = scalar, S08, 1094, "", 1, 0 smartChipRestartCounter = scalar, S08, 1095, "", 1, 0 -startStopPhysicalState = bits, U32, 1096, [0:0] -acrStateDup = bits, U32, 1096, [1:1] -acrEngineMovedRecently = bits, U32, 1096, [2:2] -heaterControlEnabled = bits, U32, 1096, [3:3] -luaDigitalState0 = bits, U32, 1096, [4:4] -luaDigitalState1 = bits, U32, 1096, [5:5] -luaDigitalState2 = bits, U32, 1096, [6:6] -luaDigitalState3 = bits, U32, 1096, [7:7] -startStopStateToggleCounter = scalar, U32, 1100, "", 1, 0 -egtValue1 = scalar, F32, 1104, "", 1, 0 -egtValue2 = scalar, F32, 1108, "", 1, 0 -desiredRpmLimit = scalar, S16, 1112, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1116, "", 1, 0 -sparkCounter = scalar, U32, 1120, "", 1, 0 -fuelingLoad = scalar, F32, 1124, "", 1, 0 -ignitionLoad = scalar, F32, 1128, "", 1, 0 -veTableYAxis = scalar, U16, 1132, "%", 0.01, 0 -; total TS size = 1136 -tpsFrom = scalar, F32, 1136 -tpsTo = scalar, F32, 1140 -deltaTps = scalar, F32, 1144 -extraFuel = scalar, F32, 1148, "", 1, 0 -valueFromTable = scalar, F32, 1152, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1156, [0:0] -isBelowDecelThreshold = bits, U32, 1156, [1:1] -isTimeToResetAccumulator = bits, U32, 1156, [2:2] -isFractionalEnrichment = bits, U32, 1156, [3:3] -belowEpsilon = bits, U32, 1156, [4:4] -tooShort = bits, U32, 1156, [5:5] -fractionalInjFuel = scalar, F32, 1160, "", 1, 0 -accumulatedValue = scalar, F32, 1164, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1168, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1172, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1176, "", 1, 0 -cycleCnt = scalar, S32, 1180, "", 1, 0 -; total TS size = 1184 -hwEventCounters1 = scalar, U32, 1184, "", 1, 0 -hwEventCounters2 = scalar, U32, 1188, "", 1, 0 -hwEventCounters3 = scalar, U32, 1192, "", 1, 0 -hwEventCounters4 = scalar, U32, 1196, "", 1, 0 -hwEventCounters5 = scalar, U32, 1200, "", 1, 0 -hwEventCounters6 = scalar, U32, 1204, "", 1, 0 -vvtCamCounter = scalar, U32, 1208, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1212, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1216, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1220, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1221, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1224, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1228, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1232, "", 1, 0 -mapCamPrevToothAngle = scalar, F32, 1236, "deg", 1, 0 -isDecodingMapCam = bits, U32, 1240, [0:0] -; total TS size = 1244 -crankSynchronizationCounter0 = scalar, U32, 1244, "", 1, 0 -vvtSyncGapRatio0 = scalar, F32, 1248, "", 1, 0 -vvtToothDurations00 = scalar, U32, 1252, "us", 1, 0 -vvtCurrentPosition0 = scalar, F32, 1256, "sync: Primary Cam Position", 1, 0 -vvtToothPosition10 = scalar, F32, 1260, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition20 = scalar, F32, 1264, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition30 = scalar, F32, 1268, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition40 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio0 = scalar, F32, 1276, "", 1, 0 -triggerStateIndex0 = scalar, U08, 1280, "", 1, 0 -vvtStateIndex0 = scalar, U08, 1281, "", 1, 0 -; total TS size = 1284 -camResyncCounter = scalar, U08, 1284, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1288, [0:0] -; total TS size = 1292 -wallFuelCorrection = scalar, F32, 1292, "", 1, 0 -wallFuel = scalar, F32, 1296, "", 1, 0 -; total TS size = 1300 -idleState = bits, S32, 1300, [0:2], "not important" -currentIdlePosition = scalar, F32, 1304 -baseIdlePosition = scalar, F32, 1308 -idleClosedLoop = scalar, F32, 1312 -iacByTpsTaper = scalar, F32, 1316 -throttlePedalUpState = scalar, S32, 1320, "", 1, 0 -mightResetPid = bits, U32, 1324, [0:0] -shouldResetPid = bits, U32, 1324, [1:1] -wasResetPid = bits, U32, 1324, [2:2] -mustResetPid = bits, U32, 1324, [3:3] -isCranking = bits, U32, 1324, [4:4] -isIacTableForCoasting = bits, U32, 1324, [5:5] -notIdling = bits, U32, 1324, [6:6] -needReset = bits, U32, 1324, [7:7] -isInDeadZone = bits, U32, 1324, [8:8] -isBlipping = bits, U32, 1324, [9:9] -useClosedLoop = bits, U32, 1324, [10:10] -badTps = bits, U32, 1324, [11:11] -looksLikeRunning = bits, U32, 1324, [12:12] -looksLikeCoasting = bits, U32, 1324, [13:13] -looksLikeCrankToIdle = bits, U32, 1324, [14:14] -isIdleCoasting = bits, U32, 1324, [15:15] -isIdleClosedLoop = bits, U32, 1324, [16:16] -idleTarget = scalar, S32, 1328, "", 1, 0 -targetRpmByClt = scalar, S32, 1332, "", 1, 0 -targetRpmAc = scalar, S32, 1336, "", 1, 0 -iacByRpmTaper = scalar, F32, 1340 -luaAdd = scalar, F32, 1344 -; total TS size = 1348 -idlePosition0 = scalar, F32, 1348, "per", 1,0 -trim0 = scalar, F32, 1352, "", 1, 0 -luaAdjustment0 = scalar, F32, 1356, "per", 1,0 -m_wastegatePosition0 = scalar, F32, 1360, "per", 1,0 -etbFeedForward0 = scalar, F32, 1364 -etbIntegralError0 = scalar, F32, 1368, "", 1, 0 -etbCurrentTarget0 = scalar, F32, 1372, "%", 1, 0 -etbCurrentAdjustedTarget0 = scalar, F32, 1376, "%", 1, 0 -etbRevLimitActive0 = bits, U32, 1380, [0:0] -jamDetected0 = bits, U32, 1380, [1:1] -etbDutyRateOfChange0 = scalar, F32, 1384, "per", 1,0 -etbDutyAverage0 = scalar, F32, 1388, "per", 1,0 -etbTpsErrorCounter0 = scalar, U16, 1392, "count", 1,0 -etbPpsErrorCounter0 = scalar, U16, 1394, "count", 1,0 -etbErrorCode0 = scalar, S08, 1396, "", 1, 0 -jamTimer0 = scalar, U16, 1398, "sec", 0.01, 0 -; total TS size = 1400 -faultCode0 = scalar, U08, 1400, "", 1, 0 -heaterDuty0 = scalar, U08, 1401, "%", 1, 0 -pumpDuty0 = scalar, U08, 1402, "%", 1, 0 -tempC0 = scalar, U16, 1404, "C", 1, 0 -nernstVoltage0 = scalar, U16, 1406, "V", 0.001, 0 -esr0 = scalar, U16, 1408, "ohm", 1, 0 -; total TS size = 1412 -dcOutput0 = scalar, F32, 1412, "per", 1,0 -isEnabled0_int = scalar, U08, 1416, "per", 1,0 -isEnabled0 = bits, U32, 1420, [0:0] -; total TS size = 1424 -value0 = scalar, U16, 1424, "value", 1,0 -value1 = scalar, U16, 1426, "value", 1,0 -errorRate = scalar, F32, 1428, "ratio", 1,0 -; total TS size = 1432 -vvtTarget = scalar, U16, 1432, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1434, "%", 0.5, 0 +smartChipAliveCounter = scalar, S08, 1096, "", 1, 0 +startStopPhysicalState = bits, U32, 1100, [0:0] +acrStateDup = bits, U32, 1100, [1:1] +acrEngineMovedRecently = bits, U32, 1100, [2:2] +heaterControlEnabled = bits, U32, 1100, [3:3] +luaDigitalState0 = bits, U32, 1100, [4:4] +luaDigitalState1 = bits, U32, 1100, [5:5] +luaDigitalState2 = bits, U32, 1100, [6:6] +luaDigitalState3 = bits, U32, 1100, [7:7] +startStopStateToggleCounter = scalar, U32, 1104, "", 1, 0 +egtValue1 = scalar, F32, 1108, "", 1, 0 +egtValue2 = scalar, F32, 1112, "", 1, 0 +desiredRpmLimit = scalar, S16, 1116, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 1120, "", 1, 0 +sparkCounter = scalar, U32, 1124, "", 1, 0 +fuelingLoad = scalar, F32, 1128, "", 1, 0 +ignitionLoad = scalar, F32, 1132, "", 1, 0 +veTableYAxis = scalar, U16, 1136, "%", 0.01, 0 +; total TS size = 1140 +tpsFrom = scalar, F32, 1140 +tpsTo = scalar, F32, 1144 +deltaTps = scalar, F32, 1148 +extraFuel = scalar, F32, 1152, "", 1, 0 +valueFromTable = scalar, F32, 1156, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1160, [0:0] +isBelowDecelThreshold = bits, U32, 1160, [1:1] +isTimeToResetAccumulator = bits, U32, 1160, [2:2] +isFractionalEnrichment = bits, U32, 1160, [3:3] +belowEpsilon = bits, U32, 1160, [4:4] +tooShort = bits, U32, 1160, [5:5] +fractionalInjFuel = scalar, F32, 1164, "", 1, 0 +accumulatedValue = scalar, F32, 1168, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1172, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1176, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1180, "", 1, 0 +cycleCnt = scalar, S32, 1184, "", 1, 0 +; total TS size = 1188 +hwEventCounters1 = scalar, U32, 1188, "", 1, 0 +hwEventCounters2 = scalar, U32, 1192, "", 1, 0 +hwEventCounters3 = scalar, U32, 1196, "", 1, 0 +hwEventCounters4 = scalar, U32, 1200, "", 1, 0 +hwEventCounters5 = scalar, U32, 1204, "", 1, 0 +hwEventCounters6 = scalar, U32, 1208, "", 1, 0 +vvtCamCounter = scalar, U32, 1212, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1216, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1220, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1224, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1225, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1228, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1232, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1236, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1240, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1244, [0:0] +; total TS size = 1248 +crankSynchronizationCounter0 = scalar, U32, 1248, "", 1, 0 +vvtSyncGapRatio0 = scalar, F32, 1252, "", 1, 0 +vvtToothDurations00 = scalar, U32, 1256, "us", 1, 0 +vvtCurrentPosition0 = scalar, F32, 1260, "sync: Primary Cam Position", 1, 0 +vvtToothPosition10 = scalar, F32, 1264, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition20 = scalar, F32, 1268, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition30 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition40 = scalar, F32, 1276, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio0 = scalar, F32, 1280, "", 1, 0 +triggerStateIndex0 = scalar, U08, 1284, "", 1, 0 +vvtStateIndex0 = scalar, U08, 1285, "", 1, 0 +; total TS size = 1288 +camResyncCounter = scalar, U08, 1288, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1292, [0:0] +; total TS size = 1296 +wallFuelCorrection = scalar, F32, 1296, "", 1, 0 +wallFuel = scalar, F32, 1300, "", 1, 0 +; total TS size = 1304 +idleState = bits, S32, 1304, [0:2], "not important" +currentIdlePosition = scalar, F32, 1308 +baseIdlePosition = scalar, F32, 1312 +idleClosedLoop = scalar, F32, 1316 +iacByTpsTaper = scalar, F32, 1320 +throttlePedalUpState = scalar, S32, 1324, "", 1, 0 +mightResetPid = bits, U32, 1328, [0:0] +shouldResetPid = bits, U32, 1328, [1:1] +wasResetPid = bits, U32, 1328, [2:2] +mustResetPid = bits, U32, 1328, [3:3] +isCranking = bits, U32, 1328, [4:4] +isIacTableForCoasting = bits, U32, 1328, [5:5] +notIdling = bits, U32, 1328, [6:6] +needReset = bits, U32, 1328, [7:7] +isInDeadZone = bits, U32, 1328, [8:8] +isBlipping = bits, U32, 1328, [9:9] +useClosedLoop = bits, U32, 1328, [10:10] +badTps = bits, U32, 1328, [11:11] +looksLikeRunning = bits, U32, 1328, [12:12] +looksLikeCoasting = bits, U32, 1328, [13:13] +looksLikeCrankToIdle = bits, U32, 1328, [14:14] +isIdleCoasting = bits, U32, 1328, [15:15] +isIdleClosedLoop = bits, U32, 1328, [16:16] +idleTarget = scalar, S32, 1332, "", 1, 0 +targetRpmByClt = scalar, S32, 1336, "", 1, 0 +targetRpmAc = scalar, S32, 1340, "", 1, 0 +iacByRpmTaper = scalar, F32, 1344 +luaAdd = scalar, F32, 1348 +; total TS size = 1352 +idlePosition0 = scalar, F32, 1352, "per", 1,0 +trim0 = scalar, F32, 1356, "", 1, 0 +luaAdjustment0 = scalar, F32, 1360, "per", 1,0 +m_wastegatePosition0 = scalar, F32, 1364, "per", 1,0 +etbFeedForward0 = scalar, F32, 1368 +etbIntegralError0 = scalar, F32, 1372, "", 1, 0 +etbCurrentTarget0 = scalar, F32, 1376, "%", 1, 0 +etbCurrentAdjustedTarget0 = scalar, F32, 1380, "%", 1, 0 +etbRevLimitActive0 = bits, U32, 1384, [0:0] +jamDetected0 = bits, U32, 1384, [1:1] +etbDutyRateOfChange0 = scalar, F32, 1388, "per", 1,0 +etbDutyAverage0 = scalar, F32, 1392, "per", 1,0 +etbTpsErrorCounter0 = scalar, U16, 1396, "count", 1,0 +etbPpsErrorCounter0 = scalar, U16, 1398, "count", 1,0 +etbErrorCode0 = scalar, S08, 1400, "", 1, 0 +jamTimer0 = scalar, U16, 1402, "sec", 0.01, 0 +; total TS size = 1404 +faultCode0 = scalar, U08, 1404, "", 1, 0 +heaterDuty0 = scalar, U08, 1405, "%", 1, 0 +pumpDuty0 = scalar, U08, 1406, "%", 1, 0 +tempC0 = scalar, U16, 1408, "C", 1, 0 +nernstVoltage0 = scalar, U16, 1410, "V", 0.001, 0 +esr0 = scalar, U16, 1412, "ohm", 1, 0 +; total TS size = 1416 +dcOutput0 = scalar, F32, 1416, "per", 1,0 +isEnabled0_int = scalar, U08, 1420, "per", 1,0 +isEnabled0 = bits, U32, 1424, [0:0] +; total TS size = 1428 +value0 = scalar, U16, 1428, "value", 1,0 +value1 = scalar, U16, 1430, "value", 1,0 +errorRate = scalar, F32, 1432, "ratio", 1,0 ; total TS size = 1436 -lambdaCurrentlyGood = bits, U32, 1436, [0:0] -lambdaMonitorCut = bits, U32, 1436, [1:1] -lambdaTimeSinceGood = scalar, U16, 1440, "sec", 0.01, 0 -; total TS size = 1444 +vvtTarget = scalar, U16, 1436, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1438, "%", 0.5, 0 +; total TS size = 1440 +lambdaCurrentlyGood = bits, U32, 1440, [0:0] +lambdaMonitorCut = bits, U32, 1440, [1:1] +lambdaTimeSinceGood = scalar, U16, 1444, "sec", 0.01, 0 +; total TS size = 1448 time = { timeNow } @@ -5237,6 +5238,7 @@ entry = brakePedalState, "Brake switch", int, "%d" entry = startStopState, "startStopState", int, "%d" entry = smartChipState, "smartChipState", int, "%d" entry = smartChipRestartCounter, "smartChipRestartCounter", int, "%d" +entry = smartChipAliveCounter, "smartChipAliveCounter", int, "%d" entry = startStopPhysicalState, "startStopPhysicalState", int, "%d" entry = acrStateDup, "acrStateDup", int, "%d" entry = acrEngineMovedRecently, "acrEngineMovedRecently", int, "%d" @@ -6201,16 +6203,17 @@ dialog = engine_stateDialog, "engine_state" graphLine = smartChipState graphLine = smartChipRestartCounter liveGraph = engine_state_5_Graph, "Graph", South + graphLine = smartChipAliveCounter graphLine = startStopStateToggleCounter graphLine = egtValue1 graphLine = egtValue2 - graphLine = desiredRpmLimit liveGraph = engine_state_6_Graph, "Graph", South + graphLine = desiredRpmLimit graphLine = fuelInjectionCounter graphLine = sparkCounter graphLine = fuelingLoad - graphLine = ignitionLoad liveGraph = engine_state_7_Graph, "Graph", South + graphLine = ignitionLoad graphLine = veTableYAxis indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini b/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini index 867ff22eaa..a3aef92c80 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.12.26.hellen88bmw.357935485" + signature = "rusEFI master.2023.12.26.hellen88bmw.3715037087" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.12.26.hellen88bmw.357935485" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.12.26.hellen88bmw.3715037087" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -92,7 +92,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","VIN5","VIN6","INVALID","PPS1","73 - TPS","56 - Battery Sense","17 - CAM","Aux BARO","Aux TPS2","16 - CRANK","41 - MAF","Aux MAP","78 - CLT","77 - IAT","Aux PPS2","Aux TPS3" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Tue Dec 26 01:37:08 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Tue Dec 26 22:47:40 UTC 2023 pageSize = 22088 page = 1 @@ -2373,7 +2373,7 @@ lambdaMaxDeviationRpmBins = array, U16, 22078, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1444 + ochBlockSize = 1448 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3027,145 +3027,146 @@ brakePedalState = scalar, S08, 1092, "", 1, 0 startStopState = scalar, S08, 1093, "", 1, 0 smartChipState = scalar, S08, 1094, "", 1, 0 smartChipRestartCounter = scalar, S08, 1095, "", 1, 0 -startStopPhysicalState = bits, U32, 1096, [0:0] -acrStateDup = bits, U32, 1096, [1:1] -acrEngineMovedRecently = bits, U32, 1096, [2:2] -heaterControlEnabled = bits, U32, 1096, [3:3] -luaDigitalState0 = bits, U32, 1096, [4:4] -luaDigitalState1 = bits, U32, 1096, [5:5] -luaDigitalState2 = bits, U32, 1096, [6:6] -luaDigitalState3 = bits, U32, 1096, [7:7] -startStopStateToggleCounter = scalar, U32, 1100, "", 1, 0 -egtValue1 = scalar, F32, 1104, "", 1, 0 -egtValue2 = scalar, F32, 1108, "", 1, 0 -desiredRpmLimit = scalar, S16, 1112, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1116, "", 1, 0 -sparkCounter = scalar, U32, 1120, "", 1, 0 -fuelingLoad = scalar, F32, 1124, "", 1, 0 -ignitionLoad = scalar, F32, 1128, "", 1, 0 -veTableYAxis = scalar, U16, 1132, "%", 0.01, 0 -; total TS size = 1136 -tpsFrom = scalar, F32, 1136 -tpsTo = scalar, F32, 1140 -deltaTps = scalar, F32, 1144 -extraFuel = scalar, F32, 1148, "", 1, 0 -valueFromTable = scalar, F32, 1152, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1156, [0:0] -isBelowDecelThreshold = bits, U32, 1156, [1:1] -isTimeToResetAccumulator = bits, U32, 1156, [2:2] -isFractionalEnrichment = bits, U32, 1156, [3:3] -belowEpsilon = bits, U32, 1156, [4:4] -tooShort = bits, U32, 1156, [5:5] -fractionalInjFuel = scalar, F32, 1160, "", 1, 0 -accumulatedValue = scalar, F32, 1164, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1168, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1172, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1176, "", 1, 0 -cycleCnt = scalar, S32, 1180, "", 1, 0 -; total TS size = 1184 -hwEventCounters1 = scalar, U32, 1184, "", 1, 0 -hwEventCounters2 = scalar, U32, 1188, "", 1, 0 -hwEventCounters3 = scalar, U32, 1192, "", 1, 0 -hwEventCounters4 = scalar, U32, 1196, "", 1, 0 -hwEventCounters5 = scalar, U32, 1200, "", 1, 0 -hwEventCounters6 = scalar, U32, 1204, "", 1, 0 -vvtCamCounter = scalar, U32, 1208, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1212, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1216, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1220, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1221, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1224, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1228, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1232, "", 1, 0 -mapCamPrevToothAngle = scalar, F32, 1236, "deg", 1, 0 -isDecodingMapCam = bits, U32, 1240, [0:0] -; total TS size = 1244 -crankSynchronizationCounter0 = scalar, U32, 1244, "", 1, 0 -vvtSyncGapRatio0 = scalar, F32, 1248, "", 1, 0 -vvtToothDurations00 = scalar, U32, 1252, "us", 1, 0 -vvtCurrentPosition0 = scalar, F32, 1256, "sync: Primary Cam Position", 1, 0 -vvtToothPosition10 = scalar, F32, 1260, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition20 = scalar, F32, 1264, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition30 = scalar, F32, 1268, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition40 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio0 = scalar, F32, 1276, "", 1, 0 -triggerStateIndex0 = scalar, U08, 1280, "", 1, 0 -vvtStateIndex0 = scalar, U08, 1281, "", 1, 0 -; total TS size = 1284 -camResyncCounter = scalar, U08, 1284, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1288, [0:0] -; total TS size = 1292 -wallFuelCorrection = scalar, F32, 1292, "", 1, 0 -wallFuel = scalar, F32, 1296, "", 1, 0 -; total TS size = 1300 -idleState = bits, S32, 1300, [0:2], "not important" -currentIdlePosition = scalar, F32, 1304 -baseIdlePosition = scalar, F32, 1308 -idleClosedLoop = scalar, F32, 1312 -iacByTpsTaper = scalar, F32, 1316 -throttlePedalUpState = scalar, S32, 1320, "", 1, 0 -mightResetPid = bits, U32, 1324, [0:0] -shouldResetPid = bits, U32, 1324, [1:1] -wasResetPid = bits, U32, 1324, [2:2] -mustResetPid = bits, U32, 1324, [3:3] -isCranking = bits, U32, 1324, [4:4] -isIacTableForCoasting = bits, U32, 1324, [5:5] -notIdling = bits, U32, 1324, [6:6] -needReset = bits, U32, 1324, [7:7] -isInDeadZone = bits, U32, 1324, [8:8] -isBlipping = bits, U32, 1324, [9:9] -useClosedLoop = bits, U32, 1324, [10:10] -badTps = bits, U32, 1324, [11:11] -looksLikeRunning = bits, U32, 1324, [12:12] -looksLikeCoasting = bits, U32, 1324, [13:13] -looksLikeCrankToIdle = bits, U32, 1324, [14:14] -isIdleCoasting = bits, U32, 1324, [15:15] -isIdleClosedLoop = bits, U32, 1324, [16:16] -idleTarget = scalar, S32, 1328, "", 1, 0 -targetRpmByClt = scalar, S32, 1332, "", 1, 0 -targetRpmAc = scalar, S32, 1336, "", 1, 0 -iacByRpmTaper = scalar, F32, 1340 -luaAdd = scalar, F32, 1344 -; total TS size = 1348 -idlePosition0 = scalar, F32, 1348, "per", 1,0 -trim0 = scalar, F32, 1352, "", 1, 0 -luaAdjustment0 = scalar, F32, 1356, "per", 1,0 -m_wastegatePosition0 = scalar, F32, 1360, "per", 1,0 -etbFeedForward0 = scalar, F32, 1364 -etbIntegralError0 = scalar, F32, 1368, "", 1, 0 -etbCurrentTarget0 = scalar, F32, 1372, "%", 1, 0 -etbCurrentAdjustedTarget0 = scalar, F32, 1376, "%", 1, 0 -etbRevLimitActive0 = bits, U32, 1380, [0:0] -jamDetected0 = bits, U32, 1380, [1:1] -etbDutyRateOfChange0 = scalar, F32, 1384, "per", 1,0 -etbDutyAverage0 = scalar, F32, 1388, "per", 1,0 -etbTpsErrorCounter0 = scalar, U16, 1392, "count", 1,0 -etbPpsErrorCounter0 = scalar, U16, 1394, "count", 1,0 -etbErrorCode0 = scalar, S08, 1396, "", 1, 0 -jamTimer0 = scalar, U16, 1398, "sec", 0.01, 0 -; total TS size = 1400 -faultCode0 = scalar, U08, 1400, "", 1, 0 -heaterDuty0 = scalar, U08, 1401, "%", 1, 0 -pumpDuty0 = scalar, U08, 1402, "%", 1, 0 -tempC0 = scalar, U16, 1404, "C", 1, 0 -nernstVoltage0 = scalar, U16, 1406, "V", 0.001, 0 -esr0 = scalar, U16, 1408, "ohm", 1, 0 -; total TS size = 1412 -dcOutput0 = scalar, F32, 1412, "per", 1,0 -isEnabled0_int = scalar, U08, 1416, "per", 1,0 -isEnabled0 = bits, U32, 1420, [0:0] -; total TS size = 1424 -value0 = scalar, U16, 1424, "value", 1,0 -value1 = scalar, U16, 1426, "value", 1,0 -errorRate = scalar, F32, 1428, "ratio", 1,0 -; total TS size = 1432 -vvtTarget = scalar, U16, 1432, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1434, "%", 0.5, 0 +smartChipAliveCounter = scalar, S08, 1096, "", 1, 0 +startStopPhysicalState = bits, U32, 1100, [0:0] +acrStateDup = bits, U32, 1100, [1:1] +acrEngineMovedRecently = bits, U32, 1100, [2:2] +heaterControlEnabled = bits, U32, 1100, [3:3] +luaDigitalState0 = bits, U32, 1100, [4:4] +luaDigitalState1 = bits, U32, 1100, [5:5] +luaDigitalState2 = bits, U32, 1100, [6:6] +luaDigitalState3 = bits, U32, 1100, [7:7] +startStopStateToggleCounter = scalar, U32, 1104, "", 1, 0 +egtValue1 = scalar, F32, 1108, "", 1, 0 +egtValue2 = scalar, F32, 1112, "", 1, 0 +desiredRpmLimit = scalar, S16, 1116, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 1120, "", 1, 0 +sparkCounter = scalar, U32, 1124, "", 1, 0 +fuelingLoad = scalar, F32, 1128, "", 1, 0 +ignitionLoad = scalar, F32, 1132, "", 1, 0 +veTableYAxis = scalar, U16, 1136, "%", 0.01, 0 +; total TS size = 1140 +tpsFrom = scalar, F32, 1140 +tpsTo = scalar, F32, 1144 +deltaTps = scalar, F32, 1148 +extraFuel = scalar, F32, 1152, "", 1, 0 +valueFromTable = scalar, F32, 1156, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1160, [0:0] +isBelowDecelThreshold = bits, U32, 1160, [1:1] +isTimeToResetAccumulator = bits, U32, 1160, [2:2] +isFractionalEnrichment = bits, U32, 1160, [3:3] +belowEpsilon = bits, U32, 1160, [4:4] +tooShort = bits, U32, 1160, [5:5] +fractionalInjFuel = scalar, F32, 1164, "", 1, 0 +accumulatedValue = scalar, F32, 1168, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1172, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1176, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1180, "", 1, 0 +cycleCnt = scalar, S32, 1184, "", 1, 0 +; total TS size = 1188 +hwEventCounters1 = scalar, U32, 1188, "", 1, 0 +hwEventCounters2 = scalar, U32, 1192, "", 1, 0 +hwEventCounters3 = scalar, U32, 1196, "", 1, 0 +hwEventCounters4 = scalar, U32, 1200, "", 1, 0 +hwEventCounters5 = scalar, U32, 1204, "", 1, 0 +hwEventCounters6 = scalar, U32, 1208, "", 1, 0 +vvtCamCounter = scalar, U32, 1212, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1216, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1220, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1224, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1225, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1228, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1232, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1236, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1240, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1244, [0:0] +; total TS size = 1248 +crankSynchronizationCounter0 = scalar, U32, 1248, "", 1, 0 +vvtSyncGapRatio0 = scalar, F32, 1252, "", 1, 0 +vvtToothDurations00 = scalar, U32, 1256, "us", 1, 0 +vvtCurrentPosition0 = scalar, F32, 1260, "sync: Primary Cam Position", 1, 0 +vvtToothPosition10 = scalar, F32, 1264, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition20 = scalar, F32, 1268, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition30 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition40 = scalar, F32, 1276, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio0 = scalar, F32, 1280, "", 1, 0 +triggerStateIndex0 = scalar, U08, 1284, "", 1, 0 +vvtStateIndex0 = scalar, U08, 1285, "", 1, 0 +; total TS size = 1288 +camResyncCounter = scalar, U08, 1288, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1292, [0:0] +; total TS size = 1296 +wallFuelCorrection = scalar, F32, 1296, "", 1, 0 +wallFuel = scalar, F32, 1300, "", 1, 0 +; total TS size = 1304 +idleState = bits, S32, 1304, [0:2], "not important" +currentIdlePosition = scalar, F32, 1308 +baseIdlePosition = scalar, F32, 1312 +idleClosedLoop = scalar, F32, 1316 +iacByTpsTaper = scalar, F32, 1320 +throttlePedalUpState = scalar, S32, 1324, "", 1, 0 +mightResetPid = bits, U32, 1328, [0:0] +shouldResetPid = bits, U32, 1328, [1:1] +wasResetPid = bits, U32, 1328, [2:2] +mustResetPid = bits, U32, 1328, [3:3] +isCranking = bits, U32, 1328, [4:4] +isIacTableForCoasting = bits, U32, 1328, [5:5] +notIdling = bits, U32, 1328, [6:6] +needReset = bits, U32, 1328, [7:7] +isInDeadZone = bits, U32, 1328, [8:8] +isBlipping = bits, U32, 1328, [9:9] +useClosedLoop = bits, U32, 1328, [10:10] +badTps = bits, U32, 1328, [11:11] +looksLikeRunning = bits, U32, 1328, [12:12] +looksLikeCoasting = bits, U32, 1328, [13:13] +looksLikeCrankToIdle = bits, U32, 1328, [14:14] +isIdleCoasting = bits, U32, 1328, [15:15] +isIdleClosedLoop = bits, U32, 1328, [16:16] +idleTarget = scalar, S32, 1332, "", 1, 0 +targetRpmByClt = scalar, S32, 1336, "", 1, 0 +targetRpmAc = scalar, S32, 1340, "", 1, 0 +iacByRpmTaper = scalar, F32, 1344 +luaAdd = scalar, F32, 1348 +; total TS size = 1352 +idlePosition0 = scalar, F32, 1352, "per", 1,0 +trim0 = scalar, F32, 1356, "", 1, 0 +luaAdjustment0 = scalar, F32, 1360, "per", 1,0 +m_wastegatePosition0 = scalar, F32, 1364, "per", 1,0 +etbFeedForward0 = scalar, F32, 1368 +etbIntegralError0 = scalar, F32, 1372, "", 1, 0 +etbCurrentTarget0 = scalar, F32, 1376, "%", 1, 0 +etbCurrentAdjustedTarget0 = scalar, F32, 1380, "%", 1, 0 +etbRevLimitActive0 = bits, U32, 1384, [0:0] +jamDetected0 = bits, U32, 1384, [1:1] +etbDutyRateOfChange0 = scalar, F32, 1388, "per", 1,0 +etbDutyAverage0 = scalar, F32, 1392, "per", 1,0 +etbTpsErrorCounter0 = scalar, U16, 1396, "count", 1,0 +etbPpsErrorCounter0 = scalar, U16, 1398, "count", 1,0 +etbErrorCode0 = scalar, S08, 1400, "", 1, 0 +jamTimer0 = scalar, U16, 1402, "sec", 0.01, 0 +; total TS size = 1404 +faultCode0 = scalar, U08, 1404, "", 1, 0 +heaterDuty0 = scalar, U08, 1405, "%", 1, 0 +pumpDuty0 = scalar, U08, 1406, "%", 1, 0 +tempC0 = scalar, U16, 1408, "C", 1, 0 +nernstVoltage0 = scalar, U16, 1410, "V", 0.001, 0 +esr0 = scalar, U16, 1412, "ohm", 1, 0 +; total TS size = 1416 +dcOutput0 = scalar, F32, 1416, "per", 1,0 +isEnabled0_int = scalar, U08, 1420, "per", 1,0 +isEnabled0 = bits, U32, 1424, [0:0] +; total TS size = 1428 +value0 = scalar, U16, 1428, "value", 1,0 +value1 = scalar, U16, 1430, "value", 1,0 +errorRate = scalar, F32, 1432, "ratio", 1,0 ; total TS size = 1436 -lambdaCurrentlyGood = bits, U32, 1436, [0:0] -lambdaMonitorCut = bits, U32, 1436, [1:1] -lambdaTimeSinceGood = scalar, U16, 1440, "sec", 0.01, 0 -; total TS size = 1444 +vvtTarget = scalar, U16, 1436, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1438, "%", 0.5, 0 +; total TS size = 1440 +lambdaCurrentlyGood = bits, U32, 1440, [0:0] +lambdaMonitorCut = bits, U32, 1440, [1:1] +lambdaTimeSinceGood = scalar, U16, 1444, "sec", 0.01, 0 +; total TS size = 1448 time = { timeNow } @@ -5237,6 +5238,7 @@ entry = brakePedalState, "Brake switch", int, "%d" entry = startStopState, "startStopState", int, "%d" entry = smartChipState, "smartChipState", int, "%d" entry = smartChipRestartCounter, "smartChipRestartCounter", int, "%d" +entry = smartChipAliveCounter, "smartChipAliveCounter", int, "%d" entry = startStopPhysicalState, "startStopPhysicalState", int, "%d" entry = acrStateDup, "acrStateDup", int, "%d" entry = acrEngineMovedRecently, "acrEngineMovedRecently", int, "%d" @@ -6203,16 +6205,17 @@ dialog = engine_stateDialog, "engine_state" graphLine = smartChipState graphLine = smartChipRestartCounter liveGraph = engine_state_5_Graph, "Graph", South + graphLine = smartChipAliveCounter graphLine = startStopStateToggleCounter graphLine = egtValue1 graphLine = egtValue2 - graphLine = desiredRpmLimit liveGraph = engine_state_6_Graph, "Graph", South + graphLine = desiredRpmLimit graphLine = fuelInjectionCounter graphLine = sparkCounter graphLine = fuelingLoad - graphLine = ignitionLoad liveGraph = engine_state_7_Graph, "Graph", South + graphLine = ignitionLoad graphLine = veTableYAxis indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_hellenNA6.ini b/firmware/tunerstudio/generated/rusefi_hellenNA6.ini index 0fa866d79f..2e44ff870b 100644 --- a/firmware/tunerstudio/generated/rusefi_hellenNA6.ini +++ b/firmware/tunerstudio/generated/rusefi_hellenNA6.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.12.26.hellenNA6.276674717" + signature = "rusEFI master.2023.12.26.hellenNA6.3628525183" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.12.26.hellenNA6.276674717" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.12.26.hellenNA6.3628525183" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -92,7 +92,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","3N - O2S","2N - Temperature Sensor","intMAP (A15)","4I - PPS1","TPS Input","1B - Battery Sense","INVALID","4G - PPS2 OR TEMPERATURE SENSOR","4H - TPS2","INVALID","3O - MAF","2M - Pressure Sensor","3Q - CLT","3P - IAT","1V - Clutch Switch","1Q AC Switch" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Tue Dec 26 01:37:26 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Tue Dec 26 22:47:58 UTC 2023 pageSize = 22088 page = 1 @@ -2373,7 +2373,7 @@ lambdaMaxDeviationRpmBins = array, U16, 22078, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1444 + ochBlockSize = 1448 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3027,145 +3027,146 @@ brakePedalState = scalar, S08, 1092, "", 1, 0 startStopState = scalar, S08, 1093, "", 1, 0 smartChipState = scalar, S08, 1094, "", 1, 0 smartChipRestartCounter = scalar, S08, 1095, "", 1, 0 -startStopPhysicalState = bits, U32, 1096, [0:0] -acrStateDup = bits, U32, 1096, [1:1] -acrEngineMovedRecently = bits, U32, 1096, [2:2] -heaterControlEnabled = bits, U32, 1096, [3:3] -luaDigitalState0 = bits, U32, 1096, [4:4] -luaDigitalState1 = bits, U32, 1096, [5:5] -luaDigitalState2 = bits, U32, 1096, [6:6] -luaDigitalState3 = bits, U32, 1096, [7:7] -startStopStateToggleCounter = scalar, U32, 1100, "", 1, 0 -egtValue1 = scalar, F32, 1104, "", 1, 0 -egtValue2 = scalar, F32, 1108, "", 1, 0 -desiredRpmLimit = scalar, S16, 1112, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1116, "", 1, 0 -sparkCounter = scalar, U32, 1120, "", 1, 0 -fuelingLoad = scalar, F32, 1124, "", 1, 0 -ignitionLoad = scalar, F32, 1128, "", 1, 0 -veTableYAxis = scalar, U16, 1132, "%", 0.01, 0 -; total TS size = 1136 -tpsFrom = scalar, F32, 1136 -tpsTo = scalar, F32, 1140 -deltaTps = scalar, F32, 1144 -extraFuel = scalar, F32, 1148, "", 1, 0 -valueFromTable = scalar, F32, 1152, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1156, [0:0] -isBelowDecelThreshold = bits, U32, 1156, [1:1] -isTimeToResetAccumulator = bits, U32, 1156, [2:2] -isFractionalEnrichment = bits, U32, 1156, [3:3] -belowEpsilon = bits, U32, 1156, [4:4] -tooShort = bits, U32, 1156, [5:5] -fractionalInjFuel = scalar, F32, 1160, "", 1, 0 -accumulatedValue = scalar, F32, 1164, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1168, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1172, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1176, "", 1, 0 -cycleCnt = scalar, S32, 1180, "", 1, 0 -; total TS size = 1184 -hwEventCounters1 = scalar, U32, 1184, "", 1, 0 -hwEventCounters2 = scalar, U32, 1188, "", 1, 0 -hwEventCounters3 = scalar, U32, 1192, "", 1, 0 -hwEventCounters4 = scalar, U32, 1196, "", 1, 0 -hwEventCounters5 = scalar, U32, 1200, "", 1, 0 -hwEventCounters6 = scalar, U32, 1204, "", 1, 0 -vvtCamCounter = scalar, U32, 1208, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1212, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1216, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1220, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1221, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1224, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1228, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1232, "", 1, 0 -mapCamPrevToothAngle = scalar, F32, 1236, "deg", 1, 0 -isDecodingMapCam = bits, U32, 1240, [0:0] -; total TS size = 1244 -crankSynchronizationCounter0 = scalar, U32, 1244, "", 1, 0 -vvtSyncGapRatio0 = scalar, F32, 1248, "", 1, 0 -vvtToothDurations00 = scalar, U32, 1252, "us", 1, 0 -vvtCurrentPosition0 = scalar, F32, 1256, "sync: Primary Cam Position", 1, 0 -vvtToothPosition10 = scalar, F32, 1260, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition20 = scalar, F32, 1264, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition30 = scalar, F32, 1268, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition40 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio0 = scalar, F32, 1276, "", 1, 0 -triggerStateIndex0 = scalar, U08, 1280, "", 1, 0 -vvtStateIndex0 = scalar, U08, 1281, "", 1, 0 -; total TS size = 1284 -camResyncCounter = scalar, U08, 1284, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1288, [0:0] -; total TS size = 1292 -wallFuelCorrection = scalar, F32, 1292, "", 1, 0 -wallFuel = scalar, F32, 1296, "", 1, 0 -; total TS size = 1300 -idleState = bits, S32, 1300, [0:2], "not important" -currentIdlePosition = scalar, F32, 1304 -baseIdlePosition = scalar, F32, 1308 -idleClosedLoop = scalar, F32, 1312 -iacByTpsTaper = scalar, F32, 1316 -throttlePedalUpState = scalar, S32, 1320, "", 1, 0 -mightResetPid = bits, U32, 1324, [0:0] -shouldResetPid = bits, U32, 1324, [1:1] -wasResetPid = bits, U32, 1324, [2:2] -mustResetPid = bits, U32, 1324, [3:3] -isCranking = bits, U32, 1324, [4:4] -isIacTableForCoasting = bits, U32, 1324, [5:5] -notIdling = bits, U32, 1324, [6:6] -needReset = bits, U32, 1324, [7:7] -isInDeadZone = bits, U32, 1324, [8:8] -isBlipping = bits, U32, 1324, [9:9] -useClosedLoop = bits, U32, 1324, [10:10] -badTps = bits, U32, 1324, [11:11] -looksLikeRunning = bits, U32, 1324, [12:12] -looksLikeCoasting = bits, U32, 1324, [13:13] -looksLikeCrankToIdle = bits, U32, 1324, [14:14] -isIdleCoasting = bits, U32, 1324, [15:15] -isIdleClosedLoop = bits, U32, 1324, [16:16] -idleTarget = scalar, S32, 1328, "", 1, 0 -targetRpmByClt = scalar, S32, 1332, "", 1, 0 -targetRpmAc = scalar, S32, 1336, "", 1, 0 -iacByRpmTaper = scalar, F32, 1340 -luaAdd = scalar, F32, 1344 -; total TS size = 1348 -idlePosition0 = scalar, F32, 1348, "per", 1,0 -trim0 = scalar, F32, 1352, "", 1, 0 -luaAdjustment0 = scalar, F32, 1356, "per", 1,0 -m_wastegatePosition0 = scalar, F32, 1360, "per", 1,0 -etbFeedForward0 = scalar, F32, 1364 -etbIntegralError0 = scalar, F32, 1368, "", 1, 0 -etbCurrentTarget0 = scalar, F32, 1372, "%", 1, 0 -etbCurrentAdjustedTarget0 = scalar, F32, 1376, "%", 1, 0 -etbRevLimitActive0 = bits, U32, 1380, [0:0] -jamDetected0 = bits, U32, 1380, [1:1] -etbDutyRateOfChange0 = scalar, F32, 1384, "per", 1,0 -etbDutyAverage0 = scalar, F32, 1388, "per", 1,0 -etbTpsErrorCounter0 = scalar, U16, 1392, "count", 1,0 -etbPpsErrorCounter0 = scalar, U16, 1394, "count", 1,0 -etbErrorCode0 = scalar, S08, 1396, "", 1, 0 -jamTimer0 = scalar, U16, 1398, "sec", 0.01, 0 -; total TS size = 1400 -faultCode0 = scalar, U08, 1400, "", 1, 0 -heaterDuty0 = scalar, U08, 1401, "%", 1, 0 -pumpDuty0 = scalar, U08, 1402, "%", 1, 0 -tempC0 = scalar, U16, 1404, "C", 1, 0 -nernstVoltage0 = scalar, U16, 1406, "V", 0.001, 0 -esr0 = scalar, U16, 1408, "ohm", 1, 0 -; total TS size = 1412 -dcOutput0 = scalar, F32, 1412, "per", 1,0 -isEnabled0_int = scalar, U08, 1416, "per", 1,0 -isEnabled0 = bits, U32, 1420, [0:0] -; total TS size = 1424 -value0 = scalar, U16, 1424, "value", 1,0 -value1 = scalar, U16, 1426, "value", 1,0 -errorRate = scalar, F32, 1428, "ratio", 1,0 -; total TS size = 1432 -vvtTarget = scalar, U16, 1432, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1434, "%", 0.5, 0 +smartChipAliveCounter = scalar, S08, 1096, "", 1, 0 +startStopPhysicalState = bits, U32, 1100, [0:0] +acrStateDup = bits, U32, 1100, [1:1] +acrEngineMovedRecently = bits, U32, 1100, [2:2] +heaterControlEnabled = bits, U32, 1100, [3:3] +luaDigitalState0 = bits, U32, 1100, [4:4] +luaDigitalState1 = bits, U32, 1100, [5:5] +luaDigitalState2 = bits, U32, 1100, [6:6] +luaDigitalState3 = bits, U32, 1100, [7:7] +startStopStateToggleCounter = scalar, U32, 1104, "", 1, 0 +egtValue1 = scalar, F32, 1108, "", 1, 0 +egtValue2 = scalar, F32, 1112, "", 1, 0 +desiredRpmLimit = scalar, S16, 1116, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 1120, "", 1, 0 +sparkCounter = scalar, U32, 1124, "", 1, 0 +fuelingLoad = scalar, F32, 1128, "", 1, 0 +ignitionLoad = scalar, F32, 1132, "", 1, 0 +veTableYAxis = scalar, U16, 1136, "%", 0.01, 0 +; total TS size = 1140 +tpsFrom = scalar, F32, 1140 +tpsTo = scalar, F32, 1144 +deltaTps = scalar, F32, 1148 +extraFuel = scalar, F32, 1152, "", 1, 0 +valueFromTable = scalar, F32, 1156, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1160, [0:0] +isBelowDecelThreshold = bits, U32, 1160, [1:1] +isTimeToResetAccumulator = bits, U32, 1160, [2:2] +isFractionalEnrichment = bits, U32, 1160, [3:3] +belowEpsilon = bits, U32, 1160, [4:4] +tooShort = bits, U32, 1160, [5:5] +fractionalInjFuel = scalar, F32, 1164, "", 1, 0 +accumulatedValue = scalar, F32, 1168, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1172, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1176, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1180, "", 1, 0 +cycleCnt = scalar, S32, 1184, "", 1, 0 +; total TS size = 1188 +hwEventCounters1 = scalar, U32, 1188, "", 1, 0 +hwEventCounters2 = scalar, U32, 1192, "", 1, 0 +hwEventCounters3 = scalar, U32, 1196, "", 1, 0 +hwEventCounters4 = scalar, U32, 1200, "", 1, 0 +hwEventCounters5 = scalar, U32, 1204, "", 1, 0 +hwEventCounters6 = scalar, U32, 1208, "", 1, 0 +vvtCamCounter = scalar, U32, 1212, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1216, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1220, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1224, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1225, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1228, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1232, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1236, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1240, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1244, [0:0] +; total TS size = 1248 +crankSynchronizationCounter0 = scalar, U32, 1248, "", 1, 0 +vvtSyncGapRatio0 = scalar, F32, 1252, "", 1, 0 +vvtToothDurations00 = scalar, U32, 1256, "us", 1, 0 +vvtCurrentPosition0 = scalar, F32, 1260, "sync: Primary Cam Position", 1, 0 +vvtToothPosition10 = scalar, F32, 1264, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition20 = scalar, F32, 1268, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition30 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition40 = scalar, F32, 1276, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio0 = scalar, F32, 1280, "", 1, 0 +triggerStateIndex0 = scalar, U08, 1284, "", 1, 0 +vvtStateIndex0 = scalar, U08, 1285, "", 1, 0 +; total TS size = 1288 +camResyncCounter = scalar, U08, 1288, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1292, [0:0] +; total TS size = 1296 +wallFuelCorrection = scalar, F32, 1296, "", 1, 0 +wallFuel = scalar, F32, 1300, "", 1, 0 +; total TS size = 1304 +idleState = bits, S32, 1304, [0:2], "not important" +currentIdlePosition = scalar, F32, 1308 +baseIdlePosition = scalar, F32, 1312 +idleClosedLoop = scalar, F32, 1316 +iacByTpsTaper = scalar, F32, 1320 +throttlePedalUpState = scalar, S32, 1324, "", 1, 0 +mightResetPid = bits, U32, 1328, [0:0] +shouldResetPid = bits, U32, 1328, [1:1] +wasResetPid = bits, U32, 1328, [2:2] +mustResetPid = bits, U32, 1328, [3:3] +isCranking = bits, U32, 1328, [4:4] +isIacTableForCoasting = bits, U32, 1328, [5:5] +notIdling = bits, U32, 1328, [6:6] +needReset = bits, U32, 1328, [7:7] +isInDeadZone = bits, U32, 1328, [8:8] +isBlipping = bits, U32, 1328, [9:9] +useClosedLoop = bits, U32, 1328, [10:10] +badTps = bits, U32, 1328, [11:11] +looksLikeRunning = bits, U32, 1328, [12:12] +looksLikeCoasting = bits, U32, 1328, [13:13] +looksLikeCrankToIdle = bits, U32, 1328, [14:14] +isIdleCoasting = bits, U32, 1328, [15:15] +isIdleClosedLoop = bits, U32, 1328, [16:16] +idleTarget = scalar, S32, 1332, "", 1, 0 +targetRpmByClt = scalar, S32, 1336, "", 1, 0 +targetRpmAc = scalar, S32, 1340, "", 1, 0 +iacByRpmTaper = scalar, F32, 1344 +luaAdd = scalar, F32, 1348 +; total TS size = 1352 +idlePosition0 = scalar, F32, 1352, "per", 1,0 +trim0 = scalar, F32, 1356, "", 1, 0 +luaAdjustment0 = scalar, F32, 1360, "per", 1,0 +m_wastegatePosition0 = scalar, F32, 1364, "per", 1,0 +etbFeedForward0 = scalar, F32, 1368 +etbIntegralError0 = scalar, F32, 1372, "", 1, 0 +etbCurrentTarget0 = scalar, F32, 1376, "%", 1, 0 +etbCurrentAdjustedTarget0 = scalar, F32, 1380, "%", 1, 0 +etbRevLimitActive0 = bits, U32, 1384, [0:0] +jamDetected0 = bits, U32, 1384, [1:1] +etbDutyRateOfChange0 = scalar, F32, 1388, "per", 1,0 +etbDutyAverage0 = scalar, F32, 1392, "per", 1,0 +etbTpsErrorCounter0 = scalar, U16, 1396, "count", 1,0 +etbPpsErrorCounter0 = scalar, U16, 1398, "count", 1,0 +etbErrorCode0 = scalar, S08, 1400, "", 1, 0 +jamTimer0 = scalar, U16, 1402, "sec", 0.01, 0 +; total TS size = 1404 +faultCode0 = scalar, U08, 1404, "", 1, 0 +heaterDuty0 = scalar, U08, 1405, "%", 1, 0 +pumpDuty0 = scalar, U08, 1406, "%", 1, 0 +tempC0 = scalar, U16, 1408, "C", 1, 0 +nernstVoltage0 = scalar, U16, 1410, "V", 0.001, 0 +esr0 = scalar, U16, 1412, "ohm", 1, 0 +; total TS size = 1416 +dcOutput0 = scalar, F32, 1416, "per", 1,0 +isEnabled0_int = scalar, U08, 1420, "per", 1,0 +isEnabled0 = bits, U32, 1424, [0:0] +; total TS size = 1428 +value0 = scalar, U16, 1428, "value", 1,0 +value1 = scalar, U16, 1430, "value", 1,0 +errorRate = scalar, F32, 1432, "ratio", 1,0 ; total TS size = 1436 -lambdaCurrentlyGood = bits, U32, 1436, [0:0] -lambdaMonitorCut = bits, U32, 1436, [1:1] -lambdaTimeSinceGood = scalar, U16, 1440, "sec", 0.01, 0 -; total TS size = 1444 +vvtTarget = scalar, U16, 1436, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1438, "%", 0.5, 0 +; total TS size = 1440 +lambdaCurrentlyGood = bits, U32, 1440, [0:0] +lambdaMonitorCut = bits, U32, 1440, [1:1] +lambdaTimeSinceGood = scalar, U16, 1444, "sec", 0.01, 0 +; total TS size = 1448 time = { timeNow } @@ -5237,6 +5238,7 @@ entry = brakePedalState, "Brake switch", int, "%d" entry = startStopState, "startStopState", int, "%d" entry = smartChipState, "smartChipState", int, "%d" entry = smartChipRestartCounter, "smartChipRestartCounter", int, "%d" +entry = smartChipAliveCounter, "smartChipAliveCounter", int, "%d" entry = startStopPhysicalState, "startStopPhysicalState", int, "%d" entry = acrStateDup, "acrStateDup", int, "%d" entry = acrEngineMovedRecently, "acrEngineMovedRecently", int, "%d" @@ -6203,16 +6205,17 @@ dialog = engine_stateDialog, "engine_state" graphLine = smartChipState graphLine = smartChipRestartCounter liveGraph = engine_state_5_Graph, "Graph", South + graphLine = smartChipAliveCounter graphLine = startStopStateToggleCounter graphLine = egtValue1 graphLine = egtValue2 - graphLine = desiredRpmLimit liveGraph = engine_state_6_Graph, "Graph", South + graphLine = desiredRpmLimit graphLine = fuelInjectionCounter graphLine = sparkCounter graphLine = fuelingLoad - graphLine = ignitionLoad liveGraph = engine_state_7_Graph, "Graph", South + graphLine = ignitionLoad graphLine = veTableYAxis indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini b/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini index 2dec3c53e2..de4dc6e25b 100644 --- a/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini +++ b/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.12.26.hellenNA8_96.1994172498" + signature = "rusEFI master.2023.12.26.hellenNA8_96.3202873008" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.12.26.hellenNA8_96.1994172498" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.12.26.hellenNA8_96.3202873008" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -92,7 +92,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","2C - O2S","TPS1","intMAP","PPS1","2F - TPS","3B - Battery Sense","3G - CAM","3S - EGR BOOST IN","2A - Pressure Input","3F - CRANK","2B - MAF","INVALID","2G - Coolant","2B - IAT","4C - IN TEMP/PPS2","1K - AC Switch" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Tue Dec 26 01:37:29 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Tue Dec 26 22:48:01 UTC 2023 pageSize = 22088 page = 1 @@ -2373,7 +2373,7 @@ lambdaMaxDeviationRpmBins = array, U16, 22078, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1444 + ochBlockSize = 1448 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3027,145 +3027,146 @@ brakePedalState = scalar, S08, 1092, "", 1, 0 startStopState = scalar, S08, 1093, "", 1, 0 smartChipState = scalar, S08, 1094, "", 1, 0 smartChipRestartCounter = scalar, S08, 1095, "", 1, 0 -startStopPhysicalState = bits, U32, 1096, [0:0] -acrStateDup = bits, U32, 1096, [1:1] -acrEngineMovedRecently = bits, U32, 1096, [2:2] -heaterControlEnabled = bits, U32, 1096, [3:3] -luaDigitalState0 = bits, U32, 1096, [4:4] -luaDigitalState1 = bits, U32, 1096, [5:5] -luaDigitalState2 = bits, U32, 1096, [6:6] -luaDigitalState3 = bits, U32, 1096, [7:7] -startStopStateToggleCounter = scalar, U32, 1100, "", 1, 0 -egtValue1 = scalar, F32, 1104, "", 1, 0 -egtValue2 = scalar, F32, 1108, "", 1, 0 -desiredRpmLimit = scalar, S16, 1112, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1116, "", 1, 0 -sparkCounter = scalar, U32, 1120, "", 1, 0 -fuelingLoad = scalar, F32, 1124, "", 1, 0 -ignitionLoad = scalar, F32, 1128, "", 1, 0 -veTableYAxis = scalar, U16, 1132, "%", 0.01, 0 -; total TS size = 1136 -tpsFrom = scalar, F32, 1136 -tpsTo = scalar, F32, 1140 -deltaTps = scalar, F32, 1144 -extraFuel = scalar, F32, 1148, "", 1, 0 -valueFromTable = scalar, F32, 1152, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1156, [0:0] -isBelowDecelThreshold = bits, U32, 1156, [1:1] -isTimeToResetAccumulator = bits, U32, 1156, [2:2] -isFractionalEnrichment = bits, U32, 1156, [3:3] -belowEpsilon = bits, U32, 1156, [4:4] -tooShort = bits, U32, 1156, [5:5] -fractionalInjFuel = scalar, F32, 1160, "", 1, 0 -accumulatedValue = scalar, F32, 1164, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1168, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1172, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1176, "", 1, 0 -cycleCnt = scalar, S32, 1180, "", 1, 0 -; total TS size = 1184 -hwEventCounters1 = scalar, U32, 1184, "", 1, 0 -hwEventCounters2 = scalar, U32, 1188, "", 1, 0 -hwEventCounters3 = scalar, U32, 1192, "", 1, 0 -hwEventCounters4 = scalar, U32, 1196, "", 1, 0 -hwEventCounters5 = scalar, U32, 1200, "", 1, 0 -hwEventCounters6 = scalar, U32, 1204, "", 1, 0 -vvtCamCounter = scalar, U32, 1208, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1212, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1216, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1220, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1221, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1224, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1228, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1232, "", 1, 0 -mapCamPrevToothAngle = scalar, F32, 1236, "deg", 1, 0 -isDecodingMapCam = bits, U32, 1240, [0:0] -; total TS size = 1244 -crankSynchronizationCounter0 = scalar, U32, 1244, "", 1, 0 -vvtSyncGapRatio0 = scalar, F32, 1248, "", 1, 0 -vvtToothDurations00 = scalar, U32, 1252, "us", 1, 0 -vvtCurrentPosition0 = scalar, F32, 1256, "sync: Primary Cam Position", 1, 0 -vvtToothPosition10 = scalar, F32, 1260, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition20 = scalar, F32, 1264, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition30 = scalar, F32, 1268, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition40 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio0 = scalar, F32, 1276, "", 1, 0 -triggerStateIndex0 = scalar, U08, 1280, "", 1, 0 -vvtStateIndex0 = scalar, U08, 1281, "", 1, 0 -; total TS size = 1284 -camResyncCounter = scalar, U08, 1284, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1288, [0:0] -; total TS size = 1292 -wallFuelCorrection = scalar, F32, 1292, "", 1, 0 -wallFuel = scalar, F32, 1296, "", 1, 0 -; total TS size = 1300 -idleState = bits, S32, 1300, [0:2], "not important" -currentIdlePosition = scalar, F32, 1304 -baseIdlePosition = scalar, F32, 1308 -idleClosedLoop = scalar, F32, 1312 -iacByTpsTaper = scalar, F32, 1316 -throttlePedalUpState = scalar, S32, 1320, "", 1, 0 -mightResetPid = bits, U32, 1324, [0:0] -shouldResetPid = bits, U32, 1324, [1:1] -wasResetPid = bits, U32, 1324, [2:2] -mustResetPid = bits, U32, 1324, [3:3] -isCranking = bits, U32, 1324, [4:4] -isIacTableForCoasting = bits, U32, 1324, [5:5] -notIdling = bits, U32, 1324, [6:6] -needReset = bits, U32, 1324, [7:7] -isInDeadZone = bits, U32, 1324, [8:8] -isBlipping = bits, U32, 1324, [9:9] -useClosedLoop = bits, U32, 1324, [10:10] -badTps = bits, U32, 1324, [11:11] -looksLikeRunning = bits, U32, 1324, [12:12] -looksLikeCoasting = bits, U32, 1324, [13:13] -looksLikeCrankToIdle = bits, U32, 1324, [14:14] -isIdleCoasting = bits, U32, 1324, [15:15] -isIdleClosedLoop = bits, U32, 1324, [16:16] -idleTarget = scalar, S32, 1328, "", 1, 0 -targetRpmByClt = scalar, S32, 1332, "", 1, 0 -targetRpmAc = scalar, S32, 1336, "", 1, 0 -iacByRpmTaper = scalar, F32, 1340 -luaAdd = scalar, F32, 1344 -; total TS size = 1348 -idlePosition0 = scalar, F32, 1348, "per", 1,0 -trim0 = scalar, F32, 1352, "", 1, 0 -luaAdjustment0 = scalar, F32, 1356, "per", 1,0 -m_wastegatePosition0 = scalar, F32, 1360, "per", 1,0 -etbFeedForward0 = scalar, F32, 1364 -etbIntegralError0 = scalar, F32, 1368, "", 1, 0 -etbCurrentTarget0 = scalar, F32, 1372, "%", 1, 0 -etbCurrentAdjustedTarget0 = scalar, F32, 1376, "%", 1, 0 -etbRevLimitActive0 = bits, U32, 1380, [0:0] -jamDetected0 = bits, U32, 1380, [1:1] -etbDutyRateOfChange0 = scalar, F32, 1384, "per", 1,0 -etbDutyAverage0 = scalar, F32, 1388, "per", 1,0 -etbTpsErrorCounter0 = scalar, U16, 1392, "count", 1,0 -etbPpsErrorCounter0 = scalar, U16, 1394, "count", 1,0 -etbErrorCode0 = scalar, S08, 1396, "", 1, 0 -jamTimer0 = scalar, U16, 1398, "sec", 0.01, 0 -; total TS size = 1400 -faultCode0 = scalar, U08, 1400, "", 1, 0 -heaterDuty0 = scalar, U08, 1401, "%", 1, 0 -pumpDuty0 = scalar, U08, 1402, "%", 1, 0 -tempC0 = scalar, U16, 1404, "C", 1, 0 -nernstVoltage0 = scalar, U16, 1406, "V", 0.001, 0 -esr0 = scalar, U16, 1408, "ohm", 1, 0 -; total TS size = 1412 -dcOutput0 = scalar, F32, 1412, "per", 1,0 -isEnabled0_int = scalar, U08, 1416, "per", 1,0 -isEnabled0 = bits, U32, 1420, [0:0] -; total TS size = 1424 -value0 = scalar, U16, 1424, "value", 1,0 -value1 = scalar, U16, 1426, "value", 1,0 -errorRate = scalar, F32, 1428, "ratio", 1,0 -; total TS size = 1432 -vvtTarget = scalar, U16, 1432, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1434, "%", 0.5, 0 +smartChipAliveCounter = scalar, S08, 1096, "", 1, 0 +startStopPhysicalState = bits, U32, 1100, [0:0] +acrStateDup = bits, U32, 1100, [1:1] +acrEngineMovedRecently = bits, U32, 1100, [2:2] +heaterControlEnabled = bits, U32, 1100, [3:3] +luaDigitalState0 = bits, U32, 1100, [4:4] +luaDigitalState1 = bits, U32, 1100, [5:5] +luaDigitalState2 = bits, U32, 1100, [6:6] +luaDigitalState3 = bits, U32, 1100, [7:7] +startStopStateToggleCounter = scalar, U32, 1104, "", 1, 0 +egtValue1 = scalar, F32, 1108, "", 1, 0 +egtValue2 = scalar, F32, 1112, "", 1, 0 +desiredRpmLimit = scalar, S16, 1116, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 1120, "", 1, 0 +sparkCounter = scalar, U32, 1124, "", 1, 0 +fuelingLoad = scalar, F32, 1128, "", 1, 0 +ignitionLoad = scalar, F32, 1132, "", 1, 0 +veTableYAxis = scalar, U16, 1136, "%", 0.01, 0 +; total TS size = 1140 +tpsFrom = scalar, F32, 1140 +tpsTo = scalar, F32, 1144 +deltaTps = scalar, F32, 1148 +extraFuel = scalar, F32, 1152, "", 1, 0 +valueFromTable = scalar, F32, 1156, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1160, [0:0] +isBelowDecelThreshold = bits, U32, 1160, [1:1] +isTimeToResetAccumulator = bits, U32, 1160, [2:2] +isFractionalEnrichment = bits, U32, 1160, [3:3] +belowEpsilon = bits, U32, 1160, [4:4] +tooShort = bits, U32, 1160, [5:5] +fractionalInjFuel = scalar, F32, 1164, "", 1, 0 +accumulatedValue = scalar, F32, 1168, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1172, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1176, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1180, "", 1, 0 +cycleCnt = scalar, S32, 1184, "", 1, 0 +; total TS size = 1188 +hwEventCounters1 = scalar, U32, 1188, "", 1, 0 +hwEventCounters2 = scalar, U32, 1192, "", 1, 0 +hwEventCounters3 = scalar, U32, 1196, "", 1, 0 +hwEventCounters4 = scalar, U32, 1200, "", 1, 0 +hwEventCounters5 = scalar, U32, 1204, "", 1, 0 +hwEventCounters6 = scalar, U32, 1208, "", 1, 0 +vvtCamCounter = scalar, U32, 1212, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1216, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1220, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1224, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1225, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1228, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1232, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1236, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1240, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1244, [0:0] +; total TS size = 1248 +crankSynchronizationCounter0 = scalar, U32, 1248, "", 1, 0 +vvtSyncGapRatio0 = scalar, F32, 1252, "", 1, 0 +vvtToothDurations00 = scalar, U32, 1256, "us", 1, 0 +vvtCurrentPosition0 = scalar, F32, 1260, "sync: Primary Cam Position", 1, 0 +vvtToothPosition10 = scalar, F32, 1264, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition20 = scalar, F32, 1268, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition30 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition40 = scalar, F32, 1276, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio0 = scalar, F32, 1280, "", 1, 0 +triggerStateIndex0 = scalar, U08, 1284, "", 1, 0 +vvtStateIndex0 = scalar, U08, 1285, "", 1, 0 +; total TS size = 1288 +camResyncCounter = scalar, U08, 1288, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1292, [0:0] +; total TS size = 1296 +wallFuelCorrection = scalar, F32, 1296, "", 1, 0 +wallFuel = scalar, F32, 1300, "", 1, 0 +; total TS size = 1304 +idleState = bits, S32, 1304, [0:2], "not important" +currentIdlePosition = scalar, F32, 1308 +baseIdlePosition = scalar, F32, 1312 +idleClosedLoop = scalar, F32, 1316 +iacByTpsTaper = scalar, F32, 1320 +throttlePedalUpState = scalar, S32, 1324, "", 1, 0 +mightResetPid = bits, U32, 1328, [0:0] +shouldResetPid = bits, U32, 1328, [1:1] +wasResetPid = bits, U32, 1328, [2:2] +mustResetPid = bits, U32, 1328, [3:3] +isCranking = bits, U32, 1328, [4:4] +isIacTableForCoasting = bits, U32, 1328, [5:5] +notIdling = bits, U32, 1328, [6:6] +needReset = bits, U32, 1328, [7:7] +isInDeadZone = bits, U32, 1328, [8:8] +isBlipping = bits, U32, 1328, [9:9] +useClosedLoop = bits, U32, 1328, [10:10] +badTps = bits, U32, 1328, [11:11] +looksLikeRunning = bits, U32, 1328, [12:12] +looksLikeCoasting = bits, U32, 1328, [13:13] +looksLikeCrankToIdle = bits, U32, 1328, [14:14] +isIdleCoasting = bits, U32, 1328, [15:15] +isIdleClosedLoop = bits, U32, 1328, [16:16] +idleTarget = scalar, S32, 1332, "", 1, 0 +targetRpmByClt = scalar, S32, 1336, "", 1, 0 +targetRpmAc = scalar, S32, 1340, "", 1, 0 +iacByRpmTaper = scalar, F32, 1344 +luaAdd = scalar, F32, 1348 +; total TS size = 1352 +idlePosition0 = scalar, F32, 1352, "per", 1,0 +trim0 = scalar, F32, 1356, "", 1, 0 +luaAdjustment0 = scalar, F32, 1360, "per", 1,0 +m_wastegatePosition0 = scalar, F32, 1364, "per", 1,0 +etbFeedForward0 = scalar, F32, 1368 +etbIntegralError0 = scalar, F32, 1372, "", 1, 0 +etbCurrentTarget0 = scalar, F32, 1376, "%", 1, 0 +etbCurrentAdjustedTarget0 = scalar, F32, 1380, "%", 1, 0 +etbRevLimitActive0 = bits, U32, 1384, [0:0] +jamDetected0 = bits, U32, 1384, [1:1] +etbDutyRateOfChange0 = scalar, F32, 1388, "per", 1,0 +etbDutyAverage0 = scalar, F32, 1392, "per", 1,0 +etbTpsErrorCounter0 = scalar, U16, 1396, "count", 1,0 +etbPpsErrorCounter0 = scalar, U16, 1398, "count", 1,0 +etbErrorCode0 = scalar, S08, 1400, "", 1, 0 +jamTimer0 = scalar, U16, 1402, "sec", 0.01, 0 +; total TS size = 1404 +faultCode0 = scalar, U08, 1404, "", 1, 0 +heaterDuty0 = scalar, U08, 1405, "%", 1, 0 +pumpDuty0 = scalar, U08, 1406, "%", 1, 0 +tempC0 = scalar, U16, 1408, "C", 1, 0 +nernstVoltage0 = scalar, U16, 1410, "V", 0.001, 0 +esr0 = scalar, U16, 1412, "ohm", 1, 0 +; total TS size = 1416 +dcOutput0 = scalar, F32, 1416, "per", 1,0 +isEnabled0_int = scalar, U08, 1420, "per", 1,0 +isEnabled0 = bits, U32, 1424, [0:0] +; total TS size = 1428 +value0 = scalar, U16, 1428, "value", 1,0 +value1 = scalar, U16, 1430, "value", 1,0 +errorRate = scalar, F32, 1432, "ratio", 1,0 ; total TS size = 1436 -lambdaCurrentlyGood = bits, U32, 1436, [0:0] -lambdaMonitorCut = bits, U32, 1436, [1:1] -lambdaTimeSinceGood = scalar, U16, 1440, "sec", 0.01, 0 -; total TS size = 1444 +vvtTarget = scalar, U16, 1436, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1438, "%", 0.5, 0 +; total TS size = 1440 +lambdaCurrentlyGood = bits, U32, 1440, [0:0] +lambdaMonitorCut = bits, U32, 1440, [1:1] +lambdaTimeSinceGood = scalar, U16, 1444, "sec", 0.01, 0 +; total TS size = 1448 time = { timeNow } @@ -5237,6 +5238,7 @@ entry = brakePedalState, "Brake switch", int, "%d" entry = startStopState, "startStopState", int, "%d" entry = smartChipState, "smartChipState", int, "%d" entry = smartChipRestartCounter, "smartChipRestartCounter", int, "%d" +entry = smartChipAliveCounter, "smartChipAliveCounter", int, "%d" entry = startStopPhysicalState, "startStopPhysicalState", int, "%d" entry = acrStateDup, "acrStateDup", int, "%d" entry = acrEngineMovedRecently, "acrEngineMovedRecently", int, "%d" @@ -6203,16 +6205,17 @@ dialog = engine_stateDialog, "engine_state" graphLine = smartChipState graphLine = smartChipRestartCounter liveGraph = engine_state_5_Graph, "Graph", South + graphLine = smartChipAliveCounter graphLine = startStopStateToggleCounter graphLine = egtValue1 graphLine = egtValue2 - graphLine = desiredRpmLimit liveGraph = engine_state_6_Graph, "Graph", South + graphLine = desiredRpmLimit graphLine = fuelInjectionCounter graphLine = sparkCounter graphLine = fuelingLoad - graphLine = ignitionLoad liveGraph = engine_state_7_Graph, "Graph", South + graphLine = ignitionLoad graphLine = veTableYAxis indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_kin.ini b/firmware/tunerstudio/generated/rusefi_kin.ini index c9029e012e..4332a9a6bb 100644 --- a/firmware/tunerstudio/generated/rusefi_kin.ini +++ b/firmware/tunerstudio/generated/rusefi_kin.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.12.26.kin.3114394391" + signature = "rusEFI master.2023.12.26.kin.1905966581" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.12.26.kin.3114394391" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.12.26.kin.1905966581" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -92,7 +92,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="Disabled", "PA2", "PA3", "INVALID", "PD3", "INVALID", "INVALID", "INVALID", "PB12", "PB13", "INVALID", "PE2", "INVALID", "PC14", "PC15", "PC16", "PC17" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Tue Dec 26 01:36:34 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Tue Dec 26 22:47:05 UTC 2023 pageSize = 20712 page = 1 @@ -2373,7 +2373,7 @@ lambdaMaxDeviationRpmBins = array, U16, 20702, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1444 + ochBlockSize = 1448 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3027,145 +3027,146 @@ brakePedalState = scalar, S08, 1092, "", 1, 0 startStopState = scalar, S08, 1093, "", 1, 0 smartChipState = scalar, S08, 1094, "", 1, 0 smartChipRestartCounter = scalar, S08, 1095, "", 1, 0 -startStopPhysicalState = bits, U32, 1096, [0:0] -acrStateDup = bits, U32, 1096, [1:1] -acrEngineMovedRecently = bits, U32, 1096, [2:2] -heaterControlEnabled = bits, U32, 1096, [3:3] -luaDigitalState0 = bits, U32, 1096, [4:4] -luaDigitalState1 = bits, U32, 1096, [5:5] -luaDigitalState2 = bits, U32, 1096, [6:6] -luaDigitalState3 = bits, U32, 1096, [7:7] -startStopStateToggleCounter = scalar, U32, 1100, "", 1, 0 -egtValue1 = scalar, F32, 1104, "", 1, 0 -egtValue2 = scalar, F32, 1108, "", 1, 0 -desiredRpmLimit = scalar, S16, 1112, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1116, "", 1, 0 -sparkCounter = scalar, U32, 1120, "", 1, 0 -fuelingLoad = scalar, F32, 1124, "", 1, 0 -ignitionLoad = scalar, F32, 1128, "", 1, 0 -veTableYAxis = scalar, U16, 1132, "%", 0.01, 0 -; total TS size = 1136 -tpsFrom = scalar, F32, 1136 -tpsTo = scalar, F32, 1140 -deltaTps = scalar, F32, 1144 -extraFuel = scalar, F32, 1148, "", 1, 0 -valueFromTable = scalar, F32, 1152, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1156, [0:0] -isBelowDecelThreshold = bits, U32, 1156, [1:1] -isTimeToResetAccumulator = bits, U32, 1156, [2:2] -isFractionalEnrichment = bits, U32, 1156, [3:3] -belowEpsilon = bits, U32, 1156, [4:4] -tooShort = bits, U32, 1156, [5:5] -fractionalInjFuel = scalar, F32, 1160, "", 1, 0 -accumulatedValue = scalar, F32, 1164, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1168, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1172, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1176, "", 1, 0 -cycleCnt = scalar, S32, 1180, "", 1, 0 -; total TS size = 1184 -hwEventCounters1 = scalar, U32, 1184, "", 1, 0 -hwEventCounters2 = scalar, U32, 1188, "", 1, 0 -hwEventCounters3 = scalar, U32, 1192, "", 1, 0 -hwEventCounters4 = scalar, U32, 1196, "", 1, 0 -hwEventCounters5 = scalar, U32, 1200, "", 1, 0 -hwEventCounters6 = scalar, U32, 1204, "", 1, 0 -vvtCamCounter = scalar, U32, 1208, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1212, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1216, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1220, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1221, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1224, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1228, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1232, "", 1, 0 -mapCamPrevToothAngle = scalar, F32, 1236, "deg", 1, 0 -isDecodingMapCam = bits, U32, 1240, [0:0] -; total TS size = 1244 -crankSynchronizationCounter0 = scalar, U32, 1244, "", 1, 0 -vvtSyncGapRatio0 = scalar, F32, 1248, "", 1, 0 -vvtToothDurations00 = scalar, U32, 1252, "us", 1, 0 -vvtCurrentPosition0 = scalar, F32, 1256, "sync: Primary Cam Position", 1, 0 -vvtToothPosition10 = scalar, F32, 1260, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition20 = scalar, F32, 1264, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition30 = scalar, F32, 1268, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition40 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio0 = scalar, F32, 1276, "", 1, 0 -triggerStateIndex0 = scalar, U08, 1280, "", 1, 0 -vvtStateIndex0 = scalar, U08, 1281, "", 1, 0 -; total TS size = 1284 -camResyncCounter = scalar, U08, 1284, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1288, [0:0] -; total TS size = 1292 -wallFuelCorrection = scalar, F32, 1292, "", 1, 0 -wallFuel = scalar, F32, 1296, "", 1, 0 -; total TS size = 1300 -idleState = bits, S32, 1300, [0:2], "not important" -currentIdlePosition = scalar, F32, 1304 -baseIdlePosition = scalar, F32, 1308 -idleClosedLoop = scalar, F32, 1312 -iacByTpsTaper = scalar, F32, 1316 -throttlePedalUpState = scalar, S32, 1320, "", 1, 0 -mightResetPid = bits, U32, 1324, [0:0] -shouldResetPid = bits, U32, 1324, [1:1] -wasResetPid = bits, U32, 1324, [2:2] -mustResetPid = bits, U32, 1324, [3:3] -isCranking = bits, U32, 1324, [4:4] -isIacTableForCoasting = bits, U32, 1324, [5:5] -notIdling = bits, U32, 1324, [6:6] -needReset = bits, U32, 1324, [7:7] -isInDeadZone = bits, U32, 1324, [8:8] -isBlipping = bits, U32, 1324, [9:9] -useClosedLoop = bits, U32, 1324, [10:10] -badTps = bits, U32, 1324, [11:11] -looksLikeRunning = bits, U32, 1324, [12:12] -looksLikeCoasting = bits, U32, 1324, [13:13] -looksLikeCrankToIdle = bits, U32, 1324, [14:14] -isIdleCoasting = bits, U32, 1324, [15:15] -isIdleClosedLoop = bits, U32, 1324, [16:16] -idleTarget = scalar, S32, 1328, "", 1, 0 -targetRpmByClt = scalar, S32, 1332, "", 1, 0 -targetRpmAc = scalar, S32, 1336, "", 1, 0 -iacByRpmTaper = scalar, F32, 1340 -luaAdd = scalar, F32, 1344 -; total TS size = 1348 -idlePosition0 = scalar, F32, 1348, "per", 1,0 -trim0 = scalar, F32, 1352, "", 1, 0 -luaAdjustment0 = scalar, F32, 1356, "per", 1,0 -m_wastegatePosition0 = scalar, F32, 1360, "per", 1,0 -etbFeedForward0 = scalar, F32, 1364 -etbIntegralError0 = scalar, F32, 1368, "", 1, 0 -etbCurrentTarget0 = scalar, F32, 1372, "%", 1, 0 -etbCurrentAdjustedTarget0 = scalar, F32, 1376, "%", 1, 0 -etbRevLimitActive0 = bits, U32, 1380, [0:0] -jamDetected0 = bits, U32, 1380, [1:1] -etbDutyRateOfChange0 = scalar, F32, 1384, "per", 1,0 -etbDutyAverage0 = scalar, F32, 1388, "per", 1,0 -etbTpsErrorCounter0 = scalar, U16, 1392, "count", 1,0 -etbPpsErrorCounter0 = scalar, U16, 1394, "count", 1,0 -etbErrorCode0 = scalar, S08, 1396, "", 1, 0 -jamTimer0 = scalar, U16, 1398, "sec", 0.01, 0 -; total TS size = 1400 -faultCode0 = scalar, U08, 1400, "", 1, 0 -heaterDuty0 = scalar, U08, 1401, "%", 1, 0 -pumpDuty0 = scalar, U08, 1402, "%", 1, 0 -tempC0 = scalar, U16, 1404, "C", 1, 0 -nernstVoltage0 = scalar, U16, 1406, "V", 0.001, 0 -esr0 = scalar, U16, 1408, "ohm", 1, 0 -; total TS size = 1412 -dcOutput0 = scalar, F32, 1412, "per", 1,0 -isEnabled0_int = scalar, U08, 1416, "per", 1,0 -isEnabled0 = bits, U32, 1420, [0:0] -; total TS size = 1424 -value0 = scalar, U16, 1424, "value", 1,0 -value1 = scalar, U16, 1426, "value", 1,0 -errorRate = scalar, F32, 1428, "ratio", 1,0 -; total TS size = 1432 -vvtTarget = scalar, U16, 1432, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1434, "%", 0.5, 0 +smartChipAliveCounter = scalar, S08, 1096, "", 1, 0 +startStopPhysicalState = bits, U32, 1100, [0:0] +acrStateDup = bits, U32, 1100, [1:1] +acrEngineMovedRecently = bits, U32, 1100, [2:2] +heaterControlEnabled = bits, U32, 1100, [3:3] +luaDigitalState0 = bits, U32, 1100, [4:4] +luaDigitalState1 = bits, U32, 1100, [5:5] +luaDigitalState2 = bits, U32, 1100, [6:6] +luaDigitalState3 = bits, U32, 1100, [7:7] +startStopStateToggleCounter = scalar, U32, 1104, "", 1, 0 +egtValue1 = scalar, F32, 1108, "", 1, 0 +egtValue2 = scalar, F32, 1112, "", 1, 0 +desiredRpmLimit = scalar, S16, 1116, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 1120, "", 1, 0 +sparkCounter = scalar, U32, 1124, "", 1, 0 +fuelingLoad = scalar, F32, 1128, "", 1, 0 +ignitionLoad = scalar, F32, 1132, "", 1, 0 +veTableYAxis = scalar, U16, 1136, "%", 0.01, 0 +; total TS size = 1140 +tpsFrom = scalar, F32, 1140 +tpsTo = scalar, F32, 1144 +deltaTps = scalar, F32, 1148 +extraFuel = scalar, F32, 1152, "", 1, 0 +valueFromTable = scalar, F32, 1156, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1160, [0:0] +isBelowDecelThreshold = bits, U32, 1160, [1:1] +isTimeToResetAccumulator = bits, U32, 1160, [2:2] +isFractionalEnrichment = bits, U32, 1160, [3:3] +belowEpsilon = bits, U32, 1160, [4:4] +tooShort = bits, U32, 1160, [5:5] +fractionalInjFuel = scalar, F32, 1164, "", 1, 0 +accumulatedValue = scalar, F32, 1168, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1172, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1176, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1180, "", 1, 0 +cycleCnt = scalar, S32, 1184, "", 1, 0 +; total TS size = 1188 +hwEventCounters1 = scalar, U32, 1188, "", 1, 0 +hwEventCounters2 = scalar, U32, 1192, "", 1, 0 +hwEventCounters3 = scalar, U32, 1196, "", 1, 0 +hwEventCounters4 = scalar, U32, 1200, "", 1, 0 +hwEventCounters5 = scalar, U32, 1204, "", 1, 0 +hwEventCounters6 = scalar, U32, 1208, "", 1, 0 +vvtCamCounter = scalar, U32, 1212, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1216, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1220, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1224, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1225, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1228, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1232, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1236, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1240, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1244, [0:0] +; total TS size = 1248 +crankSynchronizationCounter0 = scalar, U32, 1248, "", 1, 0 +vvtSyncGapRatio0 = scalar, F32, 1252, "", 1, 0 +vvtToothDurations00 = scalar, U32, 1256, "us", 1, 0 +vvtCurrentPosition0 = scalar, F32, 1260, "sync: Primary Cam Position", 1, 0 +vvtToothPosition10 = scalar, F32, 1264, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition20 = scalar, F32, 1268, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition30 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition40 = scalar, F32, 1276, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio0 = scalar, F32, 1280, "", 1, 0 +triggerStateIndex0 = scalar, U08, 1284, "", 1, 0 +vvtStateIndex0 = scalar, U08, 1285, "", 1, 0 +; total TS size = 1288 +camResyncCounter = scalar, U08, 1288, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1292, [0:0] +; total TS size = 1296 +wallFuelCorrection = scalar, F32, 1296, "", 1, 0 +wallFuel = scalar, F32, 1300, "", 1, 0 +; total TS size = 1304 +idleState = bits, S32, 1304, [0:2], "not important" +currentIdlePosition = scalar, F32, 1308 +baseIdlePosition = scalar, F32, 1312 +idleClosedLoop = scalar, F32, 1316 +iacByTpsTaper = scalar, F32, 1320 +throttlePedalUpState = scalar, S32, 1324, "", 1, 0 +mightResetPid = bits, U32, 1328, [0:0] +shouldResetPid = bits, U32, 1328, [1:1] +wasResetPid = bits, U32, 1328, [2:2] +mustResetPid = bits, U32, 1328, [3:3] +isCranking = bits, U32, 1328, [4:4] +isIacTableForCoasting = bits, U32, 1328, [5:5] +notIdling = bits, U32, 1328, [6:6] +needReset = bits, U32, 1328, [7:7] +isInDeadZone = bits, U32, 1328, [8:8] +isBlipping = bits, U32, 1328, [9:9] +useClosedLoop = bits, U32, 1328, [10:10] +badTps = bits, U32, 1328, [11:11] +looksLikeRunning = bits, U32, 1328, [12:12] +looksLikeCoasting = bits, U32, 1328, [13:13] +looksLikeCrankToIdle = bits, U32, 1328, [14:14] +isIdleCoasting = bits, U32, 1328, [15:15] +isIdleClosedLoop = bits, U32, 1328, [16:16] +idleTarget = scalar, S32, 1332, "", 1, 0 +targetRpmByClt = scalar, S32, 1336, "", 1, 0 +targetRpmAc = scalar, S32, 1340, "", 1, 0 +iacByRpmTaper = scalar, F32, 1344 +luaAdd = scalar, F32, 1348 +; total TS size = 1352 +idlePosition0 = scalar, F32, 1352, "per", 1,0 +trim0 = scalar, F32, 1356, "", 1, 0 +luaAdjustment0 = scalar, F32, 1360, "per", 1,0 +m_wastegatePosition0 = scalar, F32, 1364, "per", 1,0 +etbFeedForward0 = scalar, F32, 1368 +etbIntegralError0 = scalar, F32, 1372, "", 1, 0 +etbCurrentTarget0 = scalar, F32, 1376, "%", 1, 0 +etbCurrentAdjustedTarget0 = scalar, F32, 1380, "%", 1, 0 +etbRevLimitActive0 = bits, U32, 1384, [0:0] +jamDetected0 = bits, U32, 1384, [1:1] +etbDutyRateOfChange0 = scalar, F32, 1388, "per", 1,0 +etbDutyAverage0 = scalar, F32, 1392, "per", 1,0 +etbTpsErrorCounter0 = scalar, U16, 1396, "count", 1,0 +etbPpsErrorCounter0 = scalar, U16, 1398, "count", 1,0 +etbErrorCode0 = scalar, S08, 1400, "", 1, 0 +jamTimer0 = scalar, U16, 1402, "sec", 0.01, 0 +; total TS size = 1404 +faultCode0 = scalar, U08, 1404, "", 1, 0 +heaterDuty0 = scalar, U08, 1405, "%", 1, 0 +pumpDuty0 = scalar, U08, 1406, "%", 1, 0 +tempC0 = scalar, U16, 1408, "C", 1, 0 +nernstVoltage0 = scalar, U16, 1410, "V", 0.001, 0 +esr0 = scalar, U16, 1412, "ohm", 1, 0 +; total TS size = 1416 +dcOutput0 = scalar, F32, 1416, "per", 1,0 +isEnabled0_int = scalar, U08, 1420, "per", 1,0 +isEnabled0 = bits, U32, 1424, [0:0] +; total TS size = 1428 +value0 = scalar, U16, 1428, "value", 1,0 +value1 = scalar, U16, 1430, "value", 1,0 +errorRate = scalar, F32, 1432, "ratio", 1,0 ; total TS size = 1436 -lambdaCurrentlyGood = bits, U32, 1436, [0:0] -lambdaMonitorCut = bits, U32, 1436, [1:1] -lambdaTimeSinceGood = scalar, U16, 1440, "sec", 0.01, 0 -; total TS size = 1444 +vvtTarget = scalar, U16, 1436, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1438, "%", 0.5, 0 +; total TS size = 1440 +lambdaCurrentlyGood = bits, U32, 1440, [0:0] +lambdaMonitorCut = bits, U32, 1440, [1:1] +lambdaTimeSinceGood = scalar, U16, 1444, "sec", 0.01, 0 +; total TS size = 1448 time = { timeNow } @@ -5237,6 +5238,7 @@ entry = brakePedalState, "Brake switch", int, "%d" entry = startStopState, "startStopState", int, "%d" entry = smartChipState, "smartChipState", int, "%d" entry = smartChipRestartCounter, "smartChipRestartCounter", int, "%d" +entry = smartChipAliveCounter, "smartChipAliveCounter", int, "%d" entry = startStopPhysicalState, "startStopPhysicalState", int, "%d" entry = acrStateDup, "acrStateDup", int, "%d" entry = acrEngineMovedRecently, "acrEngineMovedRecently", int, "%d" @@ -6202,16 +6204,17 @@ dialog = engine_stateDialog, "engine_state" graphLine = smartChipState graphLine = smartChipRestartCounter liveGraph = engine_state_5_Graph, "Graph", South + graphLine = smartChipAliveCounter graphLine = startStopStateToggleCounter graphLine = egtValue1 graphLine = egtValue2 - graphLine = desiredRpmLimit liveGraph = engine_state_6_Graph, "Graph", South + graphLine = desiredRpmLimit graphLine = fuelInjectionCounter graphLine = sparkCounter graphLine = fuelingLoad - graphLine = ignitionLoad liveGraph = engine_state_7_Graph, "Graph", South + graphLine = ignitionLoad graphLine = veTableYAxis indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_m74_9.ini b/firmware/tunerstudio/generated/rusefi_m74_9.ini index 7dd392098b..1912730a57 100644 --- a/firmware/tunerstudio/generated/rusefi_m74_9.ini +++ b/firmware/tunerstudio/generated/rusefi_m74_9.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.12.26.m74_9.1937674899" + signature = "rusEFI master.2023.12.26.m74_9.3141913713" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.12.26.m74_9.1937674899" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.12.26.m74_9.3141913713" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -92,7 +92,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","INVALID","MAF/MAP sensor signal","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","Pedal position sensor 1 signal","Pedal position sensor 2 signal","ETB position sensor 1 signal","ETB position sensor 2 signal" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Tue Dec 26 01:37:39 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Tue Dec 26 22:48:11 UTC 2023 pageSize = 22088 page = 1 @@ -2373,7 +2373,7 @@ lambdaMaxDeviationRpmBins = array, U16, 22078, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1444 + ochBlockSize = 1448 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3027,145 +3027,146 @@ brakePedalState = scalar, S08, 1092, "", 1, 0 startStopState = scalar, S08, 1093, "", 1, 0 smartChipState = scalar, S08, 1094, "", 1, 0 smartChipRestartCounter = scalar, S08, 1095, "", 1, 0 -startStopPhysicalState = bits, U32, 1096, [0:0] -acrStateDup = bits, U32, 1096, [1:1] -acrEngineMovedRecently = bits, U32, 1096, [2:2] -heaterControlEnabled = bits, U32, 1096, [3:3] -luaDigitalState0 = bits, U32, 1096, [4:4] -luaDigitalState1 = bits, U32, 1096, [5:5] -luaDigitalState2 = bits, U32, 1096, [6:6] -luaDigitalState3 = bits, U32, 1096, [7:7] -startStopStateToggleCounter = scalar, U32, 1100, "", 1, 0 -egtValue1 = scalar, F32, 1104, "", 1, 0 -egtValue2 = scalar, F32, 1108, "", 1, 0 -desiredRpmLimit = scalar, S16, 1112, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1116, "", 1, 0 -sparkCounter = scalar, U32, 1120, "", 1, 0 -fuelingLoad = scalar, F32, 1124, "", 1, 0 -ignitionLoad = scalar, F32, 1128, "", 1, 0 -veTableYAxis = scalar, U16, 1132, "%", 0.01, 0 -; total TS size = 1136 -tpsFrom = scalar, F32, 1136 -tpsTo = scalar, F32, 1140 -deltaTps = scalar, F32, 1144 -extraFuel = scalar, F32, 1148, "", 1, 0 -valueFromTable = scalar, F32, 1152, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1156, [0:0] -isBelowDecelThreshold = bits, U32, 1156, [1:1] -isTimeToResetAccumulator = bits, U32, 1156, [2:2] -isFractionalEnrichment = bits, U32, 1156, [3:3] -belowEpsilon = bits, U32, 1156, [4:4] -tooShort = bits, U32, 1156, [5:5] -fractionalInjFuel = scalar, F32, 1160, "", 1, 0 -accumulatedValue = scalar, F32, 1164, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1168, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1172, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1176, "", 1, 0 -cycleCnt = scalar, S32, 1180, "", 1, 0 -; total TS size = 1184 -hwEventCounters1 = scalar, U32, 1184, "", 1, 0 -hwEventCounters2 = scalar, U32, 1188, "", 1, 0 -hwEventCounters3 = scalar, U32, 1192, "", 1, 0 -hwEventCounters4 = scalar, U32, 1196, "", 1, 0 -hwEventCounters5 = scalar, U32, 1200, "", 1, 0 -hwEventCounters6 = scalar, U32, 1204, "", 1, 0 -vvtCamCounter = scalar, U32, 1208, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1212, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1216, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1220, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1221, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1224, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1228, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1232, "", 1, 0 -mapCamPrevToothAngle = scalar, F32, 1236, "deg", 1, 0 -isDecodingMapCam = bits, U32, 1240, [0:0] -; total TS size = 1244 -crankSynchronizationCounter0 = scalar, U32, 1244, "", 1, 0 -vvtSyncGapRatio0 = scalar, F32, 1248, "", 1, 0 -vvtToothDurations00 = scalar, U32, 1252, "us", 1, 0 -vvtCurrentPosition0 = scalar, F32, 1256, "sync: Primary Cam Position", 1, 0 -vvtToothPosition10 = scalar, F32, 1260, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition20 = scalar, F32, 1264, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition30 = scalar, F32, 1268, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition40 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio0 = scalar, F32, 1276, "", 1, 0 -triggerStateIndex0 = scalar, U08, 1280, "", 1, 0 -vvtStateIndex0 = scalar, U08, 1281, "", 1, 0 -; total TS size = 1284 -camResyncCounter = scalar, U08, 1284, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1288, [0:0] -; total TS size = 1292 -wallFuelCorrection = scalar, F32, 1292, "", 1, 0 -wallFuel = scalar, F32, 1296, "", 1, 0 -; total TS size = 1300 -idleState = bits, S32, 1300, [0:2], "not important" -currentIdlePosition = scalar, F32, 1304 -baseIdlePosition = scalar, F32, 1308 -idleClosedLoop = scalar, F32, 1312 -iacByTpsTaper = scalar, F32, 1316 -throttlePedalUpState = scalar, S32, 1320, "", 1, 0 -mightResetPid = bits, U32, 1324, [0:0] -shouldResetPid = bits, U32, 1324, [1:1] -wasResetPid = bits, U32, 1324, [2:2] -mustResetPid = bits, U32, 1324, [3:3] -isCranking = bits, U32, 1324, [4:4] -isIacTableForCoasting = bits, U32, 1324, [5:5] -notIdling = bits, U32, 1324, [6:6] -needReset = bits, U32, 1324, [7:7] -isInDeadZone = bits, U32, 1324, [8:8] -isBlipping = bits, U32, 1324, [9:9] -useClosedLoop = bits, U32, 1324, [10:10] -badTps = bits, U32, 1324, [11:11] -looksLikeRunning = bits, U32, 1324, [12:12] -looksLikeCoasting = bits, U32, 1324, [13:13] -looksLikeCrankToIdle = bits, U32, 1324, [14:14] -isIdleCoasting = bits, U32, 1324, [15:15] -isIdleClosedLoop = bits, U32, 1324, [16:16] -idleTarget = scalar, S32, 1328, "", 1, 0 -targetRpmByClt = scalar, S32, 1332, "", 1, 0 -targetRpmAc = scalar, S32, 1336, "", 1, 0 -iacByRpmTaper = scalar, F32, 1340 -luaAdd = scalar, F32, 1344 -; total TS size = 1348 -idlePosition0 = scalar, F32, 1348, "per", 1,0 -trim0 = scalar, F32, 1352, "", 1, 0 -luaAdjustment0 = scalar, F32, 1356, "per", 1,0 -m_wastegatePosition0 = scalar, F32, 1360, "per", 1,0 -etbFeedForward0 = scalar, F32, 1364 -etbIntegralError0 = scalar, F32, 1368, "", 1, 0 -etbCurrentTarget0 = scalar, F32, 1372, "%", 1, 0 -etbCurrentAdjustedTarget0 = scalar, F32, 1376, "%", 1, 0 -etbRevLimitActive0 = bits, U32, 1380, [0:0] -jamDetected0 = bits, U32, 1380, [1:1] -etbDutyRateOfChange0 = scalar, F32, 1384, "per", 1,0 -etbDutyAverage0 = scalar, F32, 1388, "per", 1,0 -etbTpsErrorCounter0 = scalar, U16, 1392, "count", 1,0 -etbPpsErrorCounter0 = scalar, U16, 1394, "count", 1,0 -etbErrorCode0 = scalar, S08, 1396, "", 1, 0 -jamTimer0 = scalar, U16, 1398, "sec", 0.01, 0 -; total TS size = 1400 -faultCode0 = scalar, U08, 1400, "", 1, 0 -heaterDuty0 = scalar, U08, 1401, "%", 1, 0 -pumpDuty0 = scalar, U08, 1402, "%", 1, 0 -tempC0 = scalar, U16, 1404, "C", 1, 0 -nernstVoltage0 = scalar, U16, 1406, "V", 0.001, 0 -esr0 = scalar, U16, 1408, "ohm", 1, 0 -; total TS size = 1412 -dcOutput0 = scalar, F32, 1412, "per", 1,0 -isEnabled0_int = scalar, U08, 1416, "per", 1,0 -isEnabled0 = bits, U32, 1420, [0:0] -; total TS size = 1424 -value0 = scalar, U16, 1424, "value", 1,0 -value1 = scalar, U16, 1426, "value", 1,0 -errorRate = scalar, F32, 1428, "ratio", 1,0 -; total TS size = 1432 -vvtTarget = scalar, U16, 1432, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1434, "%", 0.5, 0 +smartChipAliveCounter = scalar, S08, 1096, "", 1, 0 +startStopPhysicalState = bits, U32, 1100, [0:0] +acrStateDup = bits, U32, 1100, [1:1] +acrEngineMovedRecently = bits, U32, 1100, [2:2] +heaterControlEnabled = bits, U32, 1100, [3:3] +luaDigitalState0 = bits, U32, 1100, [4:4] +luaDigitalState1 = bits, U32, 1100, [5:5] +luaDigitalState2 = bits, U32, 1100, [6:6] +luaDigitalState3 = bits, U32, 1100, [7:7] +startStopStateToggleCounter = scalar, U32, 1104, "", 1, 0 +egtValue1 = scalar, F32, 1108, "", 1, 0 +egtValue2 = scalar, F32, 1112, "", 1, 0 +desiredRpmLimit = scalar, S16, 1116, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 1120, "", 1, 0 +sparkCounter = scalar, U32, 1124, "", 1, 0 +fuelingLoad = scalar, F32, 1128, "", 1, 0 +ignitionLoad = scalar, F32, 1132, "", 1, 0 +veTableYAxis = scalar, U16, 1136, "%", 0.01, 0 +; total TS size = 1140 +tpsFrom = scalar, F32, 1140 +tpsTo = scalar, F32, 1144 +deltaTps = scalar, F32, 1148 +extraFuel = scalar, F32, 1152, "", 1, 0 +valueFromTable = scalar, F32, 1156, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1160, [0:0] +isBelowDecelThreshold = bits, U32, 1160, [1:1] +isTimeToResetAccumulator = bits, U32, 1160, [2:2] +isFractionalEnrichment = bits, U32, 1160, [3:3] +belowEpsilon = bits, U32, 1160, [4:4] +tooShort = bits, U32, 1160, [5:5] +fractionalInjFuel = scalar, F32, 1164, "", 1, 0 +accumulatedValue = scalar, F32, 1168, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1172, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1176, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1180, "", 1, 0 +cycleCnt = scalar, S32, 1184, "", 1, 0 +; total TS size = 1188 +hwEventCounters1 = scalar, U32, 1188, "", 1, 0 +hwEventCounters2 = scalar, U32, 1192, "", 1, 0 +hwEventCounters3 = scalar, U32, 1196, "", 1, 0 +hwEventCounters4 = scalar, U32, 1200, "", 1, 0 +hwEventCounters5 = scalar, U32, 1204, "", 1, 0 +hwEventCounters6 = scalar, U32, 1208, "", 1, 0 +vvtCamCounter = scalar, U32, 1212, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1216, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1220, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1224, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1225, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1228, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1232, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1236, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1240, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1244, [0:0] +; total TS size = 1248 +crankSynchronizationCounter0 = scalar, U32, 1248, "", 1, 0 +vvtSyncGapRatio0 = scalar, F32, 1252, "", 1, 0 +vvtToothDurations00 = scalar, U32, 1256, "us", 1, 0 +vvtCurrentPosition0 = scalar, F32, 1260, "sync: Primary Cam Position", 1, 0 +vvtToothPosition10 = scalar, F32, 1264, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition20 = scalar, F32, 1268, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition30 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition40 = scalar, F32, 1276, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio0 = scalar, F32, 1280, "", 1, 0 +triggerStateIndex0 = scalar, U08, 1284, "", 1, 0 +vvtStateIndex0 = scalar, U08, 1285, "", 1, 0 +; total TS size = 1288 +camResyncCounter = scalar, U08, 1288, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1292, [0:0] +; total TS size = 1296 +wallFuelCorrection = scalar, F32, 1296, "", 1, 0 +wallFuel = scalar, F32, 1300, "", 1, 0 +; total TS size = 1304 +idleState = bits, S32, 1304, [0:2], "not important" +currentIdlePosition = scalar, F32, 1308 +baseIdlePosition = scalar, F32, 1312 +idleClosedLoop = scalar, F32, 1316 +iacByTpsTaper = scalar, F32, 1320 +throttlePedalUpState = scalar, S32, 1324, "", 1, 0 +mightResetPid = bits, U32, 1328, [0:0] +shouldResetPid = bits, U32, 1328, [1:1] +wasResetPid = bits, U32, 1328, [2:2] +mustResetPid = bits, U32, 1328, [3:3] +isCranking = bits, U32, 1328, [4:4] +isIacTableForCoasting = bits, U32, 1328, [5:5] +notIdling = bits, U32, 1328, [6:6] +needReset = bits, U32, 1328, [7:7] +isInDeadZone = bits, U32, 1328, [8:8] +isBlipping = bits, U32, 1328, [9:9] +useClosedLoop = bits, U32, 1328, [10:10] +badTps = bits, U32, 1328, [11:11] +looksLikeRunning = bits, U32, 1328, [12:12] +looksLikeCoasting = bits, U32, 1328, [13:13] +looksLikeCrankToIdle = bits, U32, 1328, [14:14] +isIdleCoasting = bits, U32, 1328, [15:15] +isIdleClosedLoop = bits, U32, 1328, [16:16] +idleTarget = scalar, S32, 1332, "", 1, 0 +targetRpmByClt = scalar, S32, 1336, "", 1, 0 +targetRpmAc = scalar, S32, 1340, "", 1, 0 +iacByRpmTaper = scalar, F32, 1344 +luaAdd = scalar, F32, 1348 +; total TS size = 1352 +idlePosition0 = scalar, F32, 1352, "per", 1,0 +trim0 = scalar, F32, 1356, "", 1, 0 +luaAdjustment0 = scalar, F32, 1360, "per", 1,0 +m_wastegatePosition0 = scalar, F32, 1364, "per", 1,0 +etbFeedForward0 = scalar, F32, 1368 +etbIntegralError0 = scalar, F32, 1372, "", 1, 0 +etbCurrentTarget0 = scalar, F32, 1376, "%", 1, 0 +etbCurrentAdjustedTarget0 = scalar, F32, 1380, "%", 1, 0 +etbRevLimitActive0 = bits, U32, 1384, [0:0] +jamDetected0 = bits, U32, 1384, [1:1] +etbDutyRateOfChange0 = scalar, F32, 1388, "per", 1,0 +etbDutyAverage0 = scalar, F32, 1392, "per", 1,0 +etbTpsErrorCounter0 = scalar, U16, 1396, "count", 1,0 +etbPpsErrorCounter0 = scalar, U16, 1398, "count", 1,0 +etbErrorCode0 = scalar, S08, 1400, "", 1, 0 +jamTimer0 = scalar, U16, 1402, "sec", 0.01, 0 +; total TS size = 1404 +faultCode0 = scalar, U08, 1404, "", 1, 0 +heaterDuty0 = scalar, U08, 1405, "%", 1, 0 +pumpDuty0 = scalar, U08, 1406, "%", 1, 0 +tempC0 = scalar, U16, 1408, "C", 1, 0 +nernstVoltage0 = scalar, U16, 1410, "V", 0.001, 0 +esr0 = scalar, U16, 1412, "ohm", 1, 0 +; total TS size = 1416 +dcOutput0 = scalar, F32, 1416, "per", 1,0 +isEnabled0_int = scalar, U08, 1420, "per", 1,0 +isEnabled0 = bits, U32, 1424, [0:0] +; total TS size = 1428 +value0 = scalar, U16, 1428, "value", 1,0 +value1 = scalar, U16, 1430, "value", 1,0 +errorRate = scalar, F32, 1432, "ratio", 1,0 ; total TS size = 1436 -lambdaCurrentlyGood = bits, U32, 1436, [0:0] -lambdaMonitorCut = bits, U32, 1436, [1:1] -lambdaTimeSinceGood = scalar, U16, 1440, "sec", 0.01, 0 -; total TS size = 1444 +vvtTarget = scalar, U16, 1436, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1438, "%", 0.5, 0 +; total TS size = 1440 +lambdaCurrentlyGood = bits, U32, 1440, [0:0] +lambdaMonitorCut = bits, U32, 1440, [1:1] +lambdaTimeSinceGood = scalar, U16, 1444, "sec", 0.01, 0 +; total TS size = 1448 time = { timeNow } @@ -5237,6 +5238,7 @@ entry = brakePedalState, "Brake switch", int, "%d" entry = startStopState, "startStopState", int, "%d" entry = smartChipState, "smartChipState", int, "%d" entry = smartChipRestartCounter, "smartChipRestartCounter", int, "%d" +entry = smartChipAliveCounter, "smartChipAliveCounter", int, "%d" entry = startStopPhysicalState, "startStopPhysicalState", int, "%d" entry = acrStateDup, "acrStateDup", int, "%d" entry = acrEngineMovedRecently, "acrEngineMovedRecently", int, "%d" @@ -6203,16 +6205,17 @@ dialog = engine_stateDialog, "engine_state" graphLine = smartChipState graphLine = smartChipRestartCounter liveGraph = engine_state_5_Graph, "Graph", South + graphLine = smartChipAliveCounter graphLine = startStopStateToggleCounter graphLine = egtValue1 graphLine = egtValue2 - graphLine = desiredRpmLimit liveGraph = engine_state_6_Graph, "Graph", South + graphLine = desiredRpmLimit graphLine = fuelInjectionCounter graphLine = sparkCounter graphLine = fuelingLoad - graphLine = ignitionLoad liveGraph = engine_state_7_Graph, "Graph", South + graphLine = ignitionLoad graphLine = veTableYAxis indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_mre_f4.ini b/firmware/tunerstudio/generated/rusefi_mre_f4.ini index 424798aa18..d4464c317e 100644 --- a/firmware/tunerstudio/generated/rusefi_mre_f4.ini +++ b/firmware/tunerstudio/generated/rusefi_mre_f4.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.12.26.mre_f4.3625831737" + signature = "rusEFI master.2023.12.26.mre_f4.270963675" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.12.26.mre_f4.3625831737" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.12.26.mre_f4.270963675" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -92,7 +92,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","18 - AN temp 1","23 - AN temp 2","24 - AN temp 3 or Hall Input","22 - AN temp 4 or Hall Input","28 - AN volt 10, Aux Reuse","INVALID","26 - AN volt 2","31 - AN volt 3","36 - AN volt 8, Aux Reuse","40 - AN volt 9, Aux Reuse","27 - AN volt 1","Battery Sense","19 - AN volt 4","20 - AN volt 5","32 - AN volt 6, Aux Reuse","30 - AN volt 7" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Tue Dec 26 01:37:37 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Tue Dec 26 22:48:08 UTC 2023 pageSize = 22088 page = 1 @@ -2373,7 +2373,7 @@ lambdaMaxDeviationRpmBins = array, U16, 22078, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1444 + ochBlockSize = 1448 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3027,145 +3027,146 @@ brakePedalState = scalar, S08, 1092, "", 1, 0 startStopState = scalar, S08, 1093, "", 1, 0 smartChipState = scalar, S08, 1094, "", 1, 0 smartChipRestartCounter = scalar, S08, 1095, "", 1, 0 -startStopPhysicalState = bits, U32, 1096, [0:0] -acrStateDup = bits, U32, 1096, [1:1] -acrEngineMovedRecently = bits, U32, 1096, [2:2] -heaterControlEnabled = bits, U32, 1096, [3:3] -luaDigitalState0 = bits, U32, 1096, [4:4] -luaDigitalState1 = bits, U32, 1096, [5:5] -luaDigitalState2 = bits, U32, 1096, [6:6] -luaDigitalState3 = bits, U32, 1096, [7:7] -startStopStateToggleCounter = scalar, U32, 1100, "", 1, 0 -egtValue1 = scalar, F32, 1104, "", 1, 0 -egtValue2 = scalar, F32, 1108, "", 1, 0 -desiredRpmLimit = scalar, S16, 1112, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1116, "", 1, 0 -sparkCounter = scalar, U32, 1120, "", 1, 0 -fuelingLoad = scalar, F32, 1124, "", 1, 0 -ignitionLoad = scalar, F32, 1128, "", 1, 0 -veTableYAxis = scalar, U16, 1132, "%", 0.01, 0 -; total TS size = 1136 -tpsFrom = scalar, F32, 1136 -tpsTo = scalar, F32, 1140 -deltaTps = scalar, F32, 1144 -extraFuel = scalar, F32, 1148, "", 1, 0 -valueFromTable = scalar, F32, 1152, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1156, [0:0] -isBelowDecelThreshold = bits, U32, 1156, [1:1] -isTimeToResetAccumulator = bits, U32, 1156, [2:2] -isFractionalEnrichment = bits, U32, 1156, [3:3] -belowEpsilon = bits, U32, 1156, [4:4] -tooShort = bits, U32, 1156, [5:5] -fractionalInjFuel = scalar, F32, 1160, "", 1, 0 -accumulatedValue = scalar, F32, 1164, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1168, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1172, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1176, "", 1, 0 -cycleCnt = scalar, S32, 1180, "", 1, 0 -; total TS size = 1184 -hwEventCounters1 = scalar, U32, 1184, "", 1, 0 -hwEventCounters2 = scalar, U32, 1188, "", 1, 0 -hwEventCounters3 = scalar, U32, 1192, "", 1, 0 -hwEventCounters4 = scalar, U32, 1196, "", 1, 0 -hwEventCounters5 = scalar, U32, 1200, "", 1, 0 -hwEventCounters6 = scalar, U32, 1204, "", 1, 0 -vvtCamCounter = scalar, U32, 1208, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1212, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1216, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1220, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1221, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1224, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1228, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1232, "", 1, 0 -mapCamPrevToothAngle = scalar, F32, 1236, "deg", 1, 0 -isDecodingMapCam = bits, U32, 1240, [0:0] -; total TS size = 1244 -crankSynchronizationCounter0 = scalar, U32, 1244, "", 1, 0 -vvtSyncGapRatio0 = scalar, F32, 1248, "", 1, 0 -vvtToothDurations00 = scalar, U32, 1252, "us", 1, 0 -vvtCurrentPosition0 = scalar, F32, 1256, "sync: Primary Cam Position", 1, 0 -vvtToothPosition10 = scalar, F32, 1260, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition20 = scalar, F32, 1264, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition30 = scalar, F32, 1268, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition40 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio0 = scalar, F32, 1276, "", 1, 0 -triggerStateIndex0 = scalar, U08, 1280, "", 1, 0 -vvtStateIndex0 = scalar, U08, 1281, "", 1, 0 -; total TS size = 1284 -camResyncCounter = scalar, U08, 1284, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1288, [0:0] -; total TS size = 1292 -wallFuelCorrection = scalar, F32, 1292, "", 1, 0 -wallFuel = scalar, F32, 1296, "", 1, 0 -; total TS size = 1300 -idleState = bits, S32, 1300, [0:2], "not important" -currentIdlePosition = scalar, F32, 1304 -baseIdlePosition = scalar, F32, 1308 -idleClosedLoop = scalar, F32, 1312 -iacByTpsTaper = scalar, F32, 1316 -throttlePedalUpState = scalar, S32, 1320, "", 1, 0 -mightResetPid = bits, U32, 1324, [0:0] -shouldResetPid = bits, U32, 1324, [1:1] -wasResetPid = bits, U32, 1324, [2:2] -mustResetPid = bits, U32, 1324, [3:3] -isCranking = bits, U32, 1324, [4:4] -isIacTableForCoasting = bits, U32, 1324, [5:5] -notIdling = bits, U32, 1324, [6:6] -needReset = bits, U32, 1324, [7:7] -isInDeadZone = bits, U32, 1324, [8:8] -isBlipping = bits, U32, 1324, [9:9] -useClosedLoop = bits, U32, 1324, [10:10] -badTps = bits, U32, 1324, [11:11] -looksLikeRunning = bits, U32, 1324, [12:12] -looksLikeCoasting = bits, U32, 1324, [13:13] -looksLikeCrankToIdle = bits, U32, 1324, [14:14] -isIdleCoasting = bits, U32, 1324, [15:15] -isIdleClosedLoop = bits, U32, 1324, [16:16] -idleTarget = scalar, S32, 1328, "", 1, 0 -targetRpmByClt = scalar, S32, 1332, "", 1, 0 -targetRpmAc = scalar, S32, 1336, "", 1, 0 -iacByRpmTaper = scalar, F32, 1340 -luaAdd = scalar, F32, 1344 -; total TS size = 1348 -idlePosition0 = scalar, F32, 1348, "per", 1,0 -trim0 = scalar, F32, 1352, "", 1, 0 -luaAdjustment0 = scalar, F32, 1356, "per", 1,0 -m_wastegatePosition0 = scalar, F32, 1360, "per", 1,0 -etbFeedForward0 = scalar, F32, 1364 -etbIntegralError0 = scalar, F32, 1368, "", 1, 0 -etbCurrentTarget0 = scalar, F32, 1372, "%", 1, 0 -etbCurrentAdjustedTarget0 = scalar, F32, 1376, "%", 1, 0 -etbRevLimitActive0 = bits, U32, 1380, [0:0] -jamDetected0 = bits, U32, 1380, [1:1] -etbDutyRateOfChange0 = scalar, F32, 1384, "per", 1,0 -etbDutyAverage0 = scalar, F32, 1388, "per", 1,0 -etbTpsErrorCounter0 = scalar, U16, 1392, "count", 1,0 -etbPpsErrorCounter0 = scalar, U16, 1394, "count", 1,0 -etbErrorCode0 = scalar, S08, 1396, "", 1, 0 -jamTimer0 = scalar, U16, 1398, "sec", 0.01, 0 -; total TS size = 1400 -faultCode0 = scalar, U08, 1400, "", 1, 0 -heaterDuty0 = scalar, U08, 1401, "%", 1, 0 -pumpDuty0 = scalar, U08, 1402, "%", 1, 0 -tempC0 = scalar, U16, 1404, "C", 1, 0 -nernstVoltage0 = scalar, U16, 1406, "V", 0.001, 0 -esr0 = scalar, U16, 1408, "ohm", 1, 0 -; total TS size = 1412 -dcOutput0 = scalar, F32, 1412, "per", 1,0 -isEnabled0_int = scalar, U08, 1416, "per", 1,0 -isEnabled0 = bits, U32, 1420, [0:0] -; total TS size = 1424 -value0 = scalar, U16, 1424, "value", 1,0 -value1 = scalar, U16, 1426, "value", 1,0 -errorRate = scalar, F32, 1428, "ratio", 1,0 -; total TS size = 1432 -vvtTarget = scalar, U16, 1432, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1434, "%", 0.5, 0 +smartChipAliveCounter = scalar, S08, 1096, "", 1, 0 +startStopPhysicalState = bits, U32, 1100, [0:0] +acrStateDup = bits, U32, 1100, [1:1] +acrEngineMovedRecently = bits, U32, 1100, [2:2] +heaterControlEnabled = bits, U32, 1100, [3:3] +luaDigitalState0 = bits, U32, 1100, [4:4] +luaDigitalState1 = bits, U32, 1100, [5:5] +luaDigitalState2 = bits, U32, 1100, [6:6] +luaDigitalState3 = bits, U32, 1100, [7:7] +startStopStateToggleCounter = scalar, U32, 1104, "", 1, 0 +egtValue1 = scalar, F32, 1108, "", 1, 0 +egtValue2 = scalar, F32, 1112, "", 1, 0 +desiredRpmLimit = scalar, S16, 1116, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 1120, "", 1, 0 +sparkCounter = scalar, U32, 1124, "", 1, 0 +fuelingLoad = scalar, F32, 1128, "", 1, 0 +ignitionLoad = scalar, F32, 1132, "", 1, 0 +veTableYAxis = scalar, U16, 1136, "%", 0.01, 0 +; total TS size = 1140 +tpsFrom = scalar, F32, 1140 +tpsTo = scalar, F32, 1144 +deltaTps = scalar, F32, 1148 +extraFuel = scalar, F32, 1152, "", 1, 0 +valueFromTable = scalar, F32, 1156, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1160, [0:0] +isBelowDecelThreshold = bits, U32, 1160, [1:1] +isTimeToResetAccumulator = bits, U32, 1160, [2:2] +isFractionalEnrichment = bits, U32, 1160, [3:3] +belowEpsilon = bits, U32, 1160, [4:4] +tooShort = bits, U32, 1160, [5:5] +fractionalInjFuel = scalar, F32, 1164, "", 1, 0 +accumulatedValue = scalar, F32, 1168, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1172, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1176, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1180, "", 1, 0 +cycleCnt = scalar, S32, 1184, "", 1, 0 +; total TS size = 1188 +hwEventCounters1 = scalar, U32, 1188, "", 1, 0 +hwEventCounters2 = scalar, U32, 1192, "", 1, 0 +hwEventCounters3 = scalar, U32, 1196, "", 1, 0 +hwEventCounters4 = scalar, U32, 1200, "", 1, 0 +hwEventCounters5 = scalar, U32, 1204, "", 1, 0 +hwEventCounters6 = scalar, U32, 1208, "", 1, 0 +vvtCamCounter = scalar, U32, 1212, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1216, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1220, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1224, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1225, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1228, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1232, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1236, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1240, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1244, [0:0] +; total TS size = 1248 +crankSynchronizationCounter0 = scalar, U32, 1248, "", 1, 0 +vvtSyncGapRatio0 = scalar, F32, 1252, "", 1, 0 +vvtToothDurations00 = scalar, U32, 1256, "us", 1, 0 +vvtCurrentPosition0 = scalar, F32, 1260, "sync: Primary Cam Position", 1, 0 +vvtToothPosition10 = scalar, F32, 1264, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition20 = scalar, F32, 1268, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition30 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition40 = scalar, F32, 1276, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio0 = scalar, F32, 1280, "", 1, 0 +triggerStateIndex0 = scalar, U08, 1284, "", 1, 0 +vvtStateIndex0 = scalar, U08, 1285, "", 1, 0 +; total TS size = 1288 +camResyncCounter = scalar, U08, 1288, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1292, [0:0] +; total TS size = 1296 +wallFuelCorrection = scalar, F32, 1296, "", 1, 0 +wallFuel = scalar, F32, 1300, "", 1, 0 +; total TS size = 1304 +idleState = bits, S32, 1304, [0:2], "not important" +currentIdlePosition = scalar, F32, 1308 +baseIdlePosition = scalar, F32, 1312 +idleClosedLoop = scalar, F32, 1316 +iacByTpsTaper = scalar, F32, 1320 +throttlePedalUpState = scalar, S32, 1324, "", 1, 0 +mightResetPid = bits, U32, 1328, [0:0] +shouldResetPid = bits, U32, 1328, [1:1] +wasResetPid = bits, U32, 1328, [2:2] +mustResetPid = bits, U32, 1328, [3:3] +isCranking = bits, U32, 1328, [4:4] +isIacTableForCoasting = bits, U32, 1328, [5:5] +notIdling = bits, U32, 1328, [6:6] +needReset = bits, U32, 1328, [7:7] +isInDeadZone = bits, U32, 1328, [8:8] +isBlipping = bits, U32, 1328, [9:9] +useClosedLoop = bits, U32, 1328, [10:10] +badTps = bits, U32, 1328, [11:11] +looksLikeRunning = bits, U32, 1328, [12:12] +looksLikeCoasting = bits, U32, 1328, [13:13] +looksLikeCrankToIdle = bits, U32, 1328, [14:14] +isIdleCoasting = bits, U32, 1328, [15:15] +isIdleClosedLoop = bits, U32, 1328, [16:16] +idleTarget = scalar, S32, 1332, "", 1, 0 +targetRpmByClt = scalar, S32, 1336, "", 1, 0 +targetRpmAc = scalar, S32, 1340, "", 1, 0 +iacByRpmTaper = scalar, F32, 1344 +luaAdd = scalar, F32, 1348 +; total TS size = 1352 +idlePosition0 = scalar, F32, 1352, "per", 1,0 +trim0 = scalar, F32, 1356, "", 1, 0 +luaAdjustment0 = scalar, F32, 1360, "per", 1,0 +m_wastegatePosition0 = scalar, F32, 1364, "per", 1,0 +etbFeedForward0 = scalar, F32, 1368 +etbIntegralError0 = scalar, F32, 1372, "", 1, 0 +etbCurrentTarget0 = scalar, F32, 1376, "%", 1, 0 +etbCurrentAdjustedTarget0 = scalar, F32, 1380, "%", 1, 0 +etbRevLimitActive0 = bits, U32, 1384, [0:0] +jamDetected0 = bits, U32, 1384, [1:1] +etbDutyRateOfChange0 = scalar, F32, 1388, "per", 1,0 +etbDutyAverage0 = scalar, F32, 1392, "per", 1,0 +etbTpsErrorCounter0 = scalar, U16, 1396, "count", 1,0 +etbPpsErrorCounter0 = scalar, U16, 1398, "count", 1,0 +etbErrorCode0 = scalar, S08, 1400, "", 1, 0 +jamTimer0 = scalar, U16, 1402, "sec", 0.01, 0 +; total TS size = 1404 +faultCode0 = scalar, U08, 1404, "", 1, 0 +heaterDuty0 = scalar, U08, 1405, "%", 1, 0 +pumpDuty0 = scalar, U08, 1406, "%", 1, 0 +tempC0 = scalar, U16, 1408, "C", 1, 0 +nernstVoltage0 = scalar, U16, 1410, "V", 0.001, 0 +esr0 = scalar, U16, 1412, "ohm", 1, 0 +; total TS size = 1416 +dcOutput0 = scalar, F32, 1416, "per", 1,0 +isEnabled0_int = scalar, U08, 1420, "per", 1,0 +isEnabled0 = bits, U32, 1424, [0:0] +; total TS size = 1428 +value0 = scalar, U16, 1428, "value", 1,0 +value1 = scalar, U16, 1430, "value", 1,0 +errorRate = scalar, F32, 1432, "ratio", 1,0 ; total TS size = 1436 -lambdaCurrentlyGood = bits, U32, 1436, [0:0] -lambdaMonitorCut = bits, U32, 1436, [1:1] -lambdaTimeSinceGood = scalar, U16, 1440, "sec", 0.01, 0 -; total TS size = 1444 +vvtTarget = scalar, U16, 1436, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1438, "%", 0.5, 0 +; total TS size = 1440 +lambdaCurrentlyGood = bits, U32, 1440, [0:0] +lambdaMonitorCut = bits, U32, 1440, [1:1] +lambdaTimeSinceGood = scalar, U16, 1444, "sec", 0.01, 0 +; total TS size = 1448 time = { timeNow } @@ -5238,6 +5239,7 @@ entry = brakePedalState, "Brake switch", int, "%d" entry = startStopState, "startStopState", int, "%d" entry = smartChipState, "smartChipState", int, "%d" entry = smartChipRestartCounter, "smartChipRestartCounter", int, "%d" +entry = smartChipAliveCounter, "smartChipAliveCounter", int, "%d" entry = startStopPhysicalState, "startStopPhysicalState", int, "%d" entry = acrStateDup, "acrStateDup", int, "%d" entry = acrEngineMovedRecently, "acrEngineMovedRecently", int, "%d" @@ -6205,16 +6207,17 @@ dialog = engine_stateDialog, "engine_state" graphLine = smartChipState graphLine = smartChipRestartCounter liveGraph = engine_state_5_Graph, "Graph", South + graphLine = smartChipAliveCounter graphLine = startStopStateToggleCounter graphLine = egtValue1 graphLine = egtValue2 - graphLine = desiredRpmLimit liveGraph = engine_state_6_Graph, "Graph", South + graphLine = desiredRpmLimit graphLine = fuelInjectionCounter graphLine = sparkCounter graphLine = fuelingLoad - graphLine = ignitionLoad liveGraph = engine_state_7_Graph, "Graph", South + graphLine = ignitionLoad graphLine = veTableYAxis indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_mre_f7.ini b/firmware/tunerstudio/generated/rusefi_mre_f7.ini index ef996f1ac3..c9add8fd55 100644 --- a/firmware/tunerstudio/generated/rusefi_mre_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_mre_f7.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.12.26.mre_f7.3625831737" + signature = "rusEFI master.2023.12.26.mre_f7.270963675" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.12.26.mre_f7.3625831737" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.12.26.mre_f7.270963675" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -92,7 +92,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","18 - AN temp 1","23 - AN temp 2","24 - AN temp 3 or Hall Input","22 - AN temp 4 or Hall Input","28 - AN volt 10, Aux Reuse","INVALID","26 - AN volt 2","31 - AN volt 3","36 - AN volt 8, Aux Reuse","40 - AN volt 9, Aux Reuse","27 - AN volt 1","Battery Sense","19 - AN volt 4","20 - AN volt 5","32 - AN volt 6, Aux Reuse","30 - AN volt 7" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Tue Dec 26 01:37:34 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Tue Dec 26 22:48:06 UTC 2023 pageSize = 22088 page = 1 @@ -2373,7 +2373,7 @@ lambdaMaxDeviationRpmBins = array, U16, 22078, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1444 + ochBlockSize = 1448 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3027,145 +3027,146 @@ brakePedalState = scalar, S08, 1092, "", 1, 0 startStopState = scalar, S08, 1093, "", 1, 0 smartChipState = scalar, S08, 1094, "", 1, 0 smartChipRestartCounter = scalar, S08, 1095, "", 1, 0 -startStopPhysicalState = bits, U32, 1096, [0:0] -acrStateDup = bits, U32, 1096, [1:1] -acrEngineMovedRecently = bits, U32, 1096, [2:2] -heaterControlEnabled = bits, U32, 1096, [3:3] -luaDigitalState0 = bits, U32, 1096, [4:4] -luaDigitalState1 = bits, U32, 1096, [5:5] -luaDigitalState2 = bits, U32, 1096, [6:6] -luaDigitalState3 = bits, U32, 1096, [7:7] -startStopStateToggleCounter = scalar, U32, 1100, "", 1, 0 -egtValue1 = scalar, F32, 1104, "", 1, 0 -egtValue2 = scalar, F32, 1108, "", 1, 0 -desiredRpmLimit = scalar, S16, 1112, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1116, "", 1, 0 -sparkCounter = scalar, U32, 1120, "", 1, 0 -fuelingLoad = scalar, F32, 1124, "", 1, 0 -ignitionLoad = scalar, F32, 1128, "", 1, 0 -veTableYAxis = scalar, U16, 1132, "%", 0.01, 0 -; total TS size = 1136 -tpsFrom = scalar, F32, 1136 -tpsTo = scalar, F32, 1140 -deltaTps = scalar, F32, 1144 -extraFuel = scalar, F32, 1148, "", 1, 0 -valueFromTable = scalar, F32, 1152, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1156, [0:0] -isBelowDecelThreshold = bits, U32, 1156, [1:1] -isTimeToResetAccumulator = bits, U32, 1156, [2:2] -isFractionalEnrichment = bits, U32, 1156, [3:3] -belowEpsilon = bits, U32, 1156, [4:4] -tooShort = bits, U32, 1156, [5:5] -fractionalInjFuel = scalar, F32, 1160, "", 1, 0 -accumulatedValue = scalar, F32, 1164, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1168, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1172, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1176, "", 1, 0 -cycleCnt = scalar, S32, 1180, "", 1, 0 -; total TS size = 1184 -hwEventCounters1 = scalar, U32, 1184, "", 1, 0 -hwEventCounters2 = scalar, U32, 1188, "", 1, 0 -hwEventCounters3 = scalar, U32, 1192, "", 1, 0 -hwEventCounters4 = scalar, U32, 1196, "", 1, 0 -hwEventCounters5 = scalar, U32, 1200, "", 1, 0 -hwEventCounters6 = scalar, U32, 1204, "", 1, 0 -vvtCamCounter = scalar, U32, 1208, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1212, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1216, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1220, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1221, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1224, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1228, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1232, "", 1, 0 -mapCamPrevToothAngle = scalar, F32, 1236, "deg", 1, 0 -isDecodingMapCam = bits, U32, 1240, [0:0] -; total TS size = 1244 -crankSynchronizationCounter0 = scalar, U32, 1244, "", 1, 0 -vvtSyncGapRatio0 = scalar, F32, 1248, "", 1, 0 -vvtToothDurations00 = scalar, U32, 1252, "us", 1, 0 -vvtCurrentPosition0 = scalar, F32, 1256, "sync: Primary Cam Position", 1, 0 -vvtToothPosition10 = scalar, F32, 1260, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition20 = scalar, F32, 1264, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition30 = scalar, F32, 1268, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition40 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio0 = scalar, F32, 1276, "", 1, 0 -triggerStateIndex0 = scalar, U08, 1280, "", 1, 0 -vvtStateIndex0 = scalar, U08, 1281, "", 1, 0 -; total TS size = 1284 -camResyncCounter = scalar, U08, 1284, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1288, [0:0] -; total TS size = 1292 -wallFuelCorrection = scalar, F32, 1292, "", 1, 0 -wallFuel = scalar, F32, 1296, "", 1, 0 -; total TS size = 1300 -idleState = bits, S32, 1300, [0:2], "not important" -currentIdlePosition = scalar, F32, 1304 -baseIdlePosition = scalar, F32, 1308 -idleClosedLoop = scalar, F32, 1312 -iacByTpsTaper = scalar, F32, 1316 -throttlePedalUpState = scalar, S32, 1320, "", 1, 0 -mightResetPid = bits, U32, 1324, [0:0] -shouldResetPid = bits, U32, 1324, [1:1] -wasResetPid = bits, U32, 1324, [2:2] -mustResetPid = bits, U32, 1324, [3:3] -isCranking = bits, U32, 1324, [4:4] -isIacTableForCoasting = bits, U32, 1324, [5:5] -notIdling = bits, U32, 1324, [6:6] -needReset = bits, U32, 1324, [7:7] -isInDeadZone = bits, U32, 1324, [8:8] -isBlipping = bits, U32, 1324, [9:9] -useClosedLoop = bits, U32, 1324, [10:10] -badTps = bits, U32, 1324, [11:11] -looksLikeRunning = bits, U32, 1324, [12:12] -looksLikeCoasting = bits, U32, 1324, [13:13] -looksLikeCrankToIdle = bits, U32, 1324, [14:14] -isIdleCoasting = bits, U32, 1324, [15:15] -isIdleClosedLoop = bits, U32, 1324, [16:16] -idleTarget = scalar, S32, 1328, "", 1, 0 -targetRpmByClt = scalar, S32, 1332, "", 1, 0 -targetRpmAc = scalar, S32, 1336, "", 1, 0 -iacByRpmTaper = scalar, F32, 1340 -luaAdd = scalar, F32, 1344 -; total TS size = 1348 -idlePosition0 = scalar, F32, 1348, "per", 1,0 -trim0 = scalar, F32, 1352, "", 1, 0 -luaAdjustment0 = scalar, F32, 1356, "per", 1,0 -m_wastegatePosition0 = scalar, F32, 1360, "per", 1,0 -etbFeedForward0 = scalar, F32, 1364 -etbIntegralError0 = scalar, F32, 1368, "", 1, 0 -etbCurrentTarget0 = scalar, F32, 1372, "%", 1, 0 -etbCurrentAdjustedTarget0 = scalar, F32, 1376, "%", 1, 0 -etbRevLimitActive0 = bits, U32, 1380, [0:0] -jamDetected0 = bits, U32, 1380, [1:1] -etbDutyRateOfChange0 = scalar, F32, 1384, "per", 1,0 -etbDutyAverage0 = scalar, F32, 1388, "per", 1,0 -etbTpsErrorCounter0 = scalar, U16, 1392, "count", 1,0 -etbPpsErrorCounter0 = scalar, U16, 1394, "count", 1,0 -etbErrorCode0 = scalar, S08, 1396, "", 1, 0 -jamTimer0 = scalar, U16, 1398, "sec", 0.01, 0 -; total TS size = 1400 -faultCode0 = scalar, U08, 1400, "", 1, 0 -heaterDuty0 = scalar, U08, 1401, "%", 1, 0 -pumpDuty0 = scalar, U08, 1402, "%", 1, 0 -tempC0 = scalar, U16, 1404, "C", 1, 0 -nernstVoltage0 = scalar, U16, 1406, "V", 0.001, 0 -esr0 = scalar, U16, 1408, "ohm", 1, 0 -; total TS size = 1412 -dcOutput0 = scalar, F32, 1412, "per", 1,0 -isEnabled0_int = scalar, U08, 1416, "per", 1,0 -isEnabled0 = bits, U32, 1420, [0:0] -; total TS size = 1424 -value0 = scalar, U16, 1424, "value", 1,0 -value1 = scalar, U16, 1426, "value", 1,0 -errorRate = scalar, F32, 1428, "ratio", 1,0 -; total TS size = 1432 -vvtTarget = scalar, U16, 1432, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1434, "%", 0.5, 0 +smartChipAliveCounter = scalar, S08, 1096, "", 1, 0 +startStopPhysicalState = bits, U32, 1100, [0:0] +acrStateDup = bits, U32, 1100, [1:1] +acrEngineMovedRecently = bits, U32, 1100, [2:2] +heaterControlEnabled = bits, U32, 1100, [3:3] +luaDigitalState0 = bits, U32, 1100, [4:4] +luaDigitalState1 = bits, U32, 1100, [5:5] +luaDigitalState2 = bits, U32, 1100, [6:6] +luaDigitalState3 = bits, U32, 1100, [7:7] +startStopStateToggleCounter = scalar, U32, 1104, "", 1, 0 +egtValue1 = scalar, F32, 1108, "", 1, 0 +egtValue2 = scalar, F32, 1112, "", 1, 0 +desiredRpmLimit = scalar, S16, 1116, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 1120, "", 1, 0 +sparkCounter = scalar, U32, 1124, "", 1, 0 +fuelingLoad = scalar, F32, 1128, "", 1, 0 +ignitionLoad = scalar, F32, 1132, "", 1, 0 +veTableYAxis = scalar, U16, 1136, "%", 0.01, 0 +; total TS size = 1140 +tpsFrom = scalar, F32, 1140 +tpsTo = scalar, F32, 1144 +deltaTps = scalar, F32, 1148 +extraFuel = scalar, F32, 1152, "", 1, 0 +valueFromTable = scalar, F32, 1156, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1160, [0:0] +isBelowDecelThreshold = bits, U32, 1160, [1:1] +isTimeToResetAccumulator = bits, U32, 1160, [2:2] +isFractionalEnrichment = bits, U32, 1160, [3:3] +belowEpsilon = bits, U32, 1160, [4:4] +tooShort = bits, U32, 1160, [5:5] +fractionalInjFuel = scalar, F32, 1164, "", 1, 0 +accumulatedValue = scalar, F32, 1168, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1172, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1176, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1180, "", 1, 0 +cycleCnt = scalar, S32, 1184, "", 1, 0 +; total TS size = 1188 +hwEventCounters1 = scalar, U32, 1188, "", 1, 0 +hwEventCounters2 = scalar, U32, 1192, "", 1, 0 +hwEventCounters3 = scalar, U32, 1196, "", 1, 0 +hwEventCounters4 = scalar, U32, 1200, "", 1, 0 +hwEventCounters5 = scalar, U32, 1204, "", 1, 0 +hwEventCounters6 = scalar, U32, 1208, "", 1, 0 +vvtCamCounter = scalar, U32, 1212, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1216, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1220, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1224, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1225, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1228, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1232, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1236, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1240, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1244, [0:0] +; total TS size = 1248 +crankSynchronizationCounter0 = scalar, U32, 1248, "", 1, 0 +vvtSyncGapRatio0 = scalar, F32, 1252, "", 1, 0 +vvtToothDurations00 = scalar, U32, 1256, "us", 1, 0 +vvtCurrentPosition0 = scalar, F32, 1260, "sync: Primary Cam Position", 1, 0 +vvtToothPosition10 = scalar, F32, 1264, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition20 = scalar, F32, 1268, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition30 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition40 = scalar, F32, 1276, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio0 = scalar, F32, 1280, "", 1, 0 +triggerStateIndex0 = scalar, U08, 1284, "", 1, 0 +vvtStateIndex0 = scalar, U08, 1285, "", 1, 0 +; total TS size = 1288 +camResyncCounter = scalar, U08, 1288, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1292, [0:0] +; total TS size = 1296 +wallFuelCorrection = scalar, F32, 1296, "", 1, 0 +wallFuel = scalar, F32, 1300, "", 1, 0 +; total TS size = 1304 +idleState = bits, S32, 1304, [0:2], "not important" +currentIdlePosition = scalar, F32, 1308 +baseIdlePosition = scalar, F32, 1312 +idleClosedLoop = scalar, F32, 1316 +iacByTpsTaper = scalar, F32, 1320 +throttlePedalUpState = scalar, S32, 1324, "", 1, 0 +mightResetPid = bits, U32, 1328, [0:0] +shouldResetPid = bits, U32, 1328, [1:1] +wasResetPid = bits, U32, 1328, [2:2] +mustResetPid = bits, U32, 1328, [3:3] +isCranking = bits, U32, 1328, [4:4] +isIacTableForCoasting = bits, U32, 1328, [5:5] +notIdling = bits, U32, 1328, [6:6] +needReset = bits, U32, 1328, [7:7] +isInDeadZone = bits, U32, 1328, [8:8] +isBlipping = bits, U32, 1328, [9:9] +useClosedLoop = bits, U32, 1328, [10:10] +badTps = bits, U32, 1328, [11:11] +looksLikeRunning = bits, U32, 1328, [12:12] +looksLikeCoasting = bits, U32, 1328, [13:13] +looksLikeCrankToIdle = bits, U32, 1328, [14:14] +isIdleCoasting = bits, U32, 1328, [15:15] +isIdleClosedLoop = bits, U32, 1328, [16:16] +idleTarget = scalar, S32, 1332, "", 1, 0 +targetRpmByClt = scalar, S32, 1336, "", 1, 0 +targetRpmAc = scalar, S32, 1340, "", 1, 0 +iacByRpmTaper = scalar, F32, 1344 +luaAdd = scalar, F32, 1348 +; total TS size = 1352 +idlePosition0 = scalar, F32, 1352, "per", 1,0 +trim0 = scalar, F32, 1356, "", 1, 0 +luaAdjustment0 = scalar, F32, 1360, "per", 1,0 +m_wastegatePosition0 = scalar, F32, 1364, "per", 1,0 +etbFeedForward0 = scalar, F32, 1368 +etbIntegralError0 = scalar, F32, 1372, "", 1, 0 +etbCurrentTarget0 = scalar, F32, 1376, "%", 1, 0 +etbCurrentAdjustedTarget0 = scalar, F32, 1380, "%", 1, 0 +etbRevLimitActive0 = bits, U32, 1384, [0:0] +jamDetected0 = bits, U32, 1384, [1:1] +etbDutyRateOfChange0 = scalar, F32, 1388, "per", 1,0 +etbDutyAverage0 = scalar, F32, 1392, "per", 1,0 +etbTpsErrorCounter0 = scalar, U16, 1396, "count", 1,0 +etbPpsErrorCounter0 = scalar, U16, 1398, "count", 1,0 +etbErrorCode0 = scalar, S08, 1400, "", 1, 0 +jamTimer0 = scalar, U16, 1402, "sec", 0.01, 0 +; total TS size = 1404 +faultCode0 = scalar, U08, 1404, "", 1, 0 +heaterDuty0 = scalar, U08, 1405, "%", 1, 0 +pumpDuty0 = scalar, U08, 1406, "%", 1, 0 +tempC0 = scalar, U16, 1408, "C", 1, 0 +nernstVoltage0 = scalar, U16, 1410, "V", 0.001, 0 +esr0 = scalar, U16, 1412, "ohm", 1, 0 +; total TS size = 1416 +dcOutput0 = scalar, F32, 1416, "per", 1,0 +isEnabled0_int = scalar, U08, 1420, "per", 1,0 +isEnabled0 = bits, U32, 1424, [0:0] +; total TS size = 1428 +value0 = scalar, U16, 1428, "value", 1,0 +value1 = scalar, U16, 1430, "value", 1,0 +errorRate = scalar, F32, 1432, "ratio", 1,0 ; total TS size = 1436 -lambdaCurrentlyGood = bits, U32, 1436, [0:0] -lambdaMonitorCut = bits, U32, 1436, [1:1] -lambdaTimeSinceGood = scalar, U16, 1440, "sec", 0.01, 0 -; total TS size = 1444 +vvtTarget = scalar, U16, 1436, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1438, "%", 0.5, 0 +; total TS size = 1440 +lambdaCurrentlyGood = bits, U32, 1440, [0:0] +lambdaMonitorCut = bits, U32, 1440, [1:1] +lambdaTimeSinceGood = scalar, U16, 1444, "sec", 0.01, 0 +; total TS size = 1448 time = { timeNow } @@ -5238,6 +5239,7 @@ entry = brakePedalState, "Brake switch", int, "%d" entry = startStopState, "startStopState", int, "%d" entry = smartChipState, "smartChipState", int, "%d" entry = smartChipRestartCounter, "smartChipRestartCounter", int, "%d" +entry = smartChipAliveCounter, "smartChipAliveCounter", int, "%d" entry = startStopPhysicalState, "startStopPhysicalState", int, "%d" entry = acrStateDup, "acrStateDup", int, "%d" entry = acrEngineMovedRecently, "acrEngineMovedRecently", int, "%d" @@ -6205,16 +6207,17 @@ dialog = engine_stateDialog, "engine_state" graphLine = smartChipState graphLine = smartChipRestartCounter liveGraph = engine_state_5_Graph, "Graph", South + graphLine = smartChipAliveCounter graphLine = startStopStateToggleCounter graphLine = egtValue1 graphLine = egtValue2 - graphLine = desiredRpmLimit liveGraph = engine_state_6_Graph, "Graph", South + graphLine = desiredRpmLimit graphLine = fuelInjectionCounter graphLine = sparkCounter graphLine = fuelingLoad - graphLine = ignitionLoad liveGraph = engine_state_7_Graph, "Graph", South + graphLine = ignitionLoad graphLine = veTableYAxis indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_nucleo_h743.ini b/firmware/tunerstudio/generated/rusefi_nucleo_h743.ini index 75d53bbe3d..332a257971 100644 --- a/firmware/tunerstudio/generated/rusefi_nucleo_h743.ini +++ b/firmware/tunerstudio/generated/rusefi_nucleo_h743.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.12.26.nucleo_h743.4218430649" + signature = "rusEFI master.2023.12.26.nucleo_h743.860584539" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.12.26.nucleo_h743.4218430649" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.12.26.nucleo_h743.860584539" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -92,7 +92,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="Disabled", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PB0", "PB1", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Tue Dec 26 01:38:14 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Tue Dec 26 22:48:45 UTC 2023 pageSize = 22088 page = 1 @@ -2373,7 +2373,7 @@ lambdaMaxDeviationRpmBins = array, U16, 22078, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1444 + ochBlockSize = 1448 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3027,145 +3027,146 @@ brakePedalState = scalar, S08, 1092, "", 1, 0 startStopState = scalar, S08, 1093, "", 1, 0 smartChipState = scalar, S08, 1094, "", 1, 0 smartChipRestartCounter = scalar, S08, 1095, "", 1, 0 -startStopPhysicalState = bits, U32, 1096, [0:0] -acrStateDup = bits, U32, 1096, [1:1] -acrEngineMovedRecently = bits, U32, 1096, [2:2] -heaterControlEnabled = bits, U32, 1096, [3:3] -luaDigitalState0 = bits, U32, 1096, [4:4] -luaDigitalState1 = bits, U32, 1096, [5:5] -luaDigitalState2 = bits, U32, 1096, [6:6] -luaDigitalState3 = bits, U32, 1096, [7:7] -startStopStateToggleCounter = scalar, U32, 1100, "", 1, 0 -egtValue1 = scalar, F32, 1104, "", 1, 0 -egtValue2 = scalar, F32, 1108, "", 1, 0 -desiredRpmLimit = scalar, S16, 1112, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1116, "", 1, 0 -sparkCounter = scalar, U32, 1120, "", 1, 0 -fuelingLoad = scalar, F32, 1124, "", 1, 0 -ignitionLoad = scalar, F32, 1128, "", 1, 0 -veTableYAxis = scalar, U16, 1132, "%", 0.01, 0 -; total TS size = 1136 -tpsFrom = scalar, F32, 1136 -tpsTo = scalar, F32, 1140 -deltaTps = scalar, F32, 1144 -extraFuel = scalar, F32, 1148, "", 1, 0 -valueFromTable = scalar, F32, 1152, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1156, [0:0] -isBelowDecelThreshold = bits, U32, 1156, [1:1] -isTimeToResetAccumulator = bits, U32, 1156, [2:2] -isFractionalEnrichment = bits, U32, 1156, [3:3] -belowEpsilon = bits, U32, 1156, [4:4] -tooShort = bits, U32, 1156, [5:5] -fractionalInjFuel = scalar, F32, 1160, "", 1, 0 -accumulatedValue = scalar, F32, 1164, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1168, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1172, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1176, "", 1, 0 -cycleCnt = scalar, S32, 1180, "", 1, 0 -; total TS size = 1184 -hwEventCounters1 = scalar, U32, 1184, "", 1, 0 -hwEventCounters2 = scalar, U32, 1188, "", 1, 0 -hwEventCounters3 = scalar, U32, 1192, "", 1, 0 -hwEventCounters4 = scalar, U32, 1196, "", 1, 0 -hwEventCounters5 = scalar, U32, 1200, "", 1, 0 -hwEventCounters6 = scalar, U32, 1204, "", 1, 0 -vvtCamCounter = scalar, U32, 1208, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1212, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1216, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1220, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1221, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1224, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1228, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1232, "", 1, 0 -mapCamPrevToothAngle = scalar, F32, 1236, "deg", 1, 0 -isDecodingMapCam = bits, U32, 1240, [0:0] -; total TS size = 1244 -crankSynchronizationCounter0 = scalar, U32, 1244, "", 1, 0 -vvtSyncGapRatio0 = scalar, F32, 1248, "", 1, 0 -vvtToothDurations00 = scalar, U32, 1252, "us", 1, 0 -vvtCurrentPosition0 = scalar, F32, 1256, "sync: Primary Cam Position", 1, 0 -vvtToothPosition10 = scalar, F32, 1260, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition20 = scalar, F32, 1264, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition30 = scalar, F32, 1268, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition40 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio0 = scalar, F32, 1276, "", 1, 0 -triggerStateIndex0 = scalar, U08, 1280, "", 1, 0 -vvtStateIndex0 = scalar, U08, 1281, "", 1, 0 -; total TS size = 1284 -camResyncCounter = scalar, U08, 1284, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1288, [0:0] -; total TS size = 1292 -wallFuelCorrection = scalar, F32, 1292, "", 1, 0 -wallFuel = scalar, F32, 1296, "", 1, 0 -; total TS size = 1300 -idleState = bits, S32, 1300, [0:2], "not important" -currentIdlePosition = scalar, F32, 1304 -baseIdlePosition = scalar, F32, 1308 -idleClosedLoop = scalar, F32, 1312 -iacByTpsTaper = scalar, F32, 1316 -throttlePedalUpState = scalar, S32, 1320, "", 1, 0 -mightResetPid = bits, U32, 1324, [0:0] -shouldResetPid = bits, U32, 1324, [1:1] -wasResetPid = bits, U32, 1324, [2:2] -mustResetPid = bits, U32, 1324, [3:3] -isCranking = bits, U32, 1324, [4:4] -isIacTableForCoasting = bits, U32, 1324, [5:5] -notIdling = bits, U32, 1324, [6:6] -needReset = bits, U32, 1324, [7:7] -isInDeadZone = bits, U32, 1324, [8:8] -isBlipping = bits, U32, 1324, [9:9] -useClosedLoop = bits, U32, 1324, [10:10] -badTps = bits, U32, 1324, [11:11] -looksLikeRunning = bits, U32, 1324, [12:12] -looksLikeCoasting = bits, U32, 1324, [13:13] -looksLikeCrankToIdle = bits, U32, 1324, [14:14] -isIdleCoasting = bits, U32, 1324, [15:15] -isIdleClosedLoop = bits, U32, 1324, [16:16] -idleTarget = scalar, S32, 1328, "", 1, 0 -targetRpmByClt = scalar, S32, 1332, "", 1, 0 -targetRpmAc = scalar, S32, 1336, "", 1, 0 -iacByRpmTaper = scalar, F32, 1340 -luaAdd = scalar, F32, 1344 -; total TS size = 1348 -idlePosition0 = scalar, F32, 1348, "per", 1,0 -trim0 = scalar, F32, 1352, "", 1, 0 -luaAdjustment0 = scalar, F32, 1356, "per", 1,0 -m_wastegatePosition0 = scalar, F32, 1360, "per", 1,0 -etbFeedForward0 = scalar, F32, 1364 -etbIntegralError0 = scalar, F32, 1368, "", 1, 0 -etbCurrentTarget0 = scalar, F32, 1372, "%", 1, 0 -etbCurrentAdjustedTarget0 = scalar, F32, 1376, "%", 1, 0 -etbRevLimitActive0 = bits, U32, 1380, [0:0] -jamDetected0 = bits, U32, 1380, [1:1] -etbDutyRateOfChange0 = scalar, F32, 1384, "per", 1,0 -etbDutyAverage0 = scalar, F32, 1388, "per", 1,0 -etbTpsErrorCounter0 = scalar, U16, 1392, "count", 1,0 -etbPpsErrorCounter0 = scalar, U16, 1394, "count", 1,0 -etbErrorCode0 = scalar, S08, 1396, "", 1, 0 -jamTimer0 = scalar, U16, 1398, "sec", 0.01, 0 -; total TS size = 1400 -faultCode0 = scalar, U08, 1400, "", 1, 0 -heaterDuty0 = scalar, U08, 1401, "%", 1, 0 -pumpDuty0 = scalar, U08, 1402, "%", 1, 0 -tempC0 = scalar, U16, 1404, "C", 1, 0 -nernstVoltage0 = scalar, U16, 1406, "V", 0.001, 0 -esr0 = scalar, U16, 1408, "ohm", 1, 0 -; total TS size = 1412 -dcOutput0 = scalar, F32, 1412, "per", 1,0 -isEnabled0_int = scalar, U08, 1416, "per", 1,0 -isEnabled0 = bits, U32, 1420, [0:0] -; total TS size = 1424 -value0 = scalar, U16, 1424, "value", 1,0 -value1 = scalar, U16, 1426, "value", 1,0 -errorRate = scalar, F32, 1428, "ratio", 1,0 -; total TS size = 1432 -vvtTarget = scalar, U16, 1432, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1434, "%", 0.5, 0 +smartChipAliveCounter = scalar, S08, 1096, "", 1, 0 +startStopPhysicalState = bits, U32, 1100, [0:0] +acrStateDup = bits, U32, 1100, [1:1] +acrEngineMovedRecently = bits, U32, 1100, [2:2] +heaterControlEnabled = bits, U32, 1100, [3:3] +luaDigitalState0 = bits, U32, 1100, [4:4] +luaDigitalState1 = bits, U32, 1100, [5:5] +luaDigitalState2 = bits, U32, 1100, [6:6] +luaDigitalState3 = bits, U32, 1100, [7:7] +startStopStateToggleCounter = scalar, U32, 1104, "", 1, 0 +egtValue1 = scalar, F32, 1108, "", 1, 0 +egtValue2 = scalar, F32, 1112, "", 1, 0 +desiredRpmLimit = scalar, S16, 1116, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 1120, "", 1, 0 +sparkCounter = scalar, U32, 1124, "", 1, 0 +fuelingLoad = scalar, F32, 1128, "", 1, 0 +ignitionLoad = scalar, F32, 1132, "", 1, 0 +veTableYAxis = scalar, U16, 1136, "%", 0.01, 0 +; total TS size = 1140 +tpsFrom = scalar, F32, 1140 +tpsTo = scalar, F32, 1144 +deltaTps = scalar, F32, 1148 +extraFuel = scalar, F32, 1152, "", 1, 0 +valueFromTable = scalar, F32, 1156, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1160, [0:0] +isBelowDecelThreshold = bits, U32, 1160, [1:1] +isTimeToResetAccumulator = bits, U32, 1160, [2:2] +isFractionalEnrichment = bits, U32, 1160, [3:3] +belowEpsilon = bits, U32, 1160, [4:4] +tooShort = bits, U32, 1160, [5:5] +fractionalInjFuel = scalar, F32, 1164, "", 1, 0 +accumulatedValue = scalar, F32, 1168, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1172, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1176, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1180, "", 1, 0 +cycleCnt = scalar, S32, 1184, "", 1, 0 +; total TS size = 1188 +hwEventCounters1 = scalar, U32, 1188, "", 1, 0 +hwEventCounters2 = scalar, U32, 1192, "", 1, 0 +hwEventCounters3 = scalar, U32, 1196, "", 1, 0 +hwEventCounters4 = scalar, U32, 1200, "", 1, 0 +hwEventCounters5 = scalar, U32, 1204, "", 1, 0 +hwEventCounters6 = scalar, U32, 1208, "", 1, 0 +vvtCamCounter = scalar, U32, 1212, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1216, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1220, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1224, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1225, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1228, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1232, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1236, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1240, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1244, [0:0] +; total TS size = 1248 +crankSynchronizationCounter0 = scalar, U32, 1248, "", 1, 0 +vvtSyncGapRatio0 = scalar, F32, 1252, "", 1, 0 +vvtToothDurations00 = scalar, U32, 1256, "us", 1, 0 +vvtCurrentPosition0 = scalar, F32, 1260, "sync: Primary Cam Position", 1, 0 +vvtToothPosition10 = scalar, F32, 1264, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition20 = scalar, F32, 1268, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition30 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition40 = scalar, F32, 1276, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio0 = scalar, F32, 1280, "", 1, 0 +triggerStateIndex0 = scalar, U08, 1284, "", 1, 0 +vvtStateIndex0 = scalar, U08, 1285, "", 1, 0 +; total TS size = 1288 +camResyncCounter = scalar, U08, 1288, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1292, [0:0] +; total TS size = 1296 +wallFuelCorrection = scalar, F32, 1296, "", 1, 0 +wallFuel = scalar, F32, 1300, "", 1, 0 +; total TS size = 1304 +idleState = bits, S32, 1304, [0:2], "not important" +currentIdlePosition = scalar, F32, 1308 +baseIdlePosition = scalar, F32, 1312 +idleClosedLoop = scalar, F32, 1316 +iacByTpsTaper = scalar, F32, 1320 +throttlePedalUpState = scalar, S32, 1324, "", 1, 0 +mightResetPid = bits, U32, 1328, [0:0] +shouldResetPid = bits, U32, 1328, [1:1] +wasResetPid = bits, U32, 1328, [2:2] +mustResetPid = bits, U32, 1328, [3:3] +isCranking = bits, U32, 1328, [4:4] +isIacTableForCoasting = bits, U32, 1328, [5:5] +notIdling = bits, U32, 1328, [6:6] +needReset = bits, U32, 1328, [7:7] +isInDeadZone = bits, U32, 1328, [8:8] +isBlipping = bits, U32, 1328, [9:9] +useClosedLoop = bits, U32, 1328, [10:10] +badTps = bits, U32, 1328, [11:11] +looksLikeRunning = bits, U32, 1328, [12:12] +looksLikeCoasting = bits, U32, 1328, [13:13] +looksLikeCrankToIdle = bits, U32, 1328, [14:14] +isIdleCoasting = bits, U32, 1328, [15:15] +isIdleClosedLoop = bits, U32, 1328, [16:16] +idleTarget = scalar, S32, 1332, "", 1, 0 +targetRpmByClt = scalar, S32, 1336, "", 1, 0 +targetRpmAc = scalar, S32, 1340, "", 1, 0 +iacByRpmTaper = scalar, F32, 1344 +luaAdd = scalar, F32, 1348 +; total TS size = 1352 +idlePosition0 = scalar, F32, 1352, "per", 1,0 +trim0 = scalar, F32, 1356, "", 1, 0 +luaAdjustment0 = scalar, F32, 1360, "per", 1,0 +m_wastegatePosition0 = scalar, F32, 1364, "per", 1,0 +etbFeedForward0 = scalar, F32, 1368 +etbIntegralError0 = scalar, F32, 1372, "", 1, 0 +etbCurrentTarget0 = scalar, F32, 1376, "%", 1, 0 +etbCurrentAdjustedTarget0 = scalar, F32, 1380, "%", 1, 0 +etbRevLimitActive0 = bits, U32, 1384, [0:0] +jamDetected0 = bits, U32, 1384, [1:1] +etbDutyRateOfChange0 = scalar, F32, 1388, "per", 1,0 +etbDutyAverage0 = scalar, F32, 1392, "per", 1,0 +etbTpsErrorCounter0 = scalar, U16, 1396, "count", 1,0 +etbPpsErrorCounter0 = scalar, U16, 1398, "count", 1,0 +etbErrorCode0 = scalar, S08, 1400, "", 1, 0 +jamTimer0 = scalar, U16, 1402, "sec", 0.01, 0 +; total TS size = 1404 +faultCode0 = scalar, U08, 1404, "", 1, 0 +heaterDuty0 = scalar, U08, 1405, "%", 1, 0 +pumpDuty0 = scalar, U08, 1406, "%", 1, 0 +tempC0 = scalar, U16, 1408, "C", 1, 0 +nernstVoltage0 = scalar, U16, 1410, "V", 0.001, 0 +esr0 = scalar, U16, 1412, "ohm", 1, 0 +; total TS size = 1416 +dcOutput0 = scalar, F32, 1416, "per", 1,0 +isEnabled0_int = scalar, U08, 1420, "per", 1,0 +isEnabled0 = bits, U32, 1424, [0:0] +; total TS size = 1428 +value0 = scalar, U16, 1428, "value", 1,0 +value1 = scalar, U16, 1430, "value", 1,0 +errorRate = scalar, F32, 1432, "ratio", 1,0 ; total TS size = 1436 -lambdaCurrentlyGood = bits, U32, 1436, [0:0] -lambdaMonitorCut = bits, U32, 1436, [1:1] -lambdaTimeSinceGood = scalar, U16, 1440, "sec", 0.01, 0 -; total TS size = 1444 +vvtTarget = scalar, U16, 1436, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1438, "%", 0.5, 0 +; total TS size = 1440 +lambdaCurrentlyGood = bits, U32, 1440, [0:0] +lambdaMonitorCut = bits, U32, 1440, [1:1] +lambdaTimeSinceGood = scalar, U16, 1444, "sec", 0.01, 0 +; total TS size = 1448 time = { timeNow } @@ -5237,6 +5238,7 @@ entry = brakePedalState, "Brake switch", int, "%d" entry = startStopState, "startStopState", int, "%d" entry = smartChipState, "smartChipState", int, "%d" entry = smartChipRestartCounter, "smartChipRestartCounter", int, "%d" +entry = smartChipAliveCounter, "smartChipAliveCounter", int, "%d" entry = startStopPhysicalState, "startStopPhysicalState", int, "%d" entry = acrStateDup, "acrStateDup", int, "%d" entry = acrEngineMovedRecently, "acrEngineMovedRecently", int, "%d" @@ -6202,16 +6204,17 @@ dialog = engine_stateDialog, "engine_state" graphLine = smartChipState graphLine = smartChipRestartCounter liveGraph = engine_state_5_Graph, "Graph", South + graphLine = smartChipAliveCounter graphLine = startStopStateToggleCounter graphLine = egtValue1 graphLine = egtValue2 - graphLine = desiredRpmLimit liveGraph = engine_state_6_Graph, "Graph", South + graphLine = desiredRpmLimit graphLine = fuelInjectionCounter graphLine = sparkCounter graphLine = fuelingLoad - graphLine = ignitionLoad liveGraph = engine_state_7_Graph, "Graph", South + graphLine = ignitionLoad graphLine = veTableYAxis indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_405.ini b/firmware/tunerstudio/generated/rusefi_prometheus_405.ini index 78cd4b8550..7b8d408d73 100644 --- a/firmware/tunerstudio/generated/rusefi_prometheus_405.ini +++ b/firmware/tunerstudio/generated/rusefi_prometheus_405.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.12.26.prometheus_405.3420776745" + signature = "rusEFI master.2023.12.26.prometheus_405.64993227" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.12.26.prometheus_405.3420776745" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.12.26.prometheus_405.64993227" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -92,7 +92,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="Disabled", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PB0", "PB1", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Tue Dec 26 01:37:52 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Tue Dec 26 22:48:23 UTC 2023 pageSize = 22088 page = 1 @@ -2373,7 +2373,7 @@ lambdaMaxDeviationRpmBins = array, U16, 22078, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1444 + ochBlockSize = 1448 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3027,145 +3027,146 @@ brakePedalState = scalar, S08, 1092, "", 1, 0 startStopState = scalar, S08, 1093, "", 1, 0 smartChipState = scalar, S08, 1094, "", 1, 0 smartChipRestartCounter = scalar, S08, 1095, "", 1, 0 -startStopPhysicalState = bits, U32, 1096, [0:0] -acrStateDup = bits, U32, 1096, [1:1] -acrEngineMovedRecently = bits, U32, 1096, [2:2] -heaterControlEnabled = bits, U32, 1096, [3:3] -luaDigitalState0 = bits, U32, 1096, [4:4] -luaDigitalState1 = bits, U32, 1096, [5:5] -luaDigitalState2 = bits, U32, 1096, [6:6] -luaDigitalState3 = bits, U32, 1096, [7:7] -startStopStateToggleCounter = scalar, U32, 1100, "", 1, 0 -egtValue1 = scalar, F32, 1104, "", 1, 0 -egtValue2 = scalar, F32, 1108, "", 1, 0 -desiredRpmLimit = scalar, S16, 1112, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1116, "", 1, 0 -sparkCounter = scalar, U32, 1120, "", 1, 0 -fuelingLoad = scalar, F32, 1124, "", 1, 0 -ignitionLoad = scalar, F32, 1128, "", 1, 0 -veTableYAxis = scalar, U16, 1132, "%", 0.01, 0 -; total TS size = 1136 -tpsFrom = scalar, F32, 1136 -tpsTo = scalar, F32, 1140 -deltaTps = scalar, F32, 1144 -extraFuel = scalar, F32, 1148, "", 1, 0 -valueFromTable = scalar, F32, 1152, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1156, [0:0] -isBelowDecelThreshold = bits, U32, 1156, [1:1] -isTimeToResetAccumulator = bits, U32, 1156, [2:2] -isFractionalEnrichment = bits, U32, 1156, [3:3] -belowEpsilon = bits, U32, 1156, [4:4] -tooShort = bits, U32, 1156, [5:5] -fractionalInjFuel = scalar, F32, 1160, "", 1, 0 -accumulatedValue = scalar, F32, 1164, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1168, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1172, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1176, "", 1, 0 -cycleCnt = scalar, S32, 1180, "", 1, 0 -; total TS size = 1184 -hwEventCounters1 = scalar, U32, 1184, "", 1, 0 -hwEventCounters2 = scalar, U32, 1188, "", 1, 0 -hwEventCounters3 = scalar, U32, 1192, "", 1, 0 -hwEventCounters4 = scalar, U32, 1196, "", 1, 0 -hwEventCounters5 = scalar, U32, 1200, "", 1, 0 -hwEventCounters6 = scalar, U32, 1204, "", 1, 0 -vvtCamCounter = scalar, U32, 1208, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1212, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1216, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1220, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1221, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1224, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1228, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1232, "", 1, 0 -mapCamPrevToothAngle = scalar, F32, 1236, "deg", 1, 0 -isDecodingMapCam = bits, U32, 1240, [0:0] -; total TS size = 1244 -crankSynchronizationCounter0 = scalar, U32, 1244, "", 1, 0 -vvtSyncGapRatio0 = scalar, F32, 1248, "", 1, 0 -vvtToothDurations00 = scalar, U32, 1252, "us", 1, 0 -vvtCurrentPosition0 = scalar, F32, 1256, "sync: Primary Cam Position", 1, 0 -vvtToothPosition10 = scalar, F32, 1260, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition20 = scalar, F32, 1264, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition30 = scalar, F32, 1268, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition40 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio0 = scalar, F32, 1276, "", 1, 0 -triggerStateIndex0 = scalar, U08, 1280, "", 1, 0 -vvtStateIndex0 = scalar, U08, 1281, "", 1, 0 -; total TS size = 1284 -camResyncCounter = scalar, U08, 1284, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1288, [0:0] -; total TS size = 1292 -wallFuelCorrection = scalar, F32, 1292, "", 1, 0 -wallFuel = scalar, F32, 1296, "", 1, 0 -; total TS size = 1300 -idleState = bits, S32, 1300, [0:2], "not important" -currentIdlePosition = scalar, F32, 1304 -baseIdlePosition = scalar, F32, 1308 -idleClosedLoop = scalar, F32, 1312 -iacByTpsTaper = scalar, F32, 1316 -throttlePedalUpState = scalar, S32, 1320, "", 1, 0 -mightResetPid = bits, U32, 1324, [0:0] -shouldResetPid = bits, U32, 1324, [1:1] -wasResetPid = bits, U32, 1324, [2:2] -mustResetPid = bits, U32, 1324, [3:3] -isCranking = bits, U32, 1324, [4:4] -isIacTableForCoasting = bits, U32, 1324, [5:5] -notIdling = bits, U32, 1324, [6:6] -needReset = bits, U32, 1324, [7:7] -isInDeadZone = bits, U32, 1324, [8:8] -isBlipping = bits, U32, 1324, [9:9] -useClosedLoop = bits, U32, 1324, [10:10] -badTps = bits, U32, 1324, [11:11] -looksLikeRunning = bits, U32, 1324, [12:12] -looksLikeCoasting = bits, U32, 1324, [13:13] -looksLikeCrankToIdle = bits, U32, 1324, [14:14] -isIdleCoasting = bits, U32, 1324, [15:15] -isIdleClosedLoop = bits, U32, 1324, [16:16] -idleTarget = scalar, S32, 1328, "", 1, 0 -targetRpmByClt = scalar, S32, 1332, "", 1, 0 -targetRpmAc = scalar, S32, 1336, "", 1, 0 -iacByRpmTaper = scalar, F32, 1340 -luaAdd = scalar, F32, 1344 -; total TS size = 1348 -idlePosition0 = scalar, F32, 1348, "per", 1,0 -trim0 = scalar, F32, 1352, "", 1, 0 -luaAdjustment0 = scalar, F32, 1356, "per", 1,0 -m_wastegatePosition0 = scalar, F32, 1360, "per", 1,0 -etbFeedForward0 = scalar, F32, 1364 -etbIntegralError0 = scalar, F32, 1368, "", 1, 0 -etbCurrentTarget0 = scalar, F32, 1372, "%", 1, 0 -etbCurrentAdjustedTarget0 = scalar, F32, 1376, "%", 1, 0 -etbRevLimitActive0 = bits, U32, 1380, [0:0] -jamDetected0 = bits, U32, 1380, [1:1] -etbDutyRateOfChange0 = scalar, F32, 1384, "per", 1,0 -etbDutyAverage0 = scalar, F32, 1388, "per", 1,0 -etbTpsErrorCounter0 = scalar, U16, 1392, "count", 1,0 -etbPpsErrorCounter0 = scalar, U16, 1394, "count", 1,0 -etbErrorCode0 = scalar, S08, 1396, "", 1, 0 -jamTimer0 = scalar, U16, 1398, "sec", 0.01, 0 -; total TS size = 1400 -faultCode0 = scalar, U08, 1400, "", 1, 0 -heaterDuty0 = scalar, U08, 1401, "%", 1, 0 -pumpDuty0 = scalar, U08, 1402, "%", 1, 0 -tempC0 = scalar, U16, 1404, "C", 1, 0 -nernstVoltage0 = scalar, U16, 1406, "V", 0.001, 0 -esr0 = scalar, U16, 1408, "ohm", 1, 0 -; total TS size = 1412 -dcOutput0 = scalar, F32, 1412, "per", 1,0 -isEnabled0_int = scalar, U08, 1416, "per", 1,0 -isEnabled0 = bits, U32, 1420, [0:0] -; total TS size = 1424 -value0 = scalar, U16, 1424, "value", 1,0 -value1 = scalar, U16, 1426, "value", 1,0 -errorRate = scalar, F32, 1428, "ratio", 1,0 -; total TS size = 1432 -vvtTarget = scalar, U16, 1432, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1434, "%", 0.5, 0 +smartChipAliveCounter = scalar, S08, 1096, "", 1, 0 +startStopPhysicalState = bits, U32, 1100, [0:0] +acrStateDup = bits, U32, 1100, [1:1] +acrEngineMovedRecently = bits, U32, 1100, [2:2] +heaterControlEnabled = bits, U32, 1100, [3:3] +luaDigitalState0 = bits, U32, 1100, [4:4] +luaDigitalState1 = bits, U32, 1100, [5:5] +luaDigitalState2 = bits, U32, 1100, [6:6] +luaDigitalState3 = bits, U32, 1100, [7:7] +startStopStateToggleCounter = scalar, U32, 1104, "", 1, 0 +egtValue1 = scalar, F32, 1108, "", 1, 0 +egtValue2 = scalar, F32, 1112, "", 1, 0 +desiredRpmLimit = scalar, S16, 1116, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 1120, "", 1, 0 +sparkCounter = scalar, U32, 1124, "", 1, 0 +fuelingLoad = scalar, F32, 1128, "", 1, 0 +ignitionLoad = scalar, F32, 1132, "", 1, 0 +veTableYAxis = scalar, U16, 1136, "%", 0.01, 0 +; total TS size = 1140 +tpsFrom = scalar, F32, 1140 +tpsTo = scalar, F32, 1144 +deltaTps = scalar, F32, 1148 +extraFuel = scalar, F32, 1152, "", 1, 0 +valueFromTable = scalar, F32, 1156, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1160, [0:0] +isBelowDecelThreshold = bits, U32, 1160, [1:1] +isTimeToResetAccumulator = bits, U32, 1160, [2:2] +isFractionalEnrichment = bits, U32, 1160, [3:3] +belowEpsilon = bits, U32, 1160, [4:4] +tooShort = bits, U32, 1160, [5:5] +fractionalInjFuel = scalar, F32, 1164, "", 1, 0 +accumulatedValue = scalar, F32, 1168, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1172, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1176, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1180, "", 1, 0 +cycleCnt = scalar, S32, 1184, "", 1, 0 +; total TS size = 1188 +hwEventCounters1 = scalar, U32, 1188, "", 1, 0 +hwEventCounters2 = scalar, U32, 1192, "", 1, 0 +hwEventCounters3 = scalar, U32, 1196, "", 1, 0 +hwEventCounters4 = scalar, U32, 1200, "", 1, 0 +hwEventCounters5 = scalar, U32, 1204, "", 1, 0 +hwEventCounters6 = scalar, U32, 1208, "", 1, 0 +vvtCamCounter = scalar, U32, 1212, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1216, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1220, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1224, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1225, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1228, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1232, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1236, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1240, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1244, [0:0] +; total TS size = 1248 +crankSynchronizationCounter0 = scalar, U32, 1248, "", 1, 0 +vvtSyncGapRatio0 = scalar, F32, 1252, "", 1, 0 +vvtToothDurations00 = scalar, U32, 1256, "us", 1, 0 +vvtCurrentPosition0 = scalar, F32, 1260, "sync: Primary Cam Position", 1, 0 +vvtToothPosition10 = scalar, F32, 1264, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition20 = scalar, F32, 1268, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition30 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition40 = scalar, F32, 1276, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio0 = scalar, F32, 1280, "", 1, 0 +triggerStateIndex0 = scalar, U08, 1284, "", 1, 0 +vvtStateIndex0 = scalar, U08, 1285, "", 1, 0 +; total TS size = 1288 +camResyncCounter = scalar, U08, 1288, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1292, [0:0] +; total TS size = 1296 +wallFuelCorrection = scalar, F32, 1296, "", 1, 0 +wallFuel = scalar, F32, 1300, "", 1, 0 +; total TS size = 1304 +idleState = bits, S32, 1304, [0:2], "not important" +currentIdlePosition = scalar, F32, 1308 +baseIdlePosition = scalar, F32, 1312 +idleClosedLoop = scalar, F32, 1316 +iacByTpsTaper = scalar, F32, 1320 +throttlePedalUpState = scalar, S32, 1324, "", 1, 0 +mightResetPid = bits, U32, 1328, [0:0] +shouldResetPid = bits, U32, 1328, [1:1] +wasResetPid = bits, U32, 1328, [2:2] +mustResetPid = bits, U32, 1328, [3:3] +isCranking = bits, U32, 1328, [4:4] +isIacTableForCoasting = bits, U32, 1328, [5:5] +notIdling = bits, U32, 1328, [6:6] +needReset = bits, U32, 1328, [7:7] +isInDeadZone = bits, U32, 1328, [8:8] +isBlipping = bits, U32, 1328, [9:9] +useClosedLoop = bits, U32, 1328, [10:10] +badTps = bits, U32, 1328, [11:11] +looksLikeRunning = bits, U32, 1328, [12:12] +looksLikeCoasting = bits, U32, 1328, [13:13] +looksLikeCrankToIdle = bits, U32, 1328, [14:14] +isIdleCoasting = bits, U32, 1328, [15:15] +isIdleClosedLoop = bits, U32, 1328, [16:16] +idleTarget = scalar, S32, 1332, "", 1, 0 +targetRpmByClt = scalar, S32, 1336, "", 1, 0 +targetRpmAc = scalar, S32, 1340, "", 1, 0 +iacByRpmTaper = scalar, F32, 1344 +luaAdd = scalar, F32, 1348 +; total TS size = 1352 +idlePosition0 = scalar, F32, 1352, "per", 1,0 +trim0 = scalar, F32, 1356, "", 1, 0 +luaAdjustment0 = scalar, F32, 1360, "per", 1,0 +m_wastegatePosition0 = scalar, F32, 1364, "per", 1,0 +etbFeedForward0 = scalar, F32, 1368 +etbIntegralError0 = scalar, F32, 1372, "", 1, 0 +etbCurrentTarget0 = scalar, F32, 1376, "%", 1, 0 +etbCurrentAdjustedTarget0 = scalar, F32, 1380, "%", 1, 0 +etbRevLimitActive0 = bits, U32, 1384, [0:0] +jamDetected0 = bits, U32, 1384, [1:1] +etbDutyRateOfChange0 = scalar, F32, 1388, "per", 1,0 +etbDutyAverage0 = scalar, F32, 1392, "per", 1,0 +etbTpsErrorCounter0 = scalar, U16, 1396, "count", 1,0 +etbPpsErrorCounter0 = scalar, U16, 1398, "count", 1,0 +etbErrorCode0 = scalar, S08, 1400, "", 1, 0 +jamTimer0 = scalar, U16, 1402, "sec", 0.01, 0 +; total TS size = 1404 +faultCode0 = scalar, U08, 1404, "", 1, 0 +heaterDuty0 = scalar, U08, 1405, "%", 1, 0 +pumpDuty0 = scalar, U08, 1406, "%", 1, 0 +tempC0 = scalar, U16, 1408, "C", 1, 0 +nernstVoltage0 = scalar, U16, 1410, "V", 0.001, 0 +esr0 = scalar, U16, 1412, "ohm", 1, 0 +; total TS size = 1416 +dcOutput0 = scalar, F32, 1416, "per", 1,0 +isEnabled0_int = scalar, U08, 1420, "per", 1,0 +isEnabled0 = bits, U32, 1424, [0:0] +; total TS size = 1428 +value0 = scalar, U16, 1428, "value", 1,0 +value1 = scalar, U16, 1430, "value", 1,0 +errorRate = scalar, F32, 1432, "ratio", 1,0 ; total TS size = 1436 -lambdaCurrentlyGood = bits, U32, 1436, [0:0] -lambdaMonitorCut = bits, U32, 1436, [1:1] -lambdaTimeSinceGood = scalar, U16, 1440, "sec", 0.01, 0 -; total TS size = 1444 +vvtTarget = scalar, U16, 1436, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1438, "%", 0.5, 0 +; total TS size = 1440 +lambdaCurrentlyGood = bits, U32, 1440, [0:0] +lambdaMonitorCut = bits, U32, 1440, [1:1] +lambdaTimeSinceGood = scalar, U16, 1444, "sec", 0.01, 0 +; total TS size = 1448 time = { timeNow } @@ -5237,6 +5238,7 @@ entry = brakePedalState, "Brake switch", int, "%d" entry = startStopState, "startStopState", int, "%d" entry = smartChipState, "smartChipState", int, "%d" entry = smartChipRestartCounter, "smartChipRestartCounter", int, "%d" +entry = smartChipAliveCounter, "smartChipAliveCounter", int, "%d" entry = startStopPhysicalState, "startStopPhysicalState", int, "%d" entry = acrStateDup, "acrStateDup", int, "%d" entry = acrEngineMovedRecently, "acrEngineMovedRecently", int, "%d" @@ -6197,16 +6199,17 @@ dialog = engine_stateDialog, "engine_state" graphLine = smartChipState graphLine = smartChipRestartCounter liveGraph = engine_state_5_Graph, "Graph", South + graphLine = smartChipAliveCounter graphLine = startStopStateToggleCounter graphLine = egtValue1 graphLine = egtValue2 - graphLine = desiredRpmLimit liveGraph = engine_state_6_Graph, "Graph", South + graphLine = desiredRpmLimit graphLine = fuelInjectionCounter graphLine = sparkCounter graphLine = fuelingLoad - graphLine = ignitionLoad liveGraph = engine_state_7_Graph, "Graph", South + graphLine = ignitionLoad graphLine = veTableYAxis indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_469.ini b/firmware/tunerstudio/generated/rusefi_prometheus_469.ini index 7c04f17e43..523190df9e 100644 --- a/firmware/tunerstudio/generated/rusefi_prometheus_469.ini +++ b/firmware/tunerstudio/generated/rusefi_prometheus_469.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.12.26.prometheus_469.3420776745" + signature = "rusEFI master.2023.12.26.prometheus_469.64993227" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.12.26.prometheus_469.3420776745" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.12.26.prometheus_469.64993227" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -92,7 +92,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="Disabled", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PB0", "PB1", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Tue Dec 26 01:37:49 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Tue Dec 26 22:48:21 UTC 2023 pageSize = 22088 page = 1 @@ -2373,7 +2373,7 @@ lambdaMaxDeviationRpmBins = array, U16, 22078, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1444 + ochBlockSize = 1448 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3027,145 +3027,146 @@ brakePedalState = scalar, S08, 1092, "", 1, 0 startStopState = scalar, S08, 1093, "", 1, 0 smartChipState = scalar, S08, 1094, "", 1, 0 smartChipRestartCounter = scalar, S08, 1095, "", 1, 0 -startStopPhysicalState = bits, U32, 1096, [0:0] -acrStateDup = bits, U32, 1096, [1:1] -acrEngineMovedRecently = bits, U32, 1096, [2:2] -heaterControlEnabled = bits, U32, 1096, [3:3] -luaDigitalState0 = bits, U32, 1096, [4:4] -luaDigitalState1 = bits, U32, 1096, [5:5] -luaDigitalState2 = bits, U32, 1096, [6:6] -luaDigitalState3 = bits, U32, 1096, [7:7] -startStopStateToggleCounter = scalar, U32, 1100, "", 1, 0 -egtValue1 = scalar, F32, 1104, "", 1, 0 -egtValue2 = scalar, F32, 1108, "", 1, 0 -desiredRpmLimit = scalar, S16, 1112, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1116, "", 1, 0 -sparkCounter = scalar, U32, 1120, "", 1, 0 -fuelingLoad = scalar, F32, 1124, "", 1, 0 -ignitionLoad = scalar, F32, 1128, "", 1, 0 -veTableYAxis = scalar, U16, 1132, "%", 0.01, 0 -; total TS size = 1136 -tpsFrom = scalar, F32, 1136 -tpsTo = scalar, F32, 1140 -deltaTps = scalar, F32, 1144 -extraFuel = scalar, F32, 1148, "", 1, 0 -valueFromTable = scalar, F32, 1152, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1156, [0:0] -isBelowDecelThreshold = bits, U32, 1156, [1:1] -isTimeToResetAccumulator = bits, U32, 1156, [2:2] -isFractionalEnrichment = bits, U32, 1156, [3:3] -belowEpsilon = bits, U32, 1156, [4:4] -tooShort = bits, U32, 1156, [5:5] -fractionalInjFuel = scalar, F32, 1160, "", 1, 0 -accumulatedValue = scalar, F32, 1164, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1168, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1172, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1176, "", 1, 0 -cycleCnt = scalar, S32, 1180, "", 1, 0 -; total TS size = 1184 -hwEventCounters1 = scalar, U32, 1184, "", 1, 0 -hwEventCounters2 = scalar, U32, 1188, "", 1, 0 -hwEventCounters3 = scalar, U32, 1192, "", 1, 0 -hwEventCounters4 = scalar, U32, 1196, "", 1, 0 -hwEventCounters5 = scalar, U32, 1200, "", 1, 0 -hwEventCounters6 = scalar, U32, 1204, "", 1, 0 -vvtCamCounter = scalar, U32, 1208, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1212, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1216, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1220, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1221, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1224, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1228, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1232, "", 1, 0 -mapCamPrevToothAngle = scalar, F32, 1236, "deg", 1, 0 -isDecodingMapCam = bits, U32, 1240, [0:0] -; total TS size = 1244 -crankSynchronizationCounter0 = scalar, U32, 1244, "", 1, 0 -vvtSyncGapRatio0 = scalar, F32, 1248, "", 1, 0 -vvtToothDurations00 = scalar, U32, 1252, "us", 1, 0 -vvtCurrentPosition0 = scalar, F32, 1256, "sync: Primary Cam Position", 1, 0 -vvtToothPosition10 = scalar, F32, 1260, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition20 = scalar, F32, 1264, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition30 = scalar, F32, 1268, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition40 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio0 = scalar, F32, 1276, "", 1, 0 -triggerStateIndex0 = scalar, U08, 1280, "", 1, 0 -vvtStateIndex0 = scalar, U08, 1281, "", 1, 0 -; total TS size = 1284 -camResyncCounter = scalar, U08, 1284, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1288, [0:0] -; total TS size = 1292 -wallFuelCorrection = scalar, F32, 1292, "", 1, 0 -wallFuel = scalar, F32, 1296, "", 1, 0 -; total TS size = 1300 -idleState = bits, S32, 1300, [0:2], "not important" -currentIdlePosition = scalar, F32, 1304 -baseIdlePosition = scalar, F32, 1308 -idleClosedLoop = scalar, F32, 1312 -iacByTpsTaper = scalar, F32, 1316 -throttlePedalUpState = scalar, S32, 1320, "", 1, 0 -mightResetPid = bits, U32, 1324, [0:0] -shouldResetPid = bits, U32, 1324, [1:1] -wasResetPid = bits, U32, 1324, [2:2] -mustResetPid = bits, U32, 1324, [3:3] -isCranking = bits, U32, 1324, [4:4] -isIacTableForCoasting = bits, U32, 1324, [5:5] -notIdling = bits, U32, 1324, [6:6] -needReset = bits, U32, 1324, [7:7] -isInDeadZone = bits, U32, 1324, [8:8] -isBlipping = bits, U32, 1324, [9:9] -useClosedLoop = bits, U32, 1324, [10:10] -badTps = bits, U32, 1324, [11:11] -looksLikeRunning = bits, U32, 1324, [12:12] -looksLikeCoasting = bits, U32, 1324, [13:13] -looksLikeCrankToIdle = bits, U32, 1324, [14:14] -isIdleCoasting = bits, U32, 1324, [15:15] -isIdleClosedLoop = bits, U32, 1324, [16:16] -idleTarget = scalar, S32, 1328, "", 1, 0 -targetRpmByClt = scalar, S32, 1332, "", 1, 0 -targetRpmAc = scalar, S32, 1336, "", 1, 0 -iacByRpmTaper = scalar, F32, 1340 -luaAdd = scalar, F32, 1344 -; total TS size = 1348 -idlePosition0 = scalar, F32, 1348, "per", 1,0 -trim0 = scalar, F32, 1352, "", 1, 0 -luaAdjustment0 = scalar, F32, 1356, "per", 1,0 -m_wastegatePosition0 = scalar, F32, 1360, "per", 1,0 -etbFeedForward0 = scalar, F32, 1364 -etbIntegralError0 = scalar, F32, 1368, "", 1, 0 -etbCurrentTarget0 = scalar, F32, 1372, "%", 1, 0 -etbCurrentAdjustedTarget0 = scalar, F32, 1376, "%", 1, 0 -etbRevLimitActive0 = bits, U32, 1380, [0:0] -jamDetected0 = bits, U32, 1380, [1:1] -etbDutyRateOfChange0 = scalar, F32, 1384, "per", 1,0 -etbDutyAverage0 = scalar, F32, 1388, "per", 1,0 -etbTpsErrorCounter0 = scalar, U16, 1392, "count", 1,0 -etbPpsErrorCounter0 = scalar, U16, 1394, "count", 1,0 -etbErrorCode0 = scalar, S08, 1396, "", 1, 0 -jamTimer0 = scalar, U16, 1398, "sec", 0.01, 0 -; total TS size = 1400 -faultCode0 = scalar, U08, 1400, "", 1, 0 -heaterDuty0 = scalar, U08, 1401, "%", 1, 0 -pumpDuty0 = scalar, U08, 1402, "%", 1, 0 -tempC0 = scalar, U16, 1404, "C", 1, 0 -nernstVoltage0 = scalar, U16, 1406, "V", 0.001, 0 -esr0 = scalar, U16, 1408, "ohm", 1, 0 -; total TS size = 1412 -dcOutput0 = scalar, F32, 1412, "per", 1,0 -isEnabled0_int = scalar, U08, 1416, "per", 1,0 -isEnabled0 = bits, U32, 1420, [0:0] -; total TS size = 1424 -value0 = scalar, U16, 1424, "value", 1,0 -value1 = scalar, U16, 1426, "value", 1,0 -errorRate = scalar, F32, 1428, "ratio", 1,0 -; total TS size = 1432 -vvtTarget = scalar, U16, 1432, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1434, "%", 0.5, 0 +smartChipAliveCounter = scalar, S08, 1096, "", 1, 0 +startStopPhysicalState = bits, U32, 1100, [0:0] +acrStateDup = bits, U32, 1100, [1:1] +acrEngineMovedRecently = bits, U32, 1100, [2:2] +heaterControlEnabled = bits, U32, 1100, [3:3] +luaDigitalState0 = bits, U32, 1100, [4:4] +luaDigitalState1 = bits, U32, 1100, [5:5] +luaDigitalState2 = bits, U32, 1100, [6:6] +luaDigitalState3 = bits, U32, 1100, [7:7] +startStopStateToggleCounter = scalar, U32, 1104, "", 1, 0 +egtValue1 = scalar, F32, 1108, "", 1, 0 +egtValue2 = scalar, F32, 1112, "", 1, 0 +desiredRpmLimit = scalar, S16, 1116, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 1120, "", 1, 0 +sparkCounter = scalar, U32, 1124, "", 1, 0 +fuelingLoad = scalar, F32, 1128, "", 1, 0 +ignitionLoad = scalar, F32, 1132, "", 1, 0 +veTableYAxis = scalar, U16, 1136, "%", 0.01, 0 +; total TS size = 1140 +tpsFrom = scalar, F32, 1140 +tpsTo = scalar, F32, 1144 +deltaTps = scalar, F32, 1148 +extraFuel = scalar, F32, 1152, "", 1, 0 +valueFromTable = scalar, F32, 1156, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1160, [0:0] +isBelowDecelThreshold = bits, U32, 1160, [1:1] +isTimeToResetAccumulator = bits, U32, 1160, [2:2] +isFractionalEnrichment = bits, U32, 1160, [3:3] +belowEpsilon = bits, U32, 1160, [4:4] +tooShort = bits, U32, 1160, [5:5] +fractionalInjFuel = scalar, F32, 1164, "", 1, 0 +accumulatedValue = scalar, F32, 1168, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1172, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1176, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1180, "", 1, 0 +cycleCnt = scalar, S32, 1184, "", 1, 0 +; total TS size = 1188 +hwEventCounters1 = scalar, U32, 1188, "", 1, 0 +hwEventCounters2 = scalar, U32, 1192, "", 1, 0 +hwEventCounters3 = scalar, U32, 1196, "", 1, 0 +hwEventCounters4 = scalar, U32, 1200, "", 1, 0 +hwEventCounters5 = scalar, U32, 1204, "", 1, 0 +hwEventCounters6 = scalar, U32, 1208, "", 1, 0 +vvtCamCounter = scalar, U32, 1212, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1216, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1220, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1224, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1225, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1228, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1232, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1236, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1240, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1244, [0:0] +; total TS size = 1248 +crankSynchronizationCounter0 = scalar, U32, 1248, "", 1, 0 +vvtSyncGapRatio0 = scalar, F32, 1252, "", 1, 0 +vvtToothDurations00 = scalar, U32, 1256, "us", 1, 0 +vvtCurrentPosition0 = scalar, F32, 1260, "sync: Primary Cam Position", 1, 0 +vvtToothPosition10 = scalar, F32, 1264, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition20 = scalar, F32, 1268, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition30 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition40 = scalar, F32, 1276, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio0 = scalar, F32, 1280, "", 1, 0 +triggerStateIndex0 = scalar, U08, 1284, "", 1, 0 +vvtStateIndex0 = scalar, U08, 1285, "", 1, 0 +; total TS size = 1288 +camResyncCounter = scalar, U08, 1288, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1292, [0:0] +; total TS size = 1296 +wallFuelCorrection = scalar, F32, 1296, "", 1, 0 +wallFuel = scalar, F32, 1300, "", 1, 0 +; total TS size = 1304 +idleState = bits, S32, 1304, [0:2], "not important" +currentIdlePosition = scalar, F32, 1308 +baseIdlePosition = scalar, F32, 1312 +idleClosedLoop = scalar, F32, 1316 +iacByTpsTaper = scalar, F32, 1320 +throttlePedalUpState = scalar, S32, 1324, "", 1, 0 +mightResetPid = bits, U32, 1328, [0:0] +shouldResetPid = bits, U32, 1328, [1:1] +wasResetPid = bits, U32, 1328, [2:2] +mustResetPid = bits, U32, 1328, [3:3] +isCranking = bits, U32, 1328, [4:4] +isIacTableForCoasting = bits, U32, 1328, [5:5] +notIdling = bits, U32, 1328, [6:6] +needReset = bits, U32, 1328, [7:7] +isInDeadZone = bits, U32, 1328, [8:8] +isBlipping = bits, U32, 1328, [9:9] +useClosedLoop = bits, U32, 1328, [10:10] +badTps = bits, U32, 1328, [11:11] +looksLikeRunning = bits, U32, 1328, [12:12] +looksLikeCoasting = bits, U32, 1328, [13:13] +looksLikeCrankToIdle = bits, U32, 1328, [14:14] +isIdleCoasting = bits, U32, 1328, [15:15] +isIdleClosedLoop = bits, U32, 1328, [16:16] +idleTarget = scalar, S32, 1332, "", 1, 0 +targetRpmByClt = scalar, S32, 1336, "", 1, 0 +targetRpmAc = scalar, S32, 1340, "", 1, 0 +iacByRpmTaper = scalar, F32, 1344 +luaAdd = scalar, F32, 1348 +; total TS size = 1352 +idlePosition0 = scalar, F32, 1352, "per", 1,0 +trim0 = scalar, F32, 1356, "", 1, 0 +luaAdjustment0 = scalar, F32, 1360, "per", 1,0 +m_wastegatePosition0 = scalar, F32, 1364, "per", 1,0 +etbFeedForward0 = scalar, F32, 1368 +etbIntegralError0 = scalar, F32, 1372, "", 1, 0 +etbCurrentTarget0 = scalar, F32, 1376, "%", 1, 0 +etbCurrentAdjustedTarget0 = scalar, F32, 1380, "%", 1, 0 +etbRevLimitActive0 = bits, U32, 1384, [0:0] +jamDetected0 = bits, U32, 1384, [1:1] +etbDutyRateOfChange0 = scalar, F32, 1388, "per", 1,0 +etbDutyAverage0 = scalar, F32, 1392, "per", 1,0 +etbTpsErrorCounter0 = scalar, U16, 1396, "count", 1,0 +etbPpsErrorCounter0 = scalar, U16, 1398, "count", 1,0 +etbErrorCode0 = scalar, S08, 1400, "", 1, 0 +jamTimer0 = scalar, U16, 1402, "sec", 0.01, 0 +; total TS size = 1404 +faultCode0 = scalar, U08, 1404, "", 1, 0 +heaterDuty0 = scalar, U08, 1405, "%", 1, 0 +pumpDuty0 = scalar, U08, 1406, "%", 1, 0 +tempC0 = scalar, U16, 1408, "C", 1, 0 +nernstVoltage0 = scalar, U16, 1410, "V", 0.001, 0 +esr0 = scalar, U16, 1412, "ohm", 1, 0 +; total TS size = 1416 +dcOutput0 = scalar, F32, 1416, "per", 1,0 +isEnabled0_int = scalar, U08, 1420, "per", 1,0 +isEnabled0 = bits, U32, 1424, [0:0] +; total TS size = 1428 +value0 = scalar, U16, 1428, "value", 1,0 +value1 = scalar, U16, 1430, "value", 1,0 +errorRate = scalar, F32, 1432, "ratio", 1,0 ; total TS size = 1436 -lambdaCurrentlyGood = bits, U32, 1436, [0:0] -lambdaMonitorCut = bits, U32, 1436, [1:1] -lambdaTimeSinceGood = scalar, U16, 1440, "sec", 0.01, 0 -; total TS size = 1444 +vvtTarget = scalar, U16, 1436, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1438, "%", 0.5, 0 +; total TS size = 1440 +lambdaCurrentlyGood = bits, U32, 1440, [0:0] +lambdaMonitorCut = bits, U32, 1440, [1:1] +lambdaTimeSinceGood = scalar, U16, 1444, "sec", 0.01, 0 +; total TS size = 1448 time = { timeNow } @@ -5237,6 +5238,7 @@ entry = brakePedalState, "Brake switch", int, "%d" entry = startStopState, "startStopState", int, "%d" entry = smartChipState, "smartChipState", int, "%d" entry = smartChipRestartCounter, "smartChipRestartCounter", int, "%d" +entry = smartChipAliveCounter, "smartChipAliveCounter", int, "%d" entry = startStopPhysicalState, "startStopPhysicalState", int, "%d" entry = acrStateDup, "acrStateDup", int, "%d" entry = acrEngineMovedRecently, "acrEngineMovedRecently", int, "%d" @@ -6197,16 +6199,17 @@ dialog = engine_stateDialog, "engine_state" graphLine = smartChipState graphLine = smartChipRestartCounter liveGraph = engine_state_5_Graph, "Graph", South + graphLine = smartChipAliveCounter graphLine = startStopStateToggleCounter graphLine = egtValue1 graphLine = egtValue2 - graphLine = desiredRpmLimit liveGraph = engine_state_6_Graph, "Graph", South + graphLine = desiredRpmLimit graphLine = fuelInjectionCounter graphLine = sparkCounter graphLine = fuelingLoad - graphLine = ignitionLoad liveGraph = engine_state_7_Graph, "Graph", South + graphLine = ignitionLoad graphLine = veTableYAxis indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f4.ini b/firmware/tunerstudio/generated/rusefi_proteus_f4.ini index 7adeb6f29a..c7970553fe 100644 --- a/firmware/tunerstudio/generated/rusefi_proteus_f4.ini +++ b/firmware/tunerstudio/generated/rusefi_proteus_f4.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.12.26.proteus_f4.4217625283" + signature = "rusEFI master.2023.12.26.proteus_f4.861439009" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.12.26.proteus_f4.4217625283" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.12.26.proteus_f4.861439009" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -92,7 +92,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","Analog Volt 5","Analog Volt 6","Analog Volt 7","Analog Volt 8","Analog Volt 9","Analog Volt 10","Analog Volt 11","Battery Sense","Analog Temp 3","Analog Temp 4","Analog Volt 1","Analog Volt 2","Analog Volt 3","Analog Volt 4","Analog Temp 1","Analog Temp 2" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Tue Dec 26 01:37:57 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Tue Dec 26 22:48:28 UTC 2023 pageSize = 26088 page = 1 @@ -2373,7 +2373,7 @@ lambdaMaxDeviationRpmBins = array, U16, 26078, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1444 + ochBlockSize = 1448 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3027,145 +3027,146 @@ brakePedalState = scalar, S08, 1092, "", 1, 0 startStopState = scalar, S08, 1093, "", 1, 0 smartChipState = scalar, S08, 1094, "", 1, 0 smartChipRestartCounter = scalar, S08, 1095, "", 1, 0 -startStopPhysicalState = bits, U32, 1096, [0:0] -acrStateDup = bits, U32, 1096, [1:1] -acrEngineMovedRecently = bits, U32, 1096, [2:2] -heaterControlEnabled = bits, U32, 1096, [3:3] -luaDigitalState0 = bits, U32, 1096, [4:4] -luaDigitalState1 = bits, U32, 1096, [5:5] -luaDigitalState2 = bits, U32, 1096, [6:6] -luaDigitalState3 = bits, U32, 1096, [7:7] -startStopStateToggleCounter = scalar, U32, 1100, "", 1, 0 -egtValue1 = scalar, F32, 1104, "", 1, 0 -egtValue2 = scalar, F32, 1108, "", 1, 0 -desiredRpmLimit = scalar, S16, 1112, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1116, "", 1, 0 -sparkCounter = scalar, U32, 1120, "", 1, 0 -fuelingLoad = scalar, F32, 1124, "", 1, 0 -ignitionLoad = scalar, F32, 1128, "", 1, 0 -veTableYAxis = scalar, U16, 1132, "%", 0.01, 0 -; total TS size = 1136 -tpsFrom = scalar, F32, 1136 -tpsTo = scalar, F32, 1140 -deltaTps = scalar, F32, 1144 -extraFuel = scalar, F32, 1148, "", 1, 0 -valueFromTable = scalar, F32, 1152, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1156, [0:0] -isBelowDecelThreshold = bits, U32, 1156, [1:1] -isTimeToResetAccumulator = bits, U32, 1156, [2:2] -isFractionalEnrichment = bits, U32, 1156, [3:3] -belowEpsilon = bits, U32, 1156, [4:4] -tooShort = bits, U32, 1156, [5:5] -fractionalInjFuel = scalar, F32, 1160, "", 1, 0 -accumulatedValue = scalar, F32, 1164, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1168, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1172, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1176, "", 1, 0 -cycleCnt = scalar, S32, 1180, "", 1, 0 -; total TS size = 1184 -hwEventCounters1 = scalar, U32, 1184, "", 1, 0 -hwEventCounters2 = scalar, U32, 1188, "", 1, 0 -hwEventCounters3 = scalar, U32, 1192, "", 1, 0 -hwEventCounters4 = scalar, U32, 1196, "", 1, 0 -hwEventCounters5 = scalar, U32, 1200, "", 1, 0 -hwEventCounters6 = scalar, U32, 1204, "", 1, 0 -vvtCamCounter = scalar, U32, 1208, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1212, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1216, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1220, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1221, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1224, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1228, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1232, "", 1, 0 -mapCamPrevToothAngle = scalar, F32, 1236, "deg", 1, 0 -isDecodingMapCam = bits, U32, 1240, [0:0] -; total TS size = 1244 -crankSynchronizationCounter0 = scalar, U32, 1244, "", 1, 0 -vvtSyncGapRatio0 = scalar, F32, 1248, "", 1, 0 -vvtToothDurations00 = scalar, U32, 1252, "us", 1, 0 -vvtCurrentPosition0 = scalar, F32, 1256, "sync: Primary Cam Position", 1, 0 -vvtToothPosition10 = scalar, F32, 1260, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition20 = scalar, F32, 1264, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition30 = scalar, F32, 1268, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition40 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio0 = scalar, F32, 1276, "", 1, 0 -triggerStateIndex0 = scalar, U08, 1280, "", 1, 0 -vvtStateIndex0 = scalar, U08, 1281, "", 1, 0 -; total TS size = 1284 -camResyncCounter = scalar, U08, 1284, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1288, [0:0] -; total TS size = 1292 -wallFuelCorrection = scalar, F32, 1292, "", 1, 0 -wallFuel = scalar, F32, 1296, "", 1, 0 -; total TS size = 1300 -idleState = bits, S32, 1300, [0:2], "not important" -currentIdlePosition = scalar, F32, 1304 -baseIdlePosition = scalar, F32, 1308 -idleClosedLoop = scalar, F32, 1312 -iacByTpsTaper = scalar, F32, 1316 -throttlePedalUpState = scalar, S32, 1320, "", 1, 0 -mightResetPid = bits, U32, 1324, [0:0] -shouldResetPid = bits, U32, 1324, [1:1] -wasResetPid = bits, U32, 1324, [2:2] -mustResetPid = bits, U32, 1324, [3:3] -isCranking = bits, U32, 1324, [4:4] -isIacTableForCoasting = bits, U32, 1324, [5:5] -notIdling = bits, U32, 1324, [6:6] -needReset = bits, U32, 1324, [7:7] -isInDeadZone = bits, U32, 1324, [8:8] -isBlipping = bits, U32, 1324, [9:9] -useClosedLoop = bits, U32, 1324, [10:10] -badTps = bits, U32, 1324, [11:11] -looksLikeRunning = bits, U32, 1324, [12:12] -looksLikeCoasting = bits, U32, 1324, [13:13] -looksLikeCrankToIdle = bits, U32, 1324, [14:14] -isIdleCoasting = bits, U32, 1324, [15:15] -isIdleClosedLoop = bits, U32, 1324, [16:16] -idleTarget = scalar, S32, 1328, "", 1, 0 -targetRpmByClt = scalar, S32, 1332, "", 1, 0 -targetRpmAc = scalar, S32, 1336, "", 1, 0 -iacByRpmTaper = scalar, F32, 1340 -luaAdd = scalar, F32, 1344 -; total TS size = 1348 -idlePosition0 = scalar, F32, 1348, "per", 1,0 -trim0 = scalar, F32, 1352, "", 1, 0 -luaAdjustment0 = scalar, F32, 1356, "per", 1,0 -m_wastegatePosition0 = scalar, F32, 1360, "per", 1,0 -etbFeedForward0 = scalar, F32, 1364 -etbIntegralError0 = scalar, F32, 1368, "", 1, 0 -etbCurrentTarget0 = scalar, F32, 1372, "%", 1, 0 -etbCurrentAdjustedTarget0 = scalar, F32, 1376, "%", 1, 0 -etbRevLimitActive0 = bits, U32, 1380, [0:0] -jamDetected0 = bits, U32, 1380, [1:1] -etbDutyRateOfChange0 = scalar, F32, 1384, "per", 1,0 -etbDutyAverage0 = scalar, F32, 1388, "per", 1,0 -etbTpsErrorCounter0 = scalar, U16, 1392, "count", 1,0 -etbPpsErrorCounter0 = scalar, U16, 1394, "count", 1,0 -etbErrorCode0 = scalar, S08, 1396, "", 1, 0 -jamTimer0 = scalar, U16, 1398, "sec", 0.01, 0 -; total TS size = 1400 -faultCode0 = scalar, U08, 1400, "", 1, 0 -heaterDuty0 = scalar, U08, 1401, "%", 1, 0 -pumpDuty0 = scalar, U08, 1402, "%", 1, 0 -tempC0 = scalar, U16, 1404, "C", 1, 0 -nernstVoltage0 = scalar, U16, 1406, "V", 0.001, 0 -esr0 = scalar, U16, 1408, "ohm", 1, 0 -; total TS size = 1412 -dcOutput0 = scalar, F32, 1412, "per", 1,0 -isEnabled0_int = scalar, U08, 1416, "per", 1,0 -isEnabled0 = bits, U32, 1420, [0:0] -; total TS size = 1424 -value0 = scalar, U16, 1424, "value", 1,0 -value1 = scalar, U16, 1426, "value", 1,0 -errorRate = scalar, F32, 1428, "ratio", 1,0 -; total TS size = 1432 -vvtTarget = scalar, U16, 1432, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1434, "%", 0.5, 0 +smartChipAliveCounter = scalar, S08, 1096, "", 1, 0 +startStopPhysicalState = bits, U32, 1100, [0:0] +acrStateDup = bits, U32, 1100, [1:1] +acrEngineMovedRecently = bits, U32, 1100, [2:2] +heaterControlEnabled = bits, U32, 1100, [3:3] +luaDigitalState0 = bits, U32, 1100, [4:4] +luaDigitalState1 = bits, U32, 1100, [5:5] +luaDigitalState2 = bits, U32, 1100, [6:6] +luaDigitalState3 = bits, U32, 1100, [7:7] +startStopStateToggleCounter = scalar, U32, 1104, "", 1, 0 +egtValue1 = scalar, F32, 1108, "", 1, 0 +egtValue2 = scalar, F32, 1112, "", 1, 0 +desiredRpmLimit = scalar, S16, 1116, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 1120, "", 1, 0 +sparkCounter = scalar, U32, 1124, "", 1, 0 +fuelingLoad = scalar, F32, 1128, "", 1, 0 +ignitionLoad = scalar, F32, 1132, "", 1, 0 +veTableYAxis = scalar, U16, 1136, "%", 0.01, 0 +; total TS size = 1140 +tpsFrom = scalar, F32, 1140 +tpsTo = scalar, F32, 1144 +deltaTps = scalar, F32, 1148 +extraFuel = scalar, F32, 1152, "", 1, 0 +valueFromTable = scalar, F32, 1156, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1160, [0:0] +isBelowDecelThreshold = bits, U32, 1160, [1:1] +isTimeToResetAccumulator = bits, U32, 1160, [2:2] +isFractionalEnrichment = bits, U32, 1160, [3:3] +belowEpsilon = bits, U32, 1160, [4:4] +tooShort = bits, U32, 1160, [5:5] +fractionalInjFuel = scalar, F32, 1164, "", 1, 0 +accumulatedValue = scalar, F32, 1168, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1172, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1176, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1180, "", 1, 0 +cycleCnt = scalar, S32, 1184, "", 1, 0 +; total TS size = 1188 +hwEventCounters1 = scalar, U32, 1188, "", 1, 0 +hwEventCounters2 = scalar, U32, 1192, "", 1, 0 +hwEventCounters3 = scalar, U32, 1196, "", 1, 0 +hwEventCounters4 = scalar, U32, 1200, "", 1, 0 +hwEventCounters5 = scalar, U32, 1204, "", 1, 0 +hwEventCounters6 = scalar, U32, 1208, "", 1, 0 +vvtCamCounter = scalar, U32, 1212, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1216, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1220, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1224, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1225, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1228, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1232, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1236, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1240, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1244, [0:0] +; total TS size = 1248 +crankSynchronizationCounter0 = scalar, U32, 1248, "", 1, 0 +vvtSyncGapRatio0 = scalar, F32, 1252, "", 1, 0 +vvtToothDurations00 = scalar, U32, 1256, "us", 1, 0 +vvtCurrentPosition0 = scalar, F32, 1260, "sync: Primary Cam Position", 1, 0 +vvtToothPosition10 = scalar, F32, 1264, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition20 = scalar, F32, 1268, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition30 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition40 = scalar, F32, 1276, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio0 = scalar, F32, 1280, "", 1, 0 +triggerStateIndex0 = scalar, U08, 1284, "", 1, 0 +vvtStateIndex0 = scalar, U08, 1285, "", 1, 0 +; total TS size = 1288 +camResyncCounter = scalar, U08, 1288, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1292, [0:0] +; total TS size = 1296 +wallFuelCorrection = scalar, F32, 1296, "", 1, 0 +wallFuel = scalar, F32, 1300, "", 1, 0 +; total TS size = 1304 +idleState = bits, S32, 1304, [0:2], "not important" +currentIdlePosition = scalar, F32, 1308 +baseIdlePosition = scalar, F32, 1312 +idleClosedLoop = scalar, F32, 1316 +iacByTpsTaper = scalar, F32, 1320 +throttlePedalUpState = scalar, S32, 1324, "", 1, 0 +mightResetPid = bits, U32, 1328, [0:0] +shouldResetPid = bits, U32, 1328, [1:1] +wasResetPid = bits, U32, 1328, [2:2] +mustResetPid = bits, U32, 1328, [3:3] +isCranking = bits, U32, 1328, [4:4] +isIacTableForCoasting = bits, U32, 1328, [5:5] +notIdling = bits, U32, 1328, [6:6] +needReset = bits, U32, 1328, [7:7] +isInDeadZone = bits, U32, 1328, [8:8] +isBlipping = bits, U32, 1328, [9:9] +useClosedLoop = bits, U32, 1328, [10:10] +badTps = bits, U32, 1328, [11:11] +looksLikeRunning = bits, U32, 1328, [12:12] +looksLikeCoasting = bits, U32, 1328, [13:13] +looksLikeCrankToIdle = bits, U32, 1328, [14:14] +isIdleCoasting = bits, U32, 1328, [15:15] +isIdleClosedLoop = bits, U32, 1328, [16:16] +idleTarget = scalar, S32, 1332, "", 1, 0 +targetRpmByClt = scalar, S32, 1336, "", 1, 0 +targetRpmAc = scalar, S32, 1340, "", 1, 0 +iacByRpmTaper = scalar, F32, 1344 +luaAdd = scalar, F32, 1348 +; total TS size = 1352 +idlePosition0 = scalar, F32, 1352, "per", 1,0 +trim0 = scalar, F32, 1356, "", 1, 0 +luaAdjustment0 = scalar, F32, 1360, "per", 1,0 +m_wastegatePosition0 = scalar, F32, 1364, "per", 1,0 +etbFeedForward0 = scalar, F32, 1368 +etbIntegralError0 = scalar, F32, 1372, "", 1, 0 +etbCurrentTarget0 = scalar, F32, 1376, "%", 1, 0 +etbCurrentAdjustedTarget0 = scalar, F32, 1380, "%", 1, 0 +etbRevLimitActive0 = bits, U32, 1384, [0:0] +jamDetected0 = bits, U32, 1384, [1:1] +etbDutyRateOfChange0 = scalar, F32, 1388, "per", 1,0 +etbDutyAverage0 = scalar, F32, 1392, "per", 1,0 +etbTpsErrorCounter0 = scalar, U16, 1396, "count", 1,0 +etbPpsErrorCounter0 = scalar, U16, 1398, "count", 1,0 +etbErrorCode0 = scalar, S08, 1400, "", 1, 0 +jamTimer0 = scalar, U16, 1402, "sec", 0.01, 0 +; total TS size = 1404 +faultCode0 = scalar, U08, 1404, "", 1, 0 +heaterDuty0 = scalar, U08, 1405, "%", 1, 0 +pumpDuty0 = scalar, U08, 1406, "%", 1, 0 +tempC0 = scalar, U16, 1408, "C", 1, 0 +nernstVoltage0 = scalar, U16, 1410, "V", 0.001, 0 +esr0 = scalar, U16, 1412, "ohm", 1, 0 +; total TS size = 1416 +dcOutput0 = scalar, F32, 1416, "per", 1,0 +isEnabled0_int = scalar, U08, 1420, "per", 1,0 +isEnabled0 = bits, U32, 1424, [0:0] +; total TS size = 1428 +value0 = scalar, U16, 1428, "value", 1,0 +value1 = scalar, U16, 1430, "value", 1,0 +errorRate = scalar, F32, 1432, "ratio", 1,0 ; total TS size = 1436 -lambdaCurrentlyGood = bits, U32, 1436, [0:0] -lambdaMonitorCut = bits, U32, 1436, [1:1] -lambdaTimeSinceGood = scalar, U16, 1440, "sec", 0.01, 0 -; total TS size = 1444 +vvtTarget = scalar, U16, 1436, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1438, "%", 0.5, 0 +; total TS size = 1440 +lambdaCurrentlyGood = bits, U32, 1440, [0:0] +lambdaMonitorCut = bits, U32, 1440, [1:1] +lambdaTimeSinceGood = scalar, U16, 1444, "sec", 0.01, 0 +; total TS size = 1448 time = { timeNow } @@ -5237,6 +5238,7 @@ entry = brakePedalState, "Brake switch", int, "%d" entry = startStopState, "startStopState", int, "%d" entry = smartChipState, "smartChipState", int, "%d" entry = smartChipRestartCounter, "smartChipRestartCounter", int, "%d" +entry = smartChipAliveCounter, "smartChipAliveCounter", int, "%d" entry = startStopPhysicalState, "startStopPhysicalState", int, "%d" entry = acrStateDup, "acrStateDup", int, "%d" entry = acrEngineMovedRecently, "acrEngineMovedRecently", int, "%d" @@ -6212,16 +6214,17 @@ dialog = engine_stateDialog, "engine_state" graphLine = smartChipState graphLine = smartChipRestartCounter liveGraph = engine_state_5_Graph, "Graph", South + graphLine = smartChipAliveCounter graphLine = startStopStateToggleCounter graphLine = egtValue1 graphLine = egtValue2 - graphLine = desiredRpmLimit liveGraph = engine_state_6_Graph, "Graph", South + graphLine = desiredRpmLimit graphLine = fuelInjectionCounter graphLine = sparkCounter graphLine = fuelingLoad - graphLine = ignitionLoad liveGraph = engine_state_7_Graph, "Graph", South + graphLine = ignitionLoad graphLine = veTableYAxis indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f7.ini b/firmware/tunerstudio/generated/rusefi_proteus_f7.ini index 60c673b9eb..ada496e229 100644 --- a/firmware/tunerstudio/generated/rusefi_proteus_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_proteus_f7.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.12.26.proteus_f7.4217625283" + signature = "rusEFI master.2023.12.26.proteus_f7.861439009" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.12.26.proteus_f7.4217625283" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.12.26.proteus_f7.861439009" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -92,7 +92,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","Analog Volt 5","Analog Volt 6","Analog Volt 7","Analog Volt 8","Analog Volt 9","Analog Volt 10","Analog Volt 11","Battery Sense","Analog Temp 3","Analog Temp 4","Analog Volt 1","Analog Volt 2","Analog Volt 3","Analog Volt 4","Analog Temp 1","Analog Temp 2" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Tue Dec 26 01:37:54 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Tue Dec 26 22:48:26 UTC 2023 pageSize = 26088 page = 1 @@ -2373,7 +2373,7 @@ lambdaMaxDeviationRpmBins = array, U16, 26078, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1444 + ochBlockSize = 1448 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3027,145 +3027,146 @@ brakePedalState = scalar, S08, 1092, "", 1, 0 startStopState = scalar, S08, 1093, "", 1, 0 smartChipState = scalar, S08, 1094, "", 1, 0 smartChipRestartCounter = scalar, S08, 1095, "", 1, 0 -startStopPhysicalState = bits, U32, 1096, [0:0] -acrStateDup = bits, U32, 1096, [1:1] -acrEngineMovedRecently = bits, U32, 1096, [2:2] -heaterControlEnabled = bits, U32, 1096, [3:3] -luaDigitalState0 = bits, U32, 1096, [4:4] -luaDigitalState1 = bits, U32, 1096, [5:5] -luaDigitalState2 = bits, U32, 1096, [6:6] -luaDigitalState3 = bits, U32, 1096, [7:7] -startStopStateToggleCounter = scalar, U32, 1100, "", 1, 0 -egtValue1 = scalar, F32, 1104, "", 1, 0 -egtValue2 = scalar, F32, 1108, "", 1, 0 -desiredRpmLimit = scalar, S16, 1112, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1116, "", 1, 0 -sparkCounter = scalar, U32, 1120, "", 1, 0 -fuelingLoad = scalar, F32, 1124, "", 1, 0 -ignitionLoad = scalar, F32, 1128, "", 1, 0 -veTableYAxis = scalar, U16, 1132, "%", 0.01, 0 -; total TS size = 1136 -tpsFrom = scalar, F32, 1136 -tpsTo = scalar, F32, 1140 -deltaTps = scalar, F32, 1144 -extraFuel = scalar, F32, 1148, "", 1, 0 -valueFromTable = scalar, F32, 1152, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1156, [0:0] -isBelowDecelThreshold = bits, U32, 1156, [1:1] -isTimeToResetAccumulator = bits, U32, 1156, [2:2] -isFractionalEnrichment = bits, U32, 1156, [3:3] -belowEpsilon = bits, U32, 1156, [4:4] -tooShort = bits, U32, 1156, [5:5] -fractionalInjFuel = scalar, F32, 1160, "", 1, 0 -accumulatedValue = scalar, F32, 1164, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1168, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1172, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1176, "", 1, 0 -cycleCnt = scalar, S32, 1180, "", 1, 0 -; total TS size = 1184 -hwEventCounters1 = scalar, U32, 1184, "", 1, 0 -hwEventCounters2 = scalar, U32, 1188, "", 1, 0 -hwEventCounters3 = scalar, U32, 1192, "", 1, 0 -hwEventCounters4 = scalar, U32, 1196, "", 1, 0 -hwEventCounters5 = scalar, U32, 1200, "", 1, 0 -hwEventCounters6 = scalar, U32, 1204, "", 1, 0 -vvtCamCounter = scalar, U32, 1208, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1212, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1216, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1220, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1221, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1224, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1228, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1232, "", 1, 0 -mapCamPrevToothAngle = scalar, F32, 1236, "deg", 1, 0 -isDecodingMapCam = bits, U32, 1240, [0:0] -; total TS size = 1244 -crankSynchronizationCounter0 = scalar, U32, 1244, "", 1, 0 -vvtSyncGapRatio0 = scalar, F32, 1248, "", 1, 0 -vvtToothDurations00 = scalar, U32, 1252, "us", 1, 0 -vvtCurrentPosition0 = scalar, F32, 1256, "sync: Primary Cam Position", 1, 0 -vvtToothPosition10 = scalar, F32, 1260, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition20 = scalar, F32, 1264, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition30 = scalar, F32, 1268, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition40 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio0 = scalar, F32, 1276, "", 1, 0 -triggerStateIndex0 = scalar, U08, 1280, "", 1, 0 -vvtStateIndex0 = scalar, U08, 1281, "", 1, 0 -; total TS size = 1284 -camResyncCounter = scalar, U08, 1284, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1288, [0:0] -; total TS size = 1292 -wallFuelCorrection = scalar, F32, 1292, "", 1, 0 -wallFuel = scalar, F32, 1296, "", 1, 0 -; total TS size = 1300 -idleState = bits, S32, 1300, [0:2], "not important" -currentIdlePosition = scalar, F32, 1304 -baseIdlePosition = scalar, F32, 1308 -idleClosedLoop = scalar, F32, 1312 -iacByTpsTaper = scalar, F32, 1316 -throttlePedalUpState = scalar, S32, 1320, "", 1, 0 -mightResetPid = bits, U32, 1324, [0:0] -shouldResetPid = bits, U32, 1324, [1:1] -wasResetPid = bits, U32, 1324, [2:2] -mustResetPid = bits, U32, 1324, [3:3] -isCranking = bits, U32, 1324, [4:4] -isIacTableForCoasting = bits, U32, 1324, [5:5] -notIdling = bits, U32, 1324, [6:6] -needReset = bits, U32, 1324, [7:7] -isInDeadZone = bits, U32, 1324, [8:8] -isBlipping = bits, U32, 1324, [9:9] -useClosedLoop = bits, U32, 1324, [10:10] -badTps = bits, U32, 1324, [11:11] -looksLikeRunning = bits, U32, 1324, [12:12] -looksLikeCoasting = bits, U32, 1324, [13:13] -looksLikeCrankToIdle = bits, U32, 1324, [14:14] -isIdleCoasting = bits, U32, 1324, [15:15] -isIdleClosedLoop = bits, U32, 1324, [16:16] -idleTarget = scalar, S32, 1328, "", 1, 0 -targetRpmByClt = scalar, S32, 1332, "", 1, 0 -targetRpmAc = scalar, S32, 1336, "", 1, 0 -iacByRpmTaper = scalar, F32, 1340 -luaAdd = scalar, F32, 1344 -; total TS size = 1348 -idlePosition0 = scalar, F32, 1348, "per", 1,0 -trim0 = scalar, F32, 1352, "", 1, 0 -luaAdjustment0 = scalar, F32, 1356, "per", 1,0 -m_wastegatePosition0 = scalar, F32, 1360, "per", 1,0 -etbFeedForward0 = scalar, F32, 1364 -etbIntegralError0 = scalar, F32, 1368, "", 1, 0 -etbCurrentTarget0 = scalar, F32, 1372, "%", 1, 0 -etbCurrentAdjustedTarget0 = scalar, F32, 1376, "%", 1, 0 -etbRevLimitActive0 = bits, U32, 1380, [0:0] -jamDetected0 = bits, U32, 1380, [1:1] -etbDutyRateOfChange0 = scalar, F32, 1384, "per", 1,0 -etbDutyAverage0 = scalar, F32, 1388, "per", 1,0 -etbTpsErrorCounter0 = scalar, U16, 1392, "count", 1,0 -etbPpsErrorCounter0 = scalar, U16, 1394, "count", 1,0 -etbErrorCode0 = scalar, S08, 1396, "", 1, 0 -jamTimer0 = scalar, U16, 1398, "sec", 0.01, 0 -; total TS size = 1400 -faultCode0 = scalar, U08, 1400, "", 1, 0 -heaterDuty0 = scalar, U08, 1401, "%", 1, 0 -pumpDuty0 = scalar, U08, 1402, "%", 1, 0 -tempC0 = scalar, U16, 1404, "C", 1, 0 -nernstVoltage0 = scalar, U16, 1406, "V", 0.001, 0 -esr0 = scalar, U16, 1408, "ohm", 1, 0 -; total TS size = 1412 -dcOutput0 = scalar, F32, 1412, "per", 1,0 -isEnabled0_int = scalar, U08, 1416, "per", 1,0 -isEnabled0 = bits, U32, 1420, [0:0] -; total TS size = 1424 -value0 = scalar, U16, 1424, "value", 1,0 -value1 = scalar, U16, 1426, "value", 1,0 -errorRate = scalar, F32, 1428, "ratio", 1,0 -; total TS size = 1432 -vvtTarget = scalar, U16, 1432, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1434, "%", 0.5, 0 +smartChipAliveCounter = scalar, S08, 1096, "", 1, 0 +startStopPhysicalState = bits, U32, 1100, [0:0] +acrStateDup = bits, U32, 1100, [1:1] +acrEngineMovedRecently = bits, U32, 1100, [2:2] +heaterControlEnabled = bits, U32, 1100, [3:3] +luaDigitalState0 = bits, U32, 1100, [4:4] +luaDigitalState1 = bits, U32, 1100, [5:5] +luaDigitalState2 = bits, U32, 1100, [6:6] +luaDigitalState3 = bits, U32, 1100, [7:7] +startStopStateToggleCounter = scalar, U32, 1104, "", 1, 0 +egtValue1 = scalar, F32, 1108, "", 1, 0 +egtValue2 = scalar, F32, 1112, "", 1, 0 +desiredRpmLimit = scalar, S16, 1116, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 1120, "", 1, 0 +sparkCounter = scalar, U32, 1124, "", 1, 0 +fuelingLoad = scalar, F32, 1128, "", 1, 0 +ignitionLoad = scalar, F32, 1132, "", 1, 0 +veTableYAxis = scalar, U16, 1136, "%", 0.01, 0 +; total TS size = 1140 +tpsFrom = scalar, F32, 1140 +tpsTo = scalar, F32, 1144 +deltaTps = scalar, F32, 1148 +extraFuel = scalar, F32, 1152, "", 1, 0 +valueFromTable = scalar, F32, 1156, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1160, [0:0] +isBelowDecelThreshold = bits, U32, 1160, [1:1] +isTimeToResetAccumulator = bits, U32, 1160, [2:2] +isFractionalEnrichment = bits, U32, 1160, [3:3] +belowEpsilon = bits, U32, 1160, [4:4] +tooShort = bits, U32, 1160, [5:5] +fractionalInjFuel = scalar, F32, 1164, "", 1, 0 +accumulatedValue = scalar, F32, 1168, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1172, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1176, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1180, "", 1, 0 +cycleCnt = scalar, S32, 1184, "", 1, 0 +; total TS size = 1188 +hwEventCounters1 = scalar, U32, 1188, "", 1, 0 +hwEventCounters2 = scalar, U32, 1192, "", 1, 0 +hwEventCounters3 = scalar, U32, 1196, "", 1, 0 +hwEventCounters4 = scalar, U32, 1200, "", 1, 0 +hwEventCounters5 = scalar, U32, 1204, "", 1, 0 +hwEventCounters6 = scalar, U32, 1208, "", 1, 0 +vvtCamCounter = scalar, U32, 1212, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1216, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1220, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1224, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1225, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1228, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1232, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1236, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1240, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1244, [0:0] +; total TS size = 1248 +crankSynchronizationCounter0 = scalar, U32, 1248, "", 1, 0 +vvtSyncGapRatio0 = scalar, F32, 1252, "", 1, 0 +vvtToothDurations00 = scalar, U32, 1256, "us", 1, 0 +vvtCurrentPosition0 = scalar, F32, 1260, "sync: Primary Cam Position", 1, 0 +vvtToothPosition10 = scalar, F32, 1264, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition20 = scalar, F32, 1268, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition30 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition40 = scalar, F32, 1276, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio0 = scalar, F32, 1280, "", 1, 0 +triggerStateIndex0 = scalar, U08, 1284, "", 1, 0 +vvtStateIndex0 = scalar, U08, 1285, "", 1, 0 +; total TS size = 1288 +camResyncCounter = scalar, U08, 1288, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1292, [0:0] +; total TS size = 1296 +wallFuelCorrection = scalar, F32, 1296, "", 1, 0 +wallFuel = scalar, F32, 1300, "", 1, 0 +; total TS size = 1304 +idleState = bits, S32, 1304, [0:2], "not important" +currentIdlePosition = scalar, F32, 1308 +baseIdlePosition = scalar, F32, 1312 +idleClosedLoop = scalar, F32, 1316 +iacByTpsTaper = scalar, F32, 1320 +throttlePedalUpState = scalar, S32, 1324, "", 1, 0 +mightResetPid = bits, U32, 1328, [0:0] +shouldResetPid = bits, U32, 1328, [1:1] +wasResetPid = bits, U32, 1328, [2:2] +mustResetPid = bits, U32, 1328, [3:3] +isCranking = bits, U32, 1328, [4:4] +isIacTableForCoasting = bits, U32, 1328, [5:5] +notIdling = bits, U32, 1328, [6:6] +needReset = bits, U32, 1328, [7:7] +isInDeadZone = bits, U32, 1328, [8:8] +isBlipping = bits, U32, 1328, [9:9] +useClosedLoop = bits, U32, 1328, [10:10] +badTps = bits, U32, 1328, [11:11] +looksLikeRunning = bits, U32, 1328, [12:12] +looksLikeCoasting = bits, U32, 1328, [13:13] +looksLikeCrankToIdle = bits, U32, 1328, [14:14] +isIdleCoasting = bits, U32, 1328, [15:15] +isIdleClosedLoop = bits, U32, 1328, [16:16] +idleTarget = scalar, S32, 1332, "", 1, 0 +targetRpmByClt = scalar, S32, 1336, "", 1, 0 +targetRpmAc = scalar, S32, 1340, "", 1, 0 +iacByRpmTaper = scalar, F32, 1344 +luaAdd = scalar, F32, 1348 +; total TS size = 1352 +idlePosition0 = scalar, F32, 1352, "per", 1,0 +trim0 = scalar, F32, 1356, "", 1, 0 +luaAdjustment0 = scalar, F32, 1360, "per", 1,0 +m_wastegatePosition0 = scalar, F32, 1364, "per", 1,0 +etbFeedForward0 = scalar, F32, 1368 +etbIntegralError0 = scalar, F32, 1372, "", 1, 0 +etbCurrentTarget0 = scalar, F32, 1376, "%", 1, 0 +etbCurrentAdjustedTarget0 = scalar, F32, 1380, "%", 1, 0 +etbRevLimitActive0 = bits, U32, 1384, [0:0] +jamDetected0 = bits, U32, 1384, [1:1] +etbDutyRateOfChange0 = scalar, F32, 1388, "per", 1,0 +etbDutyAverage0 = scalar, F32, 1392, "per", 1,0 +etbTpsErrorCounter0 = scalar, U16, 1396, "count", 1,0 +etbPpsErrorCounter0 = scalar, U16, 1398, "count", 1,0 +etbErrorCode0 = scalar, S08, 1400, "", 1, 0 +jamTimer0 = scalar, U16, 1402, "sec", 0.01, 0 +; total TS size = 1404 +faultCode0 = scalar, U08, 1404, "", 1, 0 +heaterDuty0 = scalar, U08, 1405, "%", 1, 0 +pumpDuty0 = scalar, U08, 1406, "%", 1, 0 +tempC0 = scalar, U16, 1408, "C", 1, 0 +nernstVoltage0 = scalar, U16, 1410, "V", 0.001, 0 +esr0 = scalar, U16, 1412, "ohm", 1, 0 +; total TS size = 1416 +dcOutput0 = scalar, F32, 1416, "per", 1,0 +isEnabled0_int = scalar, U08, 1420, "per", 1,0 +isEnabled0 = bits, U32, 1424, [0:0] +; total TS size = 1428 +value0 = scalar, U16, 1428, "value", 1,0 +value1 = scalar, U16, 1430, "value", 1,0 +errorRate = scalar, F32, 1432, "ratio", 1,0 ; total TS size = 1436 -lambdaCurrentlyGood = bits, U32, 1436, [0:0] -lambdaMonitorCut = bits, U32, 1436, [1:1] -lambdaTimeSinceGood = scalar, U16, 1440, "sec", 0.01, 0 -; total TS size = 1444 +vvtTarget = scalar, U16, 1436, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1438, "%", 0.5, 0 +; total TS size = 1440 +lambdaCurrentlyGood = bits, U32, 1440, [0:0] +lambdaMonitorCut = bits, U32, 1440, [1:1] +lambdaTimeSinceGood = scalar, U16, 1444, "sec", 0.01, 0 +; total TS size = 1448 time = { timeNow } @@ -5237,6 +5238,7 @@ entry = brakePedalState, "Brake switch", int, "%d" entry = startStopState, "startStopState", int, "%d" entry = smartChipState, "smartChipState", int, "%d" entry = smartChipRestartCounter, "smartChipRestartCounter", int, "%d" +entry = smartChipAliveCounter, "smartChipAliveCounter", int, "%d" entry = startStopPhysicalState, "startStopPhysicalState", int, "%d" entry = acrStateDup, "acrStateDup", int, "%d" entry = acrEngineMovedRecently, "acrEngineMovedRecently", int, "%d" @@ -6212,16 +6214,17 @@ dialog = engine_stateDialog, "engine_state" graphLine = smartChipState graphLine = smartChipRestartCounter liveGraph = engine_state_5_Graph, "Graph", South + graphLine = smartChipAliveCounter graphLine = startStopStateToggleCounter graphLine = egtValue1 graphLine = egtValue2 - graphLine = desiredRpmLimit liveGraph = engine_state_6_Graph, "Graph", South + graphLine = desiredRpmLimit graphLine = fuelInjectionCounter graphLine = sparkCounter graphLine = fuelingLoad - graphLine = ignitionLoad liveGraph = engine_state_7_Graph, "Graph", South + graphLine = ignitionLoad graphLine = veTableYAxis indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_proteus_h7.ini b/firmware/tunerstudio/generated/rusefi_proteus_h7.ini index bb659dce15..ad943b7008 100644 --- a/firmware/tunerstudio/generated/rusefi_proteus_h7.ini +++ b/firmware/tunerstudio/generated/rusefi_proteus_h7.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.12.26.proteus_h7.4217625283" + signature = "rusEFI master.2023.12.26.proteus_h7.861439009" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.12.26.proteus_h7.4217625283" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.12.26.proteus_h7.861439009" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -92,7 +92,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","Analog Volt 5","Analog Volt 6","Analog Volt 7","Analog Volt 8","Analog Volt 9","Analog Volt 10","Analog Volt 11","Battery Sense","Analog Temp 3","Analog Temp 4","Analog Volt 1","Analog Volt 2","Analog Volt 3","Analog Volt 4","Analog Temp 1","Analog Temp 2" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Tue Dec 26 01:37:59 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Tue Dec 26 22:48:31 UTC 2023 pageSize = 26088 page = 1 @@ -2373,7 +2373,7 @@ lambdaMaxDeviationRpmBins = array, U16, 26078, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1444 + ochBlockSize = 1448 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3027,145 +3027,146 @@ brakePedalState = scalar, S08, 1092, "", 1, 0 startStopState = scalar, S08, 1093, "", 1, 0 smartChipState = scalar, S08, 1094, "", 1, 0 smartChipRestartCounter = scalar, S08, 1095, "", 1, 0 -startStopPhysicalState = bits, U32, 1096, [0:0] -acrStateDup = bits, U32, 1096, [1:1] -acrEngineMovedRecently = bits, U32, 1096, [2:2] -heaterControlEnabled = bits, U32, 1096, [3:3] -luaDigitalState0 = bits, U32, 1096, [4:4] -luaDigitalState1 = bits, U32, 1096, [5:5] -luaDigitalState2 = bits, U32, 1096, [6:6] -luaDigitalState3 = bits, U32, 1096, [7:7] -startStopStateToggleCounter = scalar, U32, 1100, "", 1, 0 -egtValue1 = scalar, F32, 1104, "", 1, 0 -egtValue2 = scalar, F32, 1108, "", 1, 0 -desiredRpmLimit = scalar, S16, 1112, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1116, "", 1, 0 -sparkCounter = scalar, U32, 1120, "", 1, 0 -fuelingLoad = scalar, F32, 1124, "", 1, 0 -ignitionLoad = scalar, F32, 1128, "", 1, 0 -veTableYAxis = scalar, U16, 1132, "%", 0.01, 0 -; total TS size = 1136 -tpsFrom = scalar, F32, 1136 -tpsTo = scalar, F32, 1140 -deltaTps = scalar, F32, 1144 -extraFuel = scalar, F32, 1148, "", 1, 0 -valueFromTable = scalar, F32, 1152, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1156, [0:0] -isBelowDecelThreshold = bits, U32, 1156, [1:1] -isTimeToResetAccumulator = bits, U32, 1156, [2:2] -isFractionalEnrichment = bits, U32, 1156, [3:3] -belowEpsilon = bits, U32, 1156, [4:4] -tooShort = bits, U32, 1156, [5:5] -fractionalInjFuel = scalar, F32, 1160, "", 1, 0 -accumulatedValue = scalar, F32, 1164, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1168, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1172, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1176, "", 1, 0 -cycleCnt = scalar, S32, 1180, "", 1, 0 -; total TS size = 1184 -hwEventCounters1 = scalar, U32, 1184, "", 1, 0 -hwEventCounters2 = scalar, U32, 1188, "", 1, 0 -hwEventCounters3 = scalar, U32, 1192, "", 1, 0 -hwEventCounters4 = scalar, U32, 1196, "", 1, 0 -hwEventCounters5 = scalar, U32, 1200, "", 1, 0 -hwEventCounters6 = scalar, U32, 1204, "", 1, 0 -vvtCamCounter = scalar, U32, 1208, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1212, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1216, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1220, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1221, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1224, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1228, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1232, "", 1, 0 -mapCamPrevToothAngle = scalar, F32, 1236, "deg", 1, 0 -isDecodingMapCam = bits, U32, 1240, [0:0] -; total TS size = 1244 -crankSynchronizationCounter0 = scalar, U32, 1244, "", 1, 0 -vvtSyncGapRatio0 = scalar, F32, 1248, "", 1, 0 -vvtToothDurations00 = scalar, U32, 1252, "us", 1, 0 -vvtCurrentPosition0 = scalar, F32, 1256, "sync: Primary Cam Position", 1, 0 -vvtToothPosition10 = scalar, F32, 1260, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition20 = scalar, F32, 1264, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition30 = scalar, F32, 1268, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition40 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio0 = scalar, F32, 1276, "", 1, 0 -triggerStateIndex0 = scalar, U08, 1280, "", 1, 0 -vvtStateIndex0 = scalar, U08, 1281, "", 1, 0 -; total TS size = 1284 -camResyncCounter = scalar, U08, 1284, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1288, [0:0] -; total TS size = 1292 -wallFuelCorrection = scalar, F32, 1292, "", 1, 0 -wallFuel = scalar, F32, 1296, "", 1, 0 -; total TS size = 1300 -idleState = bits, S32, 1300, [0:2], "not important" -currentIdlePosition = scalar, F32, 1304 -baseIdlePosition = scalar, F32, 1308 -idleClosedLoop = scalar, F32, 1312 -iacByTpsTaper = scalar, F32, 1316 -throttlePedalUpState = scalar, S32, 1320, "", 1, 0 -mightResetPid = bits, U32, 1324, [0:0] -shouldResetPid = bits, U32, 1324, [1:1] -wasResetPid = bits, U32, 1324, [2:2] -mustResetPid = bits, U32, 1324, [3:3] -isCranking = bits, U32, 1324, [4:4] -isIacTableForCoasting = bits, U32, 1324, [5:5] -notIdling = bits, U32, 1324, [6:6] -needReset = bits, U32, 1324, [7:7] -isInDeadZone = bits, U32, 1324, [8:8] -isBlipping = bits, U32, 1324, [9:9] -useClosedLoop = bits, U32, 1324, [10:10] -badTps = bits, U32, 1324, [11:11] -looksLikeRunning = bits, U32, 1324, [12:12] -looksLikeCoasting = bits, U32, 1324, [13:13] -looksLikeCrankToIdle = bits, U32, 1324, [14:14] -isIdleCoasting = bits, U32, 1324, [15:15] -isIdleClosedLoop = bits, U32, 1324, [16:16] -idleTarget = scalar, S32, 1328, "", 1, 0 -targetRpmByClt = scalar, S32, 1332, "", 1, 0 -targetRpmAc = scalar, S32, 1336, "", 1, 0 -iacByRpmTaper = scalar, F32, 1340 -luaAdd = scalar, F32, 1344 -; total TS size = 1348 -idlePosition0 = scalar, F32, 1348, "per", 1,0 -trim0 = scalar, F32, 1352, "", 1, 0 -luaAdjustment0 = scalar, F32, 1356, "per", 1,0 -m_wastegatePosition0 = scalar, F32, 1360, "per", 1,0 -etbFeedForward0 = scalar, F32, 1364 -etbIntegralError0 = scalar, F32, 1368, "", 1, 0 -etbCurrentTarget0 = scalar, F32, 1372, "%", 1, 0 -etbCurrentAdjustedTarget0 = scalar, F32, 1376, "%", 1, 0 -etbRevLimitActive0 = bits, U32, 1380, [0:0] -jamDetected0 = bits, U32, 1380, [1:1] -etbDutyRateOfChange0 = scalar, F32, 1384, "per", 1,0 -etbDutyAverage0 = scalar, F32, 1388, "per", 1,0 -etbTpsErrorCounter0 = scalar, U16, 1392, "count", 1,0 -etbPpsErrorCounter0 = scalar, U16, 1394, "count", 1,0 -etbErrorCode0 = scalar, S08, 1396, "", 1, 0 -jamTimer0 = scalar, U16, 1398, "sec", 0.01, 0 -; total TS size = 1400 -faultCode0 = scalar, U08, 1400, "", 1, 0 -heaterDuty0 = scalar, U08, 1401, "%", 1, 0 -pumpDuty0 = scalar, U08, 1402, "%", 1, 0 -tempC0 = scalar, U16, 1404, "C", 1, 0 -nernstVoltage0 = scalar, U16, 1406, "V", 0.001, 0 -esr0 = scalar, U16, 1408, "ohm", 1, 0 -; total TS size = 1412 -dcOutput0 = scalar, F32, 1412, "per", 1,0 -isEnabled0_int = scalar, U08, 1416, "per", 1,0 -isEnabled0 = bits, U32, 1420, [0:0] -; total TS size = 1424 -value0 = scalar, U16, 1424, "value", 1,0 -value1 = scalar, U16, 1426, "value", 1,0 -errorRate = scalar, F32, 1428, "ratio", 1,0 -; total TS size = 1432 -vvtTarget = scalar, U16, 1432, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1434, "%", 0.5, 0 +smartChipAliveCounter = scalar, S08, 1096, "", 1, 0 +startStopPhysicalState = bits, U32, 1100, [0:0] +acrStateDup = bits, U32, 1100, [1:1] +acrEngineMovedRecently = bits, U32, 1100, [2:2] +heaterControlEnabled = bits, U32, 1100, [3:3] +luaDigitalState0 = bits, U32, 1100, [4:4] +luaDigitalState1 = bits, U32, 1100, [5:5] +luaDigitalState2 = bits, U32, 1100, [6:6] +luaDigitalState3 = bits, U32, 1100, [7:7] +startStopStateToggleCounter = scalar, U32, 1104, "", 1, 0 +egtValue1 = scalar, F32, 1108, "", 1, 0 +egtValue2 = scalar, F32, 1112, "", 1, 0 +desiredRpmLimit = scalar, S16, 1116, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 1120, "", 1, 0 +sparkCounter = scalar, U32, 1124, "", 1, 0 +fuelingLoad = scalar, F32, 1128, "", 1, 0 +ignitionLoad = scalar, F32, 1132, "", 1, 0 +veTableYAxis = scalar, U16, 1136, "%", 0.01, 0 +; total TS size = 1140 +tpsFrom = scalar, F32, 1140 +tpsTo = scalar, F32, 1144 +deltaTps = scalar, F32, 1148 +extraFuel = scalar, F32, 1152, "", 1, 0 +valueFromTable = scalar, F32, 1156, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1160, [0:0] +isBelowDecelThreshold = bits, U32, 1160, [1:1] +isTimeToResetAccumulator = bits, U32, 1160, [2:2] +isFractionalEnrichment = bits, U32, 1160, [3:3] +belowEpsilon = bits, U32, 1160, [4:4] +tooShort = bits, U32, 1160, [5:5] +fractionalInjFuel = scalar, F32, 1164, "", 1, 0 +accumulatedValue = scalar, F32, 1168, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1172, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1176, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1180, "", 1, 0 +cycleCnt = scalar, S32, 1184, "", 1, 0 +; total TS size = 1188 +hwEventCounters1 = scalar, U32, 1188, "", 1, 0 +hwEventCounters2 = scalar, U32, 1192, "", 1, 0 +hwEventCounters3 = scalar, U32, 1196, "", 1, 0 +hwEventCounters4 = scalar, U32, 1200, "", 1, 0 +hwEventCounters5 = scalar, U32, 1204, "", 1, 0 +hwEventCounters6 = scalar, U32, 1208, "", 1, 0 +vvtCamCounter = scalar, U32, 1212, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1216, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1220, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1224, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1225, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1228, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1232, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1236, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1240, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1244, [0:0] +; total TS size = 1248 +crankSynchronizationCounter0 = scalar, U32, 1248, "", 1, 0 +vvtSyncGapRatio0 = scalar, F32, 1252, "", 1, 0 +vvtToothDurations00 = scalar, U32, 1256, "us", 1, 0 +vvtCurrentPosition0 = scalar, F32, 1260, "sync: Primary Cam Position", 1, 0 +vvtToothPosition10 = scalar, F32, 1264, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition20 = scalar, F32, 1268, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition30 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition40 = scalar, F32, 1276, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio0 = scalar, F32, 1280, "", 1, 0 +triggerStateIndex0 = scalar, U08, 1284, "", 1, 0 +vvtStateIndex0 = scalar, U08, 1285, "", 1, 0 +; total TS size = 1288 +camResyncCounter = scalar, U08, 1288, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1292, [0:0] +; total TS size = 1296 +wallFuelCorrection = scalar, F32, 1296, "", 1, 0 +wallFuel = scalar, F32, 1300, "", 1, 0 +; total TS size = 1304 +idleState = bits, S32, 1304, [0:2], "not important" +currentIdlePosition = scalar, F32, 1308 +baseIdlePosition = scalar, F32, 1312 +idleClosedLoop = scalar, F32, 1316 +iacByTpsTaper = scalar, F32, 1320 +throttlePedalUpState = scalar, S32, 1324, "", 1, 0 +mightResetPid = bits, U32, 1328, [0:0] +shouldResetPid = bits, U32, 1328, [1:1] +wasResetPid = bits, U32, 1328, [2:2] +mustResetPid = bits, U32, 1328, [3:3] +isCranking = bits, U32, 1328, [4:4] +isIacTableForCoasting = bits, U32, 1328, [5:5] +notIdling = bits, U32, 1328, [6:6] +needReset = bits, U32, 1328, [7:7] +isInDeadZone = bits, U32, 1328, [8:8] +isBlipping = bits, U32, 1328, [9:9] +useClosedLoop = bits, U32, 1328, [10:10] +badTps = bits, U32, 1328, [11:11] +looksLikeRunning = bits, U32, 1328, [12:12] +looksLikeCoasting = bits, U32, 1328, [13:13] +looksLikeCrankToIdle = bits, U32, 1328, [14:14] +isIdleCoasting = bits, U32, 1328, [15:15] +isIdleClosedLoop = bits, U32, 1328, [16:16] +idleTarget = scalar, S32, 1332, "", 1, 0 +targetRpmByClt = scalar, S32, 1336, "", 1, 0 +targetRpmAc = scalar, S32, 1340, "", 1, 0 +iacByRpmTaper = scalar, F32, 1344 +luaAdd = scalar, F32, 1348 +; total TS size = 1352 +idlePosition0 = scalar, F32, 1352, "per", 1,0 +trim0 = scalar, F32, 1356, "", 1, 0 +luaAdjustment0 = scalar, F32, 1360, "per", 1,0 +m_wastegatePosition0 = scalar, F32, 1364, "per", 1,0 +etbFeedForward0 = scalar, F32, 1368 +etbIntegralError0 = scalar, F32, 1372, "", 1, 0 +etbCurrentTarget0 = scalar, F32, 1376, "%", 1, 0 +etbCurrentAdjustedTarget0 = scalar, F32, 1380, "%", 1, 0 +etbRevLimitActive0 = bits, U32, 1384, [0:0] +jamDetected0 = bits, U32, 1384, [1:1] +etbDutyRateOfChange0 = scalar, F32, 1388, "per", 1,0 +etbDutyAverage0 = scalar, F32, 1392, "per", 1,0 +etbTpsErrorCounter0 = scalar, U16, 1396, "count", 1,0 +etbPpsErrorCounter0 = scalar, U16, 1398, "count", 1,0 +etbErrorCode0 = scalar, S08, 1400, "", 1, 0 +jamTimer0 = scalar, U16, 1402, "sec", 0.01, 0 +; total TS size = 1404 +faultCode0 = scalar, U08, 1404, "", 1, 0 +heaterDuty0 = scalar, U08, 1405, "%", 1, 0 +pumpDuty0 = scalar, U08, 1406, "%", 1, 0 +tempC0 = scalar, U16, 1408, "C", 1, 0 +nernstVoltage0 = scalar, U16, 1410, "V", 0.001, 0 +esr0 = scalar, U16, 1412, "ohm", 1, 0 +; total TS size = 1416 +dcOutput0 = scalar, F32, 1416, "per", 1,0 +isEnabled0_int = scalar, U08, 1420, "per", 1,0 +isEnabled0 = bits, U32, 1424, [0:0] +; total TS size = 1428 +value0 = scalar, U16, 1428, "value", 1,0 +value1 = scalar, U16, 1430, "value", 1,0 +errorRate = scalar, F32, 1432, "ratio", 1,0 ; total TS size = 1436 -lambdaCurrentlyGood = bits, U32, 1436, [0:0] -lambdaMonitorCut = bits, U32, 1436, [1:1] -lambdaTimeSinceGood = scalar, U16, 1440, "sec", 0.01, 0 -; total TS size = 1444 +vvtTarget = scalar, U16, 1436, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1438, "%", 0.5, 0 +; total TS size = 1440 +lambdaCurrentlyGood = bits, U32, 1440, [0:0] +lambdaMonitorCut = bits, U32, 1440, [1:1] +lambdaTimeSinceGood = scalar, U16, 1444, "sec", 0.01, 0 +; total TS size = 1448 time = { timeNow } @@ -5237,6 +5238,7 @@ entry = brakePedalState, "Brake switch", int, "%d" entry = startStopState, "startStopState", int, "%d" entry = smartChipState, "smartChipState", int, "%d" entry = smartChipRestartCounter, "smartChipRestartCounter", int, "%d" +entry = smartChipAliveCounter, "smartChipAliveCounter", int, "%d" entry = startStopPhysicalState, "startStopPhysicalState", int, "%d" entry = acrStateDup, "acrStateDup", int, "%d" entry = acrEngineMovedRecently, "acrEngineMovedRecently", int, "%d" @@ -6212,16 +6214,17 @@ dialog = engine_stateDialog, "engine_state" graphLine = smartChipState graphLine = smartChipRestartCounter liveGraph = engine_state_5_Graph, "Graph", South + graphLine = smartChipAliveCounter graphLine = startStopStateToggleCounter graphLine = egtValue1 graphLine = egtValue2 - graphLine = desiredRpmLimit liveGraph = engine_state_6_Graph, "Graph", South + graphLine = desiredRpmLimit graphLine = fuelInjectionCounter graphLine = sparkCounter graphLine = fuelingLoad - graphLine = ignitionLoad liveGraph = engine_state_7_Graph, "Graph", South + graphLine = ignitionLoad graphLine = veTableYAxis indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_s105.ini b/firmware/tunerstudio/generated/rusefi_s105.ini index 6d466fefe5..f9eb03f41f 100644 --- a/firmware/tunerstudio/generated/rusefi_s105.ini +++ b/firmware/tunerstudio/generated/rusefi_s105.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.12.26.s105.2489042143" + signature = "rusEFI master.2023.12.26.s105.1549834813" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.12.26.s105.2489042143" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.12.26.s105.1549834813" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -92,7 +92,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","56 - MAP","16 - TPS","19 - Knock","39 - CLT","INVALID","opt 55 - AFR 2","opt 21 - AC Press","18 - AFR 1","13 - Ignition switch in (15)","44 - +12 sense (MR)","INVALID","na 37 - MAF","INVALID","INVALID","40 - IAT" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Tue Dec 26 01:37:42 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Tue Dec 26 22:48:14 UTC 2023 pageSize = 22088 page = 1 @@ -2373,7 +2373,7 @@ lambdaMaxDeviationRpmBins = array, U16, 22078, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1444 + ochBlockSize = 1448 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3027,145 +3027,146 @@ brakePedalState = scalar, S08, 1092, "", 1, 0 startStopState = scalar, S08, 1093, "", 1, 0 smartChipState = scalar, S08, 1094, "", 1, 0 smartChipRestartCounter = scalar, S08, 1095, "", 1, 0 -startStopPhysicalState = bits, U32, 1096, [0:0] -acrStateDup = bits, U32, 1096, [1:1] -acrEngineMovedRecently = bits, U32, 1096, [2:2] -heaterControlEnabled = bits, U32, 1096, [3:3] -luaDigitalState0 = bits, U32, 1096, [4:4] -luaDigitalState1 = bits, U32, 1096, [5:5] -luaDigitalState2 = bits, U32, 1096, [6:6] -luaDigitalState3 = bits, U32, 1096, [7:7] -startStopStateToggleCounter = scalar, U32, 1100, "", 1, 0 -egtValue1 = scalar, F32, 1104, "", 1, 0 -egtValue2 = scalar, F32, 1108, "", 1, 0 -desiredRpmLimit = scalar, S16, 1112, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1116, "", 1, 0 -sparkCounter = scalar, U32, 1120, "", 1, 0 -fuelingLoad = scalar, F32, 1124, "", 1, 0 -ignitionLoad = scalar, F32, 1128, "", 1, 0 -veTableYAxis = scalar, U16, 1132, "%", 0.01, 0 -; total TS size = 1136 -tpsFrom = scalar, F32, 1136 -tpsTo = scalar, F32, 1140 -deltaTps = scalar, F32, 1144 -extraFuel = scalar, F32, 1148, "", 1, 0 -valueFromTable = scalar, F32, 1152, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1156, [0:0] -isBelowDecelThreshold = bits, U32, 1156, [1:1] -isTimeToResetAccumulator = bits, U32, 1156, [2:2] -isFractionalEnrichment = bits, U32, 1156, [3:3] -belowEpsilon = bits, U32, 1156, [4:4] -tooShort = bits, U32, 1156, [5:5] -fractionalInjFuel = scalar, F32, 1160, "", 1, 0 -accumulatedValue = scalar, F32, 1164, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1168, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1172, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1176, "", 1, 0 -cycleCnt = scalar, S32, 1180, "", 1, 0 -; total TS size = 1184 -hwEventCounters1 = scalar, U32, 1184, "", 1, 0 -hwEventCounters2 = scalar, U32, 1188, "", 1, 0 -hwEventCounters3 = scalar, U32, 1192, "", 1, 0 -hwEventCounters4 = scalar, U32, 1196, "", 1, 0 -hwEventCounters5 = scalar, U32, 1200, "", 1, 0 -hwEventCounters6 = scalar, U32, 1204, "", 1, 0 -vvtCamCounter = scalar, U32, 1208, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1212, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1216, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1220, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1221, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1224, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1228, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1232, "", 1, 0 -mapCamPrevToothAngle = scalar, F32, 1236, "deg", 1, 0 -isDecodingMapCam = bits, U32, 1240, [0:0] -; total TS size = 1244 -crankSynchronizationCounter0 = scalar, U32, 1244, "", 1, 0 -vvtSyncGapRatio0 = scalar, F32, 1248, "", 1, 0 -vvtToothDurations00 = scalar, U32, 1252, "us", 1, 0 -vvtCurrentPosition0 = scalar, F32, 1256, "sync: Primary Cam Position", 1, 0 -vvtToothPosition10 = scalar, F32, 1260, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition20 = scalar, F32, 1264, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition30 = scalar, F32, 1268, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition40 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio0 = scalar, F32, 1276, "", 1, 0 -triggerStateIndex0 = scalar, U08, 1280, "", 1, 0 -vvtStateIndex0 = scalar, U08, 1281, "", 1, 0 -; total TS size = 1284 -camResyncCounter = scalar, U08, 1284, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1288, [0:0] -; total TS size = 1292 -wallFuelCorrection = scalar, F32, 1292, "", 1, 0 -wallFuel = scalar, F32, 1296, "", 1, 0 -; total TS size = 1300 -idleState = bits, S32, 1300, [0:2], "not important" -currentIdlePosition = scalar, F32, 1304 -baseIdlePosition = scalar, F32, 1308 -idleClosedLoop = scalar, F32, 1312 -iacByTpsTaper = scalar, F32, 1316 -throttlePedalUpState = scalar, S32, 1320, "", 1, 0 -mightResetPid = bits, U32, 1324, [0:0] -shouldResetPid = bits, U32, 1324, [1:1] -wasResetPid = bits, U32, 1324, [2:2] -mustResetPid = bits, U32, 1324, [3:3] -isCranking = bits, U32, 1324, [4:4] -isIacTableForCoasting = bits, U32, 1324, [5:5] -notIdling = bits, U32, 1324, [6:6] -needReset = bits, U32, 1324, [7:7] -isInDeadZone = bits, U32, 1324, [8:8] -isBlipping = bits, U32, 1324, [9:9] -useClosedLoop = bits, U32, 1324, [10:10] -badTps = bits, U32, 1324, [11:11] -looksLikeRunning = bits, U32, 1324, [12:12] -looksLikeCoasting = bits, U32, 1324, [13:13] -looksLikeCrankToIdle = bits, U32, 1324, [14:14] -isIdleCoasting = bits, U32, 1324, [15:15] -isIdleClosedLoop = bits, U32, 1324, [16:16] -idleTarget = scalar, S32, 1328, "", 1, 0 -targetRpmByClt = scalar, S32, 1332, "", 1, 0 -targetRpmAc = scalar, S32, 1336, "", 1, 0 -iacByRpmTaper = scalar, F32, 1340 -luaAdd = scalar, F32, 1344 -; total TS size = 1348 -idlePosition0 = scalar, F32, 1348, "per", 1,0 -trim0 = scalar, F32, 1352, "", 1, 0 -luaAdjustment0 = scalar, F32, 1356, "per", 1,0 -m_wastegatePosition0 = scalar, F32, 1360, "per", 1,0 -etbFeedForward0 = scalar, F32, 1364 -etbIntegralError0 = scalar, F32, 1368, "", 1, 0 -etbCurrentTarget0 = scalar, F32, 1372, "%", 1, 0 -etbCurrentAdjustedTarget0 = scalar, F32, 1376, "%", 1, 0 -etbRevLimitActive0 = bits, U32, 1380, [0:0] -jamDetected0 = bits, U32, 1380, [1:1] -etbDutyRateOfChange0 = scalar, F32, 1384, "per", 1,0 -etbDutyAverage0 = scalar, F32, 1388, "per", 1,0 -etbTpsErrorCounter0 = scalar, U16, 1392, "count", 1,0 -etbPpsErrorCounter0 = scalar, U16, 1394, "count", 1,0 -etbErrorCode0 = scalar, S08, 1396, "", 1, 0 -jamTimer0 = scalar, U16, 1398, "sec", 0.01, 0 -; total TS size = 1400 -faultCode0 = scalar, U08, 1400, "", 1, 0 -heaterDuty0 = scalar, U08, 1401, "%", 1, 0 -pumpDuty0 = scalar, U08, 1402, "%", 1, 0 -tempC0 = scalar, U16, 1404, "C", 1, 0 -nernstVoltage0 = scalar, U16, 1406, "V", 0.001, 0 -esr0 = scalar, U16, 1408, "ohm", 1, 0 -; total TS size = 1412 -dcOutput0 = scalar, F32, 1412, "per", 1,0 -isEnabled0_int = scalar, U08, 1416, "per", 1,0 -isEnabled0 = bits, U32, 1420, [0:0] -; total TS size = 1424 -value0 = scalar, U16, 1424, "value", 1,0 -value1 = scalar, U16, 1426, "value", 1,0 -errorRate = scalar, F32, 1428, "ratio", 1,0 -; total TS size = 1432 -vvtTarget = scalar, U16, 1432, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1434, "%", 0.5, 0 +smartChipAliveCounter = scalar, S08, 1096, "", 1, 0 +startStopPhysicalState = bits, U32, 1100, [0:0] +acrStateDup = bits, U32, 1100, [1:1] +acrEngineMovedRecently = bits, U32, 1100, [2:2] +heaterControlEnabled = bits, U32, 1100, [3:3] +luaDigitalState0 = bits, U32, 1100, [4:4] +luaDigitalState1 = bits, U32, 1100, [5:5] +luaDigitalState2 = bits, U32, 1100, [6:6] +luaDigitalState3 = bits, U32, 1100, [7:7] +startStopStateToggleCounter = scalar, U32, 1104, "", 1, 0 +egtValue1 = scalar, F32, 1108, "", 1, 0 +egtValue2 = scalar, F32, 1112, "", 1, 0 +desiredRpmLimit = scalar, S16, 1116, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 1120, "", 1, 0 +sparkCounter = scalar, U32, 1124, "", 1, 0 +fuelingLoad = scalar, F32, 1128, "", 1, 0 +ignitionLoad = scalar, F32, 1132, "", 1, 0 +veTableYAxis = scalar, U16, 1136, "%", 0.01, 0 +; total TS size = 1140 +tpsFrom = scalar, F32, 1140 +tpsTo = scalar, F32, 1144 +deltaTps = scalar, F32, 1148 +extraFuel = scalar, F32, 1152, "", 1, 0 +valueFromTable = scalar, F32, 1156, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1160, [0:0] +isBelowDecelThreshold = bits, U32, 1160, [1:1] +isTimeToResetAccumulator = bits, U32, 1160, [2:2] +isFractionalEnrichment = bits, U32, 1160, [3:3] +belowEpsilon = bits, U32, 1160, [4:4] +tooShort = bits, U32, 1160, [5:5] +fractionalInjFuel = scalar, F32, 1164, "", 1, 0 +accumulatedValue = scalar, F32, 1168, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1172, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1176, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1180, "", 1, 0 +cycleCnt = scalar, S32, 1184, "", 1, 0 +; total TS size = 1188 +hwEventCounters1 = scalar, U32, 1188, "", 1, 0 +hwEventCounters2 = scalar, U32, 1192, "", 1, 0 +hwEventCounters3 = scalar, U32, 1196, "", 1, 0 +hwEventCounters4 = scalar, U32, 1200, "", 1, 0 +hwEventCounters5 = scalar, U32, 1204, "", 1, 0 +hwEventCounters6 = scalar, U32, 1208, "", 1, 0 +vvtCamCounter = scalar, U32, 1212, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1216, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1220, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1224, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1225, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1228, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1232, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1236, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1240, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1244, [0:0] +; total TS size = 1248 +crankSynchronizationCounter0 = scalar, U32, 1248, "", 1, 0 +vvtSyncGapRatio0 = scalar, F32, 1252, "", 1, 0 +vvtToothDurations00 = scalar, U32, 1256, "us", 1, 0 +vvtCurrentPosition0 = scalar, F32, 1260, "sync: Primary Cam Position", 1, 0 +vvtToothPosition10 = scalar, F32, 1264, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition20 = scalar, F32, 1268, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition30 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition40 = scalar, F32, 1276, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio0 = scalar, F32, 1280, "", 1, 0 +triggerStateIndex0 = scalar, U08, 1284, "", 1, 0 +vvtStateIndex0 = scalar, U08, 1285, "", 1, 0 +; total TS size = 1288 +camResyncCounter = scalar, U08, 1288, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1292, [0:0] +; total TS size = 1296 +wallFuelCorrection = scalar, F32, 1296, "", 1, 0 +wallFuel = scalar, F32, 1300, "", 1, 0 +; total TS size = 1304 +idleState = bits, S32, 1304, [0:2], "not important" +currentIdlePosition = scalar, F32, 1308 +baseIdlePosition = scalar, F32, 1312 +idleClosedLoop = scalar, F32, 1316 +iacByTpsTaper = scalar, F32, 1320 +throttlePedalUpState = scalar, S32, 1324, "", 1, 0 +mightResetPid = bits, U32, 1328, [0:0] +shouldResetPid = bits, U32, 1328, [1:1] +wasResetPid = bits, U32, 1328, [2:2] +mustResetPid = bits, U32, 1328, [3:3] +isCranking = bits, U32, 1328, [4:4] +isIacTableForCoasting = bits, U32, 1328, [5:5] +notIdling = bits, U32, 1328, [6:6] +needReset = bits, U32, 1328, [7:7] +isInDeadZone = bits, U32, 1328, [8:8] +isBlipping = bits, U32, 1328, [9:9] +useClosedLoop = bits, U32, 1328, [10:10] +badTps = bits, U32, 1328, [11:11] +looksLikeRunning = bits, U32, 1328, [12:12] +looksLikeCoasting = bits, U32, 1328, [13:13] +looksLikeCrankToIdle = bits, U32, 1328, [14:14] +isIdleCoasting = bits, U32, 1328, [15:15] +isIdleClosedLoop = bits, U32, 1328, [16:16] +idleTarget = scalar, S32, 1332, "", 1, 0 +targetRpmByClt = scalar, S32, 1336, "", 1, 0 +targetRpmAc = scalar, S32, 1340, "", 1, 0 +iacByRpmTaper = scalar, F32, 1344 +luaAdd = scalar, F32, 1348 +; total TS size = 1352 +idlePosition0 = scalar, F32, 1352, "per", 1,0 +trim0 = scalar, F32, 1356, "", 1, 0 +luaAdjustment0 = scalar, F32, 1360, "per", 1,0 +m_wastegatePosition0 = scalar, F32, 1364, "per", 1,0 +etbFeedForward0 = scalar, F32, 1368 +etbIntegralError0 = scalar, F32, 1372, "", 1, 0 +etbCurrentTarget0 = scalar, F32, 1376, "%", 1, 0 +etbCurrentAdjustedTarget0 = scalar, F32, 1380, "%", 1, 0 +etbRevLimitActive0 = bits, U32, 1384, [0:0] +jamDetected0 = bits, U32, 1384, [1:1] +etbDutyRateOfChange0 = scalar, F32, 1388, "per", 1,0 +etbDutyAverage0 = scalar, F32, 1392, "per", 1,0 +etbTpsErrorCounter0 = scalar, U16, 1396, "count", 1,0 +etbPpsErrorCounter0 = scalar, U16, 1398, "count", 1,0 +etbErrorCode0 = scalar, S08, 1400, "", 1, 0 +jamTimer0 = scalar, U16, 1402, "sec", 0.01, 0 +; total TS size = 1404 +faultCode0 = scalar, U08, 1404, "", 1, 0 +heaterDuty0 = scalar, U08, 1405, "%", 1, 0 +pumpDuty0 = scalar, U08, 1406, "%", 1, 0 +tempC0 = scalar, U16, 1408, "C", 1, 0 +nernstVoltage0 = scalar, U16, 1410, "V", 0.001, 0 +esr0 = scalar, U16, 1412, "ohm", 1, 0 +; total TS size = 1416 +dcOutput0 = scalar, F32, 1416, "per", 1,0 +isEnabled0_int = scalar, U08, 1420, "per", 1,0 +isEnabled0 = bits, U32, 1424, [0:0] +; total TS size = 1428 +value0 = scalar, U16, 1428, "value", 1,0 +value1 = scalar, U16, 1430, "value", 1,0 +errorRate = scalar, F32, 1432, "ratio", 1,0 ; total TS size = 1436 -lambdaCurrentlyGood = bits, U32, 1436, [0:0] -lambdaMonitorCut = bits, U32, 1436, [1:1] -lambdaTimeSinceGood = scalar, U16, 1440, "sec", 0.01, 0 -; total TS size = 1444 +vvtTarget = scalar, U16, 1436, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1438, "%", 0.5, 0 +; total TS size = 1440 +lambdaCurrentlyGood = bits, U32, 1440, [0:0] +lambdaMonitorCut = bits, U32, 1440, [1:1] +lambdaTimeSinceGood = scalar, U16, 1444, "sec", 0.01, 0 +; total TS size = 1448 time = { timeNow } @@ -5237,6 +5238,7 @@ entry = brakePedalState, "Brake switch", int, "%d" entry = startStopState, "startStopState", int, "%d" entry = smartChipState, "smartChipState", int, "%d" entry = smartChipRestartCounter, "smartChipRestartCounter", int, "%d" +entry = smartChipAliveCounter, "smartChipAliveCounter", int, "%d" entry = startStopPhysicalState, "startStopPhysicalState", int, "%d" entry = acrStateDup, "acrStateDup", int, "%d" entry = acrEngineMovedRecently, "acrEngineMovedRecently", int, "%d" @@ -6203,16 +6205,17 @@ dialog = engine_stateDialog, "engine_state" graphLine = smartChipState graphLine = smartChipRestartCounter liveGraph = engine_state_5_Graph, "Graph", South + graphLine = smartChipAliveCounter graphLine = startStopStateToggleCounter graphLine = egtValue1 graphLine = egtValue2 - graphLine = desiredRpmLimit liveGraph = engine_state_6_Graph, "Graph", South + graphLine = desiredRpmLimit graphLine = fuelInjectionCounter graphLine = sparkCounter graphLine = fuelingLoad - graphLine = ignitionLoad liveGraph = engine_state_7_Graph, "Graph", South + graphLine = ignitionLoad graphLine = veTableYAxis indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_small-can-board.ini b/firmware/tunerstudio/generated/rusefi_small-can-board.ini index 934531b3b0..7287aacfff 100644 --- a/firmware/tunerstudio/generated/rusefi_small-can-board.ini +++ b/firmware/tunerstudio/generated/rusefi_small-can-board.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.12.26.small-can-board.3318868016" + signature = "rusEFI master.2023.12.26.small-can-board.233486034" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.12.26.small-can-board.3318868016" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.12.26.small-can-board.233486034" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -92,7 +92,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","INVALID","INVALID","B2 - Analog/Digital Input","B3 - Analog/Digital Input","B4 - Analog/Digital Input","B5 - Analog/Digital Input","B7 - Analog/Digital Input","C1 - Analog/Digital Input 6","INVALID","INVALID","INVALID","A2 Battery Sense","INVALID","INVALID","C2 - Analog/Digital Input 7","C4 - Analog/Digital Input 8" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Tue Dec 26 01:37:31 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Tue Dec 26 22:48:03 UTC 2023 pageSize = 22088 page = 1 @@ -2373,7 +2373,7 @@ lambdaMaxDeviationRpmBins = array, U16, 22078, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1444 + ochBlockSize = 1448 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3027,145 +3027,146 @@ brakePedalState = scalar, S08, 1092, "", 1, 0 startStopState = scalar, S08, 1093, "", 1, 0 smartChipState = scalar, S08, 1094, "", 1, 0 smartChipRestartCounter = scalar, S08, 1095, "", 1, 0 -startStopPhysicalState = bits, U32, 1096, [0:0] -acrStateDup = bits, U32, 1096, [1:1] -acrEngineMovedRecently = bits, U32, 1096, [2:2] -heaterControlEnabled = bits, U32, 1096, [3:3] -luaDigitalState0 = bits, U32, 1096, [4:4] -luaDigitalState1 = bits, U32, 1096, [5:5] -luaDigitalState2 = bits, U32, 1096, [6:6] -luaDigitalState3 = bits, U32, 1096, [7:7] -startStopStateToggleCounter = scalar, U32, 1100, "", 1, 0 -egtValue1 = scalar, F32, 1104, "", 1, 0 -egtValue2 = scalar, F32, 1108, "", 1, 0 -desiredRpmLimit = scalar, S16, 1112, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1116, "", 1, 0 -sparkCounter = scalar, U32, 1120, "", 1, 0 -fuelingLoad = scalar, F32, 1124, "", 1, 0 -ignitionLoad = scalar, F32, 1128, "", 1, 0 -veTableYAxis = scalar, U16, 1132, "%", 0.01, 0 -; total TS size = 1136 -tpsFrom = scalar, F32, 1136 -tpsTo = scalar, F32, 1140 -deltaTps = scalar, F32, 1144 -extraFuel = scalar, F32, 1148, "", 1, 0 -valueFromTable = scalar, F32, 1152, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1156, [0:0] -isBelowDecelThreshold = bits, U32, 1156, [1:1] -isTimeToResetAccumulator = bits, U32, 1156, [2:2] -isFractionalEnrichment = bits, U32, 1156, [3:3] -belowEpsilon = bits, U32, 1156, [4:4] -tooShort = bits, U32, 1156, [5:5] -fractionalInjFuel = scalar, F32, 1160, "", 1, 0 -accumulatedValue = scalar, F32, 1164, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1168, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1172, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1176, "", 1, 0 -cycleCnt = scalar, S32, 1180, "", 1, 0 -; total TS size = 1184 -hwEventCounters1 = scalar, U32, 1184, "", 1, 0 -hwEventCounters2 = scalar, U32, 1188, "", 1, 0 -hwEventCounters3 = scalar, U32, 1192, "", 1, 0 -hwEventCounters4 = scalar, U32, 1196, "", 1, 0 -hwEventCounters5 = scalar, U32, 1200, "", 1, 0 -hwEventCounters6 = scalar, U32, 1204, "", 1, 0 -vvtCamCounter = scalar, U32, 1208, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1212, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1216, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1220, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1221, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1224, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1228, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1232, "", 1, 0 -mapCamPrevToothAngle = scalar, F32, 1236, "deg", 1, 0 -isDecodingMapCam = bits, U32, 1240, [0:0] -; total TS size = 1244 -crankSynchronizationCounter0 = scalar, U32, 1244, "", 1, 0 -vvtSyncGapRatio0 = scalar, F32, 1248, "", 1, 0 -vvtToothDurations00 = scalar, U32, 1252, "us", 1, 0 -vvtCurrentPosition0 = scalar, F32, 1256, "sync: Primary Cam Position", 1, 0 -vvtToothPosition10 = scalar, F32, 1260, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition20 = scalar, F32, 1264, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition30 = scalar, F32, 1268, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition40 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio0 = scalar, F32, 1276, "", 1, 0 -triggerStateIndex0 = scalar, U08, 1280, "", 1, 0 -vvtStateIndex0 = scalar, U08, 1281, "", 1, 0 -; total TS size = 1284 -camResyncCounter = scalar, U08, 1284, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1288, [0:0] -; total TS size = 1292 -wallFuelCorrection = scalar, F32, 1292, "", 1, 0 -wallFuel = scalar, F32, 1296, "", 1, 0 -; total TS size = 1300 -idleState = bits, S32, 1300, [0:2], "not important" -currentIdlePosition = scalar, F32, 1304 -baseIdlePosition = scalar, F32, 1308 -idleClosedLoop = scalar, F32, 1312 -iacByTpsTaper = scalar, F32, 1316 -throttlePedalUpState = scalar, S32, 1320, "", 1, 0 -mightResetPid = bits, U32, 1324, [0:0] -shouldResetPid = bits, U32, 1324, [1:1] -wasResetPid = bits, U32, 1324, [2:2] -mustResetPid = bits, U32, 1324, [3:3] -isCranking = bits, U32, 1324, [4:4] -isIacTableForCoasting = bits, U32, 1324, [5:5] -notIdling = bits, U32, 1324, [6:6] -needReset = bits, U32, 1324, [7:7] -isInDeadZone = bits, U32, 1324, [8:8] -isBlipping = bits, U32, 1324, [9:9] -useClosedLoop = bits, U32, 1324, [10:10] -badTps = bits, U32, 1324, [11:11] -looksLikeRunning = bits, U32, 1324, [12:12] -looksLikeCoasting = bits, U32, 1324, [13:13] -looksLikeCrankToIdle = bits, U32, 1324, [14:14] -isIdleCoasting = bits, U32, 1324, [15:15] -isIdleClosedLoop = bits, U32, 1324, [16:16] -idleTarget = scalar, S32, 1328, "", 1, 0 -targetRpmByClt = scalar, S32, 1332, "", 1, 0 -targetRpmAc = scalar, S32, 1336, "", 1, 0 -iacByRpmTaper = scalar, F32, 1340 -luaAdd = scalar, F32, 1344 -; total TS size = 1348 -idlePosition0 = scalar, F32, 1348, "per", 1,0 -trim0 = scalar, F32, 1352, "", 1, 0 -luaAdjustment0 = scalar, F32, 1356, "per", 1,0 -m_wastegatePosition0 = scalar, F32, 1360, "per", 1,0 -etbFeedForward0 = scalar, F32, 1364 -etbIntegralError0 = scalar, F32, 1368, "", 1, 0 -etbCurrentTarget0 = scalar, F32, 1372, "%", 1, 0 -etbCurrentAdjustedTarget0 = scalar, F32, 1376, "%", 1, 0 -etbRevLimitActive0 = bits, U32, 1380, [0:0] -jamDetected0 = bits, U32, 1380, [1:1] -etbDutyRateOfChange0 = scalar, F32, 1384, "per", 1,0 -etbDutyAverage0 = scalar, F32, 1388, "per", 1,0 -etbTpsErrorCounter0 = scalar, U16, 1392, "count", 1,0 -etbPpsErrorCounter0 = scalar, U16, 1394, "count", 1,0 -etbErrorCode0 = scalar, S08, 1396, "", 1, 0 -jamTimer0 = scalar, U16, 1398, "sec", 0.01, 0 -; total TS size = 1400 -faultCode0 = scalar, U08, 1400, "", 1, 0 -heaterDuty0 = scalar, U08, 1401, "%", 1, 0 -pumpDuty0 = scalar, U08, 1402, "%", 1, 0 -tempC0 = scalar, U16, 1404, "C", 1, 0 -nernstVoltage0 = scalar, U16, 1406, "V", 0.001, 0 -esr0 = scalar, U16, 1408, "ohm", 1, 0 -; total TS size = 1412 -dcOutput0 = scalar, F32, 1412, "per", 1,0 -isEnabled0_int = scalar, U08, 1416, "per", 1,0 -isEnabled0 = bits, U32, 1420, [0:0] -; total TS size = 1424 -value0 = scalar, U16, 1424, "value", 1,0 -value1 = scalar, U16, 1426, "value", 1,0 -errorRate = scalar, F32, 1428, "ratio", 1,0 -; total TS size = 1432 -vvtTarget = scalar, U16, 1432, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1434, "%", 0.5, 0 +smartChipAliveCounter = scalar, S08, 1096, "", 1, 0 +startStopPhysicalState = bits, U32, 1100, [0:0] +acrStateDup = bits, U32, 1100, [1:1] +acrEngineMovedRecently = bits, U32, 1100, [2:2] +heaterControlEnabled = bits, U32, 1100, [3:3] +luaDigitalState0 = bits, U32, 1100, [4:4] +luaDigitalState1 = bits, U32, 1100, [5:5] +luaDigitalState2 = bits, U32, 1100, [6:6] +luaDigitalState3 = bits, U32, 1100, [7:7] +startStopStateToggleCounter = scalar, U32, 1104, "", 1, 0 +egtValue1 = scalar, F32, 1108, "", 1, 0 +egtValue2 = scalar, F32, 1112, "", 1, 0 +desiredRpmLimit = scalar, S16, 1116, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 1120, "", 1, 0 +sparkCounter = scalar, U32, 1124, "", 1, 0 +fuelingLoad = scalar, F32, 1128, "", 1, 0 +ignitionLoad = scalar, F32, 1132, "", 1, 0 +veTableYAxis = scalar, U16, 1136, "%", 0.01, 0 +; total TS size = 1140 +tpsFrom = scalar, F32, 1140 +tpsTo = scalar, F32, 1144 +deltaTps = scalar, F32, 1148 +extraFuel = scalar, F32, 1152, "", 1, 0 +valueFromTable = scalar, F32, 1156, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1160, [0:0] +isBelowDecelThreshold = bits, U32, 1160, [1:1] +isTimeToResetAccumulator = bits, U32, 1160, [2:2] +isFractionalEnrichment = bits, U32, 1160, [3:3] +belowEpsilon = bits, U32, 1160, [4:4] +tooShort = bits, U32, 1160, [5:5] +fractionalInjFuel = scalar, F32, 1164, "", 1, 0 +accumulatedValue = scalar, F32, 1168, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1172, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1176, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1180, "", 1, 0 +cycleCnt = scalar, S32, 1184, "", 1, 0 +; total TS size = 1188 +hwEventCounters1 = scalar, U32, 1188, "", 1, 0 +hwEventCounters2 = scalar, U32, 1192, "", 1, 0 +hwEventCounters3 = scalar, U32, 1196, "", 1, 0 +hwEventCounters4 = scalar, U32, 1200, "", 1, 0 +hwEventCounters5 = scalar, U32, 1204, "", 1, 0 +hwEventCounters6 = scalar, U32, 1208, "", 1, 0 +vvtCamCounter = scalar, U32, 1212, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1216, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1220, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1224, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1225, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1228, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1232, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1236, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1240, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1244, [0:0] +; total TS size = 1248 +crankSynchronizationCounter0 = scalar, U32, 1248, "", 1, 0 +vvtSyncGapRatio0 = scalar, F32, 1252, "", 1, 0 +vvtToothDurations00 = scalar, U32, 1256, "us", 1, 0 +vvtCurrentPosition0 = scalar, F32, 1260, "sync: Primary Cam Position", 1, 0 +vvtToothPosition10 = scalar, F32, 1264, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition20 = scalar, F32, 1268, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition30 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition40 = scalar, F32, 1276, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio0 = scalar, F32, 1280, "", 1, 0 +triggerStateIndex0 = scalar, U08, 1284, "", 1, 0 +vvtStateIndex0 = scalar, U08, 1285, "", 1, 0 +; total TS size = 1288 +camResyncCounter = scalar, U08, 1288, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1292, [0:0] +; total TS size = 1296 +wallFuelCorrection = scalar, F32, 1296, "", 1, 0 +wallFuel = scalar, F32, 1300, "", 1, 0 +; total TS size = 1304 +idleState = bits, S32, 1304, [0:2], "not important" +currentIdlePosition = scalar, F32, 1308 +baseIdlePosition = scalar, F32, 1312 +idleClosedLoop = scalar, F32, 1316 +iacByTpsTaper = scalar, F32, 1320 +throttlePedalUpState = scalar, S32, 1324, "", 1, 0 +mightResetPid = bits, U32, 1328, [0:0] +shouldResetPid = bits, U32, 1328, [1:1] +wasResetPid = bits, U32, 1328, [2:2] +mustResetPid = bits, U32, 1328, [3:3] +isCranking = bits, U32, 1328, [4:4] +isIacTableForCoasting = bits, U32, 1328, [5:5] +notIdling = bits, U32, 1328, [6:6] +needReset = bits, U32, 1328, [7:7] +isInDeadZone = bits, U32, 1328, [8:8] +isBlipping = bits, U32, 1328, [9:9] +useClosedLoop = bits, U32, 1328, [10:10] +badTps = bits, U32, 1328, [11:11] +looksLikeRunning = bits, U32, 1328, [12:12] +looksLikeCoasting = bits, U32, 1328, [13:13] +looksLikeCrankToIdle = bits, U32, 1328, [14:14] +isIdleCoasting = bits, U32, 1328, [15:15] +isIdleClosedLoop = bits, U32, 1328, [16:16] +idleTarget = scalar, S32, 1332, "", 1, 0 +targetRpmByClt = scalar, S32, 1336, "", 1, 0 +targetRpmAc = scalar, S32, 1340, "", 1, 0 +iacByRpmTaper = scalar, F32, 1344 +luaAdd = scalar, F32, 1348 +; total TS size = 1352 +idlePosition0 = scalar, F32, 1352, "per", 1,0 +trim0 = scalar, F32, 1356, "", 1, 0 +luaAdjustment0 = scalar, F32, 1360, "per", 1,0 +m_wastegatePosition0 = scalar, F32, 1364, "per", 1,0 +etbFeedForward0 = scalar, F32, 1368 +etbIntegralError0 = scalar, F32, 1372, "", 1, 0 +etbCurrentTarget0 = scalar, F32, 1376, "%", 1, 0 +etbCurrentAdjustedTarget0 = scalar, F32, 1380, "%", 1, 0 +etbRevLimitActive0 = bits, U32, 1384, [0:0] +jamDetected0 = bits, U32, 1384, [1:1] +etbDutyRateOfChange0 = scalar, F32, 1388, "per", 1,0 +etbDutyAverage0 = scalar, F32, 1392, "per", 1,0 +etbTpsErrorCounter0 = scalar, U16, 1396, "count", 1,0 +etbPpsErrorCounter0 = scalar, U16, 1398, "count", 1,0 +etbErrorCode0 = scalar, S08, 1400, "", 1, 0 +jamTimer0 = scalar, U16, 1402, "sec", 0.01, 0 +; total TS size = 1404 +faultCode0 = scalar, U08, 1404, "", 1, 0 +heaterDuty0 = scalar, U08, 1405, "%", 1, 0 +pumpDuty0 = scalar, U08, 1406, "%", 1, 0 +tempC0 = scalar, U16, 1408, "C", 1, 0 +nernstVoltage0 = scalar, U16, 1410, "V", 0.001, 0 +esr0 = scalar, U16, 1412, "ohm", 1, 0 +; total TS size = 1416 +dcOutput0 = scalar, F32, 1416, "per", 1,0 +isEnabled0_int = scalar, U08, 1420, "per", 1,0 +isEnabled0 = bits, U32, 1424, [0:0] +; total TS size = 1428 +value0 = scalar, U16, 1428, "value", 1,0 +value1 = scalar, U16, 1430, "value", 1,0 +errorRate = scalar, F32, 1432, "ratio", 1,0 ; total TS size = 1436 -lambdaCurrentlyGood = bits, U32, 1436, [0:0] -lambdaMonitorCut = bits, U32, 1436, [1:1] -lambdaTimeSinceGood = scalar, U16, 1440, "sec", 0.01, 0 -; total TS size = 1444 +vvtTarget = scalar, U16, 1436, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1438, "%", 0.5, 0 +; total TS size = 1440 +lambdaCurrentlyGood = bits, U32, 1440, [0:0] +lambdaMonitorCut = bits, U32, 1440, [1:1] +lambdaTimeSinceGood = scalar, U16, 1444, "sec", 0.01, 0 +; total TS size = 1448 time = { timeNow } @@ -5237,6 +5238,7 @@ entry = brakePedalState, "Brake switch", int, "%d" entry = startStopState, "startStopState", int, "%d" entry = smartChipState, "smartChipState", int, "%d" entry = smartChipRestartCounter, "smartChipRestartCounter", int, "%d" +entry = smartChipAliveCounter, "smartChipAliveCounter", int, "%d" entry = startStopPhysicalState, "startStopPhysicalState", int, "%d" entry = acrStateDup, "acrStateDup", int, "%d" entry = acrEngineMovedRecently, "acrEngineMovedRecently", int, "%d" @@ -6202,16 +6204,17 @@ dialog = engine_stateDialog, "engine_state" graphLine = smartChipState graphLine = smartChipRestartCounter liveGraph = engine_state_5_Graph, "Graph", South + graphLine = smartChipAliveCounter graphLine = startStopStateToggleCounter graphLine = egtValue1 graphLine = egtValue2 - graphLine = desiredRpmLimit liveGraph = engine_state_6_Graph, "Graph", South + graphLine = desiredRpmLimit graphLine = fuelInjectionCounter graphLine = sparkCounter graphLine = fuelingLoad - graphLine = ignitionLoad liveGraph = engine_state_7_Graph, "Graph", South + graphLine = ignitionLoad graphLine = veTableYAxis indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_stm32f413_nucleo.ini b/firmware/tunerstudio/generated/rusefi_stm32f413_nucleo.ini index c530d24589..69971a4fe4 100644 --- a/firmware/tunerstudio/generated/rusefi_stm32f413_nucleo.ini +++ b/firmware/tunerstudio/generated/rusefi_stm32f413_nucleo.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.12.26.stm32f413_nucleo.4218430649" + signature = "rusEFI master.2023.12.26.stm32f413_nucleo.860584539" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.12.26.stm32f413_nucleo.4218430649" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.12.26.stm32f413_nucleo.860584539" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -92,7 +92,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="Disabled", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PB0", "PB1", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Tue Dec 26 01:38:07 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Tue Dec 26 22:48:38 UTC 2023 pageSize = 22088 page = 1 @@ -2373,7 +2373,7 @@ lambdaMaxDeviationRpmBins = array, U16, 22078, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1444 + ochBlockSize = 1448 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3027,145 +3027,146 @@ brakePedalState = scalar, S08, 1092, "", 1, 0 startStopState = scalar, S08, 1093, "", 1, 0 smartChipState = scalar, S08, 1094, "", 1, 0 smartChipRestartCounter = scalar, S08, 1095, "", 1, 0 -startStopPhysicalState = bits, U32, 1096, [0:0] -acrStateDup = bits, U32, 1096, [1:1] -acrEngineMovedRecently = bits, U32, 1096, [2:2] -heaterControlEnabled = bits, U32, 1096, [3:3] -luaDigitalState0 = bits, U32, 1096, [4:4] -luaDigitalState1 = bits, U32, 1096, [5:5] -luaDigitalState2 = bits, U32, 1096, [6:6] -luaDigitalState3 = bits, U32, 1096, [7:7] -startStopStateToggleCounter = scalar, U32, 1100, "", 1, 0 -egtValue1 = scalar, F32, 1104, "", 1, 0 -egtValue2 = scalar, F32, 1108, "", 1, 0 -desiredRpmLimit = scalar, S16, 1112, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1116, "", 1, 0 -sparkCounter = scalar, U32, 1120, "", 1, 0 -fuelingLoad = scalar, F32, 1124, "", 1, 0 -ignitionLoad = scalar, F32, 1128, "", 1, 0 -veTableYAxis = scalar, U16, 1132, "%", 0.01, 0 -; total TS size = 1136 -tpsFrom = scalar, F32, 1136 -tpsTo = scalar, F32, 1140 -deltaTps = scalar, F32, 1144 -extraFuel = scalar, F32, 1148, "", 1, 0 -valueFromTable = scalar, F32, 1152, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1156, [0:0] -isBelowDecelThreshold = bits, U32, 1156, [1:1] -isTimeToResetAccumulator = bits, U32, 1156, [2:2] -isFractionalEnrichment = bits, U32, 1156, [3:3] -belowEpsilon = bits, U32, 1156, [4:4] -tooShort = bits, U32, 1156, [5:5] -fractionalInjFuel = scalar, F32, 1160, "", 1, 0 -accumulatedValue = scalar, F32, 1164, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1168, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1172, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1176, "", 1, 0 -cycleCnt = scalar, S32, 1180, "", 1, 0 -; total TS size = 1184 -hwEventCounters1 = scalar, U32, 1184, "", 1, 0 -hwEventCounters2 = scalar, U32, 1188, "", 1, 0 -hwEventCounters3 = scalar, U32, 1192, "", 1, 0 -hwEventCounters4 = scalar, U32, 1196, "", 1, 0 -hwEventCounters5 = scalar, U32, 1200, "", 1, 0 -hwEventCounters6 = scalar, U32, 1204, "", 1, 0 -vvtCamCounter = scalar, U32, 1208, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1212, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1216, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1220, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1221, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1224, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1228, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1232, "", 1, 0 -mapCamPrevToothAngle = scalar, F32, 1236, "deg", 1, 0 -isDecodingMapCam = bits, U32, 1240, [0:0] -; total TS size = 1244 -crankSynchronizationCounter0 = scalar, U32, 1244, "", 1, 0 -vvtSyncGapRatio0 = scalar, F32, 1248, "", 1, 0 -vvtToothDurations00 = scalar, U32, 1252, "us", 1, 0 -vvtCurrentPosition0 = scalar, F32, 1256, "sync: Primary Cam Position", 1, 0 -vvtToothPosition10 = scalar, F32, 1260, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition20 = scalar, F32, 1264, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition30 = scalar, F32, 1268, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition40 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio0 = scalar, F32, 1276, "", 1, 0 -triggerStateIndex0 = scalar, U08, 1280, "", 1, 0 -vvtStateIndex0 = scalar, U08, 1281, "", 1, 0 -; total TS size = 1284 -camResyncCounter = scalar, U08, 1284, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1288, [0:0] -; total TS size = 1292 -wallFuelCorrection = scalar, F32, 1292, "", 1, 0 -wallFuel = scalar, F32, 1296, "", 1, 0 -; total TS size = 1300 -idleState = bits, S32, 1300, [0:2], "not important" -currentIdlePosition = scalar, F32, 1304 -baseIdlePosition = scalar, F32, 1308 -idleClosedLoop = scalar, F32, 1312 -iacByTpsTaper = scalar, F32, 1316 -throttlePedalUpState = scalar, S32, 1320, "", 1, 0 -mightResetPid = bits, U32, 1324, [0:0] -shouldResetPid = bits, U32, 1324, [1:1] -wasResetPid = bits, U32, 1324, [2:2] -mustResetPid = bits, U32, 1324, [3:3] -isCranking = bits, U32, 1324, [4:4] -isIacTableForCoasting = bits, U32, 1324, [5:5] -notIdling = bits, U32, 1324, [6:6] -needReset = bits, U32, 1324, [7:7] -isInDeadZone = bits, U32, 1324, [8:8] -isBlipping = bits, U32, 1324, [9:9] -useClosedLoop = bits, U32, 1324, [10:10] -badTps = bits, U32, 1324, [11:11] -looksLikeRunning = bits, U32, 1324, [12:12] -looksLikeCoasting = bits, U32, 1324, [13:13] -looksLikeCrankToIdle = bits, U32, 1324, [14:14] -isIdleCoasting = bits, U32, 1324, [15:15] -isIdleClosedLoop = bits, U32, 1324, [16:16] -idleTarget = scalar, S32, 1328, "", 1, 0 -targetRpmByClt = scalar, S32, 1332, "", 1, 0 -targetRpmAc = scalar, S32, 1336, "", 1, 0 -iacByRpmTaper = scalar, F32, 1340 -luaAdd = scalar, F32, 1344 -; total TS size = 1348 -idlePosition0 = scalar, F32, 1348, "per", 1,0 -trim0 = scalar, F32, 1352, "", 1, 0 -luaAdjustment0 = scalar, F32, 1356, "per", 1,0 -m_wastegatePosition0 = scalar, F32, 1360, "per", 1,0 -etbFeedForward0 = scalar, F32, 1364 -etbIntegralError0 = scalar, F32, 1368, "", 1, 0 -etbCurrentTarget0 = scalar, F32, 1372, "%", 1, 0 -etbCurrentAdjustedTarget0 = scalar, F32, 1376, "%", 1, 0 -etbRevLimitActive0 = bits, U32, 1380, [0:0] -jamDetected0 = bits, U32, 1380, [1:1] -etbDutyRateOfChange0 = scalar, F32, 1384, "per", 1,0 -etbDutyAverage0 = scalar, F32, 1388, "per", 1,0 -etbTpsErrorCounter0 = scalar, U16, 1392, "count", 1,0 -etbPpsErrorCounter0 = scalar, U16, 1394, "count", 1,0 -etbErrorCode0 = scalar, S08, 1396, "", 1, 0 -jamTimer0 = scalar, U16, 1398, "sec", 0.01, 0 -; total TS size = 1400 -faultCode0 = scalar, U08, 1400, "", 1, 0 -heaterDuty0 = scalar, U08, 1401, "%", 1, 0 -pumpDuty0 = scalar, U08, 1402, "%", 1, 0 -tempC0 = scalar, U16, 1404, "C", 1, 0 -nernstVoltage0 = scalar, U16, 1406, "V", 0.001, 0 -esr0 = scalar, U16, 1408, "ohm", 1, 0 -; total TS size = 1412 -dcOutput0 = scalar, F32, 1412, "per", 1,0 -isEnabled0_int = scalar, U08, 1416, "per", 1,0 -isEnabled0 = bits, U32, 1420, [0:0] -; total TS size = 1424 -value0 = scalar, U16, 1424, "value", 1,0 -value1 = scalar, U16, 1426, "value", 1,0 -errorRate = scalar, F32, 1428, "ratio", 1,0 -; total TS size = 1432 -vvtTarget = scalar, U16, 1432, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1434, "%", 0.5, 0 +smartChipAliveCounter = scalar, S08, 1096, "", 1, 0 +startStopPhysicalState = bits, U32, 1100, [0:0] +acrStateDup = bits, U32, 1100, [1:1] +acrEngineMovedRecently = bits, U32, 1100, [2:2] +heaterControlEnabled = bits, U32, 1100, [3:3] +luaDigitalState0 = bits, U32, 1100, [4:4] +luaDigitalState1 = bits, U32, 1100, [5:5] +luaDigitalState2 = bits, U32, 1100, [6:6] +luaDigitalState3 = bits, U32, 1100, [7:7] +startStopStateToggleCounter = scalar, U32, 1104, "", 1, 0 +egtValue1 = scalar, F32, 1108, "", 1, 0 +egtValue2 = scalar, F32, 1112, "", 1, 0 +desiredRpmLimit = scalar, S16, 1116, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 1120, "", 1, 0 +sparkCounter = scalar, U32, 1124, "", 1, 0 +fuelingLoad = scalar, F32, 1128, "", 1, 0 +ignitionLoad = scalar, F32, 1132, "", 1, 0 +veTableYAxis = scalar, U16, 1136, "%", 0.01, 0 +; total TS size = 1140 +tpsFrom = scalar, F32, 1140 +tpsTo = scalar, F32, 1144 +deltaTps = scalar, F32, 1148 +extraFuel = scalar, F32, 1152, "", 1, 0 +valueFromTable = scalar, F32, 1156, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1160, [0:0] +isBelowDecelThreshold = bits, U32, 1160, [1:1] +isTimeToResetAccumulator = bits, U32, 1160, [2:2] +isFractionalEnrichment = bits, U32, 1160, [3:3] +belowEpsilon = bits, U32, 1160, [4:4] +tooShort = bits, U32, 1160, [5:5] +fractionalInjFuel = scalar, F32, 1164, "", 1, 0 +accumulatedValue = scalar, F32, 1168, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1172, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1176, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1180, "", 1, 0 +cycleCnt = scalar, S32, 1184, "", 1, 0 +; total TS size = 1188 +hwEventCounters1 = scalar, U32, 1188, "", 1, 0 +hwEventCounters2 = scalar, U32, 1192, "", 1, 0 +hwEventCounters3 = scalar, U32, 1196, "", 1, 0 +hwEventCounters4 = scalar, U32, 1200, "", 1, 0 +hwEventCounters5 = scalar, U32, 1204, "", 1, 0 +hwEventCounters6 = scalar, U32, 1208, "", 1, 0 +vvtCamCounter = scalar, U32, 1212, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1216, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1220, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1224, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1225, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1228, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1232, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1236, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1240, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1244, [0:0] +; total TS size = 1248 +crankSynchronizationCounter0 = scalar, U32, 1248, "", 1, 0 +vvtSyncGapRatio0 = scalar, F32, 1252, "", 1, 0 +vvtToothDurations00 = scalar, U32, 1256, "us", 1, 0 +vvtCurrentPosition0 = scalar, F32, 1260, "sync: Primary Cam Position", 1, 0 +vvtToothPosition10 = scalar, F32, 1264, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition20 = scalar, F32, 1268, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition30 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition40 = scalar, F32, 1276, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio0 = scalar, F32, 1280, "", 1, 0 +triggerStateIndex0 = scalar, U08, 1284, "", 1, 0 +vvtStateIndex0 = scalar, U08, 1285, "", 1, 0 +; total TS size = 1288 +camResyncCounter = scalar, U08, 1288, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1292, [0:0] +; total TS size = 1296 +wallFuelCorrection = scalar, F32, 1296, "", 1, 0 +wallFuel = scalar, F32, 1300, "", 1, 0 +; total TS size = 1304 +idleState = bits, S32, 1304, [0:2], "not important" +currentIdlePosition = scalar, F32, 1308 +baseIdlePosition = scalar, F32, 1312 +idleClosedLoop = scalar, F32, 1316 +iacByTpsTaper = scalar, F32, 1320 +throttlePedalUpState = scalar, S32, 1324, "", 1, 0 +mightResetPid = bits, U32, 1328, [0:0] +shouldResetPid = bits, U32, 1328, [1:1] +wasResetPid = bits, U32, 1328, [2:2] +mustResetPid = bits, U32, 1328, [3:3] +isCranking = bits, U32, 1328, [4:4] +isIacTableForCoasting = bits, U32, 1328, [5:5] +notIdling = bits, U32, 1328, [6:6] +needReset = bits, U32, 1328, [7:7] +isInDeadZone = bits, U32, 1328, [8:8] +isBlipping = bits, U32, 1328, [9:9] +useClosedLoop = bits, U32, 1328, [10:10] +badTps = bits, U32, 1328, [11:11] +looksLikeRunning = bits, U32, 1328, [12:12] +looksLikeCoasting = bits, U32, 1328, [13:13] +looksLikeCrankToIdle = bits, U32, 1328, [14:14] +isIdleCoasting = bits, U32, 1328, [15:15] +isIdleClosedLoop = bits, U32, 1328, [16:16] +idleTarget = scalar, S32, 1332, "", 1, 0 +targetRpmByClt = scalar, S32, 1336, "", 1, 0 +targetRpmAc = scalar, S32, 1340, "", 1, 0 +iacByRpmTaper = scalar, F32, 1344 +luaAdd = scalar, F32, 1348 +; total TS size = 1352 +idlePosition0 = scalar, F32, 1352, "per", 1,0 +trim0 = scalar, F32, 1356, "", 1, 0 +luaAdjustment0 = scalar, F32, 1360, "per", 1,0 +m_wastegatePosition0 = scalar, F32, 1364, "per", 1,0 +etbFeedForward0 = scalar, F32, 1368 +etbIntegralError0 = scalar, F32, 1372, "", 1, 0 +etbCurrentTarget0 = scalar, F32, 1376, "%", 1, 0 +etbCurrentAdjustedTarget0 = scalar, F32, 1380, "%", 1, 0 +etbRevLimitActive0 = bits, U32, 1384, [0:0] +jamDetected0 = bits, U32, 1384, [1:1] +etbDutyRateOfChange0 = scalar, F32, 1388, "per", 1,0 +etbDutyAverage0 = scalar, F32, 1392, "per", 1,0 +etbTpsErrorCounter0 = scalar, U16, 1396, "count", 1,0 +etbPpsErrorCounter0 = scalar, U16, 1398, "count", 1,0 +etbErrorCode0 = scalar, S08, 1400, "", 1, 0 +jamTimer0 = scalar, U16, 1402, "sec", 0.01, 0 +; total TS size = 1404 +faultCode0 = scalar, U08, 1404, "", 1, 0 +heaterDuty0 = scalar, U08, 1405, "%", 1, 0 +pumpDuty0 = scalar, U08, 1406, "%", 1, 0 +tempC0 = scalar, U16, 1408, "C", 1, 0 +nernstVoltage0 = scalar, U16, 1410, "V", 0.001, 0 +esr0 = scalar, U16, 1412, "ohm", 1, 0 +; total TS size = 1416 +dcOutput0 = scalar, F32, 1416, "per", 1,0 +isEnabled0_int = scalar, U08, 1420, "per", 1,0 +isEnabled0 = bits, U32, 1424, [0:0] +; total TS size = 1428 +value0 = scalar, U16, 1428, "value", 1,0 +value1 = scalar, U16, 1430, "value", 1,0 +errorRate = scalar, F32, 1432, "ratio", 1,0 ; total TS size = 1436 -lambdaCurrentlyGood = bits, U32, 1436, [0:0] -lambdaMonitorCut = bits, U32, 1436, [1:1] -lambdaTimeSinceGood = scalar, U16, 1440, "sec", 0.01, 0 -; total TS size = 1444 +vvtTarget = scalar, U16, 1436, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1438, "%", 0.5, 0 +; total TS size = 1440 +lambdaCurrentlyGood = bits, U32, 1440, [0:0] +lambdaMonitorCut = bits, U32, 1440, [1:1] +lambdaTimeSinceGood = scalar, U16, 1444, "sec", 0.01, 0 +; total TS size = 1448 time = { timeNow } @@ -5237,6 +5238,7 @@ entry = brakePedalState, "Brake switch", int, "%d" entry = startStopState, "startStopState", int, "%d" entry = smartChipState, "smartChipState", int, "%d" entry = smartChipRestartCounter, "smartChipRestartCounter", int, "%d" +entry = smartChipAliveCounter, "smartChipAliveCounter", int, "%d" entry = startStopPhysicalState, "startStopPhysicalState", int, "%d" entry = acrStateDup, "acrStateDup", int, "%d" entry = acrEngineMovedRecently, "acrEngineMovedRecently", int, "%d" @@ -6202,16 +6204,17 @@ dialog = engine_stateDialog, "engine_state" graphLine = smartChipState graphLine = smartChipRestartCounter liveGraph = engine_state_5_Graph, "Graph", South + graphLine = smartChipAliveCounter graphLine = startStopStateToggleCounter graphLine = egtValue1 graphLine = egtValue2 - graphLine = desiredRpmLimit liveGraph = engine_state_6_Graph, "Graph", South + graphLine = desiredRpmLimit graphLine = fuelInjectionCounter graphLine = sparkCounter graphLine = fuelingLoad - graphLine = ignitionLoad liveGraph = engine_state_7_Graph, "Graph", South + graphLine = ignitionLoad graphLine = veTableYAxis indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_stm32f429_nucleo.ini b/firmware/tunerstudio/generated/rusefi_stm32f429_nucleo.ini index accfacab5d..d09d50ecc4 100644 --- a/firmware/tunerstudio/generated/rusefi_stm32f429_nucleo.ini +++ b/firmware/tunerstudio/generated/rusefi_stm32f429_nucleo.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.12.26.stm32f429_nucleo.4218430649" + signature = "rusEFI master.2023.12.26.stm32f429_nucleo.860584539" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.12.26.stm32f429_nucleo.4218430649" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.12.26.stm32f429_nucleo.860584539" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -92,7 +92,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="Disabled", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PB0", "PB1", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Tue Dec 26 01:38:09 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Tue Dec 26 22:48:40 UTC 2023 pageSize = 22088 page = 1 @@ -2373,7 +2373,7 @@ lambdaMaxDeviationRpmBins = array, U16, 22078, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1444 + ochBlockSize = 1448 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3027,145 +3027,146 @@ brakePedalState = scalar, S08, 1092, "", 1, 0 startStopState = scalar, S08, 1093, "", 1, 0 smartChipState = scalar, S08, 1094, "", 1, 0 smartChipRestartCounter = scalar, S08, 1095, "", 1, 0 -startStopPhysicalState = bits, U32, 1096, [0:0] -acrStateDup = bits, U32, 1096, [1:1] -acrEngineMovedRecently = bits, U32, 1096, [2:2] -heaterControlEnabled = bits, U32, 1096, [3:3] -luaDigitalState0 = bits, U32, 1096, [4:4] -luaDigitalState1 = bits, U32, 1096, [5:5] -luaDigitalState2 = bits, U32, 1096, [6:6] -luaDigitalState3 = bits, U32, 1096, [7:7] -startStopStateToggleCounter = scalar, U32, 1100, "", 1, 0 -egtValue1 = scalar, F32, 1104, "", 1, 0 -egtValue2 = scalar, F32, 1108, "", 1, 0 -desiredRpmLimit = scalar, S16, 1112, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1116, "", 1, 0 -sparkCounter = scalar, U32, 1120, "", 1, 0 -fuelingLoad = scalar, F32, 1124, "", 1, 0 -ignitionLoad = scalar, F32, 1128, "", 1, 0 -veTableYAxis = scalar, U16, 1132, "%", 0.01, 0 -; total TS size = 1136 -tpsFrom = scalar, F32, 1136 -tpsTo = scalar, F32, 1140 -deltaTps = scalar, F32, 1144 -extraFuel = scalar, F32, 1148, "", 1, 0 -valueFromTable = scalar, F32, 1152, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1156, [0:0] -isBelowDecelThreshold = bits, U32, 1156, [1:1] -isTimeToResetAccumulator = bits, U32, 1156, [2:2] -isFractionalEnrichment = bits, U32, 1156, [3:3] -belowEpsilon = bits, U32, 1156, [4:4] -tooShort = bits, U32, 1156, [5:5] -fractionalInjFuel = scalar, F32, 1160, "", 1, 0 -accumulatedValue = scalar, F32, 1164, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1168, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1172, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1176, "", 1, 0 -cycleCnt = scalar, S32, 1180, "", 1, 0 -; total TS size = 1184 -hwEventCounters1 = scalar, U32, 1184, "", 1, 0 -hwEventCounters2 = scalar, U32, 1188, "", 1, 0 -hwEventCounters3 = scalar, U32, 1192, "", 1, 0 -hwEventCounters4 = scalar, U32, 1196, "", 1, 0 -hwEventCounters5 = scalar, U32, 1200, "", 1, 0 -hwEventCounters6 = scalar, U32, 1204, "", 1, 0 -vvtCamCounter = scalar, U32, 1208, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1212, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1216, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1220, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1221, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1224, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1228, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1232, "", 1, 0 -mapCamPrevToothAngle = scalar, F32, 1236, "deg", 1, 0 -isDecodingMapCam = bits, U32, 1240, [0:0] -; total TS size = 1244 -crankSynchronizationCounter0 = scalar, U32, 1244, "", 1, 0 -vvtSyncGapRatio0 = scalar, F32, 1248, "", 1, 0 -vvtToothDurations00 = scalar, U32, 1252, "us", 1, 0 -vvtCurrentPosition0 = scalar, F32, 1256, "sync: Primary Cam Position", 1, 0 -vvtToothPosition10 = scalar, F32, 1260, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition20 = scalar, F32, 1264, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition30 = scalar, F32, 1268, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition40 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio0 = scalar, F32, 1276, "", 1, 0 -triggerStateIndex0 = scalar, U08, 1280, "", 1, 0 -vvtStateIndex0 = scalar, U08, 1281, "", 1, 0 -; total TS size = 1284 -camResyncCounter = scalar, U08, 1284, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1288, [0:0] -; total TS size = 1292 -wallFuelCorrection = scalar, F32, 1292, "", 1, 0 -wallFuel = scalar, F32, 1296, "", 1, 0 -; total TS size = 1300 -idleState = bits, S32, 1300, [0:2], "not important" -currentIdlePosition = scalar, F32, 1304 -baseIdlePosition = scalar, F32, 1308 -idleClosedLoop = scalar, F32, 1312 -iacByTpsTaper = scalar, F32, 1316 -throttlePedalUpState = scalar, S32, 1320, "", 1, 0 -mightResetPid = bits, U32, 1324, [0:0] -shouldResetPid = bits, U32, 1324, [1:1] -wasResetPid = bits, U32, 1324, [2:2] -mustResetPid = bits, U32, 1324, [3:3] -isCranking = bits, U32, 1324, [4:4] -isIacTableForCoasting = bits, U32, 1324, [5:5] -notIdling = bits, U32, 1324, [6:6] -needReset = bits, U32, 1324, [7:7] -isInDeadZone = bits, U32, 1324, [8:8] -isBlipping = bits, U32, 1324, [9:9] -useClosedLoop = bits, U32, 1324, [10:10] -badTps = bits, U32, 1324, [11:11] -looksLikeRunning = bits, U32, 1324, [12:12] -looksLikeCoasting = bits, U32, 1324, [13:13] -looksLikeCrankToIdle = bits, U32, 1324, [14:14] -isIdleCoasting = bits, U32, 1324, [15:15] -isIdleClosedLoop = bits, U32, 1324, [16:16] -idleTarget = scalar, S32, 1328, "", 1, 0 -targetRpmByClt = scalar, S32, 1332, "", 1, 0 -targetRpmAc = scalar, S32, 1336, "", 1, 0 -iacByRpmTaper = scalar, F32, 1340 -luaAdd = scalar, F32, 1344 -; total TS size = 1348 -idlePosition0 = scalar, F32, 1348, "per", 1,0 -trim0 = scalar, F32, 1352, "", 1, 0 -luaAdjustment0 = scalar, F32, 1356, "per", 1,0 -m_wastegatePosition0 = scalar, F32, 1360, "per", 1,0 -etbFeedForward0 = scalar, F32, 1364 -etbIntegralError0 = scalar, F32, 1368, "", 1, 0 -etbCurrentTarget0 = scalar, F32, 1372, "%", 1, 0 -etbCurrentAdjustedTarget0 = scalar, F32, 1376, "%", 1, 0 -etbRevLimitActive0 = bits, U32, 1380, [0:0] -jamDetected0 = bits, U32, 1380, [1:1] -etbDutyRateOfChange0 = scalar, F32, 1384, "per", 1,0 -etbDutyAverage0 = scalar, F32, 1388, "per", 1,0 -etbTpsErrorCounter0 = scalar, U16, 1392, "count", 1,0 -etbPpsErrorCounter0 = scalar, U16, 1394, "count", 1,0 -etbErrorCode0 = scalar, S08, 1396, "", 1, 0 -jamTimer0 = scalar, U16, 1398, "sec", 0.01, 0 -; total TS size = 1400 -faultCode0 = scalar, U08, 1400, "", 1, 0 -heaterDuty0 = scalar, U08, 1401, "%", 1, 0 -pumpDuty0 = scalar, U08, 1402, "%", 1, 0 -tempC0 = scalar, U16, 1404, "C", 1, 0 -nernstVoltage0 = scalar, U16, 1406, "V", 0.001, 0 -esr0 = scalar, U16, 1408, "ohm", 1, 0 -; total TS size = 1412 -dcOutput0 = scalar, F32, 1412, "per", 1,0 -isEnabled0_int = scalar, U08, 1416, "per", 1,0 -isEnabled0 = bits, U32, 1420, [0:0] -; total TS size = 1424 -value0 = scalar, U16, 1424, "value", 1,0 -value1 = scalar, U16, 1426, "value", 1,0 -errorRate = scalar, F32, 1428, "ratio", 1,0 -; total TS size = 1432 -vvtTarget = scalar, U16, 1432, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1434, "%", 0.5, 0 +smartChipAliveCounter = scalar, S08, 1096, "", 1, 0 +startStopPhysicalState = bits, U32, 1100, [0:0] +acrStateDup = bits, U32, 1100, [1:1] +acrEngineMovedRecently = bits, U32, 1100, [2:2] +heaterControlEnabled = bits, U32, 1100, [3:3] +luaDigitalState0 = bits, U32, 1100, [4:4] +luaDigitalState1 = bits, U32, 1100, [5:5] +luaDigitalState2 = bits, U32, 1100, [6:6] +luaDigitalState3 = bits, U32, 1100, [7:7] +startStopStateToggleCounter = scalar, U32, 1104, "", 1, 0 +egtValue1 = scalar, F32, 1108, "", 1, 0 +egtValue2 = scalar, F32, 1112, "", 1, 0 +desiredRpmLimit = scalar, S16, 1116, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 1120, "", 1, 0 +sparkCounter = scalar, U32, 1124, "", 1, 0 +fuelingLoad = scalar, F32, 1128, "", 1, 0 +ignitionLoad = scalar, F32, 1132, "", 1, 0 +veTableYAxis = scalar, U16, 1136, "%", 0.01, 0 +; total TS size = 1140 +tpsFrom = scalar, F32, 1140 +tpsTo = scalar, F32, 1144 +deltaTps = scalar, F32, 1148 +extraFuel = scalar, F32, 1152, "", 1, 0 +valueFromTable = scalar, F32, 1156, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1160, [0:0] +isBelowDecelThreshold = bits, U32, 1160, [1:1] +isTimeToResetAccumulator = bits, U32, 1160, [2:2] +isFractionalEnrichment = bits, U32, 1160, [3:3] +belowEpsilon = bits, U32, 1160, [4:4] +tooShort = bits, U32, 1160, [5:5] +fractionalInjFuel = scalar, F32, 1164, "", 1, 0 +accumulatedValue = scalar, F32, 1168, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1172, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1176, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1180, "", 1, 0 +cycleCnt = scalar, S32, 1184, "", 1, 0 +; total TS size = 1188 +hwEventCounters1 = scalar, U32, 1188, "", 1, 0 +hwEventCounters2 = scalar, U32, 1192, "", 1, 0 +hwEventCounters3 = scalar, U32, 1196, "", 1, 0 +hwEventCounters4 = scalar, U32, 1200, "", 1, 0 +hwEventCounters5 = scalar, U32, 1204, "", 1, 0 +hwEventCounters6 = scalar, U32, 1208, "", 1, 0 +vvtCamCounter = scalar, U32, 1212, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1216, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1220, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1224, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1225, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1228, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1232, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1236, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1240, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1244, [0:0] +; total TS size = 1248 +crankSynchronizationCounter0 = scalar, U32, 1248, "", 1, 0 +vvtSyncGapRatio0 = scalar, F32, 1252, "", 1, 0 +vvtToothDurations00 = scalar, U32, 1256, "us", 1, 0 +vvtCurrentPosition0 = scalar, F32, 1260, "sync: Primary Cam Position", 1, 0 +vvtToothPosition10 = scalar, F32, 1264, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition20 = scalar, F32, 1268, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition30 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition40 = scalar, F32, 1276, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio0 = scalar, F32, 1280, "", 1, 0 +triggerStateIndex0 = scalar, U08, 1284, "", 1, 0 +vvtStateIndex0 = scalar, U08, 1285, "", 1, 0 +; total TS size = 1288 +camResyncCounter = scalar, U08, 1288, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1292, [0:0] +; total TS size = 1296 +wallFuelCorrection = scalar, F32, 1296, "", 1, 0 +wallFuel = scalar, F32, 1300, "", 1, 0 +; total TS size = 1304 +idleState = bits, S32, 1304, [0:2], "not important" +currentIdlePosition = scalar, F32, 1308 +baseIdlePosition = scalar, F32, 1312 +idleClosedLoop = scalar, F32, 1316 +iacByTpsTaper = scalar, F32, 1320 +throttlePedalUpState = scalar, S32, 1324, "", 1, 0 +mightResetPid = bits, U32, 1328, [0:0] +shouldResetPid = bits, U32, 1328, [1:1] +wasResetPid = bits, U32, 1328, [2:2] +mustResetPid = bits, U32, 1328, [3:3] +isCranking = bits, U32, 1328, [4:4] +isIacTableForCoasting = bits, U32, 1328, [5:5] +notIdling = bits, U32, 1328, [6:6] +needReset = bits, U32, 1328, [7:7] +isInDeadZone = bits, U32, 1328, [8:8] +isBlipping = bits, U32, 1328, [9:9] +useClosedLoop = bits, U32, 1328, [10:10] +badTps = bits, U32, 1328, [11:11] +looksLikeRunning = bits, U32, 1328, [12:12] +looksLikeCoasting = bits, U32, 1328, [13:13] +looksLikeCrankToIdle = bits, U32, 1328, [14:14] +isIdleCoasting = bits, U32, 1328, [15:15] +isIdleClosedLoop = bits, U32, 1328, [16:16] +idleTarget = scalar, S32, 1332, "", 1, 0 +targetRpmByClt = scalar, S32, 1336, "", 1, 0 +targetRpmAc = scalar, S32, 1340, "", 1, 0 +iacByRpmTaper = scalar, F32, 1344 +luaAdd = scalar, F32, 1348 +; total TS size = 1352 +idlePosition0 = scalar, F32, 1352, "per", 1,0 +trim0 = scalar, F32, 1356, "", 1, 0 +luaAdjustment0 = scalar, F32, 1360, "per", 1,0 +m_wastegatePosition0 = scalar, F32, 1364, "per", 1,0 +etbFeedForward0 = scalar, F32, 1368 +etbIntegralError0 = scalar, F32, 1372, "", 1, 0 +etbCurrentTarget0 = scalar, F32, 1376, "%", 1, 0 +etbCurrentAdjustedTarget0 = scalar, F32, 1380, "%", 1, 0 +etbRevLimitActive0 = bits, U32, 1384, [0:0] +jamDetected0 = bits, U32, 1384, [1:1] +etbDutyRateOfChange0 = scalar, F32, 1388, "per", 1,0 +etbDutyAverage0 = scalar, F32, 1392, "per", 1,0 +etbTpsErrorCounter0 = scalar, U16, 1396, "count", 1,0 +etbPpsErrorCounter0 = scalar, U16, 1398, "count", 1,0 +etbErrorCode0 = scalar, S08, 1400, "", 1, 0 +jamTimer0 = scalar, U16, 1402, "sec", 0.01, 0 +; total TS size = 1404 +faultCode0 = scalar, U08, 1404, "", 1, 0 +heaterDuty0 = scalar, U08, 1405, "%", 1, 0 +pumpDuty0 = scalar, U08, 1406, "%", 1, 0 +tempC0 = scalar, U16, 1408, "C", 1, 0 +nernstVoltage0 = scalar, U16, 1410, "V", 0.001, 0 +esr0 = scalar, U16, 1412, "ohm", 1, 0 +; total TS size = 1416 +dcOutput0 = scalar, F32, 1416, "per", 1,0 +isEnabled0_int = scalar, U08, 1420, "per", 1,0 +isEnabled0 = bits, U32, 1424, [0:0] +; total TS size = 1428 +value0 = scalar, U16, 1428, "value", 1,0 +value1 = scalar, U16, 1430, "value", 1,0 +errorRate = scalar, F32, 1432, "ratio", 1,0 ; total TS size = 1436 -lambdaCurrentlyGood = bits, U32, 1436, [0:0] -lambdaMonitorCut = bits, U32, 1436, [1:1] -lambdaTimeSinceGood = scalar, U16, 1440, "sec", 0.01, 0 -; total TS size = 1444 +vvtTarget = scalar, U16, 1436, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1438, "%", 0.5, 0 +; total TS size = 1440 +lambdaCurrentlyGood = bits, U32, 1440, [0:0] +lambdaMonitorCut = bits, U32, 1440, [1:1] +lambdaTimeSinceGood = scalar, U16, 1444, "sec", 0.01, 0 +; total TS size = 1448 time = { timeNow } @@ -5237,6 +5238,7 @@ entry = brakePedalState, "Brake switch", int, "%d" entry = startStopState, "startStopState", int, "%d" entry = smartChipState, "smartChipState", int, "%d" entry = smartChipRestartCounter, "smartChipRestartCounter", int, "%d" +entry = smartChipAliveCounter, "smartChipAliveCounter", int, "%d" entry = startStopPhysicalState, "startStopPhysicalState", int, "%d" entry = acrStateDup, "acrStateDup", int, "%d" entry = acrEngineMovedRecently, "acrEngineMovedRecently", int, "%d" @@ -6202,16 +6204,17 @@ dialog = engine_stateDialog, "engine_state" graphLine = smartChipState graphLine = smartChipRestartCounter liveGraph = engine_state_5_Graph, "Graph", South + graphLine = smartChipAliveCounter graphLine = startStopStateToggleCounter graphLine = egtValue1 graphLine = egtValue2 - graphLine = desiredRpmLimit liveGraph = engine_state_6_Graph, "Graph", South + graphLine = desiredRpmLimit graphLine = fuelInjectionCounter graphLine = sparkCounter graphLine = fuelingLoad - graphLine = ignitionLoad liveGraph = engine_state_7_Graph, "Graph", South + graphLine = ignitionLoad graphLine = veTableYAxis indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_stm32f767_nucleo.ini b/firmware/tunerstudio/generated/rusefi_stm32f767_nucleo.ini index 3bf1fce2f2..b061aa0d9a 100644 --- a/firmware/tunerstudio/generated/rusefi_stm32f767_nucleo.ini +++ b/firmware/tunerstudio/generated/rusefi_stm32f767_nucleo.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.12.26.stm32f767_nucleo.4218430649" + signature = "rusEFI master.2023.12.26.stm32f767_nucleo.860584539" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.12.26.stm32f767_nucleo.4218430649" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.12.26.stm32f767_nucleo.860584539" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -92,7 +92,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="Disabled", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PB0", "PB1", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Tue Dec 26 01:38:11 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Tue Dec 26 22:48:43 UTC 2023 pageSize = 22088 page = 1 @@ -2373,7 +2373,7 @@ lambdaMaxDeviationRpmBins = array, U16, 22078, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1444 + ochBlockSize = 1448 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3027,145 +3027,146 @@ brakePedalState = scalar, S08, 1092, "", 1, 0 startStopState = scalar, S08, 1093, "", 1, 0 smartChipState = scalar, S08, 1094, "", 1, 0 smartChipRestartCounter = scalar, S08, 1095, "", 1, 0 -startStopPhysicalState = bits, U32, 1096, [0:0] -acrStateDup = bits, U32, 1096, [1:1] -acrEngineMovedRecently = bits, U32, 1096, [2:2] -heaterControlEnabled = bits, U32, 1096, [3:3] -luaDigitalState0 = bits, U32, 1096, [4:4] -luaDigitalState1 = bits, U32, 1096, [5:5] -luaDigitalState2 = bits, U32, 1096, [6:6] -luaDigitalState3 = bits, U32, 1096, [7:7] -startStopStateToggleCounter = scalar, U32, 1100, "", 1, 0 -egtValue1 = scalar, F32, 1104, "", 1, 0 -egtValue2 = scalar, F32, 1108, "", 1, 0 -desiredRpmLimit = scalar, S16, 1112, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1116, "", 1, 0 -sparkCounter = scalar, U32, 1120, "", 1, 0 -fuelingLoad = scalar, F32, 1124, "", 1, 0 -ignitionLoad = scalar, F32, 1128, "", 1, 0 -veTableYAxis = scalar, U16, 1132, "%", 0.01, 0 -; total TS size = 1136 -tpsFrom = scalar, F32, 1136 -tpsTo = scalar, F32, 1140 -deltaTps = scalar, F32, 1144 -extraFuel = scalar, F32, 1148, "", 1, 0 -valueFromTable = scalar, F32, 1152, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1156, [0:0] -isBelowDecelThreshold = bits, U32, 1156, [1:1] -isTimeToResetAccumulator = bits, U32, 1156, [2:2] -isFractionalEnrichment = bits, U32, 1156, [3:3] -belowEpsilon = bits, U32, 1156, [4:4] -tooShort = bits, U32, 1156, [5:5] -fractionalInjFuel = scalar, F32, 1160, "", 1, 0 -accumulatedValue = scalar, F32, 1164, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1168, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1172, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1176, "", 1, 0 -cycleCnt = scalar, S32, 1180, "", 1, 0 -; total TS size = 1184 -hwEventCounters1 = scalar, U32, 1184, "", 1, 0 -hwEventCounters2 = scalar, U32, 1188, "", 1, 0 -hwEventCounters3 = scalar, U32, 1192, "", 1, 0 -hwEventCounters4 = scalar, U32, 1196, "", 1, 0 -hwEventCounters5 = scalar, U32, 1200, "", 1, 0 -hwEventCounters6 = scalar, U32, 1204, "", 1, 0 -vvtCamCounter = scalar, U32, 1208, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1212, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1216, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1220, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1221, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1224, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1228, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1232, "", 1, 0 -mapCamPrevToothAngle = scalar, F32, 1236, "deg", 1, 0 -isDecodingMapCam = bits, U32, 1240, [0:0] -; total TS size = 1244 -crankSynchronizationCounter0 = scalar, U32, 1244, "", 1, 0 -vvtSyncGapRatio0 = scalar, F32, 1248, "", 1, 0 -vvtToothDurations00 = scalar, U32, 1252, "us", 1, 0 -vvtCurrentPosition0 = scalar, F32, 1256, "sync: Primary Cam Position", 1, 0 -vvtToothPosition10 = scalar, F32, 1260, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition20 = scalar, F32, 1264, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition30 = scalar, F32, 1268, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition40 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio0 = scalar, F32, 1276, "", 1, 0 -triggerStateIndex0 = scalar, U08, 1280, "", 1, 0 -vvtStateIndex0 = scalar, U08, 1281, "", 1, 0 -; total TS size = 1284 -camResyncCounter = scalar, U08, 1284, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1288, [0:0] -; total TS size = 1292 -wallFuelCorrection = scalar, F32, 1292, "", 1, 0 -wallFuel = scalar, F32, 1296, "", 1, 0 -; total TS size = 1300 -idleState = bits, S32, 1300, [0:2], "not important" -currentIdlePosition = scalar, F32, 1304 -baseIdlePosition = scalar, F32, 1308 -idleClosedLoop = scalar, F32, 1312 -iacByTpsTaper = scalar, F32, 1316 -throttlePedalUpState = scalar, S32, 1320, "", 1, 0 -mightResetPid = bits, U32, 1324, [0:0] -shouldResetPid = bits, U32, 1324, [1:1] -wasResetPid = bits, U32, 1324, [2:2] -mustResetPid = bits, U32, 1324, [3:3] -isCranking = bits, U32, 1324, [4:4] -isIacTableForCoasting = bits, U32, 1324, [5:5] -notIdling = bits, U32, 1324, [6:6] -needReset = bits, U32, 1324, [7:7] -isInDeadZone = bits, U32, 1324, [8:8] -isBlipping = bits, U32, 1324, [9:9] -useClosedLoop = bits, U32, 1324, [10:10] -badTps = bits, U32, 1324, [11:11] -looksLikeRunning = bits, U32, 1324, [12:12] -looksLikeCoasting = bits, U32, 1324, [13:13] -looksLikeCrankToIdle = bits, U32, 1324, [14:14] -isIdleCoasting = bits, U32, 1324, [15:15] -isIdleClosedLoop = bits, U32, 1324, [16:16] -idleTarget = scalar, S32, 1328, "", 1, 0 -targetRpmByClt = scalar, S32, 1332, "", 1, 0 -targetRpmAc = scalar, S32, 1336, "", 1, 0 -iacByRpmTaper = scalar, F32, 1340 -luaAdd = scalar, F32, 1344 -; total TS size = 1348 -idlePosition0 = scalar, F32, 1348, "per", 1,0 -trim0 = scalar, F32, 1352, "", 1, 0 -luaAdjustment0 = scalar, F32, 1356, "per", 1,0 -m_wastegatePosition0 = scalar, F32, 1360, "per", 1,0 -etbFeedForward0 = scalar, F32, 1364 -etbIntegralError0 = scalar, F32, 1368, "", 1, 0 -etbCurrentTarget0 = scalar, F32, 1372, "%", 1, 0 -etbCurrentAdjustedTarget0 = scalar, F32, 1376, "%", 1, 0 -etbRevLimitActive0 = bits, U32, 1380, [0:0] -jamDetected0 = bits, U32, 1380, [1:1] -etbDutyRateOfChange0 = scalar, F32, 1384, "per", 1,0 -etbDutyAverage0 = scalar, F32, 1388, "per", 1,0 -etbTpsErrorCounter0 = scalar, U16, 1392, "count", 1,0 -etbPpsErrorCounter0 = scalar, U16, 1394, "count", 1,0 -etbErrorCode0 = scalar, S08, 1396, "", 1, 0 -jamTimer0 = scalar, U16, 1398, "sec", 0.01, 0 -; total TS size = 1400 -faultCode0 = scalar, U08, 1400, "", 1, 0 -heaterDuty0 = scalar, U08, 1401, "%", 1, 0 -pumpDuty0 = scalar, U08, 1402, "%", 1, 0 -tempC0 = scalar, U16, 1404, "C", 1, 0 -nernstVoltage0 = scalar, U16, 1406, "V", 0.001, 0 -esr0 = scalar, U16, 1408, "ohm", 1, 0 -; total TS size = 1412 -dcOutput0 = scalar, F32, 1412, "per", 1,0 -isEnabled0_int = scalar, U08, 1416, "per", 1,0 -isEnabled0 = bits, U32, 1420, [0:0] -; total TS size = 1424 -value0 = scalar, U16, 1424, "value", 1,0 -value1 = scalar, U16, 1426, "value", 1,0 -errorRate = scalar, F32, 1428, "ratio", 1,0 -; total TS size = 1432 -vvtTarget = scalar, U16, 1432, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1434, "%", 0.5, 0 +smartChipAliveCounter = scalar, S08, 1096, "", 1, 0 +startStopPhysicalState = bits, U32, 1100, [0:0] +acrStateDup = bits, U32, 1100, [1:1] +acrEngineMovedRecently = bits, U32, 1100, [2:2] +heaterControlEnabled = bits, U32, 1100, [3:3] +luaDigitalState0 = bits, U32, 1100, [4:4] +luaDigitalState1 = bits, U32, 1100, [5:5] +luaDigitalState2 = bits, U32, 1100, [6:6] +luaDigitalState3 = bits, U32, 1100, [7:7] +startStopStateToggleCounter = scalar, U32, 1104, "", 1, 0 +egtValue1 = scalar, F32, 1108, "", 1, 0 +egtValue2 = scalar, F32, 1112, "", 1, 0 +desiredRpmLimit = scalar, S16, 1116, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 1120, "", 1, 0 +sparkCounter = scalar, U32, 1124, "", 1, 0 +fuelingLoad = scalar, F32, 1128, "", 1, 0 +ignitionLoad = scalar, F32, 1132, "", 1, 0 +veTableYAxis = scalar, U16, 1136, "%", 0.01, 0 +; total TS size = 1140 +tpsFrom = scalar, F32, 1140 +tpsTo = scalar, F32, 1144 +deltaTps = scalar, F32, 1148 +extraFuel = scalar, F32, 1152, "", 1, 0 +valueFromTable = scalar, F32, 1156, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1160, [0:0] +isBelowDecelThreshold = bits, U32, 1160, [1:1] +isTimeToResetAccumulator = bits, U32, 1160, [2:2] +isFractionalEnrichment = bits, U32, 1160, [3:3] +belowEpsilon = bits, U32, 1160, [4:4] +tooShort = bits, U32, 1160, [5:5] +fractionalInjFuel = scalar, F32, 1164, "", 1, 0 +accumulatedValue = scalar, F32, 1168, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1172, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1176, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1180, "", 1, 0 +cycleCnt = scalar, S32, 1184, "", 1, 0 +; total TS size = 1188 +hwEventCounters1 = scalar, U32, 1188, "", 1, 0 +hwEventCounters2 = scalar, U32, 1192, "", 1, 0 +hwEventCounters3 = scalar, U32, 1196, "", 1, 0 +hwEventCounters4 = scalar, U32, 1200, "", 1, 0 +hwEventCounters5 = scalar, U32, 1204, "", 1, 0 +hwEventCounters6 = scalar, U32, 1208, "", 1, 0 +vvtCamCounter = scalar, U32, 1212, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1216, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1220, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1224, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1225, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1228, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1232, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1236, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1240, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1244, [0:0] +; total TS size = 1248 +crankSynchronizationCounter0 = scalar, U32, 1248, "", 1, 0 +vvtSyncGapRatio0 = scalar, F32, 1252, "", 1, 0 +vvtToothDurations00 = scalar, U32, 1256, "us", 1, 0 +vvtCurrentPosition0 = scalar, F32, 1260, "sync: Primary Cam Position", 1, 0 +vvtToothPosition10 = scalar, F32, 1264, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition20 = scalar, F32, 1268, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition30 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition40 = scalar, F32, 1276, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio0 = scalar, F32, 1280, "", 1, 0 +triggerStateIndex0 = scalar, U08, 1284, "", 1, 0 +vvtStateIndex0 = scalar, U08, 1285, "", 1, 0 +; total TS size = 1288 +camResyncCounter = scalar, U08, 1288, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1292, [0:0] +; total TS size = 1296 +wallFuelCorrection = scalar, F32, 1296, "", 1, 0 +wallFuel = scalar, F32, 1300, "", 1, 0 +; total TS size = 1304 +idleState = bits, S32, 1304, [0:2], "not important" +currentIdlePosition = scalar, F32, 1308 +baseIdlePosition = scalar, F32, 1312 +idleClosedLoop = scalar, F32, 1316 +iacByTpsTaper = scalar, F32, 1320 +throttlePedalUpState = scalar, S32, 1324, "", 1, 0 +mightResetPid = bits, U32, 1328, [0:0] +shouldResetPid = bits, U32, 1328, [1:1] +wasResetPid = bits, U32, 1328, [2:2] +mustResetPid = bits, U32, 1328, [3:3] +isCranking = bits, U32, 1328, [4:4] +isIacTableForCoasting = bits, U32, 1328, [5:5] +notIdling = bits, U32, 1328, [6:6] +needReset = bits, U32, 1328, [7:7] +isInDeadZone = bits, U32, 1328, [8:8] +isBlipping = bits, U32, 1328, [9:9] +useClosedLoop = bits, U32, 1328, [10:10] +badTps = bits, U32, 1328, [11:11] +looksLikeRunning = bits, U32, 1328, [12:12] +looksLikeCoasting = bits, U32, 1328, [13:13] +looksLikeCrankToIdle = bits, U32, 1328, [14:14] +isIdleCoasting = bits, U32, 1328, [15:15] +isIdleClosedLoop = bits, U32, 1328, [16:16] +idleTarget = scalar, S32, 1332, "", 1, 0 +targetRpmByClt = scalar, S32, 1336, "", 1, 0 +targetRpmAc = scalar, S32, 1340, "", 1, 0 +iacByRpmTaper = scalar, F32, 1344 +luaAdd = scalar, F32, 1348 +; total TS size = 1352 +idlePosition0 = scalar, F32, 1352, "per", 1,0 +trim0 = scalar, F32, 1356, "", 1, 0 +luaAdjustment0 = scalar, F32, 1360, "per", 1,0 +m_wastegatePosition0 = scalar, F32, 1364, "per", 1,0 +etbFeedForward0 = scalar, F32, 1368 +etbIntegralError0 = scalar, F32, 1372, "", 1, 0 +etbCurrentTarget0 = scalar, F32, 1376, "%", 1, 0 +etbCurrentAdjustedTarget0 = scalar, F32, 1380, "%", 1, 0 +etbRevLimitActive0 = bits, U32, 1384, [0:0] +jamDetected0 = bits, U32, 1384, [1:1] +etbDutyRateOfChange0 = scalar, F32, 1388, "per", 1,0 +etbDutyAverage0 = scalar, F32, 1392, "per", 1,0 +etbTpsErrorCounter0 = scalar, U16, 1396, "count", 1,0 +etbPpsErrorCounter0 = scalar, U16, 1398, "count", 1,0 +etbErrorCode0 = scalar, S08, 1400, "", 1, 0 +jamTimer0 = scalar, U16, 1402, "sec", 0.01, 0 +; total TS size = 1404 +faultCode0 = scalar, U08, 1404, "", 1, 0 +heaterDuty0 = scalar, U08, 1405, "%", 1, 0 +pumpDuty0 = scalar, U08, 1406, "%", 1, 0 +tempC0 = scalar, U16, 1408, "C", 1, 0 +nernstVoltage0 = scalar, U16, 1410, "V", 0.001, 0 +esr0 = scalar, U16, 1412, "ohm", 1, 0 +; total TS size = 1416 +dcOutput0 = scalar, F32, 1416, "per", 1,0 +isEnabled0_int = scalar, U08, 1420, "per", 1,0 +isEnabled0 = bits, U32, 1424, [0:0] +; total TS size = 1428 +value0 = scalar, U16, 1428, "value", 1,0 +value1 = scalar, U16, 1430, "value", 1,0 +errorRate = scalar, F32, 1432, "ratio", 1,0 ; total TS size = 1436 -lambdaCurrentlyGood = bits, U32, 1436, [0:0] -lambdaMonitorCut = bits, U32, 1436, [1:1] -lambdaTimeSinceGood = scalar, U16, 1440, "sec", 0.01, 0 -; total TS size = 1444 +vvtTarget = scalar, U16, 1436, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1438, "%", 0.5, 0 +; total TS size = 1440 +lambdaCurrentlyGood = bits, U32, 1440, [0:0] +lambdaMonitorCut = bits, U32, 1440, [1:1] +lambdaTimeSinceGood = scalar, U16, 1444, "sec", 0.01, 0 +; total TS size = 1448 time = { timeNow } @@ -5237,6 +5238,7 @@ entry = brakePedalState, "Brake switch", int, "%d" entry = startStopState, "startStopState", int, "%d" entry = smartChipState, "smartChipState", int, "%d" entry = smartChipRestartCounter, "smartChipRestartCounter", int, "%d" +entry = smartChipAliveCounter, "smartChipAliveCounter", int, "%d" entry = startStopPhysicalState, "startStopPhysicalState", int, "%d" entry = acrStateDup, "acrStateDup", int, "%d" entry = acrEngineMovedRecently, "acrEngineMovedRecently", int, "%d" @@ -6202,16 +6204,17 @@ dialog = engine_stateDialog, "engine_state" graphLine = smartChipState graphLine = smartChipRestartCounter liveGraph = engine_state_5_Graph, "Graph", South + graphLine = smartChipAliveCounter graphLine = startStopStateToggleCounter graphLine = egtValue1 graphLine = egtValue2 - graphLine = desiredRpmLimit liveGraph = engine_state_6_Graph, "Graph", South + graphLine = desiredRpmLimit graphLine = fuelInjectionCounter graphLine = sparkCounter graphLine = fuelingLoad - graphLine = ignitionLoad liveGraph = engine_state_7_Graph, "Graph", South + graphLine = ignitionLoad graphLine = veTableYAxis indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini b/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini index 44e41c3f98..7ca9896dff 100644 --- a/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.12.26.subaru_eg33_f7.4244497326" + signature = "rusEFI master.2023.12.26.subaru_eg33_f7.885439820" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.12.26.subaru_eg33_f7.4244497326" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.12.26.subaru_eg33_f7.885439820" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -92,7 +92,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","AUX0_18 - MAP Ain","INVALID","INVALID","B05 - MAF Ain","INVALID","AUX0_19 - IAT Ain","A02 - VBat","INVALID","A06 - Oxyg 2 Ain","A04 - EGR t Ain","INVALID","A18 - AUX0 Ain","B02 - TPS Ain","INVALID","A03 - Coolant t Ain","A06 - Oxyg 1 Ain" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Tue Dec 26 01:36:37 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Tue Dec 26 22:47:07 UTC 2023 pageSize = 22088 page = 1 @@ -2373,7 +2373,7 @@ lambdaMaxDeviationRpmBins = array, U16, 22078, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1444 + ochBlockSize = 1448 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3027,145 +3027,146 @@ brakePedalState = scalar, S08, 1092, "", 1, 0 startStopState = scalar, S08, 1093, "", 1, 0 smartChipState = scalar, S08, 1094, "", 1, 0 smartChipRestartCounter = scalar, S08, 1095, "", 1, 0 -startStopPhysicalState = bits, U32, 1096, [0:0] -acrStateDup = bits, U32, 1096, [1:1] -acrEngineMovedRecently = bits, U32, 1096, [2:2] -heaterControlEnabled = bits, U32, 1096, [3:3] -luaDigitalState0 = bits, U32, 1096, [4:4] -luaDigitalState1 = bits, U32, 1096, [5:5] -luaDigitalState2 = bits, U32, 1096, [6:6] -luaDigitalState3 = bits, U32, 1096, [7:7] -startStopStateToggleCounter = scalar, U32, 1100, "", 1, 0 -egtValue1 = scalar, F32, 1104, "", 1, 0 -egtValue2 = scalar, F32, 1108, "", 1, 0 -desiredRpmLimit = scalar, S16, 1112, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1116, "", 1, 0 -sparkCounter = scalar, U32, 1120, "", 1, 0 -fuelingLoad = scalar, F32, 1124, "", 1, 0 -ignitionLoad = scalar, F32, 1128, "", 1, 0 -veTableYAxis = scalar, U16, 1132, "%", 0.01, 0 -; total TS size = 1136 -tpsFrom = scalar, F32, 1136 -tpsTo = scalar, F32, 1140 -deltaTps = scalar, F32, 1144 -extraFuel = scalar, F32, 1148, "", 1, 0 -valueFromTable = scalar, F32, 1152, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1156, [0:0] -isBelowDecelThreshold = bits, U32, 1156, [1:1] -isTimeToResetAccumulator = bits, U32, 1156, [2:2] -isFractionalEnrichment = bits, U32, 1156, [3:3] -belowEpsilon = bits, U32, 1156, [4:4] -tooShort = bits, U32, 1156, [5:5] -fractionalInjFuel = scalar, F32, 1160, "", 1, 0 -accumulatedValue = scalar, F32, 1164, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1168, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1172, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1176, "", 1, 0 -cycleCnt = scalar, S32, 1180, "", 1, 0 -; total TS size = 1184 -hwEventCounters1 = scalar, U32, 1184, "", 1, 0 -hwEventCounters2 = scalar, U32, 1188, "", 1, 0 -hwEventCounters3 = scalar, U32, 1192, "", 1, 0 -hwEventCounters4 = scalar, U32, 1196, "", 1, 0 -hwEventCounters5 = scalar, U32, 1200, "", 1, 0 -hwEventCounters6 = scalar, U32, 1204, "", 1, 0 -vvtCamCounter = scalar, U32, 1208, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1212, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1216, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1220, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1221, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1224, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1228, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1232, "", 1, 0 -mapCamPrevToothAngle = scalar, F32, 1236, "deg", 1, 0 -isDecodingMapCam = bits, U32, 1240, [0:0] -; total TS size = 1244 -crankSynchronizationCounter0 = scalar, U32, 1244, "", 1, 0 -vvtSyncGapRatio0 = scalar, F32, 1248, "", 1, 0 -vvtToothDurations00 = scalar, U32, 1252, "us", 1, 0 -vvtCurrentPosition0 = scalar, F32, 1256, "sync: Primary Cam Position", 1, 0 -vvtToothPosition10 = scalar, F32, 1260, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition20 = scalar, F32, 1264, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition30 = scalar, F32, 1268, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition40 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio0 = scalar, F32, 1276, "", 1, 0 -triggerStateIndex0 = scalar, U08, 1280, "", 1, 0 -vvtStateIndex0 = scalar, U08, 1281, "", 1, 0 -; total TS size = 1284 -camResyncCounter = scalar, U08, 1284, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1288, [0:0] -; total TS size = 1292 -wallFuelCorrection = scalar, F32, 1292, "", 1, 0 -wallFuel = scalar, F32, 1296, "", 1, 0 -; total TS size = 1300 -idleState = bits, S32, 1300, [0:2], "not important" -currentIdlePosition = scalar, F32, 1304 -baseIdlePosition = scalar, F32, 1308 -idleClosedLoop = scalar, F32, 1312 -iacByTpsTaper = scalar, F32, 1316 -throttlePedalUpState = scalar, S32, 1320, "", 1, 0 -mightResetPid = bits, U32, 1324, [0:0] -shouldResetPid = bits, U32, 1324, [1:1] -wasResetPid = bits, U32, 1324, [2:2] -mustResetPid = bits, U32, 1324, [3:3] -isCranking = bits, U32, 1324, [4:4] -isIacTableForCoasting = bits, U32, 1324, [5:5] -notIdling = bits, U32, 1324, [6:6] -needReset = bits, U32, 1324, [7:7] -isInDeadZone = bits, U32, 1324, [8:8] -isBlipping = bits, U32, 1324, [9:9] -useClosedLoop = bits, U32, 1324, [10:10] -badTps = bits, U32, 1324, [11:11] -looksLikeRunning = bits, U32, 1324, [12:12] -looksLikeCoasting = bits, U32, 1324, [13:13] -looksLikeCrankToIdle = bits, U32, 1324, [14:14] -isIdleCoasting = bits, U32, 1324, [15:15] -isIdleClosedLoop = bits, U32, 1324, [16:16] -idleTarget = scalar, S32, 1328, "", 1, 0 -targetRpmByClt = scalar, S32, 1332, "", 1, 0 -targetRpmAc = scalar, S32, 1336, "", 1, 0 -iacByRpmTaper = scalar, F32, 1340 -luaAdd = scalar, F32, 1344 -; total TS size = 1348 -idlePosition0 = scalar, F32, 1348, "per", 1,0 -trim0 = scalar, F32, 1352, "", 1, 0 -luaAdjustment0 = scalar, F32, 1356, "per", 1,0 -m_wastegatePosition0 = scalar, F32, 1360, "per", 1,0 -etbFeedForward0 = scalar, F32, 1364 -etbIntegralError0 = scalar, F32, 1368, "", 1, 0 -etbCurrentTarget0 = scalar, F32, 1372, "%", 1, 0 -etbCurrentAdjustedTarget0 = scalar, F32, 1376, "%", 1, 0 -etbRevLimitActive0 = bits, U32, 1380, [0:0] -jamDetected0 = bits, U32, 1380, [1:1] -etbDutyRateOfChange0 = scalar, F32, 1384, "per", 1,0 -etbDutyAverage0 = scalar, F32, 1388, "per", 1,0 -etbTpsErrorCounter0 = scalar, U16, 1392, "count", 1,0 -etbPpsErrorCounter0 = scalar, U16, 1394, "count", 1,0 -etbErrorCode0 = scalar, S08, 1396, "", 1, 0 -jamTimer0 = scalar, U16, 1398, "sec", 0.01, 0 -; total TS size = 1400 -faultCode0 = scalar, U08, 1400, "", 1, 0 -heaterDuty0 = scalar, U08, 1401, "%", 1, 0 -pumpDuty0 = scalar, U08, 1402, "%", 1, 0 -tempC0 = scalar, U16, 1404, "C", 1, 0 -nernstVoltage0 = scalar, U16, 1406, "V", 0.001, 0 -esr0 = scalar, U16, 1408, "ohm", 1, 0 -; total TS size = 1412 -dcOutput0 = scalar, F32, 1412, "per", 1,0 -isEnabled0_int = scalar, U08, 1416, "per", 1,0 -isEnabled0 = bits, U32, 1420, [0:0] -; total TS size = 1424 -value0 = scalar, U16, 1424, "value", 1,0 -value1 = scalar, U16, 1426, "value", 1,0 -errorRate = scalar, F32, 1428, "ratio", 1,0 -; total TS size = 1432 -vvtTarget = scalar, U16, 1432, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1434, "%", 0.5, 0 +smartChipAliveCounter = scalar, S08, 1096, "", 1, 0 +startStopPhysicalState = bits, U32, 1100, [0:0] +acrStateDup = bits, U32, 1100, [1:1] +acrEngineMovedRecently = bits, U32, 1100, [2:2] +heaterControlEnabled = bits, U32, 1100, [3:3] +luaDigitalState0 = bits, U32, 1100, [4:4] +luaDigitalState1 = bits, U32, 1100, [5:5] +luaDigitalState2 = bits, U32, 1100, [6:6] +luaDigitalState3 = bits, U32, 1100, [7:7] +startStopStateToggleCounter = scalar, U32, 1104, "", 1, 0 +egtValue1 = scalar, F32, 1108, "", 1, 0 +egtValue2 = scalar, F32, 1112, "", 1, 0 +desiredRpmLimit = scalar, S16, 1116, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 1120, "", 1, 0 +sparkCounter = scalar, U32, 1124, "", 1, 0 +fuelingLoad = scalar, F32, 1128, "", 1, 0 +ignitionLoad = scalar, F32, 1132, "", 1, 0 +veTableYAxis = scalar, U16, 1136, "%", 0.01, 0 +; total TS size = 1140 +tpsFrom = scalar, F32, 1140 +tpsTo = scalar, F32, 1144 +deltaTps = scalar, F32, 1148 +extraFuel = scalar, F32, 1152, "", 1, 0 +valueFromTable = scalar, F32, 1156, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1160, [0:0] +isBelowDecelThreshold = bits, U32, 1160, [1:1] +isTimeToResetAccumulator = bits, U32, 1160, [2:2] +isFractionalEnrichment = bits, U32, 1160, [3:3] +belowEpsilon = bits, U32, 1160, [4:4] +tooShort = bits, U32, 1160, [5:5] +fractionalInjFuel = scalar, F32, 1164, "", 1, 0 +accumulatedValue = scalar, F32, 1168, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1172, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1176, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1180, "", 1, 0 +cycleCnt = scalar, S32, 1184, "", 1, 0 +; total TS size = 1188 +hwEventCounters1 = scalar, U32, 1188, "", 1, 0 +hwEventCounters2 = scalar, U32, 1192, "", 1, 0 +hwEventCounters3 = scalar, U32, 1196, "", 1, 0 +hwEventCounters4 = scalar, U32, 1200, "", 1, 0 +hwEventCounters5 = scalar, U32, 1204, "", 1, 0 +hwEventCounters6 = scalar, U32, 1208, "", 1, 0 +vvtCamCounter = scalar, U32, 1212, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1216, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1220, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1224, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1225, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1228, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1232, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1236, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1240, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1244, [0:0] +; total TS size = 1248 +crankSynchronizationCounter0 = scalar, U32, 1248, "", 1, 0 +vvtSyncGapRatio0 = scalar, F32, 1252, "", 1, 0 +vvtToothDurations00 = scalar, U32, 1256, "us", 1, 0 +vvtCurrentPosition0 = scalar, F32, 1260, "sync: Primary Cam Position", 1, 0 +vvtToothPosition10 = scalar, F32, 1264, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition20 = scalar, F32, 1268, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition30 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition40 = scalar, F32, 1276, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio0 = scalar, F32, 1280, "", 1, 0 +triggerStateIndex0 = scalar, U08, 1284, "", 1, 0 +vvtStateIndex0 = scalar, U08, 1285, "", 1, 0 +; total TS size = 1288 +camResyncCounter = scalar, U08, 1288, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1292, [0:0] +; total TS size = 1296 +wallFuelCorrection = scalar, F32, 1296, "", 1, 0 +wallFuel = scalar, F32, 1300, "", 1, 0 +; total TS size = 1304 +idleState = bits, S32, 1304, [0:2], "not important" +currentIdlePosition = scalar, F32, 1308 +baseIdlePosition = scalar, F32, 1312 +idleClosedLoop = scalar, F32, 1316 +iacByTpsTaper = scalar, F32, 1320 +throttlePedalUpState = scalar, S32, 1324, "", 1, 0 +mightResetPid = bits, U32, 1328, [0:0] +shouldResetPid = bits, U32, 1328, [1:1] +wasResetPid = bits, U32, 1328, [2:2] +mustResetPid = bits, U32, 1328, [3:3] +isCranking = bits, U32, 1328, [4:4] +isIacTableForCoasting = bits, U32, 1328, [5:5] +notIdling = bits, U32, 1328, [6:6] +needReset = bits, U32, 1328, [7:7] +isInDeadZone = bits, U32, 1328, [8:8] +isBlipping = bits, U32, 1328, [9:9] +useClosedLoop = bits, U32, 1328, [10:10] +badTps = bits, U32, 1328, [11:11] +looksLikeRunning = bits, U32, 1328, [12:12] +looksLikeCoasting = bits, U32, 1328, [13:13] +looksLikeCrankToIdle = bits, U32, 1328, [14:14] +isIdleCoasting = bits, U32, 1328, [15:15] +isIdleClosedLoop = bits, U32, 1328, [16:16] +idleTarget = scalar, S32, 1332, "", 1, 0 +targetRpmByClt = scalar, S32, 1336, "", 1, 0 +targetRpmAc = scalar, S32, 1340, "", 1, 0 +iacByRpmTaper = scalar, F32, 1344 +luaAdd = scalar, F32, 1348 +; total TS size = 1352 +idlePosition0 = scalar, F32, 1352, "per", 1,0 +trim0 = scalar, F32, 1356, "", 1, 0 +luaAdjustment0 = scalar, F32, 1360, "per", 1,0 +m_wastegatePosition0 = scalar, F32, 1364, "per", 1,0 +etbFeedForward0 = scalar, F32, 1368 +etbIntegralError0 = scalar, F32, 1372, "", 1, 0 +etbCurrentTarget0 = scalar, F32, 1376, "%", 1, 0 +etbCurrentAdjustedTarget0 = scalar, F32, 1380, "%", 1, 0 +etbRevLimitActive0 = bits, U32, 1384, [0:0] +jamDetected0 = bits, U32, 1384, [1:1] +etbDutyRateOfChange0 = scalar, F32, 1388, "per", 1,0 +etbDutyAverage0 = scalar, F32, 1392, "per", 1,0 +etbTpsErrorCounter0 = scalar, U16, 1396, "count", 1,0 +etbPpsErrorCounter0 = scalar, U16, 1398, "count", 1,0 +etbErrorCode0 = scalar, S08, 1400, "", 1, 0 +jamTimer0 = scalar, U16, 1402, "sec", 0.01, 0 +; total TS size = 1404 +faultCode0 = scalar, U08, 1404, "", 1, 0 +heaterDuty0 = scalar, U08, 1405, "%", 1, 0 +pumpDuty0 = scalar, U08, 1406, "%", 1, 0 +tempC0 = scalar, U16, 1408, "C", 1, 0 +nernstVoltage0 = scalar, U16, 1410, "V", 0.001, 0 +esr0 = scalar, U16, 1412, "ohm", 1, 0 +; total TS size = 1416 +dcOutput0 = scalar, F32, 1416, "per", 1,0 +isEnabled0_int = scalar, U08, 1420, "per", 1,0 +isEnabled0 = bits, U32, 1424, [0:0] +; total TS size = 1428 +value0 = scalar, U16, 1428, "value", 1,0 +value1 = scalar, U16, 1430, "value", 1,0 +errorRate = scalar, F32, 1432, "ratio", 1,0 ; total TS size = 1436 -lambdaCurrentlyGood = bits, U32, 1436, [0:0] -lambdaMonitorCut = bits, U32, 1436, [1:1] -lambdaTimeSinceGood = scalar, U16, 1440, "sec", 0.01, 0 -; total TS size = 1444 +vvtTarget = scalar, U16, 1436, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1438, "%", 0.5, 0 +; total TS size = 1440 +lambdaCurrentlyGood = bits, U32, 1440, [0:0] +lambdaMonitorCut = bits, U32, 1440, [1:1] +lambdaTimeSinceGood = scalar, U16, 1444, "sec", 0.01, 0 +; total TS size = 1448 time = { timeNow } @@ -5237,6 +5238,7 @@ entry = brakePedalState, "Brake switch", int, "%d" entry = startStopState, "startStopState", int, "%d" entry = smartChipState, "smartChipState", int, "%d" entry = smartChipRestartCounter, "smartChipRestartCounter", int, "%d" +entry = smartChipAliveCounter, "smartChipAliveCounter", int, "%d" entry = startStopPhysicalState, "startStopPhysicalState", int, "%d" entry = acrStateDup, "acrStateDup", int, "%d" entry = acrEngineMovedRecently, "acrEngineMovedRecently", int, "%d" @@ -6202,16 +6204,17 @@ dialog = engine_stateDialog, "engine_state" graphLine = smartChipState graphLine = smartChipRestartCounter liveGraph = engine_state_5_Graph, "Graph", South + graphLine = smartChipAliveCounter graphLine = startStopStateToggleCounter graphLine = egtValue1 graphLine = egtValue2 - graphLine = desiredRpmLimit liveGraph = engine_state_6_Graph, "Graph", South + graphLine = desiredRpmLimit graphLine = fuelInjectionCounter graphLine = sparkCounter graphLine = fuelingLoad - graphLine = ignitionLoad liveGraph = engine_state_7_Graph, "Graph", South + graphLine = ignitionLoad graphLine = veTableYAxis indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_t-b-g.ini b/firmware/tunerstudio/generated/rusefi_t-b-g.ini index 6e24a9e9c5..1118047dda 100644 --- a/firmware/tunerstudio/generated/rusefi_t-b-g.ini +++ b/firmware/tunerstudio/generated/rusefi_t-b-g.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.12.26.t-b-g.4218430649" + signature = "rusEFI master.2023.12.26.t-b-g.860584539" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.12.26.t-b-g.4218430649" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.12.26.t-b-g.860584539" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -92,7 +92,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="Disabled", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PB0", "PB1", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Tue Dec 26 01:37:44 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Tue Dec 26 22:48:16 UTC 2023 pageSize = 22088 page = 1 @@ -2373,7 +2373,7 @@ lambdaMaxDeviationRpmBins = array, U16, 22078, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1444 + ochBlockSize = 1448 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3027,145 +3027,146 @@ brakePedalState = scalar, S08, 1092, "", 1, 0 startStopState = scalar, S08, 1093, "", 1, 0 smartChipState = scalar, S08, 1094, "", 1, 0 smartChipRestartCounter = scalar, S08, 1095, "", 1, 0 -startStopPhysicalState = bits, U32, 1096, [0:0] -acrStateDup = bits, U32, 1096, [1:1] -acrEngineMovedRecently = bits, U32, 1096, [2:2] -heaterControlEnabled = bits, U32, 1096, [3:3] -luaDigitalState0 = bits, U32, 1096, [4:4] -luaDigitalState1 = bits, U32, 1096, [5:5] -luaDigitalState2 = bits, U32, 1096, [6:6] -luaDigitalState3 = bits, U32, 1096, [7:7] -startStopStateToggleCounter = scalar, U32, 1100, "", 1, 0 -egtValue1 = scalar, F32, 1104, "", 1, 0 -egtValue2 = scalar, F32, 1108, "", 1, 0 -desiredRpmLimit = scalar, S16, 1112, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1116, "", 1, 0 -sparkCounter = scalar, U32, 1120, "", 1, 0 -fuelingLoad = scalar, F32, 1124, "", 1, 0 -ignitionLoad = scalar, F32, 1128, "", 1, 0 -veTableYAxis = scalar, U16, 1132, "%", 0.01, 0 -; total TS size = 1136 -tpsFrom = scalar, F32, 1136 -tpsTo = scalar, F32, 1140 -deltaTps = scalar, F32, 1144 -extraFuel = scalar, F32, 1148, "", 1, 0 -valueFromTable = scalar, F32, 1152, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1156, [0:0] -isBelowDecelThreshold = bits, U32, 1156, [1:1] -isTimeToResetAccumulator = bits, U32, 1156, [2:2] -isFractionalEnrichment = bits, U32, 1156, [3:3] -belowEpsilon = bits, U32, 1156, [4:4] -tooShort = bits, U32, 1156, [5:5] -fractionalInjFuel = scalar, F32, 1160, "", 1, 0 -accumulatedValue = scalar, F32, 1164, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1168, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1172, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1176, "", 1, 0 -cycleCnt = scalar, S32, 1180, "", 1, 0 -; total TS size = 1184 -hwEventCounters1 = scalar, U32, 1184, "", 1, 0 -hwEventCounters2 = scalar, U32, 1188, "", 1, 0 -hwEventCounters3 = scalar, U32, 1192, "", 1, 0 -hwEventCounters4 = scalar, U32, 1196, "", 1, 0 -hwEventCounters5 = scalar, U32, 1200, "", 1, 0 -hwEventCounters6 = scalar, U32, 1204, "", 1, 0 -vvtCamCounter = scalar, U32, 1208, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1212, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1216, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1220, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1221, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1224, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1228, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1232, "", 1, 0 -mapCamPrevToothAngle = scalar, F32, 1236, "deg", 1, 0 -isDecodingMapCam = bits, U32, 1240, [0:0] -; total TS size = 1244 -crankSynchronizationCounter0 = scalar, U32, 1244, "", 1, 0 -vvtSyncGapRatio0 = scalar, F32, 1248, "", 1, 0 -vvtToothDurations00 = scalar, U32, 1252, "us", 1, 0 -vvtCurrentPosition0 = scalar, F32, 1256, "sync: Primary Cam Position", 1, 0 -vvtToothPosition10 = scalar, F32, 1260, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition20 = scalar, F32, 1264, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition30 = scalar, F32, 1268, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition40 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio0 = scalar, F32, 1276, "", 1, 0 -triggerStateIndex0 = scalar, U08, 1280, "", 1, 0 -vvtStateIndex0 = scalar, U08, 1281, "", 1, 0 -; total TS size = 1284 -camResyncCounter = scalar, U08, 1284, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1288, [0:0] -; total TS size = 1292 -wallFuelCorrection = scalar, F32, 1292, "", 1, 0 -wallFuel = scalar, F32, 1296, "", 1, 0 -; total TS size = 1300 -idleState = bits, S32, 1300, [0:2], "not important" -currentIdlePosition = scalar, F32, 1304 -baseIdlePosition = scalar, F32, 1308 -idleClosedLoop = scalar, F32, 1312 -iacByTpsTaper = scalar, F32, 1316 -throttlePedalUpState = scalar, S32, 1320, "", 1, 0 -mightResetPid = bits, U32, 1324, [0:0] -shouldResetPid = bits, U32, 1324, [1:1] -wasResetPid = bits, U32, 1324, [2:2] -mustResetPid = bits, U32, 1324, [3:3] -isCranking = bits, U32, 1324, [4:4] -isIacTableForCoasting = bits, U32, 1324, [5:5] -notIdling = bits, U32, 1324, [6:6] -needReset = bits, U32, 1324, [7:7] -isInDeadZone = bits, U32, 1324, [8:8] -isBlipping = bits, U32, 1324, [9:9] -useClosedLoop = bits, U32, 1324, [10:10] -badTps = bits, U32, 1324, [11:11] -looksLikeRunning = bits, U32, 1324, [12:12] -looksLikeCoasting = bits, U32, 1324, [13:13] -looksLikeCrankToIdle = bits, U32, 1324, [14:14] -isIdleCoasting = bits, U32, 1324, [15:15] -isIdleClosedLoop = bits, U32, 1324, [16:16] -idleTarget = scalar, S32, 1328, "", 1, 0 -targetRpmByClt = scalar, S32, 1332, "", 1, 0 -targetRpmAc = scalar, S32, 1336, "", 1, 0 -iacByRpmTaper = scalar, F32, 1340 -luaAdd = scalar, F32, 1344 -; total TS size = 1348 -idlePosition0 = scalar, F32, 1348, "per", 1,0 -trim0 = scalar, F32, 1352, "", 1, 0 -luaAdjustment0 = scalar, F32, 1356, "per", 1,0 -m_wastegatePosition0 = scalar, F32, 1360, "per", 1,0 -etbFeedForward0 = scalar, F32, 1364 -etbIntegralError0 = scalar, F32, 1368, "", 1, 0 -etbCurrentTarget0 = scalar, F32, 1372, "%", 1, 0 -etbCurrentAdjustedTarget0 = scalar, F32, 1376, "%", 1, 0 -etbRevLimitActive0 = bits, U32, 1380, [0:0] -jamDetected0 = bits, U32, 1380, [1:1] -etbDutyRateOfChange0 = scalar, F32, 1384, "per", 1,0 -etbDutyAverage0 = scalar, F32, 1388, "per", 1,0 -etbTpsErrorCounter0 = scalar, U16, 1392, "count", 1,0 -etbPpsErrorCounter0 = scalar, U16, 1394, "count", 1,0 -etbErrorCode0 = scalar, S08, 1396, "", 1, 0 -jamTimer0 = scalar, U16, 1398, "sec", 0.01, 0 -; total TS size = 1400 -faultCode0 = scalar, U08, 1400, "", 1, 0 -heaterDuty0 = scalar, U08, 1401, "%", 1, 0 -pumpDuty0 = scalar, U08, 1402, "%", 1, 0 -tempC0 = scalar, U16, 1404, "C", 1, 0 -nernstVoltage0 = scalar, U16, 1406, "V", 0.001, 0 -esr0 = scalar, U16, 1408, "ohm", 1, 0 -; total TS size = 1412 -dcOutput0 = scalar, F32, 1412, "per", 1,0 -isEnabled0_int = scalar, U08, 1416, "per", 1,0 -isEnabled0 = bits, U32, 1420, [0:0] -; total TS size = 1424 -value0 = scalar, U16, 1424, "value", 1,0 -value1 = scalar, U16, 1426, "value", 1,0 -errorRate = scalar, F32, 1428, "ratio", 1,0 -; total TS size = 1432 -vvtTarget = scalar, U16, 1432, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1434, "%", 0.5, 0 +smartChipAliveCounter = scalar, S08, 1096, "", 1, 0 +startStopPhysicalState = bits, U32, 1100, [0:0] +acrStateDup = bits, U32, 1100, [1:1] +acrEngineMovedRecently = bits, U32, 1100, [2:2] +heaterControlEnabled = bits, U32, 1100, [3:3] +luaDigitalState0 = bits, U32, 1100, [4:4] +luaDigitalState1 = bits, U32, 1100, [5:5] +luaDigitalState2 = bits, U32, 1100, [6:6] +luaDigitalState3 = bits, U32, 1100, [7:7] +startStopStateToggleCounter = scalar, U32, 1104, "", 1, 0 +egtValue1 = scalar, F32, 1108, "", 1, 0 +egtValue2 = scalar, F32, 1112, "", 1, 0 +desiredRpmLimit = scalar, S16, 1116, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 1120, "", 1, 0 +sparkCounter = scalar, U32, 1124, "", 1, 0 +fuelingLoad = scalar, F32, 1128, "", 1, 0 +ignitionLoad = scalar, F32, 1132, "", 1, 0 +veTableYAxis = scalar, U16, 1136, "%", 0.01, 0 +; total TS size = 1140 +tpsFrom = scalar, F32, 1140 +tpsTo = scalar, F32, 1144 +deltaTps = scalar, F32, 1148 +extraFuel = scalar, F32, 1152, "", 1, 0 +valueFromTable = scalar, F32, 1156, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1160, [0:0] +isBelowDecelThreshold = bits, U32, 1160, [1:1] +isTimeToResetAccumulator = bits, U32, 1160, [2:2] +isFractionalEnrichment = bits, U32, 1160, [3:3] +belowEpsilon = bits, U32, 1160, [4:4] +tooShort = bits, U32, 1160, [5:5] +fractionalInjFuel = scalar, F32, 1164, "", 1, 0 +accumulatedValue = scalar, F32, 1168, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1172, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1176, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1180, "", 1, 0 +cycleCnt = scalar, S32, 1184, "", 1, 0 +; total TS size = 1188 +hwEventCounters1 = scalar, U32, 1188, "", 1, 0 +hwEventCounters2 = scalar, U32, 1192, "", 1, 0 +hwEventCounters3 = scalar, U32, 1196, "", 1, 0 +hwEventCounters4 = scalar, U32, 1200, "", 1, 0 +hwEventCounters5 = scalar, U32, 1204, "", 1, 0 +hwEventCounters6 = scalar, U32, 1208, "", 1, 0 +vvtCamCounter = scalar, U32, 1212, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1216, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1220, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1224, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1225, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1228, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1232, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1236, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1240, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1244, [0:0] +; total TS size = 1248 +crankSynchronizationCounter0 = scalar, U32, 1248, "", 1, 0 +vvtSyncGapRatio0 = scalar, F32, 1252, "", 1, 0 +vvtToothDurations00 = scalar, U32, 1256, "us", 1, 0 +vvtCurrentPosition0 = scalar, F32, 1260, "sync: Primary Cam Position", 1, 0 +vvtToothPosition10 = scalar, F32, 1264, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition20 = scalar, F32, 1268, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition30 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition40 = scalar, F32, 1276, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio0 = scalar, F32, 1280, "", 1, 0 +triggerStateIndex0 = scalar, U08, 1284, "", 1, 0 +vvtStateIndex0 = scalar, U08, 1285, "", 1, 0 +; total TS size = 1288 +camResyncCounter = scalar, U08, 1288, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1292, [0:0] +; total TS size = 1296 +wallFuelCorrection = scalar, F32, 1296, "", 1, 0 +wallFuel = scalar, F32, 1300, "", 1, 0 +; total TS size = 1304 +idleState = bits, S32, 1304, [0:2], "not important" +currentIdlePosition = scalar, F32, 1308 +baseIdlePosition = scalar, F32, 1312 +idleClosedLoop = scalar, F32, 1316 +iacByTpsTaper = scalar, F32, 1320 +throttlePedalUpState = scalar, S32, 1324, "", 1, 0 +mightResetPid = bits, U32, 1328, [0:0] +shouldResetPid = bits, U32, 1328, [1:1] +wasResetPid = bits, U32, 1328, [2:2] +mustResetPid = bits, U32, 1328, [3:3] +isCranking = bits, U32, 1328, [4:4] +isIacTableForCoasting = bits, U32, 1328, [5:5] +notIdling = bits, U32, 1328, [6:6] +needReset = bits, U32, 1328, [7:7] +isInDeadZone = bits, U32, 1328, [8:8] +isBlipping = bits, U32, 1328, [9:9] +useClosedLoop = bits, U32, 1328, [10:10] +badTps = bits, U32, 1328, [11:11] +looksLikeRunning = bits, U32, 1328, [12:12] +looksLikeCoasting = bits, U32, 1328, [13:13] +looksLikeCrankToIdle = bits, U32, 1328, [14:14] +isIdleCoasting = bits, U32, 1328, [15:15] +isIdleClosedLoop = bits, U32, 1328, [16:16] +idleTarget = scalar, S32, 1332, "", 1, 0 +targetRpmByClt = scalar, S32, 1336, "", 1, 0 +targetRpmAc = scalar, S32, 1340, "", 1, 0 +iacByRpmTaper = scalar, F32, 1344 +luaAdd = scalar, F32, 1348 +; total TS size = 1352 +idlePosition0 = scalar, F32, 1352, "per", 1,0 +trim0 = scalar, F32, 1356, "", 1, 0 +luaAdjustment0 = scalar, F32, 1360, "per", 1,0 +m_wastegatePosition0 = scalar, F32, 1364, "per", 1,0 +etbFeedForward0 = scalar, F32, 1368 +etbIntegralError0 = scalar, F32, 1372, "", 1, 0 +etbCurrentTarget0 = scalar, F32, 1376, "%", 1, 0 +etbCurrentAdjustedTarget0 = scalar, F32, 1380, "%", 1, 0 +etbRevLimitActive0 = bits, U32, 1384, [0:0] +jamDetected0 = bits, U32, 1384, [1:1] +etbDutyRateOfChange0 = scalar, F32, 1388, "per", 1,0 +etbDutyAverage0 = scalar, F32, 1392, "per", 1,0 +etbTpsErrorCounter0 = scalar, U16, 1396, "count", 1,0 +etbPpsErrorCounter0 = scalar, U16, 1398, "count", 1,0 +etbErrorCode0 = scalar, S08, 1400, "", 1, 0 +jamTimer0 = scalar, U16, 1402, "sec", 0.01, 0 +; total TS size = 1404 +faultCode0 = scalar, U08, 1404, "", 1, 0 +heaterDuty0 = scalar, U08, 1405, "%", 1, 0 +pumpDuty0 = scalar, U08, 1406, "%", 1, 0 +tempC0 = scalar, U16, 1408, "C", 1, 0 +nernstVoltage0 = scalar, U16, 1410, "V", 0.001, 0 +esr0 = scalar, U16, 1412, "ohm", 1, 0 +; total TS size = 1416 +dcOutput0 = scalar, F32, 1416, "per", 1,0 +isEnabled0_int = scalar, U08, 1420, "per", 1,0 +isEnabled0 = bits, U32, 1424, [0:0] +; total TS size = 1428 +value0 = scalar, U16, 1428, "value", 1,0 +value1 = scalar, U16, 1430, "value", 1,0 +errorRate = scalar, F32, 1432, "ratio", 1,0 ; total TS size = 1436 -lambdaCurrentlyGood = bits, U32, 1436, [0:0] -lambdaMonitorCut = bits, U32, 1436, [1:1] -lambdaTimeSinceGood = scalar, U16, 1440, "sec", 0.01, 0 -; total TS size = 1444 +vvtTarget = scalar, U16, 1436, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1438, "%", 0.5, 0 +; total TS size = 1440 +lambdaCurrentlyGood = bits, U32, 1440, [0:0] +lambdaMonitorCut = bits, U32, 1440, [1:1] +lambdaTimeSinceGood = scalar, U16, 1444, "sec", 0.01, 0 +; total TS size = 1448 time = { timeNow } @@ -5237,6 +5238,7 @@ entry = brakePedalState, "Brake switch", int, "%d" entry = startStopState, "startStopState", int, "%d" entry = smartChipState, "smartChipState", int, "%d" entry = smartChipRestartCounter, "smartChipRestartCounter", int, "%d" +entry = smartChipAliveCounter, "smartChipAliveCounter", int, "%d" entry = startStopPhysicalState, "startStopPhysicalState", int, "%d" entry = acrStateDup, "acrStateDup", int, "%d" entry = acrEngineMovedRecently, "acrEngineMovedRecently", int, "%d" @@ -6202,16 +6204,17 @@ dialog = engine_stateDialog, "engine_state" graphLine = smartChipState graphLine = smartChipRestartCounter liveGraph = engine_state_5_Graph, "Graph", South + graphLine = smartChipAliveCounter graphLine = startStopStateToggleCounter graphLine = egtValue1 graphLine = egtValue2 - graphLine = desiredRpmLimit liveGraph = engine_state_6_Graph, "Graph", South + graphLine = desiredRpmLimit graphLine = fuelInjectionCounter graphLine = sparkCounter graphLine = fuelingLoad - graphLine = ignitionLoad liveGraph = engine_state_7_Graph, "Graph", South + graphLine = ignitionLoad graphLine = veTableYAxis indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini b/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini index bfe597de36..7a03724e7c 100644 --- a/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini +++ b/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.12.26.tdg-pdm8.1910376603" + signature = "rusEFI master.2023.12.26.tdg-pdm8.3118814841" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.12.26.tdg-pdm8.1910376603" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.12.26.tdg-pdm8.3118814841" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -92,7 +92,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","INVALID","INVALID","INVALID","INVALID","Battery Sense","INVALID","INVALID","INVALID","Sense 7","Sense 8","Sense 1","Sense 2","Sense 3","Sense 4","Sense 5","Sense 6" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Tue Dec 26 01:38:18 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Tue Dec 26 22:48:50 UTC 2023 pageSize = 22088 page = 1 @@ -2373,7 +2373,7 @@ lambdaMaxDeviationRpmBins = array, U16, 22078, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1444 + ochBlockSize = 1448 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3027,145 +3027,146 @@ brakePedalState = scalar, S08, 1092, "", 1, 0 startStopState = scalar, S08, 1093, "", 1, 0 smartChipState = scalar, S08, 1094, "", 1, 0 smartChipRestartCounter = scalar, S08, 1095, "", 1, 0 -startStopPhysicalState = bits, U32, 1096, [0:0] -acrStateDup = bits, U32, 1096, [1:1] -acrEngineMovedRecently = bits, U32, 1096, [2:2] -heaterControlEnabled = bits, U32, 1096, [3:3] -luaDigitalState0 = bits, U32, 1096, [4:4] -luaDigitalState1 = bits, U32, 1096, [5:5] -luaDigitalState2 = bits, U32, 1096, [6:6] -luaDigitalState3 = bits, U32, 1096, [7:7] -startStopStateToggleCounter = scalar, U32, 1100, "", 1, 0 -egtValue1 = scalar, F32, 1104, "", 1, 0 -egtValue2 = scalar, F32, 1108, "", 1, 0 -desiredRpmLimit = scalar, S16, 1112, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1116, "", 1, 0 -sparkCounter = scalar, U32, 1120, "", 1, 0 -fuelingLoad = scalar, F32, 1124, "", 1, 0 -ignitionLoad = scalar, F32, 1128, "", 1, 0 -veTableYAxis = scalar, U16, 1132, "%", 0.01, 0 -; total TS size = 1136 -tpsFrom = scalar, F32, 1136 -tpsTo = scalar, F32, 1140 -deltaTps = scalar, F32, 1144 -extraFuel = scalar, F32, 1148, "", 1, 0 -valueFromTable = scalar, F32, 1152, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1156, [0:0] -isBelowDecelThreshold = bits, U32, 1156, [1:1] -isTimeToResetAccumulator = bits, U32, 1156, [2:2] -isFractionalEnrichment = bits, U32, 1156, [3:3] -belowEpsilon = bits, U32, 1156, [4:4] -tooShort = bits, U32, 1156, [5:5] -fractionalInjFuel = scalar, F32, 1160, "", 1, 0 -accumulatedValue = scalar, F32, 1164, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1168, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1172, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1176, "", 1, 0 -cycleCnt = scalar, S32, 1180, "", 1, 0 -; total TS size = 1184 -hwEventCounters1 = scalar, U32, 1184, "", 1, 0 -hwEventCounters2 = scalar, U32, 1188, "", 1, 0 -hwEventCounters3 = scalar, U32, 1192, "", 1, 0 -hwEventCounters4 = scalar, U32, 1196, "", 1, 0 -hwEventCounters5 = scalar, U32, 1200, "", 1, 0 -hwEventCounters6 = scalar, U32, 1204, "", 1, 0 -vvtCamCounter = scalar, U32, 1208, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1212, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1216, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1220, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1221, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1224, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1228, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1232, "", 1, 0 -mapCamPrevToothAngle = scalar, F32, 1236, "deg", 1, 0 -isDecodingMapCam = bits, U32, 1240, [0:0] -; total TS size = 1244 -crankSynchronizationCounter0 = scalar, U32, 1244, "", 1, 0 -vvtSyncGapRatio0 = scalar, F32, 1248, "", 1, 0 -vvtToothDurations00 = scalar, U32, 1252, "us", 1, 0 -vvtCurrentPosition0 = scalar, F32, 1256, "sync: Primary Cam Position", 1, 0 -vvtToothPosition10 = scalar, F32, 1260, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition20 = scalar, F32, 1264, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition30 = scalar, F32, 1268, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition40 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio0 = scalar, F32, 1276, "", 1, 0 -triggerStateIndex0 = scalar, U08, 1280, "", 1, 0 -vvtStateIndex0 = scalar, U08, 1281, "", 1, 0 -; total TS size = 1284 -camResyncCounter = scalar, U08, 1284, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1288, [0:0] -; total TS size = 1292 -wallFuelCorrection = scalar, F32, 1292, "", 1, 0 -wallFuel = scalar, F32, 1296, "", 1, 0 -; total TS size = 1300 -idleState = bits, S32, 1300, [0:2], "not important" -currentIdlePosition = scalar, F32, 1304 -baseIdlePosition = scalar, F32, 1308 -idleClosedLoop = scalar, F32, 1312 -iacByTpsTaper = scalar, F32, 1316 -throttlePedalUpState = scalar, S32, 1320, "", 1, 0 -mightResetPid = bits, U32, 1324, [0:0] -shouldResetPid = bits, U32, 1324, [1:1] -wasResetPid = bits, U32, 1324, [2:2] -mustResetPid = bits, U32, 1324, [3:3] -isCranking = bits, U32, 1324, [4:4] -isIacTableForCoasting = bits, U32, 1324, [5:5] -notIdling = bits, U32, 1324, [6:6] -needReset = bits, U32, 1324, [7:7] -isInDeadZone = bits, U32, 1324, [8:8] -isBlipping = bits, U32, 1324, [9:9] -useClosedLoop = bits, U32, 1324, [10:10] -badTps = bits, U32, 1324, [11:11] -looksLikeRunning = bits, U32, 1324, [12:12] -looksLikeCoasting = bits, U32, 1324, [13:13] -looksLikeCrankToIdle = bits, U32, 1324, [14:14] -isIdleCoasting = bits, U32, 1324, [15:15] -isIdleClosedLoop = bits, U32, 1324, [16:16] -idleTarget = scalar, S32, 1328, "", 1, 0 -targetRpmByClt = scalar, S32, 1332, "", 1, 0 -targetRpmAc = scalar, S32, 1336, "", 1, 0 -iacByRpmTaper = scalar, F32, 1340 -luaAdd = scalar, F32, 1344 -; total TS size = 1348 -idlePosition0 = scalar, F32, 1348, "per", 1,0 -trim0 = scalar, F32, 1352, "", 1, 0 -luaAdjustment0 = scalar, F32, 1356, "per", 1,0 -m_wastegatePosition0 = scalar, F32, 1360, "per", 1,0 -etbFeedForward0 = scalar, F32, 1364 -etbIntegralError0 = scalar, F32, 1368, "", 1, 0 -etbCurrentTarget0 = scalar, F32, 1372, "%", 1, 0 -etbCurrentAdjustedTarget0 = scalar, F32, 1376, "%", 1, 0 -etbRevLimitActive0 = bits, U32, 1380, [0:0] -jamDetected0 = bits, U32, 1380, [1:1] -etbDutyRateOfChange0 = scalar, F32, 1384, "per", 1,0 -etbDutyAverage0 = scalar, F32, 1388, "per", 1,0 -etbTpsErrorCounter0 = scalar, U16, 1392, "count", 1,0 -etbPpsErrorCounter0 = scalar, U16, 1394, "count", 1,0 -etbErrorCode0 = scalar, S08, 1396, "", 1, 0 -jamTimer0 = scalar, U16, 1398, "sec", 0.01, 0 -; total TS size = 1400 -faultCode0 = scalar, U08, 1400, "", 1, 0 -heaterDuty0 = scalar, U08, 1401, "%", 1, 0 -pumpDuty0 = scalar, U08, 1402, "%", 1, 0 -tempC0 = scalar, U16, 1404, "C", 1, 0 -nernstVoltage0 = scalar, U16, 1406, "V", 0.001, 0 -esr0 = scalar, U16, 1408, "ohm", 1, 0 -; total TS size = 1412 -dcOutput0 = scalar, F32, 1412, "per", 1,0 -isEnabled0_int = scalar, U08, 1416, "per", 1,0 -isEnabled0 = bits, U32, 1420, [0:0] -; total TS size = 1424 -value0 = scalar, U16, 1424, "value", 1,0 -value1 = scalar, U16, 1426, "value", 1,0 -errorRate = scalar, F32, 1428, "ratio", 1,0 -; total TS size = 1432 -vvtTarget = scalar, U16, 1432, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1434, "%", 0.5, 0 +smartChipAliveCounter = scalar, S08, 1096, "", 1, 0 +startStopPhysicalState = bits, U32, 1100, [0:0] +acrStateDup = bits, U32, 1100, [1:1] +acrEngineMovedRecently = bits, U32, 1100, [2:2] +heaterControlEnabled = bits, U32, 1100, [3:3] +luaDigitalState0 = bits, U32, 1100, [4:4] +luaDigitalState1 = bits, U32, 1100, [5:5] +luaDigitalState2 = bits, U32, 1100, [6:6] +luaDigitalState3 = bits, U32, 1100, [7:7] +startStopStateToggleCounter = scalar, U32, 1104, "", 1, 0 +egtValue1 = scalar, F32, 1108, "", 1, 0 +egtValue2 = scalar, F32, 1112, "", 1, 0 +desiredRpmLimit = scalar, S16, 1116, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 1120, "", 1, 0 +sparkCounter = scalar, U32, 1124, "", 1, 0 +fuelingLoad = scalar, F32, 1128, "", 1, 0 +ignitionLoad = scalar, F32, 1132, "", 1, 0 +veTableYAxis = scalar, U16, 1136, "%", 0.01, 0 +; total TS size = 1140 +tpsFrom = scalar, F32, 1140 +tpsTo = scalar, F32, 1144 +deltaTps = scalar, F32, 1148 +extraFuel = scalar, F32, 1152, "", 1, 0 +valueFromTable = scalar, F32, 1156, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1160, [0:0] +isBelowDecelThreshold = bits, U32, 1160, [1:1] +isTimeToResetAccumulator = bits, U32, 1160, [2:2] +isFractionalEnrichment = bits, U32, 1160, [3:3] +belowEpsilon = bits, U32, 1160, [4:4] +tooShort = bits, U32, 1160, [5:5] +fractionalInjFuel = scalar, F32, 1164, "", 1, 0 +accumulatedValue = scalar, F32, 1168, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1172, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1176, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1180, "", 1, 0 +cycleCnt = scalar, S32, 1184, "", 1, 0 +; total TS size = 1188 +hwEventCounters1 = scalar, U32, 1188, "", 1, 0 +hwEventCounters2 = scalar, U32, 1192, "", 1, 0 +hwEventCounters3 = scalar, U32, 1196, "", 1, 0 +hwEventCounters4 = scalar, U32, 1200, "", 1, 0 +hwEventCounters5 = scalar, U32, 1204, "", 1, 0 +hwEventCounters6 = scalar, U32, 1208, "", 1, 0 +vvtCamCounter = scalar, U32, 1212, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1216, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1220, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1224, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1225, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1228, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1232, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1236, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1240, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1244, [0:0] +; total TS size = 1248 +crankSynchronizationCounter0 = scalar, U32, 1248, "", 1, 0 +vvtSyncGapRatio0 = scalar, F32, 1252, "", 1, 0 +vvtToothDurations00 = scalar, U32, 1256, "us", 1, 0 +vvtCurrentPosition0 = scalar, F32, 1260, "sync: Primary Cam Position", 1, 0 +vvtToothPosition10 = scalar, F32, 1264, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition20 = scalar, F32, 1268, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition30 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition40 = scalar, F32, 1276, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio0 = scalar, F32, 1280, "", 1, 0 +triggerStateIndex0 = scalar, U08, 1284, "", 1, 0 +vvtStateIndex0 = scalar, U08, 1285, "", 1, 0 +; total TS size = 1288 +camResyncCounter = scalar, U08, 1288, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1292, [0:0] +; total TS size = 1296 +wallFuelCorrection = scalar, F32, 1296, "", 1, 0 +wallFuel = scalar, F32, 1300, "", 1, 0 +; total TS size = 1304 +idleState = bits, S32, 1304, [0:2], "not important" +currentIdlePosition = scalar, F32, 1308 +baseIdlePosition = scalar, F32, 1312 +idleClosedLoop = scalar, F32, 1316 +iacByTpsTaper = scalar, F32, 1320 +throttlePedalUpState = scalar, S32, 1324, "", 1, 0 +mightResetPid = bits, U32, 1328, [0:0] +shouldResetPid = bits, U32, 1328, [1:1] +wasResetPid = bits, U32, 1328, [2:2] +mustResetPid = bits, U32, 1328, [3:3] +isCranking = bits, U32, 1328, [4:4] +isIacTableForCoasting = bits, U32, 1328, [5:5] +notIdling = bits, U32, 1328, [6:6] +needReset = bits, U32, 1328, [7:7] +isInDeadZone = bits, U32, 1328, [8:8] +isBlipping = bits, U32, 1328, [9:9] +useClosedLoop = bits, U32, 1328, [10:10] +badTps = bits, U32, 1328, [11:11] +looksLikeRunning = bits, U32, 1328, [12:12] +looksLikeCoasting = bits, U32, 1328, [13:13] +looksLikeCrankToIdle = bits, U32, 1328, [14:14] +isIdleCoasting = bits, U32, 1328, [15:15] +isIdleClosedLoop = bits, U32, 1328, [16:16] +idleTarget = scalar, S32, 1332, "", 1, 0 +targetRpmByClt = scalar, S32, 1336, "", 1, 0 +targetRpmAc = scalar, S32, 1340, "", 1, 0 +iacByRpmTaper = scalar, F32, 1344 +luaAdd = scalar, F32, 1348 +; total TS size = 1352 +idlePosition0 = scalar, F32, 1352, "per", 1,0 +trim0 = scalar, F32, 1356, "", 1, 0 +luaAdjustment0 = scalar, F32, 1360, "per", 1,0 +m_wastegatePosition0 = scalar, F32, 1364, "per", 1,0 +etbFeedForward0 = scalar, F32, 1368 +etbIntegralError0 = scalar, F32, 1372, "", 1, 0 +etbCurrentTarget0 = scalar, F32, 1376, "%", 1, 0 +etbCurrentAdjustedTarget0 = scalar, F32, 1380, "%", 1, 0 +etbRevLimitActive0 = bits, U32, 1384, [0:0] +jamDetected0 = bits, U32, 1384, [1:1] +etbDutyRateOfChange0 = scalar, F32, 1388, "per", 1,0 +etbDutyAverage0 = scalar, F32, 1392, "per", 1,0 +etbTpsErrorCounter0 = scalar, U16, 1396, "count", 1,0 +etbPpsErrorCounter0 = scalar, U16, 1398, "count", 1,0 +etbErrorCode0 = scalar, S08, 1400, "", 1, 0 +jamTimer0 = scalar, U16, 1402, "sec", 0.01, 0 +; total TS size = 1404 +faultCode0 = scalar, U08, 1404, "", 1, 0 +heaterDuty0 = scalar, U08, 1405, "%", 1, 0 +pumpDuty0 = scalar, U08, 1406, "%", 1, 0 +tempC0 = scalar, U16, 1408, "C", 1, 0 +nernstVoltage0 = scalar, U16, 1410, "V", 0.001, 0 +esr0 = scalar, U16, 1412, "ohm", 1, 0 +; total TS size = 1416 +dcOutput0 = scalar, F32, 1416, "per", 1,0 +isEnabled0_int = scalar, U08, 1420, "per", 1,0 +isEnabled0 = bits, U32, 1424, [0:0] +; total TS size = 1428 +value0 = scalar, U16, 1428, "value", 1,0 +value1 = scalar, U16, 1430, "value", 1,0 +errorRate = scalar, F32, 1432, "ratio", 1,0 ; total TS size = 1436 -lambdaCurrentlyGood = bits, U32, 1436, [0:0] -lambdaMonitorCut = bits, U32, 1436, [1:1] -lambdaTimeSinceGood = scalar, U16, 1440, "sec", 0.01, 0 -; total TS size = 1444 +vvtTarget = scalar, U16, 1436, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1438, "%", 0.5, 0 +; total TS size = 1440 +lambdaCurrentlyGood = bits, U32, 1440, [0:0] +lambdaMonitorCut = bits, U32, 1440, [1:1] +lambdaTimeSinceGood = scalar, U16, 1444, "sec", 0.01, 0 +; total TS size = 1448 time = { timeNow } @@ -5237,6 +5238,7 @@ entry = brakePedalState, "Brake switch", int, "%d" entry = startStopState, "startStopState", int, "%d" entry = smartChipState, "smartChipState", int, "%d" entry = smartChipRestartCounter, "smartChipRestartCounter", int, "%d" +entry = smartChipAliveCounter, "smartChipAliveCounter", int, "%d" entry = startStopPhysicalState, "startStopPhysicalState", int, "%d" entry = acrStateDup, "acrStateDup", int, "%d" entry = acrEngineMovedRecently, "acrEngineMovedRecently", int, "%d" @@ -6202,16 +6204,17 @@ dialog = engine_stateDialog, "engine_state" graphLine = smartChipState graphLine = smartChipRestartCounter liveGraph = engine_state_5_Graph, "Graph", South + graphLine = smartChipAliveCounter graphLine = startStopStateToggleCounter graphLine = egtValue1 graphLine = egtValue2 - graphLine = desiredRpmLimit liveGraph = engine_state_6_Graph, "Graph", South + graphLine = desiredRpmLimit graphLine = fuelInjectionCounter graphLine = sparkCounter graphLine = fuelingLoad - graphLine = ignitionLoad liveGraph = engine_state_7_Graph, "Graph", South + graphLine = ignitionLoad graphLine = veTableYAxis indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_uaefi.ini b/firmware/tunerstudio/generated/rusefi_uaefi.ini index 5327fb4b37..fb6acadcea 100644 --- a/firmware/tunerstudio/generated/rusefi_uaefi.ini +++ b/firmware/tunerstudio/generated/rusefi_uaefi.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.12.26.uaefi.983659470" + signature = "rusEFI master.2023.12.26.uaefi.4070190380" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.12.26.uaefi.983659470" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.12.26.uaefi.4070190380" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -92,7 +92,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","D1 AUX1","C3 AUX2","INVALID","D6 PPS1","D13 TPS1","A7 Voltage From Key","INVALID","INVALID","C14 TPS2","INVALID","D9 MAP","INVALID","D16 CLT Coolant","D15 IAT","C4 PPS2","C15 AUX3" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Tue Dec 26 01:37:11 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Tue Dec 26 22:47:42 UTC 2023 pageSize = 22088 page = 1 @@ -2373,7 +2373,7 @@ lambdaMaxDeviationRpmBins = array, U16, 22078, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1444 + ochBlockSize = 1448 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3027,145 +3027,146 @@ brakePedalState = scalar, S08, 1092, "", 1, 0 startStopState = scalar, S08, 1093, "", 1, 0 smartChipState = scalar, S08, 1094, "", 1, 0 smartChipRestartCounter = scalar, S08, 1095, "", 1, 0 -startStopPhysicalState = bits, U32, 1096, [0:0] -acrStateDup = bits, U32, 1096, [1:1] -acrEngineMovedRecently = bits, U32, 1096, [2:2] -heaterControlEnabled = bits, U32, 1096, [3:3] -luaDigitalState0 = bits, U32, 1096, [4:4] -luaDigitalState1 = bits, U32, 1096, [5:5] -luaDigitalState2 = bits, U32, 1096, [6:6] -luaDigitalState3 = bits, U32, 1096, [7:7] -startStopStateToggleCounter = scalar, U32, 1100, "", 1, 0 -egtValue1 = scalar, F32, 1104, "", 1, 0 -egtValue2 = scalar, F32, 1108, "", 1, 0 -desiredRpmLimit = scalar, S16, 1112, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1116, "", 1, 0 -sparkCounter = scalar, U32, 1120, "", 1, 0 -fuelingLoad = scalar, F32, 1124, "", 1, 0 -ignitionLoad = scalar, F32, 1128, "", 1, 0 -veTableYAxis = scalar, U16, 1132, "%", 0.01, 0 -; total TS size = 1136 -tpsFrom = scalar, F32, 1136 -tpsTo = scalar, F32, 1140 -deltaTps = scalar, F32, 1144 -extraFuel = scalar, F32, 1148, "", 1, 0 -valueFromTable = scalar, F32, 1152, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1156, [0:0] -isBelowDecelThreshold = bits, U32, 1156, [1:1] -isTimeToResetAccumulator = bits, U32, 1156, [2:2] -isFractionalEnrichment = bits, U32, 1156, [3:3] -belowEpsilon = bits, U32, 1156, [4:4] -tooShort = bits, U32, 1156, [5:5] -fractionalInjFuel = scalar, F32, 1160, "", 1, 0 -accumulatedValue = scalar, F32, 1164, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1168, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1172, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1176, "", 1, 0 -cycleCnt = scalar, S32, 1180, "", 1, 0 -; total TS size = 1184 -hwEventCounters1 = scalar, U32, 1184, "", 1, 0 -hwEventCounters2 = scalar, U32, 1188, "", 1, 0 -hwEventCounters3 = scalar, U32, 1192, "", 1, 0 -hwEventCounters4 = scalar, U32, 1196, "", 1, 0 -hwEventCounters5 = scalar, U32, 1200, "", 1, 0 -hwEventCounters6 = scalar, U32, 1204, "", 1, 0 -vvtCamCounter = scalar, U32, 1208, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1212, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1216, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1220, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1221, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1224, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1228, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1232, "", 1, 0 -mapCamPrevToothAngle = scalar, F32, 1236, "deg", 1, 0 -isDecodingMapCam = bits, U32, 1240, [0:0] -; total TS size = 1244 -crankSynchronizationCounter0 = scalar, U32, 1244, "", 1, 0 -vvtSyncGapRatio0 = scalar, F32, 1248, "", 1, 0 -vvtToothDurations00 = scalar, U32, 1252, "us", 1, 0 -vvtCurrentPosition0 = scalar, F32, 1256, "sync: Primary Cam Position", 1, 0 -vvtToothPosition10 = scalar, F32, 1260, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition20 = scalar, F32, 1264, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition30 = scalar, F32, 1268, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition40 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio0 = scalar, F32, 1276, "", 1, 0 -triggerStateIndex0 = scalar, U08, 1280, "", 1, 0 -vvtStateIndex0 = scalar, U08, 1281, "", 1, 0 -; total TS size = 1284 -camResyncCounter = scalar, U08, 1284, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1288, [0:0] -; total TS size = 1292 -wallFuelCorrection = scalar, F32, 1292, "", 1, 0 -wallFuel = scalar, F32, 1296, "", 1, 0 -; total TS size = 1300 -idleState = bits, S32, 1300, [0:2], "not important" -currentIdlePosition = scalar, F32, 1304 -baseIdlePosition = scalar, F32, 1308 -idleClosedLoop = scalar, F32, 1312 -iacByTpsTaper = scalar, F32, 1316 -throttlePedalUpState = scalar, S32, 1320, "", 1, 0 -mightResetPid = bits, U32, 1324, [0:0] -shouldResetPid = bits, U32, 1324, [1:1] -wasResetPid = bits, U32, 1324, [2:2] -mustResetPid = bits, U32, 1324, [3:3] -isCranking = bits, U32, 1324, [4:4] -isIacTableForCoasting = bits, U32, 1324, [5:5] -notIdling = bits, U32, 1324, [6:6] -needReset = bits, U32, 1324, [7:7] -isInDeadZone = bits, U32, 1324, [8:8] -isBlipping = bits, U32, 1324, [9:9] -useClosedLoop = bits, U32, 1324, [10:10] -badTps = bits, U32, 1324, [11:11] -looksLikeRunning = bits, U32, 1324, [12:12] -looksLikeCoasting = bits, U32, 1324, [13:13] -looksLikeCrankToIdle = bits, U32, 1324, [14:14] -isIdleCoasting = bits, U32, 1324, [15:15] -isIdleClosedLoop = bits, U32, 1324, [16:16] -idleTarget = scalar, S32, 1328, "", 1, 0 -targetRpmByClt = scalar, S32, 1332, "", 1, 0 -targetRpmAc = scalar, S32, 1336, "", 1, 0 -iacByRpmTaper = scalar, F32, 1340 -luaAdd = scalar, F32, 1344 -; total TS size = 1348 -idlePosition0 = scalar, F32, 1348, "per", 1,0 -trim0 = scalar, F32, 1352, "", 1, 0 -luaAdjustment0 = scalar, F32, 1356, "per", 1,0 -m_wastegatePosition0 = scalar, F32, 1360, "per", 1,0 -etbFeedForward0 = scalar, F32, 1364 -etbIntegralError0 = scalar, F32, 1368, "", 1, 0 -etbCurrentTarget0 = scalar, F32, 1372, "%", 1, 0 -etbCurrentAdjustedTarget0 = scalar, F32, 1376, "%", 1, 0 -etbRevLimitActive0 = bits, U32, 1380, [0:0] -jamDetected0 = bits, U32, 1380, [1:1] -etbDutyRateOfChange0 = scalar, F32, 1384, "per", 1,0 -etbDutyAverage0 = scalar, F32, 1388, "per", 1,0 -etbTpsErrorCounter0 = scalar, U16, 1392, "count", 1,0 -etbPpsErrorCounter0 = scalar, U16, 1394, "count", 1,0 -etbErrorCode0 = scalar, S08, 1396, "", 1, 0 -jamTimer0 = scalar, U16, 1398, "sec", 0.01, 0 -; total TS size = 1400 -faultCode0 = scalar, U08, 1400, "", 1, 0 -heaterDuty0 = scalar, U08, 1401, "%", 1, 0 -pumpDuty0 = scalar, U08, 1402, "%", 1, 0 -tempC0 = scalar, U16, 1404, "C", 1, 0 -nernstVoltage0 = scalar, U16, 1406, "V", 0.001, 0 -esr0 = scalar, U16, 1408, "ohm", 1, 0 -; total TS size = 1412 -dcOutput0 = scalar, F32, 1412, "per", 1,0 -isEnabled0_int = scalar, U08, 1416, "per", 1,0 -isEnabled0 = bits, U32, 1420, [0:0] -; total TS size = 1424 -value0 = scalar, U16, 1424, "value", 1,0 -value1 = scalar, U16, 1426, "value", 1,0 -errorRate = scalar, F32, 1428, "ratio", 1,0 -; total TS size = 1432 -vvtTarget = scalar, U16, 1432, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1434, "%", 0.5, 0 +smartChipAliveCounter = scalar, S08, 1096, "", 1, 0 +startStopPhysicalState = bits, U32, 1100, [0:0] +acrStateDup = bits, U32, 1100, [1:1] +acrEngineMovedRecently = bits, U32, 1100, [2:2] +heaterControlEnabled = bits, U32, 1100, [3:3] +luaDigitalState0 = bits, U32, 1100, [4:4] +luaDigitalState1 = bits, U32, 1100, [5:5] +luaDigitalState2 = bits, U32, 1100, [6:6] +luaDigitalState3 = bits, U32, 1100, [7:7] +startStopStateToggleCounter = scalar, U32, 1104, "", 1, 0 +egtValue1 = scalar, F32, 1108, "", 1, 0 +egtValue2 = scalar, F32, 1112, "", 1, 0 +desiredRpmLimit = scalar, S16, 1116, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 1120, "", 1, 0 +sparkCounter = scalar, U32, 1124, "", 1, 0 +fuelingLoad = scalar, F32, 1128, "", 1, 0 +ignitionLoad = scalar, F32, 1132, "", 1, 0 +veTableYAxis = scalar, U16, 1136, "%", 0.01, 0 +; total TS size = 1140 +tpsFrom = scalar, F32, 1140 +tpsTo = scalar, F32, 1144 +deltaTps = scalar, F32, 1148 +extraFuel = scalar, F32, 1152, "", 1, 0 +valueFromTable = scalar, F32, 1156, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1160, [0:0] +isBelowDecelThreshold = bits, U32, 1160, [1:1] +isTimeToResetAccumulator = bits, U32, 1160, [2:2] +isFractionalEnrichment = bits, U32, 1160, [3:3] +belowEpsilon = bits, U32, 1160, [4:4] +tooShort = bits, U32, 1160, [5:5] +fractionalInjFuel = scalar, F32, 1164, "", 1, 0 +accumulatedValue = scalar, F32, 1168, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1172, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1176, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1180, "", 1, 0 +cycleCnt = scalar, S32, 1184, "", 1, 0 +; total TS size = 1188 +hwEventCounters1 = scalar, U32, 1188, "", 1, 0 +hwEventCounters2 = scalar, U32, 1192, "", 1, 0 +hwEventCounters3 = scalar, U32, 1196, "", 1, 0 +hwEventCounters4 = scalar, U32, 1200, "", 1, 0 +hwEventCounters5 = scalar, U32, 1204, "", 1, 0 +hwEventCounters6 = scalar, U32, 1208, "", 1, 0 +vvtCamCounter = scalar, U32, 1212, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1216, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1220, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1224, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1225, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1228, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1232, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1236, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1240, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1244, [0:0] +; total TS size = 1248 +crankSynchronizationCounter0 = scalar, U32, 1248, "", 1, 0 +vvtSyncGapRatio0 = scalar, F32, 1252, "", 1, 0 +vvtToothDurations00 = scalar, U32, 1256, "us", 1, 0 +vvtCurrentPosition0 = scalar, F32, 1260, "sync: Primary Cam Position", 1, 0 +vvtToothPosition10 = scalar, F32, 1264, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition20 = scalar, F32, 1268, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition30 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition40 = scalar, F32, 1276, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio0 = scalar, F32, 1280, "", 1, 0 +triggerStateIndex0 = scalar, U08, 1284, "", 1, 0 +vvtStateIndex0 = scalar, U08, 1285, "", 1, 0 +; total TS size = 1288 +camResyncCounter = scalar, U08, 1288, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1292, [0:0] +; total TS size = 1296 +wallFuelCorrection = scalar, F32, 1296, "", 1, 0 +wallFuel = scalar, F32, 1300, "", 1, 0 +; total TS size = 1304 +idleState = bits, S32, 1304, [0:2], "not important" +currentIdlePosition = scalar, F32, 1308 +baseIdlePosition = scalar, F32, 1312 +idleClosedLoop = scalar, F32, 1316 +iacByTpsTaper = scalar, F32, 1320 +throttlePedalUpState = scalar, S32, 1324, "", 1, 0 +mightResetPid = bits, U32, 1328, [0:0] +shouldResetPid = bits, U32, 1328, [1:1] +wasResetPid = bits, U32, 1328, [2:2] +mustResetPid = bits, U32, 1328, [3:3] +isCranking = bits, U32, 1328, [4:4] +isIacTableForCoasting = bits, U32, 1328, [5:5] +notIdling = bits, U32, 1328, [6:6] +needReset = bits, U32, 1328, [7:7] +isInDeadZone = bits, U32, 1328, [8:8] +isBlipping = bits, U32, 1328, [9:9] +useClosedLoop = bits, U32, 1328, [10:10] +badTps = bits, U32, 1328, [11:11] +looksLikeRunning = bits, U32, 1328, [12:12] +looksLikeCoasting = bits, U32, 1328, [13:13] +looksLikeCrankToIdle = bits, U32, 1328, [14:14] +isIdleCoasting = bits, U32, 1328, [15:15] +isIdleClosedLoop = bits, U32, 1328, [16:16] +idleTarget = scalar, S32, 1332, "", 1, 0 +targetRpmByClt = scalar, S32, 1336, "", 1, 0 +targetRpmAc = scalar, S32, 1340, "", 1, 0 +iacByRpmTaper = scalar, F32, 1344 +luaAdd = scalar, F32, 1348 +; total TS size = 1352 +idlePosition0 = scalar, F32, 1352, "per", 1,0 +trim0 = scalar, F32, 1356, "", 1, 0 +luaAdjustment0 = scalar, F32, 1360, "per", 1,0 +m_wastegatePosition0 = scalar, F32, 1364, "per", 1,0 +etbFeedForward0 = scalar, F32, 1368 +etbIntegralError0 = scalar, F32, 1372, "", 1, 0 +etbCurrentTarget0 = scalar, F32, 1376, "%", 1, 0 +etbCurrentAdjustedTarget0 = scalar, F32, 1380, "%", 1, 0 +etbRevLimitActive0 = bits, U32, 1384, [0:0] +jamDetected0 = bits, U32, 1384, [1:1] +etbDutyRateOfChange0 = scalar, F32, 1388, "per", 1,0 +etbDutyAverage0 = scalar, F32, 1392, "per", 1,0 +etbTpsErrorCounter0 = scalar, U16, 1396, "count", 1,0 +etbPpsErrorCounter0 = scalar, U16, 1398, "count", 1,0 +etbErrorCode0 = scalar, S08, 1400, "", 1, 0 +jamTimer0 = scalar, U16, 1402, "sec", 0.01, 0 +; total TS size = 1404 +faultCode0 = scalar, U08, 1404, "", 1, 0 +heaterDuty0 = scalar, U08, 1405, "%", 1, 0 +pumpDuty0 = scalar, U08, 1406, "%", 1, 0 +tempC0 = scalar, U16, 1408, "C", 1, 0 +nernstVoltage0 = scalar, U16, 1410, "V", 0.001, 0 +esr0 = scalar, U16, 1412, "ohm", 1, 0 +; total TS size = 1416 +dcOutput0 = scalar, F32, 1416, "per", 1,0 +isEnabled0_int = scalar, U08, 1420, "per", 1,0 +isEnabled0 = bits, U32, 1424, [0:0] +; total TS size = 1428 +value0 = scalar, U16, 1428, "value", 1,0 +value1 = scalar, U16, 1430, "value", 1,0 +errorRate = scalar, F32, 1432, "ratio", 1,0 ; total TS size = 1436 -lambdaCurrentlyGood = bits, U32, 1436, [0:0] -lambdaMonitorCut = bits, U32, 1436, [1:1] -lambdaTimeSinceGood = scalar, U16, 1440, "sec", 0.01, 0 -; total TS size = 1444 +vvtTarget = scalar, U16, 1436, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1438, "%", 0.5, 0 +; total TS size = 1440 +lambdaCurrentlyGood = bits, U32, 1440, [0:0] +lambdaMonitorCut = bits, U32, 1440, [1:1] +lambdaTimeSinceGood = scalar, U16, 1444, "sec", 0.01, 0 +; total TS size = 1448 time = { timeNow } @@ -5237,6 +5238,7 @@ entry = brakePedalState, "Brake switch", int, "%d" entry = startStopState, "startStopState", int, "%d" entry = smartChipState, "smartChipState", int, "%d" entry = smartChipRestartCounter, "smartChipRestartCounter", int, "%d" +entry = smartChipAliveCounter, "smartChipAliveCounter", int, "%d" entry = startStopPhysicalState, "startStopPhysicalState", int, "%d" entry = acrStateDup, "acrStateDup", int, "%d" entry = acrEngineMovedRecently, "acrEngineMovedRecently", int, "%d" @@ -6201,16 +6203,17 @@ dialog = engine_stateDialog, "engine_state" graphLine = smartChipState graphLine = smartChipRestartCounter liveGraph = engine_state_5_Graph, "Graph", South + graphLine = smartChipAliveCounter graphLine = startStopStateToggleCounter graphLine = egtValue1 graphLine = egtValue2 - graphLine = desiredRpmLimit liveGraph = engine_state_6_Graph, "Graph", South + graphLine = desiredRpmLimit graphLine = fuelInjectionCounter graphLine = sparkCounter graphLine = fuelingLoad - graphLine = ignitionLoad liveGraph = engine_state_7_Graph, "Graph", South + graphLine = ignitionLoad graphLine = veTableYAxis indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/DcMotors.java b/java_console/models/src/main/java/com/rusefi/config/generated/DcMotors.java index 25203d3fd7..c1376699c8 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/DcMotors.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/DcMotors.java @@ -1,6 +1,6 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEFI tool config_definition_base.jar based on (unknown script) controllers/actuators/dc_motors.txt Wed Dec 06 19:47:30 UTC 2023 +// this file was generated automatically by rusEFI tool config_definition_base.jar based on (unknown script) controllers/actuators/dc_motors.txt Tue Dec 26 22:46:57 UTC 2023 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -170,10 +170,10 @@ public class DcMotors { public static final int TCU_GEAR_COUNT = 10; public static final int TPS_2_BYTE_PACKING_MULT = 100; public static final int VE_BLEND_COUNT = 4; - public static final Field DCOUTPUT0 = Field.create("DCOUTPUT0", 0, FieldType.FLOAT).setBaseOffset(1412); - public static final Field ISENABLED0_INT = Field.create("ISENABLED0_INT", 4, FieldType.INT8).setScale(1.0).setBaseOffset(1412); - public static final Field ALIGNMENTFILL_AT_5 = Field.create("ALIGNMENTFILL_AT_5", 5, FieldType.INT8).setScale(1.0).setBaseOffset(1412); - public static final Field ISENABLED0 = Field.create("ISENABLED0", 8, FieldType.BIT, 0).setBaseOffset(1412); + public static final Field DCOUTPUT0 = Field.create("DCOUTPUT0", 0, FieldType.FLOAT).setBaseOffset(1416); + public static final Field ISENABLED0_INT = Field.create("ISENABLED0_INT", 4, FieldType.INT8).setScale(1.0).setBaseOffset(1416); + public static final Field ALIGNMENTFILL_AT_5 = Field.create("ALIGNMENTFILL_AT_5", 5, FieldType.INT8).setScale(1.0).setBaseOffset(1416); + public static final Field ISENABLED0 = Field.create("ISENABLED0", 8, FieldType.BIT, 0).setBaseOffset(1416); public static final Field[] VALUES = { DCOUTPUT0, ISENABLED0_INT, diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/ElectronicThrottle.java b/java_console/models/src/main/java/com/rusefi/config/generated/ElectronicThrottle.java index 2aa3627a76..d4ee48a7ed 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/ElectronicThrottle.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/ElectronicThrottle.java @@ -1,6 +1,6 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEFI tool config_definition_base.jar based on (unknown script) controllers/actuators/electronic_throttle.txt Wed Dec 06 19:47:30 UTC 2023 +// this file was generated automatically by rusEFI tool config_definition_base.jar based on (unknown script) controllers/actuators/electronic_throttle.txt Tue Dec 26 22:46:57 UTC 2023 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -170,23 +170,23 @@ public class ElectronicThrottle { public static final int TCU_GEAR_COUNT = 10; public static final int TPS_2_BYTE_PACKING_MULT = 100; public static final int VE_BLEND_COUNT = 4; - public static final Field IDLEPOSITION = Field.create("IDLEPOSITION", 0, FieldType.FLOAT).setBaseOffset(1348); - public static final Field TRIM = Field.create("TRIM", 4, FieldType.FLOAT).setBaseOffset(1348); - public static final Field LUAADJUSTMENT = Field.create("LUAADJUSTMENT", 8, FieldType.FLOAT).setBaseOffset(1348); - public static final Field M_WASTEGATEPOSITION = Field.create("M_WASTEGATEPOSITION", 12, FieldType.FLOAT).setBaseOffset(1348); - public static final Field ETBFEEDFORWARD = Field.create("ETBFEEDFORWARD", 16, FieldType.FLOAT).setBaseOffset(1348); - public static final Field ETBINTEGRALERROR = Field.create("ETBINTEGRALERROR", 20, FieldType.FLOAT).setBaseOffset(1348); - public static final Field ETBCURRENTTARGET = Field.create("ETBCURRENTTARGET", 24, FieldType.FLOAT).setBaseOffset(1348); - public static final Field ETBCURRENTADJUSTEDTARGET = Field.create("ETBCURRENTADJUSTEDTARGET", 28, FieldType.FLOAT).setBaseOffset(1348); - public static final Field ETBREVLIMITACTIVE = Field.create("ETBREVLIMITACTIVE", 32, FieldType.BIT, 0).setBaseOffset(1348); - public static final Field JAMDETECTED = Field.create("JAMDETECTED", 32, FieldType.BIT, 1).setBaseOffset(1348); - public static final Field ETBDUTYRATEOFCHANGE = Field.create("ETBDUTYRATEOFCHANGE", 36, FieldType.FLOAT).setBaseOffset(1348); - public static final Field ETBDUTYAVERAGE = Field.create("ETBDUTYAVERAGE", 40, FieldType.FLOAT).setBaseOffset(1348); - public static final Field ETBTPSERRORCOUNTER = Field.create("ETBTPSERRORCOUNTER", 44, FieldType.INT16).setScale(1.0).setBaseOffset(1348); - public static final Field ETBPPSERRORCOUNTER = Field.create("ETBPPSERRORCOUNTER", 46, FieldType.INT16).setScale(1.0).setBaseOffset(1348); - public static final Field ETBERRORCODE = Field.create("ETBERRORCODE", 48, FieldType.INT8).setScale(1.0).setBaseOffset(1348); - public static final Field ALIGNMENTFILL_AT_49 = Field.create("ALIGNMENTFILL_AT_49", 49, FieldType.INT8).setScale(1.0).setBaseOffset(1348); - public static final Field JAMTIMER = Field.create("JAMTIMER", 50, FieldType.INT16).setScale(0.01).setBaseOffset(1348); + public static final Field IDLEPOSITION = Field.create("IDLEPOSITION", 0, FieldType.FLOAT).setBaseOffset(1352); + public static final Field TRIM = Field.create("TRIM", 4, FieldType.FLOAT).setBaseOffset(1352); + public static final Field LUAADJUSTMENT = Field.create("LUAADJUSTMENT", 8, FieldType.FLOAT).setBaseOffset(1352); + public static final Field M_WASTEGATEPOSITION = Field.create("M_WASTEGATEPOSITION", 12, FieldType.FLOAT).setBaseOffset(1352); + public static final Field ETBFEEDFORWARD = Field.create("ETBFEEDFORWARD", 16, FieldType.FLOAT).setBaseOffset(1352); + public static final Field ETBINTEGRALERROR = Field.create("ETBINTEGRALERROR", 20, FieldType.FLOAT).setBaseOffset(1352); + public static final Field ETBCURRENTTARGET = Field.create("ETBCURRENTTARGET", 24, FieldType.FLOAT).setBaseOffset(1352); + public static final Field ETBCURRENTADJUSTEDTARGET = Field.create("ETBCURRENTADJUSTEDTARGET", 28, FieldType.FLOAT).setBaseOffset(1352); + public static final Field ETBREVLIMITACTIVE = Field.create("ETBREVLIMITACTIVE", 32, FieldType.BIT, 0).setBaseOffset(1352); + public static final Field JAMDETECTED = Field.create("JAMDETECTED", 32, FieldType.BIT, 1).setBaseOffset(1352); + public static final Field ETBDUTYRATEOFCHANGE = Field.create("ETBDUTYRATEOFCHANGE", 36, FieldType.FLOAT).setBaseOffset(1352); + public static final Field ETBDUTYAVERAGE = Field.create("ETBDUTYAVERAGE", 40, FieldType.FLOAT).setBaseOffset(1352); + public static final Field ETBTPSERRORCOUNTER = Field.create("ETBTPSERRORCOUNTER", 44, FieldType.INT16).setScale(1.0).setBaseOffset(1352); + public static final Field ETBPPSERRORCOUNTER = Field.create("ETBPPSERRORCOUNTER", 46, FieldType.INT16).setScale(1.0).setBaseOffset(1352); + public static final Field ETBERRORCODE = Field.create("ETBERRORCODE", 48, FieldType.INT8).setScale(1.0).setBaseOffset(1352); + public static final Field ALIGNMENTFILL_AT_49 = Field.create("ALIGNMENTFILL_AT_49", 49, FieldType.INT8).setScale(1.0).setBaseOffset(1352); + public static final Field JAMTIMER = Field.create("JAMTIMER", 50, FieldType.INT16).setScale(0.01).setBaseOffset(1352); public static final Field[] VALUES = { IDLEPOSITION, TRIM, diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/EngineState.java b/java_console/models/src/main/java/com/rusefi/config/generated/EngineState.java index 7100becde5..1e3fee85b2 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/EngineState.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/EngineState.java @@ -1,6 +1,6 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEFI tool config_definition_base.jar based on (unknown script) controllers/algo/engine_state.txt Thu Dec 21 05:28:46 UTC 2023 +// this file was generated automatically by rusEFI tool config_definition_base.jar based on (unknown script) controllers/algo/engine_state.txt Tue Dec 26 22:46:57 UTC 2023 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -193,25 +193,27 @@ public class EngineState { public static final Field STARTSTOPSTATE = Field.create("STARTSTOPSTATE", 45, FieldType.INT8).setScale(1.0).setBaseOffset(1048); public static final Field SMARTCHIPSTATE = Field.create("SMARTCHIPSTATE", 46, FieldType.INT8).setScale(1.0).setBaseOffset(1048); public static final Field SMARTCHIPRESTARTCOUNTER = Field.create("SMARTCHIPRESTARTCOUNTER", 47, FieldType.INT8).setScale(1.0).setBaseOffset(1048); - public static final Field STARTSTOPPHYSICALSTATE = Field.create("STARTSTOPPHYSICALSTATE", 48, FieldType.BIT, 0).setBaseOffset(1048); - public static final Field ACRSTATEDUP = Field.create("ACRSTATEDUP", 48, FieldType.BIT, 1).setBaseOffset(1048); - public static final Field ACRENGINEMOVEDRECENTLY = Field.create("ACRENGINEMOVEDRECENTLY", 48, FieldType.BIT, 2).setBaseOffset(1048); - public static final Field HEATERCONTROLENABLED = Field.create("HEATERCONTROLENABLED", 48, FieldType.BIT, 3).setBaseOffset(1048); - public static final Field LUADIGITALSTATE0 = Field.create("LUADIGITALSTATE0", 48, FieldType.BIT, 4).setBaseOffset(1048); - public static final Field LUADIGITALSTATE1 = Field.create("LUADIGITALSTATE1", 48, FieldType.BIT, 5).setBaseOffset(1048); - public static final Field LUADIGITALSTATE2 = Field.create("LUADIGITALSTATE2", 48, FieldType.BIT, 6).setBaseOffset(1048); - public static final Field LUADIGITALSTATE3 = Field.create("LUADIGITALSTATE3", 48, FieldType.BIT, 7).setBaseOffset(1048); - public static final Field STARTSTOPSTATETOGGLECOUNTER = Field.create("STARTSTOPSTATETOGGLECOUNTER", 52, FieldType.INT).setScale(1.0).setBaseOffset(1048); - public static final Field EGTVALUE1 = Field.create("EGTVALUE1", 56, FieldType.FLOAT).setBaseOffset(1048); - public static final Field EGTVALUE2 = Field.create("EGTVALUE2", 60, FieldType.FLOAT).setBaseOffset(1048); - public static final Field DESIREDRPMLIMIT = Field.create("DESIREDRPMLIMIT", 64, FieldType.INT16).setScale(1.0).setBaseOffset(1048); - public static final Field ALIGNMENTFILL_AT_66 = Field.create("ALIGNMENTFILL_AT_66", 66, FieldType.INT8).setScale(1.0).setBaseOffset(1048); - public static final Field FUELINJECTIONCOUNTER = Field.create("FUELINJECTIONCOUNTER", 68, FieldType.INT).setScale(1.0).setBaseOffset(1048); - public static final Field SPARKCOUNTER = Field.create("SPARKCOUNTER", 72, FieldType.INT).setScale(1.0).setBaseOffset(1048); - public static final Field FUELINGLOAD = Field.create("FUELINGLOAD", 76, FieldType.FLOAT).setBaseOffset(1048); - public static final Field IGNITIONLOAD = Field.create("IGNITIONLOAD", 80, FieldType.FLOAT).setBaseOffset(1048); - public static final Field VETABLEYAXIS = Field.create("VETABLEYAXIS", 84, FieldType.INT16).setScale(0.01).setBaseOffset(1048); - public static final Field ALIGNMENTFILL_AT_86 = Field.create("ALIGNMENTFILL_AT_86", 86, FieldType.INT8).setScale(1.0).setBaseOffset(1048); + public static final Field SMARTCHIPALIVECOUNTER = Field.create("SMARTCHIPALIVECOUNTER", 48, FieldType.INT8).setScale(1.0).setBaseOffset(1048); + public static final Field ALIGNMENTFILL_AT_49 = Field.create("ALIGNMENTFILL_AT_49", 49, FieldType.INT8).setScale(1.0).setBaseOffset(1048); + public static final Field STARTSTOPPHYSICALSTATE = Field.create("STARTSTOPPHYSICALSTATE", 52, FieldType.BIT, 0).setBaseOffset(1048); + public static final Field ACRSTATEDUP = Field.create("ACRSTATEDUP", 52, FieldType.BIT, 1).setBaseOffset(1048); + public static final Field ACRENGINEMOVEDRECENTLY = Field.create("ACRENGINEMOVEDRECENTLY", 52, FieldType.BIT, 2).setBaseOffset(1048); + public static final Field HEATERCONTROLENABLED = Field.create("HEATERCONTROLENABLED", 52, FieldType.BIT, 3).setBaseOffset(1048); + public static final Field LUADIGITALSTATE0 = Field.create("LUADIGITALSTATE0", 52, FieldType.BIT, 4).setBaseOffset(1048); + public static final Field LUADIGITALSTATE1 = Field.create("LUADIGITALSTATE1", 52, FieldType.BIT, 5).setBaseOffset(1048); + public static final Field LUADIGITALSTATE2 = Field.create("LUADIGITALSTATE2", 52, FieldType.BIT, 6).setBaseOffset(1048); + public static final Field LUADIGITALSTATE3 = Field.create("LUADIGITALSTATE3", 52, FieldType.BIT, 7).setBaseOffset(1048); + public static final Field STARTSTOPSTATETOGGLECOUNTER = Field.create("STARTSTOPSTATETOGGLECOUNTER", 56, FieldType.INT).setScale(1.0).setBaseOffset(1048); + public static final Field EGTVALUE1 = Field.create("EGTVALUE1", 60, FieldType.FLOAT).setBaseOffset(1048); + public static final Field EGTVALUE2 = Field.create("EGTVALUE2", 64, FieldType.FLOAT).setBaseOffset(1048); + public static final Field DESIREDRPMLIMIT = Field.create("DESIREDRPMLIMIT", 68, FieldType.INT16).setScale(1.0).setBaseOffset(1048); + public static final Field ALIGNMENTFILL_AT_70 = Field.create("ALIGNMENTFILL_AT_70", 70, FieldType.INT8).setScale(1.0).setBaseOffset(1048); + public static final Field FUELINJECTIONCOUNTER = Field.create("FUELINJECTIONCOUNTER", 72, FieldType.INT).setScale(1.0).setBaseOffset(1048); + public static final Field SPARKCOUNTER = Field.create("SPARKCOUNTER", 76, FieldType.INT).setScale(1.0).setBaseOffset(1048); + public static final Field FUELINGLOAD = Field.create("FUELINGLOAD", 80, FieldType.FLOAT).setBaseOffset(1048); + public static final Field IGNITIONLOAD = Field.create("IGNITIONLOAD", 84, FieldType.FLOAT).setBaseOffset(1048); + public static final Field VETABLEYAXIS = Field.create("VETABLEYAXIS", 88, FieldType.INT16).setScale(0.01).setBaseOffset(1048); + public static final Field ALIGNMENTFILL_AT_90 = Field.create("ALIGNMENTFILL_AT_90", 90, FieldType.INT8).setScale(1.0).setBaseOffset(1048); public static final Field[] VALUES = { LUA_FUELADD, LUA_FUELMULT, @@ -236,6 +238,8 @@ public class EngineState { STARTSTOPSTATE, SMARTCHIPSTATE, SMARTCHIPRESTARTCOUNTER, + SMARTCHIPALIVECOUNTER, + ALIGNMENTFILL_AT_49, STARTSTOPPHYSICALSTATE, ACRSTATEDUP, ACRENGINEMOVEDRECENTLY, @@ -248,12 +252,12 @@ public class EngineState { EGTVALUE1, EGTVALUE2, DESIREDRPMLIMIT, - ALIGNMENTFILL_AT_66, + ALIGNMENTFILL_AT_70, FUELINJECTIONCOUNTER, SPARKCOUNTER, FUELINGLOAD, IGNITIONLOAD, VETABLEYAXIS, - ALIGNMENTFILL_AT_86, + ALIGNMENTFILL_AT_90, }; } diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/Fields.java b/java_console/models/src/main/java/com/rusefi/config/generated/Fields.java index ad30e391f4..26f42d8a7b 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/Fields.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/Fields.java @@ -1,6 +1,6 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Tue Dec 26 01:38:28 UTC 2023 +// this file was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Tue Dec 26 22:48:59 UTC 2023 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -1083,7 +1083,6 @@ public class Fields { public static final int SentEtbType_FORD_TYPE_1 = 2; public static final int SentEtbType_GM_TYPE_1 = 1; public static final int SentEtbType_NONE = 0; - public static final int SIGNATURE_HASH = 2110701098; public static final String SIMULATOR_TUNE_BIN_FILE_NAME = "generated/simulator_tune_image.bin"; public static final String SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX = "generated/simulator_tune_image"; public static final String SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX = ".bin"; @@ -1312,11 +1311,11 @@ public class Fields { public static final int TS_RESPONSE_UNDERRUN = 0x80; public static final int TS_RESPONSE_UNRECOGNIZED_COMMAND = 0x83; public static final char TS_SET_LOGGER_SWITCH = 'l'; - public static final String TS_SIGNATURE = "rusEFI master.2023.12.26.f407-discovery.2110701098"; + public static final String TS_SIGNATURE = "rusEFI master.2023.12.26.f407-discovery.3052789960"; public static final char TS_SIMULATE_CAN = '>'; public static final char TS_SINGLE_WRITE_COMMAND = 'W'; public static final char TS_TEST_COMMAND = 't'; - public static final int TS_TOTAL_OUTPUT_SIZE = 1444; + public static final int TS_TOTAL_OUTPUT_SIZE = 1448; public static final String TS_TRIGGER_SCOPE_CHANNEL_1_NAME = "Channel 1"; public static final String TS_TRIGGER_SCOPE_CHANNEL_2_NAME = "Channel 2"; public static final int TS_TRIGGER_SCOPE_DISABLE = 5; diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/IdleState.java b/java_console/models/src/main/java/com/rusefi/config/generated/IdleState.java index a50bb79dc4..4d406e4d98 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/IdleState.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/IdleState.java @@ -1,6 +1,6 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEFI tool config_definition_base.jar based on (unknown script) controllers/actuators/idle_state.txt Wed Dec 06 19:47:30 UTC 2023 +// this file was generated automatically by rusEFI tool config_definition_base.jar based on (unknown script) controllers/actuators/idle_state.txt Tue Dec 26 22:46:57 UTC 2023 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -170,34 +170,34 @@ public class IdleState { public static final int TCU_GEAR_COUNT = 10; public static final int TPS_2_BYTE_PACKING_MULT = 100; public static final int VE_BLEND_COUNT = 4; - public static final Field IDLESTATE = Field.create("IDLESTATE", 0, FieldType.INT).setScale(1.0).setBaseOffset(1300); - public static final Field CURRENTIDLEPOSITION = Field.create("CURRENTIDLEPOSITION", 4, FieldType.FLOAT).setBaseOffset(1300); - public static final Field BASEIDLEPOSITION = Field.create("BASEIDLEPOSITION", 8, FieldType.FLOAT).setBaseOffset(1300); - public static final Field IDLECLOSEDLOOP = Field.create("IDLECLOSEDLOOP", 12, FieldType.FLOAT).setBaseOffset(1300); - public static final Field IACBYTPSTAPER = Field.create("IACBYTPSTAPER", 16, FieldType.FLOAT).setBaseOffset(1300); - public static final Field THROTTLEPEDALUPSTATE = Field.create("THROTTLEPEDALUPSTATE", 20, FieldType.INT).setScale(1.0).setBaseOffset(1300); - public static final Field MIGHTRESETPID = Field.create("MIGHTRESETPID", 24, FieldType.BIT, 0).setBaseOffset(1300); - public static final Field SHOULDRESETPID = Field.create("SHOULDRESETPID", 24, FieldType.BIT, 1).setBaseOffset(1300); - public static final Field WASRESETPID = Field.create("WASRESETPID", 24, FieldType.BIT, 2).setBaseOffset(1300); - public static final Field MUSTRESETPID = Field.create("MUSTRESETPID", 24, FieldType.BIT, 3).setBaseOffset(1300); - public static final Field ISCRANKING = Field.create("ISCRANKING", 24, FieldType.BIT, 4).setBaseOffset(1300); - public static final Field ISIACTABLEFORCOASTING = Field.create("ISIACTABLEFORCOASTING", 24, FieldType.BIT, 5).setBaseOffset(1300); - public static final Field NOTIDLING = Field.create("NOTIDLING", 24, FieldType.BIT, 6).setBaseOffset(1300); - public static final Field NEEDRESET = Field.create("NEEDRESET", 24, FieldType.BIT, 7).setBaseOffset(1300); - public static final Field ISINDEADZONE = Field.create("ISINDEADZONE", 24, FieldType.BIT, 8).setBaseOffset(1300); - public static final Field ISBLIPPING = Field.create("ISBLIPPING", 24, FieldType.BIT, 9).setBaseOffset(1300); - public static final Field USECLOSEDLOOP = Field.create("USECLOSEDLOOP", 24, FieldType.BIT, 10).setBaseOffset(1300); - public static final Field BADTPS = Field.create("BADTPS", 24, FieldType.BIT, 11).setBaseOffset(1300); - public static final Field LOOKSLIKERUNNING = Field.create("LOOKSLIKERUNNING", 24, FieldType.BIT, 12).setBaseOffset(1300); - public static final Field LOOKSLIKECOASTING = Field.create("LOOKSLIKECOASTING", 24, FieldType.BIT, 13).setBaseOffset(1300); - public static final Field LOOKSLIKECRANKTOIDLE = Field.create("LOOKSLIKECRANKTOIDLE", 24, FieldType.BIT, 14).setBaseOffset(1300); - public static final Field ISIDLECOASTING = Field.create("ISIDLECOASTING", 24, FieldType.BIT, 15).setBaseOffset(1300); - public static final Field ISIDLECLOSEDLOOP = Field.create("ISIDLECLOSEDLOOP", 24, FieldType.BIT, 16).setBaseOffset(1300); - public static final Field IDLETARGET = Field.create("IDLETARGET", 28, FieldType.INT).setScale(1.0).setBaseOffset(1300); - public static final Field TARGETRPMBYCLT = Field.create("TARGETRPMBYCLT", 32, FieldType.INT).setScale(1.0).setBaseOffset(1300); - public static final Field TARGETRPMAC = Field.create("TARGETRPMAC", 36, FieldType.INT).setScale(1.0).setBaseOffset(1300); - public static final Field IACBYRPMTAPER = Field.create("IACBYRPMTAPER", 40, FieldType.FLOAT).setBaseOffset(1300); - public static final Field LUAADD = Field.create("LUAADD", 44, FieldType.FLOAT).setBaseOffset(1300); + public static final Field IDLESTATE = Field.create("IDLESTATE", 0, FieldType.INT).setScale(1.0).setBaseOffset(1304); + public static final Field CURRENTIDLEPOSITION = Field.create("CURRENTIDLEPOSITION", 4, FieldType.FLOAT).setBaseOffset(1304); + public static final Field BASEIDLEPOSITION = Field.create("BASEIDLEPOSITION", 8, FieldType.FLOAT).setBaseOffset(1304); + public static final Field IDLECLOSEDLOOP = Field.create("IDLECLOSEDLOOP", 12, FieldType.FLOAT).setBaseOffset(1304); + public static final Field IACBYTPSTAPER = Field.create("IACBYTPSTAPER", 16, FieldType.FLOAT).setBaseOffset(1304); + public static final Field THROTTLEPEDALUPSTATE = Field.create("THROTTLEPEDALUPSTATE", 20, FieldType.INT).setScale(1.0).setBaseOffset(1304); + public static final Field MIGHTRESETPID = Field.create("MIGHTRESETPID", 24, FieldType.BIT, 0).setBaseOffset(1304); + public static final Field SHOULDRESETPID = Field.create("SHOULDRESETPID", 24, FieldType.BIT, 1).setBaseOffset(1304); + public static final Field WASRESETPID = Field.create("WASRESETPID", 24, FieldType.BIT, 2).setBaseOffset(1304); + public static final Field MUSTRESETPID = Field.create("MUSTRESETPID", 24, FieldType.BIT, 3).setBaseOffset(1304); + public static final Field ISCRANKING = Field.create("ISCRANKING", 24, FieldType.BIT, 4).setBaseOffset(1304); + public static final Field ISIACTABLEFORCOASTING = Field.create("ISIACTABLEFORCOASTING", 24, FieldType.BIT, 5).setBaseOffset(1304); + public static final Field NOTIDLING = Field.create("NOTIDLING", 24, FieldType.BIT, 6).setBaseOffset(1304); + public static final Field NEEDRESET = Field.create("NEEDRESET", 24, FieldType.BIT, 7).setBaseOffset(1304); + public static final Field ISINDEADZONE = Field.create("ISINDEADZONE", 24, FieldType.BIT, 8).setBaseOffset(1304); + public static final Field ISBLIPPING = Field.create("ISBLIPPING", 24, FieldType.BIT, 9).setBaseOffset(1304); + public static final Field USECLOSEDLOOP = Field.create("USECLOSEDLOOP", 24, FieldType.BIT, 10).setBaseOffset(1304); + public static final Field BADTPS = Field.create("BADTPS", 24, FieldType.BIT, 11).setBaseOffset(1304); + public static final Field LOOKSLIKERUNNING = Field.create("LOOKSLIKERUNNING", 24, FieldType.BIT, 12).setBaseOffset(1304); + public static final Field LOOKSLIKECOASTING = Field.create("LOOKSLIKECOASTING", 24, FieldType.BIT, 13).setBaseOffset(1304); + public static final Field LOOKSLIKECRANKTOIDLE = Field.create("LOOKSLIKECRANKTOIDLE", 24, FieldType.BIT, 14).setBaseOffset(1304); + public static final Field ISIDLECOASTING = Field.create("ISIDLECOASTING", 24, FieldType.BIT, 15).setBaseOffset(1304); + public static final Field ISIDLECLOSEDLOOP = Field.create("ISIDLECLOSEDLOOP", 24, FieldType.BIT, 16).setBaseOffset(1304); + public static final Field IDLETARGET = Field.create("IDLETARGET", 28, FieldType.INT).setScale(1.0).setBaseOffset(1304); + public static final Field TARGETRPMBYCLT = Field.create("TARGETRPMBYCLT", 32, FieldType.INT).setScale(1.0).setBaseOffset(1304); + public static final Field TARGETRPMAC = Field.create("TARGETRPMAC", 36, FieldType.INT).setScale(1.0).setBaseOffset(1304); + public static final Field IACBYRPMTAPER = Field.create("IACBYRPMTAPER", 40, FieldType.FLOAT).setBaseOffset(1304); + public static final Field LUAADD = Field.create("LUAADD", 44, FieldType.FLOAT).setBaseOffset(1304); public static final Field[] VALUES = { IDLESTATE, CURRENTIDLEPOSITION, diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/LambdaMonitor.java b/java_console/models/src/main/java/com/rusefi/config/generated/LambdaMonitor.java index a6adb1099b..fb5c247eda 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/LambdaMonitor.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/LambdaMonitor.java @@ -1,15 +1,15 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEFI tool config_definition_base.jar based on (unknown script) controllers/math/lambda_monitor.txt Wed Dec 06 19:47:30 UTC 2023 +// this file was generated automatically by rusEFI tool config_definition_base.jar based on (unknown script) controllers/math/lambda_monitor.txt Tue Dec 26 22:46:57 UTC 2023 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; public class LambdaMonitor { - public static final Field LAMBDACURRENTLYGOOD = Field.create("LAMBDACURRENTLYGOOD", 0, FieldType.BIT, 0).setBaseOffset(1436); - public static final Field LAMBDAMONITORCUT = Field.create("LAMBDAMONITORCUT", 0, FieldType.BIT, 1).setBaseOffset(1436); - public static final Field LAMBDATIMESINCEGOOD = Field.create("LAMBDATIMESINCEGOOD", 4, FieldType.INT16).setScale(0.01).setBaseOffset(1436); - public static final Field ALIGNMENTFILL_AT_6 = Field.create("ALIGNMENTFILL_AT_6", 6, FieldType.INT8).setScale(1.0).setBaseOffset(1436); + public static final Field LAMBDACURRENTLYGOOD = Field.create("LAMBDACURRENTLYGOOD", 0, FieldType.BIT, 0).setBaseOffset(1440); + public static final Field LAMBDAMONITORCUT = Field.create("LAMBDAMONITORCUT", 0, FieldType.BIT, 1).setBaseOffset(1440); + public static final Field LAMBDATIMESINCEGOOD = Field.create("LAMBDATIMESINCEGOOD", 4, FieldType.INT16).setScale(0.01).setBaseOffset(1440); + public static final Field ALIGNMENTFILL_AT_6 = Field.create("ALIGNMENTFILL_AT_6", 6, FieldType.INT8).setScale(1.0).setBaseOffset(1440); public static final Field[] VALUES = { LAMBDACURRENTLYGOOD, LAMBDAMONITORCUT, diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/SentState.java b/java_console/models/src/main/java/com/rusefi/config/generated/SentState.java index 47dd612a54..8b6545f23b 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/SentState.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/SentState.java @@ -1,6 +1,6 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEFI tool config_definition_base.jar based on (unknown script) controllers/sensors/sent_state.txt Wed Dec 06 19:47:30 UTC 2023 +// this file was generated automatically by rusEFI tool config_definition_base.jar based on (unknown script) controllers/sensors/sent_state.txt Tue Dec 26 22:46:57 UTC 2023 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -170,9 +170,9 @@ public class SentState { public static final int TCU_GEAR_COUNT = 10; public static final int TPS_2_BYTE_PACKING_MULT = 100; public static final int VE_BLEND_COUNT = 4; - public static final Field VALUE0 = Field.create("VALUE0", 0, FieldType.INT16).setScale(1.0).setBaseOffset(1424); - public static final Field VALUE1 = Field.create("VALUE1", 2, FieldType.INT16).setScale(1.0).setBaseOffset(1424); - public static final Field ERRORRATE = Field.create("ERRORRATE", 4, FieldType.FLOAT).setBaseOffset(1424); + public static final Field VALUE0 = Field.create("VALUE0", 0, FieldType.INT16).setScale(1.0).setBaseOffset(1428); + public static final Field VALUE1 = Field.create("VALUE1", 2, FieldType.INT16).setScale(1.0).setBaseOffset(1428); + public static final Field ERRORRATE = Field.create("ERRORRATE", 4, FieldType.FLOAT).setBaseOffset(1428); public static final Field[] VALUES = { VALUE0, VALUE1, diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/TpsAccelState.java b/java_console/models/src/main/java/com/rusefi/config/generated/TpsAccelState.java index 206f38e9df..aa3f1aff7c 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/TpsAccelState.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/TpsAccelState.java @@ -1,6 +1,6 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEFI tool config_definition_base.jar based on (unknown script) controllers/algo/tps_accel_state.txt Mon Nov 27 20:20:53 UTC 2023 +// this file was generated automatically by rusEFI tool config_definition_base.jar based on (unknown script) controllers/algo/tps_accel_state.txt Tue Dec 26 22:46:57 UTC 2023 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -170,23 +170,23 @@ public class TpsAccelState { public static final int TCU_GEAR_COUNT = 10; public static final int TPS_2_BYTE_PACKING_MULT = 100; public static final int VE_BLEND_COUNT = 4; - public static final Field TPSFROM = Field.create("TPSFROM", 0, FieldType.FLOAT).setBaseOffset(1136); - public static final Field TPSTO = Field.create("TPSTO", 4, FieldType.FLOAT).setBaseOffset(1136); - public static final Field DELTATPS = Field.create("DELTATPS", 8, FieldType.FLOAT).setBaseOffset(1136); - public static final Field EXTRAFUEL = Field.create("EXTRAFUEL", 12, FieldType.FLOAT).setBaseOffset(1136); - public static final Field VALUEFROMTABLE = Field.create("VALUEFROMTABLE", 16, FieldType.FLOAT).setBaseOffset(1136); - public static final Field ISABOVEACCELTHRESHOLD = Field.create("ISABOVEACCELTHRESHOLD", 20, FieldType.BIT, 0).setBaseOffset(1136); - public static final Field ISBELOWDECELTHRESHOLD = Field.create("ISBELOWDECELTHRESHOLD", 20, FieldType.BIT, 1).setBaseOffset(1136); - public static final Field ISTIMETORESETACCUMULATOR = Field.create("ISTIMETORESETACCUMULATOR", 20, FieldType.BIT, 2).setBaseOffset(1136); - public static final Field ISFRACTIONALENRICHMENT = Field.create("ISFRACTIONALENRICHMENT", 20, FieldType.BIT, 3).setBaseOffset(1136); - public static final Field BELOWEPSILON = Field.create("BELOWEPSILON", 20, FieldType.BIT, 4).setBaseOffset(1136); - public static final Field TOOSHORT = Field.create("TOOSHORT", 20, FieldType.BIT, 5).setBaseOffset(1136); - public static final Field FRACTIONALINJFUEL = Field.create("FRACTIONALINJFUEL", 24, FieldType.FLOAT).setBaseOffset(1136); - public static final Field ACCUMULATEDVALUE = Field.create("ACCUMULATEDVALUE", 28, FieldType.FLOAT).setBaseOffset(1136); - public static final Field MAXEXTRAPERCYCLE = Field.create("MAXEXTRAPERCYCLE", 32, FieldType.FLOAT).setBaseOffset(1136); - public static final Field MAXEXTRAPERPERIOD = Field.create("MAXEXTRAPERPERIOD", 36, FieldType.FLOAT).setBaseOffset(1136); - public static final Field MAXINJECTEDPERPERIOD = Field.create("MAXINJECTEDPERPERIOD", 40, FieldType.FLOAT).setBaseOffset(1136); - public static final Field CYCLECNT = Field.create("CYCLECNT", 44, FieldType.INT).setScale(1.0).setBaseOffset(1136); + public static final Field TPSFROM = Field.create("TPSFROM", 0, FieldType.FLOAT).setBaseOffset(1140); + public static final Field TPSTO = Field.create("TPSTO", 4, FieldType.FLOAT).setBaseOffset(1140); + public static final Field DELTATPS = Field.create("DELTATPS", 8, FieldType.FLOAT).setBaseOffset(1140); + public static final Field EXTRAFUEL = Field.create("EXTRAFUEL", 12, FieldType.FLOAT).setBaseOffset(1140); + public static final Field VALUEFROMTABLE = Field.create("VALUEFROMTABLE", 16, FieldType.FLOAT).setBaseOffset(1140); + public static final Field ISABOVEACCELTHRESHOLD = Field.create("ISABOVEACCELTHRESHOLD", 20, FieldType.BIT, 0).setBaseOffset(1140); + public static final Field ISBELOWDECELTHRESHOLD = Field.create("ISBELOWDECELTHRESHOLD", 20, FieldType.BIT, 1).setBaseOffset(1140); + public static final Field ISTIMETORESETACCUMULATOR = Field.create("ISTIMETORESETACCUMULATOR", 20, FieldType.BIT, 2).setBaseOffset(1140); + public static final Field ISFRACTIONALENRICHMENT = Field.create("ISFRACTIONALENRICHMENT", 20, FieldType.BIT, 3).setBaseOffset(1140); + public static final Field BELOWEPSILON = Field.create("BELOWEPSILON", 20, FieldType.BIT, 4).setBaseOffset(1140); + public static final Field TOOSHORT = Field.create("TOOSHORT", 20, FieldType.BIT, 5).setBaseOffset(1140); + public static final Field FRACTIONALINJFUEL = Field.create("FRACTIONALINJFUEL", 24, FieldType.FLOAT).setBaseOffset(1140); + public static final Field ACCUMULATEDVALUE = Field.create("ACCUMULATEDVALUE", 28, FieldType.FLOAT).setBaseOffset(1140); + public static final Field MAXEXTRAPERCYCLE = Field.create("MAXEXTRAPERCYCLE", 32, FieldType.FLOAT).setBaseOffset(1140); + public static final Field MAXEXTRAPERPERIOD = Field.create("MAXEXTRAPERPERIOD", 36, FieldType.FLOAT).setBaseOffset(1140); + public static final Field MAXINJECTEDPERPERIOD = Field.create("MAXINJECTEDPERPERIOD", 40, FieldType.FLOAT).setBaseOffset(1140); + public static final Field CYCLECNT = Field.create("CYCLECNT", 44, FieldType.INT).setScale(1.0).setBaseOffset(1140); public static final Field[] VALUES = { TPSFROM, TPSTO, diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/TriggerCentral.java b/java_console/models/src/main/java/com/rusefi/config/generated/TriggerCentral.java index bbd02aa310..327bd6ca28 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/TriggerCentral.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/TriggerCentral.java @@ -1,30 +1,30 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEFI tool config_definition_base.jar based on (unknown script) controllers/trigger/trigger_central.txt Mon Nov 27 20:20:53 UTC 2023 +// this file was generated automatically by rusEFI tool config_definition_base.jar based on (unknown script) controllers/trigger/trigger_central.txt Tue Dec 26 22:46:57 UTC 2023 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; public class TriggerCentral { public static final int HW_EVENT_TYPES = 6; - public static final Field HWEVENTCOUNTERS1 = Field.create("HWEVENTCOUNTERS1", 0, FieldType.INT).setScale(1.0).setBaseOffset(1184); - public static final Field HWEVENTCOUNTERS2 = Field.create("HWEVENTCOUNTERS2", 4, FieldType.INT).setScale(1.0).setBaseOffset(1184); - public static final Field HWEVENTCOUNTERS3 = Field.create("HWEVENTCOUNTERS3", 8, FieldType.INT).setScale(1.0).setBaseOffset(1184); - public static final Field HWEVENTCOUNTERS4 = Field.create("HWEVENTCOUNTERS4", 12, FieldType.INT).setScale(1.0).setBaseOffset(1184); - public static final Field HWEVENTCOUNTERS5 = Field.create("HWEVENTCOUNTERS5", 16, FieldType.INT).setScale(1.0).setBaseOffset(1184); - public static final Field HWEVENTCOUNTERS6 = Field.create("HWEVENTCOUNTERS6", 20, FieldType.INT).setScale(1.0).setBaseOffset(1184); - public static final Field VVTCAMCOUNTER = Field.create("VVTCAMCOUNTER", 24, FieldType.INT).setScale(1.0).setBaseOffset(1184); - public static final Field MAPVVT_MAP_AT_SPECIAL_POINT = Field.create("MAPVVT_MAP_AT_SPECIAL_POINT", 28, FieldType.FLOAT).setBaseOffset(1184); - public static final Field MAPVVT_MAP_AT_DIFF = Field.create("MAPVVT_MAP_AT_DIFF", 32, FieldType.FLOAT).setBaseOffset(1184); - public static final Field MAPVVT_MAP_AT_CYCLE_COUNT = Field.create("MAPVVT_MAP_AT_CYCLE_COUNT", 36, FieldType.INT8).setScale(1.0).setBaseOffset(1184); - public static final Field MAPVVT_MAP_PEAK = Field.create("MAPVVT_MAP_PEAK", 37, FieldType.INT8).setScale(1.0).setBaseOffset(1184); - public static final Field ALIGNMENTFILL_AT_38 = Field.create("ALIGNMENTFILL_AT_38", 38, FieldType.INT8).setScale(1.0).setBaseOffset(1184); - public static final Field CURRENTENGINEDECODEDPHASE = Field.create("CURRENTENGINEDECODEDPHASE", 40, FieldType.FLOAT).setBaseOffset(1184); - public static final Field TRIGGERTOOTHANGLEERROR = Field.create("TRIGGERTOOTHANGLEERROR", 44, FieldType.FLOAT).setBaseOffset(1184); - public static final Field TRIGGERIGNOREDTOOTHCOUNT = Field.create("TRIGGERIGNOREDTOOTHCOUNT", 48, FieldType.INT8).setScale(1.0).setBaseOffset(1184); - public static final Field ALIGNMENTFILL_AT_49 = Field.create("ALIGNMENTFILL_AT_49", 49, FieldType.INT8).setScale(1.0).setBaseOffset(1184); - public static final Field MAPCAMPREVTOOTHANGLE = Field.create("MAPCAMPREVTOOTHANGLE", 52, FieldType.FLOAT).setBaseOffset(1184); - public static final Field ISDECODINGMAPCAM = Field.create("ISDECODINGMAPCAM", 56, FieldType.BIT, 0).setBaseOffset(1184); + public static final Field HWEVENTCOUNTERS1 = Field.create("HWEVENTCOUNTERS1", 0, FieldType.INT).setScale(1.0).setBaseOffset(1188); + public static final Field HWEVENTCOUNTERS2 = Field.create("HWEVENTCOUNTERS2", 4, FieldType.INT).setScale(1.0).setBaseOffset(1188); + public static final Field HWEVENTCOUNTERS3 = Field.create("HWEVENTCOUNTERS3", 8, FieldType.INT).setScale(1.0).setBaseOffset(1188); + public static final Field HWEVENTCOUNTERS4 = Field.create("HWEVENTCOUNTERS4", 12, FieldType.INT).setScale(1.0).setBaseOffset(1188); + public static final Field HWEVENTCOUNTERS5 = Field.create("HWEVENTCOUNTERS5", 16, FieldType.INT).setScale(1.0).setBaseOffset(1188); + public static final Field HWEVENTCOUNTERS6 = Field.create("HWEVENTCOUNTERS6", 20, FieldType.INT).setScale(1.0).setBaseOffset(1188); + public static final Field VVTCAMCOUNTER = Field.create("VVTCAMCOUNTER", 24, FieldType.INT).setScale(1.0).setBaseOffset(1188); + public static final Field MAPVVT_MAP_AT_SPECIAL_POINT = Field.create("MAPVVT_MAP_AT_SPECIAL_POINT", 28, FieldType.FLOAT).setBaseOffset(1188); + public static final Field MAPVVT_MAP_AT_DIFF = Field.create("MAPVVT_MAP_AT_DIFF", 32, FieldType.FLOAT).setBaseOffset(1188); + public static final Field MAPVVT_MAP_AT_CYCLE_COUNT = Field.create("MAPVVT_MAP_AT_CYCLE_COUNT", 36, FieldType.INT8).setScale(1.0).setBaseOffset(1188); + public static final Field MAPVVT_MAP_PEAK = Field.create("MAPVVT_MAP_PEAK", 37, FieldType.INT8).setScale(1.0).setBaseOffset(1188); + public static final Field ALIGNMENTFILL_AT_38 = Field.create("ALIGNMENTFILL_AT_38", 38, FieldType.INT8).setScale(1.0).setBaseOffset(1188); + public static final Field CURRENTENGINEDECODEDPHASE = Field.create("CURRENTENGINEDECODEDPHASE", 40, FieldType.FLOAT).setBaseOffset(1188); + public static final Field TRIGGERTOOTHANGLEERROR = Field.create("TRIGGERTOOTHANGLEERROR", 44, FieldType.FLOAT).setBaseOffset(1188); + public static final Field TRIGGERIGNOREDTOOTHCOUNT = Field.create("TRIGGERIGNOREDTOOTHCOUNT", 48, FieldType.INT8).setScale(1.0).setBaseOffset(1188); + public static final Field ALIGNMENTFILL_AT_49 = Field.create("ALIGNMENTFILL_AT_49", 49, FieldType.INT8).setScale(1.0).setBaseOffset(1188); + public static final Field MAPCAMPREVTOOTHANGLE = Field.create("MAPCAMPREVTOOTHANGLE", 52, FieldType.FLOAT).setBaseOffset(1188); + public static final Field ISDECODINGMAPCAM = Field.create("ISDECODINGMAPCAM", 56, FieldType.BIT, 0).setBaseOffset(1188); public static final Field[] VALUES = { HWEVENTCOUNTERS1, HWEVENTCOUNTERS2, diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/TriggerState.java b/java_console/models/src/main/java/com/rusefi/config/generated/TriggerState.java index 05a101fbaf..7d015acf55 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/TriggerState.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/TriggerState.java @@ -1,6 +1,6 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEFI tool config_definition_base.jar based on (unknown script) controllers/trigger/trigger_state.txt Wed Dec 06 19:47:30 UTC 2023 +// this file was generated automatically by rusEFI tool config_definition_base.jar based on (unknown script) controllers/trigger/trigger_state.txt Tue Dec 26 22:46:57 UTC 2023 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -170,18 +170,18 @@ public class TriggerState { public static final int TCU_GEAR_COUNT = 10; public static final int TPS_2_BYTE_PACKING_MULT = 100; public static final int VE_BLEND_COUNT = 4; - public static final Field CRANKSYNCHRONIZATIONCOUNTER = Field.create("CRANKSYNCHRONIZATIONCOUNTER", 0, FieldType.INT).setScale(1.0).setBaseOffset(1244); - public static final Field VVTSYNCGAPRATIO = Field.create("VVTSYNCGAPRATIO", 4, FieldType.FLOAT).setBaseOffset(1244); - public static final Field VVTTOOTHDURATIONS0 = Field.create("VVTTOOTHDURATIONS0", 8, FieldType.INT).setScale(1.0).setBaseOffset(1244); - public static final Field VVTCURRENTPOSITION = Field.create("VVTCURRENTPOSITION", 12, FieldType.FLOAT).setBaseOffset(1244); - public static final Field VVTTOOTHPOSITION1 = Field.create("VVTTOOTHPOSITION1", 16, FieldType.FLOAT).setBaseOffset(1244); - public static final Field VVTTOOTHPOSITION2 = Field.create("VVTTOOTHPOSITION2", 20, FieldType.FLOAT).setBaseOffset(1244); - public static final Field VVTTOOTHPOSITION3 = Field.create("VVTTOOTHPOSITION3", 24, FieldType.FLOAT).setBaseOffset(1244); - public static final Field VVTTOOTHPOSITION4 = Field.create("VVTTOOTHPOSITION4", 28, FieldType.FLOAT).setBaseOffset(1244); - public static final Field TRIGGERSYNCGAPRATIO = Field.create("TRIGGERSYNCGAPRATIO", 32, FieldType.FLOAT).setBaseOffset(1244); - public static final Field TRIGGERSTATEINDEX = Field.create("TRIGGERSTATEINDEX", 36, FieldType.INT8).setScale(1.0).setBaseOffset(1244); - public static final Field VVTSTATEINDEX = Field.create("VVTSTATEINDEX", 37, FieldType.INT8).setScale(1.0).setBaseOffset(1244); - public static final Field ALIGNMENTFILL_AT_38 = Field.create("ALIGNMENTFILL_AT_38", 38, FieldType.INT8).setScale(1.0).setBaseOffset(1244); + public static final Field CRANKSYNCHRONIZATIONCOUNTER = Field.create("CRANKSYNCHRONIZATIONCOUNTER", 0, FieldType.INT).setScale(1.0).setBaseOffset(1248); + public static final Field VVTSYNCGAPRATIO = Field.create("VVTSYNCGAPRATIO", 4, FieldType.FLOAT).setBaseOffset(1248); + public static final Field VVTTOOTHDURATIONS0 = Field.create("VVTTOOTHDURATIONS0", 8, FieldType.INT).setScale(1.0).setBaseOffset(1248); + public static final Field VVTCURRENTPOSITION = Field.create("VVTCURRENTPOSITION", 12, FieldType.FLOAT).setBaseOffset(1248); + public static final Field VVTTOOTHPOSITION1 = Field.create("VVTTOOTHPOSITION1", 16, FieldType.FLOAT).setBaseOffset(1248); + public static final Field VVTTOOTHPOSITION2 = Field.create("VVTTOOTHPOSITION2", 20, FieldType.FLOAT).setBaseOffset(1248); + public static final Field VVTTOOTHPOSITION3 = Field.create("VVTTOOTHPOSITION3", 24, FieldType.FLOAT).setBaseOffset(1248); + public static final Field VVTTOOTHPOSITION4 = Field.create("VVTTOOTHPOSITION4", 28, FieldType.FLOAT).setBaseOffset(1248); + public static final Field TRIGGERSYNCGAPRATIO = Field.create("TRIGGERSYNCGAPRATIO", 32, FieldType.FLOAT).setBaseOffset(1248); + public static final Field TRIGGERSTATEINDEX = Field.create("TRIGGERSTATEINDEX", 36, FieldType.INT8).setScale(1.0).setBaseOffset(1248); + public static final Field VVTSTATEINDEX = Field.create("VVTSTATEINDEX", 37, FieldType.INT8).setScale(1.0).setBaseOffset(1248); + public static final Field ALIGNMENTFILL_AT_38 = Field.create("ALIGNMENTFILL_AT_38", 38, FieldType.INT8).setScale(1.0).setBaseOffset(1248); public static final Field[] VALUES = { CRANKSYNCHRONIZATIONCOUNTER, VVTSYNCGAPRATIO, diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/TriggerStatePrimary.java b/java_console/models/src/main/java/com/rusefi/config/generated/TriggerStatePrimary.java index 39d096cbe3..ad07c271a4 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/TriggerStatePrimary.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/TriggerStatePrimary.java @@ -1,6 +1,6 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEFI tool config_definition_base.jar based on (unknown script) controllers/trigger/trigger_state_primary.txt Wed Dec 06 19:47:30 UTC 2023 +// this file was generated automatically by rusEFI tool config_definition_base.jar based on (unknown script) controllers/trigger/trigger_state_primary.txt Tue Dec 26 22:46:57 UTC 2023 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -170,9 +170,9 @@ public class TriggerStatePrimary { public static final int TCU_GEAR_COUNT = 10; public static final int TPS_2_BYTE_PACKING_MULT = 100; public static final int VE_BLEND_COUNT = 4; - public static final Field CAMRESYNCCOUNTER = Field.create("CAMRESYNCCOUNTER", 0, FieldType.INT8).setScale(1.0).setBaseOffset(1284); - public static final Field ALIGNMENTFILL_AT_1 = Field.create("ALIGNMENTFILL_AT_1", 1, FieldType.INT8).setScale(1.0).setBaseOffset(1284); - public static final Field M_HASSYNCHRONIZEDPHASE = Field.create("M_HASSYNCHRONIZEDPHASE", 4, FieldType.BIT, 0).setBaseOffset(1284); + public static final Field CAMRESYNCCOUNTER = Field.create("CAMRESYNCCOUNTER", 0, FieldType.INT8).setScale(1.0).setBaseOffset(1288); + public static final Field ALIGNMENTFILL_AT_1 = Field.create("ALIGNMENTFILL_AT_1", 1, FieldType.INT8).setScale(1.0).setBaseOffset(1288); + public static final Field M_HASSYNCHRONIZEDPHASE = Field.create("M_HASSYNCHRONIZEDPHASE", 4, FieldType.BIT, 0).setBaseOffset(1288); public static final Field[] VALUES = { CAMRESYNCCOUNTER, ALIGNMENTFILL_AT_1, diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/VvtState.java b/java_console/models/src/main/java/com/rusefi/config/generated/VvtState.java index fbe3429e1c..7d6d8b9474 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/VvtState.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/VvtState.java @@ -1,14 +1,14 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEFI tool config_definition_base.jar based on (unknown script) controllers/actuators/vvt.txt Wed Dec 06 19:47:30 UTC 2023 +// this file was generated automatically by rusEFI tool config_definition_base.jar based on (unknown script) controllers/actuators/vvt.txt Tue Dec 26 22:46:57 UTC 2023 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; public class VvtState { - public static final Field VVTTARGET = Field.create("VVTTARGET", 0, FieldType.INT16).setScale(0.1).setBaseOffset(1432); - public static final Field VVTOUTPUT = Field.create("VVTOUTPUT", 2, FieldType.INT8).setScale(0.5).setBaseOffset(1432); - public static final Field ALIGNMENTFILL_AT_3 = Field.create("ALIGNMENTFILL_AT_3", 3, FieldType.INT8).setScale(1.0).setBaseOffset(1432); + public static final Field VVTTARGET = Field.create("VVTTARGET", 0, FieldType.INT16).setScale(0.1).setBaseOffset(1436); + public static final Field VVTOUTPUT = Field.create("VVTOUTPUT", 2, FieldType.INT8).setScale(0.5).setBaseOffset(1436); + public static final Field ALIGNMENTFILL_AT_3 = Field.create("ALIGNMENTFILL_AT_3", 3, FieldType.INT8).setScale(1.0).setBaseOffset(1436); public static final Field[] VALUES = { VVTTARGET, VVTOUTPUT, diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/WallFuelState.java b/java_console/models/src/main/java/com/rusefi/config/generated/WallFuelState.java index efa14237da..bded2359fe 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/WallFuelState.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/WallFuelState.java @@ -1,13 +1,13 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEFI tool config_definition_base.jar based on (unknown script) controllers/algo/wall_fuel_state.txt Wed Dec 06 19:47:30 UTC 2023 +// this file was generated automatically by rusEFI tool config_definition_base.jar based on (unknown script) controllers/algo/wall_fuel_state.txt Tue Dec 26 22:46:57 UTC 2023 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; public class WallFuelState { - public static final Field WALLFUELCORRECTION = Field.create("WALLFUELCORRECTION", 0, FieldType.FLOAT).setBaseOffset(1292); - public static final Field WALLFUEL = Field.create("WALLFUEL", 4, FieldType.FLOAT).setBaseOffset(1292); + public static final Field WALLFUELCORRECTION = Field.create("WALLFUELCORRECTION", 0, FieldType.FLOAT).setBaseOffset(1296); + public static final Field WALLFUEL = Field.create("WALLFUEL", 4, FieldType.FLOAT).setBaseOffset(1296); public static final Field[] VALUES = { WALLFUELCORRECTION, WALLFUEL, diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/WidebandController.java b/java_console/models/src/main/java/com/rusefi/config/generated/WidebandController.java index 238d851a22..02516dbdcf 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/WidebandController.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/WidebandController.java @@ -1,19 +1,19 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEFI tool config_definition_base.jar based on (unknown script) controllers/sensors//wideband_state.txt Wed Dec 06 19:47:30 UTC 2023 +// this file was generated automatically by rusEFI tool config_definition_base.jar based on (unknown script) controllers/sensors//wideband_state.txt Tue Dec 26 22:46:57 UTC 2023 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; public class WidebandController { - public static final Field FAULTCODE = Field.create("FAULTCODE", 0, FieldType.INT8).setScale(1.0).setBaseOffset(1400); - public static final Field HEATERDUTY = Field.create("HEATERDUTY", 1, FieldType.INT8).setScale(1.0).setBaseOffset(1400); - public static final Field PUMPDUTY = Field.create("PUMPDUTY", 2, FieldType.INT8).setScale(1.0).setBaseOffset(1400); - public static final Field ALIGNMENTFILL_AT_3 = Field.create("ALIGNMENTFILL_AT_3", 3, FieldType.INT8).setScale(1.0).setBaseOffset(1400); - public static final Field TEMPC = Field.create("TEMPC", 4, FieldType.INT16).setScale(1.0).setBaseOffset(1400); - public static final Field NERNSTVOLTAGE = Field.create("NERNSTVOLTAGE", 6, FieldType.INT16).setScale(0.001).setBaseOffset(1400); - public static final Field ESR = Field.create("ESR", 8, FieldType.INT16).setScale(1.0).setBaseOffset(1400); - public static final Field ALIGNMENTFILL_AT_10 = Field.create("ALIGNMENTFILL_AT_10", 10, FieldType.INT8).setScale(1.0).setBaseOffset(1400); + public static final Field FAULTCODE = Field.create("FAULTCODE", 0, FieldType.INT8).setScale(1.0).setBaseOffset(1404); + public static final Field HEATERDUTY = Field.create("HEATERDUTY", 1, FieldType.INT8).setScale(1.0).setBaseOffset(1404); + public static final Field PUMPDUTY = Field.create("PUMPDUTY", 2, FieldType.INT8).setScale(1.0).setBaseOffset(1404); + public static final Field ALIGNMENTFILL_AT_3 = Field.create("ALIGNMENTFILL_AT_3", 3, FieldType.INT8).setScale(1.0).setBaseOffset(1404); + public static final Field TEMPC = Field.create("TEMPC", 4, FieldType.INT16).setScale(1.0).setBaseOffset(1404); + public static final Field NERNSTVOLTAGE = Field.create("NERNSTVOLTAGE", 6, FieldType.INT16).setScale(0.001).setBaseOffset(1404); + public static final Field ESR = Field.create("ESR", 8, FieldType.INT16).setScale(1.0).setBaseOffset(1404); + public static final Field ALIGNMENTFILL_AT_10 = Field.create("ALIGNMENTFILL_AT_10", 10, FieldType.INT8).setScale(1.0).setBaseOffset(1404); public static final Field[] VALUES = { FAULTCODE, HEATERDUTY,