From 34f5b029a2d822b1bb37281afbf013fd21cd555c Mon Sep 17 00:00:00 2001 From: GitHub gen-configs Action Date: Thu, 28 Sep 2023 13:46:29 +0000 Subject: [PATCH] Auto-generated configs and docs --- .../controllers/algo/rusefi_generated.h | 6 +- .../controllers/algo/rusefi_generated.h | 6 +- .../controllers/algo/rusefi_generated.h | 6 +- .../console/binary/generated/data_logs.ini | 8 +- .../binary/generated/fancy_content.ini | 6 +- .../console/binary/generated/live_data_ids.h | 12 +- .../binary/generated/output_channels.ini | 124 +++++++-------- .../console/binary/generated/sensors.java | 84 +++++----- .../generated/total_live_data_generated.h | 2 +- .../actuators/idle_state_generated.h | 130 +++++++++------- .../controllers/generated/rusefi_generated.h | 6 +- .../controllers/generated/signature_48way.h | 4 +- .../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 +- .../controllers/generated/signature_atlas.h | 4 +- .../controllers/generated/signature_core8.h | 4 +- .../controllers/generated/signature_cypress.h | 4 +- .../generated/signature_f407-discovery.h | 4 +- .../generated/signature_f429-discovery.h | 4 +- .../generated/signature_frankenso_na6.h | 4 +- .../generated/signature_harley81.h | 4 +- .../generated/signature_hellen-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_f429.h | 4 +- .../generated/signature_nucleo_f767.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.h | 4 +- .../generated/signature_subaru_eg33_f7.h | 4 +- .../controllers/generated/signature_t-b-g.h | 4 +- .../generated/signature_tdg-pdm8.h | 4 +- firmware/tunerstudio/generated/rusefi.ini | 146 +++++++++--------- .../tunerstudio/generated/rusefi_48way.ini | 146 +++++++++--------- .../generated/rusefi_alphax-2chan.ini | 146 +++++++++--------- .../generated/rusefi_alphax-4chan.ini | 146 +++++++++--------- .../generated/rusefi_alphax-4chan_f7.ini | 146 +++++++++--------- .../generated/rusefi_alphax-8chan-revA.ini | 146 +++++++++--------- .../generated/rusefi_alphax-8chan.ini | 146 +++++++++--------- .../generated/rusefi_alphax-8chan_f7.ini | 146 +++++++++--------- .../tunerstudio/generated/rusefi_atlas.ini | 146 +++++++++--------- .../tunerstudio/generated/rusefi_core8.ini | 146 +++++++++--------- .../tunerstudio/generated/rusefi_cypress.ini | 146 +++++++++--------- .../generated/rusefi_f407-discovery.ini | 146 +++++++++--------- .../generated/rusefi_f429-discovery.ini | 146 +++++++++--------- .../generated/rusefi_frankenso_na6.ini | 146 +++++++++--------- .../tunerstudio/generated/rusefi_harley81.ini | 146 +++++++++--------- .../generated/rusefi_hellen-112-17.ini | 146 +++++++++--------- .../generated/rusefi_hellen-gm-e67.ini | 146 +++++++++--------- .../generated/rusefi_hellen-honda-k.ini | 146 +++++++++--------- .../generated/rusefi_hellen-nb1.ini | 146 +++++++++--------- .../generated/rusefi_hellen121nissan.ini | 146 +++++++++--------- .../generated/rusefi_hellen121vag.ini | 146 +++++++++--------- .../generated/rusefi_hellen128mercedes.ini | 146 +++++++++--------- .../generated/rusefi_hellen154hyundai.ini | 146 +++++++++--------- .../tunerstudio/generated/rusefi_hellen72.ini | 146 +++++++++--------- .../tunerstudio/generated/rusefi_hellen81.ini | 146 +++++++++--------- .../generated/rusefi_hellen88bmw.ini | 146 +++++++++--------- .../generated/rusefi_hellenNA6.ini | 146 +++++++++--------- .../generated/rusefi_hellenNA8_96.ini | 146 +++++++++--------- firmware/tunerstudio/generated/rusefi_kin.ini | 146 +++++++++--------- .../tunerstudio/generated/rusefi_m74_9.ini | 146 +++++++++--------- .../tunerstudio/generated/rusefi_mre_f4.ini | 146 +++++++++--------- .../tunerstudio/generated/rusefi_mre_f7.ini | 146 +++++++++--------- .../generated/rusefi_nucleo_f429.ini | 146 +++++++++--------- .../generated/rusefi_nucleo_f767.ini | 146 +++++++++--------- .../generated/rusefi_nucleo_h743.ini | 146 +++++++++--------- .../generated/rusefi_prometheus_405.ini | 146 +++++++++--------- .../generated/rusefi_prometheus_469.ini | 146 +++++++++--------- .../generated/rusefi_proteus_f4.ini | 146 +++++++++--------- .../generated/rusefi_proteus_f7.ini | 146 +++++++++--------- .../generated/rusefi_proteus_h7.ini | 146 +++++++++--------- .../tunerstudio/generated/rusefi_s105.ini | 146 +++++++++--------- .../generated/rusefi_small-can.ini | 146 +++++++++--------- .../generated/rusefi_subaru_eg33_f7.ini | 146 +++++++++--------- .../tunerstudio/generated/rusefi_t-b-g.ini | 146 +++++++++--------- .../tunerstudio/generated/rusefi_tdg-pdm8.ini | 146 +++++++++--------- .../com/rusefi/config/generated/DcMotors.java | 10 +- .../config/generated/ElectronicThrottle.java | 36 ++--- .../com/rusefi/config/generated/Fields.java | 7 +- .../rusefi/config/generated/IdleState.java | 52 ++++--- .../config/generated/LambdaMonitor.java | 10 +- .../rusefi/config/generated/SentState.java | 8 +- .../com/rusefi/config/generated/VvtState.java | 8 +- .../config/generated/WidebandController.java | 18 +-- 108 files changed, 3788 insertions(+), 3497 deletions(-) diff --git a/firmware/config/boards/cypress/config/controllers/algo/rusefi_generated.h b/firmware/config/boards/cypress/config/controllers/algo/rusefi_generated.h index 4cc6fc7d0a..a42d8c3af7 100644 --- a/firmware/config/boards/cypress/config/controllers/algo/rusefi_generated.h +++ b/firmware/config/boards/cypress/config/controllers/algo/rusefi_generated.h @@ -794,7 +794,7 @@ #define SentEtbType_NONE 0 #define show_Frankenso_presets true #define show_test_presets true -#define SIGNATURE_HASH 2397543547 +#define SIGNATURE_HASH 1163617923 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define spi_device_e_auto_enum 0="SPI_NONE",1="SPI_DEVICE_1",2="SPI_DEVICE_2",3="SPI_DEVICE_3",4="SPI_DEVICE_4" #define spi_device_e_SPI_DEVICE_1 1 @@ -1087,14 +1087,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.09.28.cypress.2397543547" +#define TS_SIGNATURE "rusEFI master.2023.09.28.cypress.1163617923" #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 1416 +#define TS_TOTAL_OUTPUT_SIZE 1424 #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.h b/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h index 4e067b1109..58135faadb 100644 --- a/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h +++ b/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h @@ -794,7 +794,7 @@ #define SentEtbType_NONE 0 #define show_Frankenso_presets true #define show_test_presets true -#define SIGNATURE_HASH 3426114517 +#define SIGNATURE_HASH 126525741 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define spi_device_e_auto_enum 0="SPI_NONE",1="SPI_DEVICE_1",2="SPI_DEVICE_2",3="SPI_DEVICE_3",4="SPI_DEVICE_4" #define spi_device_e_SPI_DEVICE_1 1 @@ -1087,14 +1087,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.09.28.kin.3426114517" +#define TS_SIGNATURE "rusEFI master.2023.09.28.kin.126525741" #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 1416 +#define TS_TOTAL_OUTPUT_SIZE 1424 #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.h b/firmware/config/boards/subaru_eg33/config/controllers/algo/rusefi_generated.h index dfcf05e279..18fb1059ca 100644 --- a/firmware/config/boards/subaru_eg33/config/controllers/algo/rusefi_generated.h +++ b/firmware/config/boards/subaru_eg33/config/controllers/algo/rusefi_generated.h @@ -1032,7 +1032,7 @@ #define show_Frankenso_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 2305448812 +#define SIGNATURE_HASH 1121362324 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define spi_device_e_auto_enum 0="SPI_NONE",1="SPI_DEVICE_1",2="SPI_DEVICE_2",3="SPI_DEVICE_3",4="SPI_DEVICE_4" #define spi_device_e_SPI_DEVICE_1 1 @@ -1325,14 +1325,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.09.28.subaru_eg33_f7.2305448812" +#define TS_SIGNATURE "rusEFI master.2023.09.28.subaru_eg33_f7.1121362324" #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 1416 +#define TS_TOTAL_OUTPUT_SIZE 1424 #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 be7c3e1841..54f17baad8 100644 --- a/firmware/console/binary/generated/data_logs.ini +++ b/firmware/console/binary/generated/data_logs.ini @@ -526,8 +526,9 @@ entry = m_hasSynchronizedPhase, "sync: Known Engine Phase", int, "%d" entry = wallFuelCorrection, "fuel wallwetting injection time", float, "%.3f" entry = wallFuel, "Fuel on the wall", float, "%.3f" entry = idleState, "idleState", int, "%d" -entry = currentIdlePosition, "idle: current position", float, "%.3f" +entry = currentIdlePosition, "Idle: Position", float, "%.3f" entry = baseIdlePosition, "idle: base value", float, "%.3f" +entry = idleClosedLoop, "Idle: Closed loop", float, "%.3f" entry = iacByTpsTaper, "idle: iacByTpsTaper portion", float, "%.3f" entry = throttlePedalUpState, "idle: throttlePedalUpState", int, "%d" entry = mightResetPid, "idle: mightResetPid", int, "%d" @@ -547,8 +548,9 @@ entry = looksLikeCoasting, "looksLikeCoasting", int, "%d" entry = looksLikeCrankToIdle, "looksLikeCrankToIdle", int, "%d" entry = isIdleCoasting, "Idle: coasting", int, "%d" entry = isIdleClosedLoop, "Idle: Closed loop active", int, "%d" -entry = targetRpmByClt, "idle: target by CLT", int, "%d" -entry = targetRpmAcBump, "idle: A/C bump", int, "%d" +entry = idleTarget, "Idle: Target RPM", int, "%d" +entry = targetRpmByClt, "Idle: Target RPM base", int, "%d" +entry = targetRpmAcBump, "Idle: Target A/C bump", int, "%d" entry = iacByRpmTaper, "idle: iacByRpmTaper portion", float, "%.3f" entry = luaAdd, "idle: Lua Adder", float, "%.3f" entry = idlePosition, "ETB: idlePosition", float, "%.3f" diff --git a/firmware/console/binary/generated/fancy_content.ini b/firmware/console/binary/generated/fancy_content.ini index d58f48019d..77b2eed16d 100644 --- a/firmware/console/binary/generated/fancy_content.ini +++ b/firmware/console/binary/generated/fancy_content.ini @@ -345,13 +345,15 @@ dialog = idle_stateDialog, "idle_state" graphLine = idleState graphLine = currentIdlePosition graphLine = baseIdlePosition - graphLine = iacByTpsTaper + graphLine = idleClosedLoop liveGraph = idle_state_2_Graph, "Graph", South + graphLine = iacByTpsTaper graphLine = throttlePedalUpState + graphLine = idleTarget graphLine = targetRpmByClt + liveGraph = idle_state_3_Graph, "Graph", South graphLine = targetRpmAcBump graphLine = iacByRpmTaper - liveGraph = idle_state_3_Graph, "Graph", South graphLine = luaAdd indicatorPanel = electronic_throttleIndicatorPanel, 2 diff --git a/firmware/console/binary/generated/live_data_ids.h b/firmware/console/binary/generated/live_data_ids.h index 8eae66c011..87a0830d47 100644 --- a/firmware/console/binary/generated/live_data_ids.h +++ b/firmware/console/binary/generated/live_data_ids.h @@ -51,9 +51,9 @@ LDS_lambda_monitor, #define TRIGGER_STATE_PRIMARY_BASE_ADDRESS 1268 #define WALL_FUEL_STATE_BASE_ADDRESS 1272 #define IDLE_STATE_BASE_ADDRESS 1280 -#define ELECTRONIC_THROTTLE_BASE_ADDRESS 1320 -#define WIDEBAND_STATE_BASE_ADDRESS 1372 -#define DC_MOTORS_BASE_ADDRESS 1384 -#define SENT_STATE_BASE_ADDRESS 1396 -#define VVT_BASE_ADDRESS 1404 -#define LAMBDA_MONITOR_BASE_ADDRESS 1408 +#define ELECTRONIC_THROTTLE_BASE_ADDRESS 1328 +#define WIDEBAND_STATE_BASE_ADDRESS 1380 +#define DC_MOTORS_BASE_ADDRESS 1392 +#define SENT_STATE_BASE_ADDRESS 1404 +#define VVT_BASE_ADDRESS 1412 +#define LAMBDA_MONITOR_BASE_ADDRESS 1416 diff --git a/firmware/console/binary/generated/output_channels.ini b/firmware/console/binary/generated/output_channels.ini index 43ed23ffcd..2bd3ecafa5 100644 --- a/firmware/console/binary/generated/output_channels.ini +++ b/firmware/console/binary/generated/output_channels.ini @@ -706,66 +706,68 @@ wallFuel = scalar, F32, 1276, "", 1, 0 idleState = bits, S32, 1280, [0:2], "not important" currentIdlePosition = scalar, F32, 1284 baseIdlePosition = scalar, F32, 1288 -iacByTpsTaper = scalar, F32, 1292 -throttlePedalUpState = scalar, S32, 1296, "", 1, 0 -mightResetPid = bits, U32, 1300, [0:0] -shouldResetPid = bits, U32, 1300, [1:1] -wasResetPid = bits, U32, 1300, [2:2] -mustResetPid = bits, U32, 1300, [3:3] -isCranking = bits, U32, 1300, [4:4] -isIacTableForCoasting = bits, U32, 1300, [5:5] -notIdling = bits, U32, 1300, [6:6] -needReset = bits, U32, 1300, [7:7] -isInDeadZone = bits, U32, 1300, [8:8] -isBlipping = bits, U32, 1300, [9:9] -useClosedLoop = bits, U32, 1300, [10:10] -badTps = bits, U32, 1300, [11:11] -looksLikeRunning = bits, U32, 1300, [12:12] -looksLikeCoasting = bits, U32, 1300, [13:13] -looksLikeCrankToIdle = bits, U32, 1300, [14:14] -isIdleCoasting = bits, U32, 1300, [15:15] -isIdleClosedLoop = bits, U32, 1300, [16:16] -targetRpmByClt = scalar, S32, 1304, "", 1, 0 -targetRpmAcBump = scalar, S32, 1308, "", 1, 0 -iacByRpmTaper = scalar, F32, 1312 -luaAdd = scalar, F32, 1316 -; total TS size = 1320 -idlePosition = scalar, F32, 1320, "per", 1,0 -trim = scalar, F32, 1324, "", 1, 0 -luaAdjustment = scalar, F32, 1328, "per", 1,0 -m_wastegatePosition = scalar, F32, 1332, "per", 1,0 -etbFeedForward = scalar, F32, 1336 -etbIntegralError = scalar, F32, 1340, "", 1, 0 -etbCurrentTarget = scalar, F32, 1344, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1348, "%", 1, 0 -etbRevLimitActive = bits, U32, 1352, [0:0] -jamDetected = bits, U32, 1352, [1:1] -etbDutyRateOfChange = scalar, F32, 1356, "per", 1,0 -etbDutyAverage = scalar, F32, 1360, "per", 1,0 -etbTpsErrorCounter = scalar, U16, 1364, "count", 1,0 -etbPpsErrorCounter = scalar, U16, 1366, "count", 1,0 -etbErrorCode = scalar, S08, 1368, "", 1, 0 -jamTimer = scalar, U16, 1370, "sec", 0.01, 0 -; total TS size = 1372 -faultCode = scalar, U08, 1372, "", 1, 0 -heaterDuty = scalar, U08, 1373, "%", 1, 0 -pumpDuty = scalar, U08, 1374, "%", 1, 0 -tempC = scalar, U16, 1376, "C", 1, 0 -nernstVoltage = scalar, U16, 1378, "V", 0.001, 0 -esr = scalar, U16, 1380, "ohm", 1, 0 -; total TS size = 1384 -dcOutput0 = scalar, F32, 1384, "per", 1,0 -isEnabled0_int = scalar, U08, 1388, "per", 1,0 -isEnabled0 = bits, U32, 1392, [0:0] -; total TS size = 1396 -value0 = scalar, U16, 1396, "value", 1,0 -value1 = scalar, U16, 1398, "value", 1,0 -errorRate = scalar, F32, 1400, "ratio", 1,0 +idleClosedLoop = scalar, F32, 1292 +iacByTpsTaper = scalar, F32, 1296 +throttlePedalUpState = scalar, S32, 1300, "", 1, 0 +mightResetPid = bits, U32, 1304, [0:0] +shouldResetPid = bits, U32, 1304, [1:1] +wasResetPid = bits, U32, 1304, [2:2] +mustResetPid = bits, U32, 1304, [3:3] +isCranking = bits, U32, 1304, [4:4] +isIacTableForCoasting = bits, U32, 1304, [5:5] +notIdling = bits, U32, 1304, [6:6] +needReset = bits, U32, 1304, [7:7] +isInDeadZone = bits, U32, 1304, [8:8] +isBlipping = bits, U32, 1304, [9:9] +useClosedLoop = bits, U32, 1304, [10:10] +badTps = bits, U32, 1304, [11:11] +looksLikeRunning = bits, U32, 1304, [12:12] +looksLikeCoasting = bits, U32, 1304, [13:13] +looksLikeCrankToIdle = bits, U32, 1304, [14:14] +isIdleCoasting = bits, U32, 1304, [15:15] +isIdleClosedLoop = bits, U32, 1304, [16:16] +idleTarget = scalar, S32, 1308, "", 1, 0 +targetRpmByClt = scalar, S32, 1312, "", 1, 0 +targetRpmAcBump = scalar, S32, 1316, "", 1, 0 +iacByRpmTaper = scalar, F32, 1320 +luaAdd = scalar, F32, 1324 +; total TS size = 1328 +idlePosition = scalar, F32, 1328, "per", 1,0 +trim = scalar, F32, 1332, "", 1, 0 +luaAdjustment = scalar, F32, 1336, "per", 1,0 +m_wastegatePosition = scalar, F32, 1340, "per", 1,0 +etbFeedForward = scalar, F32, 1344 +etbIntegralError = scalar, F32, 1348, "", 1, 0 +etbCurrentTarget = scalar, F32, 1352, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1356, "%", 1, 0 +etbRevLimitActive = bits, U32, 1360, [0:0] +jamDetected = bits, U32, 1360, [1:1] +etbDutyRateOfChange = scalar, F32, 1364, "per", 1,0 +etbDutyAverage = scalar, F32, 1368, "per", 1,0 +etbTpsErrorCounter = scalar, U16, 1372, "count", 1,0 +etbPpsErrorCounter = scalar, U16, 1374, "count", 1,0 +etbErrorCode = scalar, S08, 1376, "", 1, 0 +jamTimer = scalar, U16, 1378, "sec", 0.01, 0 +; total TS size = 1380 +faultCode = scalar, U08, 1380, "", 1, 0 +heaterDuty = scalar, U08, 1381, "%", 1, 0 +pumpDuty = scalar, U08, 1382, "%", 1, 0 +tempC = scalar, U16, 1384, "C", 1, 0 +nernstVoltage = scalar, U16, 1386, "V", 0.001, 0 +esr = scalar, U16, 1388, "ohm", 1, 0 +; total TS size = 1392 +dcOutput0 = scalar, F32, 1392, "per", 1,0 +isEnabled0_int = scalar, U08, 1396, "per", 1,0 +isEnabled0 = bits, U32, 1400, [0:0] ; total TS size = 1404 -vvtTarget = scalar, U16, 1404, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1406, "%", 0.5, 0 -; total TS size = 1408 -lambdaCurrentlyGood = bits, U32, 1408, [0:0] -lambdaMonitorCut = bits, U32, 1408, [1:1] -lambdaTimeSinceGood = scalar, U16, 1412, "sec", 0.01, 0 +value0 = scalar, U16, 1404, "value", 1,0 +value1 = scalar, U16, 1406, "value", 1,0 +errorRate = scalar, F32, 1408, "ratio", 1,0 +; total TS size = 1412 +vvtTarget = scalar, U16, 1412, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1414, "%", 0.5, 0 ; total TS size = 1416 +lambdaCurrentlyGood = bits, U32, 1416, [0:0] +lambdaMonitorCut = bits, U32, 1416, [1:1] +lambdaTimeSinceGood = scalar, U16, 1420, "sec", 0.01, 0 +; total TS size = 1424 diff --git a/firmware/console/binary/generated/sensors.java b/firmware/console/binary/generated/sensors.java index f6b6f12b74..6b5b29c8d6 100644 --- a/firmware/console/binary/generated/sensors.java +++ b/firmware/console/binary/generated/sensors.java @@ -517,45 +517,47 @@ alignmentFill_at_23("need 4 byte alignment", SensorCategory.SENSOR_INPUTS, Field wallFuelCorrection("fuel wallwetting injection time\n correction to account for wall wetting effect for current cycle", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1272, 1.0, -1.0, -1.0, ""), wallFuel("Fuel on the wall\nin ms of injector open time for each injector.", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1276, 1.0, -1.0, -1.0, ""), idleState("idleState", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1280, 1.0, -1.0, -1.0, ""), -currentIdlePosition("idle: current position\nthat's current position with CLT and IAT corrections", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1284, 1.0, -1.0, -1.0, ""), +currentIdlePosition("Idle: Position", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1284, 1.0, 0.0, 0.0, "%"), baseIdlePosition("idle: base value\ncurrent position without adjustments (iacByTpsTaper, afterCrankingIACtaperDuration)", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1288, 1.0, -1.0, -1.0, ""), -iacByTpsTaper("idle: iacByTpsTaper portion", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1292, 1.0, -1.0, -1.0, ""), -throttlePedalUpState("idle: throttlePedalUpState\ntrue in IDLE throttle pedal state, false if driver is touching the pedal\ntodo: better name for this field?", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1296, 1.0, -1.0, -1.0, ""), -targetRpmByClt("idle: target by CLT", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1304, 1.0, -1.0, -1.0, ""), -targetRpmAcBump("idle: A/C bump", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1308, 1.0, -1.0, -1.0, ""), -iacByRpmTaper("idle: iacByRpmTaper portion", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1312, 1.0, -1.0, -1.0, ""), -luaAdd("idle: Lua Adder", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1316, 1.0, -1.0, -1.0, ""), -idlePosition("ETB: idlePosition", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1320, 1.0, 0.0, 10.0, "per"), -trim("ETB: trim", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1324, 1.0, -1.0, -1.0, ""), -luaAdjustment("ETB: luaAdjustment", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1328, 1.0, 0.0, 3.0, "per"), -m_wastegatePosition("DC: wastegatePosition", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1332, 1.0, 0.0, 3.0, "per"), -etbFeedForward("etbFeedForward", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1336, 1.0, -1.0, -1.0, ""), -etbIntegralError("etbIntegralError", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1340, 1.0, -10000.0, 10000.0, ""), -etbCurrentTarget("etbCurrentTarget", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1344, 1.0, -10000.0, 10000.0, "%"), -etbCurrentAdjustedTarget("etbCurrentAdjustedTarget", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1348, 1.0, -10000.0, 10000.0, "%"), -etbDutyRateOfChange("ETB duty rate of change", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1356, 1.0, 0.0, 25.0, "per"), -etbDutyAverage("ETB average duty", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1360, 1.0, -20.0, 50.0, "per"), -etbTpsErrorCounter("ETB TPS error counter", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1364, 1.0, 0.0, 3.0, "count"), -etbPpsErrorCounter("ETB pedal error counter", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1366, 1.0, 0.0, 3.0, "count"), -etbErrorCode("etbErrorCode", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1368, 1.0, -1.0, -1.0, ""), -alignmentFill_at_49("need 4 byte alignment", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1369, 1.0, -20.0, 100.0, "units"), -jamTimer("ETB jam timer", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1370, 0.01, 0.0, 100.0, "sec"), -faultCode("WBO: Fault code", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1372, 1.0, -1.0, -1.0, ""), -heaterDuty("WBO: Heater duty", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1373, 1.0, 0.0, 100.0, "%"), -pumpDuty("WBO: Pump duty", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1374, 1.0, 0.0, 100.0, "%"), -alignmentFill_at_3("need 4 byte alignment", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1375, 1.0, -20.0, 100.0, "units"), -tempC("WBO: Temperature", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1376, 1.0, 500.0, 1000.0, "C"), -nernstVoltage("WBO: Nernst Voltage", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1378, 0.001, 0.0, 1.0, "V"), -esr("WBO: ESR", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1380, 1.0, 0.0, 10000.0, "ohm"), -alignmentFill_at_10("need 4 byte alignment", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1382, 1.0, -20.0, 100.0, "units"), -dcOutput0("DC: output0", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1384, 1.0, 0.0, 10.0, "per"), -isEnabled0_int("DC: en0", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1388, 1.0, 0.0, 10.0, "per"), -alignmentFill_at_5("need 4 byte alignment", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1389, 1.0, -20.0, 100.0, "units"), -value0("ETB: SENT value0", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1396, 1.0, 0.0, 3.0, "value"), -value1("ETB: SENT value1", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1398, 1.0, 0.0, 3.0, "value"), -errorRate("ETB: SENT error rate", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1400, 1.0, 0.0, 3.0, "ratio"), -vvtTarget("vvtTarget", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1404, 0.1, -90.0, 90.0, "deg"), -vvtOutput("vvtOutput", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1406, 0.5, 100.0, 1.0, "%"), -alignmentFill_at_3("need 4 byte alignment", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1407, 1.0, -20.0, 100.0, "units"), -lambdaTimeSinceGood("lambdaTimeSinceGood", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1412, 0.01, 0.0, 1.0, "sec"), -alignmentFill_at_6("need 4 byte alignment", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1414, 1.0, -20.0, 100.0, "units"), +idleClosedLoop("Idle: Closed loop", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1292, 1.0, -1.0, -1.0, ""), +iacByTpsTaper("idle: iacByTpsTaper portion", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1296, 1.0, -1.0, -1.0, ""), +throttlePedalUpState("idle: throttlePedalUpState\ntrue in IDLE throttle pedal state, false if driver is touching the pedal\ntodo: better name for this field?", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1300, 1.0, -1.0, -1.0, ""), +idleTarget("Idle: Target RPM", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1308, 1.0, -1.0, -1.0, ""), +targetRpmByClt("Idle: Target RPM base", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1312, 1.0, -1.0, -1.0, ""), +targetRpmAcBump("Idle: Target A/C bump", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1316, 1.0, -1.0, -1.0, ""), +iacByRpmTaper("idle: iacByRpmTaper portion", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1320, 1.0, -1.0, -1.0, ""), +luaAdd("idle: Lua Adder", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1324, 1.0, -1.0, -1.0, ""), +idlePosition("ETB: idlePosition", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1328, 1.0, 0.0, 10.0, "per"), +trim("ETB: trim", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1332, 1.0, -1.0, -1.0, ""), +luaAdjustment("ETB: luaAdjustment", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1336, 1.0, 0.0, 3.0, "per"), +m_wastegatePosition("DC: wastegatePosition", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1340, 1.0, 0.0, 3.0, "per"), +etbFeedForward("etbFeedForward", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1344, 1.0, -1.0, -1.0, ""), +etbIntegralError("etbIntegralError", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1348, 1.0, -10000.0, 10000.0, ""), +etbCurrentTarget("etbCurrentTarget", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1352, 1.0, -10000.0, 10000.0, "%"), +etbCurrentAdjustedTarget("etbCurrentAdjustedTarget", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1356, 1.0, -10000.0, 10000.0, "%"), +etbDutyRateOfChange("ETB duty rate of change", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1364, 1.0, 0.0, 25.0, "per"), +etbDutyAverage("ETB average duty", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1368, 1.0, -20.0, 50.0, "per"), +etbTpsErrorCounter("ETB TPS error counter", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1372, 1.0, 0.0, 3.0, "count"), +etbPpsErrorCounter("ETB pedal error counter", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1374, 1.0, 0.0, 3.0, "count"), +etbErrorCode("etbErrorCode", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1376, 1.0, -1.0, -1.0, ""), +alignmentFill_at_49("need 4 byte alignment", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1377, 1.0, -20.0, 100.0, "units"), +jamTimer("ETB jam timer", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1378, 0.01, 0.0, 100.0, "sec"), +faultCode("WBO: Fault code", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1380, 1.0, -1.0, -1.0, ""), +heaterDuty("WBO: Heater duty", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1381, 1.0, 0.0, 100.0, "%"), +pumpDuty("WBO: Pump duty", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1382, 1.0, 0.0, 100.0, "%"), +alignmentFill_at_3("need 4 byte alignment", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1383, 1.0, -20.0, 100.0, "units"), +tempC("WBO: Temperature", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1384, 1.0, 500.0, 1000.0, "C"), +nernstVoltage("WBO: Nernst Voltage", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1386, 0.001, 0.0, 1.0, "V"), +esr("WBO: ESR", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1388, 1.0, 0.0, 10000.0, "ohm"), +alignmentFill_at_10("need 4 byte alignment", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1390, 1.0, -20.0, 100.0, "units"), +dcOutput0("DC: output0", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1392, 1.0, 0.0, 10.0, "per"), +isEnabled0_int("DC: en0", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1396, 1.0, 0.0, 10.0, "per"), +alignmentFill_at_5("need 4 byte alignment", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1397, 1.0, -20.0, 100.0, "units"), +value0("ETB: SENT value0", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1404, 1.0, 0.0, 3.0, "value"), +value1("ETB: SENT value1", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1406, 1.0, 0.0, 3.0, "value"), +errorRate("ETB: SENT error rate", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1408, 1.0, 0.0, 3.0, "ratio"), +vvtTarget("vvtTarget", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1412, 0.1, -90.0, 90.0, "deg"), +vvtOutput("vvtOutput", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1414, 0.5, 100.0, 1.0, "%"), +alignmentFill_at_3("need 4 byte alignment", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1415, 1.0, -20.0, 100.0, "units"), +lambdaTimeSinceGood("lambdaTimeSinceGood", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1420, 0.01, 0.0, 1.0, "sec"), +alignmentFill_at_6("need 4 byte alignment", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1422, 1.0, -20.0, 100.0, "units"), diff --git a/firmware/console/binary/generated/total_live_data_generated.h b/firmware/console/binary/generated/total_live_data_generated.h index 193307086a..f43c1a1498 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 1416 \ No newline at end of file +#define TS_TOTAL_OUTPUT_SIZE 1424 \ No newline at end of file diff --git a/firmware/controllers/actuators/idle_state_generated.h b/firmware/controllers/actuators/idle_state_generated.h index 41a1a17854..9547613ace 100644 --- a/firmware/controllers/actuators/idle_state_generated.h +++ b/firmware/controllers/actuators/idle_state_generated.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool config_definition_base.jar based on (unknown script) controllers/actuators/idle_state.txt Wed Sep 27 01:12:03 UTC 2023 +// this section was generated automatically by rusEFI tool config_definition_base.jar based on (unknown script) controllers/actuators/idle_state.txt Thu Sep 28 13:44:07 UTC 2023 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -10,8 +10,8 @@ struct idle_state_s { */ idle_state_e idleState = (idle_state_e)0; /** - * "idle: current position - * that's current position with CLT and IAT corrections" + * @@GAUGE_NAME_IAC@@ + % * offset 4 */ percent_t currentIdlePosition = (percent_t)0; @@ -22,15 +22,20 @@ struct idle_state_s { */ percent_t baseIdlePosition = (percent_t)0; /** - * idle: iacByTpsTaper portion + * Idle: Closed loop * offset 12 */ + percent_t idleClosedLoop = (percent_t)0; + /** + * idle: iacByTpsTaper portion + * offset 16 + */ percent_t iacByTpsTaper = (percent_t)0; /** * idle: throttlePedalUpState * true in IDLE throttle pedal state, false if driver is touching the pedal * todo: better name for this field? - * offset 16 + * offset 20 */ int throttlePedalUpState = (int)0; /** @@ -39,133 +44,138 @@ struct idle_state_s { * The throttle pedal can be pressed for a long time, making the PID data obsolete (thus the reset is required). * We set 'mightResetPid' to true only if PID was actually used (i.e. idlePid.getOutput() was called) to save some CPU resources. * See automaticIdleController(). - offset 20 bit 0 */ + offset 24 bit 0 */ bool mightResetPid : 1 {}; /** * Idle: shouldResetPid - offset 20 bit 1 */ + offset 24 bit 1 */ bool shouldResetPid : 1 {}; /** * Idle: wasResetPid * This is needed to slowly turn on the PID back after it was reset. - offset 20 bit 2 */ + offset 24 bit 2 */ bool wasResetPid : 1 {}; /** * Idle: mustResetPid * This is used when the PID configuration is changed, to guarantee the reset - offset 20 bit 3 */ + offset 24 bit 3 */ bool mustResetPid : 1 {}; /** * Idle: cranking - offset 20 bit 4 */ + offset 24 bit 4 */ bool isCranking : 1 {}; /** - offset 20 bit 5 */ + offset 24 bit 5 */ bool isIacTableForCoasting : 1 {}; /** - offset 20 bit 6 */ + offset 24 bit 6 */ bool notIdling : 1 {}; /** * Idle: reset - offset 20 bit 7 */ + offset 24 bit 7 */ bool needReset : 1 {}; /** * Idle: dead zone - offset 20 bit 8 */ + offset 24 bit 8 */ bool isInDeadZone : 1 {}; /** - offset 20 bit 9 */ + offset 24 bit 9 */ bool isBlipping : 1 {}; /** - offset 20 bit 10 */ + offset 24 bit 10 */ bool useClosedLoop : 1 {}; /** - offset 20 bit 11 */ + offset 24 bit 11 */ bool badTps : 1 {}; /** - offset 20 bit 12 */ + offset 24 bit 12 */ bool looksLikeRunning : 1 {}; /** - offset 20 bit 13 */ + offset 24 bit 13 */ bool looksLikeCoasting : 1 {}; /** - offset 20 bit 14 */ + offset 24 bit 14 */ bool looksLikeCrankToIdle : 1 {}; /** * Idle: coasting - offset 20 bit 15 */ + offset 24 bit 15 */ bool isIdleCoasting : 1 {}; /** * Idle: Closed loop active - offset 20 bit 16 */ + offset 24 bit 16 */ bool isIdleClosedLoop : 1 {}; /** - offset 20 bit 17 */ - bool unusedBit_22_17 : 1 {}; + offset 24 bit 17 */ + bool unusedBit_23_17 : 1 {}; /** - offset 20 bit 18 */ - bool unusedBit_22_18 : 1 {}; + offset 24 bit 18 */ + bool unusedBit_23_18 : 1 {}; /** - offset 20 bit 19 */ - bool unusedBit_22_19 : 1 {}; + offset 24 bit 19 */ + bool unusedBit_23_19 : 1 {}; /** - offset 20 bit 20 */ - bool unusedBit_22_20 : 1 {}; + offset 24 bit 20 */ + bool unusedBit_23_20 : 1 {}; /** - offset 20 bit 21 */ - bool unusedBit_22_21 : 1 {}; + offset 24 bit 21 */ + bool unusedBit_23_21 : 1 {}; /** - offset 20 bit 22 */ - bool unusedBit_22_22 : 1 {}; + offset 24 bit 22 */ + bool unusedBit_23_22 : 1 {}; /** - offset 20 bit 23 */ - bool unusedBit_22_23 : 1 {}; + offset 24 bit 23 */ + bool unusedBit_23_23 : 1 {}; /** - offset 20 bit 24 */ - bool unusedBit_22_24 : 1 {}; + offset 24 bit 24 */ + bool unusedBit_23_24 : 1 {}; /** - offset 20 bit 25 */ - bool unusedBit_22_25 : 1 {}; + offset 24 bit 25 */ + bool unusedBit_23_25 : 1 {}; /** - offset 20 bit 26 */ - bool unusedBit_22_26 : 1 {}; + offset 24 bit 26 */ + bool unusedBit_23_26 : 1 {}; /** - offset 20 bit 27 */ - bool unusedBit_22_27 : 1 {}; + offset 24 bit 27 */ + bool unusedBit_23_27 : 1 {}; /** - offset 20 bit 28 */ - bool unusedBit_22_28 : 1 {}; + offset 24 bit 28 */ + bool unusedBit_23_28 : 1 {}; /** - offset 20 bit 29 */ - bool unusedBit_22_29 : 1 {}; + offset 24 bit 29 */ + bool unusedBit_23_29 : 1 {}; /** - offset 20 bit 30 */ - bool unusedBit_22_30 : 1 {}; + offset 24 bit 30 */ + bool unusedBit_23_30 : 1 {}; /** - offset 20 bit 31 */ - bool unusedBit_22_31 : 1 {}; + offset 24 bit 31 */ + bool unusedBit_23_31 : 1 {}; /** - * idle: target by CLT - * offset 24 + * Idle: Target RPM + * offset 28 + */ + int idleTarget = (int)0; + /** + * Idle: Target RPM base + * offset 32 */ int targetRpmByClt = (int)0; /** - * idle: A/C bump - * offset 28 + * Idle: Target A/C bump + * offset 36 */ int targetRpmAcBump = (int)0; /** * idle: iacByRpmTaper portion - * offset 32 + * offset 40 */ percent_t iacByRpmTaper = (percent_t)0; /** * idle: Lua Adder - * offset 36 + * offset 44 */ percent_t luaAdd = (percent_t)0; }; -static_assert(sizeof(idle_state_s) == 40); +static_assert(sizeof(idle_state_s) == 48); // end -// this section was generated automatically by rusEFI tool config_definition_base.jar based on (unknown script) controllers/actuators/idle_state.txt Wed Sep 27 01:12:03 UTC 2023 +// this section was generated automatically by rusEFI tool config_definition_base.jar based on (unknown script) controllers/actuators/idle_state.txt Thu Sep 28 13:44:07 UTC 2023 diff --git a/firmware/controllers/generated/rusefi_generated.h b/firmware/controllers/generated/rusefi_generated.h index 00ce5ee684..1ec4b201b4 100644 --- a/firmware/controllers/generated/rusefi_generated.h +++ b/firmware/controllers/generated/rusefi_generated.h @@ -1085,7 +1085,7 @@ #define SentEtbType_NONE 0 #define show_Frankenso_presets true #define show_test_presets true -#define SIGNATURE_HASH 771690048 +#define SIGNATURE_HASH 3863213240 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define spi_device_e_auto_enum 0="SPI_NONE",1="SPI_DEVICE_1",2="SPI_DEVICE_2",3="SPI_DEVICE_3",4="SPI_DEVICE_4" #define spi_device_e_SPI_DEVICE_1 1 @@ -1378,14 +1378,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.09.28.f407-discovery.771690048" +#define TS_SIGNATURE "rusEFI master.2023.09.28.f407-discovery.3863213240" #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 1416 +#define TS_TOTAL_OUTPUT_SIZE 1424 #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_48way.h b/firmware/controllers/generated/signature_48way.h index 641da9ee12..b3388f9d83 100644 --- a/firmware/controllers/generated/signature_48way.h +++ b/firmware/controllers/generated/signature_48way.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 3393000641 -#define TS_SIGNATURE "rusEFI master.2023.09.28.48way.3393000641" +#define SIGNATURE_HASH 25292345 +#define TS_SIGNATURE "rusEFI master.2023.09.28.48way.25292345" diff --git a/firmware/controllers/generated/signature_alphax-2chan.h b/firmware/controllers/generated/signature_alphax-2chan.h index fb131f80e2..77e25c2063 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 4270991484 -#define TS_SIGNATURE "rusEFI master.2023.09.28.alphax-2chan.4270991484" +#define SIGNATURE_HASH 892260996 +#define TS_SIGNATURE "rusEFI master.2023.09.28.alphax-2chan.892260996" diff --git a/firmware/controllers/generated/signature_alphax-4chan.h b/firmware/controllers/generated/signature_alphax-4chan.h index 5e5a1306ce..84b67f252a 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 1188043398 -#define TS_SIGNATURE "rusEFI master.2023.09.28.alphax-4chan.1188043398" +#define SIGNATURE_HASH 2372722814 +#define TS_SIGNATURE "rusEFI master.2023.09.28.alphax-4chan.2372722814" diff --git a/firmware/controllers/generated/signature_alphax-4chan_f7.h b/firmware/controllers/generated/signature_alphax-4chan_f7.h index 053fe62eb3..d4de5041df 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 1188043398 -#define TS_SIGNATURE "rusEFI master.2023.09.28.alphax-4chan_f7.1188043398" +#define SIGNATURE_HASH 2372722814 +#define TS_SIGNATURE "rusEFI master.2023.09.28.alphax-4chan_f7.2372722814" diff --git a/firmware/controllers/generated/signature_alphax-8chan-revA.h b/firmware/controllers/generated/signature_alphax-8chan-revA.h index 10ca851114..ee5545ba85 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 3205775992 -#define TS_SIGNATURE "rusEFI master.2023.09.28.alphax-8chan-revA.3205775992" +#define SIGNATURE_HASH 1957214336 +#define TS_SIGNATURE "rusEFI master.2023.09.28.alphax-8chan-revA.1957214336" diff --git a/firmware/controllers/generated/signature_alphax-8chan.h b/firmware/controllers/generated/signature_alphax-8chan.h index 0c59ce4d2d..5e0a3887f0 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 2210128883 -#define TS_SIGNATURE "rusEFI master.2023.09.28.alphax-8chan.2210128883" +#define SIGNATURE_HASH 1208424715 +#define TS_SIGNATURE "rusEFI master.2023.09.28.alphax-8chan.1208424715" diff --git a/firmware/controllers/generated/signature_alphax-8chan_f7.h b/firmware/controllers/generated/signature_alphax-8chan_f7.h index 19f9132660..17c8953d55 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 2210128883 -#define TS_SIGNATURE "rusEFI master.2023.09.28.alphax-8chan_f7.2210128883" +#define SIGNATURE_HASH 1208424715 +#define TS_SIGNATURE "rusEFI master.2023.09.28.alphax-8chan_f7.1208424715" diff --git a/firmware/controllers/generated/signature_atlas.h b/firmware/controllers/generated/signature_atlas.h index 3f8706640a..408370de47 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 2452449628 -#define TS_SIGNATURE "rusEFI master.2023.09.28.atlas.2452449628" +#define SIGNATURE_HASH 1502712740 +#define TS_SIGNATURE "rusEFI master.2023.09.28.atlas.1502712740" diff --git a/firmware/controllers/generated/signature_core8.h b/firmware/controllers/generated/signature_core8.h index 7714296e70..e8ca37a7bd 100644 --- a/firmware/controllers/generated/signature_core8.h +++ b/firmware/controllers/generated/signature_core8.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 3066073549 -#define TS_SIGNATURE "rusEFI master.2023.09.28.core8.3066073549" +#define SIGNATURE_HASH 2105305909 +#define TS_SIGNATURE "rusEFI master.2023.09.28.core8.2105305909" diff --git a/firmware/controllers/generated/signature_cypress.h b/firmware/controllers/generated/signature_cypress.h index d1c2955a61..7920998156 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 2397543547 -#define TS_SIGNATURE "rusEFI master.2023.09.28.cypress.2397543547" +#define SIGNATURE_HASH 1163617923 +#define TS_SIGNATURE "rusEFI master.2023.09.28.cypress.1163617923" diff --git a/firmware/controllers/generated/signature_f407-discovery.h b/firmware/controllers/generated/signature_f407-discovery.h index 988770dc6a..846a559b7b 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 771690048 -#define TS_SIGNATURE "rusEFI master.2023.09.28.f407-discovery.771690048" +#define SIGNATURE_HASH 3863213240 +#define TS_SIGNATURE "rusEFI master.2023.09.28.f407-discovery.3863213240" diff --git a/firmware/controllers/generated/signature_f429-discovery.h b/firmware/controllers/generated/signature_f429-discovery.h index 731550f816..ba0e66ba96 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 2397543547 -#define TS_SIGNATURE "rusEFI master.2023.09.28.f429-discovery.2397543547" +#define SIGNATURE_HASH 1163617923 +#define TS_SIGNATURE "rusEFI master.2023.09.28.f429-discovery.1163617923" diff --git a/firmware/controllers/generated/signature_frankenso_na6.h b/firmware/controllers/generated/signature_frankenso_na6.h index d83dbbc947..45e563a08b 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 2897575089 -#define TS_SIGNATURE "rusEFI master.2023.09.28.frankenso_na6.2897575089" +#define SIGNATURE_HASH 1728677449 +#define TS_SIGNATURE "rusEFI master.2023.09.28.frankenso_na6.1728677449" diff --git a/firmware/controllers/generated/signature_harley81.h b/firmware/controllers/generated/signature_harley81.h index db28156978..845cd9d324 100644 --- a/firmware/controllers/generated/signature_harley81.h +++ b/firmware/controllers/generated/signature_harley81.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 1294871585 -#define TS_SIGNATURE "rusEFI master.2023.09.28.harley81.1294871585" +#define SIGNATURE_HASH 2257770201 +#define TS_SIGNATURE "rusEFI master.2023.09.28.harley81.2257770201" diff --git a/firmware/controllers/generated/signature_hellen-112-17.h b/firmware/controllers/generated/signature_hellen-112-17.h index e83e64e41a..a70e08516e 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 92399819 -#define TS_SIGNATURE "rusEFI master.2023.09.28.hellen-112-17.92399819" +#define SIGNATURE_HASH 3460108851 +#define TS_SIGNATURE "rusEFI master.2023.09.28.hellen-112-17.3460108851" diff --git a/firmware/controllers/generated/signature_hellen-gm-e67.h b/firmware/controllers/generated/signature_hellen-gm-e67.h index 3c70ba8f4b..5fcf8cd825 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 1041574539 -#define TS_SIGNATURE "rusEFI master.2023.09.28.hellen-gm-e67.1041574539" +#define SIGNATURE_HASH 4121546867 +#define TS_SIGNATURE "rusEFI master.2023.09.28.hellen-gm-e67.4121546867" diff --git a/firmware/controllers/generated/signature_hellen-honda-k.h b/firmware/controllers/generated/signature_hellen-honda-k.h index c1cbb87d62..04fadc70af 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 452143531 -#define TS_SIGNATURE "rusEFI master.2023.09.28.hellen-honda-k.452143531" +#define SIGNATURE_HASH 3511669587 +#define TS_SIGNATURE "rusEFI master.2023.09.28.hellen-honda-k.3511669587" diff --git a/firmware/controllers/generated/signature_hellen-nb1.h b/firmware/controllers/generated/signature_hellen-nb1.h index 2e11736305..997871a2d8 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 3777335660 -#define TS_SIGNATURE "rusEFI master.2023.09.28.hellen-nb1.3777335660" +#define SIGNATURE_HASH 714697620 +#define TS_SIGNATURE "rusEFI master.2023.09.28.hellen-nb1.714697620" diff --git a/firmware/controllers/generated/signature_hellen121nissan.h b/firmware/controllers/generated/signature_hellen121nissan.h index 14cefafbb8..c9b320becd 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 399604303 -#define TS_SIGNATURE "rusEFI master.2023.09.28.hellen121nissan.399604303" +#define SIGNATURE_HASH 3698163895 +#define TS_SIGNATURE "rusEFI master.2023.09.28.hellen121nissan.3698163895" diff --git a/firmware/controllers/generated/signature_hellen121vag.h b/firmware/controllers/generated/signature_hellen121vag.h index 36195c7725..5206f6f135 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 446268344 -#define TS_SIGNATURE "rusEFI master.2023.09.28.hellen121vag.446268344" +#define SIGNATURE_HASH 3508894016 +#define TS_SIGNATURE "rusEFI master.2023.09.28.hellen121vag.3508894016" diff --git a/firmware/controllers/generated/signature_hellen128.h b/firmware/controllers/generated/signature_hellen128.h index 1143ace315..d0671fbf36 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 1093999377 -#define TS_SIGNATURE "rusEFI master.2023.09.28.hellen128.1093999377" +#define SIGNATURE_HASH 2324292073 +#define TS_SIGNATURE "rusEFI master.2023.09.28.hellen128.2324292073" diff --git a/firmware/controllers/generated/signature_hellen154hyundai.h b/firmware/controllers/generated/signature_hellen154hyundai.h index ad4acce40a..e2a6aa5268 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 1922303734 -#define TS_SIGNATURE "rusEFI master.2023.09.28.hellen154hyundai.1922303734" +#define SIGNATURE_HASH 3106470926 +#define TS_SIGNATURE "rusEFI master.2023.09.28.hellen154hyundai.3106470926" diff --git a/firmware/controllers/generated/signature_hellen72.h b/firmware/controllers/generated/signature_hellen72.h index 839bf7135c..0ef6891974 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 3802372694 -#define TS_SIGNATURE "rusEFI master.2023.09.28.hellen72.3802372694" +#define SIGNATURE_HASH 689922222 +#define TS_SIGNATURE "rusEFI master.2023.09.28.hellen72.689922222" diff --git a/firmware/controllers/generated/signature_hellen81.h b/firmware/controllers/generated/signature_hellen81.h index af7cfe8470..2301feb0fa 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 2042042518 -#define TS_SIGNATURE "rusEFI master.2023.09.28.hellen81.2042042518" +#define SIGNATURE_HASH 2987123310 +#define TS_SIGNATURE "rusEFI master.2023.09.28.hellen81.2987123310" diff --git a/firmware/controllers/generated/signature_hellen88bmw.h b/firmware/controllers/generated/signature_hellen88bmw.h index 0d8dc4cbc6..31e3d4ed76 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 1623331263 -#define TS_SIGNATURE "rusEFI master.2023.09.28.hellen88bmw.1623331263" +#define SIGNATURE_HASH 2877221703 +#define TS_SIGNATURE "rusEFI master.2023.09.28.hellen88bmw.2877221703" diff --git a/firmware/controllers/generated/signature_hellenNA6.h b/firmware/controllers/generated/signature_hellenNA6.h index aa1938eb80..1ce4ee139c 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 1709834335 -#define TS_SIGNATURE "rusEFI master.2023.09.28.hellenNA6.1709834335" +#define SIGNATURE_HASH 2924935847 +#define TS_SIGNATURE "rusEFI master.2023.09.28.hellenNA6.2924935847" diff --git a/firmware/controllers/generated/signature_hellenNA8_96.h b/firmware/controllers/generated/signature_hellenNA8_96.h index 06a51df88b..6583f301ca 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 55251088 -#define TS_SIGNATURE "rusEFI master.2023.09.28.hellenNA8_96.55251088" +#define SIGNATURE_HASH 3371690600 +#define TS_SIGNATURE "rusEFI master.2023.09.28.hellenNA8_96.3371690600" diff --git a/firmware/controllers/generated/signature_kin.h b/firmware/controllers/generated/signature_kin.h index 4c629c1487..9487ff4412 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 3426114517 -#define TS_SIGNATURE "rusEFI master.2023.09.28.kin.3426114517" +#define SIGNATURE_HASH 126525741 +#define TS_SIGNATURE "rusEFI master.2023.09.28.kin.126525741" diff --git a/firmware/controllers/generated/signature_m74_9.h b/firmware/controllers/generated/signature_m74_9.h index f6652b220e..441a034bbe 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 2497478773 -#define TS_SIGNATURE "rusEFI master.2023.09.28.m74_9.2497478773" +#define SIGNATURE_HASH 1600158349 +#define TS_SIGNATURE "rusEFI master.2023.09.28.m74_9.1600158349" diff --git a/firmware/controllers/generated/signature_mre_f4.h b/firmware/controllers/generated/signature_mre_f4.h index baf6d21a2e..43267291a4 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 2911532539 -#define TS_SIGNATURE "rusEFI master.2023.09.28.mre_f4.2911532539" +#define SIGNATURE_HASH 1714851587 +#define TS_SIGNATURE "rusEFI master.2023.09.28.mre_f4.1714851587" diff --git a/firmware/controllers/generated/signature_mre_f7.h b/firmware/controllers/generated/signature_mre_f7.h index 1d896e2b5d..ba83f20aeb 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 2911532539 -#define TS_SIGNATURE "rusEFI master.2023.09.28.mre_f7.2911532539" +#define SIGNATURE_HASH 1714851587 +#define TS_SIGNATURE "rusEFI master.2023.09.28.mre_f7.1714851587" diff --git a/firmware/controllers/generated/signature_nucleo_f429.h b/firmware/controllers/generated/signature_nucleo_f429.h index 642e784975..427d589d1a 100644 --- a/firmware/controllers/generated/signature_nucleo_f429.h +++ b/firmware/controllers/generated/signature_nucleo_f429.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 2397543547 -#define TS_SIGNATURE "rusEFI master.2023.09.28.nucleo_f429.2397543547" +#define SIGNATURE_HASH 1163617923 +#define TS_SIGNATURE "rusEFI master.2023.09.28.nucleo_f429.1163617923" diff --git a/firmware/controllers/generated/signature_nucleo_f767.h b/firmware/controllers/generated/signature_nucleo_f767.h index a877cb4f40..a98eb5815a 100644 --- a/firmware/controllers/generated/signature_nucleo_f767.h +++ b/firmware/controllers/generated/signature_nucleo_f767.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 2397543547 -#define TS_SIGNATURE "rusEFI master.2023.09.28.nucleo_f767.2397543547" +#define SIGNATURE_HASH 1163617923 +#define TS_SIGNATURE "rusEFI master.2023.09.28.nucleo_f767.1163617923" diff --git a/firmware/controllers/generated/signature_nucleo_h743.h b/firmware/controllers/generated/signature_nucleo_h743.h index 5c44aa72c9..6c9410f147 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 2397543547 -#define TS_SIGNATURE "rusEFI master.2023.09.28.nucleo_h743.2397543547" +#define SIGNATURE_HASH 1163617923 +#define TS_SIGNATURE "rusEFI master.2023.09.28.nucleo_h743.1163617923" diff --git a/firmware/controllers/generated/signature_prometheus_405.h b/firmware/controllers/generated/signature_prometheus_405.h index fa02f19290..b45b02ddcf 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 3195228651 -#define TS_SIGNATURE "rusEFI master.2023.09.28.prometheus_405.3195228651" +#define SIGNATURE_HASH 1976544019 +#define TS_SIGNATURE "rusEFI master.2023.09.28.prometheus_405.1976544019" diff --git a/firmware/controllers/generated/signature_prometheus_469.h b/firmware/controllers/generated/signature_prometheus_469.h index 3bea389ece..9aea9914c6 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 3195228651 -#define TS_SIGNATURE "rusEFI master.2023.09.28.prometheus_469.3195228651" +#define SIGNATURE_HASH 1976544019 +#define TS_SIGNATURE "rusEFI master.2023.09.28.prometheus_469.1976544019" diff --git a/firmware/controllers/generated/signature_proteus_f4.h b/firmware/controllers/generated/signature_proteus_f4.h index 2bf9ab2622..9723793d16 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 2398380545 -#define TS_SIGNATURE "rusEFI master.2023.09.28.proteus_f4.2398380545" +#define SIGNATURE_HASH 1162385657 +#define TS_SIGNATURE "rusEFI master.2023.09.28.proteus_f4.1162385657" diff --git a/firmware/controllers/generated/signature_proteus_f7.h b/firmware/controllers/generated/signature_proteus_f7.h index 7bf0d9627b..2d9583fa5d 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 2398380545 -#define TS_SIGNATURE "rusEFI master.2023.09.28.proteus_f7.2398380545" +#define SIGNATURE_HASH 1162385657 +#define TS_SIGNATURE "rusEFI master.2023.09.28.proteus_f7.1162385657" diff --git a/firmware/controllers/generated/signature_proteus_h7.h b/firmware/controllers/generated/signature_proteus_h7.h index 2136243c77..e8082151d5 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 2398380545 -#define TS_SIGNATURE "rusEFI master.2023.09.28.proteus_h7.2398380545" +#define SIGNATURE_HASH 1162385657 +#define TS_SIGNATURE "rusEFI master.2023.09.28.proteus_h7.1162385657" diff --git a/firmware/controllers/generated/signature_s105.h b/firmware/controllers/generated/signature_s105.h index 21171d982b..31fd1a7139 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 3938220327 -#define TS_SIGNATURE "rusEFI master.2023.09.28.s105.3938220327" +#define SIGNATURE_HASH 553681887 +#define TS_SIGNATURE "rusEFI master.2023.09.28.s105.553681887" diff --git a/firmware/controllers/generated/signature_small-can.h b/firmware/controllers/generated/signature_small-can.h index 87e5e3d0d0..775c4e8c73 100644 --- a/firmware/controllers/generated/signature_small-can.h +++ b/firmware/controllers/generated/signature_small-can.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 1139021554 -#define TS_SIGNATURE "rusEFI master.2023.09.28.small-can.1139021554" +#define SIGNATURE_HASH 2287528970 +#define TS_SIGNATURE "rusEFI master.2023.09.28.small-can.2287528970" diff --git a/firmware/controllers/generated/signature_subaru_eg33_f7.h b/firmware/controllers/generated/signature_subaru_eg33_f7.h index 07157a17ea..f2f58d7f45 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 2305448812 -#define TS_SIGNATURE "rusEFI master.2023.09.28.subaru_eg33_f7.2305448812" +#define SIGNATURE_HASH 1121362324 +#define TS_SIGNATURE "rusEFI master.2023.09.28.subaru_eg33_f7.1121362324" diff --git a/firmware/controllers/generated/signature_t-b-g.h b/firmware/controllers/generated/signature_t-b-g.h index 6bb2249345..609170e556 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 2397543547 -#define TS_SIGNATURE "rusEFI master.2023.09.28.t-b-g.2397543547" +#define SIGNATURE_HASH 1163617923 +#define TS_SIGNATURE "rusEFI master.2023.09.28.t-b-g.1163617923" diff --git a/firmware/controllers/generated/signature_tdg-pdm8.h b/firmware/controllers/generated/signature_tdg-pdm8.h index a42ea51009..26801dd0ed 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 71938137 -#define TS_SIGNATURE "rusEFI master.2023.09.28.tdg-pdm8.71938137" +#define SIGNATURE_HASH 3488959137 +#define TS_SIGNATURE "rusEFI master.2023.09.28.tdg-pdm8.3488959137" diff --git a/firmware/tunerstudio/generated/rusefi.ini b/firmware/tunerstudio/generated/rusefi.ini index 72e9dfd8fe..4cfee4e1ed 100644 --- a/firmware/tunerstudio/generated/rusefi.ini +++ b/firmware/tunerstudio/generated/rusefi.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.09.28.f407-discovery.771690048" + signature = "rusEFI master.2023.09.28.f407-discovery.3863213240" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.09.28.f407-discovery.771690048" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.09.28.f407-discovery.3863213240" ; 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 Thu Sep 28 03:25:51 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Thu Sep 28 13:46:27 UTC 2023 pageSize = 23664 page = 1 @@ -2320,7 +2320,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23654, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1416 + ochBlockSize = 1424 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3039,69 +3039,71 @@ wallFuel = scalar, F32, 1276, "", 1, 0 idleState = bits, S32, 1280, [0:2], "not important" currentIdlePosition = scalar, F32, 1284 baseIdlePosition = scalar, F32, 1288 -iacByTpsTaper = scalar, F32, 1292 -throttlePedalUpState = scalar, S32, 1296, "", 1, 0 -mightResetPid = bits, U32, 1300, [0:0] -shouldResetPid = bits, U32, 1300, [1:1] -wasResetPid = bits, U32, 1300, [2:2] -mustResetPid = bits, U32, 1300, [3:3] -isCranking = bits, U32, 1300, [4:4] -isIacTableForCoasting = bits, U32, 1300, [5:5] -notIdling = bits, U32, 1300, [6:6] -needReset = bits, U32, 1300, [7:7] -isInDeadZone = bits, U32, 1300, [8:8] -isBlipping = bits, U32, 1300, [9:9] -useClosedLoop = bits, U32, 1300, [10:10] -badTps = bits, U32, 1300, [11:11] -looksLikeRunning = bits, U32, 1300, [12:12] -looksLikeCoasting = bits, U32, 1300, [13:13] -looksLikeCrankToIdle = bits, U32, 1300, [14:14] -isIdleCoasting = bits, U32, 1300, [15:15] -isIdleClosedLoop = bits, U32, 1300, [16:16] -targetRpmByClt = scalar, S32, 1304, "", 1, 0 -targetRpmAcBump = scalar, S32, 1308, "", 1, 0 -iacByRpmTaper = scalar, F32, 1312 -luaAdd = scalar, F32, 1316 -; total TS size = 1320 -idlePosition = scalar, F32, 1320, "per", 1,0 -trim = scalar, F32, 1324, "", 1, 0 -luaAdjustment = scalar, F32, 1328, "per", 1,0 -m_wastegatePosition = scalar, F32, 1332, "per", 1,0 -etbFeedForward = scalar, F32, 1336 -etbIntegralError = scalar, F32, 1340, "", 1, 0 -etbCurrentTarget = scalar, F32, 1344, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1348, "%", 1, 0 -etbRevLimitActive = bits, U32, 1352, [0:0] -jamDetected = bits, U32, 1352, [1:1] -etbDutyRateOfChange = scalar, F32, 1356, "per", 1,0 -etbDutyAverage = scalar, F32, 1360, "per", 1,0 -etbTpsErrorCounter = scalar, U16, 1364, "count", 1,0 -etbPpsErrorCounter = scalar, U16, 1366, "count", 1,0 -etbErrorCode = scalar, S08, 1368, "", 1, 0 -jamTimer = scalar, U16, 1370, "sec", 0.01, 0 -; total TS size = 1372 -faultCode = scalar, U08, 1372, "", 1, 0 -heaterDuty = scalar, U08, 1373, "%", 1, 0 -pumpDuty = scalar, U08, 1374, "%", 1, 0 -tempC = scalar, U16, 1376, "C", 1, 0 -nernstVoltage = scalar, U16, 1378, "V", 0.001, 0 -esr = scalar, U16, 1380, "ohm", 1, 0 -; total TS size = 1384 -dcOutput0 = scalar, F32, 1384, "per", 1,0 -isEnabled0_int = scalar, U08, 1388, "per", 1,0 -isEnabled0 = bits, U32, 1392, [0:0] -; total TS size = 1396 -value0 = scalar, U16, 1396, "value", 1,0 -value1 = scalar, U16, 1398, "value", 1,0 -errorRate = scalar, F32, 1400, "ratio", 1,0 +idleClosedLoop = scalar, F32, 1292 +iacByTpsTaper = scalar, F32, 1296 +throttlePedalUpState = scalar, S32, 1300, "", 1, 0 +mightResetPid = bits, U32, 1304, [0:0] +shouldResetPid = bits, U32, 1304, [1:1] +wasResetPid = bits, U32, 1304, [2:2] +mustResetPid = bits, U32, 1304, [3:3] +isCranking = bits, U32, 1304, [4:4] +isIacTableForCoasting = bits, U32, 1304, [5:5] +notIdling = bits, U32, 1304, [6:6] +needReset = bits, U32, 1304, [7:7] +isInDeadZone = bits, U32, 1304, [8:8] +isBlipping = bits, U32, 1304, [9:9] +useClosedLoop = bits, U32, 1304, [10:10] +badTps = bits, U32, 1304, [11:11] +looksLikeRunning = bits, U32, 1304, [12:12] +looksLikeCoasting = bits, U32, 1304, [13:13] +looksLikeCrankToIdle = bits, U32, 1304, [14:14] +isIdleCoasting = bits, U32, 1304, [15:15] +isIdleClosedLoop = bits, U32, 1304, [16:16] +idleTarget = scalar, S32, 1308, "", 1, 0 +targetRpmByClt = scalar, S32, 1312, "", 1, 0 +targetRpmAcBump = scalar, S32, 1316, "", 1, 0 +iacByRpmTaper = scalar, F32, 1320 +luaAdd = scalar, F32, 1324 +; total TS size = 1328 +idlePosition = scalar, F32, 1328, "per", 1,0 +trim = scalar, F32, 1332, "", 1, 0 +luaAdjustment = scalar, F32, 1336, "per", 1,0 +m_wastegatePosition = scalar, F32, 1340, "per", 1,0 +etbFeedForward = scalar, F32, 1344 +etbIntegralError = scalar, F32, 1348, "", 1, 0 +etbCurrentTarget = scalar, F32, 1352, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1356, "%", 1, 0 +etbRevLimitActive = bits, U32, 1360, [0:0] +jamDetected = bits, U32, 1360, [1:1] +etbDutyRateOfChange = scalar, F32, 1364, "per", 1,0 +etbDutyAverage = scalar, F32, 1368, "per", 1,0 +etbTpsErrorCounter = scalar, U16, 1372, "count", 1,0 +etbPpsErrorCounter = scalar, U16, 1374, "count", 1,0 +etbErrorCode = scalar, S08, 1376, "", 1, 0 +jamTimer = scalar, U16, 1378, "sec", 0.01, 0 +; total TS size = 1380 +faultCode = scalar, U08, 1380, "", 1, 0 +heaterDuty = scalar, U08, 1381, "%", 1, 0 +pumpDuty = scalar, U08, 1382, "%", 1, 0 +tempC = scalar, U16, 1384, "C", 1, 0 +nernstVoltage = scalar, U16, 1386, "V", 0.001, 0 +esr = scalar, U16, 1388, "ohm", 1, 0 +; total TS size = 1392 +dcOutput0 = scalar, F32, 1392, "per", 1,0 +isEnabled0_int = scalar, U08, 1396, "per", 1,0 +isEnabled0 = bits, U32, 1400, [0:0] ; total TS size = 1404 -vvtTarget = scalar, U16, 1404, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1406, "%", 0.5, 0 -; total TS size = 1408 -lambdaCurrentlyGood = bits, U32, 1408, [0:0] -lambdaMonitorCut = bits, U32, 1408, [1:1] -lambdaTimeSinceGood = scalar, U16, 1412, "sec", 0.01, 0 +value0 = scalar, U16, 1404, "value", 1,0 +value1 = scalar, U16, 1406, "value", 1,0 +errorRate = scalar, F32, 1408, "ratio", 1,0 +; total TS size = 1412 +vvtTarget = scalar, U16, 1412, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1414, "%", 0.5, 0 ; total TS size = 1416 +lambdaCurrentlyGood = bits, U32, 1416, [0:0] +lambdaMonitorCut = bits, U32, 1416, [1:1] +lambdaTimeSinceGood = scalar, U16, 1420, "sec", 0.01, 0 +; total TS size = 1424 time = { timeNow } @@ -5173,8 +5175,9 @@ entry = m_hasSynchronizedPhase, "sync: Known Engine Phase", int, "%d" entry = wallFuelCorrection, "fuel wallwetting injection time", float, "%.3f" entry = wallFuel, "Fuel on the wall", float, "%.3f" entry = idleState, "idleState", int, "%d" -entry = currentIdlePosition, "idle: current position", float, "%.3f" +entry = currentIdlePosition, "Idle: Position", float, "%.3f" entry = baseIdlePosition, "idle: base value", float, "%.3f" +entry = idleClosedLoop, "Idle: Closed loop", float, "%.3f" entry = iacByTpsTaper, "idle: iacByTpsTaper portion", float, "%.3f" entry = throttlePedalUpState, "idle: throttlePedalUpState", int, "%d" entry = mightResetPid, "idle: mightResetPid", int, "%d" @@ -5194,8 +5197,9 @@ entry = looksLikeCoasting, "looksLikeCoasting", int, "%d" entry = looksLikeCrankToIdle, "looksLikeCrankToIdle", int, "%d" entry = isIdleCoasting, "Idle: coasting", int, "%d" entry = isIdleClosedLoop, "Idle: Closed loop active", int, "%d" -entry = targetRpmByClt, "idle: target by CLT", int, "%d" -entry = targetRpmAcBump, "idle: A/C bump", int, "%d" +entry = idleTarget, "Idle: Target RPM", int, "%d" +entry = targetRpmByClt, "Idle: Target RPM base", int, "%d" +entry = targetRpmAcBump, "Idle: Target A/C bump", int, "%d" entry = iacByRpmTaper, "idle: iacByRpmTaper portion", float, "%.3f" entry = luaAdd, "idle: Lua Adder", float, "%.3f" entry = idlePosition, "ETB: idlePosition", float, "%.3f" @@ -6105,13 +6109,15 @@ dialog = idle_stateDialog, "idle_state" graphLine = idleState graphLine = currentIdlePosition graphLine = baseIdlePosition - graphLine = iacByTpsTaper + graphLine = idleClosedLoop liveGraph = idle_state_2_Graph, "Graph", South + graphLine = iacByTpsTaper graphLine = throttlePedalUpState + graphLine = idleTarget graphLine = targetRpmByClt + liveGraph = idle_state_3_Graph, "Graph", South graphLine = targetRpmAcBump graphLine = iacByRpmTaper - liveGraph = idle_state_3_Graph, "Graph", South graphLine = luaAdd indicatorPanel = electronic_throttleIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_48way.ini b/firmware/tunerstudio/generated/rusefi_48way.ini index 1c8661d603..c5dcfc384e 100644 --- a/firmware/tunerstudio/generated/rusefi_48way.ini +++ b/firmware/tunerstudio/generated/rusefi_48way.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.09.28.48way.3393000641" + signature = "rusEFI master.2023.09.28.48way.25292345" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.09.28.48way.3393000641" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.09.28.48way.25292345" ; 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","Battery Reference Input (A0)","TPS Reference Input (A1)","CLT Reference Input (A2)","IAT Reference Input (A3)","O2 Reference Input (A4)","INVALID","INVALID","INVALID","MAP Pressure Reference Input (B0)","BARO Pressure Reference Input (B1)","INVALID","INVALID","INVALID","INVALID","Fuel Pressure Reference Input (C4)","Oil Pressure Reference Input (C5)" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Thu Sep 28 03:25:00 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Thu Sep 28 13:45:35 UTC 2023 pageSize = 23664 page = 1 @@ -2320,7 +2320,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23654, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1416 + ochBlockSize = 1424 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3039,69 +3039,71 @@ wallFuel = scalar, F32, 1276, "", 1, 0 idleState = bits, S32, 1280, [0:2], "not important" currentIdlePosition = scalar, F32, 1284 baseIdlePosition = scalar, F32, 1288 -iacByTpsTaper = scalar, F32, 1292 -throttlePedalUpState = scalar, S32, 1296, "", 1, 0 -mightResetPid = bits, U32, 1300, [0:0] -shouldResetPid = bits, U32, 1300, [1:1] -wasResetPid = bits, U32, 1300, [2:2] -mustResetPid = bits, U32, 1300, [3:3] -isCranking = bits, U32, 1300, [4:4] -isIacTableForCoasting = bits, U32, 1300, [5:5] -notIdling = bits, U32, 1300, [6:6] -needReset = bits, U32, 1300, [7:7] -isInDeadZone = bits, U32, 1300, [8:8] -isBlipping = bits, U32, 1300, [9:9] -useClosedLoop = bits, U32, 1300, [10:10] -badTps = bits, U32, 1300, [11:11] -looksLikeRunning = bits, U32, 1300, [12:12] -looksLikeCoasting = bits, U32, 1300, [13:13] -looksLikeCrankToIdle = bits, U32, 1300, [14:14] -isIdleCoasting = bits, U32, 1300, [15:15] -isIdleClosedLoop = bits, U32, 1300, [16:16] -targetRpmByClt = scalar, S32, 1304, "", 1, 0 -targetRpmAcBump = scalar, S32, 1308, "", 1, 0 -iacByRpmTaper = scalar, F32, 1312 -luaAdd = scalar, F32, 1316 -; total TS size = 1320 -idlePosition = scalar, F32, 1320, "per", 1,0 -trim = scalar, F32, 1324, "", 1, 0 -luaAdjustment = scalar, F32, 1328, "per", 1,0 -m_wastegatePosition = scalar, F32, 1332, "per", 1,0 -etbFeedForward = scalar, F32, 1336 -etbIntegralError = scalar, F32, 1340, "", 1, 0 -etbCurrentTarget = scalar, F32, 1344, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1348, "%", 1, 0 -etbRevLimitActive = bits, U32, 1352, [0:0] -jamDetected = bits, U32, 1352, [1:1] -etbDutyRateOfChange = scalar, F32, 1356, "per", 1,0 -etbDutyAverage = scalar, F32, 1360, "per", 1,0 -etbTpsErrorCounter = scalar, U16, 1364, "count", 1,0 -etbPpsErrorCounter = scalar, U16, 1366, "count", 1,0 -etbErrorCode = scalar, S08, 1368, "", 1, 0 -jamTimer = scalar, U16, 1370, "sec", 0.01, 0 -; total TS size = 1372 -faultCode = scalar, U08, 1372, "", 1, 0 -heaterDuty = scalar, U08, 1373, "%", 1, 0 -pumpDuty = scalar, U08, 1374, "%", 1, 0 -tempC = scalar, U16, 1376, "C", 1, 0 -nernstVoltage = scalar, U16, 1378, "V", 0.001, 0 -esr = scalar, U16, 1380, "ohm", 1, 0 -; total TS size = 1384 -dcOutput0 = scalar, F32, 1384, "per", 1,0 -isEnabled0_int = scalar, U08, 1388, "per", 1,0 -isEnabled0 = bits, U32, 1392, [0:0] -; total TS size = 1396 -value0 = scalar, U16, 1396, "value", 1,0 -value1 = scalar, U16, 1398, "value", 1,0 -errorRate = scalar, F32, 1400, "ratio", 1,0 +idleClosedLoop = scalar, F32, 1292 +iacByTpsTaper = scalar, F32, 1296 +throttlePedalUpState = scalar, S32, 1300, "", 1, 0 +mightResetPid = bits, U32, 1304, [0:0] +shouldResetPid = bits, U32, 1304, [1:1] +wasResetPid = bits, U32, 1304, [2:2] +mustResetPid = bits, U32, 1304, [3:3] +isCranking = bits, U32, 1304, [4:4] +isIacTableForCoasting = bits, U32, 1304, [5:5] +notIdling = bits, U32, 1304, [6:6] +needReset = bits, U32, 1304, [7:7] +isInDeadZone = bits, U32, 1304, [8:8] +isBlipping = bits, U32, 1304, [9:9] +useClosedLoop = bits, U32, 1304, [10:10] +badTps = bits, U32, 1304, [11:11] +looksLikeRunning = bits, U32, 1304, [12:12] +looksLikeCoasting = bits, U32, 1304, [13:13] +looksLikeCrankToIdle = bits, U32, 1304, [14:14] +isIdleCoasting = bits, U32, 1304, [15:15] +isIdleClosedLoop = bits, U32, 1304, [16:16] +idleTarget = scalar, S32, 1308, "", 1, 0 +targetRpmByClt = scalar, S32, 1312, "", 1, 0 +targetRpmAcBump = scalar, S32, 1316, "", 1, 0 +iacByRpmTaper = scalar, F32, 1320 +luaAdd = scalar, F32, 1324 +; total TS size = 1328 +idlePosition = scalar, F32, 1328, "per", 1,0 +trim = scalar, F32, 1332, "", 1, 0 +luaAdjustment = scalar, F32, 1336, "per", 1,0 +m_wastegatePosition = scalar, F32, 1340, "per", 1,0 +etbFeedForward = scalar, F32, 1344 +etbIntegralError = scalar, F32, 1348, "", 1, 0 +etbCurrentTarget = scalar, F32, 1352, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1356, "%", 1, 0 +etbRevLimitActive = bits, U32, 1360, [0:0] +jamDetected = bits, U32, 1360, [1:1] +etbDutyRateOfChange = scalar, F32, 1364, "per", 1,0 +etbDutyAverage = scalar, F32, 1368, "per", 1,0 +etbTpsErrorCounter = scalar, U16, 1372, "count", 1,0 +etbPpsErrorCounter = scalar, U16, 1374, "count", 1,0 +etbErrorCode = scalar, S08, 1376, "", 1, 0 +jamTimer = scalar, U16, 1378, "sec", 0.01, 0 +; total TS size = 1380 +faultCode = scalar, U08, 1380, "", 1, 0 +heaterDuty = scalar, U08, 1381, "%", 1, 0 +pumpDuty = scalar, U08, 1382, "%", 1, 0 +tempC = scalar, U16, 1384, "C", 1, 0 +nernstVoltage = scalar, U16, 1386, "V", 0.001, 0 +esr = scalar, U16, 1388, "ohm", 1, 0 +; total TS size = 1392 +dcOutput0 = scalar, F32, 1392, "per", 1,0 +isEnabled0_int = scalar, U08, 1396, "per", 1,0 +isEnabled0 = bits, U32, 1400, [0:0] ; total TS size = 1404 -vvtTarget = scalar, U16, 1404, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1406, "%", 0.5, 0 -; total TS size = 1408 -lambdaCurrentlyGood = bits, U32, 1408, [0:0] -lambdaMonitorCut = bits, U32, 1408, [1:1] -lambdaTimeSinceGood = scalar, U16, 1412, "sec", 0.01, 0 +value0 = scalar, U16, 1404, "value", 1,0 +value1 = scalar, U16, 1406, "value", 1,0 +errorRate = scalar, F32, 1408, "ratio", 1,0 +; total TS size = 1412 +vvtTarget = scalar, U16, 1412, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1414, "%", 0.5, 0 ; total TS size = 1416 +lambdaCurrentlyGood = bits, U32, 1416, [0:0] +lambdaMonitorCut = bits, U32, 1416, [1:1] +lambdaTimeSinceGood = scalar, U16, 1420, "sec", 0.01, 0 +; total TS size = 1424 time = { timeNow } @@ -5173,8 +5175,9 @@ entry = m_hasSynchronizedPhase, "sync: Known Engine Phase", int, "%d" entry = wallFuelCorrection, "fuel wallwetting injection time", float, "%.3f" entry = wallFuel, "Fuel on the wall", float, "%.3f" entry = idleState, "idleState", int, "%d" -entry = currentIdlePosition, "idle: current position", float, "%.3f" +entry = currentIdlePosition, "Idle: Position", float, "%.3f" entry = baseIdlePosition, "idle: base value", float, "%.3f" +entry = idleClosedLoop, "Idle: Closed loop", float, "%.3f" entry = iacByTpsTaper, "idle: iacByTpsTaper portion", float, "%.3f" entry = throttlePedalUpState, "idle: throttlePedalUpState", int, "%d" entry = mightResetPid, "idle: mightResetPid", int, "%d" @@ -5194,8 +5197,9 @@ entry = looksLikeCoasting, "looksLikeCoasting", int, "%d" entry = looksLikeCrankToIdle, "looksLikeCrankToIdle", int, "%d" entry = isIdleCoasting, "Idle: coasting", int, "%d" entry = isIdleClosedLoop, "Idle: Closed loop active", int, "%d" -entry = targetRpmByClt, "idle: target by CLT", int, "%d" -entry = targetRpmAcBump, "idle: A/C bump", int, "%d" +entry = idleTarget, "Idle: Target RPM", int, "%d" +entry = targetRpmByClt, "Idle: Target RPM base", int, "%d" +entry = targetRpmAcBump, "Idle: Target A/C bump", int, "%d" entry = iacByRpmTaper, "idle: iacByRpmTaper portion", float, "%.3f" entry = luaAdd, "idle: Lua Adder", float, "%.3f" entry = idlePosition, "ETB: idlePosition", float, "%.3f" @@ -6105,13 +6109,15 @@ dialog = idle_stateDialog, "idle_state" graphLine = idleState graphLine = currentIdlePosition graphLine = baseIdlePosition - graphLine = iacByTpsTaper + graphLine = idleClosedLoop liveGraph = idle_state_2_Graph, "Graph", South + graphLine = iacByTpsTaper graphLine = throttlePedalUpState + graphLine = idleTarget graphLine = targetRpmByClt + liveGraph = idle_state_3_Graph, "Graph", South graphLine = targetRpmAcBump graphLine = iacByRpmTaper - liveGraph = idle_state_3_Graph, "Graph", South graphLine = luaAdd indicatorPanel = electronic_throttleIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini b/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini index 5d56cb89ff..61c6ae726d 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.09.28.alphax-2chan.4270991484" + signature = "rusEFI master.2023.09.28.alphax-2chan.892260996" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.09.28.alphax-2chan.4270991484" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.09.28.alphax-2chan.892260996" ; 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 Thu Sep 28 03:23:49 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Thu Sep 28 13:44:22 UTC 2023 pageSize = 23664 page = 1 @@ -2320,7 +2320,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23654, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1416 + ochBlockSize = 1424 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3039,69 +3039,71 @@ wallFuel = scalar, F32, 1276, "", 1, 0 idleState = bits, S32, 1280, [0:2], "not important" currentIdlePosition = scalar, F32, 1284 baseIdlePosition = scalar, F32, 1288 -iacByTpsTaper = scalar, F32, 1292 -throttlePedalUpState = scalar, S32, 1296, "", 1, 0 -mightResetPid = bits, U32, 1300, [0:0] -shouldResetPid = bits, U32, 1300, [1:1] -wasResetPid = bits, U32, 1300, [2:2] -mustResetPid = bits, U32, 1300, [3:3] -isCranking = bits, U32, 1300, [4:4] -isIacTableForCoasting = bits, U32, 1300, [5:5] -notIdling = bits, U32, 1300, [6:6] -needReset = bits, U32, 1300, [7:7] -isInDeadZone = bits, U32, 1300, [8:8] -isBlipping = bits, U32, 1300, [9:9] -useClosedLoop = bits, U32, 1300, [10:10] -badTps = bits, U32, 1300, [11:11] -looksLikeRunning = bits, U32, 1300, [12:12] -looksLikeCoasting = bits, U32, 1300, [13:13] -looksLikeCrankToIdle = bits, U32, 1300, [14:14] -isIdleCoasting = bits, U32, 1300, [15:15] -isIdleClosedLoop = bits, U32, 1300, [16:16] -targetRpmByClt = scalar, S32, 1304, "", 1, 0 -targetRpmAcBump = scalar, S32, 1308, "", 1, 0 -iacByRpmTaper = scalar, F32, 1312 -luaAdd = scalar, F32, 1316 -; total TS size = 1320 -idlePosition = scalar, F32, 1320, "per", 1,0 -trim = scalar, F32, 1324, "", 1, 0 -luaAdjustment = scalar, F32, 1328, "per", 1,0 -m_wastegatePosition = scalar, F32, 1332, "per", 1,0 -etbFeedForward = scalar, F32, 1336 -etbIntegralError = scalar, F32, 1340, "", 1, 0 -etbCurrentTarget = scalar, F32, 1344, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1348, "%", 1, 0 -etbRevLimitActive = bits, U32, 1352, [0:0] -jamDetected = bits, U32, 1352, [1:1] -etbDutyRateOfChange = scalar, F32, 1356, "per", 1,0 -etbDutyAverage = scalar, F32, 1360, "per", 1,0 -etbTpsErrorCounter = scalar, U16, 1364, "count", 1,0 -etbPpsErrorCounter = scalar, U16, 1366, "count", 1,0 -etbErrorCode = scalar, S08, 1368, "", 1, 0 -jamTimer = scalar, U16, 1370, "sec", 0.01, 0 -; total TS size = 1372 -faultCode = scalar, U08, 1372, "", 1, 0 -heaterDuty = scalar, U08, 1373, "%", 1, 0 -pumpDuty = scalar, U08, 1374, "%", 1, 0 -tempC = scalar, U16, 1376, "C", 1, 0 -nernstVoltage = scalar, U16, 1378, "V", 0.001, 0 -esr = scalar, U16, 1380, "ohm", 1, 0 -; total TS size = 1384 -dcOutput0 = scalar, F32, 1384, "per", 1,0 -isEnabled0_int = scalar, U08, 1388, "per", 1,0 -isEnabled0 = bits, U32, 1392, [0:0] -; total TS size = 1396 -value0 = scalar, U16, 1396, "value", 1,0 -value1 = scalar, U16, 1398, "value", 1,0 -errorRate = scalar, F32, 1400, "ratio", 1,0 +idleClosedLoop = scalar, F32, 1292 +iacByTpsTaper = scalar, F32, 1296 +throttlePedalUpState = scalar, S32, 1300, "", 1, 0 +mightResetPid = bits, U32, 1304, [0:0] +shouldResetPid = bits, U32, 1304, [1:1] +wasResetPid = bits, U32, 1304, [2:2] +mustResetPid = bits, U32, 1304, [3:3] +isCranking = bits, U32, 1304, [4:4] +isIacTableForCoasting = bits, U32, 1304, [5:5] +notIdling = bits, U32, 1304, [6:6] +needReset = bits, U32, 1304, [7:7] +isInDeadZone = bits, U32, 1304, [8:8] +isBlipping = bits, U32, 1304, [9:9] +useClosedLoop = bits, U32, 1304, [10:10] +badTps = bits, U32, 1304, [11:11] +looksLikeRunning = bits, U32, 1304, [12:12] +looksLikeCoasting = bits, U32, 1304, [13:13] +looksLikeCrankToIdle = bits, U32, 1304, [14:14] +isIdleCoasting = bits, U32, 1304, [15:15] +isIdleClosedLoop = bits, U32, 1304, [16:16] +idleTarget = scalar, S32, 1308, "", 1, 0 +targetRpmByClt = scalar, S32, 1312, "", 1, 0 +targetRpmAcBump = scalar, S32, 1316, "", 1, 0 +iacByRpmTaper = scalar, F32, 1320 +luaAdd = scalar, F32, 1324 +; total TS size = 1328 +idlePosition = scalar, F32, 1328, "per", 1,0 +trim = scalar, F32, 1332, "", 1, 0 +luaAdjustment = scalar, F32, 1336, "per", 1,0 +m_wastegatePosition = scalar, F32, 1340, "per", 1,0 +etbFeedForward = scalar, F32, 1344 +etbIntegralError = scalar, F32, 1348, "", 1, 0 +etbCurrentTarget = scalar, F32, 1352, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1356, "%", 1, 0 +etbRevLimitActive = bits, U32, 1360, [0:0] +jamDetected = bits, U32, 1360, [1:1] +etbDutyRateOfChange = scalar, F32, 1364, "per", 1,0 +etbDutyAverage = scalar, F32, 1368, "per", 1,0 +etbTpsErrorCounter = scalar, U16, 1372, "count", 1,0 +etbPpsErrorCounter = scalar, U16, 1374, "count", 1,0 +etbErrorCode = scalar, S08, 1376, "", 1, 0 +jamTimer = scalar, U16, 1378, "sec", 0.01, 0 +; total TS size = 1380 +faultCode = scalar, U08, 1380, "", 1, 0 +heaterDuty = scalar, U08, 1381, "%", 1, 0 +pumpDuty = scalar, U08, 1382, "%", 1, 0 +tempC = scalar, U16, 1384, "C", 1, 0 +nernstVoltage = scalar, U16, 1386, "V", 0.001, 0 +esr = scalar, U16, 1388, "ohm", 1, 0 +; total TS size = 1392 +dcOutput0 = scalar, F32, 1392, "per", 1,0 +isEnabled0_int = scalar, U08, 1396, "per", 1,0 +isEnabled0 = bits, U32, 1400, [0:0] ; total TS size = 1404 -vvtTarget = scalar, U16, 1404, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1406, "%", 0.5, 0 -; total TS size = 1408 -lambdaCurrentlyGood = bits, U32, 1408, [0:0] -lambdaMonitorCut = bits, U32, 1408, [1:1] -lambdaTimeSinceGood = scalar, U16, 1412, "sec", 0.01, 0 +value0 = scalar, U16, 1404, "value", 1,0 +value1 = scalar, U16, 1406, "value", 1,0 +errorRate = scalar, F32, 1408, "ratio", 1,0 +; total TS size = 1412 +vvtTarget = scalar, U16, 1412, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1414, "%", 0.5, 0 ; total TS size = 1416 +lambdaCurrentlyGood = bits, U32, 1416, [0:0] +lambdaMonitorCut = bits, U32, 1416, [1:1] +lambdaTimeSinceGood = scalar, U16, 1420, "sec", 0.01, 0 +; total TS size = 1424 time = { timeNow } @@ -5173,8 +5175,9 @@ entry = m_hasSynchronizedPhase, "sync: Known Engine Phase", int, "%d" entry = wallFuelCorrection, "fuel wallwetting injection time", float, "%.3f" entry = wallFuel, "Fuel on the wall", float, "%.3f" entry = idleState, "idleState", int, "%d" -entry = currentIdlePosition, "idle: current position", float, "%.3f" +entry = currentIdlePosition, "Idle: Position", float, "%.3f" entry = baseIdlePosition, "idle: base value", float, "%.3f" +entry = idleClosedLoop, "Idle: Closed loop", float, "%.3f" entry = iacByTpsTaper, "idle: iacByTpsTaper portion", float, "%.3f" entry = throttlePedalUpState, "idle: throttlePedalUpState", int, "%d" entry = mightResetPid, "idle: mightResetPid", int, "%d" @@ -5194,8 +5197,9 @@ entry = looksLikeCoasting, "looksLikeCoasting", int, "%d" entry = looksLikeCrankToIdle, "looksLikeCrankToIdle", int, "%d" entry = isIdleCoasting, "Idle: coasting", int, "%d" entry = isIdleClosedLoop, "Idle: Closed loop active", int, "%d" -entry = targetRpmByClt, "idle: target by CLT", int, "%d" -entry = targetRpmAcBump, "idle: A/C bump", int, "%d" +entry = idleTarget, "Idle: Target RPM", int, "%d" +entry = targetRpmByClt, "Idle: Target RPM base", int, "%d" +entry = targetRpmAcBump, "Idle: Target A/C bump", int, "%d" entry = iacByRpmTaper, "idle: iacByRpmTaper portion", float, "%.3f" entry = luaAdd, "idle: Lua Adder", float, "%.3f" entry = idlePosition, "ETB: idlePosition", float, "%.3f" @@ -6101,13 +6105,15 @@ dialog = idle_stateDialog, "idle_state" graphLine = idleState graphLine = currentIdlePosition graphLine = baseIdlePosition - graphLine = iacByTpsTaper + graphLine = idleClosedLoop liveGraph = idle_state_2_Graph, "Graph", South + graphLine = iacByTpsTaper graphLine = throttlePedalUpState + graphLine = idleTarget graphLine = targetRpmByClt + liveGraph = idle_state_3_Graph, "Graph", South graphLine = targetRpmAcBump graphLine = iacByRpmTaper - liveGraph = idle_state_3_Graph, "Graph", South graphLine = luaAdd indicatorPanel = electronic_throttleIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini b/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini index c8afc8949e..2dea9e5349 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.09.28.alphax-4chan.1188043398" + signature = "rusEFI master.2023.09.28.alphax-4chan.2372722814" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.09.28.alphax-4chan.1188043398" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.09.28.alphax-4chan.2372722814" ; 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","X5 - AIN4","INVALID","INVALID","INVALID","INVALID","D5 - PPS rev G" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Thu Sep 28 03:23:52 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Thu Sep 28 13:44:25 UTC 2023 pageSize = 23664 page = 1 @@ -2320,7 +2320,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23654, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1416 + ochBlockSize = 1424 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3039,69 +3039,71 @@ wallFuel = scalar, F32, 1276, "", 1, 0 idleState = bits, S32, 1280, [0:2], "not important" currentIdlePosition = scalar, F32, 1284 baseIdlePosition = scalar, F32, 1288 -iacByTpsTaper = scalar, F32, 1292 -throttlePedalUpState = scalar, S32, 1296, "", 1, 0 -mightResetPid = bits, U32, 1300, [0:0] -shouldResetPid = bits, U32, 1300, [1:1] -wasResetPid = bits, U32, 1300, [2:2] -mustResetPid = bits, U32, 1300, [3:3] -isCranking = bits, U32, 1300, [4:4] -isIacTableForCoasting = bits, U32, 1300, [5:5] -notIdling = bits, U32, 1300, [6:6] -needReset = bits, U32, 1300, [7:7] -isInDeadZone = bits, U32, 1300, [8:8] -isBlipping = bits, U32, 1300, [9:9] -useClosedLoop = bits, U32, 1300, [10:10] -badTps = bits, U32, 1300, [11:11] -looksLikeRunning = bits, U32, 1300, [12:12] -looksLikeCoasting = bits, U32, 1300, [13:13] -looksLikeCrankToIdle = bits, U32, 1300, [14:14] -isIdleCoasting = bits, U32, 1300, [15:15] -isIdleClosedLoop = bits, U32, 1300, [16:16] -targetRpmByClt = scalar, S32, 1304, "", 1, 0 -targetRpmAcBump = scalar, S32, 1308, "", 1, 0 -iacByRpmTaper = scalar, F32, 1312 -luaAdd = scalar, F32, 1316 -; total TS size = 1320 -idlePosition = scalar, F32, 1320, "per", 1,0 -trim = scalar, F32, 1324, "", 1, 0 -luaAdjustment = scalar, F32, 1328, "per", 1,0 -m_wastegatePosition = scalar, F32, 1332, "per", 1,0 -etbFeedForward = scalar, F32, 1336 -etbIntegralError = scalar, F32, 1340, "", 1, 0 -etbCurrentTarget = scalar, F32, 1344, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1348, "%", 1, 0 -etbRevLimitActive = bits, U32, 1352, [0:0] -jamDetected = bits, U32, 1352, [1:1] -etbDutyRateOfChange = scalar, F32, 1356, "per", 1,0 -etbDutyAverage = scalar, F32, 1360, "per", 1,0 -etbTpsErrorCounter = scalar, U16, 1364, "count", 1,0 -etbPpsErrorCounter = scalar, U16, 1366, "count", 1,0 -etbErrorCode = scalar, S08, 1368, "", 1, 0 -jamTimer = scalar, U16, 1370, "sec", 0.01, 0 -; total TS size = 1372 -faultCode = scalar, U08, 1372, "", 1, 0 -heaterDuty = scalar, U08, 1373, "%", 1, 0 -pumpDuty = scalar, U08, 1374, "%", 1, 0 -tempC = scalar, U16, 1376, "C", 1, 0 -nernstVoltage = scalar, U16, 1378, "V", 0.001, 0 -esr = scalar, U16, 1380, "ohm", 1, 0 -; total TS size = 1384 -dcOutput0 = scalar, F32, 1384, "per", 1,0 -isEnabled0_int = scalar, U08, 1388, "per", 1,0 -isEnabled0 = bits, U32, 1392, [0:0] -; total TS size = 1396 -value0 = scalar, U16, 1396, "value", 1,0 -value1 = scalar, U16, 1398, "value", 1,0 -errorRate = scalar, F32, 1400, "ratio", 1,0 +idleClosedLoop = scalar, F32, 1292 +iacByTpsTaper = scalar, F32, 1296 +throttlePedalUpState = scalar, S32, 1300, "", 1, 0 +mightResetPid = bits, U32, 1304, [0:0] +shouldResetPid = bits, U32, 1304, [1:1] +wasResetPid = bits, U32, 1304, [2:2] +mustResetPid = bits, U32, 1304, [3:3] +isCranking = bits, U32, 1304, [4:4] +isIacTableForCoasting = bits, U32, 1304, [5:5] +notIdling = bits, U32, 1304, [6:6] +needReset = bits, U32, 1304, [7:7] +isInDeadZone = bits, U32, 1304, [8:8] +isBlipping = bits, U32, 1304, [9:9] +useClosedLoop = bits, U32, 1304, [10:10] +badTps = bits, U32, 1304, [11:11] +looksLikeRunning = bits, U32, 1304, [12:12] +looksLikeCoasting = bits, U32, 1304, [13:13] +looksLikeCrankToIdle = bits, U32, 1304, [14:14] +isIdleCoasting = bits, U32, 1304, [15:15] +isIdleClosedLoop = bits, U32, 1304, [16:16] +idleTarget = scalar, S32, 1308, "", 1, 0 +targetRpmByClt = scalar, S32, 1312, "", 1, 0 +targetRpmAcBump = scalar, S32, 1316, "", 1, 0 +iacByRpmTaper = scalar, F32, 1320 +luaAdd = scalar, F32, 1324 +; total TS size = 1328 +idlePosition = scalar, F32, 1328, "per", 1,0 +trim = scalar, F32, 1332, "", 1, 0 +luaAdjustment = scalar, F32, 1336, "per", 1,0 +m_wastegatePosition = scalar, F32, 1340, "per", 1,0 +etbFeedForward = scalar, F32, 1344 +etbIntegralError = scalar, F32, 1348, "", 1, 0 +etbCurrentTarget = scalar, F32, 1352, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1356, "%", 1, 0 +etbRevLimitActive = bits, U32, 1360, [0:0] +jamDetected = bits, U32, 1360, [1:1] +etbDutyRateOfChange = scalar, F32, 1364, "per", 1,0 +etbDutyAverage = scalar, F32, 1368, "per", 1,0 +etbTpsErrorCounter = scalar, U16, 1372, "count", 1,0 +etbPpsErrorCounter = scalar, U16, 1374, "count", 1,0 +etbErrorCode = scalar, S08, 1376, "", 1, 0 +jamTimer = scalar, U16, 1378, "sec", 0.01, 0 +; total TS size = 1380 +faultCode = scalar, U08, 1380, "", 1, 0 +heaterDuty = scalar, U08, 1381, "%", 1, 0 +pumpDuty = scalar, U08, 1382, "%", 1, 0 +tempC = scalar, U16, 1384, "C", 1, 0 +nernstVoltage = scalar, U16, 1386, "V", 0.001, 0 +esr = scalar, U16, 1388, "ohm", 1, 0 +; total TS size = 1392 +dcOutput0 = scalar, F32, 1392, "per", 1,0 +isEnabled0_int = scalar, U08, 1396, "per", 1,0 +isEnabled0 = bits, U32, 1400, [0:0] ; total TS size = 1404 -vvtTarget = scalar, U16, 1404, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1406, "%", 0.5, 0 -; total TS size = 1408 -lambdaCurrentlyGood = bits, U32, 1408, [0:0] -lambdaMonitorCut = bits, U32, 1408, [1:1] -lambdaTimeSinceGood = scalar, U16, 1412, "sec", 0.01, 0 +value0 = scalar, U16, 1404, "value", 1,0 +value1 = scalar, U16, 1406, "value", 1,0 +errorRate = scalar, F32, 1408, "ratio", 1,0 +; total TS size = 1412 +vvtTarget = scalar, U16, 1412, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1414, "%", 0.5, 0 ; total TS size = 1416 +lambdaCurrentlyGood = bits, U32, 1416, [0:0] +lambdaMonitorCut = bits, U32, 1416, [1:1] +lambdaTimeSinceGood = scalar, U16, 1420, "sec", 0.01, 0 +; total TS size = 1424 time = { timeNow } @@ -5173,8 +5175,9 @@ entry = m_hasSynchronizedPhase, "sync: Known Engine Phase", int, "%d" entry = wallFuelCorrection, "fuel wallwetting injection time", float, "%.3f" entry = wallFuel, "Fuel on the wall", float, "%.3f" entry = idleState, "idleState", int, "%d" -entry = currentIdlePosition, "idle: current position", float, "%.3f" +entry = currentIdlePosition, "Idle: Position", float, "%.3f" entry = baseIdlePosition, "idle: base value", float, "%.3f" +entry = idleClosedLoop, "Idle: Closed loop", float, "%.3f" entry = iacByTpsTaper, "idle: iacByTpsTaper portion", float, "%.3f" entry = throttlePedalUpState, "idle: throttlePedalUpState", int, "%d" entry = mightResetPid, "idle: mightResetPid", int, "%d" @@ -5194,8 +5197,9 @@ entry = looksLikeCoasting, "looksLikeCoasting", int, "%d" entry = looksLikeCrankToIdle, "looksLikeCrankToIdle", int, "%d" entry = isIdleCoasting, "Idle: coasting", int, "%d" entry = isIdleClosedLoop, "Idle: Closed loop active", int, "%d" -entry = targetRpmByClt, "idle: target by CLT", int, "%d" -entry = targetRpmAcBump, "idle: A/C bump", int, "%d" +entry = idleTarget, "Idle: Target RPM", int, "%d" +entry = targetRpmByClt, "Idle: Target RPM base", int, "%d" +entry = targetRpmAcBump, "Idle: Target A/C bump", int, "%d" entry = iacByRpmTaper, "idle: iacByRpmTaper portion", float, "%.3f" entry = luaAdd, "idle: Lua Adder", float, "%.3f" entry = idlePosition, "ETB: idlePosition", float, "%.3f" @@ -6104,13 +6108,15 @@ dialog = idle_stateDialog, "idle_state" graphLine = idleState graphLine = currentIdlePosition graphLine = baseIdlePosition - graphLine = iacByTpsTaper + graphLine = idleClosedLoop liveGraph = idle_state_2_Graph, "Graph", South + graphLine = iacByTpsTaper graphLine = throttlePedalUpState + graphLine = idleTarget graphLine = targetRpmByClt + liveGraph = idle_state_3_Graph, "Graph", South graphLine = targetRpmAcBump graphLine = iacByRpmTaper - liveGraph = idle_state_3_Graph, "Graph", South graphLine = luaAdd indicatorPanel = electronic_throttleIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_alphax-4chan_f7.ini b/firmware/tunerstudio/generated/rusefi_alphax-4chan_f7.ini index 910ab20d14..9c1083a063 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.09.28.alphax-4chan_f7.1188043398" + signature = "rusEFI master.2023.09.28.alphax-4chan_f7.2372722814" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.09.28.alphax-4chan_f7.1188043398" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.09.28.alphax-4chan_f7.2372722814" ; 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","X5 - AIN4","INVALID","INVALID","INVALID","INVALID","D5 - PPS rev G" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Thu Sep 28 03:23:55 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Thu Sep 28 13:44:28 UTC 2023 pageSize = 23664 page = 1 @@ -2320,7 +2320,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23654, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1416 + ochBlockSize = 1424 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3039,69 +3039,71 @@ wallFuel = scalar, F32, 1276, "", 1, 0 idleState = bits, S32, 1280, [0:2], "not important" currentIdlePosition = scalar, F32, 1284 baseIdlePosition = scalar, F32, 1288 -iacByTpsTaper = scalar, F32, 1292 -throttlePedalUpState = scalar, S32, 1296, "", 1, 0 -mightResetPid = bits, U32, 1300, [0:0] -shouldResetPid = bits, U32, 1300, [1:1] -wasResetPid = bits, U32, 1300, [2:2] -mustResetPid = bits, U32, 1300, [3:3] -isCranking = bits, U32, 1300, [4:4] -isIacTableForCoasting = bits, U32, 1300, [5:5] -notIdling = bits, U32, 1300, [6:6] -needReset = bits, U32, 1300, [7:7] -isInDeadZone = bits, U32, 1300, [8:8] -isBlipping = bits, U32, 1300, [9:9] -useClosedLoop = bits, U32, 1300, [10:10] -badTps = bits, U32, 1300, [11:11] -looksLikeRunning = bits, U32, 1300, [12:12] -looksLikeCoasting = bits, U32, 1300, [13:13] -looksLikeCrankToIdle = bits, U32, 1300, [14:14] -isIdleCoasting = bits, U32, 1300, [15:15] -isIdleClosedLoop = bits, U32, 1300, [16:16] -targetRpmByClt = scalar, S32, 1304, "", 1, 0 -targetRpmAcBump = scalar, S32, 1308, "", 1, 0 -iacByRpmTaper = scalar, F32, 1312 -luaAdd = scalar, F32, 1316 -; total TS size = 1320 -idlePosition = scalar, F32, 1320, "per", 1,0 -trim = scalar, F32, 1324, "", 1, 0 -luaAdjustment = scalar, F32, 1328, "per", 1,0 -m_wastegatePosition = scalar, F32, 1332, "per", 1,0 -etbFeedForward = scalar, F32, 1336 -etbIntegralError = scalar, F32, 1340, "", 1, 0 -etbCurrentTarget = scalar, F32, 1344, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1348, "%", 1, 0 -etbRevLimitActive = bits, U32, 1352, [0:0] -jamDetected = bits, U32, 1352, [1:1] -etbDutyRateOfChange = scalar, F32, 1356, "per", 1,0 -etbDutyAverage = scalar, F32, 1360, "per", 1,0 -etbTpsErrorCounter = scalar, U16, 1364, "count", 1,0 -etbPpsErrorCounter = scalar, U16, 1366, "count", 1,0 -etbErrorCode = scalar, S08, 1368, "", 1, 0 -jamTimer = scalar, U16, 1370, "sec", 0.01, 0 -; total TS size = 1372 -faultCode = scalar, U08, 1372, "", 1, 0 -heaterDuty = scalar, U08, 1373, "%", 1, 0 -pumpDuty = scalar, U08, 1374, "%", 1, 0 -tempC = scalar, U16, 1376, "C", 1, 0 -nernstVoltage = scalar, U16, 1378, "V", 0.001, 0 -esr = scalar, U16, 1380, "ohm", 1, 0 -; total TS size = 1384 -dcOutput0 = scalar, F32, 1384, "per", 1,0 -isEnabled0_int = scalar, U08, 1388, "per", 1,0 -isEnabled0 = bits, U32, 1392, [0:0] -; total TS size = 1396 -value0 = scalar, U16, 1396, "value", 1,0 -value1 = scalar, U16, 1398, "value", 1,0 -errorRate = scalar, F32, 1400, "ratio", 1,0 +idleClosedLoop = scalar, F32, 1292 +iacByTpsTaper = scalar, F32, 1296 +throttlePedalUpState = scalar, S32, 1300, "", 1, 0 +mightResetPid = bits, U32, 1304, [0:0] +shouldResetPid = bits, U32, 1304, [1:1] +wasResetPid = bits, U32, 1304, [2:2] +mustResetPid = bits, U32, 1304, [3:3] +isCranking = bits, U32, 1304, [4:4] +isIacTableForCoasting = bits, U32, 1304, [5:5] +notIdling = bits, U32, 1304, [6:6] +needReset = bits, U32, 1304, [7:7] +isInDeadZone = bits, U32, 1304, [8:8] +isBlipping = bits, U32, 1304, [9:9] +useClosedLoop = bits, U32, 1304, [10:10] +badTps = bits, U32, 1304, [11:11] +looksLikeRunning = bits, U32, 1304, [12:12] +looksLikeCoasting = bits, U32, 1304, [13:13] +looksLikeCrankToIdle = bits, U32, 1304, [14:14] +isIdleCoasting = bits, U32, 1304, [15:15] +isIdleClosedLoop = bits, U32, 1304, [16:16] +idleTarget = scalar, S32, 1308, "", 1, 0 +targetRpmByClt = scalar, S32, 1312, "", 1, 0 +targetRpmAcBump = scalar, S32, 1316, "", 1, 0 +iacByRpmTaper = scalar, F32, 1320 +luaAdd = scalar, F32, 1324 +; total TS size = 1328 +idlePosition = scalar, F32, 1328, "per", 1,0 +trim = scalar, F32, 1332, "", 1, 0 +luaAdjustment = scalar, F32, 1336, "per", 1,0 +m_wastegatePosition = scalar, F32, 1340, "per", 1,0 +etbFeedForward = scalar, F32, 1344 +etbIntegralError = scalar, F32, 1348, "", 1, 0 +etbCurrentTarget = scalar, F32, 1352, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1356, "%", 1, 0 +etbRevLimitActive = bits, U32, 1360, [0:0] +jamDetected = bits, U32, 1360, [1:1] +etbDutyRateOfChange = scalar, F32, 1364, "per", 1,0 +etbDutyAverage = scalar, F32, 1368, "per", 1,0 +etbTpsErrorCounter = scalar, U16, 1372, "count", 1,0 +etbPpsErrorCounter = scalar, U16, 1374, "count", 1,0 +etbErrorCode = scalar, S08, 1376, "", 1, 0 +jamTimer = scalar, U16, 1378, "sec", 0.01, 0 +; total TS size = 1380 +faultCode = scalar, U08, 1380, "", 1, 0 +heaterDuty = scalar, U08, 1381, "%", 1, 0 +pumpDuty = scalar, U08, 1382, "%", 1, 0 +tempC = scalar, U16, 1384, "C", 1, 0 +nernstVoltage = scalar, U16, 1386, "V", 0.001, 0 +esr = scalar, U16, 1388, "ohm", 1, 0 +; total TS size = 1392 +dcOutput0 = scalar, F32, 1392, "per", 1,0 +isEnabled0_int = scalar, U08, 1396, "per", 1,0 +isEnabled0 = bits, U32, 1400, [0:0] ; total TS size = 1404 -vvtTarget = scalar, U16, 1404, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1406, "%", 0.5, 0 -; total TS size = 1408 -lambdaCurrentlyGood = bits, U32, 1408, [0:0] -lambdaMonitorCut = bits, U32, 1408, [1:1] -lambdaTimeSinceGood = scalar, U16, 1412, "sec", 0.01, 0 +value0 = scalar, U16, 1404, "value", 1,0 +value1 = scalar, U16, 1406, "value", 1,0 +errorRate = scalar, F32, 1408, "ratio", 1,0 +; total TS size = 1412 +vvtTarget = scalar, U16, 1412, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1414, "%", 0.5, 0 ; total TS size = 1416 +lambdaCurrentlyGood = bits, U32, 1416, [0:0] +lambdaMonitorCut = bits, U32, 1416, [1:1] +lambdaTimeSinceGood = scalar, U16, 1420, "sec", 0.01, 0 +; total TS size = 1424 time = { timeNow } @@ -5173,8 +5175,9 @@ entry = m_hasSynchronizedPhase, "sync: Known Engine Phase", int, "%d" entry = wallFuelCorrection, "fuel wallwetting injection time", float, "%.3f" entry = wallFuel, "Fuel on the wall", float, "%.3f" entry = idleState, "idleState", int, "%d" -entry = currentIdlePosition, "idle: current position", float, "%.3f" +entry = currentIdlePosition, "Idle: Position", float, "%.3f" entry = baseIdlePosition, "idle: base value", float, "%.3f" +entry = idleClosedLoop, "Idle: Closed loop", float, "%.3f" entry = iacByTpsTaper, "idle: iacByTpsTaper portion", float, "%.3f" entry = throttlePedalUpState, "idle: throttlePedalUpState", int, "%d" entry = mightResetPid, "idle: mightResetPid", int, "%d" @@ -5194,8 +5197,9 @@ entry = looksLikeCoasting, "looksLikeCoasting", int, "%d" entry = looksLikeCrankToIdle, "looksLikeCrankToIdle", int, "%d" entry = isIdleCoasting, "Idle: coasting", int, "%d" entry = isIdleClosedLoop, "Idle: Closed loop active", int, "%d" -entry = targetRpmByClt, "idle: target by CLT", int, "%d" -entry = targetRpmAcBump, "idle: A/C bump", int, "%d" +entry = idleTarget, "Idle: Target RPM", int, "%d" +entry = targetRpmByClt, "Idle: Target RPM base", int, "%d" +entry = targetRpmAcBump, "Idle: Target A/C bump", int, "%d" entry = iacByRpmTaper, "idle: iacByRpmTaper portion", float, "%.3f" entry = luaAdd, "idle: Lua Adder", float, "%.3f" entry = idlePosition, "ETB: idlePosition", float, "%.3f" @@ -6104,13 +6108,15 @@ dialog = idle_stateDialog, "idle_state" graphLine = idleState graphLine = currentIdlePosition graphLine = baseIdlePosition - graphLine = iacByTpsTaper + graphLine = idleClosedLoop liveGraph = idle_state_2_Graph, "Graph", South + graphLine = iacByTpsTaper graphLine = throttlePedalUpState + graphLine = idleTarget graphLine = targetRpmByClt + liveGraph = idle_state_3_Graph, "Graph", South graphLine = targetRpmAcBump graphLine = iacByRpmTaper - liveGraph = idle_state_3_Graph, "Graph", South graphLine = luaAdd indicatorPanel = electronic_throttleIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_alphax-8chan-revA.ini b/firmware/tunerstudio/generated/rusefi_alphax-8chan-revA.ini index 107825b2e1..ab17686736 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.09.28.alphax-8chan-revA.3205775992" + signature = "rusEFI master.2023.09.28.alphax-8chan-revA.1957214336" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.09.28.alphax-8chan-revA.3205775992" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.09.28.alphax-8chan-revA.1957214336" ; 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 Thu Sep 28 03:24:04 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Thu Sep 28 13:44:37 UTC 2023 pageSize = 23664 page = 1 @@ -2320,7 +2320,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23654, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1416 + ochBlockSize = 1424 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3039,69 +3039,71 @@ wallFuel = scalar, F32, 1276, "", 1, 0 idleState = bits, S32, 1280, [0:2], "not important" currentIdlePosition = scalar, F32, 1284 baseIdlePosition = scalar, F32, 1288 -iacByTpsTaper = scalar, F32, 1292 -throttlePedalUpState = scalar, S32, 1296, "", 1, 0 -mightResetPid = bits, U32, 1300, [0:0] -shouldResetPid = bits, U32, 1300, [1:1] -wasResetPid = bits, U32, 1300, [2:2] -mustResetPid = bits, U32, 1300, [3:3] -isCranking = bits, U32, 1300, [4:4] -isIacTableForCoasting = bits, U32, 1300, [5:5] -notIdling = bits, U32, 1300, [6:6] -needReset = bits, U32, 1300, [7:7] -isInDeadZone = bits, U32, 1300, [8:8] -isBlipping = bits, U32, 1300, [9:9] -useClosedLoop = bits, U32, 1300, [10:10] -badTps = bits, U32, 1300, [11:11] -looksLikeRunning = bits, U32, 1300, [12:12] -looksLikeCoasting = bits, U32, 1300, [13:13] -looksLikeCrankToIdle = bits, U32, 1300, [14:14] -isIdleCoasting = bits, U32, 1300, [15:15] -isIdleClosedLoop = bits, U32, 1300, [16:16] -targetRpmByClt = scalar, S32, 1304, "", 1, 0 -targetRpmAcBump = scalar, S32, 1308, "", 1, 0 -iacByRpmTaper = scalar, F32, 1312 -luaAdd = scalar, F32, 1316 -; total TS size = 1320 -idlePosition = scalar, F32, 1320, "per", 1,0 -trim = scalar, F32, 1324, "", 1, 0 -luaAdjustment = scalar, F32, 1328, "per", 1,0 -m_wastegatePosition = scalar, F32, 1332, "per", 1,0 -etbFeedForward = scalar, F32, 1336 -etbIntegralError = scalar, F32, 1340, "", 1, 0 -etbCurrentTarget = scalar, F32, 1344, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1348, "%", 1, 0 -etbRevLimitActive = bits, U32, 1352, [0:0] -jamDetected = bits, U32, 1352, [1:1] -etbDutyRateOfChange = scalar, F32, 1356, "per", 1,0 -etbDutyAverage = scalar, F32, 1360, "per", 1,0 -etbTpsErrorCounter = scalar, U16, 1364, "count", 1,0 -etbPpsErrorCounter = scalar, U16, 1366, "count", 1,0 -etbErrorCode = scalar, S08, 1368, "", 1, 0 -jamTimer = scalar, U16, 1370, "sec", 0.01, 0 -; total TS size = 1372 -faultCode = scalar, U08, 1372, "", 1, 0 -heaterDuty = scalar, U08, 1373, "%", 1, 0 -pumpDuty = scalar, U08, 1374, "%", 1, 0 -tempC = scalar, U16, 1376, "C", 1, 0 -nernstVoltage = scalar, U16, 1378, "V", 0.001, 0 -esr = scalar, U16, 1380, "ohm", 1, 0 -; total TS size = 1384 -dcOutput0 = scalar, F32, 1384, "per", 1,0 -isEnabled0_int = scalar, U08, 1388, "per", 1,0 -isEnabled0 = bits, U32, 1392, [0:0] -; total TS size = 1396 -value0 = scalar, U16, 1396, "value", 1,0 -value1 = scalar, U16, 1398, "value", 1,0 -errorRate = scalar, F32, 1400, "ratio", 1,0 +idleClosedLoop = scalar, F32, 1292 +iacByTpsTaper = scalar, F32, 1296 +throttlePedalUpState = scalar, S32, 1300, "", 1, 0 +mightResetPid = bits, U32, 1304, [0:0] +shouldResetPid = bits, U32, 1304, [1:1] +wasResetPid = bits, U32, 1304, [2:2] +mustResetPid = bits, U32, 1304, [3:3] +isCranking = bits, U32, 1304, [4:4] +isIacTableForCoasting = bits, U32, 1304, [5:5] +notIdling = bits, U32, 1304, [6:6] +needReset = bits, U32, 1304, [7:7] +isInDeadZone = bits, U32, 1304, [8:8] +isBlipping = bits, U32, 1304, [9:9] +useClosedLoop = bits, U32, 1304, [10:10] +badTps = bits, U32, 1304, [11:11] +looksLikeRunning = bits, U32, 1304, [12:12] +looksLikeCoasting = bits, U32, 1304, [13:13] +looksLikeCrankToIdle = bits, U32, 1304, [14:14] +isIdleCoasting = bits, U32, 1304, [15:15] +isIdleClosedLoop = bits, U32, 1304, [16:16] +idleTarget = scalar, S32, 1308, "", 1, 0 +targetRpmByClt = scalar, S32, 1312, "", 1, 0 +targetRpmAcBump = scalar, S32, 1316, "", 1, 0 +iacByRpmTaper = scalar, F32, 1320 +luaAdd = scalar, F32, 1324 +; total TS size = 1328 +idlePosition = scalar, F32, 1328, "per", 1,0 +trim = scalar, F32, 1332, "", 1, 0 +luaAdjustment = scalar, F32, 1336, "per", 1,0 +m_wastegatePosition = scalar, F32, 1340, "per", 1,0 +etbFeedForward = scalar, F32, 1344 +etbIntegralError = scalar, F32, 1348, "", 1, 0 +etbCurrentTarget = scalar, F32, 1352, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1356, "%", 1, 0 +etbRevLimitActive = bits, U32, 1360, [0:0] +jamDetected = bits, U32, 1360, [1:1] +etbDutyRateOfChange = scalar, F32, 1364, "per", 1,0 +etbDutyAverage = scalar, F32, 1368, "per", 1,0 +etbTpsErrorCounter = scalar, U16, 1372, "count", 1,0 +etbPpsErrorCounter = scalar, U16, 1374, "count", 1,0 +etbErrorCode = scalar, S08, 1376, "", 1, 0 +jamTimer = scalar, U16, 1378, "sec", 0.01, 0 +; total TS size = 1380 +faultCode = scalar, U08, 1380, "", 1, 0 +heaterDuty = scalar, U08, 1381, "%", 1, 0 +pumpDuty = scalar, U08, 1382, "%", 1, 0 +tempC = scalar, U16, 1384, "C", 1, 0 +nernstVoltage = scalar, U16, 1386, "V", 0.001, 0 +esr = scalar, U16, 1388, "ohm", 1, 0 +; total TS size = 1392 +dcOutput0 = scalar, F32, 1392, "per", 1,0 +isEnabled0_int = scalar, U08, 1396, "per", 1,0 +isEnabled0 = bits, U32, 1400, [0:0] ; total TS size = 1404 -vvtTarget = scalar, U16, 1404, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1406, "%", 0.5, 0 -; total TS size = 1408 -lambdaCurrentlyGood = bits, U32, 1408, [0:0] -lambdaMonitorCut = bits, U32, 1408, [1:1] -lambdaTimeSinceGood = scalar, U16, 1412, "sec", 0.01, 0 +value0 = scalar, U16, 1404, "value", 1,0 +value1 = scalar, U16, 1406, "value", 1,0 +errorRate = scalar, F32, 1408, "ratio", 1,0 +; total TS size = 1412 +vvtTarget = scalar, U16, 1412, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1414, "%", 0.5, 0 ; total TS size = 1416 +lambdaCurrentlyGood = bits, U32, 1416, [0:0] +lambdaMonitorCut = bits, U32, 1416, [1:1] +lambdaTimeSinceGood = scalar, U16, 1420, "sec", 0.01, 0 +; total TS size = 1424 time = { timeNow } @@ -5173,8 +5175,9 @@ entry = m_hasSynchronizedPhase, "sync: Known Engine Phase", int, "%d" entry = wallFuelCorrection, "fuel wallwetting injection time", float, "%.3f" entry = wallFuel, "Fuel on the wall", float, "%.3f" entry = idleState, "idleState", int, "%d" -entry = currentIdlePosition, "idle: current position", float, "%.3f" +entry = currentIdlePosition, "Idle: Position", float, "%.3f" entry = baseIdlePosition, "idle: base value", float, "%.3f" +entry = idleClosedLoop, "Idle: Closed loop", float, "%.3f" entry = iacByTpsTaper, "idle: iacByTpsTaper portion", float, "%.3f" entry = throttlePedalUpState, "idle: throttlePedalUpState", int, "%d" entry = mightResetPid, "idle: mightResetPid", int, "%d" @@ -5194,8 +5197,9 @@ entry = looksLikeCoasting, "looksLikeCoasting", int, "%d" entry = looksLikeCrankToIdle, "looksLikeCrankToIdle", int, "%d" entry = isIdleCoasting, "Idle: coasting", int, "%d" entry = isIdleClosedLoop, "Idle: Closed loop active", int, "%d" -entry = targetRpmByClt, "idle: target by CLT", int, "%d" -entry = targetRpmAcBump, "idle: A/C bump", int, "%d" +entry = idleTarget, "Idle: Target RPM", int, "%d" +entry = targetRpmByClt, "Idle: Target RPM base", int, "%d" +entry = targetRpmAcBump, "Idle: Target A/C bump", int, "%d" entry = iacByRpmTaper, "idle: iacByRpmTaper portion", float, "%.3f" entry = luaAdd, "idle: Lua Adder", float, "%.3f" entry = idlePosition, "ETB: idlePosition", float, "%.3f" @@ -6105,13 +6109,15 @@ dialog = idle_stateDialog, "idle_state" graphLine = idleState graphLine = currentIdlePosition graphLine = baseIdlePosition - graphLine = iacByTpsTaper + graphLine = idleClosedLoop liveGraph = idle_state_2_Graph, "Graph", South + graphLine = iacByTpsTaper graphLine = throttlePedalUpState + graphLine = idleTarget graphLine = targetRpmByClt + liveGraph = idle_state_3_Graph, "Graph", South graphLine = targetRpmAcBump graphLine = iacByRpmTaper - liveGraph = idle_state_3_Graph, "Graph", South graphLine = luaAdd indicatorPanel = electronic_throttleIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_alphax-8chan.ini b/firmware/tunerstudio/generated/rusefi_alphax-8chan.ini index 4af2800a61..7c6f0c1275 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.09.28.alphax-8chan.2210128883" + signature = "rusEFI master.2023.09.28.alphax-8chan.1208424715" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.09.28.alphax-8chan.2210128883" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.09.28.alphax-8chan.1208424715" ; 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","33A - 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","32A - 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 Thu Sep 28 03:23:58 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Thu Sep 28 13:44:31 UTC 2023 pageSize = 23664 page = 1 @@ -2320,7 +2320,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23654, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1416 + ochBlockSize = 1424 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3039,69 +3039,71 @@ wallFuel = scalar, F32, 1276, "", 1, 0 idleState = bits, S32, 1280, [0:2], "not important" currentIdlePosition = scalar, F32, 1284 baseIdlePosition = scalar, F32, 1288 -iacByTpsTaper = scalar, F32, 1292 -throttlePedalUpState = scalar, S32, 1296, "", 1, 0 -mightResetPid = bits, U32, 1300, [0:0] -shouldResetPid = bits, U32, 1300, [1:1] -wasResetPid = bits, U32, 1300, [2:2] -mustResetPid = bits, U32, 1300, [3:3] -isCranking = bits, U32, 1300, [4:4] -isIacTableForCoasting = bits, U32, 1300, [5:5] -notIdling = bits, U32, 1300, [6:6] -needReset = bits, U32, 1300, [7:7] -isInDeadZone = bits, U32, 1300, [8:8] -isBlipping = bits, U32, 1300, [9:9] -useClosedLoop = bits, U32, 1300, [10:10] -badTps = bits, U32, 1300, [11:11] -looksLikeRunning = bits, U32, 1300, [12:12] -looksLikeCoasting = bits, U32, 1300, [13:13] -looksLikeCrankToIdle = bits, U32, 1300, [14:14] -isIdleCoasting = bits, U32, 1300, [15:15] -isIdleClosedLoop = bits, U32, 1300, [16:16] -targetRpmByClt = scalar, S32, 1304, "", 1, 0 -targetRpmAcBump = scalar, S32, 1308, "", 1, 0 -iacByRpmTaper = scalar, F32, 1312 -luaAdd = scalar, F32, 1316 -; total TS size = 1320 -idlePosition = scalar, F32, 1320, "per", 1,0 -trim = scalar, F32, 1324, "", 1, 0 -luaAdjustment = scalar, F32, 1328, "per", 1,0 -m_wastegatePosition = scalar, F32, 1332, "per", 1,0 -etbFeedForward = scalar, F32, 1336 -etbIntegralError = scalar, F32, 1340, "", 1, 0 -etbCurrentTarget = scalar, F32, 1344, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1348, "%", 1, 0 -etbRevLimitActive = bits, U32, 1352, [0:0] -jamDetected = bits, U32, 1352, [1:1] -etbDutyRateOfChange = scalar, F32, 1356, "per", 1,0 -etbDutyAverage = scalar, F32, 1360, "per", 1,0 -etbTpsErrorCounter = scalar, U16, 1364, "count", 1,0 -etbPpsErrorCounter = scalar, U16, 1366, "count", 1,0 -etbErrorCode = scalar, S08, 1368, "", 1, 0 -jamTimer = scalar, U16, 1370, "sec", 0.01, 0 -; total TS size = 1372 -faultCode = scalar, U08, 1372, "", 1, 0 -heaterDuty = scalar, U08, 1373, "%", 1, 0 -pumpDuty = scalar, U08, 1374, "%", 1, 0 -tempC = scalar, U16, 1376, "C", 1, 0 -nernstVoltage = scalar, U16, 1378, "V", 0.001, 0 -esr = scalar, U16, 1380, "ohm", 1, 0 -; total TS size = 1384 -dcOutput0 = scalar, F32, 1384, "per", 1,0 -isEnabled0_int = scalar, U08, 1388, "per", 1,0 -isEnabled0 = bits, U32, 1392, [0:0] -; total TS size = 1396 -value0 = scalar, U16, 1396, "value", 1,0 -value1 = scalar, U16, 1398, "value", 1,0 -errorRate = scalar, F32, 1400, "ratio", 1,0 +idleClosedLoop = scalar, F32, 1292 +iacByTpsTaper = scalar, F32, 1296 +throttlePedalUpState = scalar, S32, 1300, "", 1, 0 +mightResetPid = bits, U32, 1304, [0:0] +shouldResetPid = bits, U32, 1304, [1:1] +wasResetPid = bits, U32, 1304, [2:2] +mustResetPid = bits, U32, 1304, [3:3] +isCranking = bits, U32, 1304, [4:4] +isIacTableForCoasting = bits, U32, 1304, [5:5] +notIdling = bits, U32, 1304, [6:6] +needReset = bits, U32, 1304, [7:7] +isInDeadZone = bits, U32, 1304, [8:8] +isBlipping = bits, U32, 1304, [9:9] +useClosedLoop = bits, U32, 1304, [10:10] +badTps = bits, U32, 1304, [11:11] +looksLikeRunning = bits, U32, 1304, [12:12] +looksLikeCoasting = bits, U32, 1304, [13:13] +looksLikeCrankToIdle = bits, U32, 1304, [14:14] +isIdleCoasting = bits, U32, 1304, [15:15] +isIdleClosedLoop = bits, U32, 1304, [16:16] +idleTarget = scalar, S32, 1308, "", 1, 0 +targetRpmByClt = scalar, S32, 1312, "", 1, 0 +targetRpmAcBump = scalar, S32, 1316, "", 1, 0 +iacByRpmTaper = scalar, F32, 1320 +luaAdd = scalar, F32, 1324 +; total TS size = 1328 +idlePosition = scalar, F32, 1328, "per", 1,0 +trim = scalar, F32, 1332, "", 1, 0 +luaAdjustment = scalar, F32, 1336, "per", 1,0 +m_wastegatePosition = scalar, F32, 1340, "per", 1,0 +etbFeedForward = scalar, F32, 1344 +etbIntegralError = scalar, F32, 1348, "", 1, 0 +etbCurrentTarget = scalar, F32, 1352, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1356, "%", 1, 0 +etbRevLimitActive = bits, U32, 1360, [0:0] +jamDetected = bits, U32, 1360, [1:1] +etbDutyRateOfChange = scalar, F32, 1364, "per", 1,0 +etbDutyAverage = scalar, F32, 1368, "per", 1,0 +etbTpsErrorCounter = scalar, U16, 1372, "count", 1,0 +etbPpsErrorCounter = scalar, U16, 1374, "count", 1,0 +etbErrorCode = scalar, S08, 1376, "", 1, 0 +jamTimer = scalar, U16, 1378, "sec", 0.01, 0 +; total TS size = 1380 +faultCode = scalar, U08, 1380, "", 1, 0 +heaterDuty = scalar, U08, 1381, "%", 1, 0 +pumpDuty = scalar, U08, 1382, "%", 1, 0 +tempC = scalar, U16, 1384, "C", 1, 0 +nernstVoltage = scalar, U16, 1386, "V", 0.001, 0 +esr = scalar, U16, 1388, "ohm", 1, 0 +; total TS size = 1392 +dcOutput0 = scalar, F32, 1392, "per", 1,0 +isEnabled0_int = scalar, U08, 1396, "per", 1,0 +isEnabled0 = bits, U32, 1400, [0:0] ; total TS size = 1404 -vvtTarget = scalar, U16, 1404, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1406, "%", 0.5, 0 -; total TS size = 1408 -lambdaCurrentlyGood = bits, U32, 1408, [0:0] -lambdaMonitorCut = bits, U32, 1408, [1:1] -lambdaTimeSinceGood = scalar, U16, 1412, "sec", 0.01, 0 +value0 = scalar, U16, 1404, "value", 1,0 +value1 = scalar, U16, 1406, "value", 1,0 +errorRate = scalar, F32, 1408, "ratio", 1,0 +; total TS size = 1412 +vvtTarget = scalar, U16, 1412, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1414, "%", 0.5, 0 ; total TS size = 1416 +lambdaCurrentlyGood = bits, U32, 1416, [0:0] +lambdaMonitorCut = bits, U32, 1416, [1:1] +lambdaTimeSinceGood = scalar, U16, 1420, "sec", 0.01, 0 +; total TS size = 1424 time = { timeNow } @@ -5173,8 +5175,9 @@ entry = m_hasSynchronizedPhase, "sync: Known Engine Phase", int, "%d" entry = wallFuelCorrection, "fuel wallwetting injection time", float, "%.3f" entry = wallFuel, "Fuel on the wall", float, "%.3f" entry = idleState, "idleState", int, "%d" -entry = currentIdlePosition, "idle: current position", float, "%.3f" +entry = currentIdlePosition, "Idle: Position", float, "%.3f" entry = baseIdlePosition, "idle: base value", float, "%.3f" +entry = idleClosedLoop, "Idle: Closed loop", float, "%.3f" entry = iacByTpsTaper, "idle: iacByTpsTaper portion", float, "%.3f" entry = throttlePedalUpState, "idle: throttlePedalUpState", int, "%d" entry = mightResetPid, "idle: mightResetPid", int, "%d" @@ -5194,8 +5197,9 @@ entry = looksLikeCoasting, "looksLikeCoasting", int, "%d" entry = looksLikeCrankToIdle, "looksLikeCrankToIdle", int, "%d" entry = isIdleCoasting, "Idle: coasting", int, "%d" entry = isIdleClosedLoop, "Idle: Closed loop active", int, "%d" -entry = targetRpmByClt, "idle: target by CLT", int, "%d" -entry = targetRpmAcBump, "idle: A/C bump", int, "%d" +entry = idleTarget, "Idle: Target RPM", int, "%d" +entry = targetRpmByClt, "Idle: Target RPM base", int, "%d" +entry = targetRpmAcBump, "Idle: Target A/C bump", int, "%d" entry = iacByRpmTaper, "idle: iacByRpmTaper portion", float, "%.3f" entry = luaAdd, "idle: Lua Adder", float, "%.3f" entry = idlePosition, "ETB: idlePosition", float, "%.3f" @@ -6105,13 +6109,15 @@ dialog = idle_stateDialog, "idle_state" graphLine = idleState graphLine = currentIdlePosition graphLine = baseIdlePosition - graphLine = iacByTpsTaper + graphLine = idleClosedLoop liveGraph = idle_state_2_Graph, "Graph", South + graphLine = iacByTpsTaper graphLine = throttlePedalUpState + graphLine = idleTarget graphLine = targetRpmByClt + liveGraph = idle_state_3_Graph, "Graph", South graphLine = targetRpmAcBump graphLine = iacByRpmTaper - liveGraph = idle_state_3_Graph, "Graph", South graphLine = luaAdd indicatorPanel = electronic_throttleIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_alphax-8chan_f7.ini b/firmware/tunerstudio/generated/rusefi_alphax-8chan_f7.ini index 00bcc36202..3bc0b034b7 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.09.28.alphax-8chan_f7.2210128883" + signature = "rusEFI master.2023.09.28.alphax-8chan_f7.1208424715" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.09.28.alphax-8chan_f7.2210128883" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.09.28.alphax-8chan_f7.1208424715" ; 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","33A - 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","32A - 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 Thu Sep 28 03:24:01 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Thu Sep 28 13:44:34 UTC 2023 pageSize = 23664 page = 1 @@ -2320,7 +2320,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23654, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1416 + ochBlockSize = 1424 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3039,69 +3039,71 @@ wallFuel = scalar, F32, 1276, "", 1, 0 idleState = bits, S32, 1280, [0:2], "not important" currentIdlePosition = scalar, F32, 1284 baseIdlePosition = scalar, F32, 1288 -iacByTpsTaper = scalar, F32, 1292 -throttlePedalUpState = scalar, S32, 1296, "", 1, 0 -mightResetPid = bits, U32, 1300, [0:0] -shouldResetPid = bits, U32, 1300, [1:1] -wasResetPid = bits, U32, 1300, [2:2] -mustResetPid = bits, U32, 1300, [3:3] -isCranking = bits, U32, 1300, [4:4] -isIacTableForCoasting = bits, U32, 1300, [5:5] -notIdling = bits, U32, 1300, [6:6] -needReset = bits, U32, 1300, [7:7] -isInDeadZone = bits, U32, 1300, [8:8] -isBlipping = bits, U32, 1300, [9:9] -useClosedLoop = bits, U32, 1300, [10:10] -badTps = bits, U32, 1300, [11:11] -looksLikeRunning = bits, U32, 1300, [12:12] -looksLikeCoasting = bits, U32, 1300, [13:13] -looksLikeCrankToIdle = bits, U32, 1300, [14:14] -isIdleCoasting = bits, U32, 1300, [15:15] -isIdleClosedLoop = bits, U32, 1300, [16:16] -targetRpmByClt = scalar, S32, 1304, "", 1, 0 -targetRpmAcBump = scalar, S32, 1308, "", 1, 0 -iacByRpmTaper = scalar, F32, 1312 -luaAdd = scalar, F32, 1316 -; total TS size = 1320 -idlePosition = scalar, F32, 1320, "per", 1,0 -trim = scalar, F32, 1324, "", 1, 0 -luaAdjustment = scalar, F32, 1328, "per", 1,0 -m_wastegatePosition = scalar, F32, 1332, "per", 1,0 -etbFeedForward = scalar, F32, 1336 -etbIntegralError = scalar, F32, 1340, "", 1, 0 -etbCurrentTarget = scalar, F32, 1344, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1348, "%", 1, 0 -etbRevLimitActive = bits, U32, 1352, [0:0] -jamDetected = bits, U32, 1352, [1:1] -etbDutyRateOfChange = scalar, F32, 1356, "per", 1,0 -etbDutyAverage = scalar, F32, 1360, "per", 1,0 -etbTpsErrorCounter = scalar, U16, 1364, "count", 1,0 -etbPpsErrorCounter = scalar, U16, 1366, "count", 1,0 -etbErrorCode = scalar, S08, 1368, "", 1, 0 -jamTimer = scalar, U16, 1370, "sec", 0.01, 0 -; total TS size = 1372 -faultCode = scalar, U08, 1372, "", 1, 0 -heaterDuty = scalar, U08, 1373, "%", 1, 0 -pumpDuty = scalar, U08, 1374, "%", 1, 0 -tempC = scalar, U16, 1376, "C", 1, 0 -nernstVoltage = scalar, U16, 1378, "V", 0.001, 0 -esr = scalar, U16, 1380, "ohm", 1, 0 -; total TS size = 1384 -dcOutput0 = scalar, F32, 1384, "per", 1,0 -isEnabled0_int = scalar, U08, 1388, "per", 1,0 -isEnabled0 = bits, U32, 1392, [0:0] -; total TS size = 1396 -value0 = scalar, U16, 1396, "value", 1,0 -value1 = scalar, U16, 1398, "value", 1,0 -errorRate = scalar, F32, 1400, "ratio", 1,0 +idleClosedLoop = scalar, F32, 1292 +iacByTpsTaper = scalar, F32, 1296 +throttlePedalUpState = scalar, S32, 1300, "", 1, 0 +mightResetPid = bits, U32, 1304, [0:0] +shouldResetPid = bits, U32, 1304, [1:1] +wasResetPid = bits, U32, 1304, [2:2] +mustResetPid = bits, U32, 1304, [3:3] +isCranking = bits, U32, 1304, [4:4] +isIacTableForCoasting = bits, U32, 1304, [5:5] +notIdling = bits, U32, 1304, [6:6] +needReset = bits, U32, 1304, [7:7] +isInDeadZone = bits, U32, 1304, [8:8] +isBlipping = bits, U32, 1304, [9:9] +useClosedLoop = bits, U32, 1304, [10:10] +badTps = bits, U32, 1304, [11:11] +looksLikeRunning = bits, U32, 1304, [12:12] +looksLikeCoasting = bits, U32, 1304, [13:13] +looksLikeCrankToIdle = bits, U32, 1304, [14:14] +isIdleCoasting = bits, U32, 1304, [15:15] +isIdleClosedLoop = bits, U32, 1304, [16:16] +idleTarget = scalar, S32, 1308, "", 1, 0 +targetRpmByClt = scalar, S32, 1312, "", 1, 0 +targetRpmAcBump = scalar, S32, 1316, "", 1, 0 +iacByRpmTaper = scalar, F32, 1320 +luaAdd = scalar, F32, 1324 +; total TS size = 1328 +idlePosition = scalar, F32, 1328, "per", 1,0 +trim = scalar, F32, 1332, "", 1, 0 +luaAdjustment = scalar, F32, 1336, "per", 1,0 +m_wastegatePosition = scalar, F32, 1340, "per", 1,0 +etbFeedForward = scalar, F32, 1344 +etbIntegralError = scalar, F32, 1348, "", 1, 0 +etbCurrentTarget = scalar, F32, 1352, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1356, "%", 1, 0 +etbRevLimitActive = bits, U32, 1360, [0:0] +jamDetected = bits, U32, 1360, [1:1] +etbDutyRateOfChange = scalar, F32, 1364, "per", 1,0 +etbDutyAverage = scalar, F32, 1368, "per", 1,0 +etbTpsErrorCounter = scalar, U16, 1372, "count", 1,0 +etbPpsErrorCounter = scalar, U16, 1374, "count", 1,0 +etbErrorCode = scalar, S08, 1376, "", 1, 0 +jamTimer = scalar, U16, 1378, "sec", 0.01, 0 +; total TS size = 1380 +faultCode = scalar, U08, 1380, "", 1, 0 +heaterDuty = scalar, U08, 1381, "%", 1, 0 +pumpDuty = scalar, U08, 1382, "%", 1, 0 +tempC = scalar, U16, 1384, "C", 1, 0 +nernstVoltage = scalar, U16, 1386, "V", 0.001, 0 +esr = scalar, U16, 1388, "ohm", 1, 0 +; total TS size = 1392 +dcOutput0 = scalar, F32, 1392, "per", 1,0 +isEnabled0_int = scalar, U08, 1396, "per", 1,0 +isEnabled0 = bits, U32, 1400, [0:0] ; total TS size = 1404 -vvtTarget = scalar, U16, 1404, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1406, "%", 0.5, 0 -; total TS size = 1408 -lambdaCurrentlyGood = bits, U32, 1408, [0:0] -lambdaMonitorCut = bits, U32, 1408, [1:1] -lambdaTimeSinceGood = scalar, U16, 1412, "sec", 0.01, 0 +value0 = scalar, U16, 1404, "value", 1,0 +value1 = scalar, U16, 1406, "value", 1,0 +errorRate = scalar, F32, 1408, "ratio", 1,0 +; total TS size = 1412 +vvtTarget = scalar, U16, 1412, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1414, "%", 0.5, 0 ; total TS size = 1416 +lambdaCurrentlyGood = bits, U32, 1416, [0:0] +lambdaMonitorCut = bits, U32, 1416, [1:1] +lambdaTimeSinceGood = scalar, U16, 1420, "sec", 0.01, 0 +; total TS size = 1424 time = { timeNow } @@ -5173,8 +5175,9 @@ entry = m_hasSynchronizedPhase, "sync: Known Engine Phase", int, "%d" entry = wallFuelCorrection, "fuel wallwetting injection time", float, "%.3f" entry = wallFuel, "Fuel on the wall", float, "%.3f" entry = idleState, "idleState", int, "%d" -entry = currentIdlePosition, "idle: current position", float, "%.3f" +entry = currentIdlePosition, "Idle: Position", float, "%.3f" entry = baseIdlePosition, "idle: base value", float, "%.3f" +entry = idleClosedLoop, "Idle: Closed loop", float, "%.3f" entry = iacByTpsTaper, "idle: iacByTpsTaper portion", float, "%.3f" entry = throttlePedalUpState, "idle: throttlePedalUpState", int, "%d" entry = mightResetPid, "idle: mightResetPid", int, "%d" @@ -5194,8 +5197,9 @@ entry = looksLikeCoasting, "looksLikeCoasting", int, "%d" entry = looksLikeCrankToIdle, "looksLikeCrankToIdle", int, "%d" entry = isIdleCoasting, "Idle: coasting", int, "%d" entry = isIdleClosedLoop, "Idle: Closed loop active", int, "%d" -entry = targetRpmByClt, "idle: target by CLT", int, "%d" -entry = targetRpmAcBump, "idle: A/C bump", int, "%d" +entry = idleTarget, "Idle: Target RPM", int, "%d" +entry = targetRpmByClt, "Idle: Target RPM base", int, "%d" +entry = targetRpmAcBump, "Idle: Target A/C bump", int, "%d" entry = iacByRpmTaper, "idle: iacByRpmTaper portion", float, "%.3f" entry = luaAdd, "idle: Lua Adder", float, "%.3f" entry = idlePosition, "ETB: idlePosition", float, "%.3f" @@ -6105,13 +6109,15 @@ dialog = idle_stateDialog, "idle_state" graphLine = idleState graphLine = currentIdlePosition graphLine = baseIdlePosition - graphLine = iacByTpsTaper + graphLine = idleClosedLoop liveGraph = idle_state_2_Graph, "Graph", South + graphLine = iacByTpsTaper graphLine = throttlePedalUpState + graphLine = idleTarget graphLine = targetRpmByClt + liveGraph = idle_state_3_Graph, "Graph", South graphLine = targetRpmAcBump graphLine = iacByRpmTaper - liveGraph = idle_state_3_Graph, "Graph", South graphLine = luaAdd indicatorPanel = electronic_throttleIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_atlas.ini b/firmware/tunerstudio/generated/rusefi_atlas.ini index 779690a9e2..2e79493e96 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.09.28.atlas.2452449628" + signature = "rusEFI master.2023.09.28.atlas.1502712740" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.09.28.atlas.2452449628" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.09.28.atlas.1502712740" ; 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 Thu Sep 28 03:25:40 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Thu Sep 28 13:46:16 UTC 2023 pageSize = 23664 page = 1 @@ -2320,7 +2320,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23654, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1416 + ochBlockSize = 1424 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3039,69 +3039,71 @@ wallFuel = scalar, F32, 1276, "", 1, 0 idleState = bits, S32, 1280, [0:2], "not important" currentIdlePosition = scalar, F32, 1284 baseIdlePosition = scalar, F32, 1288 -iacByTpsTaper = scalar, F32, 1292 -throttlePedalUpState = scalar, S32, 1296, "", 1, 0 -mightResetPid = bits, U32, 1300, [0:0] -shouldResetPid = bits, U32, 1300, [1:1] -wasResetPid = bits, U32, 1300, [2:2] -mustResetPid = bits, U32, 1300, [3:3] -isCranking = bits, U32, 1300, [4:4] -isIacTableForCoasting = bits, U32, 1300, [5:5] -notIdling = bits, U32, 1300, [6:6] -needReset = bits, U32, 1300, [7:7] -isInDeadZone = bits, U32, 1300, [8:8] -isBlipping = bits, U32, 1300, [9:9] -useClosedLoop = bits, U32, 1300, [10:10] -badTps = bits, U32, 1300, [11:11] -looksLikeRunning = bits, U32, 1300, [12:12] -looksLikeCoasting = bits, U32, 1300, [13:13] -looksLikeCrankToIdle = bits, U32, 1300, [14:14] -isIdleCoasting = bits, U32, 1300, [15:15] -isIdleClosedLoop = bits, U32, 1300, [16:16] -targetRpmByClt = scalar, S32, 1304, "", 1, 0 -targetRpmAcBump = scalar, S32, 1308, "", 1, 0 -iacByRpmTaper = scalar, F32, 1312 -luaAdd = scalar, F32, 1316 -; total TS size = 1320 -idlePosition = scalar, F32, 1320, "per", 1,0 -trim = scalar, F32, 1324, "", 1, 0 -luaAdjustment = scalar, F32, 1328, "per", 1,0 -m_wastegatePosition = scalar, F32, 1332, "per", 1,0 -etbFeedForward = scalar, F32, 1336 -etbIntegralError = scalar, F32, 1340, "", 1, 0 -etbCurrentTarget = scalar, F32, 1344, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1348, "%", 1, 0 -etbRevLimitActive = bits, U32, 1352, [0:0] -jamDetected = bits, U32, 1352, [1:1] -etbDutyRateOfChange = scalar, F32, 1356, "per", 1,0 -etbDutyAverage = scalar, F32, 1360, "per", 1,0 -etbTpsErrorCounter = scalar, U16, 1364, "count", 1,0 -etbPpsErrorCounter = scalar, U16, 1366, "count", 1,0 -etbErrorCode = scalar, S08, 1368, "", 1, 0 -jamTimer = scalar, U16, 1370, "sec", 0.01, 0 -; total TS size = 1372 -faultCode = scalar, U08, 1372, "", 1, 0 -heaterDuty = scalar, U08, 1373, "%", 1, 0 -pumpDuty = scalar, U08, 1374, "%", 1, 0 -tempC = scalar, U16, 1376, "C", 1, 0 -nernstVoltage = scalar, U16, 1378, "V", 0.001, 0 -esr = scalar, U16, 1380, "ohm", 1, 0 -; total TS size = 1384 -dcOutput0 = scalar, F32, 1384, "per", 1,0 -isEnabled0_int = scalar, U08, 1388, "per", 1,0 -isEnabled0 = bits, U32, 1392, [0:0] -; total TS size = 1396 -value0 = scalar, U16, 1396, "value", 1,0 -value1 = scalar, U16, 1398, "value", 1,0 -errorRate = scalar, F32, 1400, "ratio", 1,0 +idleClosedLoop = scalar, F32, 1292 +iacByTpsTaper = scalar, F32, 1296 +throttlePedalUpState = scalar, S32, 1300, "", 1, 0 +mightResetPid = bits, U32, 1304, [0:0] +shouldResetPid = bits, U32, 1304, [1:1] +wasResetPid = bits, U32, 1304, [2:2] +mustResetPid = bits, U32, 1304, [3:3] +isCranking = bits, U32, 1304, [4:4] +isIacTableForCoasting = bits, U32, 1304, [5:5] +notIdling = bits, U32, 1304, [6:6] +needReset = bits, U32, 1304, [7:7] +isInDeadZone = bits, U32, 1304, [8:8] +isBlipping = bits, U32, 1304, [9:9] +useClosedLoop = bits, U32, 1304, [10:10] +badTps = bits, U32, 1304, [11:11] +looksLikeRunning = bits, U32, 1304, [12:12] +looksLikeCoasting = bits, U32, 1304, [13:13] +looksLikeCrankToIdle = bits, U32, 1304, [14:14] +isIdleCoasting = bits, U32, 1304, [15:15] +isIdleClosedLoop = bits, U32, 1304, [16:16] +idleTarget = scalar, S32, 1308, "", 1, 0 +targetRpmByClt = scalar, S32, 1312, "", 1, 0 +targetRpmAcBump = scalar, S32, 1316, "", 1, 0 +iacByRpmTaper = scalar, F32, 1320 +luaAdd = scalar, F32, 1324 +; total TS size = 1328 +idlePosition = scalar, F32, 1328, "per", 1,0 +trim = scalar, F32, 1332, "", 1, 0 +luaAdjustment = scalar, F32, 1336, "per", 1,0 +m_wastegatePosition = scalar, F32, 1340, "per", 1,0 +etbFeedForward = scalar, F32, 1344 +etbIntegralError = scalar, F32, 1348, "", 1, 0 +etbCurrentTarget = scalar, F32, 1352, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1356, "%", 1, 0 +etbRevLimitActive = bits, U32, 1360, [0:0] +jamDetected = bits, U32, 1360, [1:1] +etbDutyRateOfChange = scalar, F32, 1364, "per", 1,0 +etbDutyAverage = scalar, F32, 1368, "per", 1,0 +etbTpsErrorCounter = scalar, U16, 1372, "count", 1,0 +etbPpsErrorCounter = scalar, U16, 1374, "count", 1,0 +etbErrorCode = scalar, S08, 1376, "", 1, 0 +jamTimer = scalar, U16, 1378, "sec", 0.01, 0 +; total TS size = 1380 +faultCode = scalar, U08, 1380, "", 1, 0 +heaterDuty = scalar, U08, 1381, "%", 1, 0 +pumpDuty = scalar, U08, 1382, "%", 1, 0 +tempC = scalar, U16, 1384, "C", 1, 0 +nernstVoltage = scalar, U16, 1386, "V", 0.001, 0 +esr = scalar, U16, 1388, "ohm", 1, 0 +; total TS size = 1392 +dcOutput0 = scalar, F32, 1392, "per", 1,0 +isEnabled0_int = scalar, U08, 1396, "per", 1,0 +isEnabled0 = bits, U32, 1400, [0:0] ; total TS size = 1404 -vvtTarget = scalar, U16, 1404, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1406, "%", 0.5, 0 -; total TS size = 1408 -lambdaCurrentlyGood = bits, U32, 1408, [0:0] -lambdaMonitorCut = bits, U32, 1408, [1:1] -lambdaTimeSinceGood = scalar, U16, 1412, "sec", 0.01, 0 +value0 = scalar, U16, 1404, "value", 1,0 +value1 = scalar, U16, 1406, "value", 1,0 +errorRate = scalar, F32, 1408, "ratio", 1,0 +; total TS size = 1412 +vvtTarget = scalar, U16, 1412, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1414, "%", 0.5, 0 ; total TS size = 1416 +lambdaCurrentlyGood = bits, U32, 1416, [0:0] +lambdaMonitorCut = bits, U32, 1416, [1:1] +lambdaTimeSinceGood = scalar, U16, 1420, "sec", 0.01, 0 +; total TS size = 1424 time = { timeNow } @@ -5173,8 +5175,9 @@ entry = m_hasSynchronizedPhase, "sync: Known Engine Phase", int, "%d" entry = wallFuelCorrection, "fuel wallwetting injection time", float, "%.3f" entry = wallFuel, "Fuel on the wall", float, "%.3f" entry = idleState, "idleState", int, "%d" -entry = currentIdlePosition, "idle: current position", float, "%.3f" +entry = currentIdlePosition, "Idle: Position", float, "%.3f" entry = baseIdlePosition, "idle: base value", float, "%.3f" +entry = idleClosedLoop, "Idle: Closed loop", float, "%.3f" entry = iacByTpsTaper, "idle: iacByTpsTaper portion", float, "%.3f" entry = throttlePedalUpState, "idle: throttlePedalUpState", int, "%d" entry = mightResetPid, "idle: mightResetPid", int, "%d" @@ -5194,8 +5197,9 @@ entry = looksLikeCoasting, "looksLikeCoasting", int, "%d" entry = looksLikeCrankToIdle, "looksLikeCrankToIdle", int, "%d" entry = isIdleCoasting, "Idle: coasting", int, "%d" entry = isIdleClosedLoop, "Idle: Closed loop active", int, "%d" -entry = targetRpmByClt, "idle: target by CLT", int, "%d" -entry = targetRpmAcBump, "idle: A/C bump", int, "%d" +entry = idleTarget, "Idle: Target RPM", int, "%d" +entry = targetRpmByClt, "Idle: Target RPM base", int, "%d" +entry = targetRpmAcBump, "Idle: Target A/C bump", int, "%d" entry = iacByRpmTaper, "idle: iacByRpmTaper portion", float, "%.3f" entry = luaAdd, "idle: Lua Adder", float, "%.3f" entry = idlePosition, "ETB: idlePosition", float, "%.3f" @@ -6103,13 +6107,15 @@ dialog = idle_stateDialog, "idle_state" graphLine = idleState graphLine = currentIdlePosition graphLine = baseIdlePosition - graphLine = iacByTpsTaper + graphLine = idleClosedLoop liveGraph = idle_state_2_Graph, "Graph", South + graphLine = iacByTpsTaper graphLine = throttlePedalUpState + graphLine = idleTarget graphLine = targetRpmByClt + liveGraph = idle_state_3_Graph, "Graph", South graphLine = targetRpmAcBump graphLine = iacByRpmTaper - liveGraph = idle_state_3_Graph, "Graph", South graphLine = luaAdd indicatorPanel = electronic_throttleIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_core8.ini b/firmware/tunerstudio/generated/rusefi_core8.ini index 854bb1123e..80bb8cc3d1 100644 --- a/firmware/tunerstudio/generated/rusefi_core8.ini +++ b/firmware/tunerstudio/generated/rusefi_core8.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.09.28.core8.3066073549" + signature = "rusEFI master.2023.09.28.core8.2105305909" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.09.28.core8.3066073549" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.09.28.core8.2105305909" ; 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","On-board Battery Sense (A0)","Analog Inputs 1 (A1)","Analog Inputs 2 (A2)","Analog Inputs 3 (A3)","Analog Inputs 4 (A4)","On-board MAP (A5)","Analog Inputs 6 (A6)","Analog Inputs 7 (A7)","On-board BARO (B0)","Analog Inputs 9 (B1)","Analog Inputs 10 (C0)","Primary On-board O2 (C1)","Secondary On-board O2 (C2)","Analog Inputs 13 (C3)","Analog Inputs 14 (C4)","Analog Inputs 15 (C5)" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Thu Sep 28 03:24:57 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Thu Sep 28 13:45:32 UTC 2023 pageSize = 23664 page = 1 @@ -2320,7 +2320,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23654, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1416 + ochBlockSize = 1424 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3039,69 +3039,71 @@ wallFuel = scalar, F32, 1276, "", 1, 0 idleState = bits, S32, 1280, [0:2], "not important" currentIdlePosition = scalar, F32, 1284 baseIdlePosition = scalar, F32, 1288 -iacByTpsTaper = scalar, F32, 1292 -throttlePedalUpState = scalar, S32, 1296, "", 1, 0 -mightResetPid = bits, U32, 1300, [0:0] -shouldResetPid = bits, U32, 1300, [1:1] -wasResetPid = bits, U32, 1300, [2:2] -mustResetPid = bits, U32, 1300, [3:3] -isCranking = bits, U32, 1300, [4:4] -isIacTableForCoasting = bits, U32, 1300, [5:5] -notIdling = bits, U32, 1300, [6:6] -needReset = bits, U32, 1300, [7:7] -isInDeadZone = bits, U32, 1300, [8:8] -isBlipping = bits, U32, 1300, [9:9] -useClosedLoop = bits, U32, 1300, [10:10] -badTps = bits, U32, 1300, [11:11] -looksLikeRunning = bits, U32, 1300, [12:12] -looksLikeCoasting = bits, U32, 1300, [13:13] -looksLikeCrankToIdle = bits, U32, 1300, [14:14] -isIdleCoasting = bits, U32, 1300, [15:15] -isIdleClosedLoop = bits, U32, 1300, [16:16] -targetRpmByClt = scalar, S32, 1304, "", 1, 0 -targetRpmAcBump = scalar, S32, 1308, "", 1, 0 -iacByRpmTaper = scalar, F32, 1312 -luaAdd = scalar, F32, 1316 -; total TS size = 1320 -idlePosition = scalar, F32, 1320, "per", 1,0 -trim = scalar, F32, 1324, "", 1, 0 -luaAdjustment = scalar, F32, 1328, "per", 1,0 -m_wastegatePosition = scalar, F32, 1332, "per", 1,0 -etbFeedForward = scalar, F32, 1336 -etbIntegralError = scalar, F32, 1340, "", 1, 0 -etbCurrentTarget = scalar, F32, 1344, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1348, "%", 1, 0 -etbRevLimitActive = bits, U32, 1352, [0:0] -jamDetected = bits, U32, 1352, [1:1] -etbDutyRateOfChange = scalar, F32, 1356, "per", 1,0 -etbDutyAverage = scalar, F32, 1360, "per", 1,0 -etbTpsErrorCounter = scalar, U16, 1364, "count", 1,0 -etbPpsErrorCounter = scalar, U16, 1366, "count", 1,0 -etbErrorCode = scalar, S08, 1368, "", 1, 0 -jamTimer = scalar, U16, 1370, "sec", 0.01, 0 -; total TS size = 1372 -faultCode = scalar, U08, 1372, "", 1, 0 -heaterDuty = scalar, U08, 1373, "%", 1, 0 -pumpDuty = scalar, U08, 1374, "%", 1, 0 -tempC = scalar, U16, 1376, "C", 1, 0 -nernstVoltage = scalar, U16, 1378, "V", 0.001, 0 -esr = scalar, U16, 1380, "ohm", 1, 0 -; total TS size = 1384 -dcOutput0 = scalar, F32, 1384, "per", 1,0 -isEnabled0_int = scalar, U08, 1388, "per", 1,0 -isEnabled0 = bits, U32, 1392, [0:0] -; total TS size = 1396 -value0 = scalar, U16, 1396, "value", 1,0 -value1 = scalar, U16, 1398, "value", 1,0 -errorRate = scalar, F32, 1400, "ratio", 1,0 +idleClosedLoop = scalar, F32, 1292 +iacByTpsTaper = scalar, F32, 1296 +throttlePedalUpState = scalar, S32, 1300, "", 1, 0 +mightResetPid = bits, U32, 1304, [0:0] +shouldResetPid = bits, U32, 1304, [1:1] +wasResetPid = bits, U32, 1304, [2:2] +mustResetPid = bits, U32, 1304, [3:3] +isCranking = bits, U32, 1304, [4:4] +isIacTableForCoasting = bits, U32, 1304, [5:5] +notIdling = bits, U32, 1304, [6:6] +needReset = bits, U32, 1304, [7:7] +isInDeadZone = bits, U32, 1304, [8:8] +isBlipping = bits, U32, 1304, [9:9] +useClosedLoop = bits, U32, 1304, [10:10] +badTps = bits, U32, 1304, [11:11] +looksLikeRunning = bits, U32, 1304, [12:12] +looksLikeCoasting = bits, U32, 1304, [13:13] +looksLikeCrankToIdle = bits, U32, 1304, [14:14] +isIdleCoasting = bits, U32, 1304, [15:15] +isIdleClosedLoop = bits, U32, 1304, [16:16] +idleTarget = scalar, S32, 1308, "", 1, 0 +targetRpmByClt = scalar, S32, 1312, "", 1, 0 +targetRpmAcBump = scalar, S32, 1316, "", 1, 0 +iacByRpmTaper = scalar, F32, 1320 +luaAdd = scalar, F32, 1324 +; total TS size = 1328 +idlePosition = scalar, F32, 1328, "per", 1,0 +trim = scalar, F32, 1332, "", 1, 0 +luaAdjustment = scalar, F32, 1336, "per", 1,0 +m_wastegatePosition = scalar, F32, 1340, "per", 1,0 +etbFeedForward = scalar, F32, 1344 +etbIntegralError = scalar, F32, 1348, "", 1, 0 +etbCurrentTarget = scalar, F32, 1352, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1356, "%", 1, 0 +etbRevLimitActive = bits, U32, 1360, [0:0] +jamDetected = bits, U32, 1360, [1:1] +etbDutyRateOfChange = scalar, F32, 1364, "per", 1,0 +etbDutyAverage = scalar, F32, 1368, "per", 1,0 +etbTpsErrorCounter = scalar, U16, 1372, "count", 1,0 +etbPpsErrorCounter = scalar, U16, 1374, "count", 1,0 +etbErrorCode = scalar, S08, 1376, "", 1, 0 +jamTimer = scalar, U16, 1378, "sec", 0.01, 0 +; total TS size = 1380 +faultCode = scalar, U08, 1380, "", 1, 0 +heaterDuty = scalar, U08, 1381, "%", 1, 0 +pumpDuty = scalar, U08, 1382, "%", 1, 0 +tempC = scalar, U16, 1384, "C", 1, 0 +nernstVoltage = scalar, U16, 1386, "V", 0.001, 0 +esr = scalar, U16, 1388, "ohm", 1, 0 +; total TS size = 1392 +dcOutput0 = scalar, F32, 1392, "per", 1,0 +isEnabled0_int = scalar, U08, 1396, "per", 1,0 +isEnabled0 = bits, U32, 1400, [0:0] ; total TS size = 1404 -vvtTarget = scalar, U16, 1404, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1406, "%", 0.5, 0 -; total TS size = 1408 -lambdaCurrentlyGood = bits, U32, 1408, [0:0] -lambdaMonitorCut = bits, U32, 1408, [1:1] -lambdaTimeSinceGood = scalar, U16, 1412, "sec", 0.01, 0 +value0 = scalar, U16, 1404, "value", 1,0 +value1 = scalar, U16, 1406, "value", 1,0 +errorRate = scalar, F32, 1408, "ratio", 1,0 +; total TS size = 1412 +vvtTarget = scalar, U16, 1412, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1414, "%", 0.5, 0 ; total TS size = 1416 +lambdaCurrentlyGood = bits, U32, 1416, [0:0] +lambdaMonitorCut = bits, U32, 1416, [1:1] +lambdaTimeSinceGood = scalar, U16, 1420, "sec", 0.01, 0 +; total TS size = 1424 time = { timeNow } @@ -5173,8 +5175,9 @@ entry = m_hasSynchronizedPhase, "sync: Known Engine Phase", int, "%d" entry = wallFuelCorrection, "fuel wallwetting injection time", float, "%.3f" entry = wallFuel, "Fuel on the wall", float, "%.3f" entry = idleState, "idleState", int, "%d" -entry = currentIdlePosition, "idle: current position", float, "%.3f" +entry = currentIdlePosition, "Idle: Position", float, "%.3f" entry = baseIdlePosition, "idle: base value", float, "%.3f" +entry = idleClosedLoop, "Idle: Closed loop", float, "%.3f" entry = iacByTpsTaper, "idle: iacByTpsTaper portion", float, "%.3f" entry = throttlePedalUpState, "idle: throttlePedalUpState", int, "%d" entry = mightResetPid, "idle: mightResetPid", int, "%d" @@ -5194,8 +5197,9 @@ entry = looksLikeCoasting, "looksLikeCoasting", int, "%d" entry = looksLikeCrankToIdle, "looksLikeCrankToIdle", int, "%d" entry = isIdleCoasting, "Idle: coasting", int, "%d" entry = isIdleClosedLoop, "Idle: Closed loop active", int, "%d" -entry = targetRpmByClt, "idle: target by CLT", int, "%d" -entry = targetRpmAcBump, "idle: A/C bump", int, "%d" +entry = idleTarget, "Idle: Target RPM", int, "%d" +entry = targetRpmByClt, "Idle: Target RPM base", int, "%d" +entry = targetRpmAcBump, "Idle: Target A/C bump", int, "%d" entry = iacByRpmTaper, "idle: iacByRpmTaper portion", float, "%.3f" entry = luaAdd, "idle: Lua Adder", float, "%.3f" entry = idlePosition, "ETB: idlePosition", float, "%.3f" @@ -6105,13 +6109,15 @@ dialog = idle_stateDialog, "idle_state" graphLine = idleState graphLine = currentIdlePosition graphLine = baseIdlePosition - graphLine = iacByTpsTaper + graphLine = idleClosedLoop liveGraph = idle_state_2_Graph, "Graph", South + graphLine = iacByTpsTaper graphLine = throttlePedalUpState + graphLine = idleTarget graphLine = targetRpmByClt + liveGraph = idle_state_3_Graph, "Graph", South graphLine = targetRpmAcBump graphLine = iacByRpmTaper - liveGraph = idle_state_3_Graph, "Graph", South graphLine = luaAdd indicatorPanel = electronic_throttleIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_cypress.ini b/firmware/tunerstudio/generated/rusefi_cypress.ini index a11105d00d..587938e8b7 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.09.28.cypress.2397543547" + signature = "rusEFI master.2023.09.28.cypress.1163617923" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.09.28.cypress.2397543547" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.09.28.cypress.1163617923" ; 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 Thu Sep 28 03:23:45 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Thu Sep 28 13:44:17 UTC 2023 pageSize = 23664 page = 1 @@ -2320,7 +2320,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23654, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1416 + ochBlockSize = 1424 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3039,69 +3039,71 @@ wallFuel = scalar, F32, 1276, "", 1, 0 idleState = bits, S32, 1280, [0:2], "not important" currentIdlePosition = scalar, F32, 1284 baseIdlePosition = scalar, F32, 1288 -iacByTpsTaper = scalar, F32, 1292 -throttlePedalUpState = scalar, S32, 1296, "", 1, 0 -mightResetPid = bits, U32, 1300, [0:0] -shouldResetPid = bits, U32, 1300, [1:1] -wasResetPid = bits, U32, 1300, [2:2] -mustResetPid = bits, U32, 1300, [3:3] -isCranking = bits, U32, 1300, [4:4] -isIacTableForCoasting = bits, U32, 1300, [5:5] -notIdling = bits, U32, 1300, [6:6] -needReset = bits, U32, 1300, [7:7] -isInDeadZone = bits, U32, 1300, [8:8] -isBlipping = bits, U32, 1300, [9:9] -useClosedLoop = bits, U32, 1300, [10:10] -badTps = bits, U32, 1300, [11:11] -looksLikeRunning = bits, U32, 1300, [12:12] -looksLikeCoasting = bits, U32, 1300, [13:13] -looksLikeCrankToIdle = bits, U32, 1300, [14:14] -isIdleCoasting = bits, U32, 1300, [15:15] -isIdleClosedLoop = bits, U32, 1300, [16:16] -targetRpmByClt = scalar, S32, 1304, "", 1, 0 -targetRpmAcBump = scalar, S32, 1308, "", 1, 0 -iacByRpmTaper = scalar, F32, 1312 -luaAdd = scalar, F32, 1316 -; total TS size = 1320 -idlePosition = scalar, F32, 1320, "per", 1,0 -trim = scalar, F32, 1324, "", 1, 0 -luaAdjustment = scalar, F32, 1328, "per", 1,0 -m_wastegatePosition = scalar, F32, 1332, "per", 1,0 -etbFeedForward = scalar, F32, 1336 -etbIntegralError = scalar, F32, 1340, "", 1, 0 -etbCurrentTarget = scalar, F32, 1344, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1348, "%", 1, 0 -etbRevLimitActive = bits, U32, 1352, [0:0] -jamDetected = bits, U32, 1352, [1:1] -etbDutyRateOfChange = scalar, F32, 1356, "per", 1,0 -etbDutyAverage = scalar, F32, 1360, "per", 1,0 -etbTpsErrorCounter = scalar, U16, 1364, "count", 1,0 -etbPpsErrorCounter = scalar, U16, 1366, "count", 1,0 -etbErrorCode = scalar, S08, 1368, "", 1, 0 -jamTimer = scalar, U16, 1370, "sec", 0.01, 0 -; total TS size = 1372 -faultCode = scalar, U08, 1372, "", 1, 0 -heaterDuty = scalar, U08, 1373, "%", 1, 0 -pumpDuty = scalar, U08, 1374, "%", 1, 0 -tempC = scalar, U16, 1376, "C", 1, 0 -nernstVoltage = scalar, U16, 1378, "V", 0.001, 0 -esr = scalar, U16, 1380, "ohm", 1, 0 -; total TS size = 1384 -dcOutput0 = scalar, F32, 1384, "per", 1,0 -isEnabled0_int = scalar, U08, 1388, "per", 1,0 -isEnabled0 = bits, U32, 1392, [0:0] -; total TS size = 1396 -value0 = scalar, U16, 1396, "value", 1,0 -value1 = scalar, U16, 1398, "value", 1,0 -errorRate = scalar, F32, 1400, "ratio", 1,0 +idleClosedLoop = scalar, F32, 1292 +iacByTpsTaper = scalar, F32, 1296 +throttlePedalUpState = scalar, S32, 1300, "", 1, 0 +mightResetPid = bits, U32, 1304, [0:0] +shouldResetPid = bits, U32, 1304, [1:1] +wasResetPid = bits, U32, 1304, [2:2] +mustResetPid = bits, U32, 1304, [3:3] +isCranking = bits, U32, 1304, [4:4] +isIacTableForCoasting = bits, U32, 1304, [5:5] +notIdling = bits, U32, 1304, [6:6] +needReset = bits, U32, 1304, [7:7] +isInDeadZone = bits, U32, 1304, [8:8] +isBlipping = bits, U32, 1304, [9:9] +useClosedLoop = bits, U32, 1304, [10:10] +badTps = bits, U32, 1304, [11:11] +looksLikeRunning = bits, U32, 1304, [12:12] +looksLikeCoasting = bits, U32, 1304, [13:13] +looksLikeCrankToIdle = bits, U32, 1304, [14:14] +isIdleCoasting = bits, U32, 1304, [15:15] +isIdleClosedLoop = bits, U32, 1304, [16:16] +idleTarget = scalar, S32, 1308, "", 1, 0 +targetRpmByClt = scalar, S32, 1312, "", 1, 0 +targetRpmAcBump = scalar, S32, 1316, "", 1, 0 +iacByRpmTaper = scalar, F32, 1320 +luaAdd = scalar, F32, 1324 +; total TS size = 1328 +idlePosition = scalar, F32, 1328, "per", 1,0 +trim = scalar, F32, 1332, "", 1, 0 +luaAdjustment = scalar, F32, 1336, "per", 1,0 +m_wastegatePosition = scalar, F32, 1340, "per", 1,0 +etbFeedForward = scalar, F32, 1344 +etbIntegralError = scalar, F32, 1348, "", 1, 0 +etbCurrentTarget = scalar, F32, 1352, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1356, "%", 1, 0 +etbRevLimitActive = bits, U32, 1360, [0:0] +jamDetected = bits, U32, 1360, [1:1] +etbDutyRateOfChange = scalar, F32, 1364, "per", 1,0 +etbDutyAverage = scalar, F32, 1368, "per", 1,0 +etbTpsErrorCounter = scalar, U16, 1372, "count", 1,0 +etbPpsErrorCounter = scalar, U16, 1374, "count", 1,0 +etbErrorCode = scalar, S08, 1376, "", 1, 0 +jamTimer = scalar, U16, 1378, "sec", 0.01, 0 +; total TS size = 1380 +faultCode = scalar, U08, 1380, "", 1, 0 +heaterDuty = scalar, U08, 1381, "%", 1, 0 +pumpDuty = scalar, U08, 1382, "%", 1, 0 +tempC = scalar, U16, 1384, "C", 1, 0 +nernstVoltage = scalar, U16, 1386, "V", 0.001, 0 +esr = scalar, U16, 1388, "ohm", 1, 0 +; total TS size = 1392 +dcOutput0 = scalar, F32, 1392, "per", 1,0 +isEnabled0_int = scalar, U08, 1396, "per", 1,0 +isEnabled0 = bits, U32, 1400, [0:0] ; total TS size = 1404 -vvtTarget = scalar, U16, 1404, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1406, "%", 0.5, 0 -; total TS size = 1408 -lambdaCurrentlyGood = bits, U32, 1408, [0:0] -lambdaMonitorCut = bits, U32, 1408, [1:1] -lambdaTimeSinceGood = scalar, U16, 1412, "sec", 0.01, 0 +value0 = scalar, U16, 1404, "value", 1,0 +value1 = scalar, U16, 1406, "value", 1,0 +errorRate = scalar, F32, 1408, "ratio", 1,0 +; total TS size = 1412 +vvtTarget = scalar, U16, 1412, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1414, "%", 0.5, 0 ; total TS size = 1416 +lambdaCurrentlyGood = bits, U32, 1416, [0:0] +lambdaMonitorCut = bits, U32, 1416, [1:1] +lambdaTimeSinceGood = scalar, U16, 1420, "sec", 0.01, 0 +; total TS size = 1424 time = { timeNow } @@ -5173,8 +5175,9 @@ entry = m_hasSynchronizedPhase, "sync: Known Engine Phase", int, "%d" entry = wallFuelCorrection, "fuel wallwetting injection time", float, "%.3f" entry = wallFuel, "Fuel on the wall", float, "%.3f" entry = idleState, "idleState", int, "%d" -entry = currentIdlePosition, "idle: current position", float, "%.3f" +entry = currentIdlePosition, "Idle: Position", float, "%.3f" entry = baseIdlePosition, "idle: base value", float, "%.3f" +entry = idleClosedLoop, "Idle: Closed loop", float, "%.3f" entry = iacByTpsTaper, "idle: iacByTpsTaper portion", float, "%.3f" entry = throttlePedalUpState, "idle: throttlePedalUpState", int, "%d" entry = mightResetPid, "idle: mightResetPid", int, "%d" @@ -5194,8 +5197,9 @@ entry = looksLikeCoasting, "looksLikeCoasting", int, "%d" entry = looksLikeCrankToIdle, "looksLikeCrankToIdle", int, "%d" entry = isIdleCoasting, "Idle: coasting", int, "%d" entry = isIdleClosedLoop, "Idle: Closed loop active", int, "%d" -entry = targetRpmByClt, "idle: target by CLT", int, "%d" -entry = targetRpmAcBump, "idle: A/C bump", int, "%d" +entry = idleTarget, "Idle: Target RPM", int, "%d" +entry = targetRpmByClt, "Idle: Target RPM base", int, "%d" +entry = targetRpmAcBump, "Idle: Target A/C bump", int, "%d" entry = iacByRpmTaper, "idle: iacByRpmTaper portion", float, "%.3f" entry = luaAdd, "idle: Lua Adder", float, "%.3f" entry = idlePosition, "ETB: idlePosition", float, "%.3f" @@ -6103,13 +6107,15 @@ dialog = idle_stateDialog, "idle_state" graphLine = idleState graphLine = currentIdlePosition graphLine = baseIdlePosition - graphLine = iacByTpsTaper + graphLine = idleClosedLoop liveGraph = idle_state_2_Graph, "Graph", South + graphLine = iacByTpsTaper graphLine = throttlePedalUpState + graphLine = idleTarget graphLine = targetRpmByClt + liveGraph = idle_state_3_Graph, "Graph", South graphLine = targetRpmAcBump graphLine = iacByRpmTaper - liveGraph = idle_state_3_Graph, "Graph", South graphLine = luaAdd indicatorPanel = electronic_throttleIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_f407-discovery.ini b/firmware/tunerstudio/generated/rusefi_f407-discovery.ini index cbac816c95..1dff84cc2d 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.09.28.f407-discovery.771690048" + signature = "rusEFI master.2023.09.28.f407-discovery.3863213240" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.09.28.f407-discovery.771690048" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.09.28.f407-discovery.3863213240" ; 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 Thu Sep 28 03:25:46 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Thu Sep 28 13:46:22 UTC 2023 pageSize = 23664 page = 1 @@ -2320,7 +2320,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23654, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1416 + ochBlockSize = 1424 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3039,69 +3039,71 @@ wallFuel = scalar, F32, 1276, "", 1, 0 idleState = bits, S32, 1280, [0:2], "not important" currentIdlePosition = scalar, F32, 1284 baseIdlePosition = scalar, F32, 1288 -iacByTpsTaper = scalar, F32, 1292 -throttlePedalUpState = scalar, S32, 1296, "", 1, 0 -mightResetPid = bits, U32, 1300, [0:0] -shouldResetPid = bits, U32, 1300, [1:1] -wasResetPid = bits, U32, 1300, [2:2] -mustResetPid = bits, U32, 1300, [3:3] -isCranking = bits, U32, 1300, [4:4] -isIacTableForCoasting = bits, U32, 1300, [5:5] -notIdling = bits, U32, 1300, [6:6] -needReset = bits, U32, 1300, [7:7] -isInDeadZone = bits, U32, 1300, [8:8] -isBlipping = bits, U32, 1300, [9:9] -useClosedLoop = bits, U32, 1300, [10:10] -badTps = bits, U32, 1300, [11:11] -looksLikeRunning = bits, U32, 1300, [12:12] -looksLikeCoasting = bits, U32, 1300, [13:13] -looksLikeCrankToIdle = bits, U32, 1300, [14:14] -isIdleCoasting = bits, U32, 1300, [15:15] -isIdleClosedLoop = bits, U32, 1300, [16:16] -targetRpmByClt = scalar, S32, 1304, "", 1, 0 -targetRpmAcBump = scalar, S32, 1308, "", 1, 0 -iacByRpmTaper = scalar, F32, 1312 -luaAdd = scalar, F32, 1316 -; total TS size = 1320 -idlePosition = scalar, F32, 1320, "per", 1,0 -trim = scalar, F32, 1324, "", 1, 0 -luaAdjustment = scalar, F32, 1328, "per", 1,0 -m_wastegatePosition = scalar, F32, 1332, "per", 1,0 -etbFeedForward = scalar, F32, 1336 -etbIntegralError = scalar, F32, 1340, "", 1, 0 -etbCurrentTarget = scalar, F32, 1344, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1348, "%", 1, 0 -etbRevLimitActive = bits, U32, 1352, [0:0] -jamDetected = bits, U32, 1352, [1:1] -etbDutyRateOfChange = scalar, F32, 1356, "per", 1,0 -etbDutyAverage = scalar, F32, 1360, "per", 1,0 -etbTpsErrorCounter = scalar, U16, 1364, "count", 1,0 -etbPpsErrorCounter = scalar, U16, 1366, "count", 1,0 -etbErrorCode = scalar, S08, 1368, "", 1, 0 -jamTimer = scalar, U16, 1370, "sec", 0.01, 0 -; total TS size = 1372 -faultCode = scalar, U08, 1372, "", 1, 0 -heaterDuty = scalar, U08, 1373, "%", 1, 0 -pumpDuty = scalar, U08, 1374, "%", 1, 0 -tempC = scalar, U16, 1376, "C", 1, 0 -nernstVoltage = scalar, U16, 1378, "V", 0.001, 0 -esr = scalar, U16, 1380, "ohm", 1, 0 -; total TS size = 1384 -dcOutput0 = scalar, F32, 1384, "per", 1,0 -isEnabled0_int = scalar, U08, 1388, "per", 1,0 -isEnabled0 = bits, U32, 1392, [0:0] -; total TS size = 1396 -value0 = scalar, U16, 1396, "value", 1,0 -value1 = scalar, U16, 1398, "value", 1,0 -errorRate = scalar, F32, 1400, "ratio", 1,0 +idleClosedLoop = scalar, F32, 1292 +iacByTpsTaper = scalar, F32, 1296 +throttlePedalUpState = scalar, S32, 1300, "", 1, 0 +mightResetPid = bits, U32, 1304, [0:0] +shouldResetPid = bits, U32, 1304, [1:1] +wasResetPid = bits, U32, 1304, [2:2] +mustResetPid = bits, U32, 1304, [3:3] +isCranking = bits, U32, 1304, [4:4] +isIacTableForCoasting = bits, U32, 1304, [5:5] +notIdling = bits, U32, 1304, [6:6] +needReset = bits, U32, 1304, [7:7] +isInDeadZone = bits, U32, 1304, [8:8] +isBlipping = bits, U32, 1304, [9:9] +useClosedLoop = bits, U32, 1304, [10:10] +badTps = bits, U32, 1304, [11:11] +looksLikeRunning = bits, U32, 1304, [12:12] +looksLikeCoasting = bits, U32, 1304, [13:13] +looksLikeCrankToIdle = bits, U32, 1304, [14:14] +isIdleCoasting = bits, U32, 1304, [15:15] +isIdleClosedLoop = bits, U32, 1304, [16:16] +idleTarget = scalar, S32, 1308, "", 1, 0 +targetRpmByClt = scalar, S32, 1312, "", 1, 0 +targetRpmAcBump = scalar, S32, 1316, "", 1, 0 +iacByRpmTaper = scalar, F32, 1320 +luaAdd = scalar, F32, 1324 +; total TS size = 1328 +idlePosition = scalar, F32, 1328, "per", 1,0 +trim = scalar, F32, 1332, "", 1, 0 +luaAdjustment = scalar, F32, 1336, "per", 1,0 +m_wastegatePosition = scalar, F32, 1340, "per", 1,0 +etbFeedForward = scalar, F32, 1344 +etbIntegralError = scalar, F32, 1348, "", 1, 0 +etbCurrentTarget = scalar, F32, 1352, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1356, "%", 1, 0 +etbRevLimitActive = bits, U32, 1360, [0:0] +jamDetected = bits, U32, 1360, [1:1] +etbDutyRateOfChange = scalar, F32, 1364, "per", 1,0 +etbDutyAverage = scalar, F32, 1368, "per", 1,0 +etbTpsErrorCounter = scalar, U16, 1372, "count", 1,0 +etbPpsErrorCounter = scalar, U16, 1374, "count", 1,0 +etbErrorCode = scalar, S08, 1376, "", 1, 0 +jamTimer = scalar, U16, 1378, "sec", 0.01, 0 +; total TS size = 1380 +faultCode = scalar, U08, 1380, "", 1, 0 +heaterDuty = scalar, U08, 1381, "%", 1, 0 +pumpDuty = scalar, U08, 1382, "%", 1, 0 +tempC = scalar, U16, 1384, "C", 1, 0 +nernstVoltage = scalar, U16, 1386, "V", 0.001, 0 +esr = scalar, U16, 1388, "ohm", 1, 0 +; total TS size = 1392 +dcOutput0 = scalar, F32, 1392, "per", 1,0 +isEnabled0_int = scalar, U08, 1396, "per", 1,0 +isEnabled0 = bits, U32, 1400, [0:0] ; total TS size = 1404 -vvtTarget = scalar, U16, 1404, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1406, "%", 0.5, 0 -; total TS size = 1408 -lambdaCurrentlyGood = bits, U32, 1408, [0:0] -lambdaMonitorCut = bits, U32, 1408, [1:1] -lambdaTimeSinceGood = scalar, U16, 1412, "sec", 0.01, 0 +value0 = scalar, U16, 1404, "value", 1,0 +value1 = scalar, U16, 1406, "value", 1,0 +errorRate = scalar, F32, 1408, "ratio", 1,0 +; total TS size = 1412 +vvtTarget = scalar, U16, 1412, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1414, "%", 0.5, 0 ; total TS size = 1416 +lambdaCurrentlyGood = bits, U32, 1416, [0:0] +lambdaMonitorCut = bits, U32, 1416, [1:1] +lambdaTimeSinceGood = scalar, U16, 1420, "sec", 0.01, 0 +; total TS size = 1424 time = { timeNow } @@ -5173,8 +5175,9 @@ entry = m_hasSynchronizedPhase, "sync: Known Engine Phase", int, "%d" entry = wallFuelCorrection, "fuel wallwetting injection time", float, "%.3f" entry = wallFuel, "Fuel on the wall", float, "%.3f" entry = idleState, "idleState", int, "%d" -entry = currentIdlePosition, "idle: current position", float, "%.3f" +entry = currentIdlePosition, "Idle: Position", float, "%.3f" entry = baseIdlePosition, "idle: base value", float, "%.3f" +entry = idleClosedLoop, "Idle: Closed loop", float, "%.3f" entry = iacByTpsTaper, "idle: iacByTpsTaper portion", float, "%.3f" entry = throttlePedalUpState, "idle: throttlePedalUpState", int, "%d" entry = mightResetPid, "idle: mightResetPid", int, "%d" @@ -5194,8 +5197,9 @@ entry = looksLikeCoasting, "looksLikeCoasting", int, "%d" entry = looksLikeCrankToIdle, "looksLikeCrankToIdle", int, "%d" entry = isIdleCoasting, "Idle: coasting", int, "%d" entry = isIdleClosedLoop, "Idle: Closed loop active", int, "%d" -entry = targetRpmByClt, "idle: target by CLT", int, "%d" -entry = targetRpmAcBump, "idle: A/C bump", int, "%d" +entry = idleTarget, "Idle: Target RPM", int, "%d" +entry = targetRpmByClt, "Idle: Target RPM base", int, "%d" +entry = targetRpmAcBump, "Idle: Target A/C bump", int, "%d" entry = iacByRpmTaper, "idle: iacByRpmTaper portion", float, "%.3f" entry = luaAdd, "idle: Lua Adder", float, "%.3f" entry = idlePosition, "ETB: idlePosition", float, "%.3f" @@ -6105,13 +6109,15 @@ dialog = idle_stateDialog, "idle_state" graphLine = idleState graphLine = currentIdlePosition graphLine = baseIdlePosition - graphLine = iacByTpsTaper + graphLine = idleClosedLoop liveGraph = idle_state_2_Graph, "Graph", South + graphLine = iacByTpsTaper graphLine = throttlePedalUpState + graphLine = idleTarget graphLine = targetRpmByClt + liveGraph = idle_state_3_Graph, "Graph", South graphLine = targetRpmAcBump graphLine = iacByRpmTaper - liveGraph = idle_state_3_Graph, "Graph", South graphLine = luaAdd indicatorPanel = electronic_throttleIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_f429-discovery.ini b/firmware/tunerstudio/generated/rusefi_f429-discovery.ini index a5bcf365ee..4ed011ec25 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.09.28.f429-discovery.2397543547" + signature = "rusEFI master.2023.09.28.f429-discovery.1163617923" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.09.28.f429-discovery.2397543547" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.09.28.f429-discovery.1163617923" ; 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 Thu Sep 28 03:25:29 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Thu Sep 28 13:46:05 UTC 2023 pageSize = 23664 page = 1 @@ -2320,7 +2320,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23654, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1416 + ochBlockSize = 1424 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3039,69 +3039,71 @@ wallFuel = scalar, F32, 1276, "", 1, 0 idleState = bits, S32, 1280, [0:2], "not important" currentIdlePosition = scalar, F32, 1284 baseIdlePosition = scalar, F32, 1288 -iacByTpsTaper = scalar, F32, 1292 -throttlePedalUpState = scalar, S32, 1296, "", 1, 0 -mightResetPid = bits, U32, 1300, [0:0] -shouldResetPid = bits, U32, 1300, [1:1] -wasResetPid = bits, U32, 1300, [2:2] -mustResetPid = bits, U32, 1300, [3:3] -isCranking = bits, U32, 1300, [4:4] -isIacTableForCoasting = bits, U32, 1300, [5:5] -notIdling = bits, U32, 1300, [6:6] -needReset = bits, U32, 1300, [7:7] -isInDeadZone = bits, U32, 1300, [8:8] -isBlipping = bits, U32, 1300, [9:9] -useClosedLoop = bits, U32, 1300, [10:10] -badTps = bits, U32, 1300, [11:11] -looksLikeRunning = bits, U32, 1300, [12:12] -looksLikeCoasting = bits, U32, 1300, [13:13] -looksLikeCrankToIdle = bits, U32, 1300, [14:14] -isIdleCoasting = bits, U32, 1300, [15:15] -isIdleClosedLoop = bits, U32, 1300, [16:16] -targetRpmByClt = scalar, S32, 1304, "", 1, 0 -targetRpmAcBump = scalar, S32, 1308, "", 1, 0 -iacByRpmTaper = scalar, F32, 1312 -luaAdd = scalar, F32, 1316 -; total TS size = 1320 -idlePosition = scalar, F32, 1320, "per", 1,0 -trim = scalar, F32, 1324, "", 1, 0 -luaAdjustment = scalar, F32, 1328, "per", 1,0 -m_wastegatePosition = scalar, F32, 1332, "per", 1,0 -etbFeedForward = scalar, F32, 1336 -etbIntegralError = scalar, F32, 1340, "", 1, 0 -etbCurrentTarget = scalar, F32, 1344, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1348, "%", 1, 0 -etbRevLimitActive = bits, U32, 1352, [0:0] -jamDetected = bits, U32, 1352, [1:1] -etbDutyRateOfChange = scalar, F32, 1356, "per", 1,0 -etbDutyAverage = scalar, F32, 1360, "per", 1,0 -etbTpsErrorCounter = scalar, U16, 1364, "count", 1,0 -etbPpsErrorCounter = scalar, U16, 1366, "count", 1,0 -etbErrorCode = scalar, S08, 1368, "", 1, 0 -jamTimer = scalar, U16, 1370, "sec", 0.01, 0 -; total TS size = 1372 -faultCode = scalar, U08, 1372, "", 1, 0 -heaterDuty = scalar, U08, 1373, "%", 1, 0 -pumpDuty = scalar, U08, 1374, "%", 1, 0 -tempC = scalar, U16, 1376, "C", 1, 0 -nernstVoltage = scalar, U16, 1378, "V", 0.001, 0 -esr = scalar, U16, 1380, "ohm", 1, 0 -; total TS size = 1384 -dcOutput0 = scalar, F32, 1384, "per", 1,0 -isEnabled0_int = scalar, U08, 1388, "per", 1,0 -isEnabled0 = bits, U32, 1392, [0:0] -; total TS size = 1396 -value0 = scalar, U16, 1396, "value", 1,0 -value1 = scalar, U16, 1398, "value", 1,0 -errorRate = scalar, F32, 1400, "ratio", 1,0 +idleClosedLoop = scalar, F32, 1292 +iacByTpsTaper = scalar, F32, 1296 +throttlePedalUpState = scalar, S32, 1300, "", 1, 0 +mightResetPid = bits, U32, 1304, [0:0] +shouldResetPid = bits, U32, 1304, [1:1] +wasResetPid = bits, U32, 1304, [2:2] +mustResetPid = bits, U32, 1304, [3:3] +isCranking = bits, U32, 1304, [4:4] +isIacTableForCoasting = bits, U32, 1304, [5:5] +notIdling = bits, U32, 1304, [6:6] +needReset = bits, U32, 1304, [7:7] +isInDeadZone = bits, U32, 1304, [8:8] +isBlipping = bits, U32, 1304, [9:9] +useClosedLoop = bits, U32, 1304, [10:10] +badTps = bits, U32, 1304, [11:11] +looksLikeRunning = bits, U32, 1304, [12:12] +looksLikeCoasting = bits, U32, 1304, [13:13] +looksLikeCrankToIdle = bits, U32, 1304, [14:14] +isIdleCoasting = bits, U32, 1304, [15:15] +isIdleClosedLoop = bits, U32, 1304, [16:16] +idleTarget = scalar, S32, 1308, "", 1, 0 +targetRpmByClt = scalar, S32, 1312, "", 1, 0 +targetRpmAcBump = scalar, S32, 1316, "", 1, 0 +iacByRpmTaper = scalar, F32, 1320 +luaAdd = scalar, F32, 1324 +; total TS size = 1328 +idlePosition = scalar, F32, 1328, "per", 1,0 +trim = scalar, F32, 1332, "", 1, 0 +luaAdjustment = scalar, F32, 1336, "per", 1,0 +m_wastegatePosition = scalar, F32, 1340, "per", 1,0 +etbFeedForward = scalar, F32, 1344 +etbIntegralError = scalar, F32, 1348, "", 1, 0 +etbCurrentTarget = scalar, F32, 1352, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1356, "%", 1, 0 +etbRevLimitActive = bits, U32, 1360, [0:0] +jamDetected = bits, U32, 1360, [1:1] +etbDutyRateOfChange = scalar, F32, 1364, "per", 1,0 +etbDutyAverage = scalar, F32, 1368, "per", 1,0 +etbTpsErrorCounter = scalar, U16, 1372, "count", 1,0 +etbPpsErrorCounter = scalar, U16, 1374, "count", 1,0 +etbErrorCode = scalar, S08, 1376, "", 1, 0 +jamTimer = scalar, U16, 1378, "sec", 0.01, 0 +; total TS size = 1380 +faultCode = scalar, U08, 1380, "", 1, 0 +heaterDuty = scalar, U08, 1381, "%", 1, 0 +pumpDuty = scalar, U08, 1382, "%", 1, 0 +tempC = scalar, U16, 1384, "C", 1, 0 +nernstVoltage = scalar, U16, 1386, "V", 0.001, 0 +esr = scalar, U16, 1388, "ohm", 1, 0 +; total TS size = 1392 +dcOutput0 = scalar, F32, 1392, "per", 1,0 +isEnabled0_int = scalar, U08, 1396, "per", 1,0 +isEnabled0 = bits, U32, 1400, [0:0] ; total TS size = 1404 -vvtTarget = scalar, U16, 1404, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1406, "%", 0.5, 0 -; total TS size = 1408 -lambdaCurrentlyGood = bits, U32, 1408, [0:0] -lambdaMonitorCut = bits, U32, 1408, [1:1] -lambdaTimeSinceGood = scalar, U16, 1412, "sec", 0.01, 0 +value0 = scalar, U16, 1404, "value", 1,0 +value1 = scalar, U16, 1406, "value", 1,0 +errorRate = scalar, F32, 1408, "ratio", 1,0 +; total TS size = 1412 +vvtTarget = scalar, U16, 1412, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1414, "%", 0.5, 0 ; total TS size = 1416 +lambdaCurrentlyGood = bits, U32, 1416, [0:0] +lambdaMonitorCut = bits, U32, 1416, [1:1] +lambdaTimeSinceGood = scalar, U16, 1420, "sec", 0.01, 0 +; total TS size = 1424 time = { timeNow } @@ -5173,8 +5175,9 @@ entry = m_hasSynchronizedPhase, "sync: Known Engine Phase", int, "%d" entry = wallFuelCorrection, "fuel wallwetting injection time", float, "%.3f" entry = wallFuel, "Fuel on the wall", float, "%.3f" entry = idleState, "idleState", int, "%d" -entry = currentIdlePosition, "idle: current position", float, "%.3f" +entry = currentIdlePosition, "Idle: Position", float, "%.3f" entry = baseIdlePosition, "idle: base value", float, "%.3f" +entry = idleClosedLoop, "Idle: Closed loop", float, "%.3f" entry = iacByTpsTaper, "idle: iacByTpsTaper portion", float, "%.3f" entry = throttlePedalUpState, "idle: throttlePedalUpState", int, "%d" entry = mightResetPid, "idle: mightResetPid", int, "%d" @@ -5194,8 +5197,9 @@ entry = looksLikeCoasting, "looksLikeCoasting", int, "%d" entry = looksLikeCrankToIdle, "looksLikeCrankToIdle", int, "%d" entry = isIdleCoasting, "Idle: coasting", int, "%d" entry = isIdleClosedLoop, "Idle: Closed loop active", int, "%d" -entry = targetRpmByClt, "idle: target by CLT", int, "%d" -entry = targetRpmAcBump, "idle: A/C bump", int, "%d" +entry = idleTarget, "Idle: Target RPM", int, "%d" +entry = targetRpmByClt, "Idle: Target RPM base", int, "%d" +entry = targetRpmAcBump, "Idle: Target A/C bump", int, "%d" entry = iacByRpmTaper, "idle: iacByRpmTaper portion", float, "%.3f" entry = luaAdd, "idle: Lua Adder", float, "%.3f" entry = idlePosition, "ETB: idlePosition", float, "%.3f" @@ -6103,13 +6107,15 @@ dialog = idle_stateDialog, "idle_state" graphLine = idleState graphLine = currentIdlePosition graphLine = baseIdlePosition - graphLine = iacByTpsTaper + graphLine = idleClosedLoop liveGraph = idle_state_2_Graph, "Graph", South + graphLine = iacByTpsTaper graphLine = throttlePedalUpState + graphLine = idleTarget graphLine = targetRpmByClt + liveGraph = idle_state_3_Graph, "Graph", South graphLine = targetRpmAcBump graphLine = iacByRpmTaper - liveGraph = idle_state_3_Graph, "Graph", South graphLine = luaAdd indicatorPanel = electronic_throttleIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini b/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini index 6a57135887..8ed3997e17 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.09.28.frankenso_na6.2897575089" + signature = "rusEFI master.2023.09.28.frankenso_na6.1728677449" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.09.28.frankenso_na6.2897575089" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.09.28.frankenso_na6.1728677449" ; 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 Thu Sep 28 03:25:12 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Thu Sep 28 13:45:47 UTC 2023 pageSize = 23664 page = 1 @@ -2320,7 +2320,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23654, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1416 + ochBlockSize = 1424 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3039,69 +3039,71 @@ wallFuel = scalar, F32, 1276, "", 1, 0 idleState = bits, S32, 1280, [0:2], "not important" currentIdlePosition = scalar, F32, 1284 baseIdlePosition = scalar, F32, 1288 -iacByTpsTaper = scalar, F32, 1292 -throttlePedalUpState = scalar, S32, 1296, "", 1, 0 -mightResetPid = bits, U32, 1300, [0:0] -shouldResetPid = bits, U32, 1300, [1:1] -wasResetPid = bits, U32, 1300, [2:2] -mustResetPid = bits, U32, 1300, [3:3] -isCranking = bits, U32, 1300, [4:4] -isIacTableForCoasting = bits, U32, 1300, [5:5] -notIdling = bits, U32, 1300, [6:6] -needReset = bits, U32, 1300, [7:7] -isInDeadZone = bits, U32, 1300, [8:8] -isBlipping = bits, U32, 1300, [9:9] -useClosedLoop = bits, U32, 1300, [10:10] -badTps = bits, U32, 1300, [11:11] -looksLikeRunning = bits, U32, 1300, [12:12] -looksLikeCoasting = bits, U32, 1300, [13:13] -looksLikeCrankToIdle = bits, U32, 1300, [14:14] -isIdleCoasting = bits, U32, 1300, [15:15] -isIdleClosedLoop = bits, U32, 1300, [16:16] -targetRpmByClt = scalar, S32, 1304, "", 1, 0 -targetRpmAcBump = scalar, S32, 1308, "", 1, 0 -iacByRpmTaper = scalar, F32, 1312 -luaAdd = scalar, F32, 1316 -; total TS size = 1320 -idlePosition = scalar, F32, 1320, "per", 1,0 -trim = scalar, F32, 1324, "", 1, 0 -luaAdjustment = scalar, F32, 1328, "per", 1,0 -m_wastegatePosition = scalar, F32, 1332, "per", 1,0 -etbFeedForward = scalar, F32, 1336 -etbIntegralError = scalar, F32, 1340, "", 1, 0 -etbCurrentTarget = scalar, F32, 1344, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1348, "%", 1, 0 -etbRevLimitActive = bits, U32, 1352, [0:0] -jamDetected = bits, U32, 1352, [1:1] -etbDutyRateOfChange = scalar, F32, 1356, "per", 1,0 -etbDutyAverage = scalar, F32, 1360, "per", 1,0 -etbTpsErrorCounter = scalar, U16, 1364, "count", 1,0 -etbPpsErrorCounter = scalar, U16, 1366, "count", 1,0 -etbErrorCode = scalar, S08, 1368, "", 1, 0 -jamTimer = scalar, U16, 1370, "sec", 0.01, 0 -; total TS size = 1372 -faultCode = scalar, U08, 1372, "", 1, 0 -heaterDuty = scalar, U08, 1373, "%", 1, 0 -pumpDuty = scalar, U08, 1374, "%", 1, 0 -tempC = scalar, U16, 1376, "C", 1, 0 -nernstVoltage = scalar, U16, 1378, "V", 0.001, 0 -esr = scalar, U16, 1380, "ohm", 1, 0 -; total TS size = 1384 -dcOutput0 = scalar, F32, 1384, "per", 1,0 -isEnabled0_int = scalar, U08, 1388, "per", 1,0 -isEnabled0 = bits, U32, 1392, [0:0] -; total TS size = 1396 -value0 = scalar, U16, 1396, "value", 1,0 -value1 = scalar, U16, 1398, "value", 1,0 -errorRate = scalar, F32, 1400, "ratio", 1,0 +idleClosedLoop = scalar, F32, 1292 +iacByTpsTaper = scalar, F32, 1296 +throttlePedalUpState = scalar, S32, 1300, "", 1, 0 +mightResetPid = bits, U32, 1304, [0:0] +shouldResetPid = bits, U32, 1304, [1:1] +wasResetPid = bits, U32, 1304, [2:2] +mustResetPid = bits, U32, 1304, [3:3] +isCranking = bits, U32, 1304, [4:4] +isIacTableForCoasting = bits, U32, 1304, [5:5] +notIdling = bits, U32, 1304, [6:6] +needReset = bits, U32, 1304, [7:7] +isInDeadZone = bits, U32, 1304, [8:8] +isBlipping = bits, U32, 1304, [9:9] +useClosedLoop = bits, U32, 1304, [10:10] +badTps = bits, U32, 1304, [11:11] +looksLikeRunning = bits, U32, 1304, [12:12] +looksLikeCoasting = bits, U32, 1304, [13:13] +looksLikeCrankToIdle = bits, U32, 1304, [14:14] +isIdleCoasting = bits, U32, 1304, [15:15] +isIdleClosedLoop = bits, U32, 1304, [16:16] +idleTarget = scalar, S32, 1308, "", 1, 0 +targetRpmByClt = scalar, S32, 1312, "", 1, 0 +targetRpmAcBump = scalar, S32, 1316, "", 1, 0 +iacByRpmTaper = scalar, F32, 1320 +luaAdd = scalar, F32, 1324 +; total TS size = 1328 +idlePosition = scalar, F32, 1328, "per", 1,0 +trim = scalar, F32, 1332, "", 1, 0 +luaAdjustment = scalar, F32, 1336, "per", 1,0 +m_wastegatePosition = scalar, F32, 1340, "per", 1,0 +etbFeedForward = scalar, F32, 1344 +etbIntegralError = scalar, F32, 1348, "", 1, 0 +etbCurrentTarget = scalar, F32, 1352, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1356, "%", 1, 0 +etbRevLimitActive = bits, U32, 1360, [0:0] +jamDetected = bits, U32, 1360, [1:1] +etbDutyRateOfChange = scalar, F32, 1364, "per", 1,0 +etbDutyAverage = scalar, F32, 1368, "per", 1,0 +etbTpsErrorCounter = scalar, U16, 1372, "count", 1,0 +etbPpsErrorCounter = scalar, U16, 1374, "count", 1,0 +etbErrorCode = scalar, S08, 1376, "", 1, 0 +jamTimer = scalar, U16, 1378, "sec", 0.01, 0 +; total TS size = 1380 +faultCode = scalar, U08, 1380, "", 1, 0 +heaterDuty = scalar, U08, 1381, "%", 1, 0 +pumpDuty = scalar, U08, 1382, "%", 1, 0 +tempC = scalar, U16, 1384, "C", 1, 0 +nernstVoltage = scalar, U16, 1386, "V", 0.001, 0 +esr = scalar, U16, 1388, "ohm", 1, 0 +; total TS size = 1392 +dcOutput0 = scalar, F32, 1392, "per", 1,0 +isEnabled0_int = scalar, U08, 1396, "per", 1,0 +isEnabled0 = bits, U32, 1400, [0:0] ; total TS size = 1404 -vvtTarget = scalar, U16, 1404, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1406, "%", 0.5, 0 -; total TS size = 1408 -lambdaCurrentlyGood = bits, U32, 1408, [0:0] -lambdaMonitorCut = bits, U32, 1408, [1:1] -lambdaTimeSinceGood = scalar, U16, 1412, "sec", 0.01, 0 +value0 = scalar, U16, 1404, "value", 1,0 +value1 = scalar, U16, 1406, "value", 1,0 +errorRate = scalar, F32, 1408, "ratio", 1,0 +; total TS size = 1412 +vvtTarget = scalar, U16, 1412, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1414, "%", 0.5, 0 ; total TS size = 1416 +lambdaCurrentlyGood = bits, U32, 1416, [0:0] +lambdaMonitorCut = bits, U32, 1416, [1:1] +lambdaTimeSinceGood = scalar, U16, 1420, "sec", 0.01, 0 +; total TS size = 1424 time = { timeNow } @@ -5173,8 +5175,9 @@ entry = m_hasSynchronizedPhase, "sync: Known Engine Phase", int, "%d" entry = wallFuelCorrection, "fuel wallwetting injection time", float, "%.3f" entry = wallFuel, "Fuel on the wall", float, "%.3f" entry = idleState, "idleState", int, "%d" -entry = currentIdlePosition, "idle: current position", float, "%.3f" +entry = currentIdlePosition, "Idle: Position", float, "%.3f" entry = baseIdlePosition, "idle: base value", float, "%.3f" +entry = idleClosedLoop, "Idle: Closed loop", float, "%.3f" entry = iacByTpsTaper, "idle: iacByTpsTaper portion", float, "%.3f" entry = throttlePedalUpState, "idle: throttlePedalUpState", int, "%d" entry = mightResetPid, "idle: mightResetPid", int, "%d" @@ -5194,8 +5197,9 @@ entry = looksLikeCoasting, "looksLikeCoasting", int, "%d" entry = looksLikeCrankToIdle, "looksLikeCrankToIdle", int, "%d" entry = isIdleCoasting, "Idle: coasting", int, "%d" entry = isIdleClosedLoop, "Idle: Closed loop active", int, "%d" -entry = targetRpmByClt, "idle: target by CLT", int, "%d" -entry = targetRpmAcBump, "idle: A/C bump", int, "%d" +entry = idleTarget, "Idle: Target RPM", int, "%d" +entry = targetRpmByClt, "Idle: Target RPM base", int, "%d" +entry = targetRpmAcBump, "Idle: Target A/C bump", int, "%d" entry = iacByRpmTaper, "idle: iacByRpmTaper portion", float, "%.3f" entry = luaAdd, "idle: Lua Adder", float, "%.3f" entry = idlePosition, "ETB: idlePosition", float, "%.3f" @@ -6103,13 +6107,15 @@ dialog = idle_stateDialog, "idle_state" graphLine = idleState graphLine = currentIdlePosition graphLine = baseIdlePosition - graphLine = iacByTpsTaper + graphLine = idleClosedLoop liveGraph = idle_state_2_Graph, "Graph", South + graphLine = iacByTpsTaper graphLine = throttlePedalUpState + graphLine = idleTarget graphLine = targetRpmByClt + liveGraph = idle_state_3_Graph, "Graph", South graphLine = targetRpmAcBump graphLine = iacByRpmTaper - liveGraph = idle_state_3_Graph, "Graph", South graphLine = luaAdd indicatorPanel = electronic_throttleIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_harley81.ini b/firmware/tunerstudio/generated/rusefi_harley81.ini index 94ef29bb7c..e711b4bedf 100644 --- a/firmware/tunerstudio/generated/rusefi_harley81.ini +++ b/firmware/tunerstudio/generated/rusefi_harley81.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.09.28.harley81.1294871585" + signature = "rusEFI master.2023.09.28.harley81.2257770201" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.09.28.harley81.1294871585" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.09.28.harley81.2257770201" ; 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","27 - TPS 2","INVALID","41 - PPS 1","52 - TPS 1","5 Battery Sense","INVALID","INVALID","42 - PPS 2","INVALID","53 - MAP","55 Engine Temperature","49 CLT","72 IAT","32 Oil Pressure","34 Kickstand Position Sensor" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Thu Sep 28 03:24:07 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Thu Sep 28 13:44:40 UTC 2023 pageSize = 23664 page = 1 @@ -2320,7 +2320,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23654, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1416 + ochBlockSize = 1424 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3039,69 +3039,71 @@ wallFuel = scalar, F32, 1276, "", 1, 0 idleState = bits, S32, 1280, [0:2], "not important" currentIdlePosition = scalar, F32, 1284 baseIdlePosition = scalar, F32, 1288 -iacByTpsTaper = scalar, F32, 1292 -throttlePedalUpState = scalar, S32, 1296, "", 1, 0 -mightResetPid = bits, U32, 1300, [0:0] -shouldResetPid = bits, U32, 1300, [1:1] -wasResetPid = bits, U32, 1300, [2:2] -mustResetPid = bits, U32, 1300, [3:3] -isCranking = bits, U32, 1300, [4:4] -isIacTableForCoasting = bits, U32, 1300, [5:5] -notIdling = bits, U32, 1300, [6:6] -needReset = bits, U32, 1300, [7:7] -isInDeadZone = bits, U32, 1300, [8:8] -isBlipping = bits, U32, 1300, [9:9] -useClosedLoop = bits, U32, 1300, [10:10] -badTps = bits, U32, 1300, [11:11] -looksLikeRunning = bits, U32, 1300, [12:12] -looksLikeCoasting = bits, U32, 1300, [13:13] -looksLikeCrankToIdle = bits, U32, 1300, [14:14] -isIdleCoasting = bits, U32, 1300, [15:15] -isIdleClosedLoop = bits, U32, 1300, [16:16] -targetRpmByClt = scalar, S32, 1304, "", 1, 0 -targetRpmAcBump = scalar, S32, 1308, "", 1, 0 -iacByRpmTaper = scalar, F32, 1312 -luaAdd = scalar, F32, 1316 -; total TS size = 1320 -idlePosition = scalar, F32, 1320, "per", 1,0 -trim = scalar, F32, 1324, "", 1, 0 -luaAdjustment = scalar, F32, 1328, "per", 1,0 -m_wastegatePosition = scalar, F32, 1332, "per", 1,0 -etbFeedForward = scalar, F32, 1336 -etbIntegralError = scalar, F32, 1340, "", 1, 0 -etbCurrentTarget = scalar, F32, 1344, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1348, "%", 1, 0 -etbRevLimitActive = bits, U32, 1352, [0:0] -jamDetected = bits, U32, 1352, [1:1] -etbDutyRateOfChange = scalar, F32, 1356, "per", 1,0 -etbDutyAverage = scalar, F32, 1360, "per", 1,0 -etbTpsErrorCounter = scalar, U16, 1364, "count", 1,0 -etbPpsErrorCounter = scalar, U16, 1366, "count", 1,0 -etbErrorCode = scalar, S08, 1368, "", 1, 0 -jamTimer = scalar, U16, 1370, "sec", 0.01, 0 -; total TS size = 1372 -faultCode = scalar, U08, 1372, "", 1, 0 -heaterDuty = scalar, U08, 1373, "%", 1, 0 -pumpDuty = scalar, U08, 1374, "%", 1, 0 -tempC = scalar, U16, 1376, "C", 1, 0 -nernstVoltage = scalar, U16, 1378, "V", 0.001, 0 -esr = scalar, U16, 1380, "ohm", 1, 0 -; total TS size = 1384 -dcOutput0 = scalar, F32, 1384, "per", 1,0 -isEnabled0_int = scalar, U08, 1388, "per", 1,0 -isEnabled0 = bits, U32, 1392, [0:0] -; total TS size = 1396 -value0 = scalar, U16, 1396, "value", 1,0 -value1 = scalar, U16, 1398, "value", 1,0 -errorRate = scalar, F32, 1400, "ratio", 1,0 +idleClosedLoop = scalar, F32, 1292 +iacByTpsTaper = scalar, F32, 1296 +throttlePedalUpState = scalar, S32, 1300, "", 1, 0 +mightResetPid = bits, U32, 1304, [0:0] +shouldResetPid = bits, U32, 1304, [1:1] +wasResetPid = bits, U32, 1304, [2:2] +mustResetPid = bits, U32, 1304, [3:3] +isCranking = bits, U32, 1304, [4:4] +isIacTableForCoasting = bits, U32, 1304, [5:5] +notIdling = bits, U32, 1304, [6:6] +needReset = bits, U32, 1304, [7:7] +isInDeadZone = bits, U32, 1304, [8:8] +isBlipping = bits, U32, 1304, [9:9] +useClosedLoop = bits, U32, 1304, [10:10] +badTps = bits, U32, 1304, [11:11] +looksLikeRunning = bits, U32, 1304, [12:12] +looksLikeCoasting = bits, U32, 1304, [13:13] +looksLikeCrankToIdle = bits, U32, 1304, [14:14] +isIdleCoasting = bits, U32, 1304, [15:15] +isIdleClosedLoop = bits, U32, 1304, [16:16] +idleTarget = scalar, S32, 1308, "", 1, 0 +targetRpmByClt = scalar, S32, 1312, "", 1, 0 +targetRpmAcBump = scalar, S32, 1316, "", 1, 0 +iacByRpmTaper = scalar, F32, 1320 +luaAdd = scalar, F32, 1324 +; total TS size = 1328 +idlePosition = scalar, F32, 1328, "per", 1,0 +trim = scalar, F32, 1332, "", 1, 0 +luaAdjustment = scalar, F32, 1336, "per", 1,0 +m_wastegatePosition = scalar, F32, 1340, "per", 1,0 +etbFeedForward = scalar, F32, 1344 +etbIntegralError = scalar, F32, 1348, "", 1, 0 +etbCurrentTarget = scalar, F32, 1352, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1356, "%", 1, 0 +etbRevLimitActive = bits, U32, 1360, [0:0] +jamDetected = bits, U32, 1360, [1:1] +etbDutyRateOfChange = scalar, F32, 1364, "per", 1,0 +etbDutyAverage = scalar, F32, 1368, "per", 1,0 +etbTpsErrorCounter = scalar, U16, 1372, "count", 1,0 +etbPpsErrorCounter = scalar, U16, 1374, "count", 1,0 +etbErrorCode = scalar, S08, 1376, "", 1, 0 +jamTimer = scalar, U16, 1378, "sec", 0.01, 0 +; total TS size = 1380 +faultCode = scalar, U08, 1380, "", 1, 0 +heaterDuty = scalar, U08, 1381, "%", 1, 0 +pumpDuty = scalar, U08, 1382, "%", 1, 0 +tempC = scalar, U16, 1384, "C", 1, 0 +nernstVoltage = scalar, U16, 1386, "V", 0.001, 0 +esr = scalar, U16, 1388, "ohm", 1, 0 +; total TS size = 1392 +dcOutput0 = scalar, F32, 1392, "per", 1,0 +isEnabled0_int = scalar, U08, 1396, "per", 1,0 +isEnabled0 = bits, U32, 1400, [0:0] ; total TS size = 1404 -vvtTarget = scalar, U16, 1404, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1406, "%", 0.5, 0 -; total TS size = 1408 -lambdaCurrentlyGood = bits, U32, 1408, [0:0] -lambdaMonitorCut = bits, U32, 1408, [1:1] -lambdaTimeSinceGood = scalar, U16, 1412, "sec", 0.01, 0 +value0 = scalar, U16, 1404, "value", 1,0 +value1 = scalar, U16, 1406, "value", 1,0 +errorRate = scalar, F32, 1408, "ratio", 1,0 +; total TS size = 1412 +vvtTarget = scalar, U16, 1412, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1414, "%", 0.5, 0 ; total TS size = 1416 +lambdaCurrentlyGood = bits, U32, 1416, [0:0] +lambdaMonitorCut = bits, U32, 1416, [1:1] +lambdaTimeSinceGood = scalar, U16, 1420, "sec", 0.01, 0 +; total TS size = 1424 time = { timeNow } @@ -5173,8 +5175,9 @@ entry = m_hasSynchronizedPhase, "sync: Known Engine Phase", int, "%d" entry = wallFuelCorrection, "fuel wallwetting injection time", float, "%.3f" entry = wallFuel, "Fuel on the wall", float, "%.3f" entry = idleState, "idleState", int, "%d" -entry = currentIdlePosition, "idle: current position", float, "%.3f" +entry = currentIdlePosition, "Idle: Position", float, "%.3f" entry = baseIdlePosition, "idle: base value", float, "%.3f" +entry = idleClosedLoop, "Idle: Closed loop", float, "%.3f" entry = iacByTpsTaper, "idle: iacByTpsTaper portion", float, "%.3f" entry = throttlePedalUpState, "idle: throttlePedalUpState", int, "%d" entry = mightResetPid, "idle: mightResetPid", int, "%d" @@ -5194,8 +5197,9 @@ entry = looksLikeCoasting, "looksLikeCoasting", int, "%d" entry = looksLikeCrankToIdle, "looksLikeCrankToIdle", int, "%d" entry = isIdleCoasting, "Idle: coasting", int, "%d" entry = isIdleClosedLoop, "Idle: Closed loop active", int, "%d" -entry = targetRpmByClt, "idle: target by CLT", int, "%d" -entry = targetRpmAcBump, "idle: A/C bump", int, "%d" +entry = idleTarget, "Idle: Target RPM", int, "%d" +entry = targetRpmByClt, "Idle: Target RPM base", int, "%d" +entry = targetRpmAcBump, "Idle: Target A/C bump", int, "%d" entry = iacByRpmTaper, "idle: iacByRpmTaper portion", float, "%.3f" entry = luaAdd, "idle: Lua Adder", float, "%.3f" entry = idlePosition, "ETB: idlePosition", float, "%.3f" @@ -6104,13 +6108,15 @@ dialog = idle_stateDialog, "idle_state" graphLine = idleState graphLine = currentIdlePosition graphLine = baseIdlePosition - graphLine = iacByTpsTaper + graphLine = idleClosedLoop liveGraph = idle_state_2_Graph, "Graph", South + graphLine = iacByTpsTaper graphLine = throttlePedalUpState + graphLine = idleTarget graphLine = targetRpmByClt + liveGraph = idle_state_3_Graph, "Graph", South graphLine = targetRpmAcBump graphLine = iacByRpmTaper - liveGraph = idle_state_3_Graph, "Graph", South graphLine = luaAdd indicatorPanel = electronic_throttleIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_hellen-112-17.ini b/firmware/tunerstudio/generated/rusefi_hellen-112-17.ini index e7c00ba057..ff3bef3a04 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.09.28.hellen-112-17.92399819" + signature = "rusEFI master.2023.09.28.hellen-112-17.3460108851" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.09.28.hellen-112-17.92399819" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.09.28.hellen-112-17.3460108851" ; 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","114 Analog Input","INVALID","121 PPS1","203 TPS Throttle Position 1","INVALID","107 TODO","119 Analog Input","110 Analog Input","INVALID","219 MAP","109 Analog Input","215 CLT","227 IAT","111 Analog Input","112 Analog Input" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Thu Sep 28 03:24:28 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Thu Sep 28 13:45:02 UTC 2023 pageSize = 23664 page = 1 @@ -2320,7 +2320,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23654, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1416 + ochBlockSize = 1424 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3039,69 +3039,71 @@ wallFuel = scalar, F32, 1276, "", 1, 0 idleState = bits, S32, 1280, [0:2], "not important" currentIdlePosition = scalar, F32, 1284 baseIdlePosition = scalar, F32, 1288 -iacByTpsTaper = scalar, F32, 1292 -throttlePedalUpState = scalar, S32, 1296, "", 1, 0 -mightResetPid = bits, U32, 1300, [0:0] -shouldResetPid = bits, U32, 1300, [1:1] -wasResetPid = bits, U32, 1300, [2:2] -mustResetPid = bits, U32, 1300, [3:3] -isCranking = bits, U32, 1300, [4:4] -isIacTableForCoasting = bits, U32, 1300, [5:5] -notIdling = bits, U32, 1300, [6:6] -needReset = bits, U32, 1300, [7:7] -isInDeadZone = bits, U32, 1300, [8:8] -isBlipping = bits, U32, 1300, [9:9] -useClosedLoop = bits, U32, 1300, [10:10] -badTps = bits, U32, 1300, [11:11] -looksLikeRunning = bits, U32, 1300, [12:12] -looksLikeCoasting = bits, U32, 1300, [13:13] -looksLikeCrankToIdle = bits, U32, 1300, [14:14] -isIdleCoasting = bits, U32, 1300, [15:15] -isIdleClosedLoop = bits, U32, 1300, [16:16] -targetRpmByClt = scalar, S32, 1304, "", 1, 0 -targetRpmAcBump = scalar, S32, 1308, "", 1, 0 -iacByRpmTaper = scalar, F32, 1312 -luaAdd = scalar, F32, 1316 -; total TS size = 1320 -idlePosition = scalar, F32, 1320, "per", 1,0 -trim = scalar, F32, 1324, "", 1, 0 -luaAdjustment = scalar, F32, 1328, "per", 1,0 -m_wastegatePosition = scalar, F32, 1332, "per", 1,0 -etbFeedForward = scalar, F32, 1336 -etbIntegralError = scalar, F32, 1340, "", 1, 0 -etbCurrentTarget = scalar, F32, 1344, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1348, "%", 1, 0 -etbRevLimitActive = bits, U32, 1352, [0:0] -jamDetected = bits, U32, 1352, [1:1] -etbDutyRateOfChange = scalar, F32, 1356, "per", 1,0 -etbDutyAverage = scalar, F32, 1360, "per", 1,0 -etbTpsErrorCounter = scalar, U16, 1364, "count", 1,0 -etbPpsErrorCounter = scalar, U16, 1366, "count", 1,0 -etbErrorCode = scalar, S08, 1368, "", 1, 0 -jamTimer = scalar, U16, 1370, "sec", 0.01, 0 -; total TS size = 1372 -faultCode = scalar, U08, 1372, "", 1, 0 -heaterDuty = scalar, U08, 1373, "%", 1, 0 -pumpDuty = scalar, U08, 1374, "%", 1, 0 -tempC = scalar, U16, 1376, "C", 1, 0 -nernstVoltage = scalar, U16, 1378, "V", 0.001, 0 -esr = scalar, U16, 1380, "ohm", 1, 0 -; total TS size = 1384 -dcOutput0 = scalar, F32, 1384, "per", 1,0 -isEnabled0_int = scalar, U08, 1388, "per", 1,0 -isEnabled0 = bits, U32, 1392, [0:0] -; total TS size = 1396 -value0 = scalar, U16, 1396, "value", 1,0 -value1 = scalar, U16, 1398, "value", 1,0 -errorRate = scalar, F32, 1400, "ratio", 1,0 +idleClosedLoop = scalar, F32, 1292 +iacByTpsTaper = scalar, F32, 1296 +throttlePedalUpState = scalar, S32, 1300, "", 1, 0 +mightResetPid = bits, U32, 1304, [0:0] +shouldResetPid = bits, U32, 1304, [1:1] +wasResetPid = bits, U32, 1304, [2:2] +mustResetPid = bits, U32, 1304, [3:3] +isCranking = bits, U32, 1304, [4:4] +isIacTableForCoasting = bits, U32, 1304, [5:5] +notIdling = bits, U32, 1304, [6:6] +needReset = bits, U32, 1304, [7:7] +isInDeadZone = bits, U32, 1304, [8:8] +isBlipping = bits, U32, 1304, [9:9] +useClosedLoop = bits, U32, 1304, [10:10] +badTps = bits, U32, 1304, [11:11] +looksLikeRunning = bits, U32, 1304, [12:12] +looksLikeCoasting = bits, U32, 1304, [13:13] +looksLikeCrankToIdle = bits, U32, 1304, [14:14] +isIdleCoasting = bits, U32, 1304, [15:15] +isIdleClosedLoop = bits, U32, 1304, [16:16] +idleTarget = scalar, S32, 1308, "", 1, 0 +targetRpmByClt = scalar, S32, 1312, "", 1, 0 +targetRpmAcBump = scalar, S32, 1316, "", 1, 0 +iacByRpmTaper = scalar, F32, 1320 +luaAdd = scalar, F32, 1324 +; total TS size = 1328 +idlePosition = scalar, F32, 1328, "per", 1,0 +trim = scalar, F32, 1332, "", 1, 0 +luaAdjustment = scalar, F32, 1336, "per", 1,0 +m_wastegatePosition = scalar, F32, 1340, "per", 1,0 +etbFeedForward = scalar, F32, 1344 +etbIntegralError = scalar, F32, 1348, "", 1, 0 +etbCurrentTarget = scalar, F32, 1352, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1356, "%", 1, 0 +etbRevLimitActive = bits, U32, 1360, [0:0] +jamDetected = bits, U32, 1360, [1:1] +etbDutyRateOfChange = scalar, F32, 1364, "per", 1,0 +etbDutyAverage = scalar, F32, 1368, "per", 1,0 +etbTpsErrorCounter = scalar, U16, 1372, "count", 1,0 +etbPpsErrorCounter = scalar, U16, 1374, "count", 1,0 +etbErrorCode = scalar, S08, 1376, "", 1, 0 +jamTimer = scalar, U16, 1378, "sec", 0.01, 0 +; total TS size = 1380 +faultCode = scalar, U08, 1380, "", 1, 0 +heaterDuty = scalar, U08, 1381, "%", 1, 0 +pumpDuty = scalar, U08, 1382, "%", 1, 0 +tempC = scalar, U16, 1384, "C", 1, 0 +nernstVoltage = scalar, U16, 1386, "V", 0.001, 0 +esr = scalar, U16, 1388, "ohm", 1, 0 +; total TS size = 1392 +dcOutput0 = scalar, F32, 1392, "per", 1,0 +isEnabled0_int = scalar, U08, 1396, "per", 1,0 +isEnabled0 = bits, U32, 1400, [0:0] ; total TS size = 1404 -vvtTarget = scalar, U16, 1404, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1406, "%", 0.5, 0 -; total TS size = 1408 -lambdaCurrentlyGood = bits, U32, 1408, [0:0] -lambdaMonitorCut = bits, U32, 1408, [1:1] -lambdaTimeSinceGood = scalar, U16, 1412, "sec", 0.01, 0 +value0 = scalar, U16, 1404, "value", 1,0 +value1 = scalar, U16, 1406, "value", 1,0 +errorRate = scalar, F32, 1408, "ratio", 1,0 +; total TS size = 1412 +vvtTarget = scalar, U16, 1412, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1414, "%", 0.5, 0 ; total TS size = 1416 +lambdaCurrentlyGood = bits, U32, 1416, [0:0] +lambdaMonitorCut = bits, U32, 1416, [1:1] +lambdaTimeSinceGood = scalar, U16, 1420, "sec", 0.01, 0 +; total TS size = 1424 time = { timeNow } @@ -5173,8 +5175,9 @@ entry = m_hasSynchronizedPhase, "sync: Known Engine Phase", int, "%d" entry = wallFuelCorrection, "fuel wallwetting injection time", float, "%.3f" entry = wallFuel, "Fuel on the wall", float, "%.3f" entry = idleState, "idleState", int, "%d" -entry = currentIdlePosition, "idle: current position", float, "%.3f" +entry = currentIdlePosition, "Idle: Position", float, "%.3f" entry = baseIdlePosition, "idle: base value", float, "%.3f" +entry = idleClosedLoop, "Idle: Closed loop", float, "%.3f" entry = iacByTpsTaper, "idle: iacByTpsTaper portion", float, "%.3f" entry = throttlePedalUpState, "idle: throttlePedalUpState", int, "%d" entry = mightResetPid, "idle: mightResetPid", int, "%d" @@ -5194,8 +5197,9 @@ entry = looksLikeCoasting, "looksLikeCoasting", int, "%d" entry = looksLikeCrankToIdle, "looksLikeCrankToIdle", int, "%d" entry = isIdleCoasting, "Idle: coasting", int, "%d" entry = isIdleClosedLoop, "Idle: Closed loop active", int, "%d" -entry = targetRpmByClt, "idle: target by CLT", int, "%d" -entry = targetRpmAcBump, "idle: A/C bump", int, "%d" +entry = idleTarget, "Idle: Target RPM", int, "%d" +entry = targetRpmByClt, "Idle: Target RPM base", int, "%d" +entry = targetRpmAcBump, "Idle: Target A/C bump", int, "%d" entry = iacByRpmTaper, "idle: iacByRpmTaper portion", float, "%.3f" entry = luaAdd, "idle: Lua Adder", float, "%.3f" entry = idlePosition, "ETB: idlePosition", float, "%.3f" @@ -6102,13 +6106,15 @@ dialog = idle_stateDialog, "idle_state" graphLine = idleState graphLine = currentIdlePosition graphLine = baseIdlePosition - graphLine = iacByTpsTaper + graphLine = idleClosedLoop liveGraph = idle_state_2_Graph, "Graph", South + graphLine = iacByTpsTaper graphLine = throttlePedalUpState + graphLine = idleTarget graphLine = targetRpmByClt + liveGraph = idle_state_3_Graph, "Graph", South graphLine = targetRpmAcBump graphLine = iacByRpmTaper - liveGraph = idle_state_3_Graph, "Graph", South graphLine = luaAdd indicatorPanel = electronic_throttleIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_hellen-gm-e67.ini b/firmware/tunerstudio/generated/rusefi_hellen-gm-e67.ini index 564e4440da..57d0333126 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.09.28.hellen-gm-e67.1041574539" + signature = "rusEFI master.2023.09.28.hellen-gm-e67.4121546867" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.09.28.hellen-gm-e67.1041574539" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.09.28.hellen-gm-e67.4121546867" ; 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 Thu Sep 28 03:24:40 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Thu Sep 28 13:45:14 UTC 2023 pageSize = 23664 page = 1 @@ -2320,7 +2320,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23654, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1416 + ochBlockSize = 1424 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3039,69 +3039,71 @@ wallFuel = scalar, F32, 1276, "", 1, 0 idleState = bits, S32, 1280, [0:2], "not important" currentIdlePosition = scalar, F32, 1284 baseIdlePosition = scalar, F32, 1288 -iacByTpsTaper = scalar, F32, 1292 -throttlePedalUpState = scalar, S32, 1296, "", 1, 0 -mightResetPid = bits, U32, 1300, [0:0] -shouldResetPid = bits, U32, 1300, [1:1] -wasResetPid = bits, U32, 1300, [2:2] -mustResetPid = bits, U32, 1300, [3:3] -isCranking = bits, U32, 1300, [4:4] -isIacTableForCoasting = bits, U32, 1300, [5:5] -notIdling = bits, U32, 1300, [6:6] -needReset = bits, U32, 1300, [7:7] -isInDeadZone = bits, U32, 1300, [8:8] -isBlipping = bits, U32, 1300, [9:9] -useClosedLoop = bits, U32, 1300, [10:10] -badTps = bits, U32, 1300, [11:11] -looksLikeRunning = bits, U32, 1300, [12:12] -looksLikeCoasting = bits, U32, 1300, [13:13] -looksLikeCrankToIdle = bits, U32, 1300, [14:14] -isIdleCoasting = bits, U32, 1300, [15:15] -isIdleClosedLoop = bits, U32, 1300, [16:16] -targetRpmByClt = scalar, S32, 1304, "", 1, 0 -targetRpmAcBump = scalar, S32, 1308, "", 1, 0 -iacByRpmTaper = scalar, F32, 1312 -luaAdd = scalar, F32, 1316 -; total TS size = 1320 -idlePosition = scalar, F32, 1320, "per", 1,0 -trim = scalar, F32, 1324, "", 1, 0 -luaAdjustment = scalar, F32, 1328, "per", 1,0 -m_wastegatePosition = scalar, F32, 1332, "per", 1,0 -etbFeedForward = scalar, F32, 1336 -etbIntegralError = scalar, F32, 1340, "", 1, 0 -etbCurrentTarget = scalar, F32, 1344, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1348, "%", 1, 0 -etbRevLimitActive = bits, U32, 1352, [0:0] -jamDetected = bits, U32, 1352, [1:1] -etbDutyRateOfChange = scalar, F32, 1356, "per", 1,0 -etbDutyAverage = scalar, F32, 1360, "per", 1,0 -etbTpsErrorCounter = scalar, U16, 1364, "count", 1,0 -etbPpsErrorCounter = scalar, U16, 1366, "count", 1,0 -etbErrorCode = scalar, S08, 1368, "", 1, 0 -jamTimer = scalar, U16, 1370, "sec", 0.01, 0 -; total TS size = 1372 -faultCode = scalar, U08, 1372, "", 1, 0 -heaterDuty = scalar, U08, 1373, "%", 1, 0 -pumpDuty = scalar, U08, 1374, "%", 1, 0 -tempC = scalar, U16, 1376, "C", 1, 0 -nernstVoltage = scalar, U16, 1378, "V", 0.001, 0 -esr = scalar, U16, 1380, "ohm", 1, 0 -; total TS size = 1384 -dcOutput0 = scalar, F32, 1384, "per", 1,0 -isEnabled0_int = scalar, U08, 1388, "per", 1,0 -isEnabled0 = bits, U32, 1392, [0:0] -; total TS size = 1396 -value0 = scalar, U16, 1396, "value", 1,0 -value1 = scalar, U16, 1398, "value", 1,0 -errorRate = scalar, F32, 1400, "ratio", 1,0 +idleClosedLoop = scalar, F32, 1292 +iacByTpsTaper = scalar, F32, 1296 +throttlePedalUpState = scalar, S32, 1300, "", 1, 0 +mightResetPid = bits, U32, 1304, [0:0] +shouldResetPid = bits, U32, 1304, [1:1] +wasResetPid = bits, U32, 1304, [2:2] +mustResetPid = bits, U32, 1304, [3:3] +isCranking = bits, U32, 1304, [4:4] +isIacTableForCoasting = bits, U32, 1304, [5:5] +notIdling = bits, U32, 1304, [6:6] +needReset = bits, U32, 1304, [7:7] +isInDeadZone = bits, U32, 1304, [8:8] +isBlipping = bits, U32, 1304, [9:9] +useClosedLoop = bits, U32, 1304, [10:10] +badTps = bits, U32, 1304, [11:11] +looksLikeRunning = bits, U32, 1304, [12:12] +looksLikeCoasting = bits, U32, 1304, [13:13] +looksLikeCrankToIdle = bits, U32, 1304, [14:14] +isIdleCoasting = bits, U32, 1304, [15:15] +isIdleClosedLoop = bits, U32, 1304, [16:16] +idleTarget = scalar, S32, 1308, "", 1, 0 +targetRpmByClt = scalar, S32, 1312, "", 1, 0 +targetRpmAcBump = scalar, S32, 1316, "", 1, 0 +iacByRpmTaper = scalar, F32, 1320 +luaAdd = scalar, F32, 1324 +; total TS size = 1328 +idlePosition = scalar, F32, 1328, "per", 1,0 +trim = scalar, F32, 1332, "", 1, 0 +luaAdjustment = scalar, F32, 1336, "per", 1,0 +m_wastegatePosition = scalar, F32, 1340, "per", 1,0 +etbFeedForward = scalar, F32, 1344 +etbIntegralError = scalar, F32, 1348, "", 1, 0 +etbCurrentTarget = scalar, F32, 1352, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1356, "%", 1, 0 +etbRevLimitActive = bits, U32, 1360, [0:0] +jamDetected = bits, U32, 1360, [1:1] +etbDutyRateOfChange = scalar, F32, 1364, "per", 1,0 +etbDutyAverage = scalar, F32, 1368, "per", 1,0 +etbTpsErrorCounter = scalar, U16, 1372, "count", 1,0 +etbPpsErrorCounter = scalar, U16, 1374, "count", 1,0 +etbErrorCode = scalar, S08, 1376, "", 1, 0 +jamTimer = scalar, U16, 1378, "sec", 0.01, 0 +; total TS size = 1380 +faultCode = scalar, U08, 1380, "", 1, 0 +heaterDuty = scalar, U08, 1381, "%", 1, 0 +pumpDuty = scalar, U08, 1382, "%", 1, 0 +tempC = scalar, U16, 1384, "C", 1, 0 +nernstVoltage = scalar, U16, 1386, "V", 0.001, 0 +esr = scalar, U16, 1388, "ohm", 1, 0 +; total TS size = 1392 +dcOutput0 = scalar, F32, 1392, "per", 1,0 +isEnabled0_int = scalar, U08, 1396, "per", 1,0 +isEnabled0 = bits, U32, 1400, [0:0] ; total TS size = 1404 -vvtTarget = scalar, U16, 1404, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1406, "%", 0.5, 0 -; total TS size = 1408 -lambdaCurrentlyGood = bits, U32, 1408, [0:0] -lambdaMonitorCut = bits, U32, 1408, [1:1] -lambdaTimeSinceGood = scalar, U16, 1412, "sec", 0.01, 0 +value0 = scalar, U16, 1404, "value", 1,0 +value1 = scalar, U16, 1406, "value", 1,0 +errorRate = scalar, F32, 1408, "ratio", 1,0 +; total TS size = 1412 +vvtTarget = scalar, U16, 1412, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1414, "%", 0.5, 0 ; total TS size = 1416 +lambdaCurrentlyGood = bits, U32, 1416, [0:0] +lambdaMonitorCut = bits, U32, 1416, [1:1] +lambdaTimeSinceGood = scalar, U16, 1420, "sec", 0.01, 0 +; total TS size = 1424 time = { timeNow } @@ -5173,8 +5175,9 @@ entry = m_hasSynchronizedPhase, "sync: Known Engine Phase", int, "%d" entry = wallFuelCorrection, "fuel wallwetting injection time", float, "%.3f" entry = wallFuel, "Fuel on the wall", float, "%.3f" entry = idleState, "idleState", int, "%d" -entry = currentIdlePosition, "idle: current position", float, "%.3f" +entry = currentIdlePosition, "Idle: Position", float, "%.3f" entry = baseIdlePosition, "idle: base value", float, "%.3f" +entry = idleClosedLoop, "Idle: Closed loop", float, "%.3f" entry = iacByTpsTaper, "idle: iacByTpsTaper portion", float, "%.3f" entry = throttlePedalUpState, "idle: throttlePedalUpState", int, "%d" entry = mightResetPid, "idle: mightResetPid", int, "%d" @@ -5194,8 +5197,9 @@ entry = looksLikeCoasting, "looksLikeCoasting", int, "%d" entry = looksLikeCrankToIdle, "looksLikeCrankToIdle", int, "%d" entry = isIdleCoasting, "Idle: coasting", int, "%d" entry = isIdleClosedLoop, "Idle: Closed loop active", int, "%d" -entry = targetRpmByClt, "idle: target by CLT", int, "%d" -entry = targetRpmAcBump, "idle: A/C bump", int, "%d" +entry = idleTarget, "Idle: Target RPM", int, "%d" +entry = targetRpmByClt, "Idle: Target RPM base", int, "%d" +entry = targetRpmAcBump, "Idle: Target A/C bump", int, "%d" entry = iacByRpmTaper, "idle: iacByRpmTaper portion", float, "%.3f" entry = luaAdd, "idle: Lua Adder", float, "%.3f" entry = idlePosition, "ETB: idlePosition", float, "%.3f" @@ -6104,13 +6108,15 @@ dialog = idle_stateDialog, "idle_state" graphLine = idleState graphLine = currentIdlePosition graphLine = baseIdlePosition - graphLine = iacByTpsTaper + graphLine = idleClosedLoop liveGraph = idle_state_2_Graph, "Graph", South + graphLine = iacByTpsTaper graphLine = throttlePedalUpState + graphLine = idleTarget graphLine = targetRpmByClt + liveGraph = idle_state_3_Graph, "Graph", South graphLine = targetRpmAcBump graphLine = iacByRpmTaper - liveGraph = idle_state_3_Graph, "Graph", South graphLine = luaAdd indicatorPanel = electronic_throttleIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_hellen-honda-k.ini b/firmware/tunerstudio/generated/rusefi_hellen-honda-k.ini index f886462b92..63b7df80ce 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.09.28.hellen-honda-k.452143531" + signature = "rusEFI master.2023.09.28.hellen-honda-k.3511669587" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.09.28.hellen-honda-k.452143531" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.09.28.hellen-honda-k.3511669587" ; 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","INVALID","INVALID","A19 - MAP","INVALID","B8 - CLT","B17 IAT" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Thu Sep 28 03:24:19 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Thu Sep 28 13:44:53 UTC 2023 pageSize = 23664 page = 1 @@ -2320,7 +2320,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23654, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1416 + ochBlockSize = 1424 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3039,69 +3039,71 @@ wallFuel = scalar, F32, 1276, "", 1, 0 idleState = bits, S32, 1280, [0:2], "not important" currentIdlePosition = scalar, F32, 1284 baseIdlePosition = scalar, F32, 1288 -iacByTpsTaper = scalar, F32, 1292 -throttlePedalUpState = scalar, S32, 1296, "", 1, 0 -mightResetPid = bits, U32, 1300, [0:0] -shouldResetPid = bits, U32, 1300, [1:1] -wasResetPid = bits, U32, 1300, [2:2] -mustResetPid = bits, U32, 1300, [3:3] -isCranking = bits, U32, 1300, [4:4] -isIacTableForCoasting = bits, U32, 1300, [5:5] -notIdling = bits, U32, 1300, [6:6] -needReset = bits, U32, 1300, [7:7] -isInDeadZone = bits, U32, 1300, [8:8] -isBlipping = bits, U32, 1300, [9:9] -useClosedLoop = bits, U32, 1300, [10:10] -badTps = bits, U32, 1300, [11:11] -looksLikeRunning = bits, U32, 1300, [12:12] -looksLikeCoasting = bits, U32, 1300, [13:13] -looksLikeCrankToIdle = bits, U32, 1300, [14:14] -isIdleCoasting = bits, U32, 1300, [15:15] -isIdleClosedLoop = bits, U32, 1300, [16:16] -targetRpmByClt = scalar, S32, 1304, "", 1, 0 -targetRpmAcBump = scalar, S32, 1308, "", 1, 0 -iacByRpmTaper = scalar, F32, 1312 -luaAdd = scalar, F32, 1316 -; total TS size = 1320 -idlePosition = scalar, F32, 1320, "per", 1,0 -trim = scalar, F32, 1324, "", 1, 0 -luaAdjustment = scalar, F32, 1328, "per", 1,0 -m_wastegatePosition = scalar, F32, 1332, "per", 1,0 -etbFeedForward = scalar, F32, 1336 -etbIntegralError = scalar, F32, 1340, "", 1, 0 -etbCurrentTarget = scalar, F32, 1344, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1348, "%", 1, 0 -etbRevLimitActive = bits, U32, 1352, [0:0] -jamDetected = bits, U32, 1352, [1:1] -etbDutyRateOfChange = scalar, F32, 1356, "per", 1,0 -etbDutyAverage = scalar, F32, 1360, "per", 1,0 -etbTpsErrorCounter = scalar, U16, 1364, "count", 1,0 -etbPpsErrorCounter = scalar, U16, 1366, "count", 1,0 -etbErrorCode = scalar, S08, 1368, "", 1, 0 -jamTimer = scalar, U16, 1370, "sec", 0.01, 0 -; total TS size = 1372 -faultCode = scalar, U08, 1372, "", 1, 0 -heaterDuty = scalar, U08, 1373, "%", 1, 0 -pumpDuty = scalar, U08, 1374, "%", 1, 0 -tempC = scalar, U16, 1376, "C", 1, 0 -nernstVoltage = scalar, U16, 1378, "V", 0.001, 0 -esr = scalar, U16, 1380, "ohm", 1, 0 -; total TS size = 1384 -dcOutput0 = scalar, F32, 1384, "per", 1,0 -isEnabled0_int = scalar, U08, 1388, "per", 1,0 -isEnabled0 = bits, U32, 1392, [0:0] -; total TS size = 1396 -value0 = scalar, U16, 1396, "value", 1,0 -value1 = scalar, U16, 1398, "value", 1,0 -errorRate = scalar, F32, 1400, "ratio", 1,0 +idleClosedLoop = scalar, F32, 1292 +iacByTpsTaper = scalar, F32, 1296 +throttlePedalUpState = scalar, S32, 1300, "", 1, 0 +mightResetPid = bits, U32, 1304, [0:0] +shouldResetPid = bits, U32, 1304, [1:1] +wasResetPid = bits, U32, 1304, [2:2] +mustResetPid = bits, U32, 1304, [3:3] +isCranking = bits, U32, 1304, [4:4] +isIacTableForCoasting = bits, U32, 1304, [5:5] +notIdling = bits, U32, 1304, [6:6] +needReset = bits, U32, 1304, [7:7] +isInDeadZone = bits, U32, 1304, [8:8] +isBlipping = bits, U32, 1304, [9:9] +useClosedLoop = bits, U32, 1304, [10:10] +badTps = bits, U32, 1304, [11:11] +looksLikeRunning = bits, U32, 1304, [12:12] +looksLikeCoasting = bits, U32, 1304, [13:13] +looksLikeCrankToIdle = bits, U32, 1304, [14:14] +isIdleCoasting = bits, U32, 1304, [15:15] +isIdleClosedLoop = bits, U32, 1304, [16:16] +idleTarget = scalar, S32, 1308, "", 1, 0 +targetRpmByClt = scalar, S32, 1312, "", 1, 0 +targetRpmAcBump = scalar, S32, 1316, "", 1, 0 +iacByRpmTaper = scalar, F32, 1320 +luaAdd = scalar, F32, 1324 +; total TS size = 1328 +idlePosition = scalar, F32, 1328, "per", 1,0 +trim = scalar, F32, 1332, "", 1, 0 +luaAdjustment = scalar, F32, 1336, "per", 1,0 +m_wastegatePosition = scalar, F32, 1340, "per", 1,0 +etbFeedForward = scalar, F32, 1344 +etbIntegralError = scalar, F32, 1348, "", 1, 0 +etbCurrentTarget = scalar, F32, 1352, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1356, "%", 1, 0 +etbRevLimitActive = bits, U32, 1360, [0:0] +jamDetected = bits, U32, 1360, [1:1] +etbDutyRateOfChange = scalar, F32, 1364, "per", 1,0 +etbDutyAverage = scalar, F32, 1368, "per", 1,0 +etbTpsErrorCounter = scalar, U16, 1372, "count", 1,0 +etbPpsErrorCounter = scalar, U16, 1374, "count", 1,0 +etbErrorCode = scalar, S08, 1376, "", 1, 0 +jamTimer = scalar, U16, 1378, "sec", 0.01, 0 +; total TS size = 1380 +faultCode = scalar, U08, 1380, "", 1, 0 +heaterDuty = scalar, U08, 1381, "%", 1, 0 +pumpDuty = scalar, U08, 1382, "%", 1, 0 +tempC = scalar, U16, 1384, "C", 1, 0 +nernstVoltage = scalar, U16, 1386, "V", 0.001, 0 +esr = scalar, U16, 1388, "ohm", 1, 0 +; total TS size = 1392 +dcOutput0 = scalar, F32, 1392, "per", 1,0 +isEnabled0_int = scalar, U08, 1396, "per", 1,0 +isEnabled0 = bits, U32, 1400, [0:0] ; total TS size = 1404 -vvtTarget = scalar, U16, 1404, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1406, "%", 0.5, 0 -; total TS size = 1408 -lambdaCurrentlyGood = bits, U32, 1408, [0:0] -lambdaMonitorCut = bits, U32, 1408, [1:1] -lambdaTimeSinceGood = scalar, U16, 1412, "sec", 0.01, 0 +value0 = scalar, U16, 1404, "value", 1,0 +value1 = scalar, U16, 1406, "value", 1,0 +errorRate = scalar, F32, 1408, "ratio", 1,0 +; total TS size = 1412 +vvtTarget = scalar, U16, 1412, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1414, "%", 0.5, 0 ; total TS size = 1416 +lambdaCurrentlyGood = bits, U32, 1416, [0:0] +lambdaMonitorCut = bits, U32, 1416, [1:1] +lambdaTimeSinceGood = scalar, U16, 1420, "sec", 0.01, 0 +; total TS size = 1424 time = { timeNow } @@ -5173,8 +5175,9 @@ entry = m_hasSynchronizedPhase, "sync: Known Engine Phase", int, "%d" entry = wallFuelCorrection, "fuel wallwetting injection time", float, "%.3f" entry = wallFuel, "Fuel on the wall", float, "%.3f" entry = idleState, "idleState", int, "%d" -entry = currentIdlePosition, "idle: current position", float, "%.3f" +entry = currentIdlePosition, "Idle: Position", float, "%.3f" entry = baseIdlePosition, "idle: base value", float, "%.3f" +entry = idleClosedLoop, "Idle: Closed loop", float, "%.3f" entry = iacByTpsTaper, "idle: iacByTpsTaper portion", float, "%.3f" entry = throttlePedalUpState, "idle: throttlePedalUpState", int, "%d" entry = mightResetPid, "idle: mightResetPid", int, "%d" @@ -5194,8 +5197,9 @@ entry = looksLikeCoasting, "looksLikeCoasting", int, "%d" entry = looksLikeCrankToIdle, "looksLikeCrankToIdle", int, "%d" entry = isIdleCoasting, "Idle: coasting", int, "%d" entry = isIdleClosedLoop, "Idle: Closed loop active", int, "%d" -entry = targetRpmByClt, "idle: target by CLT", int, "%d" -entry = targetRpmAcBump, "idle: A/C bump", int, "%d" +entry = idleTarget, "Idle: Target RPM", int, "%d" +entry = targetRpmByClt, "Idle: Target RPM base", int, "%d" +entry = targetRpmAcBump, "Idle: Target A/C bump", int, "%d" entry = iacByRpmTaper, "idle: iacByRpmTaper portion", float, "%.3f" entry = luaAdd, "idle: Lua Adder", float, "%.3f" entry = idlePosition, "ETB: idlePosition", float, "%.3f" @@ -6102,13 +6106,15 @@ dialog = idle_stateDialog, "idle_state" graphLine = idleState graphLine = currentIdlePosition graphLine = baseIdlePosition - graphLine = iacByTpsTaper + graphLine = idleClosedLoop liveGraph = idle_state_2_Graph, "Graph", South + graphLine = iacByTpsTaper graphLine = throttlePedalUpState + graphLine = idleTarget graphLine = targetRpmByClt + liveGraph = idle_state_3_Graph, "Graph", South graphLine = targetRpmAcBump graphLine = iacByRpmTaper - liveGraph = idle_state_3_Graph, "Graph", South graphLine = luaAdd indicatorPanel = electronic_throttleIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini b/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini index a6cb650eb5..6b8cf2c6ca 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.09.28.hellen-nb1.3777335660" + signature = "rusEFI master.2023.09.28.hellen-nb1.714697620" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.09.28.hellen-nb1.3777335660" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.09.28.hellen-nb1.714697620" ; 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 Thu Sep 28 03:24:37 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Thu Sep 28 13:45:11 UTC 2023 pageSize = 23664 page = 1 @@ -2320,7 +2320,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23654, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1416 + ochBlockSize = 1424 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3039,69 +3039,71 @@ wallFuel = scalar, F32, 1276, "", 1, 0 idleState = bits, S32, 1280, [0:2], "not important" currentIdlePosition = scalar, F32, 1284 baseIdlePosition = scalar, F32, 1288 -iacByTpsTaper = scalar, F32, 1292 -throttlePedalUpState = scalar, S32, 1296, "", 1, 0 -mightResetPid = bits, U32, 1300, [0:0] -shouldResetPid = bits, U32, 1300, [1:1] -wasResetPid = bits, U32, 1300, [2:2] -mustResetPid = bits, U32, 1300, [3:3] -isCranking = bits, U32, 1300, [4:4] -isIacTableForCoasting = bits, U32, 1300, [5:5] -notIdling = bits, U32, 1300, [6:6] -needReset = bits, U32, 1300, [7:7] -isInDeadZone = bits, U32, 1300, [8:8] -isBlipping = bits, U32, 1300, [9:9] -useClosedLoop = bits, U32, 1300, [10:10] -badTps = bits, U32, 1300, [11:11] -looksLikeRunning = bits, U32, 1300, [12:12] -looksLikeCoasting = bits, U32, 1300, [13:13] -looksLikeCrankToIdle = bits, U32, 1300, [14:14] -isIdleCoasting = bits, U32, 1300, [15:15] -isIdleClosedLoop = bits, U32, 1300, [16:16] -targetRpmByClt = scalar, S32, 1304, "", 1, 0 -targetRpmAcBump = scalar, S32, 1308, "", 1, 0 -iacByRpmTaper = scalar, F32, 1312 -luaAdd = scalar, F32, 1316 -; total TS size = 1320 -idlePosition = scalar, F32, 1320, "per", 1,0 -trim = scalar, F32, 1324, "", 1, 0 -luaAdjustment = scalar, F32, 1328, "per", 1,0 -m_wastegatePosition = scalar, F32, 1332, "per", 1,0 -etbFeedForward = scalar, F32, 1336 -etbIntegralError = scalar, F32, 1340, "", 1, 0 -etbCurrentTarget = scalar, F32, 1344, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1348, "%", 1, 0 -etbRevLimitActive = bits, U32, 1352, [0:0] -jamDetected = bits, U32, 1352, [1:1] -etbDutyRateOfChange = scalar, F32, 1356, "per", 1,0 -etbDutyAverage = scalar, F32, 1360, "per", 1,0 -etbTpsErrorCounter = scalar, U16, 1364, "count", 1,0 -etbPpsErrorCounter = scalar, U16, 1366, "count", 1,0 -etbErrorCode = scalar, S08, 1368, "", 1, 0 -jamTimer = scalar, U16, 1370, "sec", 0.01, 0 -; total TS size = 1372 -faultCode = scalar, U08, 1372, "", 1, 0 -heaterDuty = scalar, U08, 1373, "%", 1, 0 -pumpDuty = scalar, U08, 1374, "%", 1, 0 -tempC = scalar, U16, 1376, "C", 1, 0 -nernstVoltage = scalar, U16, 1378, "V", 0.001, 0 -esr = scalar, U16, 1380, "ohm", 1, 0 -; total TS size = 1384 -dcOutput0 = scalar, F32, 1384, "per", 1,0 -isEnabled0_int = scalar, U08, 1388, "per", 1,0 -isEnabled0 = bits, U32, 1392, [0:0] -; total TS size = 1396 -value0 = scalar, U16, 1396, "value", 1,0 -value1 = scalar, U16, 1398, "value", 1,0 -errorRate = scalar, F32, 1400, "ratio", 1,0 +idleClosedLoop = scalar, F32, 1292 +iacByTpsTaper = scalar, F32, 1296 +throttlePedalUpState = scalar, S32, 1300, "", 1, 0 +mightResetPid = bits, U32, 1304, [0:0] +shouldResetPid = bits, U32, 1304, [1:1] +wasResetPid = bits, U32, 1304, [2:2] +mustResetPid = bits, U32, 1304, [3:3] +isCranking = bits, U32, 1304, [4:4] +isIacTableForCoasting = bits, U32, 1304, [5:5] +notIdling = bits, U32, 1304, [6:6] +needReset = bits, U32, 1304, [7:7] +isInDeadZone = bits, U32, 1304, [8:8] +isBlipping = bits, U32, 1304, [9:9] +useClosedLoop = bits, U32, 1304, [10:10] +badTps = bits, U32, 1304, [11:11] +looksLikeRunning = bits, U32, 1304, [12:12] +looksLikeCoasting = bits, U32, 1304, [13:13] +looksLikeCrankToIdle = bits, U32, 1304, [14:14] +isIdleCoasting = bits, U32, 1304, [15:15] +isIdleClosedLoop = bits, U32, 1304, [16:16] +idleTarget = scalar, S32, 1308, "", 1, 0 +targetRpmByClt = scalar, S32, 1312, "", 1, 0 +targetRpmAcBump = scalar, S32, 1316, "", 1, 0 +iacByRpmTaper = scalar, F32, 1320 +luaAdd = scalar, F32, 1324 +; total TS size = 1328 +idlePosition = scalar, F32, 1328, "per", 1,0 +trim = scalar, F32, 1332, "", 1, 0 +luaAdjustment = scalar, F32, 1336, "per", 1,0 +m_wastegatePosition = scalar, F32, 1340, "per", 1,0 +etbFeedForward = scalar, F32, 1344 +etbIntegralError = scalar, F32, 1348, "", 1, 0 +etbCurrentTarget = scalar, F32, 1352, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1356, "%", 1, 0 +etbRevLimitActive = bits, U32, 1360, [0:0] +jamDetected = bits, U32, 1360, [1:1] +etbDutyRateOfChange = scalar, F32, 1364, "per", 1,0 +etbDutyAverage = scalar, F32, 1368, "per", 1,0 +etbTpsErrorCounter = scalar, U16, 1372, "count", 1,0 +etbPpsErrorCounter = scalar, U16, 1374, "count", 1,0 +etbErrorCode = scalar, S08, 1376, "", 1, 0 +jamTimer = scalar, U16, 1378, "sec", 0.01, 0 +; total TS size = 1380 +faultCode = scalar, U08, 1380, "", 1, 0 +heaterDuty = scalar, U08, 1381, "%", 1, 0 +pumpDuty = scalar, U08, 1382, "%", 1, 0 +tempC = scalar, U16, 1384, "C", 1, 0 +nernstVoltage = scalar, U16, 1386, "V", 0.001, 0 +esr = scalar, U16, 1388, "ohm", 1, 0 +; total TS size = 1392 +dcOutput0 = scalar, F32, 1392, "per", 1,0 +isEnabled0_int = scalar, U08, 1396, "per", 1,0 +isEnabled0 = bits, U32, 1400, [0:0] ; total TS size = 1404 -vvtTarget = scalar, U16, 1404, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1406, "%", 0.5, 0 -; total TS size = 1408 -lambdaCurrentlyGood = bits, U32, 1408, [0:0] -lambdaMonitorCut = bits, U32, 1408, [1:1] -lambdaTimeSinceGood = scalar, U16, 1412, "sec", 0.01, 0 +value0 = scalar, U16, 1404, "value", 1,0 +value1 = scalar, U16, 1406, "value", 1,0 +errorRate = scalar, F32, 1408, "ratio", 1,0 +; total TS size = 1412 +vvtTarget = scalar, U16, 1412, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1414, "%", 0.5, 0 ; total TS size = 1416 +lambdaCurrentlyGood = bits, U32, 1416, [0:0] +lambdaMonitorCut = bits, U32, 1416, [1:1] +lambdaTimeSinceGood = scalar, U16, 1420, "sec", 0.01, 0 +; total TS size = 1424 time = { timeNow } @@ -5173,8 +5175,9 @@ entry = m_hasSynchronizedPhase, "sync: Known Engine Phase", int, "%d" entry = wallFuelCorrection, "fuel wallwetting injection time", float, "%.3f" entry = wallFuel, "Fuel on the wall", float, "%.3f" entry = idleState, "idleState", int, "%d" -entry = currentIdlePosition, "idle: current position", float, "%.3f" +entry = currentIdlePosition, "Idle: Position", float, "%.3f" entry = baseIdlePosition, "idle: base value", float, "%.3f" +entry = idleClosedLoop, "Idle: Closed loop", float, "%.3f" entry = iacByTpsTaper, "idle: iacByTpsTaper portion", float, "%.3f" entry = throttlePedalUpState, "idle: throttlePedalUpState", int, "%d" entry = mightResetPid, "idle: mightResetPid", int, "%d" @@ -5194,8 +5197,9 @@ entry = looksLikeCoasting, "looksLikeCoasting", int, "%d" entry = looksLikeCrankToIdle, "looksLikeCrankToIdle", int, "%d" entry = isIdleCoasting, "Idle: coasting", int, "%d" entry = isIdleClosedLoop, "Idle: Closed loop active", int, "%d" -entry = targetRpmByClt, "idle: target by CLT", int, "%d" -entry = targetRpmAcBump, "idle: A/C bump", int, "%d" +entry = idleTarget, "Idle: Target RPM", int, "%d" +entry = targetRpmByClt, "Idle: Target RPM base", int, "%d" +entry = targetRpmAcBump, "Idle: Target A/C bump", int, "%d" entry = iacByRpmTaper, "idle: iacByRpmTaper portion", float, "%.3f" entry = luaAdd, "idle: Lua Adder", float, "%.3f" entry = idlePosition, "ETB: idlePosition", float, "%.3f" @@ -6104,13 +6108,15 @@ dialog = idle_stateDialog, "idle_state" graphLine = idleState graphLine = currentIdlePosition graphLine = baseIdlePosition - graphLine = iacByTpsTaper + graphLine = idleClosedLoop liveGraph = idle_state_2_Graph, "Graph", South + graphLine = iacByTpsTaper graphLine = throttlePedalUpState + graphLine = idleTarget graphLine = targetRpmByClt + liveGraph = idle_state_3_Graph, "Graph", South graphLine = targetRpmAcBump graphLine = iacByRpmTaper - liveGraph = idle_state_3_Graph, "Graph", South graphLine = luaAdd indicatorPanel = electronic_throttleIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini b/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini index 93d32ca34f..72265a9da4 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.09.28.hellen121nissan.399604303" + signature = "rusEFI master.2023.09.28.hellen121nissan.3698163895" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.09.28.hellen121nissan.399604303" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.09.28.hellen121nissan.3698163895" ; 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 Thu Sep 28 03:24:16 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Thu Sep 28 13:44:50 UTC 2023 pageSize = 23664 page = 1 @@ -2320,7 +2320,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23654, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1416 + ochBlockSize = 1424 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3039,69 +3039,71 @@ wallFuel = scalar, F32, 1276, "", 1, 0 idleState = bits, S32, 1280, [0:2], "not important" currentIdlePosition = scalar, F32, 1284 baseIdlePosition = scalar, F32, 1288 -iacByTpsTaper = scalar, F32, 1292 -throttlePedalUpState = scalar, S32, 1296, "", 1, 0 -mightResetPid = bits, U32, 1300, [0:0] -shouldResetPid = bits, U32, 1300, [1:1] -wasResetPid = bits, U32, 1300, [2:2] -mustResetPid = bits, U32, 1300, [3:3] -isCranking = bits, U32, 1300, [4:4] -isIacTableForCoasting = bits, U32, 1300, [5:5] -notIdling = bits, U32, 1300, [6:6] -needReset = bits, U32, 1300, [7:7] -isInDeadZone = bits, U32, 1300, [8:8] -isBlipping = bits, U32, 1300, [9:9] -useClosedLoop = bits, U32, 1300, [10:10] -badTps = bits, U32, 1300, [11:11] -looksLikeRunning = bits, U32, 1300, [12:12] -looksLikeCoasting = bits, U32, 1300, [13:13] -looksLikeCrankToIdle = bits, U32, 1300, [14:14] -isIdleCoasting = bits, U32, 1300, [15:15] -isIdleClosedLoop = bits, U32, 1300, [16:16] -targetRpmByClt = scalar, S32, 1304, "", 1, 0 -targetRpmAcBump = scalar, S32, 1308, "", 1, 0 -iacByRpmTaper = scalar, F32, 1312 -luaAdd = scalar, F32, 1316 -; total TS size = 1320 -idlePosition = scalar, F32, 1320, "per", 1,0 -trim = scalar, F32, 1324, "", 1, 0 -luaAdjustment = scalar, F32, 1328, "per", 1,0 -m_wastegatePosition = scalar, F32, 1332, "per", 1,0 -etbFeedForward = scalar, F32, 1336 -etbIntegralError = scalar, F32, 1340, "", 1, 0 -etbCurrentTarget = scalar, F32, 1344, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1348, "%", 1, 0 -etbRevLimitActive = bits, U32, 1352, [0:0] -jamDetected = bits, U32, 1352, [1:1] -etbDutyRateOfChange = scalar, F32, 1356, "per", 1,0 -etbDutyAverage = scalar, F32, 1360, "per", 1,0 -etbTpsErrorCounter = scalar, U16, 1364, "count", 1,0 -etbPpsErrorCounter = scalar, U16, 1366, "count", 1,0 -etbErrorCode = scalar, S08, 1368, "", 1, 0 -jamTimer = scalar, U16, 1370, "sec", 0.01, 0 -; total TS size = 1372 -faultCode = scalar, U08, 1372, "", 1, 0 -heaterDuty = scalar, U08, 1373, "%", 1, 0 -pumpDuty = scalar, U08, 1374, "%", 1, 0 -tempC = scalar, U16, 1376, "C", 1, 0 -nernstVoltage = scalar, U16, 1378, "V", 0.001, 0 -esr = scalar, U16, 1380, "ohm", 1, 0 -; total TS size = 1384 -dcOutput0 = scalar, F32, 1384, "per", 1,0 -isEnabled0_int = scalar, U08, 1388, "per", 1,0 -isEnabled0 = bits, U32, 1392, [0:0] -; total TS size = 1396 -value0 = scalar, U16, 1396, "value", 1,0 -value1 = scalar, U16, 1398, "value", 1,0 -errorRate = scalar, F32, 1400, "ratio", 1,0 +idleClosedLoop = scalar, F32, 1292 +iacByTpsTaper = scalar, F32, 1296 +throttlePedalUpState = scalar, S32, 1300, "", 1, 0 +mightResetPid = bits, U32, 1304, [0:0] +shouldResetPid = bits, U32, 1304, [1:1] +wasResetPid = bits, U32, 1304, [2:2] +mustResetPid = bits, U32, 1304, [3:3] +isCranking = bits, U32, 1304, [4:4] +isIacTableForCoasting = bits, U32, 1304, [5:5] +notIdling = bits, U32, 1304, [6:6] +needReset = bits, U32, 1304, [7:7] +isInDeadZone = bits, U32, 1304, [8:8] +isBlipping = bits, U32, 1304, [9:9] +useClosedLoop = bits, U32, 1304, [10:10] +badTps = bits, U32, 1304, [11:11] +looksLikeRunning = bits, U32, 1304, [12:12] +looksLikeCoasting = bits, U32, 1304, [13:13] +looksLikeCrankToIdle = bits, U32, 1304, [14:14] +isIdleCoasting = bits, U32, 1304, [15:15] +isIdleClosedLoop = bits, U32, 1304, [16:16] +idleTarget = scalar, S32, 1308, "", 1, 0 +targetRpmByClt = scalar, S32, 1312, "", 1, 0 +targetRpmAcBump = scalar, S32, 1316, "", 1, 0 +iacByRpmTaper = scalar, F32, 1320 +luaAdd = scalar, F32, 1324 +; total TS size = 1328 +idlePosition = scalar, F32, 1328, "per", 1,0 +trim = scalar, F32, 1332, "", 1, 0 +luaAdjustment = scalar, F32, 1336, "per", 1,0 +m_wastegatePosition = scalar, F32, 1340, "per", 1,0 +etbFeedForward = scalar, F32, 1344 +etbIntegralError = scalar, F32, 1348, "", 1, 0 +etbCurrentTarget = scalar, F32, 1352, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1356, "%", 1, 0 +etbRevLimitActive = bits, U32, 1360, [0:0] +jamDetected = bits, U32, 1360, [1:1] +etbDutyRateOfChange = scalar, F32, 1364, "per", 1,0 +etbDutyAverage = scalar, F32, 1368, "per", 1,0 +etbTpsErrorCounter = scalar, U16, 1372, "count", 1,0 +etbPpsErrorCounter = scalar, U16, 1374, "count", 1,0 +etbErrorCode = scalar, S08, 1376, "", 1, 0 +jamTimer = scalar, U16, 1378, "sec", 0.01, 0 +; total TS size = 1380 +faultCode = scalar, U08, 1380, "", 1, 0 +heaterDuty = scalar, U08, 1381, "%", 1, 0 +pumpDuty = scalar, U08, 1382, "%", 1, 0 +tempC = scalar, U16, 1384, "C", 1, 0 +nernstVoltage = scalar, U16, 1386, "V", 0.001, 0 +esr = scalar, U16, 1388, "ohm", 1, 0 +; total TS size = 1392 +dcOutput0 = scalar, F32, 1392, "per", 1,0 +isEnabled0_int = scalar, U08, 1396, "per", 1,0 +isEnabled0 = bits, U32, 1400, [0:0] ; total TS size = 1404 -vvtTarget = scalar, U16, 1404, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1406, "%", 0.5, 0 -; total TS size = 1408 -lambdaCurrentlyGood = bits, U32, 1408, [0:0] -lambdaMonitorCut = bits, U32, 1408, [1:1] -lambdaTimeSinceGood = scalar, U16, 1412, "sec", 0.01, 0 +value0 = scalar, U16, 1404, "value", 1,0 +value1 = scalar, U16, 1406, "value", 1,0 +errorRate = scalar, F32, 1408, "ratio", 1,0 +; total TS size = 1412 +vvtTarget = scalar, U16, 1412, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1414, "%", 0.5, 0 ; total TS size = 1416 +lambdaCurrentlyGood = bits, U32, 1416, [0:0] +lambdaMonitorCut = bits, U32, 1416, [1:1] +lambdaTimeSinceGood = scalar, U16, 1420, "sec", 0.01, 0 +; total TS size = 1424 time = { timeNow } @@ -5173,8 +5175,9 @@ entry = m_hasSynchronizedPhase, "sync: Known Engine Phase", int, "%d" entry = wallFuelCorrection, "fuel wallwetting injection time", float, "%.3f" entry = wallFuel, "Fuel on the wall", float, "%.3f" entry = idleState, "idleState", int, "%d" -entry = currentIdlePosition, "idle: current position", float, "%.3f" +entry = currentIdlePosition, "Idle: Position", float, "%.3f" entry = baseIdlePosition, "idle: base value", float, "%.3f" +entry = idleClosedLoop, "Idle: Closed loop", float, "%.3f" entry = iacByTpsTaper, "idle: iacByTpsTaper portion", float, "%.3f" entry = throttlePedalUpState, "idle: throttlePedalUpState", int, "%d" entry = mightResetPid, "idle: mightResetPid", int, "%d" @@ -5194,8 +5197,9 @@ entry = looksLikeCoasting, "looksLikeCoasting", int, "%d" entry = looksLikeCrankToIdle, "looksLikeCrankToIdle", int, "%d" entry = isIdleCoasting, "Idle: coasting", int, "%d" entry = isIdleClosedLoop, "Idle: Closed loop active", int, "%d" -entry = targetRpmByClt, "idle: target by CLT", int, "%d" -entry = targetRpmAcBump, "idle: A/C bump", int, "%d" +entry = idleTarget, "Idle: Target RPM", int, "%d" +entry = targetRpmByClt, "Idle: Target RPM base", int, "%d" +entry = targetRpmAcBump, "Idle: Target A/C bump", int, "%d" entry = iacByRpmTaper, "idle: iacByRpmTaper portion", float, "%.3f" entry = luaAdd, "idle: Lua Adder", float, "%.3f" entry = idlePosition, "ETB: idlePosition", float, "%.3f" @@ -6102,13 +6106,15 @@ dialog = idle_stateDialog, "idle_state" graphLine = idleState graphLine = currentIdlePosition graphLine = baseIdlePosition - graphLine = iacByTpsTaper + graphLine = idleClosedLoop liveGraph = idle_state_2_Graph, "Graph", South + graphLine = iacByTpsTaper graphLine = throttlePedalUpState + graphLine = idleTarget graphLine = targetRpmByClt + liveGraph = idle_state_3_Graph, "Graph", South graphLine = targetRpmAcBump graphLine = iacByRpmTaper - liveGraph = idle_state_3_Graph, "Graph", South graphLine = luaAdd indicatorPanel = electronic_throttleIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_hellen121vag.ini b/firmware/tunerstudio/generated/rusefi_hellen121vag.ini index 53bac8491a..65b5a66b61 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.09.28.hellen121vag.446268344" + signature = "rusEFI master.2023.09.28.hellen121vag.3508894016" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.09.28.hellen121vag.446268344" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.09.28.hellen121vag.3508894016" ; 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 Thu Sep 28 03:24:13 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Thu Sep 28 13:44:46 UTC 2023 pageSize = 23664 page = 1 @@ -2320,7 +2320,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23654, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1416 + ochBlockSize = 1424 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3039,69 +3039,71 @@ wallFuel = scalar, F32, 1276, "", 1, 0 idleState = bits, S32, 1280, [0:2], "not important" currentIdlePosition = scalar, F32, 1284 baseIdlePosition = scalar, F32, 1288 -iacByTpsTaper = scalar, F32, 1292 -throttlePedalUpState = scalar, S32, 1296, "", 1, 0 -mightResetPid = bits, U32, 1300, [0:0] -shouldResetPid = bits, U32, 1300, [1:1] -wasResetPid = bits, U32, 1300, [2:2] -mustResetPid = bits, U32, 1300, [3:3] -isCranking = bits, U32, 1300, [4:4] -isIacTableForCoasting = bits, U32, 1300, [5:5] -notIdling = bits, U32, 1300, [6:6] -needReset = bits, U32, 1300, [7:7] -isInDeadZone = bits, U32, 1300, [8:8] -isBlipping = bits, U32, 1300, [9:9] -useClosedLoop = bits, U32, 1300, [10:10] -badTps = bits, U32, 1300, [11:11] -looksLikeRunning = bits, U32, 1300, [12:12] -looksLikeCoasting = bits, U32, 1300, [13:13] -looksLikeCrankToIdle = bits, U32, 1300, [14:14] -isIdleCoasting = bits, U32, 1300, [15:15] -isIdleClosedLoop = bits, U32, 1300, [16:16] -targetRpmByClt = scalar, S32, 1304, "", 1, 0 -targetRpmAcBump = scalar, S32, 1308, "", 1, 0 -iacByRpmTaper = scalar, F32, 1312 -luaAdd = scalar, F32, 1316 -; total TS size = 1320 -idlePosition = scalar, F32, 1320, "per", 1,0 -trim = scalar, F32, 1324, "", 1, 0 -luaAdjustment = scalar, F32, 1328, "per", 1,0 -m_wastegatePosition = scalar, F32, 1332, "per", 1,0 -etbFeedForward = scalar, F32, 1336 -etbIntegralError = scalar, F32, 1340, "", 1, 0 -etbCurrentTarget = scalar, F32, 1344, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1348, "%", 1, 0 -etbRevLimitActive = bits, U32, 1352, [0:0] -jamDetected = bits, U32, 1352, [1:1] -etbDutyRateOfChange = scalar, F32, 1356, "per", 1,0 -etbDutyAverage = scalar, F32, 1360, "per", 1,0 -etbTpsErrorCounter = scalar, U16, 1364, "count", 1,0 -etbPpsErrorCounter = scalar, U16, 1366, "count", 1,0 -etbErrorCode = scalar, S08, 1368, "", 1, 0 -jamTimer = scalar, U16, 1370, "sec", 0.01, 0 -; total TS size = 1372 -faultCode = scalar, U08, 1372, "", 1, 0 -heaterDuty = scalar, U08, 1373, "%", 1, 0 -pumpDuty = scalar, U08, 1374, "%", 1, 0 -tempC = scalar, U16, 1376, "C", 1, 0 -nernstVoltage = scalar, U16, 1378, "V", 0.001, 0 -esr = scalar, U16, 1380, "ohm", 1, 0 -; total TS size = 1384 -dcOutput0 = scalar, F32, 1384, "per", 1,0 -isEnabled0_int = scalar, U08, 1388, "per", 1,0 -isEnabled0 = bits, U32, 1392, [0:0] -; total TS size = 1396 -value0 = scalar, U16, 1396, "value", 1,0 -value1 = scalar, U16, 1398, "value", 1,0 -errorRate = scalar, F32, 1400, "ratio", 1,0 +idleClosedLoop = scalar, F32, 1292 +iacByTpsTaper = scalar, F32, 1296 +throttlePedalUpState = scalar, S32, 1300, "", 1, 0 +mightResetPid = bits, U32, 1304, [0:0] +shouldResetPid = bits, U32, 1304, [1:1] +wasResetPid = bits, U32, 1304, [2:2] +mustResetPid = bits, U32, 1304, [3:3] +isCranking = bits, U32, 1304, [4:4] +isIacTableForCoasting = bits, U32, 1304, [5:5] +notIdling = bits, U32, 1304, [6:6] +needReset = bits, U32, 1304, [7:7] +isInDeadZone = bits, U32, 1304, [8:8] +isBlipping = bits, U32, 1304, [9:9] +useClosedLoop = bits, U32, 1304, [10:10] +badTps = bits, U32, 1304, [11:11] +looksLikeRunning = bits, U32, 1304, [12:12] +looksLikeCoasting = bits, U32, 1304, [13:13] +looksLikeCrankToIdle = bits, U32, 1304, [14:14] +isIdleCoasting = bits, U32, 1304, [15:15] +isIdleClosedLoop = bits, U32, 1304, [16:16] +idleTarget = scalar, S32, 1308, "", 1, 0 +targetRpmByClt = scalar, S32, 1312, "", 1, 0 +targetRpmAcBump = scalar, S32, 1316, "", 1, 0 +iacByRpmTaper = scalar, F32, 1320 +luaAdd = scalar, F32, 1324 +; total TS size = 1328 +idlePosition = scalar, F32, 1328, "per", 1,0 +trim = scalar, F32, 1332, "", 1, 0 +luaAdjustment = scalar, F32, 1336, "per", 1,0 +m_wastegatePosition = scalar, F32, 1340, "per", 1,0 +etbFeedForward = scalar, F32, 1344 +etbIntegralError = scalar, F32, 1348, "", 1, 0 +etbCurrentTarget = scalar, F32, 1352, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1356, "%", 1, 0 +etbRevLimitActive = bits, U32, 1360, [0:0] +jamDetected = bits, U32, 1360, [1:1] +etbDutyRateOfChange = scalar, F32, 1364, "per", 1,0 +etbDutyAverage = scalar, F32, 1368, "per", 1,0 +etbTpsErrorCounter = scalar, U16, 1372, "count", 1,0 +etbPpsErrorCounter = scalar, U16, 1374, "count", 1,0 +etbErrorCode = scalar, S08, 1376, "", 1, 0 +jamTimer = scalar, U16, 1378, "sec", 0.01, 0 +; total TS size = 1380 +faultCode = scalar, U08, 1380, "", 1, 0 +heaterDuty = scalar, U08, 1381, "%", 1, 0 +pumpDuty = scalar, U08, 1382, "%", 1, 0 +tempC = scalar, U16, 1384, "C", 1, 0 +nernstVoltage = scalar, U16, 1386, "V", 0.001, 0 +esr = scalar, U16, 1388, "ohm", 1, 0 +; total TS size = 1392 +dcOutput0 = scalar, F32, 1392, "per", 1,0 +isEnabled0_int = scalar, U08, 1396, "per", 1,0 +isEnabled0 = bits, U32, 1400, [0:0] ; total TS size = 1404 -vvtTarget = scalar, U16, 1404, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1406, "%", 0.5, 0 -; total TS size = 1408 -lambdaCurrentlyGood = bits, U32, 1408, [0:0] -lambdaMonitorCut = bits, U32, 1408, [1:1] -lambdaTimeSinceGood = scalar, U16, 1412, "sec", 0.01, 0 +value0 = scalar, U16, 1404, "value", 1,0 +value1 = scalar, U16, 1406, "value", 1,0 +errorRate = scalar, F32, 1408, "ratio", 1,0 +; total TS size = 1412 +vvtTarget = scalar, U16, 1412, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1414, "%", 0.5, 0 ; total TS size = 1416 +lambdaCurrentlyGood = bits, U32, 1416, [0:0] +lambdaMonitorCut = bits, U32, 1416, [1:1] +lambdaTimeSinceGood = scalar, U16, 1420, "sec", 0.01, 0 +; total TS size = 1424 time = { timeNow } @@ -5173,8 +5175,9 @@ entry = m_hasSynchronizedPhase, "sync: Known Engine Phase", int, "%d" entry = wallFuelCorrection, "fuel wallwetting injection time", float, "%.3f" entry = wallFuel, "Fuel on the wall", float, "%.3f" entry = idleState, "idleState", int, "%d" -entry = currentIdlePosition, "idle: current position", float, "%.3f" +entry = currentIdlePosition, "Idle: Position", float, "%.3f" entry = baseIdlePosition, "idle: base value", float, "%.3f" +entry = idleClosedLoop, "Idle: Closed loop", float, "%.3f" entry = iacByTpsTaper, "idle: iacByTpsTaper portion", float, "%.3f" entry = throttlePedalUpState, "idle: throttlePedalUpState", int, "%d" entry = mightResetPid, "idle: mightResetPid", int, "%d" @@ -5194,8 +5197,9 @@ entry = looksLikeCoasting, "looksLikeCoasting", int, "%d" entry = looksLikeCrankToIdle, "looksLikeCrankToIdle", int, "%d" entry = isIdleCoasting, "Idle: coasting", int, "%d" entry = isIdleClosedLoop, "Idle: Closed loop active", int, "%d" -entry = targetRpmByClt, "idle: target by CLT", int, "%d" -entry = targetRpmAcBump, "idle: A/C bump", int, "%d" +entry = idleTarget, "Idle: Target RPM", int, "%d" +entry = targetRpmByClt, "Idle: Target RPM base", int, "%d" +entry = targetRpmAcBump, "Idle: Target A/C bump", int, "%d" entry = iacByRpmTaper, "idle: iacByRpmTaper portion", float, "%.3f" entry = luaAdd, "idle: Lua Adder", float, "%.3f" entry = idlePosition, "ETB: idlePosition", float, "%.3f" @@ -6104,13 +6108,15 @@ dialog = idle_stateDialog, "idle_state" graphLine = idleState graphLine = currentIdlePosition graphLine = baseIdlePosition - graphLine = iacByTpsTaper + graphLine = idleClosedLoop liveGraph = idle_state_2_Graph, "Graph", South + graphLine = iacByTpsTaper graphLine = throttlePedalUpState + graphLine = idleTarget graphLine = targetRpmByClt + liveGraph = idle_state_3_Graph, "Graph", South graphLine = targetRpmAcBump graphLine = iacByRpmTaper - liveGraph = idle_state_3_Graph, "Graph", South graphLine = luaAdd indicatorPanel = electronic_throttleIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini b/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini index 114888b127..14fccce874 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.09.28.hellen128.1093999377" + signature = "rusEFI master.2023.09.28.hellen128.2324292073" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.09.28.hellen128.1093999377" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.09.28.hellen128.2324292073" ; 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 Thu Sep 28 03:24:10 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Thu Sep 28 13:44:43 UTC 2023 pageSize = 23664 page = 1 @@ -2320,7 +2320,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23654, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1416 + ochBlockSize = 1424 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3039,69 +3039,71 @@ wallFuel = scalar, F32, 1276, "", 1, 0 idleState = bits, S32, 1280, [0:2], "not important" currentIdlePosition = scalar, F32, 1284 baseIdlePosition = scalar, F32, 1288 -iacByTpsTaper = scalar, F32, 1292 -throttlePedalUpState = scalar, S32, 1296, "", 1, 0 -mightResetPid = bits, U32, 1300, [0:0] -shouldResetPid = bits, U32, 1300, [1:1] -wasResetPid = bits, U32, 1300, [2:2] -mustResetPid = bits, U32, 1300, [3:3] -isCranking = bits, U32, 1300, [4:4] -isIacTableForCoasting = bits, U32, 1300, [5:5] -notIdling = bits, U32, 1300, [6:6] -needReset = bits, U32, 1300, [7:7] -isInDeadZone = bits, U32, 1300, [8:8] -isBlipping = bits, U32, 1300, [9:9] -useClosedLoop = bits, U32, 1300, [10:10] -badTps = bits, U32, 1300, [11:11] -looksLikeRunning = bits, U32, 1300, [12:12] -looksLikeCoasting = bits, U32, 1300, [13:13] -looksLikeCrankToIdle = bits, U32, 1300, [14:14] -isIdleCoasting = bits, U32, 1300, [15:15] -isIdleClosedLoop = bits, U32, 1300, [16:16] -targetRpmByClt = scalar, S32, 1304, "", 1, 0 -targetRpmAcBump = scalar, S32, 1308, "", 1, 0 -iacByRpmTaper = scalar, F32, 1312 -luaAdd = scalar, F32, 1316 -; total TS size = 1320 -idlePosition = scalar, F32, 1320, "per", 1,0 -trim = scalar, F32, 1324, "", 1, 0 -luaAdjustment = scalar, F32, 1328, "per", 1,0 -m_wastegatePosition = scalar, F32, 1332, "per", 1,0 -etbFeedForward = scalar, F32, 1336 -etbIntegralError = scalar, F32, 1340, "", 1, 0 -etbCurrentTarget = scalar, F32, 1344, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1348, "%", 1, 0 -etbRevLimitActive = bits, U32, 1352, [0:0] -jamDetected = bits, U32, 1352, [1:1] -etbDutyRateOfChange = scalar, F32, 1356, "per", 1,0 -etbDutyAverage = scalar, F32, 1360, "per", 1,0 -etbTpsErrorCounter = scalar, U16, 1364, "count", 1,0 -etbPpsErrorCounter = scalar, U16, 1366, "count", 1,0 -etbErrorCode = scalar, S08, 1368, "", 1, 0 -jamTimer = scalar, U16, 1370, "sec", 0.01, 0 -; total TS size = 1372 -faultCode = scalar, U08, 1372, "", 1, 0 -heaterDuty = scalar, U08, 1373, "%", 1, 0 -pumpDuty = scalar, U08, 1374, "%", 1, 0 -tempC = scalar, U16, 1376, "C", 1, 0 -nernstVoltage = scalar, U16, 1378, "V", 0.001, 0 -esr = scalar, U16, 1380, "ohm", 1, 0 -; total TS size = 1384 -dcOutput0 = scalar, F32, 1384, "per", 1,0 -isEnabled0_int = scalar, U08, 1388, "per", 1,0 -isEnabled0 = bits, U32, 1392, [0:0] -; total TS size = 1396 -value0 = scalar, U16, 1396, "value", 1,0 -value1 = scalar, U16, 1398, "value", 1,0 -errorRate = scalar, F32, 1400, "ratio", 1,0 +idleClosedLoop = scalar, F32, 1292 +iacByTpsTaper = scalar, F32, 1296 +throttlePedalUpState = scalar, S32, 1300, "", 1, 0 +mightResetPid = bits, U32, 1304, [0:0] +shouldResetPid = bits, U32, 1304, [1:1] +wasResetPid = bits, U32, 1304, [2:2] +mustResetPid = bits, U32, 1304, [3:3] +isCranking = bits, U32, 1304, [4:4] +isIacTableForCoasting = bits, U32, 1304, [5:5] +notIdling = bits, U32, 1304, [6:6] +needReset = bits, U32, 1304, [7:7] +isInDeadZone = bits, U32, 1304, [8:8] +isBlipping = bits, U32, 1304, [9:9] +useClosedLoop = bits, U32, 1304, [10:10] +badTps = bits, U32, 1304, [11:11] +looksLikeRunning = bits, U32, 1304, [12:12] +looksLikeCoasting = bits, U32, 1304, [13:13] +looksLikeCrankToIdle = bits, U32, 1304, [14:14] +isIdleCoasting = bits, U32, 1304, [15:15] +isIdleClosedLoop = bits, U32, 1304, [16:16] +idleTarget = scalar, S32, 1308, "", 1, 0 +targetRpmByClt = scalar, S32, 1312, "", 1, 0 +targetRpmAcBump = scalar, S32, 1316, "", 1, 0 +iacByRpmTaper = scalar, F32, 1320 +luaAdd = scalar, F32, 1324 +; total TS size = 1328 +idlePosition = scalar, F32, 1328, "per", 1,0 +trim = scalar, F32, 1332, "", 1, 0 +luaAdjustment = scalar, F32, 1336, "per", 1,0 +m_wastegatePosition = scalar, F32, 1340, "per", 1,0 +etbFeedForward = scalar, F32, 1344 +etbIntegralError = scalar, F32, 1348, "", 1, 0 +etbCurrentTarget = scalar, F32, 1352, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1356, "%", 1, 0 +etbRevLimitActive = bits, U32, 1360, [0:0] +jamDetected = bits, U32, 1360, [1:1] +etbDutyRateOfChange = scalar, F32, 1364, "per", 1,0 +etbDutyAverage = scalar, F32, 1368, "per", 1,0 +etbTpsErrorCounter = scalar, U16, 1372, "count", 1,0 +etbPpsErrorCounter = scalar, U16, 1374, "count", 1,0 +etbErrorCode = scalar, S08, 1376, "", 1, 0 +jamTimer = scalar, U16, 1378, "sec", 0.01, 0 +; total TS size = 1380 +faultCode = scalar, U08, 1380, "", 1, 0 +heaterDuty = scalar, U08, 1381, "%", 1, 0 +pumpDuty = scalar, U08, 1382, "%", 1, 0 +tempC = scalar, U16, 1384, "C", 1, 0 +nernstVoltage = scalar, U16, 1386, "V", 0.001, 0 +esr = scalar, U16, 1388, "ohm", 1, 0 +; total TS size = 1392 +dcOutput0 = scalar, F32, 1392, "per", 1,0 +isEnabled0_int = scalar, U08, 1396, "per", 1,0 +isEnabled0 = bits, U32, 1400, [0:0] ; total TS size = 1404 -vvtTarget = scalar, U16, 1404, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1406, "%", 0.5, 0 -; total TS size = 1408 -lambdaCurrentlyGood = bits, U32, 1408, [0:0] -lambdaMonitorCut = bits, U32, 1408, [1:1] -lambdaTimeSinceGood = scalar, U16, 1412, "sec", 0.01, 0 +value0 = scalar, U16, 1404, "value", 1,0 +value1 = scalar, U16, 1406, "value", 1,0 +errorRate = scalar, F32, 1408, "ratio", 1,0 +; total TS size = 1412 +vvtTarget = scalar, U16, 1412, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1414, "%", 0.5, 0 ; total TS size = 1416 +lambdaCurrentlyGood = bits, U32, 1416, [0:0] +lambdaMonitorCut = bits, U32, 1416, [1:1] +lambdaTimeSinceGood = scalar, U16, 1420, "sec", 0.01, 0 +; total TS size = 1424 time = { timeNow } @@ -5173,8 +5175,9 @@ entry = m_hasSynchronizedPhase, "sync: Known Engine Phase", int, "%d" entry = wallFuelCorrection, "fuel wallwetting injection time", float, "%.3f" entry = wallFuel, "Fuel on the wall", float, "%.3f" entry = idleState, "idleState", int, "%d" -entry = currentIdlePosition, "idle: current position", float, "%.3f" +entry = currentIdlePosition, "Idle: Position", float, "%.3f" entry = baseIdlePosition, "idle: base value", float, "%.3f" +entry = idleClosedLoop, "Idle: Closed loop", float, "%.3f" entry = iacByTpsTaper, "idle: iacByTpsTaper portion", float, "%.3f" entry = throttlePedalUpState, "idle: throttlePedalUpState", int, "%d" entry = mightResetPid, "idle: mightResetPid", int, "%d" @@ -5194,8 +5197,9 @@ entry = looksLikeCoasting, "looksLikeCoasting", int, "%d" entry = looksLikeCrankToIdle, "looksLikeCrankToIdle", int, "%d" entry = isIdleCoasting, "Idle: coasting", int, "%d" entry = isIdleClosedLoop, "Idle: Closed loop active", int, "%d" -entry = targetRpmByClt, "idle: target by CLT", int, "%d" -entry = targetRpmAcBump, "idle: A/C bump", int, "%d" +entry = idleTarget, "Idle: Target RPM", int, "%d" +entry = targetRpmByClt, "Idle: Target RPM base", int, "%d" +entry = targetRpmAcBump, "Idle: Target A/C bump", int, "%d" entry = iacByRpmTaper, "idle: iacByRpmTaper portion", float, "%.3f" entry = luaAdd, "idle: Lua Adder", float, "%.3f" entry = idlePosition, "ETB: idlePosition", float, "%.3f" @@ -6104,13 +6108,15 @@ dialog = idle_stateDialog, "idle_state" graphLine = idleState graphLine = currentIdlePosition graphLine = baseIdlePosition - graphLine = iacByTpsTaper + graphLine = idleClosedLoop liveGraph = idle_state_2_Graph, "Graph", South + graphLine = iacByTpsTaper graphLine = throttlePedalUpState + graphLine = idleTarget graphLine = targetRpmByClt + liveGraph = idle_state_3_Graph, "Graph", South graphLine = targetRpmAcBump graphLine = iacByRpmTaper - liveGraph = idle_state_3_Graph, "Graph", South graphLine = luaAdd indicatorPanel = electronic_throttleIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini b/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini index b5d9debbf0..9d3ef18d5e 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.09.28.hellen154hyundai.1922303734" + signature = "rusEFI master.2023.09.28.hellen154hyundai.3106470926" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.09.28.hellen154hyundai.1922303734" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.09.28.hellen154hyundai.3106470926" ; 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 Thu Sep 28 03:24:22 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Thu Sep 28 13:44:56 UTC 2023 pageSize = 23664 page = 1 @@ -2320,7 +2320,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23654, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1416 + ochBlockSize = 1424 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3039,69 +3039,71 @@ wallFuel = scalar, F32, 1276, "", 1, 0 idleState = bits, S32, 1280, [0:2], "not important" currentIdlePosition = scalar, F32, 1284 baseIdlePosition = scalar, F32, 1288 -iacByTpsTaper = scalar, F32, 1292 -throttlePedalUpState = scalar, S32, 1296, "", 1, 0 -mightResetPid = bits, U32, 1300, [0:0] -shouldResetPid = bits, U32, 1300, [1:1] -wasResetPid = bits, U32, 1300, [2:2] -mustResetPid = bits, U32, 1300, [3:3] -isCranking = bits, U32, 1300, [4:4] -isIacTableForCoasting = bits, U32, 1300, [5:5] -notIdling = bits, U32, 1300, [6:6] -needReset = bits, U32, 1300, [7:7] -isInDeadZone = bits, U32, 1300, [8:8] -isBlipping = bits, U32, 1300, [9:9] -useClosedLoop = bits, U32, 1300, [10:10] -badTps = bits, U32, 1300, [11:11] -looksLikeRunning = bits, U32, 1300, [12:12] -looksLikeCoasting = bits, U32, 1300, [13:13] -looksLikeCrankToIdle = bits, U32, 1300, [14:14] -isIdleCoasting = bits, U32, 1300, [15:15] -isIdleClosedLoop = bits, U32, 1300, [16:16] -targetRpmByClt = scalar, S32, 1304, "", 1, 0 -targetRpmAcBump = scalar, S32, 1308, "", 1, 0 -iacByRpmTaper = scalar, F32, 1312 -luaAdd = scalar, F32, 1316 -; total TS size = 1320 -idlePosition = scalar, F32, 1320, "per", 1,0 -trim = scalar, F32, 1324, "", 1, 0 -luaAdjustment = scalar, F32, 1328, "per", 1,0 -m_wastegatePosition = scalar, F32, 1332, "per", 1,0 -etbFeedForward = scalar, F32, 1336 -etbIntegralError = scalar, F32, 1340, "", 1, 0 -etbCurrentTarget = scalar, F32, 1344, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1348, "%", 1, 0 -etbRevLimitActive = bits, U32, 1352, [0:0] -jamDetected = bits, U32, 1352, [1:1] -etbDutyRateOfChange = scalar, F32, 1356, "per", 1,0 -etbDutyAverage = scalar, F32, 1360, "per", 1,0 -etbTpsErrorCounter = scalar, U16, 1364, "count", 1,0 -etbPpsErrorCounter = scalar, U16, 1366, "count", 1,0 -etbErrorCode = scalar, S08, 1368, "", 1, 0 -jamTimer = scalar, U16, 1370, "sec", 0.01, 0 -; total TS size = 1372 -faultCode = scalar, U08, 1372, "", 1, 0 -heaterDuty = scalar, U08, 1373, "%", 1, 0 -pumpDuty = scalar, U08, 1374, "%", 1, 0 -tempC = scalar, U16, 1376, "C", 1, 0 -nernstVoltage = scalar, U16, 1378, "V", 0.001, 0 -esr = scalar, U16, 1380, "ohm", 1, 0 -; total TS size = 1384 -dcOutput0 = scalar, F32, 1384, "per", 1,0 -isEnabled0_int = scalar, U08, 1388, "per", 1,0 -isEnabled0 = bits, U32, 1392, [0:0] -; total TS size = 1396 -value0 = scalar, U16, 1396, "value", 1,0 -value1 = scalar, U16, 1398, "value", 1,0 -errorRate = scalar, F32, 1400, "ratio", 1,0 +idleClosedLoop = scalar, F32, 1292 +iacByTpsTaper = scalar, F32, 1296 +throttlePedalUpState = scalar, S32, 1300, "", 1, 0 +mightResetPid = bits, U32, 1304, [0:0] +shouldResetPid = bits, U32, 1304, [1:1] +wasResetPid = bits, U32, 1304, [2:2] +mustResetPid = bits, U32, 1304, [3:3] +isCranking = bits, U32, 1304, [4:4] +isIacTableForCoasting = bits, U32, 1304, [5:5] +notIdling = bits, U32, 1304, [6:6] +needReset = bits, U32, 1304, [7:7] +isInDeadZone = bits, U32, 1304, [8:8] +isBlipping = bits, U32, 1304, [9:9] +useClosedLoop = bits, U32, 1304, [10:10] +badTps = bits, U32, 1304, [11:11] +looksLikeRunning = bits, U32, 1304, [12:12] +looksLikeCoasting = bits, U32, 1304, [13:13] +looksLikeCrankToIdle = bits, U32, 1304, [14:14] +isIdleCoasting = bits, U32, 1304, [15:15] +isIdleClosedLoop = bits, U32, 1304, [16:16] +idleTarget = scalar, S32, 1308, "", 1, 0 +targetRpmByClt = scalar, S32, 1312, "", 1, 0 +targetRpmAcBump = scalar, S32, 1316, "", 1, 0 +iacByRpmTaper = scalar, F32, 1320 +luaAdd = scalar, F32, 1324 +; total TS size = 1328 +idlePosition = scalar, F32, 1328, "per", 1,0 +trim = scalar, F32, 1332, "", 1, 0 +luaAdjustment = scalar, F32, 1336, "per", 1,0 +m_wastegatePosition = scalar, F32, 1340, "per", 1,0 +etbFeedForward = scalar, F32, 1344 +etbIntegralError = scalar, F32, 1348, "", 1, 0 +etbCurrentTarget = scalar, F32, 1352, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1356, "%", 1, 0 +etbRevLimitActive = bits, U32, 1360, [0:0] +jamDetected = bits, U32, 1360, [1:1] +etbDutyRateOfChange = scalar, F32, 1364, "per", 1,0 +etbDutyAverage = scalar, F32, 1368, "per", 1,0 +etbTpsErrorCounter = scalar, U16, 1372, "count", 1,0 +etbPpsErrorCounter = scalar, U16, 1374, "count", 1,0 +etbErrorCode = scalar, S08, 1376, "", 1, 0 +jamTimer = scalar, U16, 1378, "sec", 0.01, 0 +; total TS size = 1380 +faultCode = scalar, U08, 1380, "", 1, 0 +heaterDuty = scalar, U08, 1381, "%", 1, 0 +pumpDuty = scalar, U08, 1382, "%", 1, 0 +tempC = scalar, U16, 1384, "C", 1, 0 +nernstVoltage = scalar, U16, 1386, "V", 0.001, 0 +esr = scalar, U16, 1388, "ohm", 1, 0 +; total TS size = 1392 +dcOutput0 = scalar, F32, 1392, "per", 1,0 +isEnabled0_int = scalar, U08, 1396, "per", 1,0 +isEnabled0 = bits, U32, 1400, [0:0] ; total TS size = 1404 -vvtTarget = scalar, U16, 1404, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1406, "%", 0.5, 0 -; total TS size = 1408 -lambdaCurrentlyGood = bits, U32, 1408, [0:0] -lambdaMonitorCut = bits, U32, 1408, [1:1] -lambdaTimeSinceGood = scalar, U16, 1412, "sec", 0.01, 0 +value0 = scalar, U16, 1404, "value", 1,0 +value1 = scalar, U16, 1406, "value", 1,0 +errorRate = scalar, F32, 1408, "ratio", 1,0 +; total TS size = 1412 +vvtTarget = scalar, U16, 1412, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1414, "%", 0.5, 0 ; total TS size = 1416 +lambdaCurrentlyGood = bits, U32, 1416, [0:0] +lambdaMonitorCut = bits, U32, 1416, [1:1] +lambdaTimeSinceGood = scalar, U16, 1420, "sec", 0.01, 0 +; total TS size = 1424 time = { timeNow } @@ -5173,8 +5175,9 @@ entry = m_hasSynchronizedPhase, "sync: Known Engine Phase", int, "%d" entry = wallFuelCorrection, "fuel wallwetting injection time", float, "%.3f" entry = wallFuel, "Fuel on the wall", float, "%.3f" entry = idleState, "idleState", int, "%d" -entry = currentIdlePosition, "idle: current position", float, "%.3f" +entry = currentIdlePosition, "Idle: Position", float, "%.3f" entry = baseIdlePosition, "idle: base value", float, "%.3f" +entry = idleClosedLoop, "Idle: Closed loop", float, "%.3f" entry = iacByTpsTaper, "idle: iacByTpsTaper portion", float, "%.3f" entry = throttlePedalUpState, "idle: throttlePedalUpState", int, "%d" entry = mightResetPid, "idle: mightResetPid", int, "%d" @@ -5194,8 +5197,9 @@ entry = looksLikeCoasting, "looksLikeCoasting", int, "%d" entry = looksLikeCrankToIdle, "looksLikeCrankToIdle", int, "%d" entry = isIdleCoasting, "Idle: coasting", int, "%d" entry = isIdleClosedLoop, "Idle: Closed loop active", int, "%d" -entry = targetRpmByClt, "idle: target by CLT", int, "%d" -entry = targetRpmAcBump, "idle: A/C bump", int, "%d" +entry = idleTarget, "Idle: Target RPM", int, "%d" +entry = targetRpmByClt, "Idle: Target RPM base", int, "%d" +entry = targetRpmAcBump, "Idle: Target A/C bump", int, "%d" entry = iacByRpmTaper, "idle: iacByRpmTaper portion", float, "%.3f" entry = luaAdd, "idle: Lua Adder", float, "%.3f" entry = idlePosition, "ETB: idlePosition", float, "%.3f" @@ -6102,13 +6106,15 @@ dialog = idle_stateDialog, "idle_state" graphLine = idleState graphLine = currentIdlePosition graphLine = baseIdlePosition - graphLine = iacByTpsTaper + graphLine = idleClosedLoop liveGraph = idle_state_2_Graph, "Graph", South + graphLine = iacByTpsTaper graphLine = throttlePedalUpState + graphLine = idleTarget graphLine = targetRpmByClt + liveGraph = idle_state_3_Graph, "Graph", South graphLine = targetRpmAcBump graphLine = iacByRpmTaper - liveGraph = idle_state_3_Graph, "Graph", South graphLine = luaAdd indicatorPanel = electronic_throttleIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_hellen72.ini b/firmware/tunerstudio/generated/rusefi_hellen72.ini index 5a943396f8..c24c96daa3 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.09.28.hellen72.3802372694" + signature = "rusEFI master.2023.09.28.hellen72.689922222" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.09.28.hellen72.3802372694" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.09.28.hellen72.689922222" ; 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 Thu Sep 28 03:24:31 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Thu Sep 28 13:45:05 UTC 2023 pageSize = 23664 page = 1 @@ -2320,7 +2320,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23654, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1416 + ochBlockSize = 1424 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3039,69 +3039,71 @@ wallFuel = scalar, F32, 1276, "", 1, 0 idleState = bits, S32, 1280, [0:2], "not important" currentIdlePosition = scalar, F32, 1284 baseIdlePosition = scalar, F32, 1288 -iacByTpsTaper = scalar, F32, 1292 -throttlePedalUpState = scalar, S32, 1296, "", 1, 0 -mightResetPid = bits, U32, 1300, [0:0] -shouldResetPid = bits, U32, 1300, [1:1] -wasResetPid = bits, U32, 1300, [2:2] -mustResetPid = bits, U32, 1300, [3:3] -isCranking = bits, U32, 1300, [4:4] -isIacTableForCoasting = bits, U32, 1300, [5:5] -notIdling = bits, U32, 1300, [6:6] -needReset = bits, U32, 1300, [7:7] -isInDeadZone = bits, U32, 1300, [8:8] -isBlipping = bits, U32, 1300, [9:9] -useClosedLoop = bits, U32, 1300, [10:10] -badTps = bits, U32, 1300, [11:11] -looksLikeRunning = bits, U32, 1300, [12:12] -looksLikeCoasting = bits, U32, 1300, [13:13] -looksLikeCrankToIdle = bits, U32, 1300, [14:14] -isIdleCoasting = bits, U32, 1300, [15:15] -isIdleClosedLoop = bits, U32, 1300, [16:16] -targetRpmByClt = scalar, S32, 1304, "", 1, 0 -targetRpmAcBump = scalar, S32, 1308, "", 1, 0 -iacByRpmTaper = scalar, F32, 1312 -luaAdd = scalar, F32, 1316 -; total TS size = 1320 -idlePosition = scalar, F32, 1320, "per", 1,0 -trim = scalar, F32, 1324, "", 1, 0 -luaAdjustment = scalar, F32, 1328, "per", 1,0 -m_wastegatePosition = scalar, F32, 1332, "per", 1,0 -etbFeedForward = scalar, F32, 1336 -etbIntegralError = scalar, F32, 1340, "", 1, 0 -etbCurrentTarget = scalar, F32, 1344, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1348, "%", 1, 0 -etbRevLimitActive = bits, U32, 1352, [0:0] -jamDetected = bits, U32, 1352, [1:1] -etbDutyRateOfChange = scalar, F32, 1356, "per", 1,0 -etbDutyAverage = scalar, F32, 1360, "per", 1,0 -etbTpsErrorCounter = scalar, U16, 1364, "count", 1,0 -etbPpsErrorCounter = scalar, U16, 1366, "count", 1,0 -etbErrorCode = scalar, S08, 1368, "", 1, 0 -jamTimer = scalar, U16, 1370, "sec", 0.01, 0 -; total TS size = 1372 -faultCode = scalar, U08, 1372, "", 1, 0 -heaterDuty = scalar, U08, 1373, "%", 1, 0 -pumpDuty = scalar, U08, 1374, "%", 1, 0 -tempC = scalar, U16, 1376, "C", 1, 0 -nernstVoltage = scalar, U16, 1378, "V", 0.001, 0 -esr = scalar, U16, 1380, "ohm", 1, 0 -; total TS size = 1384 -dcOutput0 = scalar, F32, 1384, "per", 1,0 -isEnabled0_int = scalar, U08, 1388, "per", 1,0 -isEnabled0 = bits, U32, 1392, [0:0] -; total TS size = 1396 -value0 = scalar, U16, 1396, "value", 1,0 -value1 = scalar, U16, 1398, "value", 1,0 -errorRate = scalar, F32, 1400, "ratio", 1,0 +idleClosedLoop = scalar, F32, 1292 +iacByTpsTaper = scalar, F32, 1296 +throttlePedalUpState = scalar, S32, 1300, "", 1, 0 +mightResetPid = bits, U32, 1304, [0:0] +shouldResetPid = bits, U32, 1304, [1:1] +wasResetPid = bits, U32, 1304, [2:2] +mustResetPid = bits, U32, 1304, [3:3] +isCranking = bits, U32, 1304, [4:4] +isIacTableForCoasting = bits, U32, 1304, [5:5] +notIdling = bits, U32, 1304, [6:6] +needReset = bits, U32, 1304, [7:7] +isInDeadZone = bits, U32, 1304, [8:8] +isBlipping = bits, U32, 1304, [9:9] +useClosedLoop = bits, U32, 1304, [10:10] +badTps = bits, U32, 1304, [11:11] +looksLikeRunning = bits, U32, 1304, [12:12] +looksLikeCoasting = bits, U32, 1304, [13:13] +looksLikeCrankToIdle = bits, U32, 1304, [14:14] +isIdleCoasting = bits, U32, 1304, [15:15] +isIdleClosedLoop = bits, U32, 1304, [16:16] +idleTarget = scalar, S32, 1308, "", 1, 0 +targetRpmByClt = scalar, S32, 1312, "", 1, 0 +targetRpmAcBump = scalar, S32, 1316, "", 1, 0 +iacByRpmTaper = scalar, F32, 1320 +luaAdd = scalar, F32, 1324 +; total TS size = 1328 +idlePosition = scalar, F32, 1328, "per", 1,0 +trim = scalar, F32, 1332, "", 1, 0 +luaAdjustment = scalar, F32, 1336, "per", 1,0 +m_wastegatePosition = scalar, F32, 1340, "per", 1,0 +etbFeedForward = scalar, F32, 1344 +etbIntegralError = scalar, F32, 1348, "", 1, 0 +etbCurrentTarget = scalar, F32, 1352, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1356, "%", 1, 0 +etbRevLimitActive = bits, U32, 1360, [0:0] +jamDetected = bits, U32, 1360, [1:1] +etbDutyRateOfChange = scalar, F32, 1364, "per", 1,0 +etbDutyAverage = scalar, F32, 1368, "per", 1,0 +etbTpsErrorCounter = scalar, U16, 1372, "count", 1,0 +etbPpsErrorCounter = scalar, U16, 1374, "count", 1,0 +etbErrorCode = scalar, S08, 1376, "", 1, 0 +jamTimer = scalar, U16, 1378, "sec", 0.01, 0 +; total TS size = 1380 +faultCode = scalar, U08, 1380, "", 1, 0 +heaterDuty = scalar, U08, 1381, "%", 1, 0 +pumpDuty = scalar, U08, 1382, "%", 1, 0 +tempC = scalar, U16, 1384, "C", 1, 0 +nernstVoltage = scalar, U16, 1386, "V", 0.001, 0 +esr = scalar, U16, 1388, "ohm", 1, 0 +; total TS size = 1392 +dcOutput0 = scalar, F32, 1392, "per", 1,0 +isEnabled0_int = scalar, U08, 1396, "per", 1,0 +isEnabled0 = bits, U32, 1400, [0:0] ; total TS size = 1404 -vvtTarget = scalar, U16, 1404, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1406, "%", 0.5, 0 -; total TS size = 1408 -lambdaCurrentlyGood = bits, U32, 1408, [0:0] -lambdaMonitorCut = bits, U32, 1408, [1:1] -lambdaTimeSinceGood = scalar, U16, 1412, "sec", 0.01, 0 +value0 = scalar, U16, 1404, "value", 1,0 +value1 = scalar, U16, 1406, "value", 1,0 +errorRate = scalar, F32, 1408, "ratio", 1,0 +; total TS size = 1412 +vvtTarget = scalar, U16, 1412, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1414, "%", 0.5, 0 ; total TS size = 1416 +lambdaCurrentlyGood = bits, U32, 1416, [0:0] +lambdaMonitorCut = bits, U32, 1416, [1:1] +lambdaTimeSinceGood = scalar, U16, 1420, "sec", 0.01, 0 +; total TS size = 1424 time = { timeNow } @@ -5173,8 +5175,9 @@ entry = m_hasSynchronizedPhase, "sync: Known Engine Phase", int, "%d" entry = wallFuelCorrection, "fuel wallwetting injection time", float, "%.3f" entry = wallFuel, "Fuel on the wall", float, "%.3f" entry = idleState, "idleState", int, "%d" -entry = currentIdlePosition, "idle: current position", float, "%.3f" +entry = currentIdlePosition, "Idle: Position", float, "%.3f" entry = baseIdlePosition, "idle: base value", float, "%.3f" +entry = idleClosedLoop, "Idle: Closed loop", float, "%.3f" entry = iacByTpsTaper, "idle: iacByTpsTaper portion", float, "%.3f" entry = throttlePedalUpState, "idle: throttlePedalUpState", int, "%d" entry = mightResetPid, "idle: mightResetPid", int, "%d" @@ -5194,8 +5197,9 @@ entry = looksLikeCoasting, "looksLikeCoasting", int, "%d" entry = looksLikeCrankToIdle, "looksLikeCrankToIdle", int, "%d" entry = isIdleCoasting, "Idle: coasting", int, "%d" entry = isIdleClosedLoop, "Idle: Closed loop active", int, "%d" -entry = targetRpmByClt, "idle: target by CLT", int, "%d" -entry = targetRpmAcBump, "idle: A/C bump", int, "%d" +entry = idleTarget, "Idle: Target RPM", int, "%d" +entry = targetRpmByClt, "Idle: Target RPM base", int, "%d" +entry = targetRpmAcBump, "Idle: Target A/C bump", int, "%d" entry = iacByRpmTaper, "idle: iacByRpmTaper portion", float, "%.3f" entry = luaAdd, "idle: Lua Adder", float, "%.3f" entry = idlePosition, "ETB: idlePosition", float, "%.3f" @@ -6104,13 +6108,15 @@ dialog = idle_stateDialog, "idle_state" graphLine = idleState graphLine = currentIdlePosition graphLine = baseIdlePosition - graphLine = iacByTpsTaper + graphLine = idleClosedLoop liveGraph = idle_state_2_Graph, "Graph", South + graphLine = iacByTpsTaper graphLine = throttlePedalUpState + graphLine = idleTarget graphLine = targetRpmByClt + liveGraph = idle_state_3_Graph, "Graph", South graphLine = targetRpmAcBump graphLine = iacByRpmTaper - liveGraph = idle_state_3_Graph, "Graph", South graphLine = luaAdd indicatorPanel = electronic_throttleIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_hellen81.ini b/firmware/tunerstudio/generated/rusefi_hellen81.ini index baa09ce480..d2581504b1 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.09.28.hellen81.2042042518" + signature = "rusEFI master.2023.09.28.hellen81.2987123310" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.09.28.hellen81.2042042518" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.09.28.hellen81.2987123310" ; 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 Thu Sep 28 03:24:34 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Thu Sep 28 13:45:08 UTC 2023 pageSize = 23664 page = 1 @@ -2320,7 +2320,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23654, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1416 + ochBlockSize = 1424 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3039,69 +3039,71 @@ wallFuel = scalar, F32, 1276, "", 1, 0 idleState = bits, S32, 1280, [0:2], "not important" currentIdlePosition = scalar, F32, 1284 baseIdlePosition = scalar, F32, 1288 -iacByTpsTaper = scalar, F32, 1292 -throttlePedalUpState = scalar, S32, 1296, "", 1, 0 -mightResetPid = bits, U32, 1300, [0:0] -shouldResetPid = bits, U32, 1300, [1:1] -wasResetPid = bits, U32, 1300, [2:2] -mustResetPid = bits, U32, 1300, [3:3] -isCranking = bits, U32, 1300, [4:4] -isIacTableForCoasting = bits, U32, 1300, [5:5] -notIdling = bits, U32, 1300, [6:6] -needReset = bits, U32, 1300, [7:7] -isInDeadZone = bits, U32, 1300, [8:8] -isBlipping = bits, U32, 1300, [9:9] -useClosedLoop = bits, U32, 1300, [10:10] -badTps = bits, U32, 1300, [11:11] -looksLikeRunning = bits, U32, 1300, [12:12] -looksLikeCoasting = bits, U32, 1300, [13:13] -looksLikeCrankToIdle = bits, U32, 1300, [14:14] -isIdleCoasting = bits, U32, 1300, [15:15] -isIdleClosedLoop = bits, U32, 1300, [16:16] -targetRpmByClt = scalar, S32, 1304, "", 1, 0 -targetRpmAcBump = scalar, S32, 1308, "", 1, 0 -iacByRpmTaper = scalar, F32, 1312 -luaAdd = scalar, F32, 1316 -; total TS size = 1320 -idlePosition = scalar, F32, 1320, "per", 1,0 -trim = scalar, F32, 1324, "", 1, 0 -luaAdjustment = scalar, F32, 1328, "per", 1,0 -m_wastegatePosition = scalar, F32, 1332, "per", 1,0 -etbFeedForward = scalar, F32, 1336 -etbIntegralError = scalar, F32, 1340, "", 1, 0 -etbCurrentTarget = scalar, F32, 1344, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1348, "%", 1, 0 -etbRevLimitActive = bits, U32, 1352, [0:0] -jamDetected = bits, U32, 1352, [1:1] -etbDutyRateOfChange = scalar, F32, 1356, "per", 1,0 -etbDutyAverage = scalar, F32, 1360, "per", 1,0 -etbTpsErrorCounter = scalar, U16, 1364, "count", 1,0 -etbPpsErrorCounter = scalar, U16, 1366, "count", 1,0 -etbErrorCode = scalar, S08, 1368, "", 1, 0 -jamTimer = scalar, U16, 1370, "sec", 0.01, 0 -; total TS size = 1372 -faultCode = scalar, U08, 1372, "", 1, 0 -heaterDuty = scalar, U08, 1373, "%", 1, 0 -pumpDuty = scalar, U08, 1374, "%", 1, 0 -tempC = scalar, U16, 1376, "C", 1, 0 -nernstVoltage = scalar, U16, 1378, "V", 0.001, 0 -esr = scalar, U16, 1380, "ohm", 1, 0 -; total TS size = 1384 -dcOutput0 = scalar, F32, 1384, "per", 1,0 -isEnabled0_int = scalar, U08, 1388, "per", 1,0 -isEnabled0 = bits, U32, 1392, [0:0] -; total TS size = 1396 -value0 = scalar, U16, 1396, "value", 1,0 -value1 = scalar, U16, 1398, "value", 1,0 -errorRate = scalar, F32, 1400, "ratio", 1,0 +idleClosedLoop = scalar, F32, 1292 +iacByTpsTaper = scalar, F32, 1296 +throttlePedalUpState = scalar, S32, 1300, "", 1, 0 +mightResetPid = bits, U32, 1304, [0:0] +shouldResetPid = bits, U32, 1304, [1:1] +wasResetPid = bits, U32, 1304, [2:2] +mustResetPid = bits, U32, 1304, [3:3] +isCranking = bits, U32, 1304, [4:4] +isIacTableForCoasting = bits, U32, 1304, [5:5] +notIdling = bits, U32, 1304, [6:6] +needReset = bits, U32, 1304, [7:7] +isInDeadZone = bits, U32, 1304, [8:8] +isBlipping = bits, U32, 1304, [9:9] +useClosedLoop = bits, U32, 1304, [10:10] +badTps = bits, U32, 1304, [11:11] +looksLikeRunning = bits, U32, 1304, [12:12] +looksLikeCoasting = bits, U32, 1304, [13:13] +looksLikeCrankToIdle = bits, U32, 1304, [14:14] +isIdleCoasting = bits, U32, 1304, [15:15] +isIdleClosedLoop = bits, U32, 1304, [16:16] +idleTarget = scalar, S32, 1308, "", 1, 0 +targetRpmByClt = scalar, S32, 1312, "", 1, 0 +targetRpmAcBump = scalar, S32, 1316, "", 1, 0 +iacByRpmTaper = scalar, F32, 1320 +luaAdd = scalar, F32, 1324 +; total TS size = 1328 +idlePosition = scalar, F32, 1328, "per", 1,0 +trim = scalar, F32, 1332, "", 1, 0 +luaAdjustment = scalar, F32, 1336, "per", 1,0 +m_wastegatePosition = scalar, F32, 1340, "per", 1,0 +etbFeedForward = scalar, F32, 1344 +etbIntegralError = scalar, F32, 1348, "", 1, 0 +etbCurrentTarget = scalar, F32, 1352, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1356, "%", 1, 0 +etbRevLimitActive = bits, U32, 1360, [0:0] +jamDetected = bits, U32, 1360, [1:1] +etbDutyRateOfChange = scalar, F32, 1364, "per", 1,0 +etbDutyAverage = scalar, F32, 1368, "per", 1,0 +etbTpsErrorCounter = scalar, U16, 1372, "count", 1,0 +etbPpsErrorCounter = scalar, U16, 1374, "count", 1,0 +etbErrorCode = scalar, S08, 1376, "", 1, 0 +jamTimer = scalar, U16, 1378, "sec", 0.01, 0 +; total TS size = 1380 +faultCode = scalar, U08, 1380, "", 1, 0 +heaterDuty = scalar, U08, 1381, "%", 1, 0 +pumpDuty = scalar, U08, 1382, "%", 1, 0 +tempC = scalar, U16, 1384, "C", 1, 0 +nernstVoltage = scalar, U16, 1386, "V", 0.001, 0 +esr = scalar, U16, 1388, "ohm", 1, 0 +; total TS size = 1392 +dcOutput0 = scalar, F32, 1392, "per", 1,0 +isEnabled0_int = scalar, U08, 1396, "per", 1,0 +isEnabled0 = bits, U32, 1400, [0:0] ; total TS size = 1404 -vvtTarget = scalar, U16, 1404, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1406, "%", 0.5, 0 -; total TS size = 1408 -lambdaCurrentlyGood = bits, U32, 1408, [0:0] -lambdaMonitorCut = bits, U32, 1408, [1:1] -lambdaTimeSinceGood = scalar, U16, 1412, "sec", 0.01, 0 +value0 = scalar, U16, 1404, "value", 1,0 +value1 = scalar, U16, 1406, "value", 1,0 +errorRate = scalar, F32, 1408, "ratio", 1,0 +; total TS size = 1412 +vvtTarget = scalar, U16, 1412, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1414, "%", 0.5, 0 ; total TS size = 1416 +lambdaCurrentlyGood = bits, U32, 1416, [0:0] +lambdaMonitorCut = bits, U32, 1416, [1:1] +lambdaTimeSinceGood = scalar, U16, 1420, "sec", 0.01, 0 +; total TS size = 1424 time = { timeNow } @@ -5173,8 +5175,9 @@ entry = m_hasSynchronizedPhase, "sync: Known Engine Phase", int, "%d" entry = wallFuelCorrection, "fuel wallwetting injection time", float, "%.3f" entry = wallFuel, "Fuel on the wall", float, "%.3f" entry = idleState, "idleState", int, "%d" -entry = currentIdlePosition, "idle: current position", float, "%.3f" +entry = currentIdlePosition, "Idle: Position", float, "%.3f" entry = baseIdlePosition, "idle: base value", float, "%.3f" +entry = idleClosedLoop, "Idle: Closed loop", float, "%.3f" entry = iacByTpsTaper, "idle: iacByTpsTaper portion", float, "%.3f" entry = throttlePedalUpState, "idle: throttlePedalUpState", int, "%d" entry = mightResetPid, "idle: mightResetPid", int, "%d" @@ -5194,8 +5197,9 @@ entry = looksLikeCoasting, "looksLikeCoasting", int, "%d" entry = looksLikeCrankToIdle, "looksLikeCrankToIdle", int, "%d" entry = isIdleCoasting, "Idle: coasting", int, "%d" entry = isIdleClosedLoop, "Idle: Closed loop active", int, "%d" -entry = targetRpmByClt, "idle: target by CLT", int, "%d" -entry = targetRpmAcBump, "idle: A/C bump", int, "%d" +entry = idleTarget, "Idle: Target RPM", int, "%d" +entry = targetRpmByClt, "Idle: Target RPM base", int, "%d" +entry = targetRpmAcBump, "Idle: Target A/C bump", int, "%d" entry = iacByRpmTaper, "idle: iacByRpmTaper portion", float, "%.3f" entry = luaAdd, "idle: Lua Adder", float, "%.3f" entry = idlePosition, "ETB: idlePosition", float, "%.3f" @@ -6102,13 +6106,15 @@ dialog = idle_stateDialog, "idle_state" graphLine = idleState graphLine = currentIdlePosition graphLine = baseIdlePosition - graphLine = iacByTpsTaper + graphLine = idleClosedLoop liveGraph = idle_state_2_Graph, "Graph", South + graphLine = iacByTpsTaper graphLine = throttlePedalUpState + graphLine = idleTarget graphLine = targetRpmByClt + liveGraph = idle_state_3_Graph, "Graph", South graphLine = targetRpmAcBump graphLine = iacByRpmTaper - liveGraph = idle_state_3_Graph, "Graph", South graphLine = luaAdd indicatorPanel = electronic_throttleIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini b/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini index 7fc2a9127e..32024eaa14 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.09.28.hellen88bmw.1623331263" + signature = "rusEFI master.2023.09.28.hellen88bmw.2877221703" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.09.28.hellen88bmw.1623331263" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.09.28.hellen88bmw.2877221703" ; 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 Thu Sep 28 03:24:25 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Thu Sep 28 13:44:59 UTC 2023 pageSize = 23664 page = 1 @@ -2320,7 +2320,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23654, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1416 + ochBlockSize = 1424 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3039,69 +3039,71 @@ wallFuel = scalar, F32, 1276, "", 1, 0 idleState = bits, S32, 1280, [0:2], "not important" currentIdlePosition = scalar, F32, 1284 baseIdlePosition = scalar, F32, 1288 -iacByTpsTaper = scalar, F32, 1292 -throttlePedalUpState = scalar, S32, 1296, "", 1, 0 -mightResetPid = bits, U32, 1300, [0:0] -shouldResetPid = bits, U32, 1300, [1:1] -wasResetPid = bits, U32, 1300, [2:2] -mustResetPid = bits, U32, 1300, [3:3] -isCranking = bits, U32, 1300, [4:4] -isIacTableForCoasting = bits, U32, 1300, [5:5] -notIdling = bits, U32, 1300, [6:6] -needReset = bits, U32, 1300, [7:7] -isInDeadZone = bits, U32, 1300, [8:8] -isBlipping = bits, U32, 1300, [9:9] -useClosedLoop = bits, U32, 1300, [10:10] -badTps = bits, U32, 1300, [11:11] -looksLikeRunning = bits, U32, 1300, [12:12] -looksLikeCoasting = bits, U32, 1300, [13:13] -looksLikeCrankToIdle = bits, U32, 1300, [14:14] -isIdleCoasting = bits, U32, 1300, [15:15] -isIdleClosedLoop = bits, U32, 1300, [16:16] -targetRpmByClt = scalar, S32, 1304, "", 1, 0 -targetRpmAcBump = scalar, S32, 1308, "", 1, 0 -iacByRpmTaper = scalar, F32, 1312 -luaAdd = scalar, F32, 1316 -; total TS size = 1320 -idlePosition = scalar, F32, 1320, "per", 1,0 -trim = scalar, F32, 1324, "", 1, 0 -luaAdjustment = scalar, F32, 1328, "per", 1,0 -m_wastegatePosition = scalar, F32, 1332, "per", 1,0 -etbFeedForward = scalar, F32, 1336 -etbIntegralError = scalar, F32, 1340, "", 1, 0 -etbCurrentTarget = scalar, F32, 1344, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1348, "%", 1, 0 -etbRevLimitActive = bits, U32, 1352, [0:0] -jamDetected = bits, U32, 1352, [1:1] -etbDutyRateOfChange = scalar, F32, 1356, "per", 1,0 -etbDutyAverage = scalar, F32, 1360, "per", 1,0 -etbTpsErrorCounter = scalar, U16, 1364, "count", 1,0 -etbPpsErrorCounter = scalar, U16, 1366, "count", 1,0 -etbErrorCode = scalar, S08, 1368, "", 1, 0 -jamTimer = scalar, U16, 1370, "sec", 0.01, 0 -; total TS size = 1372 -faultCode = scalar, U08, 1372, "", 1, 0 -heaterDuty = scalar, U08, 1373, "%", 1, 0 -pumpDuty = scalar, U08, 1374, "%", 1, 0 -tempC = scalar, U16, 1376, "C", 1, 0 -nernstVoltage = scalar, U16, 1378, "V", 0.001, 0 -esr = scalar, U16, 1380, "ohm", 1, 0 -; total TS size = 1384 -dcOutput0 = scalar, F32, 1384, "per", 1,0 -isEnabled0_int = scalar, U08, 1388, "per", 1,0 -isEnabled0 = bits, U32, 1392, [0:0] -; total TS size = 1396 -value0 = scalar, U16, 1396, "value", 1,0 -value1 = scalar, U16, 1398, "value", 1,0 -errorRate = scalar, F32, 1400, "ratio", 1,0 +idleClosedLoop = scalar, F32, 1292 +iacByTpsTaper = scalar, F32, 1296 +throttlePedalUpState = scalar, S32, 1300, "", 1, 0 +mightResetPid = bits, U32, 1304, [0:0] +shouldResetPid = bits, U32, 1304, [1:1] +wasResetPid = bits, U32, 1304, [2:2] +mustResetPid = bits, U32, 1304, [3:3] +isCranking = bits, U32, 1304, [4:4] +isIacTableForCoasting = bits, U32, 1304, [5:5] +notIdling = bits, U32, 1304, [6:6] +needReset = bits, U32, 1304, [7:7] +isInDeadZone = bits, U32, 1304, [8:8] +isBlipping = bits, U32, 1304, [9:9] +useClosedLoop = bits, U32, 1304, [10:10] +badTps = bits, U32, 1304, [11:11] +looksLikeRunning = bits, U32, 1304, [12:12] +looksLikeCoasting = bits, U32, 1304, [13:13] +looksLikeCrankToIdle = bits, U32, 1304, [14:14] +isIdleCoasting = bits, U32, 1304, [15:15] +isIdleClosedLoop = bits, U32, 1304, [16:16] +idleTarget = scalar, S32, 1308, "", 1, 0 +targetRpmByClt = scalar, S32, 1312, "", 1, 0 +targetRpmAcBump = scalar, S32, 1316, "", 1, 0 +iacByRpmTaper = scalar, F32, 1320 +luaAdd = scalar, F32, 1324 +; total TS size = 1328 +idlePosition = scalar, F32, 1328, "per", 1,0 +trim = scalar, F32, 1332, "", 1, 0 +luaAdjustment = scalar, F32, 1336, "per", 1,0 +m_wastegatePosition = scalar, F32, 1340, "per", 1,0 +etbFeedForward = scalar, F32, 1344 +etbIntegralError = scalar, F32, 1348, "", 1, 0 +etbCurrentTarget = scalar, F32, 1352, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1356, "%", 1, 0 +etbRevLimitActive = bits, U32, 1360, [0:0] +jamDetected = bits, U32, 1360, [1:1] +etbDutyRateOfChange = scalar, F32, 1364, "per", 1,0 +etbDutyAverage = scalar, F32, 1368, "per", 1,0 +etbTpsErrorCounter = scalar, U16, 1372, "count", 1,0 +etbPpsErrorCounter = scalar, U16, 1374, "count", 1,0 +etbErrorCode = scalar, S08, 1376, "", 1, 0 +jamTimer = scalar, U16, 1378, "sec", 0.01, 0 +; total TS size = 1380 +faultCode = scalar, U08, 1380, "", 1, 0 +heaterDuty = scalar, U08, 1381, "%", 1, 0 +pumpDuty = scalar, U08, 1382, "%", 1, 0 +tempC = scalar, U16, 1384, "C", 1, 0 +nernstVoltage = scalar, U16, 1386, "V", 0.001, 0 +esr = scalar, U16, 1388, "ohm", 1, 0 +; total TS size = 1392 +dcOutput0 = scalar, F32, 1392, "per", 1,0 +isEnabled0_int = scalar, U08, 1396, "per", 1,0 +isEnabled0 = bits, U32, 1400, [0:0] ; total TS size = 1404 -vvtTarget = scalar, U16, 1404, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1406, "%", 0.5, 0 -; total TS size = 1408 -lambdaCurrentlyGood = bits, U32, 1408, [0:0] -lambdaMonitorCut = bits, U32, 1408, [1:1] -lambdaTimeSinceGood = scalar, U16, 1412, "sec", 0.01, 0 +value0 = scalar, U16, 1404, "value", 1,0 +value1 = scalar, U16, 1406, "value", 1,0 +errorRate = scalar, F32, 1408, "ratio", 1,0 +; total TS size = 1412 +vvtTarget = scalar, U16, 1412, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1414, "%", 0.5, 0 ; total TS size = 1416 +lambdaCurrentlyGood = bits, U32, 1416, [0:0] +lambdaMonitorCut = bits, U32, 1416, [1:1] +lambdaTimeSinceGood = scalar, U16, 1420, "sec", 0.01, 0 +; total TS size = 1424 time = { timeNow } @@ -5173,8 +5175,9 @@ entry = m_hasSynchronizedPhase, "sync: Known Engine Phase", int, "%d" entry = wallFuelCorrection, "fuel wallwetting injection time", float, "%.3f" entry = wallFuel, "Fuel on the wall", float, "%.3f" entry = idleState, "idleState", int, "%d" -entry = currentIdlePosition, "idle: current position", float, "%.3f" +entry = currentIdlePosition, "Idle: Position", float, "%.3f" entry = baseIdlePosition, "idle: base value", float, "%.3f" +entry = idleClosedLoop, "Idle: Closed loop", float, "%.3f" entry = iacByTpsTaper, "idle: iacByTpsTaper portion", float, "%.3f" entry = throttlePedalUpState, "idle: throttlePedalUpState", int, "%d" entry = mightResetPid, "idle: mightResetPid", int, "%d" @@ -5194,8 +5197,9 @@ entry = looksLikeCoasting, "looksLikeCoasting", int, "%d" entry = looksLikeCrankToIdle, "looksLikeCrankToIdle", int, "%d" entry = isIdleCoasting, "Idle: coasting", int, "%d" entry = isIdleClosedLoop, "Idle: Closed loop active", int, "%d" -entry = targetRpmByClt, "idle: target by CLT", int, "%d" -entry = targetRpmAcBump, "idle: A/C bump", int, "%d" +entry = idleTarget, "Idle: Target RPM", int, "%d" +entry = targetRpmByClt, "Idle: Target RPM base", int, "%d" +entry = targetRpmAcBump, "Idle: Target A/C bump", int, "%d" entry = iacByRpmTaper, "idle: iacByRpmTaper portion", float, "%.3f" entry = luaAdd, "idle: Lua Adder", float, "%.3f" entry = idlePosition, "ETB: idlePosition", float, "%.3f" @@ -6104,13 +6108,15 @@ dialog = idle_stateDialog, "idle_state" graphLine = idleState graphLine = currentIdlePosition graphLine = baseIdlePosition - graphLine = iacByTpsTaper + graphLine = idleClosedLoop liveGraph = idle_state_2_Graph, "Graph", South + graphLine = iacByTpsTaper graphLine = throttlePedalUpState + graphLine = idleTarget graphLine = targetRpmByClt + liveGraph = idle_state_3_Graph, "Graph", South graphLine = targetRpmAcBump graphLine = iacByRpmTaper - liveGraph = idle_state_3_Graph, "Graph", South graphLine = luaAdd indicatorPanel = electronic_throttleIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_hellenNA6.ini b/firmware/tunerstudio/generated/rusefi_hellenNA6.ini index 3b69d1c00c..4f4f601375 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.09.28.hellenNA6.1709834335" + signature = "rusEFI master.2023.09.28.hellenNA6.2924935847" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.09.28.hellenNA6.1709834335" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.09.28.hellenNA6.2924935847" ; 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 Thu Sep 28 03:24:43 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Thu Sep 28 13:45:17 UTC 2023 pageSize = 23664 page = 1 @@ -2320,7 +2320,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23654, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1416 + ochBlockSize = 1424 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3039,69 +3039,71 @@ wallFuel = scalar, F32, 1276, "", 1, 0 idleState = bits, S32, 1280, [0:2], "not important" currentIdlePosition = scalar, F32, 1284 baseIdlePosition = scalar, F32, 1288 -iacByTpsTaper = scalar, F32, 1292 -throttlePedalUpState = scalar, S32, 1296, "", 1, 0 -mightResetPid = bits, U32, 1300, [0:0] -shouldResetPid = bits, U32, 1300, [1:1] -wasResetPid = bits, U32, 1300, [2:2] -mustResetPid = bits, U32, 1300, [3:3] -isCranking = bits, U32, 1300, [4:4] -isIacTableForCoasting = bits, U32, 1300, [5:5] -notIdling = bits, U32, 1300, [6:6] -needReset = bits, U32, 1300, [7:7] -isInDeadZone = bits, U32, 1300, [8:8] -isBlipping = bits, U32, 1300, [9:9] -useClosedLoop = bits, U32, 1300, [10:10] -badTps = bits, U32, 1300, [11:11] -looksLikeRunning = bits, U32, 1300, [12:12] -looksLikeCoasting = bits, U32, 1300, [13:13] -looksLikeCrankToIdle = bits, U32, 1300, [14:14] -isIdleCoasting = bits, U32, 1300, [15:15] -isIdleClosedLoop = bits, U32, 1300, [16:16] -targetRpmByClt = scalar, S32, 1304, "", 1, 0 -targetRpmAcBump = scalar, S32, 1308, "", 1, 0 -iacByRpmTaper = scalar, F32, 1312 -luaAdd = scalar, F32, 1316 -; total TS size = 1320 -idlePosition = scalar, F32, 1320, "per", 1,0 -trim = scalar, F32, 1324, "", 1, 0 -luaAdjustment = scalar, F32, 1328, "per", 1,0 -m_wastegatePosition = scalar, F32, 1332, "per", 1,0 -etbFeedForward = scalar, F32, 1336 -etbIntegralError = scalar, F32, 1340, "", 1, 0 -etbCurrentTarget = scalar, F32, 1344, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1348, "%", 1, 0 -etbRevLimitActive = bits, U32, 1352, [0:0] -jamDetected = bits, U32, 1352, [1:1] -etbDutyRateOfChange = scalar, F32, 1356, "per", 1,0 -etbDutyAverage = scalar, F32, 1360, "per", 1,0 -etbTpsErrorCounter = scalar, U16, 1364, "count", 1,0 -etbPpsErrorCounter = scalar, U16, 1366, "count", 1,0 -etbErrorCode = scalar, S08, 1368, "", 1, 0 -jamTimer = scalar, U16, 1370, "sec", 0.01, 0 -; total TS size = 1372 -faultCode = scalar, U08, 1372, "", 1, 0 -heaterDuty = scalar, U08, 1373, "%", 1, 0 -pumpDuty = scalar, U08, 1374, "%", 1, 0 -tempC = scalar, U16, 1376, "C", 1, 0 -nernstVoltage = scalar, U16, 1378, "V", 0.001, 0 -esr = scalar, U16, 1380, "ohm", 1, 0 -; total TS size = 1384 -dcOutput0 = scalar, F32, 1384, "per", 1,0 -isEnabled0_int = scalar, U08, 1388, "per", 1,0 -isEnabled0 = bits, U32, 1392, [0:0] -; total TS size = 1396 -value0 = scalar, U16, 1396, "value", 1,0 -value1 = scalar, U16, 1398, "value", 1,0 -errorRate = scalar, F32, 1400, "ratio", 1,0 +idleClosedLoop = scalar, F32, 1292 +iacByTpsTaper = scalar, F32, 1296 +throttlePedalUpState = scalar, S32, 1300, "", 1, 0 +mightResetPid = bits, U32, 1304, [0:0] +shouldResetPid = bits, U32, 1304, [1:1] +wasResetPid = bits, U32, 1304, [2:2] +mustResetPid = bits, U32, 1304, [3:3] +isCranking = bits, U32, 1304, [4:4] +isIacTableForCoasting = bits, U32, 1304, [5:5] +notIdling = bits, U32, 1304, [6:6] +needReset = bits, U32, 1304, [7:7] +isInDeadZone = bits, U32, 1304, [8:8] +isBlipping = bits, U32, 1304, [9:9] +useClosedLoop = bits, U32, 1304, [10:10] +badTps = bits, U32, 1304, [11:11] +looksLikeRunning = bits, U32, 1304, [12:12] +looksLikeCoasting = bits, U32, 1304, [13:13] +looksLikeCrankToIdle = bits, U32, 1304, [14:14] +isIdleCoasting = bits, U32, 1304, [15:15] +isIdleClosedLoop = bits, U32, 1304, [16:16] +idleTarget = scalar, S32, 1308, "", 1, 0 +targetRpmByClt = scalar, S32, 1312, "", 1, 0 +targetRpmAcBump = scalar, S32, 1316, "", 1, 0 +iacByRpmTaper = scalar, F32, 1320 +luaAdd = scalar, F32, 1324 +; total TS size = 1328 +idlePosition = scalar, F32, 1328, "per", 1,0 +trim = scalar, F32, 1332, "", 1, 0 +luaAdjustment = scalar, F32, 1336, "per", 1,0 +m_wastegatePosition = scalar, F32, 1340, "per", 1,0 +etbFeedForward = scalar, F32, 1344 +etbIntegralError = scalar, F32, 1348, "", 1, 0 +etbCurrentTarget = scalar, F32, 1352, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1356, "%", 1, 0 +etbRevLimitActive = bits, U32, 1360, [0:0] +jamDetected = bits, U32, 1360, [1:1] +etbDutyRateOfChange = scalar, F32, 1364, "per", 1,0 +etbDutyAverage = scalar, F32, 1368, "per", 1,0 +etbTpsErrorCounter = scalar, U16, 1372, "count", 1,0 +etbPpsErrorCounter = scalar, U16, 1374, "count", 1,0 +etbErrorCode = scalar, S08, 1376, "", 1, 0 +jamTimer = scalar, U16, 1378, "sec", 0.01, 0 +; total TS size = 1380 +faultCode = scalar, U08, 1380, "", 1, 0 +heaterDuty = scalar, U08, 1381, "%", 1, 0 +pumpDuty = scalar, U08, 1382, "%", 1, 0 +tempC = scalar, U16, 1384, "C", 1, 0 +nernstVoltage = scalar, U16, 1386, "V", 0.001, 0 +esr = scalar, U16, 1388, "ohm", 1, 0 +; total TS size = 1392 +dcOutput0 = scalar, F32, 1392, "per", 1,0 +isEnabled0_int = scalar, U08, 1396, "per", 1,0 +isEnabled0 = bits, U32, 1400, [0:0] ; total TS size = 1404 -vvtTarget = scalar, U16, 1404, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1406, "%", 0.5, 0 -; total TS size = 1408 -lambdaCurrentlyGood = bits, U32, 1408, [0:0] -lambdaMonitorCut = bits, U32, 1408, [1:1] -lambdaTimeSinceGood = scalar, U16, 1412, "sec", 0.01, 0 +value0 = scalar, U16, 1404, "value", 1,0 +value1 = scalar, U16, 1406, "value", 1,0 +errorRate = scalar, F32, 1408, "ratio", 1,0 +; total TS size = 1412 +vvtTarget = scalar, U16, 1412, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1414, "%", 0.5, 0 ; total TS size = 1416 +lambdaCurrentlyGood = bits, U32, 1416, [0:0] +lambdaMonitorCut = bits, U32, 1416, [1:1] +lambdaTimeSinceGood = scalar, U16, 1420, "sec", 0.01, 0 +; total TS size = 1424 time = { timeNow } @@ -5173,8 +5175,9 @@ entry = m_hasSynchronizedPhase, "sync: Known Engine Phase", int, "%d" entry = wallFuelCorrection, "fuel wallwetting injection time", float, "%.3f" entry = wallFuel, "Fuel on the wall", float, "%.3f" entry = idleState, "idleState", int, "%d" -entry = currentIdlePosition, "idle: current position", float, "%.3f" +entry = currentIdlePosition, "Idle: Position", float, "%.3f" entry = baseIdlePosition, "idle: base value", float, "%.3f" +entry = idleClosedLoop, "Idle: Closed loop", float, "%.3f" entry = iacByTpsTaper, "idle: iacByTpsTaper portion", float, "%.3f" entry = throttlePedalUpState, "idle: throttlePedalUpState", int, "%d" entry = mightResetPid, "idle: mightResetPid", int, "%d" @@ -5194,8 +5197,9 @@ entry = looksLikeCoasting, "looksLikeCoasting", int, "%d" entry = looksLikeCrankToIdle, "looksLikeCrankToIdle", int, "%d" entry = isIdleCoasting, "Idle: coasting", int, "%d" entry = isIdleClosedLoop, "Idle: Closed loop active", int, "%d" -entry = targetRpmByClt, "idle: target by CLT", int, "%d" -entry = targetRpmAcBump, "idle: A/C bump", int, "%d" +entry = idleTarget, "Idle: Target RPM", int, "%d" +entry = targetRpmByClt, "Idle: Target RPM base", int, "%d" +entry = targetRpmAcBump, "Idle: Target A/C bump", int, "%d" entry = iacByRpmTaper, "idle: iacByRpmTaper portion", float, "%.3f" entry = luaAdd, "idle: Lua Adder", float, "%.3f" entry = idlePosition, "ETB: idlePosition", float, "%.3f" @@ -6104,13 +6108,15 @@ dialog = idle_stateDialog, "idle_state" graphLine = idleState graphLine = currentIdlePosition graphLine = baseIdlePosition - graphLine = iacByTpsTaper + graphLine = idleClosedLoop liveGraph = idle_state_2_Graph, "Graph", South + graphLine = iacByTpsTaper graphLine = throttlePedalUpState + graphLine = idleTarget graphLine = targetRpmByClt + liveGraph = idle_state_3_Graph, "Graph", South graphLine = targetRpmAcBump graphLine = iacByRpmTaper - liveGraph = idle_state_3_Graph, "Graph", South graphLine = luaAdd indicatorPanel = electronic_throttleIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini b/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini index 2b78b381e8..9194f42aa9 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.09.28.hellenNA8_96.55251088" + signature = "rusEFI master.2023.09.28.hellenNA8_96.3371690600" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.09.28.hellenNA8_96.55251088" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.09.28.hellenNA8_96.3371690600" ; 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 Thu Sep 28 03:24:46 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Thu Sep 28 13:45:20 UTC 2023 pageSize = 23664 page = 1 @@ -2320,7 +2320,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23654, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1416 + ochBlockSize = 1424 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3039,69 +3039,71 @@ wallFuel = scalar, F32, 1276, "", 1, 0 idleState = bits, S32, 1280, [0:2], "not important" currentIdlePosition = scalar, F32, 1284 baseIdlePosition = scalar, F32, 1288 -iacByTpsTaper = scalar, F32, 1292 -throttlePedalUpState = scalar, S32, 1296, "", 1, 0 -mightResetPid = bits, U32, 1300, [0:0] -shouldResetPid = bits, U32, 1300, [1:1] -wasResetPid = bits, U32, 1300, [2:2] -mustResetPid = bits, U32, 1300, [3:3] -isCranking = bits, U32, 1300, [4:4] -isIacTableForCoasting = bits, U32, 1300, [5:5] -notIdling = bits, U32, 1300, [6:6] -needReset = bits, U32, 1300, [7:7] -isInDeadZone = bits, U32, 1300, [8:8] -isBlipping = bits, U32, 1300, [9:9] -useClosedLoop = bits, U32, 1300, [10:10] -badTps = bits, U32, 1300, [11:11] -looksLikeRunning = bits, U32, 1300, [12:12] -looksLikeCoasting = bits, U32, 1300, [13:13] -looksLikeCrankToIdle = bits, U32, 1300, [14:14] -isIdleCoasting = bits, U32, 1300, [15:15] -isIdleClosedLoop = bits, U32, 1300, [16:16] -targetRpmByClt = scalar, S32, 1304, "", 1, 0 -targetRpmAcBump = scalar, S32, 1308, "", 1, 0 -iacByRpmTaper = scalar, F32, 1312 -luaAdd = scalar, F32, 1316 -; total TS size = 1320 -idlePosition = scalar, F32, 1320, "per", 1,0 -trim = scalar, F32, 1324, "", 1, 0 -luaAdjustment = scalar, F32, 1328, "per", 1,0 -m_wastegatePosition = scalar, F32, 1332, "per", 1,0 -etbFeedForward = scalar, F32, 1336 -etbIntegralError = scalar, F32, 1340, "", 1, 0 -etbCurrentTarget = scalar, F32, 1344, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1348, "%", 1, 0 -etbRevLimitActive = bits, U32, 1352, [0:0] -jamDetected = bits, U32, 1352, [1:1] -etbDutyRateOfChange = scalar, F32, 1356, "per", 1,0 -etbDutyAverage = scalar, F32, 1360, "per", 1,0 -etbTpsErrorCounter = scalar, U16, 1364, "count", 1,0 -etbPpsErrorCounter = scalar, U16, 1366, "count", 1,0 -etbErrorCode = scalar, S08, 1368, "", 1, 0 -jamTimer = scalar, U16, 1370, "sec", 0.01, 0 -; total TS size = 1372 -faultCode = scalar, U08, 1372, "", 1, 0 -heaterDuty = scalar, U08, 1373, "%", 1, 0 -pumpDuty = scalar, U08, 1374, "%", 1, 0 -tempC = scalar, U16, 1376, "C", 1, 0 -nernstVoltage = scalar, U16, 1378, "V", 0.001, 0 -esr = scalar, U16, 1380, "ohm", 1, 0 -; total TS size = 1384 -dcOutput0 = scalar, F32, 1384, "per", 1,0 -isEnabled0_int = scalar, U08, 1388, "per", 1,0 -isEnabled0 = bits, U32, 1392, [0:0] -; total TS size = 1396 -value0 = scalar, U16, 1396, "value", 1,0 -value1 = scalar, U16, 1398, "value", 1,0 -errorRate = scalar, F32, 1400, "ratio", 1,0 +idleClosedLoop = scalar, F32, 1292 +iacByTpsTaper = scalar, F32, 1296 +throttlePedalUpState = scalar, S32, 1300, "", 1, 0 +mightResetPid = bits, U32, 1304, [0:0] +shouldResetPid = bits, U32, 1304, [1:1] +wasResetPid = bits, U32, 1304, [2:2] +mustResetPid = bits, U32, 1304, [3:3] +isCranking = bits, U32, 1304, [4:4] +isIacTableForCoasting = bits, U32, 1304, [5:5] +notIdling = bits, U32, 1304, [6:6] +needReset = bits, U32, 1304, [7:7] +isInDeadZone = bits, U32, 1304, [8:8] +isBlipping = bits, U32, 1304, [9:9] +useClosedLoop = bits, U32, 1304, [10:10] +badTps = bits, U32, 1304, [11:11] +looksLikeRunning = bits, U32, 1304, [12:12] +looksLikeCoasting = bits, U32, 1304, [13:13] +looksLikeCrankToIdle = bits, U32, 1304, [14:14] +isIdleCoasting = bits, U32, 1304, [15:15] +isIdleClosedLoop = bits, U32, 1304, [16:16] +idleTarget = scalar, S32, 1308, "", 1, 0 +targetRpmByClt = scalar, S32, 1312, "", 1, 0 +targetRpmAcBump = scalar, S32, 1316, "", 1, 0 +iacByRpmTaper = scalar, F32, 1320 +luaAdd = scalar, F32, 1324 +; total TS size = 1328 +idlePosition = scalar, F32, 1328, "per", 1,0 +trim = scalar, F32, 1332, "", 1, 0 +luaAdjustment = scalar, F32, 1336, "per", 1,0 +m_wastegatePosition = scalar, F32, 1340, "per", 1,0 +etbFeedForward = scalar, F32, 1344 +etbIntegralError = scalar, F32, 1348, "", 1, 0 +etbCurrentTarget = scalar, F32, 1352, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1356, "%", 1, 0 +etbRevLimitActive = bits, U32, 1360, [0:0] +jamDetected = bits, U32, 1360, [1:1] +etbDutyRateOfChange = scalar, F32, 1364, "per", 1,0 +etbDutyAverage = scalar, F32, 1368, "per", 1,0 +etbTpsErrorCounter = scalar, U16, 1372, "count", 1,0 +etbPpsErrorCounter = scalar, U16, 1374, "count", 1,0 +etbErrorCode = scalar, S08, 1376, "", 1, 0 +jamTimer = scalar, U16, 1378, "sec", 0.01, 0 +; total TS size = 1380 +faultCode = scalar, U08, 1380, "", 1, 0 +heaterDuty = scalar, U08, 1381, "%", 1, 0 +pumpDuty = scalar, U08, 1382, "%", 1, 0 +tempC = scalar, U16, 1384, "C", 1, 0 +nernstVoltage = scalar, U16, 1386, "V", 0.001, 0 +esr = scalar, U16, 1388, "ohm", 1, 0 +; total TS size = 1392 +dcOutput0 = scalar, F32, 1392, "per", 1,0 +isEnabled0_int = scalar, U08, 1396, "per", 1,0 +isEnabled0 = bits, U32, 1400, [0:0] ; total TS size = 1404 -vvtTarget = scalar, U16, 1404, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1406, "%", 0.5, 0 -; total TS size = 1408 -lambdaCurrentlyGood = bits, U32, 1408, [0:0] -lambdaMonitorCut = bits, U32, 1408, [1:1] -lambdaTimeSinceGood = scalar, U16, 1412, "sec", 0.01, 0 +value0 = scalar, U16, 1404, "value", 1,0 +value1 = scalar, U16, 1406, "value", 1,0 +errorRate = scalar, F32, 1408, "ratio", 1,0 +; total TS size = 1412 +vvtTarget = scalar, U16, 1412, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1414, "%", 0.5, 0 ; total TS size = 1416 +lambdaCurrentlyGood = bits, U32, 1416, [0:0] +lambdaMonitorCut = bits, U32, 1416, [1:1] +lambdaTimeSinceGood = scalar, U16, 1420, "sec", 0.01, 0 +; total TS size = 1424 time = { timeNow } @@ -5173,8 +5175,9 @@ entry = m_hasSynchronizedPhase, "sync: Known Engine Phase", int, "%d" entry = wallFuelCorrection, "fuel wallwetting injection time", float, "%.3f" entry = wallFuel, "Fuel on the wall", float, "%.3f" entry = idleState, "idleState", int, "%d" -entry = currentIdlePosition, "idle: current position", float, "%.3f" +entry = currentIdlePosition, "Idle: Position", float, "%.3f" entry = baseIdlePosition, "idle: base value", float, "%.3f" +entry = idleClosedLoop, "Idle: Closed loop", float, "%.3f" entry = iacByTpsTaper, "idle: iacByTpsTaper portion", float, "%.3f" entry = throttlePedalUpState, "idle: throttlePedalUpState", int, "%d" entry = mightResetPid, "idle: mightResetPid", int, "%d" @@ -5194,8 +5197,9 @@ entry = looksLikeCoasting, "looksLikeCoasting", int, "%d" entry = looksLikeCrankToIdle, "looksLikeCrankToIdle", int, "%d" entry = isIdleCoasting, "Idle: coasting", int, "%d" entry = isIdleClosedLoop, "Idle: Closed loop active", int, "%d" -entry = targetRpmByClt, "idle: target by CLT", int, "%d" -entry = targetRpmAcBump, "idle: A/C bump", int, "%d" +entry = idleTarget, "Idle: Target RPM", int, "%d" +entry = targetRpmByClt, "Idle: Target RPM base", int, "%d" +entry = targetRpmAcBump, "Idle: Target A/C bump", int, "%d" entry = iacByRpmTaper, "idle: iacByRpmTaper portion", float, "%.3f" entry = luaAdd, "idle: Lua Adder", float, "%.3f" entry = idlePosition, "ETB: idlePosition", float, "%.3f" @@ -6104,13 +6108,15 @@ dialog = idle_stateDialog, "idle_state" graphLine = idleState graphLine = currentIdlePosition graphLine = baseIdlePosition - graphLine = iacByTpsTaper + graphLine = idleClosedLoop liveGraph = idle_state_2_Graph, "Graph", South + graphLine = iacByTpsTaper graphLine = throttlePedalUpState + graphLine = idleTarget graphLine = targetRpmByClt + liveGraph = idle_state_3_Graph, "Graph", South graphLine = targetRpmAcBump graphLine = iacByRpmTaper - liveGraph = idle_state_3_Graph, "Graph", South graphLine = luaAdd indicatorPanel = electronic_throttleIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_kin.ini b/firmware/tunerstudio/generated/rusefi_kin.ini index 06c9ac5a96..5ee93060b9 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.09.28.kin.3426114517" + signature = "rusEFI master.2023.09.28.kin.126525741" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.09.28.kin.3426114517" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.09.28.kin.126525741" ; 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 Thu Sep 28 03:23:44 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Thu Sep 28 13:44:16 UTC 2023 pageSize = 22288 page = 1 @@ -2320,7 +2320,7 @@ lambdaMaxDeviationRpmBins = array, U16, 22278, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1416 + ochBlockSize = 1424 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3039,69 +3039,71 @@ wallFuel = scalar, F32, 1276, "", 1, 0 idleState = bits, S32, 1280, [0:2], "not important" currentIdlePosition = scalar, F32, 1284 baseIdlePosition = scalar, F32, 1288 -iacByTpsTaper = scalar, F32, 1292 -throttlePedalUpState = scalar, S32, 1296, "", 1, 0 -mightResetPid = bits, U32, 1300, [0:0] -shouldResetPid = bits, U32, 1300, [1:1] -wasResetPid = bits, U32, 1300, [2:2] -mustResetPid = bits, U32, 1300, [3:3] -isCranking = bits, U32, 1300, [4:4] -isIacTableForCoasting = bits, U32, 1300, [5:5] -notIdling = bits, U32, 1300, [6:6] -needReset = bits, U32, 1300, [7:7] -isInDeadZone = bits, U32, 1300, [8:8] -isBlipping = bits, U32, 1300, [9:9] -useClosedLoop = bits, U32, 1300, [10:10] -badTps = bits, U32, 1300, [11:11] -looksLikeRunning = bits, U32, 1300, [12:12] -looksLikeCoasting = bits, U32, 1300, [13:13] -looksLikeCrankToIdle = bits, U32, 1300, [14:14] -isIdleCoasting = bits, U32, 1300, [15:15] -isIdleClosedLoop = bits, U32, 1300, [16:16] -targetRpmByClt = scalar, S32, 1304, "", 1, 0 -targetRpmAcBump = scalar, S32, 1308, "", 1, 0 -iacByRpmTaper = scalar, F32, 1312 -luaAdd = scalar, F32, 1316 -; total TS size = 1320 -idlePosition = scalar, F32, 1320, "per", 1,0 -trim = scalar, F32, 1324, "", 1, 0 -luaAdjustment = scalar, F32, 1328, "per", 1,0 -m_wastegatePosition = scalar, F32, 1332, "per", 1,0 -etbFeedForward = scalar, F32, 1336 -etbIntegralError = scalar, F32, 1340, "", 1, 0 -etbCurrentTarget = scalar, F32, 1344, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1348, "%", 1, 0 -etbRevLimitActive = bits, U32, 1352, [0:0] -jamDetected = bits, U32, 1352, [1:1] -etbDutyRateOfChange = scalar, F32, 1356, "per", 1,0 -etbDutyAverage = scalar, F32, 1360, "per", 1,0 -etbTpsErrorCounter = scalar, U16, 1364, "count", 1,0 -etbPpsErrorCounter = scalar, U16, 1366, "count", 1,0 -etbErrorCode = scalar, S08, 1368, "", 1, 0 -jamTimer = scalar, U16, 1370, "sec", 0.01, 0 -; total TS size = 1372 -faultCode = scalar, U08, 1372, "", 1, 0 -heaterDuty = scalar, U08, 1373, "%", 1, 0 -pumpDuty = scalar, U08, 1374, "%", 1, 0 -tempC = scalar, U16, 1376, "C", 1, 0 -nernstVoltage = scalar, U16, 1378, "V", 0.001, 0 -esr = scalar, U16, 1380, "ohm", 1, 0 -; total TS size = 1384 -dcOutput0 = scalar, F32, 1384, "per", 1,0 -isEnabled0_int = scalar, U08, 1388, "per", 1,0 -isEnabled0 = bits, U32, 1392, [0:0] -; total TS size = 1396 -value0 = scalar, U16, 1396, "value", 1,0 -value1 = scalar, U16, 1398, "value", 1,0 -errorRate = scalar, F32, 1400, "ratio", 1,0 +idleClosedLoop = scalar, F32, 1292 +iacByTpsTaper = scalar, F32, 1296 +throttlePedalUpState = scalar, S32, 1300, "", 1, 0 +mightResetPid = bits, U32, 1304, [0:0] +shouldResetPid = bits, U32, 1304, [1:1] +wasResetPid = bits, U32, 1304, [2:2] +mustResetPid = bits, U32, 1304, [3:3] +isCranking = bits, U32, 1304, [4:4] +isIacTableForCoasting = bits, U32, 1304, [5:5] +notIdling = bits, U32, 1304, [6:6] +needReset = bits, U32, 1304, [7:7] +isInDeadZone = bits, U32, 1304, [8:8] +isBlipping = bits, U32, 1304, [9:9] +useClosedLoop = bits, U32, 1304, [10:10] +badTps = bits, U32, 1304, [11:11] +looksLikeRunning = bits, U32, 1304, [12:12] +looksLikeCoasting = bits, U32, 1304, [13:13] +looksLikeCrankToIdle = bits, U32, 1304, [14:14] +isIdleCoasting = bits, U32, 1304, [15:15] +isIdleClosedLoop = bits, U32, 1304, [16:16] +idleTarget = scalar, S32, 1308, "", 1, 0 +targetRpmByClt = scalar, S32, 1312, "", 1, 0 +targetRpmAcBump = scalar, S32, 1316, "", 1, 0 +iacByRpmTaper = scalar, F32, 1320 +luaAdd = scalar, F32, 1324 +; total TS size = 1328 +idlePosition = scalar, F32, 1328, "per", 1,0 +trim = scalar, F32, 1332, "", 1, 0 +luaAdjustment = scalar, F32, 1336, "per", 1,0 +m_wastegatePosition = scalar, F32, 1340, "per", 1,0 +etbFeedForward = scalar, F32, 1344 +etbIntegralError = scalar, F32, 1348, "", 1, 0 +etbCurrentTarget = scalar, F32, 1352, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1356, "%", 1, 0 +etbRevLimitActive = bits, U32, 1360, [0:0] +jamDetected = bits, U32, 1360, [1:1] +etbDutyRateOfChange = scalar, F32, 1364, "per", 1,0 +etbDutyAverage = scalar, F32, 1368, "per", 1,0 +etbTpsErrorCounter = scalar, U16, 1372, "count", 1,0 +etbPpsErrorCounter = scalar, U16, 1374, "count", 1,0 +etbErrorCode = scalar, S08, 1376, "", 1, 0 +jamTimer = scalar, U16, 1378, "sec", 0.01, 0 +; total TS size = 1380 +faultCode = scalar, U08, 1380, "", 1, 0 +heaterDuty = scalar, U08, 1381, "%", 1, 0 +pumpDuty = scalar, U08, 1382, "%", 1, 0 +tempC = scalar, U16, 1384, "C", 1, 0 +nernstVoltage = scalar, U16, 1386, "V", 0.001, 0 +esr = scalar, U16, 1388, "ohm", 1, 0 +; total TS size = 1392 +dcOutput0 = scalar, F32, 1392, "per", 1,0 +isEnabled0_int = scalar, U08, 1396, "per", 1,0 +isEnabled0 = bits, U32, 1400, [0:0] ; total TS size = 1404 -vvtTarget = scalar, U16, 1404, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1406, "%", 0.5, 0 -; total TS size = 1408 -lambdaCurrentlyGood = bits, U32, 1408, [0:0] -lambdaMonitorCut = bits, U32, 1408, [1:1] -lambdaTimeSinceGood = scalar, U16, 1412, "sec", 0.01, 0 +value0 = scalar, U16, 1404, "value", 1,0 +value1 = scalar, U16, 1406, "value", 1,0 +errorRate = scalar, F32, 1408, "ratio", 1,0 +; total TS size = 1412 +vvtTarget = scalar, U16, 1412, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1414, "%", 0.5, 0 ; total TS size = 1416 +lambdaCurrentlyGood = bits, U32, 1416, [0:0] +lambdaMonitorCut = bits, U32, 1416, [1:1] +lambdaTimeSinceGood = scalar, U16, 1420, "sec", 0.01, 0 +; total TS size = 1424 time = { timeNow } @@ -5173,8 +5175,9 @@ entry = m_hasSynchronizedPhase, "sync: Known Engine Phase", int, "%d" entry = wallFuelCorrection, "fuel wallwetting injection time", float, "%.3f" entry = wallFuel, "Fuel on the wall", float, "%.3f" entry = idleState, "idleState", int, "%d" -entry = currentIdlePosition, "idle: current position", float, "%.3f" +entry = currentIdlePosition, "Idle: Position", float, "%.3f" entry = baseIdlePosition, "idle: base value", float, "%.3f" +entry = idleClosedLoop, "Idle: Closed loop", float, "%.3f" entry = iacByTpsTaper, "idle: iacByTpsTaper portion", float, "%.3f" entry = throttlePedalUpState, "idle: throttlePedalUpState", int, "%d" entry = mightResetPid, "idle: mightResetPid", int, "%d" @@ -5194,8 +5197,9 @@ entry = looksLikeCoasting, "looksLikeCoasting", int, "%d" entry = looksLikeCrankToIdle, "looksLikeCrankToIdle", int, "%d" entry = isIdleCoasting, "Idle: coasting", int, "%d" entry = isIdleClosedLoop, "Idle: Closed loop active", int, "%d" -entry = targetRpmByClt, "idle: target by CLT", int, "%d" -entry = targetRpmAcBump, "idle: A/C bump", int, "%d" +entry = idleTarget, "Idle: Target RPM", int, "%d" +entry = targetRpmByClt, "Idle: Target RPM base", int, "%d" +entry = targetRpmAcBump, "Idle: Target A/C bump", int, "%d" entry = iacByRpmTaper, "idle: iacByRpmTaper portion", float, "%.3f" entry = luaAdd, "idle: Lua Adder", float, "%.3f" entry = idlePosition, "ETB: idlePosition", float, "%.3f" @@ -6103,13 +6107,15 @@ dialog = idle_stateDialog, "idle_state" graphLine = idleState graphLine = currentIdlePosition graphLine = baseIdlePosition - graphLine = iacByTpsTaper + graphLine = idleClosedLoop liveGraph = idle_state_2_Graph, "Graph", South + graphLine = iacByTpsTaper graphLine = throttlePedalUpState + graphLine = idleTarget graphLine = targetRpmByClt + liveGraph = idle_state_3_Graph, "Graph", South graphLine = targetRpmAcBump graphLine = iacByRpmTaper - liveGraph = idle_state_3_Graph, "Graph", South graphLine = luaAdd indicatorPanel = electronic_throttleIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_m74_9.ini b/firmware/tunerstudio/generated/rusefi_m74_9.ini index 234a1a3f1a..907bf45fbe 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.09.28.m74_9.2497478773" + signature = "rusEFI master.2023.09.28.m74_9.1600158349" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.09.28.m74_9.2497478773" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.09.28.m74_9.1600158349" ; 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 Thu Sep 28 03:25:03 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Thu Sep 28 13:45:38 UTC 2023 pageSize = 23664 page = 1 @@ -2320,7 +2320,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23654, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1416 + ochBlockSize = 1424 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3039,69 +3039,71 @@ wallFuel = scalar, F32, 1276, "", 1, 0 idleState = bits, S32, 1280, [0:2], "not important" currentIdlePosition = scalar, F32, 1284 baseIdlePosition = scalar, F32, 1288 -iacByTpsTaper = scalar, F32, 1292 -throttlePedalUpState = scalar, S32, 1296, "", 1, 0 -mightResetPid = bits, U32, 1300, [0:0] -shouldResetPid = bits, U32, 1300, [1:1] -wasResetPid = bits, U32, 1300, [2:2] -mustResetPid = bits, U32, 1300, [3:3] -isCranking = bits, U32, 1300, [4:4] -isIacTableForCoasting = bits, U32, 1300, [5:5] -notIdling = bits, U32, 1300, [6:6] -needReset = bits, U32, 1300, [7:7] -isInDeadZone = bits, U32, 1300, [8:8] -isBlipping = bits, U32, 1300, [9:9] -useClosedLoop = bits, U32, 1300, [10:10] -badTps = bits, U32, 1300, [11:11] -looksLikeRunning = bits, U32, 1300, [12:12] -looksLikeCoasting = bits, U32, 1300, [13:13] -looksLikeCrankToIdle = bits, U32, 1300, [14:14] -isIdleCoasting = bits, U32, 1300, [15:15] -isIdleClosedLoop = bits, U32, 1300, [16:16] -targetRpmByClt = scalar, S32, 1304, "", 1, 0 -targetRpmAcBump = scalar, S32, 1308, "", 1, 0 -iacByRpmTaper = scalar, F32, 1312 -luaAdd = scalar, F32, 1316 -; total TS size = 1320 -idlePosition = scalar, F32, 1320, "per", 1,0 -trim = scalar, F32, 1324, "", 1, 0 -luaAdjustment = scalar, F32, 1328, "per", 1,0 -m_wastegatePosition = scalar, F32, 1332, "per", 1,0 -etbFeedForward = scalar, F32, 1336 -etbIntegralError = scalar, F32, 1340, "", 1, 0 -etbCurrentTarget = scalar, F32, 1344, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1348, "%", 1, 0 -etbRevLimitActive = bits, U32, 1352, [0:0] -jamDetected = bits, U32, 1352, [1:1] -etbDutyRateOfChange = scalar, F32, 1356, "per", 1,0 -etbDutyAverage = scalar, F32, 1360, "per", 1,0 -etbTpsErrorCounter = scalar, U16, 1364, "count", 1,0 -etbPpsErrorCounter = scalar, U16, 1366, "count", 1,0 -etbErrorCode = scalar, S08, 1368, "", 1, 0 -jamTimer = scalar, U16, 1370, "sec", 0.01, 0 -; total TS size = 1372 -faultCode = scalar, U08, 1372, "", 1, 0 -heaterDuty = scalar, U08, 1373, "%", 1, 0 -pumpDuty = scalar, U08, 1374, "%", 1, 0 -tempC = scalar, U16, 1376, "C", 1, 0 -nernstVoltage = scalar, U16, 1378, "V", 0.001, 0 -esr = scalar, U16, 1380, "ohm", 1, 0 -; total TS size = 1384 -dcOutput0 = scalar, F32, 1384, "per", 1,0 -isEnabled0_int = scalar, U08, 1388, "per", 1,0 -isEnabled0 = bits, U32, 1392, [0:0] -; total TS size = 1396 -value0 = scalar, U16, 1396, "value", 1,0 -value1 = scalar, U16, 1398, "value", 1,0 -errorRate = scalar, F32, 1400, "ratio", 1,0 +idleClosedLoop = scalar, F32, 1292 +iacByTpsTaper = scalar, F32, 1296 +throttlePedalUpState = scalar, S32, 1300, "", 1, 0 +mightResetPid = bits, U32, 1304, [0:0] +shouldResetPid = bits, U32, 1304, [1:1] +wasResetPid = bits, U32, 1304, [2:2] +mustResetPid = bits, U32, 1304, [3:3] +isCranking = bits, U32, 1304, [4:4] +isIacTableForCoasting = bits, U32, 1304, [5:5] +notIdling = bits, U32, 1304, [6:6] +needReset = bits, U32, 1304, [7:7] +isInDeadZone = bits, U32, 1304, [8:8] +isBlipping = bits, U32, 1304, [9:9] +useClosedLoop = bits, U32, 1304, [10:10] +badTps = bits, U32, 1304, [11:11] +looksLikeRunning = bits, U32, 1304, [12:12] +looksLikeCoasting = bits, U32, 1304, [13:13] +looksLikeCrankToIdle = bits, U32, 1304, [14:14] +isIdleCoasting = bits, U32, 1304, [15:15] +isIdleClosedLoop = bits, U32, 1304, [16:16] +idleTarget = scalar, S32, 1308, "", 1, 0 +targetRpmByClt = scalar, S32, 1312, "", 1, 0 +targetRpmAcBump = scalar, S32, 1316, "", 1, 0 +iacByRpmTaper = scalar, F32, 1320 +luaAdd = scalar, F32, 1324 +; total TS size = 1328 +idlePosition = scalar, F32, 1328, "per", 1,0 +trim = scalar, F32, 1332, "", 1, 0 +luaAdjustment = scalar, F32, 1336, "per", 1,0 +m_wastegatePosition = scalar, F32, 1340, "per", 1,0 +etbFeedForward = scalar, F32, 1344 +etbIntegralError = scalar, F32, 1348, "", 1, 0 +etbCurrentTarget = scalar, F32, 1352, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1356, "%", 1, 0 +etbRevLimitActive = bits, U32, 1360, [0:0] +jamDetected = bits, U32, 1360, [1:1] +etbDutyRateOfChange = scalar, F32, 1364, "per", 1,0 +etbDutyAverage = scalar, F32, 1368, "per", 1,0 +etbTpsErrorCounter = scalar, U16, 1372, "count", 1,0 +etbPpsErrorCounter = scalar, U16, 1374, "count", 1,0 +etbErrorCode = scalar, S08, 1376, "", 1, 0 +jamTimer = scalar, U16, 1378, "sec", 0.01, 0 +; total TS size = 1380 +faultCode = scalar, U08, 1380, "", 1, 0 +heaterDuty = scalar, U08, 1381, "%", 1, 0 +pumpDuty = scalar, U08, 1382, "%", 1, 0 +tempC = scalar, U16, 1384, "C", 1, 0 +nernstVoltage = scalar, U16, 1386, "V", 0.001, 0 +esr = scalar, U16, 1388, "ohm", 1, 0 +; total TS size = 1392 +dcOutput0 = scalar, F32, 1392, "per", 1,0 +isEnabled0_int = scalar, U08, 1396, "per", 1,0 +isEnabled0 = bits, U32, 1400, [0:0] ; total TS size = 1404 -vvtTarget = scalar, U16, 1404, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1406, "%", 0.5, 0 -; total TS size = 1408 -lambdaCurrentlyGood = bits, U32, 1408, [0:0] -lambdaMonitorCut = bits, U32, 1408, [1:1] -lambdaTimeSinceGood = scalar, U16, 1412, "sec", 0.01, 0 +value0 = scalar, U16, 1404, "value", 1,0 +value1 = scalar, U16, 1406, "value", 1,0 +errorRate = scalar, F32, 1408, "ratio", 1,0 +; total TS size = 1412 +vvtTarget = scalar, U16, 1412, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1414, "%", 0.5, 0 ; total TS size = 1416 +lambdaCurrentlyGood = bits, U32, 1416, [0:0] +lambdaMonitorCut = bits, U32, 1416, [1:1] +lambdaTimeSinceGood = scalar, U16, 1420, "sec", 0.01, 0 +; total TS size = 1424 time = { timeNow } @@ -5173,8 +5175,9 @@ entry = m_hasSynchronizedPhase, "sync: Known Engine Phase", int, "%d" entry = wallFuelCorrection, "fuel wallwetting injection time", float, "%.3f" entry = wallFuel, "Fuel on the wall", float, "%.3f" entry = idleState, "idleState", int, "%d" -entry = currentIdlePosition, "idle: current position", float, "%.3f" +entry = currentIdlePosition, "Idle: Position", float, "%.3f" entry = baseIdlePosition, "idle: base value", float, "%.3f" +entry = idleClosedLoop, "Idle: Closed loop", float, "%.3f" entry = iacByTpsTaper, "idle: iacByTpsTaper portion", float, "%.3f" entry = throttlePedalUpState, "idle: throttlePedalUpState", int, "%d" entry = mightResetPid, "idle: mightResetPid", int, "%d" @@ -5194,8 +5197,9 @@ entry = looksLikeCoasting, "looksLikeCoasting", int, "%d" entry = looksLikeCrankToIdle, "looksLikeCrankToIdle", int, "%d" entry = isIdleCoasting, "Idle: coasting", int, "%d" entry = isIdleClosedLoop, "Idle: Closed loop active", int, "%d" -entry = targetRpmByClt, "idle: target by CLT", int, "%d" -entry = targetRpmAcBump, "idle: A/C bump", int, "%d" +entry = idleTarget, "Idle: Target RPM", int, "%d" +entry = targetRpmByClt, "Idle: Target RPM base", int, "%d" +entry = targetRpmAcBump, "Idle: Target A/C bump", int, "%d" entry = iacByRpmTaper, "idle: iacByRpmTaper portion", float, "%.3f" entry = luaAdd, "idle: Lua Adder", float, "%.3f" entry = idlePosition, "ETB: idlePosition", float, "%.3f" @@ -6104,13 +6108,15 @@ dialog = idle_stateDialog, "idle_state" graphLine = idleState graphLine = currentIdlePosition graphLine = baseIdlePosition - graphLine = iacByTpsTaper + graphLine = idleClosedLoop liveGraph = idle_state_2_Graph, "Graph", South + graphLine = iacByTpsTaper graphLine = throttlePedalUpState + graphLine = idleTarget graphLine = targetRpmByClt + liveGraph = idle_state_3_Graph, "Graph", South graphLine = targetRpmAcBump graphLine = iacByRpmTaper - liveGraph = idle_state_3_Graph, "Graph", South graphLine = luaAdd indicatorPanel = electronic_throttleIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_mre_f4.ini b/firmware/tunerstudio/generated/rusefi_mre_f4.ini index 24c2c966ec..806b5b5f31 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.09.28.mre_f4.2911532539" + signature = "rusEFI master.2023.09.28.mre_f4.1714851587" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.09.28.mre_f4.2911532539" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.09.28.mre_f4.1714851587" ; 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 Thu Sep 28 03:24:54 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Thu Sep 28 13:45:29 UTC 2023 pageSize = 23664 page = 1 @@ -2320,7 +2320,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23654, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1416 + ochBlockSize = 1424 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3039,69 +3039,71 @@ wallFuel = scalar, F32, 1276, "", 1, 0 idleState = bits, S32, 1280, [0:2], "not important" currentIdlePosition = scalar, F32, 1284 baseIdlePosition = scalar, F32, 1288 -iacByTpsTaper = scalar, F32, 1292 -throttlePedalUpState = scalar, S32, 1296, "", 1, 0 -mightResetPid = bits, U32, 1300, [0:0] -shouldResetPid = bits, U32, 1300, [1:1] -wasResetPid = bits, U32, 1300, [2:2] -mustResetPid = bits, U32, 1300, [3:3] -isCranking = bits, U32, 1300, [4:4] -isIacTableForCoasting = bits, U32, 1300, [5:5] -notIdling = bits, U32, 1300, [6:6] -needReset = bits, U32, 1300, [7:7] -isInDeadZone = bits, U32, 1300, [8:8] -isBlipping = bits, U32, 1300, [9:9] -useClosedLoop = bits, U32, 1300, [10:10] -badTps = bits, U32, 1300, [11:11] -looksLikeRunning = bits, U32, 1300, [12:12] -looksLikeCoasting = bits, U32, 1300, [13:13] -looksLikeCrankToIdle = bits, U32, 1300, [14:14] -isIdleCoasting = bits, U32, 1300, [15:15] -isIdleClosedLoop = bits, U32, 1300, [16:16] -targetRpmByClt = scalar, S32, 1304, "", 1, 0 -targetRpmAcBump = scalar, S32, 1308, "", 1, 0 -iacByRpmTaper = scalar, F32, 1312 -luaAdd = scalar, F32, 1316 -; total TS size = 1320 -idlePosition = scalar, F32, 1320, "per", 1,0 -trim = scalar, F32, 1324, "", 1, 0 -luaAdjustment = scalar, F32, 1328, "per", 1,0 -m_wastegatePosition = scalar, F32, 1332, "per", 1,0 -etbFeedForward = scalar, F32, 1336 -etbIntegralError = scalar, F32, 1340, "", 1, 0 -etbCurrentTarget = scalar, F32, 1344, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1348, "%", 1, 0 -etbRevLimitActive = bits, U32, 1352, [0:0] -jamDetected = bits, U32, 1352, [1:1] -etbDutyRateOfChange = scalar, F32, 1356, "per", 1,0 -etbDutyAverage = scalar, F32, 1360, "per", 1,0 -etbTpsErrorCounter = scalar, U16, 1364, "count", 1,0 -etbPpsErrorCounter = scalar, U16, 1366, "count", 1,0 -etbErrorCode = scalar, S08, 1368, "", 1, 0 -jamTimer = scalar, U16, 1370, "sec", 0.01, 0 -; total TS size = 1372 -faultCode = scalar, U08, 1372, "", 1, 0 -heaterDuty = scalar, U08, 1373, "%", 1, 0 -pumpDuty = scalar, U08, 1374, "%", 1, 0 -tempC = scalar, U16, 1376, "C", 1, 0 -nernstVoltage = scalar, U16, 1378, "V", 0.001, 0 -esr = scalar, U16, 1380, "ohm", 1, 0 -; total TS size = 1384 -dcOutput0 = scalar, F32, 1384, "per", 1,0 -isEnabled0_int = scalar, U08, 1388, "per", 1,0 -isEnabled0 = bits, U32, 1392, [0:0] -; total TS size = 1396 -value0 = scalar, U16, 1396, "value", 1,0 -value1 = scalar, U16, 1398, "value", 1,0 -errorRate = scalar, F32, 1400, "ratio", 1,0 +idleClosedLoop = scalar, F32, 1292 +iacByTpsTaper = scalar, F32, 1296 +throttlePedalUpState = scalar, S32, 1300, "", 1, 0 +mightResetPid = bits, U32, 1304, [0:0] +shouldResetPid = bits, U32, 1304, [1:1] +wasResetPid = bits, U32, 1304, [2:2] +mustResetPid = bits, U32, 1304, [3:3] +isCranking = bits, U32, 1304, [4:4] +isIacTableForCoasting = bits, U32, 1304, [5:5] +notIdling = bits, U32, 1304, [6:6] +needReset = bits, U32, 1304, [7:7] +isInDeadZone = bits, U32, 1304, [8:8] +isBlipping = bits, U32, 1304, [9:9] +useClosedLoop = bits, U32, 1304, [10:10] +badTps = bits, U32, 1304, [11:11] +looksLikeRunning = bits, U32, 1304, [12:12] +looksLikeCoasting = bits, U32, 1304, [13:13] +looksLikeCrankToIdle = bits, U32, 1304, [14:14] +isIdleCoasting = bits, U32, 1304, [15:15] +isIdleClosedLoop = bits, U32, 1304, [16:16] +idleTarget = scalar, S32, 1308, "", 1, 0 +targetRpmByClt = scalar, S32, 1312, "", 1, 0 +targetRpmAcBump = scalar, S32, 1316, "", 1, 0 +iacByRpmTaper = scalar, F32, 1320 +luaAdd = scalar, F32, 1324 +; total TS size = 1328 +idlePosition = scalar, F32, 1328, "per", 1,0 +trim = scalar, F32, 1332, "", 1, 0 +luaAdjustment = scalar, F32, 1336, "per", 1,0 +m_wastegatePosition = scalar, F32, 1340, "per", 1,0 +etbFeedForward = scalar, F32, 1344 +etbIntegralError = scalar, F32, 1348, "", 1, 0 +etbCurrentTarget = scalar, F32, 1352, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1356, "%", 1, 0 +etbRevLimitActive = bits, U32, 1360, [0:0] +jamDetected = bits, U32, 1360, [1:1] +etbDutyRateOfChange = scalar, F32, 1364, "per", 1,0 +etbDutyAverage = scalar, F32, 1368, "per", 1,0 +etbTpsErrorCounter = scalar, U16, 1372, "count", 1,0 +etbPpsErrorCounter = scalar, U16, 1374, "count", 1,0 +etbErrorCode = scalar, S08, 1376, "", 1, 0 +jamTimer = scalar, U16, 1378, "sec", 0.01, 0 +; total TS size = 1380 +faultCode = scalar, U08, 1380, "", 1, 0 +heaterDuty = scalar, U08, 1381, "%", 1, 0 +pumpDuty = scalar, U08, 1382, "%", 1, 0 +tempC = scalar, U16, 1384, "C", 1, 0 +nernstVoltage = scalar, U16, 1386, "V", 0.001, 0 +esr = scalar, U16, 1388, "ohm", 1, 0 +; total TS size = 1392 +dcOutput0 = scalar, F32, 1392, "per", 1,0 +isEnabled0_int = scalar, U08, 1396, "per", 1,0 +isEnabled0 = bits, U32, 1400, [0:0] ; total TS size = 1404 -vvtTarget = scalar, U16, 1404, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1406, "%", 0.5, 0 -; total TS size = 1408 -lambdaCurrentlyGood = bits, U32, 1408, [0:0] -lambdaMonitorCut = bits, U32, 1408, [1:1] -lambdaTimeSinceGood = scalar, U16, 1412, "sec", 0.01, 0 +value0 = scalar, U16, 1404, "value", 1,0 +value1 = scalar, U16, 1406, "value", 1,0 +errorRate = scalar, F32, 1408, "ratio", 1,0 +; total TS size = 1412 +vvtTarget = scalar, U16, 1412, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1414, "%", 0.5, 0 ; total TS size = 1416 +lambdaCurrentlyGood = bits, U32, 1416, [0:0] +lambdaMonitorCut = bits, U32, 1416, [1:1] +lambdaTimeSinceGood = scalar, U16, 1420, "sec", 0.01, 0 +; total TS size = 1424 time = { timeNow } @@ -5174,8 +5176,9 @@ entry = m_hasSynchronizedPhase, "sync: Known Engine Phase", int, "%d" entry = wallFuelCorrection, "fuel wallwetting injection time", float, "%.3f" entry = wallFuel, "Fuel on the wall", float, "%.3f" entry = idleState, "idleState", int, "%d" -entry = currentIdlePosition, "idle: current position", float, "%.3f" +entry = currentIdlePosition, "Idle: Position", float, "%.3f" entry = baseIdlePosition, "idle: base value", float, "%.3f" +entry = idleClosedLoop, "Idle: Closed loop", float, "%.3f" entry = iacByTpsTaper, "idle: iacByTpsTaper portion", float, "%.3f" entry = throttlePedalUpState, "idle: throttlePedalUpState", int, "%d" entry = mightResetPid, "idle: mightResetPid", int, "%d" @@ -5195,8 +5198,9 @@ entry = looksLikeCoasting, "looksLikeCoasting", int, "%d" entry = looksLikeCrankToIdle, "looksLikeCrankToIdle", int, "%d" entry = isIdleCoasting, "Idle: coasting", int, "%d" entry = isIdleClosedLoop, "Idle: Closed loop active", int, "%d" -entry = targetRpmByClt, "idle: target by CLT", int, "%d" -entry = targetRpmAcBump, "idle: A/C bump", int, "%d" +entry = idleTarget, "Idle: Target RPM", int, "%d" +entry = targetRpmByClt, "Idle: Target RPM base", int, "%d" +entry = targetRpmAcBump, "Idle: Target A/C bump", int, "%d" entry = iacByRpmTaper, "idle: iacByRpmTaper portion", float, "%.3f" entry = luaAdd, "idle: Lua Adder", float, "%.3f" entry = idlePosition, "ETB: idlePosition", float, "%.3f" @@ -6106,13 +6110,15 @@ dialog = idle_stateDialog, "idle_state" graphLine = idleState graphLine = currentIdlePosition graphLine = baseIdlePosition - graphLine = iacByTpsTaper + graphLine = idleClosedLoop liveGraph = idle_state_2_Graph, "Graph", South + graphLine = iacByTpsTaper graphLine = throttlePedalUpState + graphLine = idleTarget graphLine = targetRpmByClt + liveGraph = idle_state_3_Graph, "Graph", South graphLine = targetRpmAcBump graphLine = iacByRpmTaper - liveGraph = idle_state_3_Graph, "Graph", South graphLine = luaAdd indicatorPanel = electronic_throttleIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_mre_f7.ini b/firmware/tunerstudio/generated/rusefi_mre_f7.ini index e22623b8fb..69d903bafa 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.09.28.mre_f7.2911532539" + signature = "rusEFI master.2023.09.28.mre_f7.1714851587" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.09.28.mre_f7.2911532539" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.09.28.mre_f7.1714851587" ; 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 Thu Sep 28 03:24:51 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Thu Sep 28 13:45:26 UTC 2023 pageSize = 23664 page = 1 @@ -2320,7 +2320,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23654, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1416 + ochBlockSize = 1424 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3039,69 +3039,71 @@ wallFuel = scalar, F32, 1276, "", 1, 0 idleState = bits, S32, 1280, [0:2], "not important" currentIdlePosition = scalar, F32, 1284 baseIdlePosition = scalar, F32, 1288 -iacByTpsTaper = scalar, F32, 1292 -throttlePedalUpState = scalar, S32, 1296, "", 1, 0 -mightResetPid = bits, U32, 1300, [0:0] -shouldResetPid = bits, U32, 1300, [1:1] -wasResetPid = bits, U32, 1300, [2:2] -mustResetPid = bits, U32, 1300, [3:3] -isCranking = bits, U32, 1300, [4:4] -isIacTableForCoasting = bits, U32, 1300, [5:5] -notIdling = bits, U32, 1300, [6:6] -needReset = bits, U32, 1300, [7:7] -isInDeadZone = bits, U32, 1300, [8:8] -isBlipping = bits, U32, 1300, [9:9] -useClosedLoop = bits, U32, 1300, [10:10] -badTps = bits, U32, 1300, [11:11] -looksLikeRunning = bits, U32, 1300, [12:12] -looksLikeCoasting = bits, U32, 1300, [13:13] -looksLikeCrankToIdle = bits, U32, 1300, [14:14] -isIdleCoasting = bits, U32, 1300, [15:15] -isIdleClosedLoop = bits, U32, 1300, [16:16] -targetRpmByClt = scalar, S32, 1304, "", 1, 0 -targetRpmAcBump = scalar, S32, 1308, "", 1, 0 -iacByRpmTaper = scalar, F32, 1312 -luaAdd = scalar, F32, 1316 -; total TS size = 1320 -idlePosition = scalar, F32, 1320, "per", 1,0 -trim = scalar, F32, 1324, "", 1, 0 -luaAdjustment = scalar, F32, 1328, "per", 1,0 -m_wastegatePosition = scalar, F32, 1332, "per", 1,0 -etbFeedForward = scalar, F32, 1336 -etbIntegralError = scalar, F32, 1340, "", 1, 0 -etbCurrentTarget = scalar, F32, 1344, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1348, "%", 1, 0 -etbRevLimitActive = bits, U32, 1352, [0:0] -jamDetected = bits, U32, 1352, [1:1] -etbDutyRateOfChange = scalar, F32, 1356, "per", 1,0 -etbDutyAverage = scalar, F32, 1360, "per", 1,0 -etbTpsErrorCounter = scalar, U16, 1364, "count", 1,0 -etbPpsErrorCounter = scalar, U16, 1366, "count", 1,0 -etbErrorCode = scalar, S08, 1368, "", 1, 0 -jamTimer = scalar, U16, 1370, "sec", 0.01, 0 -; total TS size = 1372 -faultCode = scalar, U08, 1372, "", 1, 0 -heaterDuty = scalar, U08, 1373, "%", 1, 0 -pumpDuty = scalar, U08, 1374, "%", 1, 0 -tempC = scalar, U16, 1376, "C", 1, 0 -nernstVoltage = scalar, U16, 1378, "V", 0.001, 0 -esr = scalar, U16, 1380, "ohm", 1, 0 -; total TS size = 1384 -dcOutput0 = scalar, F32, 1384, "per", 1,0 -isEnabled0_int = scalar, U08, 1388, "per", 1,0 -isEnabled0 = bits, U32, 1392, [0:0] -; total TS size = 1396 -value0 = scalar, U16, 1396, "value", 1,0 -value1 = scalar, U16, 1398, "value", 1,0 -errorRate = scalar, F32, 1400, "ratio", 1,0 +idleClosedLoop = scalar, F32, 1292 +iacByTpsTaper = scalar, F32, 1296 +throttlePedalUpState = scalar, S32, 1300, "", 1, 0 +mightResetPid = bits, U32, 1304, [0:0] +shouldResetPid = bits, U32, 1304, [1:1] +wasResetPid = bits, U32, 1304, [2:2] +mustResetPid = bits, U32, 1304, [3:3] +isCranking = bits, U32, 1304, [4:4] +isIacTableForCoasting = bits, U32, 1304, [5:5] +notIdling = bits, U32, 1304, [6:6] +needReset = bits, U32, 1304, [7:7] +isInDeadZone = bits, U32, 1304, [8:8] +isBlipping = bits, U32, 1304, [9:9] +useClosedLoop = bits, U32, 1304, [10:10] +badTps = bits, U32, 1304, [11:11] +looksLikeRunning = bits, U32, 1304, [12:12] +looksLikeCoasting = bits, U32, 1304, [13:13] +looksLikeCrankToIdle = bits, U32, 1304, [14:14] +isIdleCoasting = bits, U32, 1304, [15:15] +isIdleClosedLoop = bits, U32, 1304, [16:16] +idleTarget = scalar, S32, 1308, "", 1, 0 +targetRpmByClt = scalar, S32, 1312, "", 1, 0 +targetRpmAcBump = scalar, S32, 1316, "", 1, 0 +iacByRpmTaper = scalar, F32, 1320 +luaAdd = scalar, F32, 1324 +; total TS size = 1328 +idlePosition = scalar, F32, 1328, "per", 1,0 +trim = scalar, F32, 1332, "", 1, 0 +luaAdjustment = scalar, F32, 1336, "per", 1,0 +m_wastegatePosition = scalar, F32, 1340, "per", 1,0 +etbFeedForward = scalar, F32, 1344 +etbIntegralError = scalar, F32, 1348, "", 1, 0 +etbCurrentTarget = scalar, F32, 1352, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1356, "%", 1, 0 +etbRevLimitActive = bits, U32, 1360, [0:0] +jamDetected = bits, U32, 1360, [1:1] +etbDutyRateOfChange = scalar, F32, 1364, "per", 1,0 +etbDutyAverage = scalar, F32, 1368, "per", 1,0 +etbTpsErrorCounter = scalar, U16, 1372, "count", 1,0 +etbPpsErrorCounter = scalar, U16, 1374, "count", 1,0 +etbErrorCode = scalar, S08, 1376, "", 1, 0 +jamTimer = scalar, U16, 1378, "sec", 0.01, 0 +; total TS size = 1380 +faultCode = scalar, U08, 1380, "", 1, 0 +heaterDuty = scalar, U08, 1381, "%", 1, 0 +pumpDuty = scalar, U08, 1382, "%", 1, 0 +tempC = scalar, U16, 1384, "C", 1, 0 +nernstVoltage = scalar, U16, 1386, "V", 0.001, 0 +esr = scalar, U16, 1388, "ohm", 1, 0 +; total TS size = 1392 +dcOutput0 = scalar, F32, 1392, "per", 1,0 +isEnabled0_int = scalar, U08, 1396, "per", 1,0 +isEnabled0 = bits, U32, 1400, [0:0] ; total TS size = 1404 -vvtTarget = scalar, U16, 1404, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1406, "%", 0.5, 0 -; total TS size = 1408 -lambdaCurrentlyGood = bits, U32, 1408, [0:0] -lambdaMonitorCut = bits, U32, 1408, [1:1] -lambdaTimeSinceGood = scalar, U16, 1412, "sec", 0.01, 0 +value0 = scalar, U16, 1404, "value", 1,0 +value1 = scalar, U16, 1406, "value", 1,0 +errorRate = scalar, F32, 1408, "ratio", 1,0 +; total TS size = 1412 +vvtTarget = scalar, U16, 1412, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1414, "%", 0.5, 0 ; total TS size = 1416 +lambdaCurrentlyGood = bits, U32, 1416, [0:0] +lambdaMonitorCut = bits, U32, 1416, [1:1] +lambdaTimeSinceGood = scalar, U16, 1420, "sec", 0.01, 0 +; total TS size = 1424 time = { timeNow } @@ -5174,8 +5176,9 @@ entry = m_hasSynchronizedPhase, "sync: Known Engine Phase", int, "%d" entry = wallFuelCorrection, "fuel wallwetting injection time", float, "%.3f" entry = wallFuel, "Fuel on the wall", float, "%.3f" entry = idleState, "idleState", int, "%d" -entry = currentIdlePosition, "idle: current position", float, "%.3f" +entry = currentIdlePosition, "Idle: Position", float, "%.3f" entry = baseIdlePosition, "idle: base value", float, "%.3f" +entry = idleClosedLoop, "Idle: Closed loop", float, "%.3f" entry = iacByTpsTaper, "idle: iacByTpsTaper portion", float, "%.3f" entry = throttlePedalUpState, "idle: throttlePedalUpState", int, "%d" entry = mightResetPid, "idle: mightResetPid", int, "%d" @@ -5195,8 +5198,9 @@ entry = looksLikeCoasting, "looksLikeCoasting", int, "%d" entry = looksLikeCrankToIdle, "looksLikeCrankToIdle", int, "%d" entry = isIdleCoasting, "Idle: coasting", int, "%d" entry = isIdleClosedLoop, "Idle: Closed loop active", int, "%d" -entry = targetRpmByClt, "idle: target by CLT", int, "%d" -entry = targetRpmAcBump, "idle: A/C bump", int, "%d" +entry = idleTarget, "Idle: Target RPM", int, "%d" +entry = targetRpmByClt, "Idle: Target RPM base", int, "%d" +entry = targetRpmAcBump, "Idle: Target A/C bump", int, "%d" entry = iacByRpmTaper, "idle: iacByRpmTaper portion", float, "%.3f" entry = luaAdd, "idle: Lua Adder", float, "%.3f" entry = idlePosition, "ETB: idlePosition", float, "%.3f" @@ -6106,13 +6110,15 @@ dialog = idle_stateDialog, "idle_state" graphLine = idleState graphLine = currentIdlePosition graphLine = baseIdlePosition - graphLine = iacByTpsTaper + graphLine = idleClosedLoop liveGraph = idle_state_2_Graph, "Graph", South + graphLine = iacByTpsTaper graphLine = throttlePedalUpState + graphLine = idleTarget graphLine = targetRpmByClt + liveGraph = idle_state_3_Graph, "Graph", South graphLine = targetRpmAcBump graphLine = iacByRpmTaper - liveGraph = idle_state_3_Graph, "Graph", South graphLine = luaAdd indicatorPanel = electronic_throttleIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_nucleo_f429.ini b/firmware/tunerstudio/generated/rusefi_nucleo_f429.ini index 0432edcdaf..78f5b5232d 100644 --- a/firmware/tunerstudio/generated/rusefi_nucleo_f429.ini +++ b/firmware/tunerstudio/generated/rusefi_nucleo_f429.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.09.28.nucleo_f429.2397543547" + signature = "rusEFI master.2023.09.28.nucleo_f429.1163617923" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.09.28.nucleo_f429.2397543547" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.09.28.nucleo_f429.1163617923" ; 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 Thu Sep 28 03:25:32 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Thu Sep 28 13:46:08 UTC 2023 pageSize = 23664 page = 1 @@ -2320,7 +2320,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23654, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1416 + ochBlockSize = 1424 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3039,69 +3039,71 @@ wallFuel = scalar, F32, 1276, "", 1, 0 idleState = bits, S32, 1280, [0:2], "not important" currentIdlePosition = scalar, F32, 1284 baseIdlePosition = scalar, F32, 1288 -iacByTpsTaper = scalar, F32, 1292 -throttlePedalUpState = scalar, S32, 1296, "", 1, 0 -mightResetPid = bits, U32, 1300, [0:0] -shouldResetPid = bits, U32, 1300, [1:1] -wasResetPid = bits, U32, 1300, [2:2] -mustResetPid = bits, U32, 1300, [3:3] -isCranking = bits, U32, 1300, [4:4] -isIacTableForCoasting = bits, U32, 1300, [5:5] -notIdling = bits, U32, 1300, [6:6] -needReset = bits, U32, 1300, [7:7] -isInDeadZone = bits, U32, 1300, [8:8] -isBlipping = bits, U32, 1300, [9:9] -useClosedLoop = bits, U32, 1300, [10:10] -badTps = bits, U32, 1300, [11:11] -looksLikeRunning = bits, U32, 1300, [12:12] -looksLikeCoasting = bits, U32, 1300, [13:13] -looksLikeCrankToIdle = bits, U32, 1300, [14:14] -isIdleCoasting = bits, U32, 1300, [15:15] -isIdleClosedLoop = bits, U32, 1300, [16:16] -targetRpmByClt = scalar, S32, 1304, "", 1, 0 -targetRpmAcBump = scalar, S32, 1308, "", 1, 0 -iacByRpmTaper = scalar, F32, 1312 -luaAdd = scalar, F32, 1316 -; total TS size = 1320 -idlePosition = scalar, F32, 1320, "per", 1,0 -trim = scalar, F32, 1324, "", 1, 0 -luaAdjustment = scalar, F32, 1328, "per", 1,0 -m_wastegatePosition = scalar, F32, 1332, "per", 1,0 -etbFeedForward = scalar, F32, 1336 -etbIntegralError = scalar, F32, 1340, "", 1, 0 -etbCurrentTarget = scalar, F32, 1344, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1348, "%", 1, 0 -etbRevLimitActive = bits, U32, 1352, [0:0] -jamDetected = bits, U32, 1352, [1:1] -etbDutyRateOfChange = scalar, F32, 1356, "per", 1,0 -etbDutyAverage = scalar, F32, 1360, "per", 1,0 -etbTpsErrorCounter = scalar, U16, 1364, "count", 1,0 -etbPpsErrorCounter = scalar, U16, 1366, "count", 1,0 -etbErrorCode = scalar, S08, 1368, "", 1, 0 -jamTimer = scalar, U16, 1370, "sec", 0.01, 0 -; total TS size = 1372 -faultCode = scalar, U08, 1372, "", 1, 0 -heaterDuty = scalar, U08, 1373, "%", 1, 0 -pumpDuty = scalar, U08, 1374, "%", 1, 0 -tempC = scalar, U16, 1376, "C", 1, 0 -nernstVoltage = scalar, U16, 1378, "V", 0.001, 0 -esr = scalar, U16, 1380, "ohm", 1, 0 -; total TS size = 1384 -dcOutput0 = scalar, F32, 1384, "per", 1,0 -isEnabled0_int = scalar, U08, 1388, "per", 1,0 -isEnabled0 = bits, U32, 1392, [0:0] -; total TS size = 1396 -value0 = scalar, U16, 1396, "value", 1,0 -value1 = scalar, U16, 1398, "value", 1,0 -errorRate = scalar, F32, 1400, "ratio", 1,0 +idleClosedLoop = scalar, F32, 1292 +iacByTpsTaper = scalar, F32, 1296 +throttlePedalUpState = scalar, S32, 1300, "", 1, 0 +mightResetPid = bits, U32, 1304, [0:0] +shouldResetPid = bits, U32, 1304, [1:1] +wasResetPid = bits, U32, 1304, [2:2] +mustResetPid = bits, U32, 1304, [3:3] +isCranking = bits, U32, 1304, [4:4] +isIacTableForCoasting = bits, U32, 1304, [5:5] +notIdling = bits, U32, 1304, [6:6] +needReset = bits, U32, 1304, [7:7] +isInDeadZone = bits, U32, 1304, [8:8] +isBlipping = bits, U32, 1304, [9:9] +useClosedLoop = bits, U32, 1304, [10:10] +badTps = bits, U32, 1304, [11:11] +looksLikeRunning = bits, U32, 1304, [12:12] +looksLikeCoasting = bits, U32, 1304, [13:13] +looksLikeCrankToIdle = bits, U32, 1304, [14:14] +isIdleCoasting = bits, U32, 1304, [15:15] +isIdleClosedLoop = bits, U32, 1304, [16:16] +idleTarget = scalar, S32, 1308, "", 1, 0 +targetRpmByClt = scalar, S32, 1312, "", 1, 0 +targetRpmAcBump = scalar, S32, 1316, "", 1, 0 +iacByRpmTaper = scalar, F32, 1320 +luaAdd = scalar, F32, 1324 +; total TS size = 1328 +idlePosition = scalar, F32, 1328, "per", 1,0 +trim = scalar, F32, 1332, "", 1, 0 +luaAdjustment = scalar, F32, 1336, "per", 1,0 +m_wastegatePosition = scalar, F32, 1340, "per", 1,0 +etbFeedForward = scalar, F32, 1344 +etbIntegralError = scalar, F32, 1348, "", 1, 0 +etbCurrentTarget = scalar, F32, 1352, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1356, "%", 1, 0 +etbRevLimitActive = bits, U32, 1360, [0:0] +jamDetected = bits, U32, 1360, [1:1] +etbDutyRateOfChange = scalar, F32, 1364, "per", 1,0 +etbDutyAverage = scalar, F32, 1368, "per", 1,0 +etbTpsErrorCounter = scalar, U16, 1372, "count", 1,0 +etbPpsErrorCounter = scalar, U16, 1374, "count", 1,0 +etbErrorCode = scalar, S08, 1376, "", 1, 0 +jamTimer = scalar, U16, 1378, "sec", 0.01, 0 +; total TS size = 1380 +faultCode = scalar, U08, 1380, "", 1, 0 +heaterDuty = scalar, U08, 1381, "%", 1, 0 +pumpDuty = scalar, U08, 1382, "%", 1, 0 +tempC = scalar, U16, 1384, "C", 1, 0 +nernstVoltage = scalar, U16, 1386, "V", 0.001, 0 +esr = scalar, U16, 1388, "ohm", 1, 0 +; total TS size = 1392 +dcOutput0 = scalar, F32, 1392, "per", 1,0 +isEnabled0_int = scalar, U08, 1396, "per", 1,0 +isEnabled0 = bits, U32, 1400, [0:0] ; total TS size = 1404 -vvtTarget = scalar, U16, 1404, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1406, "%", 0.5, 0 -; total TS size = 1408 -lambdaCurrentlyGood = bits, U32, 1408, [0:0] -lambdaMonitorCut = bits, U32, 1408, [1:1] -lambdaTimeSinceGood = scalar, U16, 1412, "sec", 0.01, 0 +value0 = scalar, U16, 1404, "value", 1,0 +value1 = scalar, U16, 1406, "value", 1,0 +errorRate = scalar, F32, 1408, "ratio", 1,0 +; total TS size = 1412 +vvtTarget = scalar, U16, 1412, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1414, "%", 0.5, 0 ; total TS size = 1416 +lambdaCurrentlyGood = bits, U32, 1416, [0:0] +lambdaMonitorCut = bits, U32, 1416, [1:1] +lambdaTimeSinceGood = scalar, U16, 1420, "sec", 0.01, 0 +; total TS size = 1424 time = { timeNow } @@ -5173,8 +5175,9 @@ entry = m_hasSynchronizedPhase, "sync: Known Engine Phase", int, "%d" entry = wallFuelCorrection, "fuel wallwetting injection time", float, "%.3f" entry = wallFuel, "Fuel on the wall", float, "%.3f" entry = idleState, "idleState", int, "%d" -entry = currentIdlePosition, "idle: current position", float, "%.3f" +entry = currentIdlePosition, "Idle: Position", float, "%.3f" entry = baseIdlePosition, "idle: base value", float, "%.3f" +entry = idleClosedLoop, "Idle: Closed loop", float, "%.3f" entry = iacByTpsTaper, "idle: iacByTpsTaper portion", float, "%.3f" entry = throttlePedalUpState, "idle: throttlePedalUpState", int, "%d" entry = mightResetPid, "idle: mightResetPid", int, "%d" @@ -5194,8 +5197,9 @@ entry = looksLikeCoasting, "looksLikeCoasting", int, "%d" entry = looksLikeCrankToIdle, "looksLikeCrankToIdle", int, "%d" entry = isIdleCoasting, "Idle: coasting", int, "%d" entry = isIdleClosedLoop, "Idle: Closed loop active", int, "%d" -entry = targetRpmByClt, "idle: target by CLT", int, "%d" -entry = targetRpmAcBump, "idle: A/C bump", int, "%d" +entry = idleTarget, "Idle: Target RPM", int, "%d" +entry = targetRpmByClt, "Idle: Target RPM base", int, "%d" +entry = targetRpmAcBump, "Idle: Target A/C bump", int, "%d" entry = iacByRpmTaper, "idle: iacByRpmTaper portion", float, "%.3f" entry = luaAdd, "idle: Lua Adder", float, "%.3f" entry = idlePosition, "ETB: idlePosition", float, "%.3f" @@ -6103,13 +6107,15 @@ dialog = idle_stateDialog, "idle_state" graphLine = idleState graphLine = currentIdlePosition graphLine = baseIdlePosition - graphLine = iacByTpsTaper + graphLine = idleClosedLoop liveGraph = idle_state_2_Graph, "Graph", South + graphLine = iacByTpsTaper graphLine = throttlePedalUpState + graphLine = idleTarget graphLine = targetRpmByClt + liveGraph = idle_state_3_Graph, "Graph", South graphLine = targetRpmAcBump graphLine = iacByRpmTaper - liveGraph = idle_state_3_Graph, "Graph", South graphLine = luaAdd indicatorPanel = electronic_throttleIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_nucleo_f767.ini b/firmware/tunerstudio/generated/rusefi_nucleo_f767.ini index 32740bd6f3..f18dbbe2cf 100644 --- a/firmware/tunerstudio/generated/rusefi_nucleo_f767.ini +++ b/firmware/tunerstudio/generated/rusefi_nucleo_f767.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.09.28.nucleo_f767.2397543547" + signature = "rusEFI master.2023.09.28.nucleo_f767.1163617923" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.09.28.nucleo_f767.2397543547" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.09.28.nucleo_f767.1163617923" ; 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 Thu Sep 28 03:25:34 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Thu Sep 28 13:46:10 UTC 2023 pageSize = 23664 page = 1 @@ -2320,7 +2320,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23654, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1416 + ochBlockSize = 1424 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3039,69 +3039,71 @@ wallFuel = scalar, F32, 1276, "", 1, 0 idleState = bits, S32, 1280, [0:2], "not important" currentIdlePosition = scalar, F32, 1284 baseIdlePosition = scalar, F32, 1288 -iacByTpsTaper = scalar, F32, 1292 -throttlePedalUpState = scalar, S32, 1296, "", 1, 0 -mightResetPid = bits, U32, 1300, [0:0] -shouldResetPid = bits, U32, 1300, [1:1] -wasResetPid = bits, U32, 1300, [2:2] -mustResetPid = bits, U32, 1300, [3:3] -isCranking = bits, U32, 1300, [4:4] -isIacTableForCoasting = bits, U32, 1300, [5:5] -notIdling = bits, U32, 1300, [6:6] -needReset = bits, U32, 1300, [7:7] -isInDeadZone = bits, U32, 1300, [8:8] -isBlipping = bits, U32, 1300, [9:9] -useClosedLoop = bits, U32, 1300, [10:10] -badTps = bits, U32, 1300, [11:11] -looksLikeRunning = bits, U32, 1300, [12:12] -looksLikeCoasting = bits, U32, 1300, [13:13] -looksLikeCrankToIdle = bits, U32, 1300, [14:14] -isIdleCoasting = bits, U32, 1300, [15:15] -isIdleClosedLoop = bits, U32, 1300, [16:16] -targetRpmByClt = scalar, S32, 1304, "", 1, 0 -targetRpmAcBump = scalar, S32, 1308, "", 1, 0 -iacByRpmTaper = scalar, F32, 1312 -luaAdd = scalar, F32, 1316 -; total TS size = 1320 -idlePosition = scalar, F32, 1320, "per", 1,0 -trim = scalar, F32, 1324, "", 1, 0 -luaAdjustment = scalar, F32, 1328, "per", 1,0 -m_wastegatePosition = scalar, F32, 1332, "per", 1,0 -etbFeedForward = scalar, F32, 1336 -etbIntegralError = scalar, F32, 1340, "", 1, 0 -etbCurrentTarget = scalar, F32, 1344, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1348, "%", 1, 0 -etbRevLimitActive = bits, U32, 1352, [0:0] -jamDetected = bits, U32, 1352, [1:1] -etbDutyRateOfChange = scalar, F32, 1356, "per", 1,0 -etbDutyAverage = scalar, F32, 1360, "per", 1,0 -etbTpsErrorCounter = scalar, U16, 1364, "count", 1,0 -etbPpsErrorCounter = scalar, U16, 1366, "count", 1,0 -etbErrorCode = scalar, S08, 1368, "", 1, 0 -jamTimer = scalar, U16, 1370, "sec", 0.01, 0 -; total TS size = 1372 -faultCode = scalar, U08, 1372, "", 1, 0 -heaterDuty = scalar, U08, 1373, "%", 1, 0 -pumpDuty = scalar, U08, 1374, "%", 1, 0 -tempC = scalar, U16, 1376, "C", 1, 0 -nernstVoltage = scalar, U16, 1378, "V", 0.001, 0 -esr = scalar, U16, 1380, "ohm", 1, 0 -; total TS size = 1384 -dcOutput0 = scalar, F32, 1384, "per", 1,0 -isEnabled0_int = scalar, U08, 1388, "per", 1,0 -isEnabled0 = bits, U32, 1392, [0:0] -; total TS size = 1396 -value0 = scalar, U16, 1396, "value", 1,0 -value1 = scalar, U16, 1398, "value", 1,0 -errorRate = scalar, F32, 1400, "ratio", 1,0 +idleClosedLoop = scalar, F32, 1292 +iacByTpsTaper = scalar, F32, 1296 +throttlePedalUpState = scalar, S32, 1300, "", 1, 0 +mightResetPid = bits, U32, 1304, [0:0] +shouldResetPid = bits, U32, 1304, [1:1] +wasResetPid = bits, U32, 1304, [2:2] +mustResetPid = bits, U32, 1304, [3:3] +isCranking = bits, U32, 1304, [4:4] +isIacTableForCoasting = bits, U32, 1304, [5:5] +notIdling = bits, U32, 1304, [6:6] +needReset = bits, U32, 1304, [7:7] +isInDeadZone = bits, U32, 1304, [8:8] +isBlipping = bits, U32, 1304, [9:9] +useClosedLoop = bits, U32, 1304, [10:10] +badTps = bits, U32, 1304, [11:11] +looksLikeRunning = bits, U32, 1304, [12:12] +looksLikeCoasting = bits, U32, 1304, [13:13] +looksLikeCrankToIdle = bits, U32, 1304, [14:14] +isIdleCoasting = bits, U32, 1304, [15:15] +isIdleClosedLoop = bits, U32, 1304, [16:16] +idleTarget = scalar, S32, 1308, "", 1, 0 +targetRpmByClt = scalar, S32, 1312, "", 1, 0 +targetRpmAcBump = scalar, S32, 1316, "", 1, 0 +iacByRpmTaper = scalar, F32, 1320 +luaAdd = scalar, F32, 1324 +; total TS size = 1328 +idlePosition = scalar, F32, 1328, "per", 1,0 +trim = scalar, F32, 1332, "", 1, 0 +luaAdjustment = scalar, F32, 1336, "per", 1,0 +m_wastegatePosition = scalar, F32, 1340, "per", 1,0 +etbFeedForward = scalar, F32, 1344 +etbIntegralError = scalar, F32, 1348, "", 1, 0 +etbCurrentTarget = scalar, F32, 1352, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1356, "%", 1, 0 +etbRevLimitActive = bits, U32, 1360, [0:0] +jamDetected = bits, U32, 1360, [1:1] +etbDutyRateOfChange = scalar, F32, 1364, "per", 1,0 +etbDutyAverage = scalar, F32, 1368, "per", 1,0 +etbTpsErrorCounter = scalar, U16, 1372, "count", 1,0 +etbPpsErrorCounter = scalar, U16, 1374, "count", 1,0 +etbErrorCode = scalar, S08, 1376, "", 1, 0 +jamTimer = scalar, U16, 1378, "sec", 0.01, 0 +; total TS size = 1380 +faultCode = scalar, U08, 1380, "", 1, 0 +heaterDuty = scalar, U08, 1381, "%", 1, 0 +pumpDuty = scalar, U08, 1382, "%", 1, 0 +tempC = scalar, U16, 1384, "C", 1, 0 +nernstVoltage = scalar, U16, 1386, "V", 0.001, 0 +esr = scalar, U16, 1388, "ohm", 1, 0 +; total TS size = 1392 +dcOutput0 = scalar, F32, 1392, "per", 1,0 +isEnabled0_int = scalar, U08, 1396, "per", 1,0 +isEnabled0 = bits, U32, 1400, [0:0] ; total TS size = 1404 -vvtTarget = scalar, U16, 1404, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1406, "%", 0.5, 0 -; total TS size = 1408 -lambdaCurrentlyGood = bits, U32, 1408, [0:0] -lambdaMonitorCut = bits, U32, 1408, [1:1] -lambdaTimeSinceGood = scalar, U16, 1412, "sec", 0.01, 0 +value0 = scalar, U16, 1404, "value", 1,0 +value1 = scalar, U16, 1406, "value", 1,0 +errorRate = scalar, F32, 1408, "ratio", 1,0 +; total TS size = 1412 +vvtTarget = scalar, U16, 1412, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1414, "%", 0.5, 0 ; total TS size = 1416 +lambdaCurrentlyGood = bits, U32, 1416, [0:0] +lambdaMonitorCut = bits, U32, 1416, [1:1] +lambdaTimeSinceGood = scalar, U16, 1420, "sec", 0.01, 0 +; total TS size = 1424 time = { timeNow } @@ -5173,8 +5175,9 @@ entry = m_hasSynchronizedPhase, "sync: Known Engine Phase", int, "%d" entry = wallFuelCorrection, "fuel wallwetting injection time", float, "%.3f" entry = wallFuel, "Fuel on the wall", float, "%.3f" entry = idleState, "idleState", int, "%d" -entry = currentIdlePosition, "idle: current position", float, "%.3f" +entry = currentIdlePosition, "Idle: Position", float, "%.3f" entry = baseIdlePosition, "idle: base value", float, "%.3f" +entry = idleClosedLoop, "Idle: Closed loop", float, "%.3f" entry = iacByTpsTaper, "idle: iacByTpsTaper portion", float, "%.3f" entry = throttlePedalUpState, "idle: throttlePedalUpState", int, "%d" entry = mightResetPid, "idle: mightResetPid", int, "%d" @@ -5194,8 +5197,9 @@ entry = looksLikeCoasting, "looksLikeCoasting", int, "%d" entry = looksLikeCrankToIdle, "looksLikeCrankToIdle", int, "%d" entry = isIdleCoasting, "Idle: coasting", int, "%d" entry = isIdleClosedLoop, "Idle: Closed loop active", int, "%d" -entry = targetRpmByClt, "idle: target by CLT", int, "%d" -entry = targetRpmAcBump, "idle: A/C bump", int, "%d" +entry = idleTarget, "Idle: Target RPM", int, "%d" +entry = targetRpmByClt, "Idle: Target RPM base", int, "%d" +entry = targetRpmAcBump, "Idle: Target A/C bump", int, "%d" entry = iacByRpmTaper, "idle: iacByRpmTaper portion", float, "%.3f" entry = luaAdd, "idle: Lua Adder", float, "%.3f" entry = idlePosition, "ETB: idlePosition", float, "%.3f" @@ -6103,13 +6107,15 @@ dialog = idle_stateDialog, "idle_state" graphLine = idleState graphLine = currentIdlePosition graphLine = baseIdlePosition - graphLine = iacByTpsTaper + graphLine = idleClosedLoop liveGraph = idle_state_2_Graph, "Graph", South + graphLine = iacByTpsTaper graphLine = throttlePedalUpState + graphLine = idleTarget graphLine = targetRpmByClt + liveGraph = idle_state_3_Graph, "Graph", South graphLine = targetRpmAcBump graphLine = iacByRpmTaper - liveGraph = idle_state_3_Graph, "Graph", South graphLine = luaAdd indicatorPanel = electronic_throttleIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_nucleo_h743.ini b/firmware/tunerstudio/generated/rusefi_nucleo_h743.ini index a8278941dc..470e69bbfe 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.09.28.nucleo_h743.2397543547" + signature = "rusEFI master.2023.09.28.nucleo_h743.1163617923" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.09.28.nucleo_h743.2397543547" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.09.28.nucleo_h743.1163617923" ; 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 Thu Sep 28 03:25:37 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Thu Sep 28 13:46:13 UTC 2023 pageSize = 23664 page = 1 @@ -2320,7 +2320,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23654, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1416 + ochBlockSize = 1424 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3039,69 +3039,71 @@ wallFuel = scalar, F32, 1276, "", 1, 0 idleState = bits, S32, 1280, [0:2], "not important" currentIdlePosition = scalar, F32, 1284 baseIdlePosition = scalar, F32, 1288 -iacByTpsTaper = scalar, F32, 1292 -throttlePedalUpState = scalar, S32, 1296, "", 1, 0 -mightResetPid = bits, U32, 1300, [0:0] -shouldResetPid = bits, U32, 1300, [1:1] -wasResetPid = bits, U32, 1300, [2:2] -mustResetPid = bits, U32, 1300, [3:3] -isCranking = bits, U32, 1300, [4:4] -isIacTableForCoasting = bits, U32, 1300, [5:5] -notIdling = bits, U32, 1300, [6:6] -needReset = bits, U32, 1300, [7:7] -isInDeadZone = bits, U32, 1300, [8:8] -isBlipping = bits, U32, 1300, [9:9] -useClosedLoop = bits, U32, 1300, [10:10] -badTps = bits, U32, 1300, [11:11] -looksLikeRunning = bits, U32, 1300, [12:12] -looksLikeCoasting = bits, U32, 1300, [13:13] -looksLikeCrankToIdle = bits, U32, 1300, [14:14] -isIdleCoasting = bits, U32, 1300, [15:15] -isIdleClosedLoop = bits, U32, 1300, [16:16] -targetRpmByClt = scalar, S32, 1304, "", 1, 0 -targetRpmAcBump = scalar, S32, 1308, "", 1, 0 -iacByRpmTaper = scalar, F32, 1312 -luaAdd = scalar, F32, 1316 -; total TS size = 1320 -idlePosition = scalar, F32, 1320, "per", 1,0 -trim = scalar, F32, 1324, "", 1, 0 -luaAdjustment = scalar, F32, 1328, "per", 1,0 -m_wastegatePosition = scalar, F32, 1332, "per", 1,0 -etbFeedForward = scalar, F32, 1336 -etbIntegralError = scalar, F32, 1340, "", 1, 0 -etbCurrentTarget = scalar, F32, 1344, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1348, "%", 1, 0 -etbRevLimitActive = bits, U32, 1352, [0:0] -jamDetected = bits, U32, 1352, [1:1] -etbDutyRateOfChange = scalar, F32, 1356, "per", 1,0 -etbDutyAverage = scalar, F32, 1360, "per", 1,0 -etbTpsErrorCounter = scalar, U16, 1364, "count", 1,0 -etbPpsErrorCounter = scalar, U16, 1366, "count", 1,0 -etbErrorCode = scalar, S08, 1368, "", 1, 0 -jamTimer = scalar, U16, 1370, "sec", 0.01, 0 -; total TS size = 1372 -faultCode = scalar, U08, 1372, "", 1, 0 -heaterDuty = scalar, U08, 1373, "%", 1, 0 -pumpDuty = scalar, U08, 1374, "%", 1, 0 -tempC = scalar, U16, 1376, "C", 1, 0 -nernstVoltage = scalar, U16, 1378, "V", 0.001, 0 -esr = scalar, U16, 1380, "ohm", 1, 0 -; total TS size = 1384 -dcOutput0 = scalar, F32, 1384, "per", 1,0 -isEnabled0_int = scalar, U08, 1388, "per", 1,0 -isEnabled0 = bits, U32, 1392, [0:0] -; total TS size = 1396 -value0 = scalar, U16, 1396, "value", 1,0 -value1 = scalar, U16, 1398, "value", 1,0 -errorRate = scalar, F32, 1400, "ratio", 1,0 +idleClosedLoop = scalar, F32, 1292 +iacByTpsTaper = scalar, F32, 1296 +throttlePedalUpState = scalar, S32, 1300, "", 1, 0 +mightResetPid = bits, U32, 1304, [0:0] +shouldResetPid = bits, U32, 1304, [1:1] +wasResetPid = bits, U32, 1304, [2:2] +mustResetPid = bits, U32, 1304, [3:3] +isCranking = bits, U32, 1304, [4:4] +isIacTableForCoasting = bits, U32, 1304, [5:5] +notIdling = bits, U32, 1304, [6:6] +needReset = bits, U32, 1304, [7:7] +isInDeadZone = bits, U32, 1304, [8:8] +isBlipping = bits, U32, 1304, [9:9] +useClosedLoop = bits, U32, 1304, [10:10] +badTps = bits, U32, 1304, [11:11] +looksLikeRunning = bits, U32, 1304, [12:12] +looksLikeCoasting = bits, U32, 1304, [13:13] +looksLikeCrankToIdle = bits, U32, 1304, [14:14] +isIdleCoasting = bits, U32, 1304, [15:15] +isIdleClosedLoop = bits, U32, 1304, [16:16] +idleTarget = scalar, S32, 1308, "", 1, 0 +targetRpmByClt = scalar, S32, 1312, "", 1, 0 +targetRpmAcBump = scalar, S32, 1316, "", 1, 0 +iacByRpmTaper = scalar, F32, 1320 +luaAdd = scalar, F32, 1324 +; total TS size = 1328 +idlePosition = scalar, F32, 1328, "per", 1,0 +trim = scalar, F32, 1332, "", 1, 0 +luaAdjustment = scalar, F32, 1336, "per", 1,0 +m_wastegatePosition = scalar, F32, 1340, "per", 1,0 +etbFeedForward = scalar, F32, 1344 +etbIntegralError = scalar, F32, 1348, "", 1, 0 +etbCurrentTarget = scalar, F32, 1352, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1356, "%", 1, 0 +etbRevLimitActive = bits, U32, 1360, [0:0] +jamDetected = bits, U32, 1360, [1:1] +etbDutyRateOfChange = scalar, F32, 1364, "per", 1,0 +etbDutyAverage = scalar, F32, 1368, "per", 1,0 +etbTpsErrorCounter = scalar, U16, 1372, "count", 1,0 +etbPpsErrorCounter = scalar, U16, 1374, "count", 1,0 +etbErrorCode = scalar, S08, 1376, "", 1, 0 +jamTimer = scalar, U16, 1378, "sec", 0.01, 0 +; total TS size = 1380 +faultCode = scalar, U08, 1380, "", 1, 0 +heaterDuty = scalar, U08, 1381, "%", 1, 0 +pumpDuty = scalar, U08, 1382, "%", 1, 0 +tempC = scalar, U16, 1384, "C", 1, 0 +nernstVoltage = scalar, U16, 1386, "V", 0.001, 0 +esr = scalar, U16, 1388, "ohm", 1, 0 +; total TS size = 1392 +dcOutput0 = scalar, F32, 1392, "per", 1,0 +isEnabled0_int = scalar, U08, 1396, "per", 1,0 +isEnabled0 = bits, U32, 1400, [0:0] ; total TS size = 1404 -vvtTarget = scalar, U16, 1404, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1406, "%", 0.5, 0 -; total TS size = 1408 -lambdaCurrentlyGood = bits, U32, 1408, [0:0] -lambdaMonitorCut = bits, U32, 1408, [1:1] -lambdaTimeSinceGood = scalar, U16, 1412, "sec", 0.01, 0 +value0 = scalar, U16, 1404, "value", 1,0 +value1 = scalar, U16, 1406, "value", 1,0 +errorRate = scalar, F32, 1408, "ratio", 1,0 +; total TS size = 1412 +vvtTarget = scalar, U16, 1412, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1414, "%", 0.5, 0 ; total TS size = 1416 +lambdaCurrentlyGood = bits, U32, 1416, [0:0] +lambdaMonitorCut = bits, U32, 1416, [1:1] +lambdaTimeSinceGood = scalar, U16, 1420, "sec", 0.01, 0 +; total TS size = 1424 time = { timeNow } @@ -5173,8 +5175,9 @@ entry = m_hasSynchronizedPhase, "sync: Known Engine Phase", int, "%d" entry = wallFuelCorrection, "fuel wallwetting injection time", float, "%.3f" entry = wallFuel, "Fuel on the wall", float, "%.3f" entry = idleState, "idleState", int, "%d" -entry = currentIdlePosition, "idle: current position", float, "%.3f" +entry = currentIdlePosition, "Idle: Position", float, "%.3f" entry = baseIdlePosition, "idle: base value", float, "%.3f" +entry = idleClosedLoop, "Idle: Closed loop", float, "%.3f" entry = iacByTpsTaper, "idle: iacByTpsTaper portion", float, "%.3f" entry = throttlePedalUpState, "idle: throttlePedalUpState", int, "%d" entry = mightResetPid, "idle: mightResetPid", int, "%d" @@ -5194,8 +5197,9 @@ entry = looksLikeCoasting, "looksLikeCoasting", int, "%d" entry = looksLikeCrankToIdle, "looksLikeCrankToIdle", int, "%d" entry = isIdleCoasting, "Idle: coasting", int, "%d" entry = isIdleClosedLoop, "Idle: Closed loop active", int, "%d" -entry = targetRpmByClt, "idle: target by CLT", int, "%d" -entry = targetRpmAcBump, "idle: A/C bump", int, "%d" +entry = idleTarget, "Idle: Target RPM", int, "%d" +entry = targetRpmByClt, "Idle: Target RPM base", int, "%d" +entry = targetRpmAcBump, "Idle: Target A/C bump", int, "%d" entry = iacByRpmTaper, "idle: iacByRpmTaper portion", float, "%.3f" entry = luaAdd, "idle: Lua Adder", float, "%.3f" entry = idlePosition, "ETB: idlePosition", float, "%.3f" @@ -6103,13 +6107,15 @@ dialog = idle_stateDialog, "idle_state" graphLine = idleState graphLine = currentIdlePosition graphLine = baseIdlePosition - graphLine = iacByTpsTaper + graphLine = idleClosedLoop liveGraph = idle_state_2_Graph, "Graph", South + graphLine = iacByTpsTaper graphLine = throttlePedalUpState + graphLine = idleTarget graphLine = targetRpmByClt + liveGraph = idle_state_3_Graph, "Graph", South graphLine = targetRpmAcBump graphLine = iacByRpmTaper - liveGraph = idle_state_3_Graph, "Graph", South graphLine = luaAdd indicatorPanel = electronic_throttleIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_405.ini b/firmware/tunerstudio/generated/rusefi_prometheus_405.ini index f5efe60f60..e4a2e453eb 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.09.28.prometheus_405.3195228651" + signature = "rusEFI master.2023.09.28.prometheus_405.1976544019" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.09.28.prometheus_405.3195228651" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.09.28.prometheus_405.1976544019" ; 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 Thu Sep 28 03:25:17 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Thu Sep 28 13:45:53 UTC 2023 pageSize = 23664 page = 1 @@ -2320,7 +2320,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23654, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1416 + ochBlockSize = 1424 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3039,69 +3039,71 @@ wallFuel = scalar, F32, 1276, "", 1, 0 idleState = bits, S32, 1280, [0:2], "not important" currentIdlePosition = scalar, F32, 1284 baseIdlePosition = scalar, F32, 1288 -iacByTpsTaper = scalar, F32, 1292 -throttlePedalUpState = scalar, S32, 1296, "", 1, 0 -mightResetPid = bits, U32, 1300, [0:0] -shouldResetPid = bits, U32, 1300, [1:1] -wasResetPid = bits, U32, 1300, [2:2] -mustResetPid = bits, U32, 1300, [3:3] -isCranking = bits, U32, 1300, [4:4] -isIacTableForCoasting = bits, U32, 1300, [5:5] -notIdling = bits, U32, 1300, [6:6] -needReset = bits, U32, 1300, [7:7] -isInDeadZone = bits, U32, 1300, [8:8] -isBlipping = bits, U32, 1300, [9:9] -useClosedLoop = bits, U32, 1300, [10:10] -badTps = bits, U32, 1300, [11:11] -looksLikeRunning = bits, U32, 1300, [12:12] -looksLikeCoasting = bits, U32, 1300, [13:13] -looksLikeCrankToIdle = bits, U32, 1300, [14:14] -isIdleCoasting = bits, U32, 1300, [15:15] -isIdleClosedLoop = bits, U32, 1300, [16:16] -targetRpmByClt = scalar, S32, 1304, "", 1, 0 -targetRpmAcBump = scalar, S32, 1308, "", 1, 0 -iacByRpmTaper = scalar, F32, 1312 -luaAdd = scalar, F32, 1316 -; total TS size = 1320 -idlePosition = scalar, F32, 1320, "per", 1,0 -trim = scalar, F32, 1324, "", 1, 0 -luaAdjustment = scalar, F32, 1328, "per", 1,0 -m_wastegatePosition = scalar, F32, 1332, "per", 1,0 -etbFeedForward = scalar, F32, 1336 -etbIntegralError = scalar, F32, 1340, "", 1, 0 -etbCurrentTarget = scalar, F32, 1344, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1348, "%", 1, 0 -etbRevLimitActive = bits, U32, 1352, [0:0] -jamDetected = bits, U32, 1352, [1:1] -etbDutyRateOfChange = scalar, F32, 1356, "per", 1,0 -etbDutyAverage = scalar, F32, 1360, "per", 1,0 -etbTpsErrorCounter = scalar, U16, 1364, "count", 1,0 -etbPpsErrorCounter = scalar, U16, 1366, "count", 1,0 -etbErrorCode = scalar, S08, 1368, "", 1, 0 -jamTimer = scalar, U16, 1370, "sec", 0.01, 0 -; total TS size = 1372 -faultCode = scalar, U08, 1372, "", 1, 0 -heaterDuty = scalar, U08, 1373, "%", 1, 0 -pumpDuty = scalar, U08, 1374, "%", 1, 0 -tempC = scalar, U16, 1376, "C", 1, 0 -nernstVoltage = scalar, U16, 1378, "V", 0.001, 0 -esr = scalar, U16, 1380, "ohm", 1, 0 -; total TS size = 1384 -dcOutput0 = scalar, F32, 1384, "per", 1,0 -isEnabled0_int = scalar, U08, 1388, "per", 1,0 -isEnabled0 = bits, U32, 1392, [0:0] -; total TS size = 1396 -value0 = scalar, U16, 1396, "value", 1,0 -value1 = scalar, U16, 1398, "value", 1,0 -errorRate = scalar, F32, 1400, "ratio", 1,0 +idleClosedLoop = scalar, F32, 1292 +iacByTpsTaper = scalar, F32, 1296 +throttlePedalUpState = scalar, S32, 1300, "", 1, 0 +mightResetPid = bits, U32, 1304, [0:0] +shouldResetPid = bits, U32, 1304, [1:1] +wasResetPid = bits, U32, 1304, [2:2] +mustResetPid = bits, U32, 1304, [3:3] +isCranking = bits, U32, 1304, [4:4] +isIacTableForCoasting = bits, U32, 1304, [5:5] +notIdling = bits, U32, 1304, [6:6] +needReset = bits, U32, 1304, [7:7] +isInDeadZone = bits, U32, 1304, [8:8] +isBlipping = bits, U32, 1304, [9:9] +useClosedLoop = bits, U32, 1304, [10:10] +badTps = bits, U32, 1304, [11:11] +looksLikeRunning = bits, U32, 1304, [12:12] +looksLikeCoasting = bits, U32, 1304, [13:13] +looksLikeCrankToIdle = bits, U32, 1304, [14:14] +isIdleCoasting = bits, U32, 1304, [15:15] +isIdleClosedLoop = bits, U32, 1304, [16:16] +idleTarget = scalar, S32, 1308, "", 1, 0 +targetRpmByClt = scalar, S32, 1312, "", 1, 0 +targetRpmAcBump = scalar, S32, 1316, "", 1, 0 +iacByRpmTaper = scalar, F32, 1320 +luaAdd = scalar, F32, 1324 +; total TS size = 1328 +idlePosition = scalar, F32, 1328, "per", 1,0 +trim = scalar, F32, 1332, "", 1, 0 +luaAdjustment = scalar, F32, 1336, "per", 1,0 +m_wastegatePosition = scalar, F32, 1340, "per", 1,0 +etbFeedForward = scalar, F32, 1344 +etbIntegralError = scalar, F32, 1348, "", 1, 0 +etbCurrentTarget = scalar, F32, 1352, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1356, "%", 1, 0 +etbRevLimitActive = bits, U32, 1360, [0:0] +jamDetected = bits, U32, 1360, [1:1] +etbDutyRateOfChange = scalar, F32, 1364, "per", 1,0 +etbDutyAverage = scalar, F32, 1368, "per", 1,0 +etbTpsErrorCounter = scalar, U16, 1372, "count", 1,0 +etbPpsErrorCounter = scalar, U16, 1374, "count", 1,0 +etbErrorCode = scalar, S08, 1376, "", 1, 0 +jamTimer = scalar, U16, 1378, "sec", 0.01, 0 +; total TS size = 1380 +faultCode = scalar, U08, 1380, "", 1, 0 +heaterDuty = scalar, U08, 1381, "%", 1, 0 +pumpDuty = scalar, U08, 1382, "%", 1, 0 +tempC = scalar, U16, 1384, "C", 1, 0 +nernstVoltage = scalar, U16, 1386, "V", 0.001, 0 +esr = scalar, U16, 1388, "ohm", 1, 0 +; total TS size = 1392 +dcOutput0 = scalar, F32, 1392, "per", 1,0 +isEnabled0_int = scalar, U08, 1396, "per", 1,0 +isEnabled0 = bits, U32, 1400, [0:0] ; total TS size = 1404 -vvtTarget = scalar, U16, 1404, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1406, "%", 0.5, 0 -; total TS size = 1408 -lambdaCurrentlyGood = bits, U32, 1408, [0:0] -lambdaMonitorCut = bits, U32, 1408, [1:1] -lambdaTimeSinceGood = scalar, U16, 1412, "sec", 0.01, 0 +value0 = scalar, U16, 1404, "value", 1,0 +value1 = scalar, U16, 1406, "value", 1,0 +errorRate = scalar, F32, 1408, "ratio", 1,0 +; total TS size = 1412 +vvtTarget = scalar, U16, 1412, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1414, "%", 0.5, 0 ; total TS size = 1416 +lambdaCurrentlyGood = bits, U32, 1416, [0:0] +lambdaMonitorCut = bits, U32, 1416, [1:1] +lambdaTimeSinceGood = scalar, U16, 1420, "sec", 0.01, 0 +; total TS size = 1424 time = { timeNow } @@ -5173,8 +5175,9 @@ entry = m_hasSynchronizedPhase, "sync: Known Engine Phase", int, "%d" entry = wallFuelCorrection, "fuel wallwetting injection time", float, "%.3f" entry = wallFuel, "Fuel on the wall", float, "%.3f" entry = idleState, "idleState", int, "%d" -entry = currentIdlePosition, "idle: current position", float, "%.3f" +entry = currentIdlePosition, "Idle: Position", float, "%.3f" entry = baseIdlePosition, "idle: base value", float, "%.3f" +entry = idleClosedLoop, "Idle: Closed loop", float, "%.3f" entry = iacByTpsTaper, "idle: iacByTpsTaper portion", float, "%.3f" entry = throttlePedalUpState, "idle: throttlePedalUpState", int, "%d" entry = mightResetPid, "idle: mightResetPid", int, "%d" @@ -5194,8 +5197,9 @@ entry = looksLikeCoasting, "looksLikeCoasting", int, "%d" entry = looksLikeCrankToIdle, "looksLikeCrankToIdle", int, "%d" entry = isIdleCoasting, "Idle: coasting", int, "%d" entry = isIdleClosedLoop, "Idle: Closed loop active", int, "%d" -entry = targetRpmByClt, "idle: target by CLT", int, "%d" -entry = targetRpmAcBump, "idle: A/C bump", int, "%d" +entry = idleTarget, "Idle: Target RPM", int, "%d" +entry = targetRpmByClt, "Idle: Target RPM base", int, "%d" +entry = targetRpmAcBump, "Idle: Target A/C bump", int, "%d" entry = iacByRpmTaper, "idle: iacByRpmTaper portion", float, "%.3f" entry = luaAdd, "idle: Lua Adder", float, "%.3f" entry = idlePosition, "ETB: idlePosition", float, "%.3f" @@ -6098,13 +6102,15 @@ dialog = idle_stateDialog, "idle_state" graphLine = idleState graphLine = currentIdlePosition graphLine = baseIdlePosition - graphLine = iacByTpsTaper + graphLine = idleClosedLoop liveGraph = idle_state_2_Graph, "Graph", South + graphLine = iacByTpsTaper graphLine = throttlePedalUpState + graphLine = idleTarget graphLine = targetRpmByClt + liveGraph = idle_state_3_Graph, "Graph", South graphLine = targetRpmAcBump graphLine = iacByRpmTaper - liveGraph = idle_state_3_Graph, "Graph", South graphLine = luaAdd indicatorPanel = electronic_throttleIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_469.ini b/firmware/tunerstudio/generated/rusefi_prometheus_469.ini index 1451633c66..a84fe98e46 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.09.28.prometheus_469.3195228651" + signature = "rusEFI master.2023.09.28.prometheus_469.1976544019" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.09.28.prometheus_469.3195228651" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.09.28.prometheus_469.1976544019" ; 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 Thu Sep 28 03:25:15 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Thu Sep 28 13:45:50 UTC 2023 pageSize = 23664 page = 1 @@ -2320,7 +2320,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23654, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1416 + ochBlockSize = 1424 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3039,69 +3039,71 @@ wallFuel = scalar, F32, 1276, "", 1, 0 idleState = bits, S32, 1280, [0:2], "not important" currentIdlePosition = scalar, F32, 1284 baseIdlePosition = scalar, F32, 1288 -iacByTpsTaper = scalar, F32, 1292 -throttlePedalUpState = scalar, S32, 1296, "", 1, 0 -mightResetPid = bits, U32, 1300, [0:0] -shouldResetPid = bits, U32, 1300, [1:1] -wasResetPid = bits, U32, 1300, [2:2] -mustResetPid = bits, U32, 1300, [3:3] -isCranking = bits, U32, 1300, [4:4] -isIacTableForCoasting = bits, U32, 1300, [5:5] -notIdling = bits, U32, 1300, [6:6] -needReset = bits, U32, 1300, [7:7] -isInDeadZone = bits, U32, 1300, [8:8] -isBlipping = bits, U32, 1300, [9:9] -useClosedLoop = bits, U32, 1300, [10:10] -badTps = bits, U32, 1300, [11:11] -looksLikeRunning = bits, U32, 1300, [12:12] -looksLikeCoasting = bits, U32, 1300, [13:13] -looksLikeCrankToIdle = bits, U32, 1300, [14:14] -isIdleCoasting = bits, U32, 1300, [15:15] -isIdleClosedLoop = bits, U32, 1300, [16:16] -targetRpmByClt = scalar, S32, 1304, "", 1, 0 -targetRpmAcBump = scalar, S32, 1308, "", 1, 0 -iacByRpmTaper = scalar, F32, 1312 -luaAdd = scalar, F32, 1316 -; total TS size = 1320 -idlePosition = scalar, F32, 1320, "per", 1,0 -trim = scalar, F32, 1324, "", 1, 0 -luaAdjustment = scalar, F32, 1328, "per", 1,0 -m_wastegatePosition = scalar, F32, 1332, "per", 1,0 -etbFeedForward = scalar, F32, 1336 -etbIntegralError = scalar, F32, 1340, "", 1, 0 -etbCurrentTarget = scalar, F32, 1344, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1348, "%", 1, 0 -etbRevLimitActive = bits, U32, 1352, [0:0] -jamDetected = bits, U32, 1352, [1:1] -etbDutyRateOfChange = scalar, F32, 1356, "per", 1,0 -etbDutyAverage = scalar, F32, 1360, "per", 1,0 -etbTpsErrorCounter = scalar, U16, 1364, "count", 1,0 -etbPpsErrorCounter = scalar, U16, 1366, "count", 1,0 -etbErrorCode = scalar, S08, 1368, "", 1, 0 -jamTimer = scalar, U16, 1370, "sec", 0.01, 0 -; total TS size = 1372 -faultCode = scalar, U08, 1372, "", 1, 0 -heaterDuty = scalar, U08, 1373, "%", 1, 0 -pumpDuty = scalar, U08, 1374, "%", 1, 0 -tempC = scalar, U16, 1376, "C", 1, 0 -nernstVoltage = scalar, U16, 1378, "V", 0.001, 0 -esr = scalar, U16, 1380, "ohm", 1, 0 -; total TS size = 1384 -dcOutput0 = scalar, F32, 1384, "per", 1,0 -isEnabled0_int = scalar, U08, 1388, "per", 1,0 -isEnabled0 = bits, U32, 1392, [0:0] -; total TS size = 1396 -value0 = scalar, U16, 1396, "value", 1,0 -value1 = scalar, U16, 1398, "value", 1,0 -errorRate = scalar, F32, 1400, "ratio", 1,0 +idleClosedLoop = scalar, F32, 1292 +iacByTpsTaper = scalar, F32, 1296 +throttlePedalUpState = scalar, S32, 1300, "", 1, 0 +mightResetPid = bits, U32, 1304, [0:0] +shouldResetPid = bits, U32, 1304, [1:1] +wasResetPid = bits, U32, 1304, [2:2] +mustResetPid = bits, U32, 1304, [3:3] +isCranking = bits, U32, 1304, [4:4] +isIacTableForCoasting = bits, U32, 1304, [5:5] +notIdling = bits, U32, 1304, [6:6] +needReset = bits, U32, 1304, [7:7] +isInDeadZone = bits, U32, 1304, [8:8] +isBlipping = bits, U32, 1304, [9:9] +useClosedLoop = bits, U32, 1304, [10:10] +badTps = bits, U32, 1304, [11:11] +looksLikeRunning = bits, U32, 1304, [12:12] +looksLikeCoasting = bits, U32, 1304, [13:13] +looksLikeCrankToIdle = bits, U32, 1304, [14:14] +isIdleCoasting = bits, U32, 1304, [15:15] +isIdleClosedLoop = bits, U32, 1304, [16:16] +idleTarget = scalar, S32, 1308, "", 1, 0 +targetRpmByClt = scalar, S32, 1312, "", 1, 0 +targetRpmAcBump = scalar, S32, 1316, "", 1, 0 +iacByRpmTaper = scalar, F32, 1320 +luaAdd = scalar, F32, 1324 +; total TS size = 1328 +idlePosition = scalar, F32, 1328, "per", 1,0 +trim = scalar, F32, 1332, "", 1, 0 +luaAdjustment = scalar, F32, 1336, "per", 1,0 +m_wastegatePosition = scalar, F32, 1340, "per", 1,0 +etbFeedForward = scalar, F32, 1344 +etbIntegralError = scalar, F32, 1348, "", 1, 0 +etbCurrentTarget = scalar, F32, 1352, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1356, "%", 1, 0 +etbRevLimitActive = bits, U32, 1360, [0:0] +jamDetected = bits, U32, 1360, [1:1] +etbDutyRateOfChange = scalar, F32, 1364, "per", 1,0 +etbDutyAverage = scalar, F32, 1368, "per", 1,0 +etbTpsErrorCounter = scalar, U16, 1372, "count", 1,0 +etbPpsErrorCounter = scalar, U16, 1374, "count", 1,0 +etbErrorCode = scalar, S08, 1376, "", 1, 0 +jamTimer = scalar, U16, 1378, "sec", 0.01, 0 +; total TS size = 1380 +faultCode = scalar, U08, 1380, "", 1, 0 +heaterDuty = scalar, U08, 1381, "%", 1, 0 +pumpDuty = scalar, U08, 1382, "%", 1, 0 +tempC = scalar, U16, 1384, "C", 1, 0 +nernstVoltage = scalar, U16, 1386, "V", 0.001, 0 +esr = scalar, U16, 1388, "ohm", 1, 0 +; total TS size = 1392 +dcOutput0 = scalar, F32, 1392, "per", 1,0 +isEnabled0_int = scalar, U08, 1396, "per", 1,0 +isEnabled0 = bits, U32, 1400, [0:0] ; total TS size = 1404 -vvtTarget = scalar, U16, 1404, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1406, "%", 0.5, 0 -; total TS size = 1408 -lambdaCurrentlyGood = bits, U32, 1408, [0:0] -lambdaMonitorCut = bits, U32, 1408, [1:1] -lambdaTimeSinceGood = scalar, U16, 1412, "sec", 0.01, 0 +value0 = scalar, U16, 1404, "value", 1,0 +value1 = scalar, U16, 1406, "value", 1,0 +errorRate = scalar, F32, 1408, "ratio", 1,0 +; total TS size = 1412 +vvtTarget = scalar, U16, 1412, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1414, "%", 0.5, 0 ; total TS size = 1416 +lambdaCurrentlyGood = bits, U32, 1416, [0:0] +lambdaMonitorCut = bits, U32, 1416, [1:1] +lambdaTimeSinceGood = scalar, U16, 1420, "sec", 0.01, 0 +; total TS size = 1424 time = { timeNow } @@ -5173,8 +5175,9 @@ entry = m_hasSynchronizedPhase, "sync: Known Engine Phase", int, "%d" entry = wallFuelCorrection, "fuel wallwetting injection time", float, "%.3f" entry = wallFuel, "Fuel on the wall", float, "%.3f" entry = idleState, "idleState", int, "%d" -entry = currentIdlePosition, "idle: current position", float, "%.3f" +entry = currentIdlePosition, "Idle: Position", float, "%.3f" entry = baseIdlePosition, "idle: base value", float, "%.3f" +entry = idleClosedLoop, "Idle: Closed loop", float, "%.3f" entry = iacByTpsTaper, "idle: iacByTpsTaper portion", float, "%.3f" entry = throttlePedalUpState, "idle: throttlePedalUpState", int, "%d" entry = mightResetPid, "idle: mightResetPid", int, "%d" @@ -5194,8 +5197,9 @@ entry = looksLikeCoasting, "looksLikeCoasting", int, "%d" entry = looksLikeCrankToIdle, "looksLikeCrankToIdle", int, "%d" entry = isIdleCoasting, "Idle: coasting", int, "%d" entry = isIdleClosedLoop, "Idle: Closed loop active", int, "%d" -entry = targetRpmByClt, "idle: target by CLT", int, "%d" -entry = targetRpmAcBump, "idle: A/C bump", int, "%d" +entry = idleTarget, "Idle: Target RPM", int, "%d" +entry = targetRpmByClt, "Idle: Target RPM base", int, "%d" +entry = targetRpmAcBump, "Idle: Target A/C bump", int, "%d" entry = iacByRpmTaper, "idle: iacByRpmTaper portion", float, "%.3f" entry = luaAdd, "idle: Lua Adder", float, "%.3f" entry = idlePosition, "ETB: idlePosition", float, "%.3f" @@ -6098,13 +6102,15 @@ dialog = idle_stateDialog, "idle_state" graphLine = idleState graphLine = currentIdlePosition graphLine = baseIdlePosition - graphLine = iacByTpsTaper + graphLine = idleClosedLoop liveGraph = idle_state_2_Graph, "Graph", South + graphLine = iacByTpsTaper graphLine = throttlePedalUpState + graphLine = idleTarget graphLine = targetRpmByClt + liveGraph = idle_state_3_Graph, "Graph", South graphLine = targetRpmAcBump graphLine = iacByRpmTaper - liveGraph = idle_state_3_Graph, "Graph", South graphLine = luaAdd indicatorPanel = electronic_throttleIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f4.ini b/firmware/tunerstudio/generated/rusefi_proteus_f4.ini index 5d5916ea65..9b006e2aa6 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.09.28.proteus_f4.2398380545" + signature = "rusEFI master.2023.09.28.proteus_f4.1162385657" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.09.28.proteus_f4.2398380545" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.09.28.proteus_f4.1162385657" ; 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 Thu Sep 28 03:25:23 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Thu Sep 28 13:45:58 UTC 2023 pageSize = 27664 page = 1 @@ -2320,7 +2320,7 @@ lambdaMaxDeviationRpmBins = array, U16, 27654, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1416 + ochBlockSize = 1424 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3039,69 +3039,71 @@ wallFuel = scalar, F32, 1276, "", 1, 0 idleState = bits, S32, 1280, [0:2], "not important" currentIdlePosition = scalar, F32, 1284 baseIdlePosition = scalar, F32, 1288 -iacByTpsTaper = scalar, F32, 1292 -throttlePedalUpState = scalar, S32, 1296, "", 1, 0 -mightResetPid = bits, U32, 1300, [0:0] -shouldResetPid = bits, U32, 1300, [1:1] -wasResetPid = bits, U32, 1300, [2:2] -mustResetPid = bits, U32, 1300, [3:3] -isCranking = bits, U32, 1300, [4:4] -isIacTableForCoasting = bits, U32, 1300, [5:5] -notIdling = bits, U32, 1300, [6:6] -needReset = bits, U32, 1300, [7:7] -isInDeadZone = bits, U32, 1300, [8:8] -isBlipping = bits, U32, 1300, [9:9] -useClosedLoop = bits, U32, 1300, [10:10] -badTps = bits, U32, 1300, [11:11] -looksLikeRunning = bits, U32, 1300, [12:12] -looksLikeCoasting = bits, U32, 1300, [13:13] -looksLikeCrankToIdle = bits, U32, 1300, [14:14] -isIdleCoasting = bits, U32, 1300, [15:15] -isIdleClosedLoop = bits, U32, 1300, [16:16] -targetRpmByClt = scalar, S32, 1304, "", 1, 0 -targetRpmAcBump = scalar, S32, 1308, "", 1, 0 -iacByRpmTaper = scalar, F32, 1312 -luaAdd = scalar, F32, 1316 -; total TS size = 1320 -idlePosition = scalar, F32, 1320, "per", 1,0 -trim = scalar, F32, 1324, "", 1, 0 -luaAdjustment = scalar, F32, 1328, "per", 1,0 -m_wastegatePosition = scalar, F32, 1332, "per", 1,0 -etbFeedForward = scalar, F32, 1336 -etbIntegralError = scalar, F32, 1340, "", 1, 0 -etbCurrentTarget = scalar, F32, 1344, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1348, "%", 1, 0 -etbRevLimitActive = bits, U32, 1352, [0:0] -jamDetected = bits, U32, 1352, [1:1] -etbDutyRateOfChange = scalar, F32, 1356, "per", 1,0 -etbDutyAverage = scalar, F32, 1360, "per", 1,0 -etbTpsErrorCounter = scalar, U16, 1364, "count", 1,0 -etbPpsErrorCounter = scalar, U16, 1366, "count", 1,0 -etbErrorCode = scalar, S08, 1368, "", 1, 0 -jamTimer = scalar, U16, 1370, "sec", 0.01, 0 -; total TS size = 1372 -faultCode = scalar, U08, 1372, "", 1, 0 -heaterDuty = scalar, U08, 1373, "%", 1, 0 -pumpDuty = scalar, U08, 1374, "%", 1, 0 -tempC = scalar, U16, 1376, "C", 1, 0 -nernstVoltage = scalar, U16, 1378, "V", 0.001, 0 -esr = scalar, U16, 1380, "ohm", 1, 0 -; total TS size = 1384 -dcOutput0 = scalar, F32, 1384, "per", 1,0 -isEnabled0_int = scalar, U08, 1388, "per", 1,0 -isEnabled0 = bits, U32, 1392, [0:0] -; total TS size = 1396 -value0 = scalar, U16, 1396, "value", 1,0 -value1 = scalar, U16, 1398, "value", 1,0 -errorRate = scalar, F32, 1400, "ratio", 1,0 +idleClosedLoop = scalar, F32, 1292 +iacByTpsTaper = scalar, F32, 1296 +throttlePedalUpState = scalar, S32, 1300, "", 1, 0 +mightResetPid = bits, U32, 1304, [0:0] +shouldResetPid = bits, U32, 1304, [1:1] +wasResetPid = bits, U32, 1304, [2:2] +mustResetPid = bits, U32, 1304, [3:3] +isCranking = bits, U32, 1304, [4:4] +isIacTableForCoasting = bits, U32, 1304, [5:5] +notIdling = bits, U32, 1304, [6:6] +needReset = bits, U32, 1304, [7:7] +isInDeadZone = bits, U32, 1304, [8:8] +isBlipping = bits, U32, 1304, [9:9] +useClosedLoop = bits, U32, 1304, [10:10] +badTps = bits, U32, 1304, [11:11] +looksLikeRunning = bits, U32, 1304, [12:12] +looksLikeCoasting = bits, U32, 1304, [13:13] +looksLikeCrankToIdle = bits, U32, 1304, [14:14] +isIdleCoasting = bits, U32, 1304, [15:15] +isIdleClosedLoop = bits, U32, 1304, [16:16] +idleTarget = scalar, S32, 1308, "", 1, 0 +targetRpmByClt = scalar, S32, 1312, "", 1, 0 +targetRpmAcBump = scalar, S32, 1316, "", 1, 0 +iacByRpmTaper = scalar, F32, 1320 +luaAdd = scalar, F32, 1324 +; total TS size = 1328 +idlePosition = scalar, F32, 1328, "per", 1,0 +trim = scalar, F32, 1332, "", 1, 0 +luaAdjustment = scalar, F32, 1336, "per", 1,0 +m_wastegatePosition = scalar, F32, 1340, "per", 1,0 +etbFeedForward = scalar, F32, 1344 +etbIntegralError = scalar, F32, 1348, "", 1, 0 +etbCurrentTarget = scalar, F32, 1352, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1356, "%", 1, 0 +etbRevLimitActive = bits, U32, 1360, [0:0] +jamDetected = bits, U32, 1360, [1:1] +etbDutyRateOfChange = scalar, F32, 1364, "per", 1,0 +etbDutyAverage = scalar, F32, 1368, "per", 1,0 +etbTpsErrorCounter = scalar, U16, 1372, "count", 1,0 +etbPpsErrorCounter = scalar, U16, 1374, "count", 1,0 +etbErrorCode = scalar, S08, 1376, "", 1, 0 +jamTimer = scalar, U16, 1378, "sec", 0.01, 0 +; total TS size = 1380 +faultCode = scalar, U08, 1380, "", 1, 0 +heaterDuty = scalar, U08, 1381, "%", 1, 0 +pumpDuty = scalar, U08, 1382, "%", 1, 0 +tempC = scalar, U16, 1384, "C", 1, 0 +nernstVoltage = scalar, U16, 1386, "V", 0.001, 0 +esr = scalar, U16, 1388, "ohm", 1, 0 +; total TS size = 1392 +dcOutput0 = scalar, F32, 1392, "per", 1,0 +isEnabled0_int = scalar, U08, 1396, "per", 1,0 +isEnabled0 = bits, U32, 1400, [0:0] ; total TS size = 1404 -vvtTarget = scalar, U16, 1404, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1406, "%", 0.5, 0 -; total TS size = 1408 -lambdaCurrentlyGood = bits, U32, 1408, [0:0] -lambdaMonitorCut = bits, U32, 1408, [1:1] -lambdaTimeSinceGood = scalar, U16, 1412, "sec", 0.01, 0 +value0 = scalar, U16, 1404, "value", 1,0 +value1 = scalar, U16, 1406, "value", 1,0 +errorRate = scalar, F32, 1408, "ratio", 1,0 +; total TS size = 1412 +vvtTarget = scalar, U16, 1412, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1414, "%", 0.5, 0 ; total TS size = 1416 +lambdaCurrentlyGood = bits, U32, 1416, [0:0] +lambdaMonitorCut = bits, U32, 1416, [1:1] +lambdaTimeSinceGood = scalar, U16, 1420, "sec", 0.01, 0 +; total TS size = 1424 time = { timeNow } @@ -5173,8 +5175,9 @@ entry = m_hasSynchronizedPhase, "sync: Known Engine Phase", int, "%d" entry = wallFuelCorrection, "fuel wallwetting injection time", float, "%.3f" entry = wallFuel, "Fuel on the wall", float, "%.3f" entry = idleState, "idleState", int, "%d" -entry = currentIdlePosition, "idle: current position", float, "%.3f" +entry = currentIdlePosition, "Idle: Position", float, "%.3f" entry = baseIdlePosition, "idle: base value", float, "%.3f" +entry = idleClosedLoop, "Idle: Closed loop", float, "%.3f" entry = iacByTpsTaper, "idle: iacByTpsTaper portion", float, "%.3f" entry = throttlePedalUpState, "idle: throttlePedalUpState", int, "%d" entry = mightResetPid, "idle: mightResetPid", int, "%d" @@ -5194,8 +5197,9 @@ entry = looksLikeCoasting, "looksLikeCoasting", int, "%d" entry = looksLikeCrankToIdle, "looksLikeCrankToIdle", int, "%d" entry = isIdleCoasting, "Idle: coasting", int, "%d" entry = isIdleClosedLoop, "Idle: Closed loop active", int, "%d" -entry = targetRpmByClt, "idle: target by CLT", int, "%d" -entry = targetRpmAcBump, "idle: A/C bump", int, "%d" +entry = idleTarget, "Idle: Target RPM", int, "%d" +entry = targetRpmByClt, "Idle: Target RPM base", int, "%d" +entry = targetRpmAcBump, "Idle: Target A/C bump", int, "%d" entry = iacByRpmTaper, "idle: iacByRpmTaper portion", float, "%.3f" entry = luaAdd, "idle: Lua Adder", float, "%.3f" entry = idlePosition, "ETB: idlePosition", float, "%.3f" @@ -6113,13 +6117,15 @@ dialog = idle_stateDialog, "idle_state" graphLine = idleState graphLine = currentIdlePosition graphLine = baseIdlePosition - graphLine = iacByTpsTaper + graphLine = idleClosedLoop liveGraph = idle_state_2_Graph, "Graph", South + graphLine = iacByTpsTaper graphLine = throttlePedalUpState + graphLine = idleTarget graphLine = targetRpmByClt + liveGraph = idle_state_3_Graph, "Graph", South graphLine = targetRpmAcBump graphLine = iacByRpmTaper - liveGraph = idle_state_3_Graph, "Graph", South graphLine = luaAdd indicatorPanel = electronic_throttleIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f7.ini b/firmware/tunerstudio/generated/rusefi_proteus_f7.ini index 501a0e36e6..8cfacc8855 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.09.28.proteus_f7.2398380545" + signature = "rusEFI master.2023.09.28.proteus_f7.1162385657" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.09.28.proteus_f7.2398380545" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.09.28.proteus_f7.1162385657" ; 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 Thu Sep 28 03:25:20 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Thu Sep 28 13:45:55 UTC 2023 pageSize = 27664 page = 1 @@ -2320,7 +2320,7 @@ lambdaMaxDeviationRpmBins = array, U16, 27654, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1416 + ochBlockSize = 1424 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3039,69 +3039,71 @@ wallFuel = scalar, F32, 1276, "", 1, 0 idleState = bits, S32, 1280, [0:2], "not important" currentIdlePosition = scalar, F32, 1284 baseIdlePosition = scalar, F32, 1288 -iacByTpsTaper = scalar, F32, 1292 -throttlePedalUpState = scalar, S32, 1296, "", 1, 0 -mightResetPid = bits, U32, 1300, [0:0] -shouldResetPid = bits, U32, 1300, [1:1] -wasResetPid = bits, U32, 1300, [2:2] -mustResetPid = bits, U32, 1300, [3:3] -isCranking = bits, U32, 1300, [4:4] -isIacTableForCoasting = bits, U32, 1300, [5:5] -notIdling = bits, U32, 1300, [6:6] -needReset = bits, U32, 1300, [7:7] -isInDeadZone = bits, U32, 1300, [8:8] -isBlipping = bits, U32, 1300, [9:9] -useClosedLoop = bits, U32, 1300, [10:10] -badTps = bits, U32, 1300, [11:11] -looksLikeRunning = bits, U32, 1300, [12:12] -looksLikeCoasting = bits, U32, 1300, [13:13] -looksLikeCrankToIdle = bits, U32, 1300, [14:14] -isIdleCoasting = bits, U32, 1300, [15:15] -isIdleClosedLoop = bits, U32, 1300, [16:16] -targetRpmByClt = scalar, S32, 1304, "", 1, 0 -targetRpmAcBump = scalar, S32, 1308, "", 1, 0 -iacByRpmTaper = scalar, F32, 1312 -luaAdd = scalar, F32, 1316 -; total TS size = 1320 -idlePosition = scalar, F32, 1320, "per", 1,0 -trim = scalar, F32, 1324, "", 1, 0 -luaAdjustment = scalar, F32, 1328, "per", 1,0 -m_wastegatePosition = scalar, F32, 1332, "per", 1,0 -etbFeedForward = scalar, F32, 1336 -etbIntegralError = scalar, F32, 1340, "", 1, 0 -etbCurrentTarget = scalar, F32, 1344, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1348, "%", 1, 0 -etbRevLimitActive = bits, U32, 1352, [0:0] -jamDetected = bits, U32, 1352, [1:1] -etbDutyRateOfChange = scalar, F32, 1356, "per", 1,0 -etbDutyAverage = scalar, F32, 1360, "per", 1,0 -etbTpsErrorCounter = scalar, U16, 1364, "count", 1,0 -etbPpsErrorCounter = scalar, U16, 1366, "count", 1,0 -etbErrorCode = scalar, S08, 1368, "", 1, 0 -jamTimer = scalar, U16, 1370, "sec", 0.01, 0 -; total TS size = 1372 -faultCode = scalar, U08, 1372, "", 1, 0 -heaterDuty = scalar, U08, 1373, "%", 1, 0 -pumpDuty = scalar, U08, 1374, "%", 1, 0 -tempC = scalar, U16, 1376, "C", 1, 0 -nernstVoltage = scalar, U16, 1378, "V", 0.001, 0 -esr = scalar, U16, 1380, "ohm", 1, 0 -; total TS size = 1384 -dcOutput0 = scalar, F32, 1384, "per", 1,0 -isEnabled0_int = scalar, U08, 1388, "per", 1,0 -isEnabled0 = bits, U32, 1392, [0:0] -; total TS size = 1396 -value0 = scalar, U16, 1396, "value", 1,0 -value1 = scalar, U16, 1398, "value", 1,0 -errorRate = scalar, F32, 1400, "ratio", 1,0 +idleClosedLoop = scalar, F32, 1292 +iacByTpsTaper = scalar, F32, 1296 +throttlePedalUpState = scalar, S32, 1300, "", 1, 0 +mightResetPid = bits, U32, 1304, [0:0] +shouldResetPid = bits, U32, 1304, [1:1] +wasResetPid = bits, U32, 1304, [2:2] +mustResetPid = bits, U32, 1304, [3:3] +isCranking = bits, U32, 1304, [4:4] +isIacTableForCoasting = bits, U32, 1304, [5:5] +notIdling = bits, U32, 1304, [6:6] +needReset = bits, U32, 1304, [7:7] +isInDeadZone = bits, U32, 1304, [8:8] +isBlipping = bits, U32, 1304, [9:9] +useClosedLoop = bits, U32, 1304, [10:10] +badTps = bits, U32, 1304, [11:11] +looksLikeRunning = bits, U32, 1304, [12:12] +looksLikeCoasting = bits, U32, 1304, [13:13] +looksLikeCrankToIdle = bits, U32, 1304, [14:14] +isIdleCoasting = bits, U32, 1304, [15:15] +isIdleClosedLoop = bits, U32, 1304, [16:16] +idleTarget = scalar, S32, 1308, "", 1, 0 +targetRpmByClt = scalar, S32, 1312, "", 1, 0 +targetRpmAcBump = scalar, S32, 1316, "", 1, 0 +iacByRpmTaper = scalar, F32, 1320 +luaAdd = scalar, F32, 1324 +; total TS size = 1328 +idlePosition = scalar, F32, 1328, "per", 1,0 +trim = scalar, F32, 1332, "", 1, 0 +luaAdjustment = scalar, F32, 1336, "per", 1,0 +m_wastegatePosition = scalar, F32, 1340, "per", 1,0 +etbFeedForward = scalar, F32, 1344 +etbIntegralError = scalar, F32, 1348, "", 1, 0 +etbCurrentTarget = scalar, F32, 1352, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1356, "%", 1, 0 +etbRevLimitActive = bits, U32, 1360, [0:0] +jamDetected = bits, U32, 1360, [1:1] +etbDutyRateOfChange = scalar, F32, 1364, "per", 1,0 +etbDutyAverage = scalar, F32, 1368, "per", 1,0 +etbTpsErrorCounter = scalar, U16, 1372, "count", 1,0 +etbPpsErrorCounter = scalar, U16, 1374, "count", 1,0 +etbErrorCode = scalar, S08, 1376, "", 1, 0 +jamTimer = scalar, U16, 1378, "sec", 0.01, 0 +; total TS size = 1380 +faultCode = scalar, U08, 1380, "", 1, 0 +heaterDuty = scalar, U08, 1381, "%", 1, 0 +pumpDuty = scalar, U08, 1382, "%", 1, 0 +tempC = scalar, U16, 1384, "C", 1, 0 +nernstVoltage = scalar, U16, 1386, "V", 0.001, 0 +esr = scalar, U16, 1388, "ohm", 1, 0 +; total TS size = 1392 +dcOutput0 = scalar, F32, 1392, "per", 1,0 +isEnabled0_int = scalar, U08, 1396, "per", 1,0 +isEnabled0 = bits, U32, 1400, [0:0] ; total TS size = 1404 -vvtTarget = scalar, U16, 1404, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1406, "%", 0.5, 0 -; total TS size = 1408 -lambdaCurrentlyGood = bits, U32, 1408, [0:0] -lambdaMonitorCut = bits, U32, 1408, [1:1] -lambdaTimeSinceGood = scalar, U16, 1412, "sec", 0.01, 0 +value0 = scalar, U16, 1404, "value", 1,0 +value1 = scalar, U16, 1406, "value", 1,0 +errorRate = scalar, F32, 1408, "ratio", 1,0 +; total TS size = 1412 +vvtTarget = scalar, U16, 1412, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1414, "%", 0.5, 0 ; total TS size = 1416 +lambdaCurrentlyGood = bits, U32, 1416, [0:0] +lambdaMonitorCut = bits, U32, 1416, [1:1] +lambdaTimeSinceGood = scalar, U16, 1420, "sec", 0.01, 0 +; total TS size = 1424 time = { timeNow } @@ -5173,8 +5175,9 @@ entry = m_hasSynchronizedPhase, "sync: Known Engine Phase", int, "%d" entry = wallFuelCorrection, "fuel wallwetting injection time", float, "%.3f" entry = wallFuel, "Fuel on the wall", float, "%.3f" entry = idleState, "idleState", int, "%d" -entry = currentIdlePosition, "idle: current position", float, "%.3f" +entry = currentIdlePosition, "Idle: Position", float, "%.3f" entry = baseIdlePosition, "idle: base value", float, "%.3f" +entry = idleClosedLoop, "Idle: Closed loop", float, "%.3f" entry = iacByTpsTaper, "idle: iacByTpsTaper portion", float, "%.3f" entry = throttlePedalUpState, "idle: throttlePedalUpState", int, "%d" entry = mightResetPid, "idle: mightResetPid", int, "%d" @@ -5194,8 +5197,9 @@ entry = looksLikeCoasting, "looksLikeCoasting", int, "%d" entry = looksLikeCrankToIdle, "looksLikeCrankToIdle", int, "%d" entry = isIdleCoasting, "Idle: coasting", int, "%d" entry = isIdleClosedLoop, "Idle: Closed loop active", int, "%d" -entry = targetRpmByClt, "idle: target by CLT", int, "%d" -entry = targetRpmAcBump, "idle: A/C bump", int, "%d" +entry = idleTarget, "Idle: Target RPM", int, "%d" +entry = targetRpmByClt, "Idle: Target RPM base", int, "%d" +entry = targetRpmAcBump, "Idle: Target A/C bump", int, "%d" entry = iacByRpmTaper, "idle: iacByRpmTaper portion", float, "%.3f" entry = luaAdd, "idle: Lua Adder", float, "%.3f" entry = idlePosition, "ETB: idlePosition", float, "%.3f" @@ -6113,13 +6117,15 @@ dialog = idle_stateDialog, "idle_state" graphLine = idleState graphLine = currentIdlePosition graphLine = baseIdlePosition - graphLine = iacByTpsTaper + graphLine = idleClosedLoop liveGraph = idle_state_2_Graph, "Graph", South + graphLine = iacByTpsTaper graphLine = throttlePedalUpState + graphLine = idleTarget graphLine = targetRpmByClt + liveGraph = idle_state_3_Graph, "Graph", South graphLine = targetRpmAcBump graphLine = iacByRpmTaper - liveGraph = idle_state_3_Graph, "Graph", South graphLine = luaAdd indicatorPanel = electronic_throttleIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_proteus_h7.ini b/firmware/tunerstudio/generated/rusefi_proteus_h7.ini index 4e84e03b7b..7c78a2d6b2 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.09.28.proteus_h7.2398380545" + signature = "rusEFI master.2023.09.28.proteus_h7.1162385657" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.09.28.proteus_h7.2398380545" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.09.28.proteus_h7.1162385657" ; 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 Thu Sep 28 03:25:26 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Thu Sep 28 13:46:02 UTC 2023 pageSize = 27664 page = 1 @@ -2320,7 +2320,7 @@ lambdaMaxDeviationRpmBins = array, U16, 27654, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1416 + ochBlockSize = 1424 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3039,69 +3039,71 @@ wallFuel = scalar, F32, 1276, "", 1, 0 idleState = bits, S32, 1280, [0:2], "not important" currentIdlePosition = scalar, F32, 1284 baseIdlePosition = scalar, F32, 1288 -iacByTpsTaper = scalar, F32, 1292 -throttlePedalUpState = scalar, S32, 1296, "", 1, 0 -mightResetPid = bits, U32, 1300, [0:0] -shouldResetPid = bits, U32, 1300, [1:1] -wasResetPid = bits, U32, 1300, [2:2] -mustResetPid = bits, U32, 1300, [3:3] -isCranking = bits, U32, 1300, [4:4] -isIacTableForCoasting = bits, U32, 1300, [5:5] -notIdling = bits, U32, 1300, [6:6] -needReset = bits, U32, 1300, [7:7] -isInDeadZone = bits, U32, 1300, [8:8] -isBlipping = bits, U32, 1300, [9:9] -useClosedLoop = bits, U32, 1300, [10:10] -badTps = bits, U32, 1300, [11:11] -looksLikeRunning = bits, U32, 1300, [12:12] -looksLikeCoasting = bits, U32, 1300, [13:13] -looksLikeCrankToIdle = bits, U32, 1300, [14:14] -isIdleCoasting = bits, U32, 1300, [15:15] -isIdleClosedLoop = bits, U32, 1300, [16:16] -targetRpmByClt = scalar, S32, 1304, "", 1, 0 -targetRpmAcBump = scalar, S32, 1308, "", 1, 0 -iacByRpmTaper = scalar, F32, 1312 -luaAdd = scalar, F32, 1316 -; total TS size = 1320 -idlePosition = scalar, F32, 1320, "per", 1,0 -trim = scalar, F32, 1324, "", 1, 0 -luaAdjustment = scalar, F32, 1328, "per", 1,0 -m_wastegatePosition = scalar, F32, 1332, "per", 1,0 -etbFeedForward = scalar, F32, 1336 -etbIntegralError = scalar, F32, 1340, "", 1, 0 -etbCurrentTarget = scalar, F32, 1344, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1348, "%", 1, 0 -etbRevLimitActive = bits, U32, 1352, [0:0] -jamDetected = bits, U32, 1352, [1:1] -etbDutyRateOfChange = scalar, F32, 1356, "per", 1,0 -etbDutyAverage = scalar, F32, 1360, "per", 1,0 -etbTpsErrorCounter = scalar, U16, 1364, "count", 1,0 -etbPpsErrorCounter = scalar, U16, 1366, "count", 1,0 -etbErrorCode = scalar, S08, 1368, "", 1, 0 -jamTimer = scalar, U16, 1370, "sec", 0.01, 0 -; total TS size = 1372 -faultCode = scalar, U08, 1372, "", 1, 0 -heaterDuty = scalar, U08, 1373, "%", 1, 0 -pumpDuty = scalar, U08, 1374, "%", 1, 0 -tempC = scalar, U16, 1376, "C", 1, 0 -nernstVoltage = scalar, U16, 1378, "V", 0.001, 0 -esr = scalar, U16, 1380, "ohm", 1, 0 -; total TS size = 1384 -dcOutput0 = scalar, F32, 1384, "per", 1,0 -isEnabled0_int = scalar, U08, 1388, "per", 1,0 -isEnabled0 = bits, U32, 1392, [0:0] -; total TS size = 1396 -value0 = scalar, U16, 1396, "value", 1,0 -value1 = scalar, U16, 1398, "value", 1,0 -errorRate = scalar, F32, 1400, "ratio", 1,0 +idleClosedLoop = scalar, F32, 1292 +iacByTpsTaper = scalar, F32, 1296 +throttlePedalUpState = scalar, S32, 1300, "", 1, 0 +mightResetPid = bits, U32, 1304, [0:0] +shouldResetPid = bits, U32, 1304, [1:1] +wasResetPid = bits, U32, 1304, [2:2] +mustResetPid = bits, U32, 1304, [3:3] +isCranking = bits, U32, 1304, [4:4] +isIacTableForCoasting = bits, U32, 1304, [5:5] +notIdling = bits, U32, 1304, [6:6] +needReset = bits, U32, 1304, [7:7] +isInDeadZone = bits, U32, 1304, [8:8] +isBlipping = bits, U32, 1304, [9:9] +useClosedLoop = bits, U32, 1304, [10:10] +badTps = bits, U32, 1304, [11:11] +looksLikeRunning = bits, U32, 1304, [12:12] +looksLikeCoasting = bits, U32, 1304, [13:13] +looksLikeCrankToIdle = bits, U32, 1304, [14:14] +isIdleCoasting = bits, U32, 1304, [15:15] +isIdleClosedLoop = bits, U32, 1304, [16:16] +idleTarget = scalar, S32, 1308, "", 1, 0 +targetRpmByClt = scalar, S32, 1312, "", 1, 0 +targetRpmAcBump = scalar, S32, 1316, "", 1, 0 +iacByRpmTaper = scalar, F32, 1320 +luaAdd = scalar, F32, 1324 +; total TS size = 1328 +idlePosition = scalar, F32, 1328, "per", 1,0 +trim = scalar, F32, 1332, "", 1, 0 +luaAdjustment = scalar, F32, 1336, "per", 1,0 +m_wastegatePosition = scalar, F32, 1340, "per", 1,0 +etbFeedForward = scalar, F32, 1344 +etbIntegralError = scalar, F32, 1348, "", 1, 0 +etbCurrentTarget = scalar, F32, 1352, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1356, "%", 1, 0 +etbRevLimitActive = bits, U32, 1360, [0:0] +jamDetected = bits, U32, 1360, [1:1] +etbDutyRateOfChange = scalar, F32, 1364, "per", 1,0 +etbDutyAverage = scalar, F32, 1368, "per", 1,0 +etbTpsErrorCounter = scalar, U16, 1372, "count", 1,0 +etbPpsErrorCounter = scalar, U16, 1374, "count", 1,0 +etbErrorCode = scalar, S08, 1376, "", 1, 0 +jamTimer = scalar, U16, 1378, "sec", 0.01, 0 +; total TS size = 1380 +faultCode = scalar, U08, 1380, "", 1, 0 +heaterDuty = scalar, U08, 1381, "%", 1, 0 +pumpDuty = scalar, U08, 1382, "%", 1, 0 +tempC = scalar, U16, 1384, "C", 1, 0 +nernstVoltage = scalar, U16, 1386, "V", 0.001, 0 +esr = scalar, U16, 1388, "ohm", 1, 0 +; total TS size = 1392 +dcOutput0 = scalar, F32, 1392, "per", 1,0 +isEnabled0_int = scalar, U08, 1396, "per", 1,0 +isEnabled0 = bits, U32, 1400, [0:0] ; total TS size = 1404 -vvtTarget = scalar, U16, 1404, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1406, "%", 0.5, 0 -; total TS size = 1408 -lambdaCurrentlyGood = bits, U32, 1408, [0:0] -lambdaMonitorCut = bits, U32, 1408, [1:1] -lambdaTimeSinceGood = scalar, U16, 1412, "sec", 0.01, 0 +value0 = scalar, U16, 1404, "value", 1,0 +value1 = scalar, U16, 1406, "value", 1,0 +errorRate = scalar, F32, 1408, "ratio", 1,0 +; total TS size = 1412 +vvtTarget = scalar, U16, 1412, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1414, "%", 0.5, 0 ; total TS size = 1416 +lambdaCurrentlyGood = bits, U32, 1416, [0:0] +lambdaMonitorCut = bits, U32, 1416, [1:1] +lambdaTimeSinceGood = scalar, U16, 1420, "sec", 0.01, 0 +; total TS size = 1424 time = { timeNow } @@ -5173,8 +5175,9 @@ entry = m_hasSynchronizedPhase, "sync: Known Engine Phase", int, "%d" entry = wallFuelCorrection, "fuel wallwetting injection time", float, "%.3f" entry = wallFuel, "Fuel on the wall", float, "%.3f" entry = idleState, "idleState", int, "%d" -entry = currentIdlePosition, "idle: current position", float, "%.3f" +entry = currentIdlePosition, "Idle: Position", float, "%.3f" entry = baseIdlePosition, "idle: base value", float, "%.3f" +entry = idleClosedLoop, "Idle: Closed loop", float, "%.3f" entry = iacByTpsTaper, "idle: iacByTpsTaper portion", float, "%.3f" entry = throttlePedalUpState, "idle: throttlePedalUpState", int, "%d" entry = mightResetPid, "idle: mightResetPid", int, "%d" @@ -5194,8 +5197,9 @@ entry = looksLikeCoasting, "looksLikeCoasting", int, "%d" entry = looksLikeCrankToIdle, "looksLikeCrankToIdle", int, "%d" entry = isIdleCoasting, "Idle: coasting", int, "%d" entry = isIdleClosedLoop, "Idle: Closed loop active", int, "%d" -entry = targetRpmByClt, "idle: target by CLT", int, "%d" -entry = targetRpmAcBump, "idle: A/C bump", int, "%d" +entry = idleTarget, "Idle: Target RPM", int, "%d" +entry = targetRpmByClt, "Idle: Target RPM base", int, "%d" +entry = targetRpmAcBump, "Idle: Target A/C bump", int, "%d" entry = iacByRpmTaper, "idle: iacByRpmTaper portion", float, "%.3f" entry = luaAdd, "idle: Lua Adder", float, "%.3f" entry = idlePosition, "ETB: idlePosition", float, "%.3f" @@ -6113,13 +6117,15 @@ dialog = idle_stateDialog, "idle_state" graphLine = idleState graphLine = currentIdlePosition graphLine = baseIdlePosition - graphLine = iacByTpsTaper + graphLine = idleClosedLoop liveGraph = idle_state_2_Graph, "Graph", South + graphLine = iacByTpsTaper graphLine = throttlePedalUpState + graphLine = idleTarget graphLine = targetRpmByClt + liveGraph = idle_state_3_Graph, "Graph", South graphLine = targetRpmAcBump graphLine = iacByRpmTaper - liveGraph = idle_state_3_Graph, "Graph", South graphLine = luaAdd indicatorPanel = electronic_throttleIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_s105.ini b/firmware/tunerstudio/generated/rusefi_s105.ini index 0339a45c7a..c67f501c03 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.09.28.s105.3938220327" + signature = "rusEFI master.2023.09.28.s105.553681887" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.09.28.s105.3938220327" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.09.28.s105.553681887" ; 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 Thu Sep 28 03:25:06 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Thu Sep 28 13:45:41 UTC 2023 pageSize = 23664 page = 1 @@ -2320,7 +2320,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23654, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1416 + ochBlockSize = 1424 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3039,69 +3039,71 @@ wallFuel = scalar, F32, 1276, "", 1, 0 idleState = bits, S32, 1280, [0:2], "not important" currentIdlePosition = scalar, F32, 1284 baseIdlePosition = scalar, F32, 1288 -iacByTpsTaper = scalar, F32, 1292 -throttlePedalUpState = scalar, S32, 1296, "", 1, 0 -mightResetPid = bits, U32, 1300, [0:0] -shouldResetPid = bits, U32, 1300, [1:1] -wasResetPid = bits, U32, 1300, [2:2] -mustResetPid = bits, U32, 1300, [3:3] -isCranking = bits, U32, 1300, [4:4] -isIacTableForCoasting = bits, U32, 1300, [5:5] -notIdling = bits, U32, 1300, [6:6] -needReset = bits, U32, 1300, [7:7] -isInDeadZone = bits, U32, 1300, [8:8] -isBlipping = bits, U32, 1300, [9:9] -useClosedLoop = bits, U32, 1300, [10:10] -badTps = bits, U32, 1300, [11:11] -looksLikeRunning = bits, U32, 1300, [12:12] -looksLikeCoasting = bits, U32, 1300, [13:13] -looksLikeCrankToIdle = bits, U32, 1300, [14:14] -isIdleCoasting = bits, U32, 1300, [15:15] -isIdleClosedLoop = bits, U32, 1300, [16:16] -targetRpmByClt = scalar, S32, 1304, "", 1, 0 -targetRpmAcBump = scalar, S32, 1308, "", 1, 0 -iacByRpmTaper = scalar, F32, 1312 -luaAdd = scalar, F32, 1316 -; total TS size = 1320 -idlePosition = scalar, F32, 1320, "per", 1,0 -trim = scalar, F32, 1324, "", 1, 0 -luaAdjustment = scalar, F32, 1328, "per", 1,0 -m_wastegatePosition = scalar, F32, 1332, "per", 1,0 -etbFeedForward = scalar, F32, 1336 -etbIntegralError = scalar, F32, 1340, "", 1, 0 -etbCurrentTarget = scalar, F32, 1344, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1348, "%", 1, 0 -etbRevLimitActive = bits, U32, 1352, [0:0] -jamDetected = bits, U32, 1352, [1:1] -etbDutyRateOfChange = scalar, F32, 1356, "per", 1,0 -etbDutyAverage = scalar, F32, 1360, "per", 1,0 -etbTpsErrorCounter = scalar, U16, 1364, "count", 1,0 -etbPpsErrorCounter = scalar, U16, 1366, "count", 1,0 -etbErrorCode = scalar, S08, 1368, "", 1, 0 -jamTimer = scalar, U16, 1370, "sec", 0.01, 0 -; total TS size = 1372 -faultCode = scalar, U08, 1372, "", 1, 0 -heaterDuty = scalar, U08, 1373, "%", 1, 0 -pumpDuty = scalar, U08, 1374, "%", 1, 0 -tempC = scalar, U16, 1376, "C", 1, 0 -nernstVoltage = scalar, U16, 1378, "V", 0.001, 0 -esr = scalar, U16, 1380, "ohm", 1, 0 -; total TS size = 1384 -dcOutput0 = scalar, F32, 1384, "per", 1,0 -isEnabled0_int = scalar, U08, 1388, "per", 1,0 -isEnabled0 = bits, U32, 1392, [0:0] -; total TS size = 1396 -value0 = scalar, U16, 1396, "value", 1,0 -value1 = scalar, U16, 1398, "value", 1,0 -errorRate = scalar, F32, 1400, "ratio", 1,0 +idleClosedLoop = scalar, F32, 1292 +iacByTpsTaper = scalar, F32, 1296 +throttlePedalUpState = scalar, S32, 1300, "", 1, 0 +mightResetPid = bits, U32, 1304, [0:0] +shouldResetPid = bits, U32, 1304, [1:1] +wasResetPid = bits, U32, 1304, [2:2] +mustResetPid = bits, U32, 1304, [3:3] +isCranking = bits, U32, 1304, [4:4] +isIacTableForCoasting = bits, U32, 1304, [5:5] +notIdling = bits, U32, 1304, [6:6] +needReset = bits, U32, 1304, [7:7] +isInDeadZone = bits, U32, 1304, [8:8] +isBlipping = bits, U32, 1304, [9:9] +useClosedLoop = bits, U32, 1304, [10:10] +badTps = bits, U32, 1304, [11:11] +looksLikeRunning = bits, U32, 1304, [12:12] +looksLikeCoasting = bits, U32, 1304, [13:13] +looksLikeCrankToIdle = bits, U32, 1304, [14:14] +isIdleCoasting = bits, U32, 1304, [15:15] +isIdleClosedLoop = bits, U32, 1304, [16:16] +idleTarget = scalar, S32, 1308, "", 1, 0 +targetRpmByClt = scalar, S32, 1312, "", 1, 0 +targetRpmAcBump = scalar, S32, 1316, "", 1, 0 +iacByRpmTaper = scalar, F32, 1320 +luaAdd = scalar, F32, 1324 +; total TS size = 1328 +idlePosition = scalar, F32, 1328, "per", 1,0 +trim = scalar, F32, 1332, "", 1, 0 +luaAdjustment = scalar, F32, 1336, "per", 1,0 +m_wastegatePosition = scalar, F32, 1340, "per", 1,0 +etbFeedForward = scalar, F32, 1344 +etbIntegralError = scalar, F32, 1348, "", 1, 0 +etbCurrentTarget = scalar, F32, 1352, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1356, "%", 1, 0 +etbRevLimitActive = bits, U32, 1360, [0:0] +jamDetected = bits, U32, 1360, [1:1] +etbDutyRateOfChange = scalar, F32, 1364, "per", 1,0 +etbDutyAverage = scalar, F32, 1368, "per", 1,0 +etbTpsErrorCounter = scalar, U16, 1372, "count", 1,0 +etbPpsErrorCounter = scalar, U16, 1374, "count", 1,0 +etbErrorCode = scalar, S08, 1376, "", 1, 0 +jamTimer = scalar, U16, 1378, "sec", 0.01, 0 +; total TS size = 1380 +faultCode = scalar, U08, 1380, "", 1, 0 +heaterDuty = scalar, U08, 1381, "%", 1, 0 +pumpDuty = scalar, U08, 1382, "%", 1, 0 +tempC = scalar, U16, 1384, "C", 1, 0 +nernstVoltage = scalar, U16, 1386, "V", 0.001, 0 +esr = scalar, U16, 1388, "ohm", 1, 0 +; total TS size = 1392 +dcOutput0 = scalar, F32, 1392, "per", 1,0 +isEnabled0_int = scalar, U08, 1396, "per", 1,0 +isEnabled0 = bits, U32, 1400, [0:0] ; total TS size = 1404 -vvtTarget = scalar, U16, 1404, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1406, "%", 0.5, 0 -; total TS size = 1408 -lambdaCurrentlyGood = bits, U32, 1408, [0:0] -lambdaMonitorCut = bits, U32, 1408, [1:1] -lambdaTimeSinceGood = scalar, U16, 1412, "sec", 0.01, 0 +value0 = scalar, U16, 1404, "value", 1,0 +value1 = scalar, U16, 1406, "value", 1,0 +errorRate = scalar, F32, 1408, "ratio", 1,0 +; total TS size = 1412 +vvtTarget = scalar, U16, 1412, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1414, "%", 0.5, 0 ; total TS size = 1416 +lambdaCurrentlyGood = bits, U32, 1416, [0:0] +lambdaMonitorCut = bits, U32, 1416, [1:1] +lambdaTimeSinceGood = scalar, U16, 1420, "sec", 0.01, 0 +; total TS size = 1424 time = { timeNow } @@ -5173,8 +5175,9 @@ entry = m_hasSynchronizedPhase, "sync: Known Engine Phase", int, "%d" entry = wallFuelCorrection, "fuel wallwetting injection time", float, "%.3f" entry = wallFuel, "Fuel on the wall", float, "%.3f" entry = idleState, "idleState", int, "%d" -entry = currentIdlePosition, "idle: current position", float, "%.3f" +entry = currentIdlePosition, "Idle: Position", float, "%.3f" entry = baseIdlePosition, "idle: base value", float, "%.3f" +entry = idleClosedLoop, "Idle: Closed loop", float, "%.3f" entry = iacByTpsTaper, "idle: iacByTpsTaper portion", float, "%.3f" entry = throttlePedalUpState, "idle: throttlePedalUpState", int, "%d" entry = mightResetPid, "idle: mightResetPid", int, "%d" @@ -5194,8 +5197,9 @@ entry = looksLikeCoasting, "looksLikeCoasting", int, "%d" entry = looksLikeCrankToIdle, "looksLikeCrankToIdle", int, "%d" entry = isIdleCoasting, "Idle: coasting", int, "%d" entry = isIdleClosedLoop, "Idle: Closed loop active", int, "%d" -entry = targetRpmByClt, "idle: target by CLT", int, "%d" -entry = targetRpmAcBump, "idle: A/C bump", int, "%d" +entry = idleTarget, "Idle: Target RPM", int, "%d" +entry = targetRpmByClt, "Idle: Target RPM base", int, "%d" +entry = targetRpmAcBump, "Idle: Target A/C bump", int, "%d" entry = iacByRpmTaper, "idle: iacByRpmTaper portion", float, "%.3f" entry = luaAdd, "idle: Lua Adder", float, "%.3f" entry = idlePosition, "ETB: idlePosition", float, "%.3f" @@ -6104,13 +6108,15 @@ dialog = idle_stateDialog, "idle_state" graphLine = idleState graphLine = currentIdlePosition graphLine = baseIdlePosition - graphLine = iacByTpsTaper + graphLine = idleClosedLoop liveGraph = idle_state_2_Graph, "Graph", South + graphLine = iacByTpsTaper graphLine = throttlePedalUpState + graphLine = idleTarget graphLine = targetRpmByClt + liveGraph = idle_state_3_Graph, "Graph", South graphLine = targetRpmAcBump graphLine = iacByRpmTaper - liveGraph = idle_state_3_Graph, "Graph", South graphLine = luaAdd indicatorPanel = electronic_throttleIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_small-can.ini b/firmware/tunerstudio/generated/rusefi_small-can.ini index a5e42ca360..6c7557f535 100644 --- a/firmware/tunerstudio/generated/rusefi_small-can.ini +++ b/firmware/tunerstudio/generated/rusefi_small-can.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.09.28.small-can.1139021554" + signature = "rusEFI master.2023.09.28.small-can.2287528970" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.09.28.small-can.1139021554" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.09.28.small-can.2287528970" ; 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 - Analog input","INVALID","INVALID","INVALID","A2 Battery Sense","INVALID","INVALID","INVALID","INVALID","INVALID","B2 - Analog input" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Thu Sep 28 03:24:49 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Thu Sep 28 13:45:23 UTC 2023 pageSize = 23664 page = 1 @@ -2320,7 +2320,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23654, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1416 + ochBlockSize = 1424 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3039,69 +3039,71 @@ wallFuel = scalar, F32, 1276, "", 1, 0 idleState = bits, S32, 1280, [0:2], "not important" currentIdlePosition = scalar, F32, 1284 baseIdlePosition = scalar, F32, 1288 -iacByTpsTaper = scalar, F32, 1292 -throttlePedalUpState = scalar, S32, 1296, "", 1, 0 -mightResetPid = bits, U32, 1300, [0:0] -shouldResetPid = bits, U32, 1300, [1:1] -wasResetPid = bits, U32, 1300, [2:2] -mustResetPid = bits, U32, 1300, [3:3] -isCranking = bits, U32, 1300, [4:4] -isIacTableForCoasting = bits, U32, 1300, [5:5] -notIdling = bits, U32, 1300, [6:6] -needReset = bits, U32, 1300, [7:7] -isInDeadZone = bits, U32, 1300, [8:8] -isBlipping = bits, U32, 1300, [9:9] -useClosedLoop = bits, U32, 1300, [10:10] -badTps = bits, U32, 1300, [11:11] -looksLikeRunning = bits, U32, 1300, [12:12] -looksLikeCoasting = bits, U32, 1300, [13:13] -looksLikeCrankToIdle = bits, U32, 1300, [14:14] -isIdleCoasting = bits, U32, 1300, [15:15] -isIdleClosedLoop = bits, U32, 1300, [16:16] -targetRpmByClt = scalar, S32, 1304, "", 1, 0 -targetRpmAcBump = scalar, S32, 1308, "", 1, 0 -iacByRpmTaper = scalar, F32, 1312 -luaAdd = scalar, F32, 1316 -; total TS size = 1320 -idlePosition = scalar, F32, 1320, "per", 1,0 -trim = scalar, F32, 1324, "", 1, 0 -luaAdjustment = scalar, F32, 1328, "per", 1,0 -m_wastegatePosition = scalar, F32, 1332, "per", 1,0 -etbFeedForward = scalar, F32, 1336 -etbIntegralError = scalar, F32, 1340, "", 1, 0 -etbCurrentTarget = scalar, F32, 1344, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1348, "%", 1, 0 -etbRevLimitActive = bits, U32, 1352, [0:0] -jamDetected = bits, U32, 1352, [1:1] -etbDutyRateOfChange = scalar, F32, 1356, "per", 1,0 -etbDutyAverage = scalar, F32, 1360, "per", 1,0 -etbTpsErrorCounter = scalar, U16, 1364, "count", 1,0 -etbPpsErrorCounter = scalar, U16, 1366, "count", 1,0 -etbErrorCode = scalar, S08, 1368, "", 1, 0 -jamTimer = scalar, U16, 1370, "sec", 0.01, 0 -; total TS size = 1372 -faultCode = scalar, U08, 1372, "", 1, 0 -heaterDuty = scalar, U08, 1373, "%", 1, 0 -pumpDuty = scalar, U08, 1374, "%", 1, 0 -tempC = scalar, U16, 1376, "C", 1, 0 -nernstVoltage = scalar, U16, 1378, "V", 0.001, 0 -esr = scalar, U16, 1380, "ohm", 1, 0 -; total TS size = 1384 -dcOutput0 = scalar, F32, 1384, "per", 1,0 -isEnabled0_int = scalar, U08, 1388, "per", 1,0 -isEnabled0 = bits, U32, 1392, [0:0] -; total TS size = 1396 -value0 = scalar, U16, 1396, "value", 1,0 -value1 = scalar, U16, 1398, "value", 1,0 -errorRate = scalar, F32, 1400, "ratio", 1,0 +idleClosedLoop = scalar, F32, 1292 +iacByTpsTaper = scalar, F32, 1296 +throttlePedalUpState = scalar, S32, 1300, "", 1, 0 +mightResetPid = bits, U32, 1304, [0:0] +shouldResetPid = bits, U32, 1304, [1:1] +wasResetPid = bits, U32, 1304, [2:2] +mustResetPid = bits, U32, 1304, [3:3] +isCranking = bits, U32, 1304, [4:4] +isIacTableForCoasting = bits, U32, 1304, [5:5] +notIdling = bits, U32, 1304, [6:6] +needReset = bits, U32, 1304, [7:7] +isInDeadZone = bits, U32, 1304, [8:8] +isBlipping = bits, U32, 1304, [9:9] +useClosedLoop = bits, U32, 1304, [10:10] +badTps = bits, U32, 1304, [11:11] +looksLikeRunning = bits, U32, 1304, [12:12] +looksLikeCoasting = bits, U32, 1304, [13:13] +looksLikeCrankToIdle = bits, U32, 1304, [14:14] +isIdleCoasting = bits, U32, 1304, [15:15] +isIdleClosedLoop = bits, U32, 1304, [16:16] +idleTarget = scalar, S32, 1308, "", 1, 0 +targetRpmByClt = scalar, S32, 1312, "", 1, 0 +targetRpmAcBump = scalar, S32, 1316, "", 1, 0 +iacByRpmTaper = scalar, F32, 1320 +luaAdd = scalar, F32, 1324 +; total TS size = 1328 +idlePosition = scalar, F32, 1328, "per", 1,0 +trim = scalar, F32, 1332, "", 1, 0 +luaAdjustment = scalar, F32, 1336, "per", 1,0 +m_wastegatePosition = scalar, F32, 1340, "per", 1,0 +etbFeedForward = scalar, F32, 1344 +etbIntegralError = scalar, F32, 1348, "", 1, 0 +etbCurrentTarget = scalar, F32, 1352, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1356, "%", 1, 0 +etbRevLimitActive = bits, U32, 1360, [0:0] +jamDetected = bits, U32, 1360, [1:1] +etbDutyRateOfChange = scalar, F32, 1364, "per", 1,0 +etbDutyAverage = scalar, F32, 1368, "per", 1,0 +etbTpsErrorCounter = scalar, U16, 1372, "count", 1,0 +etbPpsErrorCounter = scalar, U16, 1374, "count", 1,0 +etbErrorCode = scalar, S08, 1376, "", 1, 0 +jamTimer = scalar, U16, 1378, "sec", 0.01, 0 +; total TS size = 1380 +faultCode = scalar, U08, 1380, "", 1, 0 +heaterDuty = scalar, U08, 1381, "%", 1, 0 +pumpDuty = scalar, U08, 1382, "%", 1, 0 +tempC = scalar, U16, 1384, "C", 1, 0 +nernstVoltage = scalar, U16, 1386, "V", 0.001, 0 +esr = scalar, U16, 1388, "ohm", 1, 0 +; total TS size = 1392 +dcOutput0 = scalar, F32, 1392, "per", 1,0 +isEnabled0_int = scalar, U08, 1396, "per", 1,0 +isEnabled0 = bits, U32, 1400, [0:0] ; total TS size = 1404 -vvtTarget = scalar, U16, 1404, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1406, "%", 0.5, 0 -; total TS size = 1408 -lambdaCurrentlyGood = bits, U32, 1408, [0:0] -lambdaMonitorCut = bits, U32, 1408, [1:1] -lambdaTimeSinceGood = scalar, U16, 1412, "sec", 0.01, 0 +value0 = scalar, U16, 1404, "value", 1,0 +value1 = scalar, U16, 1406, "value", 1,0 +errorRate = scalar, F32, 1408, "ratio", 1,0 +; total TS size = 1412 +vvtTarget = scalar, U16, 1412, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1414, "%", 0.5, 0 ; total TS size = 1416 +lambdaCurrentlyGood = bits, U32, 1416, [0:0] +lambdaMonitorCut = bits, U32, 1416, [1:1] +lambdaTimeSinceGood = scalar, U16, 1420, "sec", 0.01, 0 +; total TS size = 1424 time = { timeNow } @@ -5173,8 +5175,9 @@ entry = m_hasSynchronizedPhase, "sync: Known Engine Phase", int, "%d" entry = wallFuelCorrection, "fuel wallwetting injection time", float, "%.3f" entry = wallFuel, "Fuel on the wall", float, "%.3f" entry = idleState, "idleState", int, "%d" -entry = currentIdlePosition, "idle: current position", float, "%.3f" +entry = currentIdlePosition, "Idle: Position", float, "%.3f" entry = baseIdlePosition, "idle: base value", float, "%.3f" +entry = idleClosedLoop, "Idle: Closed loop", float, "%.3f" entry = iacByTpsTaper, "idle: iacByTpsTaper portion", float, "%.3f" entry = throttlePedalUpState, "idle: throttlePedalUpState", int, "%d" entry = mightResetPid, "idle: mightResetPid", int, "%d" @@ -5194,8 +5197,9 @@ entry = looksLikeCoasting, "looksLikeCoasting", int, "%d" entry = looksLikeCrankToIdle, "looksLikeCrankToIdle", int, "%d" entry = isIdleCoasting, "Idle: coasting", int, "%d" entry = isIdleClosedLoop, "Idle: Closed loop active", int, "%d" -entry = targetRpmByClt, "idle: target by CLT", int, "%d" -entry = targetRpmAcBump, "idle: A/C bump", int, "%d" +entry = idleTarget, "Idle: Target RPM", int, "%d" +entry = targetRpmByClt, "Idle: Target RPM base", int, "%d" +entry = targetRpmAcBump, "Idle: Target A/C bump", int, "%d" entry = iacByRpmTaper, "idle: iacByRpmTaper portion", float, "%.3f" entry = luaAdd, "idle: Lua Adder", float, "%.3f" entry = idlePosition, "ETB: idlePosition", float, "%.3f" @@ -6103,13 +6107,15 @@ dialog = idle_stateDialog, "idle_state" graphLine = idleState graphLine = currentIdlePosition graphLine = baseIdlePosition - graphLine = iacByTpsTaper + graphLine = idleClosedLoop liveGraph = idle_state_2_Graph, "Graph", South + graphLine = iacByTpsTaper graphLine = throttlePedalUpState + graphLine = idleTarget graphLine = targetRpmByClt + liveGraph = idle_state_3_Graph, "Graph", South graphLine = targetRpmAcBump graphLine = iacByRpmTaper - liveGraph = idle_state_3_Graph, "Graph", South graphLine = luaAdd indicatorPanel = electronic_throttleIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini b/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini index 68c43e549c..f5e310d26d 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.09.28.subaru_eg33_f7.2305448812" + signature = "rusEFI master.2023.09.28.subaru_eg33_f7.1121362324" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.09.28.subaru_eg33_f7.2305448812" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.09.28.subaru_eg33_f7.1121362324" ; 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 Thu Sep 28 03:23:46 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Thu Sep 28 13:44:19 UTC 2023 pageSize = 23664 page = 1 @@ -2320,7 +2320,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23654, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1416 + ochBlockSize = 1424 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3039,69 +3039,71 @@ wallFuel = scalar, F32, 1276, "", 1, 0 idleState = bits, S32, 1280, [0:2], "not important" currentIdlePosition = scalar, F32, 1284 baseIdlePosition = scalar, F32, 1288 -iacByTpsTaper = scalar, F32, 1292 -throttlePedalUpState = scalar, S32, 1296, "", 1, 0 -mightResetPid = bits, U32, 1300, [0:0] -shouldResetPid = bits, U32, 1300, [1:1] -wasResetPid = bits, U32, 1300, [2:2] -mustResetPid = bits, U32, 1300, [3:3] -isCranking = bits, U32, 1300, [4:4] -isIacTableForCoasting = bits, U32, 1300, [5:5] -notIdling = bits, U32, 1300, [6:6] -needReset = bits, U32, 1300, [7:7] -isInDeadZone = bits, U32, 1300, [8:8] -isBlipping = bits, U32, 1300, [9:9] -useClosedLoop = bits, U32, 1300, [10:10] -badTps = bits, U32, 1300, [11:11] -looksLikeRunning = bits, U32, 1300, [12:12] -looksLikeCoasting = bits, U32, 1300, [13:13] -looksLikeCrankToIdle = bits, U32, 1300, [14:14] -isIdleCoasting = bits, U32, 1300, [15:15] -isIdleClosedLoop = bits, U32, 1300, [16:16] -targetRpmByClt = scalar, S32, 1304, "", 1, 0 -targetRpmAcBump = scalar, S32, 1308, "", 1, 0 -iacByRpmTaper = scalar, F32, 1312 -luaAdd = scalar, F32, 1316 -; total TS size = 1320 -idlePosition = scalar, F32, 1320, "per", 1,0 -trim = scalar, F32, 1324, "", 1, 0 -luaAdjustment = scalar, F32, 1328, "per", 1,0 -m_wastegatePosition = scalar, F32, 1332, "per", 1,0 -etbFeedForward = scalar, F32, 1336 -etbIntegralError = scalar, F32, 1340, "", 1, 0 -etbCurrentTarget = scalar, F32, 1344, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1348, "%", 1, 0 -etbRevLimitActive = bits, U32, 1352, [0:0] -jamDetected = bits, U32, 1352, [1:1] -etbDutyRateOfChange = scalar, F32, 1356, "per", 1,0 -etbDutyAverage = scalar, F32, 1360, "per", 1,0 -etbTpsErrorCounter = scalar, U16, 1364, "count", 1,0 -etbPpsErrorCounter = scalar, U16, 1366, "count", 1,0 -etbErrorCode = scalar, S08, 1368, "", 1, 0 -jamTimer = scalar, U16, 1370, "sec", 0.01, 0 -; total TS size = 1372 -faultCode = scalar, U08, 1372, "", 1, 0 -heaterDuty = scalar, U08, 1373, "%", 1, 0 -pumpDuty = scalar, U08, 1374, "%", 1, 0 -tempC = scalar, U16, 1376, "C", 1, 0 -nernstVoltage = scalar, U16, 1378, "V", 0.001, 0 -esr = scalar, U16, 1380, "ohm", 1, 0 -; total TS size = 1384 -dcOutput0 = scalar, F32, 1384, "per", 1,0 -isEnabled0_int = scalar, U08, 1388, "per", 1,0 -isEnabled0 = bits, U32, 1392, [0:0] -; total TS size = 1396 -value0 = scalar, U16, 1396, "value", 1,0 -value1 = scalar, U16, 1398, "value", 1,0 -errorRate = scalar, F32, 1400, "ratio", 1,0 +idleClosedLoop = scalar, F32, 1292 +iacByTpsTaper = scalar, F32, 1296 +throttlePedalUpState = scalar, S32, 1300, "", 1, 0 +mightResetPid = bits, U32, 1304, [0:0] +shouldResetPid = bits, U32, 1304, [1:1] +wasResetPid = bits, U32, 1304, [2:2] +mustResetPid = bits, U32, 1304, [3:3] +isCranking = bits, U32, 1304, [4:4] +isIacTableForCoasting = bits, U32, 1304, [5:5] +notIdling = bits, U32, 1304, [6:6] +needReset = bits, U32, 1304, [7:7] +isInDeadZone = bits, U32, 1304, [8:8] +isBlipping = bits, U32, 1304, [9:9] +useClosedLoop = bits, U32, 1304, [10:10] +badTps = bits, U32, 1304, [11:11] +looksLikeRunning = bits, U32, 1304, [12:12] +looksLikeCoasting = bits, U32, 1304, [13:13] +looksLikeCrankToIdle = bits, U32, 1304, [14:14] +isIdleCoasting = bits, U32, 1304, [15:15] +isIdleClosedLoop = bits, U32, 1304, [16:16] +idleTarget = scalar, S32, 1308, "", 1, 0 +targetRpmByClt = scalar, S32, 1312, "", 1, 0 +targetRpmAcBump = scalar, S32, 1316, "", 1, 0 +iacByRpmTaper = scalar, F32, 1320 +luaAdd = scalar, F32, 1324 +; total TS size = 1328 +idlePosition = scalar, F32, 1328, "per", 1,0 +trim = scalar, F32, 1332, "", 1, 0 +luaAdjustment = scalar, F32, 1336, "per", 1,0 +m_wastegatePosition = scalar, F32, 1340, "per", 1,0 +etbFeedForward = scalar, F32, 1344 +etbIntegralError = scalar, F32, 1348, "", 1, 0 +etbCurrentTarget = scalar, F32, 1352, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1356, "%", 1, 0 +etbRevLimitActive = bits, U32, 1360, [0:0] +jamDetected = bits, U32, 1360, [1:1] +etbDutyRateOfChange = scalar, F32, 1364, "per", 1,0 +etbDutyAverage = scalar, F32, 1368, "per", 1,0 +etbTpsErrorCounter = scalar, U16, 1372, "count", 1,0 +etbPpsErrorCounter = scalar, U16, 1374, "count", 1,0 +etbErrorCode = scalar, S08, 1376, "", 1, 0 +jamTimer = scalar, U16, 1378, "sec", 0.01, 0 +; total TS size = 1380 +faultCode = scalar, U08, 1380, "", 1, 0 +heaterDuty = scalar, U08, 1381, "%", 1, 0 +pumpDuty = scalar, U08, 1382, "%", 1, 0 +tempC = scalar, U16, 1384, "C", 1, 0 +nernstVoltage = scalar, U16, 1386, "V", 0.001, 0 +esr = scalar, U16, 1388, "ohm", 1, 0 +; total TS size = 1392 +dcOutput0 = scalar, F32, 1392, "per", 1,0 +isEnabled0_int = scalar, U08, 1396, "per", 1,0 +isEnabled0 = bits, U32, 1400, [0:0] ; total TS size = 1404 -vvtTarget = scalar, U16, 1404, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1406, "%", 0.5, 0 -; total TS size = 1408 -lambdaCurrentlyGood = bits, U32, 1408, [0:0] -lambdaMonitorCut = bits, U32, 1408, [1:1] -lambdaTimeSinceGood = scalar, U16, 1412, "sec", 0.01, 0 +value0 = scalar, U16, 1404, "value", 1,0 +value1 = scalar, U16, 1406, "value", 1,0 +errorRate = scalar, F32, 1408, "ratio", 1,0 +; total TS size = 1412 +vvtTarget = scalar, U16, 1412, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1414, "%", 0.5, 0 ; total TS size = 1416 +lambdaCurrentlyGood = bits, U32, 1416, [0:0] +lambdaMonitorCut = bits, U32, 1416, [1:1] +lambdaTimeSinceGood = scalar, U16, 1420, "sec", 0.01, 0 +; total TS size = 1424 time = { timeNow } @@ -5173,8 +5175,9 @@ entry = m_hasSynchronizedPhase, "sync: Known Engine Phase", int, "%d" entry = wallFuelCorrection, "fuel wallwetting injection time", float, "%.3f" entry = wallFuel, "Fuel on the wall", float, "%.3f" entry = idleState, "idleState", int, "%d" -entry = currentIdlePosition, "idle: current position", float, "%.3f" +entry = currentIdlePosition, "Idle: Position", float, "%.3f" entry = baseIdlePosition, "idle: base value", float, "%.3f" +entry = idleClosedLoop, "Idle: Closed loop", float, "%.3f" entry = iacByTpsTaper, "idle: iacByTpsTaper portion", float, "%.3f" entry = throttlePedalUpState, "idle: throttlePedalUpState", int, "%d" entry = mightResetPid, "idle: mightResetPid", int, "%d" @@ -5194,8 +5197,9 @@ entry = looksLikeCoasting, "looksLikeCoasting", int, "%d" entry = looksLikeCrankToIdle, "looksLikeCrankToIdle", int, "%d" entry = isIdleCoasting, "Idle: coasting", int, "%d" entry = isIdleClosedLoop, "Idle: Closed loop active", int, "%d" -entry = targetRpmByClt, "idle: target by CLT", int, "%d" -entry = targetRpmAcBump, "idle: A/C bump", int, "%d" +entry = idleTarget, "Idle: Target RPM", int, "%d" +entry = targetRpmByClt, "Idle: Target RPM base", int, "%d" +entry = targetRpmAcBump, "Idle: Target A/C bump", int, "%d" entry = iacByRpmTaper, "idle: iacByRpmTaper portion", float, "%.3f" entry = luaAdd, "idle: Lua Adder", float, "%.3f" entry = idlePosition, "ETB: idlePosition", float, "%.3f" @@ -6103,13 +6107,15 @@ dialog = idle_stateDialog, "idle_state" graphLine = idleState graphLine = currentIdlePosition graphLine = baseIdlePosition - graphLine = iacByTpsTaper + graphLine = idleClosedLoop liveGraph = idle_state_2_Graph, "Graph", South + graphLine = iacByTpsTaper graphLine = throttlePedalUpState + graphLine = idleTarget graphLine = targetRpmByClt + liveGraph = idle_state_3_Graph, "Graph", South graphLine = targetRpmAcBump graphLine = iacByRpmTaper - liveGraph = idle_state_3_Graph, "Graph", South graphLine = luaAdd indicatorPanel = electronic_throttleIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_t-b-g.ini b/firmware/tunerstudio/generated/rusefi_t-b-g.ini index cb92d23fb5..fd5f74dfeb 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.09.28.t-b-g.2397543547" + signature = "rusEFI master.2023.09.28.t-b-g.1163617923" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.09.28.t-b-g.2397543547" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.09.28.t-b-g.1163617923" ; 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 Thu Sep 28 03:25:09 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Thu Sep 28 13:45:44 UTC 2023 pageSize = 23664 page = 1 @@ -2320,7 +2320,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23654, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1416 + ochBlockSize = 1424 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3039,69 +3039,71 @@ wallFuel = scalar, F32, 1276, "", 1, 0 idleState = bits, S32, 1280, [0:2], "not important" currentIdlePosition = scalar, F32, 1284 baseIdlePosition = scalar, F32, 1288 -iacByTpsTaper = scalar, F32, 1292 -throttlePedalUpState = scalar, S32, 1296, "", 1, 0 -mightResetPid = bits, U32, 1300, [0:0] -shouldResetPid = bits, U32, 1300, [1:1] -wasResetPid = bits, U32, 1300, [2:2] -mustResetPid = bits, U32, 1300, [3:3] -isCranking = bits, U32, 1300, [4:4] -isIacTableForCoasting = bits, U32, 1300, [5:5] -notIdling = bits, U32, 1300, [6:6] -needReset = bits, U32, 1300, [7:7] -isInDeadZone = bits, U32, 1300, [8:8] -isBlipping = bits, U32, 1300, [9:9] -useClosedLoop = bits, U32, 1300, [10:10] -badTps = bits, U32, 1300, [11:11] -looksLikeRunning = bits, U32, 1300, [12:12] -looksLikeCoasting = bits, U32, 1300, [13:13] -looksLikeCrankToIdle = bits, U32, 1300, [14:14] -isIdleCoasting = bits, U32, 1300, [15:15] -isIdleClosedLoop = bits, U32, 1300, [16:16] -targetRpmByClt = scalar, S32, 1304, "", 1, 0 -targetRpmAcBump = scalar, S32, 1308, "", 1, 0 -iacByRpmTaper = scalar, F32, 1312 -luaAdd = scalar, F32, 1316 -; total TS size = 1320 -idlePosition = scalar, F32, 1320, "per", 1,0 -trim = scalar, F32, 1324, "", 1, 0 -luaAdjustment = scalar, F32, 1328, "per", 1,0 -m_wastegatePosition = scalar, F32, 1332, "per", 1,0 -etbFeedForward = scalar, F32, 1336 -etbIntegralError = scalar, F32, 1340, "", 1, 0 -etbCurrentTarget = scalar, F32, 1344, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1348, "%", 1, 0 -etbRevLimitActive = bits, U32, 1352, [0:0] -jamDetected = bits, U32, 1352, [1:1] -etbDutyRateOfChange = scalar, F32, 1356, "per", 1,0 -etbDutyAverage = scalar, F32, 1360, "per", 1,0 -etbTpsErrorCounter = scalar, U16, 1364, "count", 1,0 -etbPpsErrorCounter = scalar, U16, 1366, "count", 1,0 -etbErrorCode = scalar, S08, 1368, "", 1, 0 -jamTimer = scalar, U16, 1370, "sec", 0.01, 0 -; total TS size = 1372 -faultCode = scalar, U08, 1372, "", 1, 0 -heaterDuty = scalar, U08, 1373, "%", 1, 0 -pumpDuty = scalar, U08, 1374, "%", 1, 0 -tempC = scalar, U16, 1376, "C", 1, 0 -nernstVoltage = scalar, U16, 1378, "V", 0.001, 0 -esr = scalar, U16, 1380, "ohm", 1, 0 -; total TS size = 1384 -dcOutput0 = scalar, F32, 1384, "per", 1,0 -isEnabled0_int = scalar, U08, 1388, "per", 1,0 -isEnabled0 = bits, U32, 1392, [0:0] -; total TS size = 1396 -value0 = scalar, U16, 1396, "value", 1,0 -value1 = scalar, U16, 1398, "value", 1,0 -errorRate = scalar, F32, 1400, "ratio", 1,0 +idleClosedLoop = scalar, F32, 1292 +iacByTpsTaper = scalar, F32, 1296 +throttlePedalUpState = scalar, S32, 1300, "", 1, 0 +mightResetPid = bits, U32, 1304, [0:0] +shouldResetPid = bits, U32, 1304, [1:1] +wasResetPid = bits, U32, 1304, [2:2] +mustResetPid = bits, U32, 1304, [3:3] +isCranking = bits, U32, 1304, [4:4] +isIacTableForCoasting = bits, U32, 1304, [5:5] +notIdling = bits, U32, 1304, [6:6] +needReset = bits, U32, 1304, [7:7] +isInDeadZone = bits, U32, 1304, [8:8] +isBlipping = bits, U32, 1304, [9:9] +useClosedLoop = bits, U32, 1304, [10:10] +badTps = bits, U32, 1304, [11:11] +looksLikeRunning = bits, U32, 1304, [12:12] +looksLikeCoasting = bits, U32, 1304, [13:13] +looksLikeCrankToIdle = bits, U32, 1304, [14:14] +isIdleCoasting = bits, U32, 1304, [15:15] +isIdleClosedLoop = bits, U32, 1304, [16:16] +idleTarget = scalar, S32, 1308, "", 1, 0 +targetRpmByClt = scalar, S32, 1312, "", 1, 0 +targetRpmAcBump = scalar, S32, 1316, "", 1, 0 +iacByRpmTaper = scalar, F32, 1320 +luaAdd = scalar, F32, 1324 +; total TS size = 1328 +idlePosition = scalar, F32, 1328, "per", 1,0 +trim = scalar, F32, 1332, "", 1, 0 +luaAdjustment = scalar, F32, 1336, "per", 1,0 +m_wastegatePosition = scalar, F32, 1340, "per", 1,0 +etbFeedForward = scalar, F32, 1344 +etbIntegralError = scalar, F32, 1348, "", 1, 0 +etbCurrentTarget = scalar, F32, 1352, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1356, "%", 1, 0 +etbRevLimitActive = bits, U32, 1360, [0:0] +jamDetected = bits, U32, 1360, [1:1] +etbDutyRateOfChange = scalar, F32, 1364, "per", 1,0 +etbDutyAverage = scalar, F32, 1368, "per", 1,0 +etbTpsErrorCounter = scalar, U16, 1372, "count", 1,0 +etbPpsErrorCounter = scalar, U16, 1374, "count", 1,0 +etbErrorCode = scalar, S08, 1376, "", 1, 0 +jamTimer = scalar, U16, 1378, "sec", 0.01, 0 +; total TS size = 1380 +faultCode = scalar, U08, 1380, "", 1, 0 +heaterDuty = scalar, U08, 1381, "%", 1, 0 +pumpDuty = scalar, U08, 1382, "%", 1, 0 +tempC = scalar, U16, 1384, "C", 1, 0 +nernstVoltage = scalar, U16, 1386, "V", 0.001, 0 +esr = scalar, U16, 1388, "ohm", 1, 0 +; total TS size = 1392 +dcOutput0 = scalar, F32, 1392, "per", 1,0 +isEnabled0_int = scalar, U08, 1396, "per", 1,0 +isEnabled0 = bits, U32, 1400, [0:0] ; total TS size = 1404 -vvtTarget = scalar, U16, 1404, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1406, "%", 0.5, 0 -; total TS size = 1408 -lambdaCurrentlyGood = bits, U32, 1408, [0:0] -lambdaMonitorCut = bits, U32, 1408, [1:1] -lambdaTimeSinceGood = scalar, U16, 1412, "sec", 0.01, 0 +value0 = scalar, U16, 1404, "value", 1,0 +value1 = scalar, U16, 1406, "value", 1,0 +errorRate = scalar, F32, 1408, "ratio", 1,0 +; total TS size = 1412 +vvtTarget = scalar, U16, 1412, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1414, "%", 0.5, 0 ; total TS size = 1416 +lambdaCurrentlyGood = bits, U32, 1416, [0:0] +lambdaMonitorCut = bits, U32, 1416, [1:1] +lambdaTimeSinceGood = scalar, U16, 1420, "sec", 0.01, 0 +; total TS size = 1424 time = { timeNow } @@ -5173,8 +5175,9 @@ entry = m_hasSynchronizedPhase, "sync: Known Engine Phase", int, "%d" entry = wallFuelCorrection, "fuel wallwetting injection time", float, "%.3f" entry = wallFuel, "Fuel on the wall", float, "%.3f" entry = idleState, "idleState", int, "%d" -entry = currentIdlePosition, "idle: current position", float, "%.3f" +entry = currentIdlePosition, "Idle: Position", float, "%.3f" entry = baseIdlePosition, "idle: base value", float, "%.3f" +entry = idleClosedLoop, "Idle: Closed loop", float, "%.3f" entry = iacByTpsTaper, "idle: iacByTpsTaper portion", float, "%.3f" entry = throttlePedalUpState, "idle: throttlePedalUpState", int, "%d" entry = mightResetPid, "idle: mightResetPid", int, "%d" @@ -5194,8 +5197,9 @@ entry = looksLikeCoasting, "looksLikeCoasting", int, "%d" entry = looksLikeCrankToIdle, "looksLikeCrankToIdle", int, "%d" entry = isIdleCoasting, "Idle: coasting", int, "%d" entry = isIdleClosedLoop, "Idle: Closed loop active", int, "%d" -entry = targetRpmByClt, "idle: target by CLT", int, "%d" -entry = targetRpmAcBump, "idle: A/C bump", int, "%d" +entry = idleTarget, "Idle: Target RPM", int, "%d" +entry = targetRpmByClt, "Idle: Target RPM base", int, "%d" +entry = targetRpmAcBump, "Idle: Target A/C bump", int, "%d" entry = iacByRpmTaper, "idle: iacByRpmTaper portion", float, "%.3f" entry = luaAdd, "idle: Lua Adder", float, "%.3f" entry = idlePosition, "ETB: idlePosition", float, "%.3f" @@ -6103,13 +6107,15 @@ dialog = idle_stateDialog, "idle_state" graphLine = idleState graphLine = currentIdlePosition graphLine = baseIdlePosition - graphLine = iacByTpsTaper + graphLine = idleClosedLoop liveGraph = idle_state_2_Graph, "Graph", South + graphLine = iacByTpsTaper graphLine = throttlePedalUpState + graphLine = idleTarget graphLine = targetRpmByClt + liveGraph = idle_state_3_Graph, "Graph", South graphLine = targetRpmAcBump graphLine = iacByRpmTaper - liveGraph = idle_state_3_Graph, "Graph", South graphLine = luaAdd indicatorPanel = electronic_throttleIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini b/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini index b473171994..ca90c1360a 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.09.28.tdg-pdm8.71938137" + signature = "rusEFI master.2023.09.28.tdg-pdm8.3488959137" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.09.28.tdg-pdm8.71938137" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.09.28.tdg-pdm8.3488959137" ; 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 Thu Sep 28 03:25:43 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Thu Sep 28 13:46:19 UTC 2023 pageSize = 23664 page = 1 @@ -2320,7 +2320,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23654, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1416 + ochBlockSize = 1424 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3039,69 +3039,71 @@ wallFuel = scalar, F32, 1276, "", 1, 0 idleState = bits, S32, 1280, [0:2], "not important" currentIdlePosition = scalar, F32, 1284 baseIdlePosition = scalar, F32, 1288 -iacByTpsTaper = scalar, F32, 1292 -throttlePedalUpState = scalar, S32, 1296, "", 1, 0 -mightResetPid = bits, U32, 1300, [0:0] -shouldResetPid = bits, U32, 1300, [1:1] -wasResetPid = bits, U32, 1300, [2:2] -mustResetPid = bits, U32, 1300, [3:3] -isCranking = bits, U32, 1300, [4:4] -isIacTableForCoasting = bits, U32, 1300, [5:5] -notIdling = bits, U32, 1300, [6:6] -needReset = bits, U32, 1300, [7:7] -isInDeadZone = bits, U32, 1300, [8:8] -isBlipping = bits, U32, 1300, [9:9] -useClosedLoop = bits, U32, 1300, [10:10] -badTps = bits, U32, 1300, [11:11] -looksLikeRunning = bits, U32, 1300, [12:12] -looksLikeCoasting = bits, U32, 1300, [13:13] -looksLikeCrankToIdle = bits, U32, 1300, [14:14] -isIdleCoasting = bits, U32, 1300, [15:15] -isIdleClosedLoop = bits, U32, 1300, [16:16] -targetRpmByClt = scalar, S32, 1304, "", 1, 0 -targetRpmAcBump = scalar, S32, 1308, "", 1, 0 -iacByRpmTaper = scalar, F32, 1312 -luaAdd = scalar, F32, 1316 -; total TS size = 1320 -idlePosition = scalar, F32, 1320, "per", 1,0 -trim = scalar, F32, 1324, "", 1, 0 -luaAdjustment = scalar, F32, 1328, "per", 1,0 -m_wastegatePosition = scalar, F32, 1332, "per", 1,0 -etbFeedForward = scalar, F32, 1336 -etbIntegralError = scalar, F32, 1340, "", 1, 0 -etbCurrentTarget = scalar, F32, 1344, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1348, "%", 1, 0 -etbRevLimitActive = bits, U32, 1352, [0:0] -jamDetected = bits, U32, 1352, [1:1] -etbDutyRateOfChange = scalar, F32, 1356, "per", 1,0 -etbDutyAverage = scalar, F32, 1360, "per", 1,0 -etbTpsErrorCounter = scalar, U16, 1364, "count", 1,0 -etbPpsErrorCounter = scalar, U16, 1366, "count", 1,0 -etbErrorCode = scalar, S08, 1368, "", 1, 0 -jamTimer = scalar, U16, 1370, "sec", 0.01, 0 -; total TS size = 1372 -faultCode = scalar, U08, 1372, "", 1, 0 -heaterDuty = scalar, U08, 1373, "%", 1, 0 -pumpDuty = scalar, U08, 1374, "%", 1, 0 -tempC = scalar, U16, 1376, "C", 1, 0 -nernstVoltage = scalar, U16, 1378, "V", 0.001, 0 -esr = scalar, U16, 1380, "ohm", 1, 0 -; total TS size = 1384 -dcOutput0 = scalar, F32, 1384, "per", 1,0 -isEnabled0_int = scalar, U08, 1388, "per", 1,0 -isEnabled0 = bits, U32, 1392, [0:0] -; total TS size = 1396 -value0 = scalar, U16, 1396, "value", 1,0 -value1 = scalar, U16, 1398, "value", 1,0 -errorRate = scalar, F32, 1400, "ratio", 1,0 +idleClosedLoop = scalar, F32, 1292 +iacByTpsTaper = scalar, F32, 1296 +throttlePedalUpState = scalar, S32, 1300, "", 1, 0 +mightResetPid = bits, U32, 1304, [0:0] +shouldResetPid = bits, U32, 1304, [1:1] +wasResetPid = bits, U32, 1304, [2:2] +mustResetPid = bits, U32, 1304, [3:3] +isCranking = bits, U32, 1304, [4:4] +isIacTableForCoasting = bits, U32, 1304, [5:5] +notIdling = bits, U32, 1304, [6:6] +needReset = bits, U32, 1304, [7:7] +isInDeadZone = bits, U32, 1304, [8:8] +isBlipping = bits, U32, 1304, [9:9] +useClosedLoop = bits, U32, 1304, [10:10] +badTps = bits, U32, 1304, [11:11] +looksLikeRunning = bits, U32, 1304, [12:12] +looksLikeCoasting = bits, U32, 1304, [13:13] +looksLikeCrankToIdle = bits, U32, 1304, [14:14] +isIdleCoasting = bits, U32, 1304, [15:15] +isIdleClosedLoop = bits, U32, 1304, [16:16] +idleTarget = scalar, S32, 1308, "", 1, 0 +targetRpmByClt = scalar, S32, 1312, "", 1, 0 +targetRpmAcBump = scalar, S32, 1316, "", 1, 0 +iacByRpmTaper = scalar, F32, 1320 +luaAdd = scalar, F32, 1324 +; total TS size = 1328 +idlePosition = scalar, F32, 1328, "per", 1,0 +trim = scalar, F32, 1332, "", 1, 0 +luaAdjustment = scalar, F32, 1336, "per", 1,0 +m_wastegatePosition = scalar, F32, 1340, "per", 1,0 +etbFeedForward = scalar, F32, 1344 +etbIntegralError = scalar, F32, 1348, "", 1, 0 +etbCurrentTarget = scalar, F32, 1352, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1356, "%", 1, 0 +etbRevLimitActive = bits, U32, 1360, [0:0] +jamDetected = bits, U32, 1360, [1:1] +etbDutyRateOfChange = scalar, F32, 1364, "per", 1,0 +etbDutyAverage = scalar, F32, 1368, "per", 1,0 +etbTpsErrorCounter = scalar, U16, 1372, "count", 1,0 +etbPpsErrorCounter = scalar, U16, 1374, "count", 1,0 +etbErrorCode = scalar, S08, 1376, "", 1, 0 +jamTimer = scalar, U16, 1378, "sec", 0.01, 0 +; total TS size = 1380 +faultCode = scalar, U08, 1380, "", 1, 0 +heaterDuty = scalar, U08, 1381, "%", 1, 0 +pumpDuty = scalar, U08, 1382, "%", 1, 0 +tempC = scalar, U16, 1384, "C", 1, 0 +nernstVoltage = scalar, U16, 1386, "V", 0.001, 0 +esr = scalar, U16, 1388, "ohm", 1, 0 +; total TS size = 1392 +dcOutput0 = scalar, F32, 1392, "per", 1,0 +isEnabled0_int = scalar, U08, 1396, "per", 1,0 +isEnabled0 = bits, U32, 1400, [0:0] ; total TS size = 1404 -vvtTarget = scalar, U16, 1404, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1406, "%", 0.5, 0 -; total TS size = 1408 -lambdaCurrentlyGood = bits, U32, 1408, [0:0] -lambdaMonitorCut = bits, U32, 1408, [1:1] -lambdaTimeSinceGood = scalar, U16, 1412, "sec", 0.01, 0 +value0 = scalar, U16, 1404, "value", 1,0 +value1 = scalar, U16, 1406, "value", 1,0 +errorRate = scalar, F32, 1408, "ratio", 1,0 +; total TS size = 1412 +vvtTarget = scalar, U16, 1412, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1414, "%", 0.5, 0 ; total TS size = 1416 +lambdaCurrentlyGood = bits, U32, 1416, [0:0] +lambdaMonitorCut = bits, U32, 1416, [1:1] +lambdaTimeSinceGood = scalar, U16, 1420, "sec", 0.01, 0 +; total TS size = 1424 time = { timeNow } @@ -5173,8 +5175,9 @@ entry = m_hasSynchronizedPhase, "sync: Known Engine Phase", int, "%d" entry = wallFuelCorrection, "fuel wallwetting injection time", float, "%.3f" entry = wallFuel, "Fuel on the wall", float, "%.3f" entry = idleState, "idleState", int, "%d" -entry = currentIdlePosition, "idle: current position", float, "%.3f" +entry = currentIdlePosition, "Idle: Position", float, "%.3f" entry = baseIdlePosition, "idle: base value", float, "%.3f" +entry = idleClosedLoop, "Idle: Closed loop", float, "%.3f" entry = iacByTpsTaper, "idle: iacByTpsTaper portion", float, "%.3f" entry = throttlePedalUpState, "idle: throttlePedalUpState", int, "%d" entry = mightResetPid, "idle: mightResetPid", int, "%d" @@ -5194,8 +5197,9 @@ entry = looksLikeCoasting, "looksLikeCoasting", int, "%d" entry = looksLikeCrankToIdle, "looksLikeCrankToIdle", int, "%d" entry = isIdleCoasting, "Idle: coasting", int, "%d" entry = isIdleClosedLoop, "Idle: Closed loop active", int, "%d" -entry = targetRpmByClt, "idle: target by CLT", int, "%d" -entry = targetRpmAcBump, "idle: A/C bump", int, "%d" +entry = idleTarget, "Idle: Target RPM", int, "%d" +entry = targetRpmByClt, "Idle: Target RPM base", int, "%d" +entry = targetRpmAcBump, "Idle: Target A/C bump", int, "%d" entry = iacByRpmTaper, "idle: iacByRpmTaper portion", float, "%.3f" entry = luaAdd, "idle: Lua Adder", float, "%.3f" entry = idlePosition, "ETB: idlePosition", float, "%.3f" @@ -6103,13 +6107,15 @@ dialog = idle_stateDialog, "idle_state" graphLine = idleState graphLine = currentIdlePosition graphLine = baseIdlePosition - graphLine = iacByTpsTaper + graphLine = idleClosedLoop liveGraph = idle_state_2_Graph, "Graph", South + graphLine = iacByTpsTaper graphLine = throttlePedalUpState + graphLine = idleTarget graphLine = targetRpmByClt + liveGraph = idle_state_3_Graph, "Graph", South graphLine = targetRpmAcBump graphLine = iacByRpmTaper - liveGraph = idle_state_3_Graph, "Graph", South graphLine = luaAdd indicatorPanel = electronic_throttleIndicatorPanel, 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 62d01c5176..2fab3d146a 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 Tue Sep 26 01:20:38 UTC 2023 +// this file was generated automatically by rusEFI tool config_definition_base.jar based on (unknown script) controllers/actuators/dc_motors.txt Thu Sep 28 13:44:07 UTC 2023 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -167,10 +167,10 @@ public class DcMotors { public static final int PACK_MULT_VSS = 100; 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(1384); - public static final Field ISENABLED0_INT = Field.create("ISENABLED0_INT", 4, FieldType.INT8).setScale(1.0).setBaseOffset(1384); - public static final Field ALIGNMENTFILL_AT_5 = Field.create("ALIGNMENTFILL_AT_5", 5, FieldType.INT8).setScale(1.0).setBaseOffset(1384); - public static final Field ISENABLED0 = Field.create("ISENABLED0", 8, FieldType.BIT, 0).setBaseOffset(1384); + public static final Field DCOUTPUT0 = Field.create("DCOUTPUT0", 0, FieldType.FLOAT).setBaseOffset(1392); + public static final Field ISENABLED0_INT = Field.create("ISENABLED0_INT", 4, FieldType.INT8).setScale(1.0).setBaseOffset(1392); + public static final Field ALIGNMENTFILL_AT_5 = Field.create("ALIGNMENTFILL_AT_5", 5, FieldType.INT8).setScale(1.0).setBaseOffset(1392); + public static final Field ISENABLED0 = Field.create("ISENABLED0", 8, FieldType.BIT, 0).setBaseOffset(1392); 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 0b8629600a..4e436231ac 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 Tue Sep 26 01:20:38 UTC 2023 +// this file was generated automatically by rusEFI tool config_definition_base.jar based on (unknown script) controllers/actuators/electronic_throttle.txt Thu Sep 28 13:44:07 UTC 2023 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -167,23 +167,23 @@ public class ElectronicThrottle { public static final int PACK_MULT_VSS = 100; 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(1320); - public static final Field TRIM = Field.create("TRIM", 4, FieldType.FLOAT).setBaseOffset(1320); - public static final Field LUAADJUSTMENT = Field.create("LUAADJUSTMENT", 8, FieldType.FLOAT).setBaseOffset(1320); - public static final Field M_WASTEGATEPOSITION = Field.create("M_WASTEGATEPOSITION", 12, FieldType.FLOAT).setBaseOffset(1320); - public static final Field ETBFEEDFORWARD = Field.create("ETBFEEDFORWARD", 16, FieldType.FLOAT).setBaseOffset(1320); - public static final Field ETBINTEGRALERROR = Field.create("ETBINTEGRALERROR", 20, FieldType.FLOAT).setBaseOffset(1320); - public static final Field ETBCURRENTTARGET = Field.create("ETBCURRENTTARGET", 24, FieldType.FLOAT).setBaseOffset(1320); - public static final Field ETBCURRENTADJUSTEDTARGET = Field.create("ETBCURRENTADJUSTEDTARGET", 28, FieldType.FLOAT).setBaseOffset(1320); - public static final Field ETBREVLIMITACTIVE = Field.create("ETBREVLIMITACTIVE", 32, FieldType.BIT, 0).setBaseOffset(1320); - public static final Field JAMDETECTED = Field.create("JAMDETECTED", 32, FieldType.BIT, 1).setBaseOffset(1320); - public static final Field ETBDUTYRATEOFCHANGE = Field.create("ETBDUTYRATEOFCHANGE", 36, FieldType.FLOAT).setBaseOffset(1320); - public static final Field ETBDUTYAVERAGE = Field.create("ETBDUTYAVERAGE", 40, FieldType.FLOAT).setBaseOffset(1320); - public static final Field ETBTPSERRORCOUNTER = Field.create("ETBTPSERRORCOUNTER", 44, FieldType.INT16).setScale(1.0).setBaseOffset(1320); - public static final Field ETBPPSERRORCOUNTER = Field.create("ETBPPSERRORCOUNTER", 46, FieldType.INT16).setScale(1.0).setBaseOffset(1320); - public static final Field ETBERRORCODE = Field.create("ETBERRORCODE", 48, FieldType.INT8).setScale(1.0).setBaseOffset(1320); - public static final Field ALIGNMENTFILL_AT_49 = Field.create("ALIGNMENTFILL_AT_49", 49, FieldType.INT8).setScale(1.0).setBaseOffset(1320); - public static final Field JAMTIMER = Field.create("JAMTIMER", 50, FieldType.INT16).setScale(0.01).setBaseOffset(1320); + public static final Field IDLEPOSITION = Field.create("IDLEPOSITION", 0, FieldType.FLOAT).setBaseOffset(1328); + public static final Field TRIM = Field.create("TRIM", 4, FieldType.FLOAT).setBaseOffset(1328); + public static final Field LUAADJUSTMENT = Field.create("LUAADJUSTMENT", 8, FieldType.FLOAT).setBaseOffset(1328); + public static final Field M_WASTEGATEPOSITION = Field.create("M_WASTEGATEPOSITION", 12, FieldType.FLOAT).setBaseOffset(1328); + public static final Field ETBFEEDFORWARD = Field.create("ETBFEEDFORWARD", 16, FieldType.FLOAT).setBaseOffset(1328); + public static final Field ETBINTEGRALERROR = Field.create("ETBINTEGRALERROR", 20, FieldType.FLOAT).setBaseOffset(1328); + public static final Field ETBCURRENTTARGET = Field.create("ETBCURRENTTARGET", 24, FieldType.FLOAT).setBaseOffset(1328); + public static final Field ETBCURRENTADJUSTEDTARGET = Field.create("ETBCURRENTADJUSTEDTARGET", 28, FieldType.FLOAT).setBaseOffset(1328); + public static final Field ETBREVLIMITACTIVE = Field.create("ETBREVLIMITACTIVE", 32, FieldType.BIT, 0).setBaseOffset(1328); + public static final Field JAMDETECTED = Field.create("JAMDETECTED", 32, FieldType.BIT, 1).setBaseOffset(1328); + public static final Field ETBDUTYRATEOFCHANGE = Field.create("ETBDUTYRATEOFCHANGE", 36, FieldType.FLOAT).setBaseOffset(1328); + public static final Field ETBDUTYAVERAGE = Field.create("ETBDUTYAVERAGE", 40, FieldType.FLOAT).setBaseOffset(1328); + public static final Field ETBTPSERRORCOUNTER = Field.create("ETBTPSERRORCOUNTER", 44, FieldType.INT16).setScale(1.0).setBaseOffset(1328); + public static final Field ETBPPSERRORCOUNTER = Field.create("ETBPPSERRORCOUNTER", 46, FieldType.INT16).setScale(1.0).setBaseOffset(1328); + public static final Field ETBERRORCODE = Field.create("ETBERRORCODE", 48, FieldType.INT8).setScale(1.0).setBaseOffset(1328); + public static final Field ALIGNMENTFILL_AT_49 = Field.create("ALIGNMENTFILL_AT_49", 49, FieldType.INT8).setScale(1.0).setBaseOffset(1328); + public static final Field JAMTIMER = Field.create("JAMTIMER", 50, FieldType.INT16).setScale(0.01).setBaseOffset(1328); public static final Field[] VALUES = { IDLEPOSITION, TRIM, 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 ccdcee3e51..69317ce8cd 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 Thu Sep 28 03:25:51 UTC 2023 +// this file was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Thu Sep 28 13:46:27 UTC 2023 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -1025,7 +1025,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 = 771690048; public static final String SIMULATOR_TUNE_BIN_FILE_NAME = "generated/simulator_tune_image.bin"; public static final int spi_device_e_SPI_DEVICE_1 = 1; public static final int spi_device_e_SPI_DEVICE_2 = 2; @@ -1250,11 +1249,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.09.28.f407-discovery.771690048"; + public static final String TS_SIGNATURE = "rusEFI master.2023.09.28.f407-discovery.3863213240"; 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 = 1416; + public static final int TS_TOTAL_OUTPUT_SIZE = 1424; 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 db563e895c..5b9f4f6071 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 Sep 27 01:12:03 UTC 2023 +// this file was generated automatically by rusEFI tool config_definition_base.jar based on (unknown script) controllers/actuators/idle_state.txt Thu Sep 28 13:44:07 UTC 2023 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -170,33 +170,36 @@ public class IdleState { public static final Field IDLESTATE = Field.create("IDLESTATE", 0, FieldType.INT).setScale(1.0).setBaseOffset(1280); public static final Field CURRENTIDLEPOSITION = Field.create("CURRENTIDLEPOSITION", 4, FieldType.FLOAT).setBaseOffset(1280); public static final Field BASEIDLEPOSITION = Field.create("BASEIDLEPOSITION", 8, FieldType.FLOAT).setBaseOffset(1280); - public static final Field IACBYTPSTAPER = Field.create("IACBYTPSTAPER", 12, FieldType.FLOAT).setBaseOffset(1280); - public static final Field THROTTLEPEDALUPSTATE = Field.create("THROTTLEPEDALUPSTATE", 16, FieldType.INT).setScale(1.0).setBaseOffset(1280); - public static final Field MIGHTRESETPID = Field.create("MIGHTRESETPID", 20, FieldType.BIT, 0).setBaseOffset(1280); - public static final Field SHOULDRESETPID = Field.create("SHOULDRESETPID", 20, FieldType.BIT, 1).setBaseOffset(1280); - public static final Field WASRESETPID = Field.create("WASRESETPID", 20, FieldType.BIT, 2).setBaseOffset(1280); - public static final Field MUSTRESETPID = Field.create("MUSTRESETPID", 20, FieldType.BIT, 3).setBaseOffset(1280); - public static final Field ISCRANKING = Field.create("ISCRANKING", 20, FieldType.BIT, 4).setBaseOffset(1280); - public static final Field ISIACTABLEFORCOASTING = Field.create("ISIACTABLEFORCOASTING", 20, FieldType.BIT, 5).setBaseOffset(1280); - public static final Field NOTIDLING = Field.create("NOTIDLING", 20, FieldType.BIT, 6).setBaseOffset(1280); - public static final Field NEEDRESET = Field.create("NEEDRESET", 20, FieldType.BIT, 7).setBaseOffset(1280); - public static final Field ISINDEADZONE = Field.create("ISINDEADZONE", 20, FieldType.BIT, 8).setBaseOffset(1280); - public static final Field ISBLIPPING = Field.create("ISBLIPPING", 20, FieldType.BIT, 9).setBaseOffset(1280); - public static final Field USECLOSEDLOOP = Field.create("USECLOSEDLOOP", 20, FieldType.BIT, 10).setBaseOffset(1280); - public static final Field BADTPS = Field.create("BADTPS", 20, FieldType.BIT, 11).setBaseOffset(1280); - public static final Field LOOKSLIKERUNNING = Field.create("LOOKSLIKERUNNING", 20, FieldType.BIT, 12).setBaseOffset(1280); - public static final Field LOOKSLIKECOASTING = Field.create("LOOKSLIKECOASTING", 20, FieldType.BIT, 13).setBaseOffset(1280); - public static final Field LOOKSLIKECRANKTOIDLE = Field.create("LOOKSLIKECRANKTOIDLE", 20, FieldType.BIT, 14).setBaseOffset(1280); - public static final Field ISIDLECOASTING = Field.create("ISIDLECOASTING", 20, FieldType.BIT, 15).setBaseOffset(1280); - public static final Field ISIDLECLOSEDLOOP = Field.create("ISIDLECLOSEDLOOP", 20, FieldType.BIT, 16).setBaseOffset(1280); - public static final Field TARGETRPMBYCLT = Field.create("TARGETRPMBYCLT", 24, FieldType.INT).setScale(1.0).setBaseOffset(1280); - public static final Field TARGETRPMACBUMP = Field.create("TARGETRPMACBUMP", 28, FieldType.INT).setScale(1.0).setBaseOffset(1280); - public static final Field IACBYRPMTAPER = Field.create("IACBYRPMTAPER", 32, FieldType.FLOAT).setBaseOffset(1280); - public static final Field LUAADD = Field.create("LUAADD", 36, FieldType.FLOAT).setBaseOffset(1280); + public static final Field IDLECLOSEDLOOP = Field.create("IDLECLOSEDLOOP", 12, FieldType.FLOAT).setBaseOffset(1280); + public static final Field IACBYTPSTAPER = Field.create("IACBYTPSTAPER", 16, FieldType.FLOAT).setBaseOffset(1280); + public static final Field THROTTLEPEDALUPSTATE = Field.create("THROTTLEPEDALUPSTATE", 20, FieldType.INT).setScale(1.0).setBaseOffset(1280); + public static final Field MIGHTRESETPID = Field.create("MIGHTRESETPID", 24, FieldType.BIT, 0).setBaseOffset(1280); + public static final Field SHOULDRESETPID = Field.create("SHOULDRESETPID", 24, FieldType.BIT, 1).setBaseOffset(1280); + public static final Field WASRESETPID = Field.create("WASRESETPID", 24, FieldType.BIT, 2).setBaseOffset(1280); + public static final Field MUSTRESETPID = Field.create("MUSTRESETPID", 24, FieldType.BIT, 3).setBaseOffset(1280); + public static final Field ISCRANKING = Field.create("ISCRANKING", 24, FieldType.BIT, 4).setBaseOffset(1280); + public static final Field ISIACTABLEFORCOASTING = Field.create("ISIACTABLEFORCOASTING", 24, FieldType.BIT, 5).setBaseOffset(1280); + public static final Field NOTIDLING = Field.create("NOTIDLING", 24, FieldType.BIT, 6).setBaseOffset(1280); + public static final Field NEEDRESET = Field.create("NEEDRESET", 24, FieldType.BIT, 7).setBaseOffset(1280); + public static final Field ISINDEADZONE = Field.create("ISINDEADZONE", 24, FieldType.BIT, 8).setBaseOffset(1280); + public static final Field ISBLIPPING = Field.create("ISBLIPPING", 24, FieldType.BIT, 9).setBaseOffset(1280); + public static final Field USECLOSEDLOOP = Field.create("USECLOSEDLOOP", 24, FieldType.BIT, 10).setBaseOffset(1280); + public static final Field BADTPS = Field.create("BADTPS", 24, FieldType.BIT, 11).setBaseOffset(1280); + public static final Field LOOKSLIKERUNNING = Field.create("LOOKSLIKERUNNING", 24, FieldType.BIT, 12).setBaseOffset(1280); + public static final Field LOOKSLIKECOASTING = Field.create("LOOKSLIKECOASTING", 24, FieldType.BIT, 13).setBaseOffset(1280); + public static final Field LOOKSLIKECRANKTOIDLE = Field.create("LOOKSLIKECRANKTOIDLE", 24, FieldType.BIT, 14).setBaseOffset(1280); + public static final Field ISIDLECOASTING = Field.create("ISIDLECOASTING", 24, FieldType.BIT, 15).setBaseOffset(1280); + public static final Field ISIDLECLOSEDLOOP = Field.create("ISIDLECLOSEDLOOP", 24, FieldType.BIT, 16).setBaseOffset(1280); + public static final Field IDLETARGET = Field.create("IDLETARGET", 28, FieldType.INT).setScale(1.0).setBaseOffset(1280); + public static final Field TARGETRPMBYCLT = Field.create("TARGETRPMBYCLT", 32, FieldType.INT).setScale(1.0).setBaseOffset(1280); + public static final Field TARGETRPMACBUMP = Field.create("TARGETRPMACBUMP", 36, FieldType.INT).setScale(1.0).setBaseOffset(1280); + public static final Field IACBYRPMTAPER = Field.create("IACBYRPMTAPER", 40, FieldType.FLOAT).setBaseOffset(1280); + public static final Field LUAADD = Field.create("LUAADD", 44, FieldType.FLOAT).setBaseOffset(1280); public static final Field[] VALUES = { IDLESTATE, CURRENTIDLEPOSITION, BASEIDLEPOSITION, + IDLECLOSEDLOOP, IACBYTPSTAPER, THROTTLEPEDALUPSTATE, MIGHTRESETPID, @@ -216,6 +219,7 @@ public class IdleState { LOOKSLIKECRANKTOIDLE, ISIDLECOASTING, ISIDLECLOSEDLOOP, + IDLETARGET, TARGETRPMBYCLT, TARGETRPMACBUMP, IACBYRPMTAPER, 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 dd3570053b..eba92f02b0 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 Tue Sep 26 01:20:38 UTC 2023 +// this file was generated automatically by rusEFI tool config_definition_base.jar based on (unknown script) controllers/math/lambda_monitor.txt Thu Sep 28 13:44:07 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(1408); - public static final Field LAMBDAMONITORCUT = Field.create("LAMBDAMONITORCUT", 0, FieldType.BIT, 1).setBaseOffset(1408); - public static final Field LAMBDATIMESINCEGOOD = Field.create("LAMBDATIMESINCEGOOD", 4, FieldType.INT16).setScale(0.01).setBaseOffset(1408); - public static final Field ALIGNMENTFILL_AT_6 = Field.create("ALIGNMENTFILL_AT_6", 6, FieldType.INT8).setScale(1.0).setBaseOffset(1408); + public static final Field LAMBDACURRENTLYGOOD = Field.create("LAMBDACURRENTLYGOOD", 0, FieldType.BIT, 0).setBaseOffset(1416); + public static final Field LAMBDAMONITORCUT = Field.create("LAMBDAMONITORCUT", 0, FieldType.BIT, 1).setBaseOffset(1416); + public static final Field LAMBDATIMESINCEGOOD = Field.create("LAMBDATIMESINCEGOOD", 4, FieldType.INT16).setScale(0.01).setBaseOffset(1416); + public static final Field ALIGNMENTFILL_AT_6 = Field.create("ALIGNMENTFILL_AT_6", 6, FieldType.INT8).setScale(1.0).setBaseOffset(1416); 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 ffc5248f66..9f84a7f7b0 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 Tue Sep 26 01:20:38 UTC 2023 +// this file was generated automatically by rusEFI tool config_definition_base.jar based on (unknown script) controllers/sensors/sent_state.txt Thu Sep 28 13:44:07 UTC 2023 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -167,9 +167,9 @@ public class SentState { public static final int PACK_MULT_VSS = 100; 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(1396); - public static final Field VALUE1 = Field.create("VALUE1", 2, FieldType.INT16).setScale(1.0).setBaseOffset(1396); - public static final Field ERRORRATE = Field.create("ERRORRATE", 4, FieldType.FLOAT).setBaseOffset(1396); + public static final Field VALUE0 = Field.create("VALUE0", 0, FieldType.INT16).setScale(1.0).setBaseOffset(1404); + public static final Field VALUE1 = Field.create("VALUE1", 2, FieldType.INT16).setScale(1.0).setBaseOffset(1404); + public static final Field ERRORRATE = Field.create("ERRORRATE", 4, FieldType.FLOAT).setBaseOffset(1404); public static final Field[] VALUES = { VALUE0, VALUE1, 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 5fa1d2a164..00c6c04556 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 Tue Sep 26 01:20:38 UTC 2023 +// this file was generated automatically by rusEFI tool config_definition_base.jar based on (unknown script) controllers/actuators/vvt.txt Thu Sep 28 13:44:07 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(1404); - public static final Field VVTOUTPUT = Field.create("VVTOUTPUT", 2, FieldType.INT8).setScale(0.5).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 VVTTARGET = Field.create("VVTTARGET", 0, FieldType.INT16).setScale(0.1).setBaseOffset(1412); + public static final Field VVTOUTPUT = Field.create("VVTOUTPUT", 2, FieldType.INT8).setScale(0.5).setBaseOffset(1412); + public static final Field ALIGNMENTFILL_AT_3 = Field.create("ALIGNMENTFILL_AT_3", 3, FieldType.INT8).setScale(1.0).setBaseOffset(1412); public static final Field[] VALUES = { VVTTARGET, VVTOUTPUT, 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 2410b6a007..1c630874df 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 Tue Sep 26 01:20:38 UTC 2023 +// this file was generated automatically by rusEFI tool config_definition_base.jar based on (unknown script) controllers/sensors//wideband_state.txt Thu Sep 28 13:44:07 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(1372); - public static final Field HEATERDUTY = Field.create("HEATERDUTY", 1, FieldType.INT8).setScale(1.0).setBaseOffset(1372); - public static final Field PUMPDUTY = Field.create("PUMPDUTY", 2, FieldType.INT8).setScale(1.0).setBaseOffset(1372); - public static final Field ALIGNMENTFILL_AT_3 = Field.create("ALIGNMENTFILL_AT_3", 3, FieldType.INT8).setScale(1.0).setBaseOffset(1372); - public static final Field TEMPC = Field.create("TEMPC", 4, FieldType.INT16).setScale(1.0).setBaseOffset(1372); - public static final Field NERNSTVOLTAGE = Field.create("NERNSTVOLTAGE", 6, FieldType.INT16).setScale(0.001).setBaseOffset(1372); - public static final Field ESR = Field.create("ESR", 8, FieldType.INT16).setScale(1.0).setBaseOffset(1372); - public static final Field ALIGNMENTFILL_AT_10 = Field.create("ALIGNMENTFILL_AT_10", 10, FieldType.INT8).setScale(1.0).setBaseOffset(1372); + public static final Field FAULTCODE = Field.create("FAULTCODE", 0, FieldType.INT8).setScale(1.0).setBaseOffset(1380); + public static final Field HEATERDUTY = Field.create("HEATERDUTY", 1, FieldType.INT8).setScale(1.0).setBaseOffset(1380); + public static final Field PUMPDUTY = Field.create("PUMPDUTY", 2, FieldType.INT8).setScale(1.0).setBaseOffset(1380); + public static final Field ALIGNMENTFILL_AT_3 = Field.create("ALIGNMENTFILL_AT_3", 3, FieldType.INT8).setScale(1.0).setBaseOffset(1380); + public static final Field TEMPC = Field.create("TEMPC", 4, FieldType.INT16).setScale(1.0).setBaseOffset(1380); + public static final Field NERNSTVOLTAGE = Field.create("NERNSTVOLTAGE", 6, FieldType.INT16).setScale(0.001).setBaseOffset(1380); + public static final Field ESR = Field.create("ESR", 8, FieldType.INT16).setScale(1.0).setBaseOffset(1380); + public static final Field ALIGNMENTFILL_AT_10 = Field.create("ALIGNMENTFILL_AT_10", 10, FieldType.INT8).setScale(1.0).setBaseOffset(1380); public static final Field[] VALUES = { FAULTCODE, HEATERDUTY,